incr: uom conversion child table & schema changes

schemas/app/InvoiceItem.json

@@ -24,6 +24,30 @@
       "required": true,
       "default": 1
     },
+    {
+      "fieldname": "transferQty",
+      "label": "Qty as per Stock UOM",
+      "fieldtype": "Float",
+      "required": true
+    },
+    {
+      "fieldname": "stockUOM",
+      "label": "Stock UOM",
+      "fieldtype": "Data",
+      "readOnly": true
+    },
+    {
+      "fieldname": "uom",
+      "label": "UOMs",
+      "fieldtype": "Link",
+      "target": "UOM"
+    },
+    {
+      "fieldname": "UOMConversionFactor",
+      "label": "Conversion Factor",
+      "fieldtype": "Float",
+      "required": "true"
+    },
     {
       "fieldname": "rate",
       "label": "Rate",
@@ -95,7 +119,17 @@
       "readOnly": true
     }
   ],
-  "tableFields": ["item", "tax", "quantity", "rate", "amount"],
+  "tableFields": [
+    "item",
+    "tax",
+    "stockUOM",
+    "uom",
+    "UOMConversionFactor",
+    "transferQty",
+    "quantity",
+    "rate",
+    "amount"
+  ],
   "keywordFields": ["item", "tax"],
   "quickEditFields": [
     "item",
@@ -103,6 +137,10 @@
     "description",
     "hsnCode",
     "tax",
+    "stockUOM",
+    "uom",
+    "UOMConversionFactor",
+    "transferQty",
     "quantity",
     "rate",
     "amount",

schemas/app/Item.json

@@ -135,7 +135,6 @@
   "quickEditFields": [
     "rate",
     "unit",
-    "UOM",
     "itemType",
     "for",
     "tax",
@@ -144,7 +143,8 @@
     "expenseAccount",
     "barcode",
     "hsnCode",
-    "trackItem"
+    "trackItem",
+    "uom"
   ],
   "keywordFields": ["name", "itemType", "for"]
 }

schemas/app/UOMConversionFactor.json

@@ -1,29 +1,24 @@
 {
   "name": "UOMConversionFactor",
   "label": "UOM Conversion Factor",
-  "naming": "manual",
+  "isChild": true,
   "fields": [
     {
-      "fieldname": "name",
+      "fieldname": "uom",
       "label": "UOM",
       "fieldtype": "Link",
       "target": "UOM",
       "create": true,
       "required": true
     },
-    {
-      "fieldname": "item",
-      "label": "Item",
-      "fieldtype": "Link",
-      "target": "Item",
-      "required": true
-    },
     {
       "fieldname": "value",
       "label": "Value",
       "fieldtype": "Float",
+      "default": 1,
       "required": true
     }
   ],
-  "quickEditFields": ["item", "value"]
+  "tableFields": ["uom", "value"],
+  "quickEditFields": ["uom", "value"]
 }

schemas/app/inventory/StockMovementItem.json

@@ -26,6 +26,12 @@
       "target": "Location",
       "create": true
     },
+    {
+      "fieldname": "transferQty",
+      "label": "Qty as per Stock UOM",
+      "fieldtype": "Float",
+      "required": true
+    },
     {
       "fieldname": "quantity",
       "label": "Quantity",
@@ -33,12 +39,6 @@
       "required": true,
       "default": 1
     },
-    {
-      "fieldname": "transferQty",
-      "label": "Qty as per UOM",
-      "fieldtype": "Float",
-      "required": true
-    },
     {
       "fieldname": "stockUOM",
       "label": "Stock UOM",
@@ -46,10 +46,10 @@
       "readOnly": true
     },
     {
-      "fieldname": "UOMs",
+      "fieldname": "uom",
       "label": "UOMs",
       "fieldtype": "Link",
-      "target": "UOMConversionFactor"
+      "target": "UOM"
     },
     {
       "fieldname": "UOMConversionFactor",
@@ -75,10 +75,10 @@
     "fromLocation",
     "toLocation",
     "stockUOM",
-    "UOMs",
+    "uom",
     "UOMConversionFactor",
-    "quantity",
     "transferQty",
+    "quantity",
     "rate"
   ],
   "keywordFields": ["item"],
@@ -87,10 +87,10 @@
     "fromLocation",
     "toLocation",
     "stockUOM",
-    "UOMs",
+    "uom",
     "UOMConversionFactor",
-    "quantity",
     "transferQty",
+    "quantity",
     "rate",
     "amount"
   ]

schemas/app/inventory/StockTransferItem.json

@@ -24,6 +24,30 @@
       "required": true,
       "default": 1
     },
+    {
+      "fieldname": "transferQty",
+      "label": "Qty as per Stock UOM",
+      "fieldtype": "Float",
+      "required": true
+    },
+    {
+      "fieldname": "stockUOM",
+      "label": "Stock UOM",
+      "fieldtype": "Data",
+      "readOnly": true
+    },
+    {
+      "fieldname": "uom",
+      "label": "UOMs",
+      "fieldtype": "Link",
+      "target": "UOM"
+    },
+    {
+      "fieldname": "UOMConversionFactor",
+      "label": "Conversion Factor",
+      "fieldtype": "Float",
+      "required": "true"
+    },
     {
       "fieldname": "rate",
       "label": "Rate",
@@ -57,13 +81,27 @@
       "placeholder": "HSN/SAC Code"
     }
   ],
-  "tableFields": ["item", "location", "quantity", "rate", "amount"],
+  "tableFields": [
+    "item",
+    "location",
+    "stockUOM",
+    "uom",
+    "UOMConversionFactor",
+    "transferQty",
+    "quantity",
+    "rate",
+    "amount"
+  ],
   "quickEditFields": [
     "item",
     "unit",
     "description",
     "hsnCode",
     "location",
+    "stockUOM",
+    "uom",
+    "UOMConversionFactor",
+    "transferQty",
     "quantity",
     "rate",
     "amount"