diff --git a/schemas/app/Item.json b/schemas/app/Item.json index deb74828..6ac835f3 100644 --- a/schemas/app/Item.json +++ b/schemas/app/Item.json @@ -135,6 +135,7 @@ "quickEditFields": [ "rate", "unit", + "UOM", "itemType", "for", "tax", diff --git a/schemas/app/UOMConversionFactor.json b/schemas/app/UOMConversionFactor.json new file mode 100644 index 00000000..43abcd6e --- /dev/null +++ b/schemas/app/UOMConversionFactor.json @@ -0,0 +1,29 @@ +{ + "name": "UOMConversionFactor", + "label": "UOM Conversion Factor", + "naming": "manual", + "fields": [ + { + "fieldname": "name", + "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", + "required": true + } + ], + "quickEditFields": ["item", "value"] +} diff --git a/schemas/app/inventory/StockMovementItem.json b/schemas/app/inventory/StockMovementItem.json index 2ba7a6a3..cedc2f4c 100644 --- a/schemas/app/inventory/StockMovementItem.json +++ b/schemas/app/inventory/StockMovementItem.json @@ -33,6 +33,30 @@ "required": true, "default": 1 }, + { + "fieldname": "transferQty", + "label": "Qty as per UOM", + "fieldtype": "Float", + "required": true + }, + { + "fieldname": "stockUOM", + "label": "Stock UOM", + "fieldtype": "Data", + "readOnly": true + }, + { + "fieldname": "UOMs", + "label": "UOMs", + "fieldtype": "Link", + "target": "UOMConversionFactor" + }, + { + "fieldname": "UOMConversionFactor", + "label": "Conversion Factor", + "fieldtype": "Float", + "required": "true" + }, { "fieldname": "rate", "label": "Rate", @@ -46,13 +70,27 @@ "readOnly": true } ], - "tableFields": ["item", "fromLocation", "toLocation", "quantity", "rate"], + "tableFields": [ + "item", + "fromLocation", + "toLocation", + "stockUOM", + "UOMs", + "UOMConversionFactor", + "quantity", + "transferQty", + "rate" + ], "keywordFields": ["item"], "quickEditFields": [ "item", "fromLocation", "toLocation", + "stockUOM", + "UOMs", + "UOMConversionFactor", "quantity", + "transferQty", "rate", "amount" ]