frappe · SaiFi0102 · Sep 19, 2018 · Sep 26, 2018 · Sep 26, 2018 · Sep 29, 2018
diff --git a/erpnext/accounts/doctype/loyalty_program/loyalty_program.json b/erpnext/accounts/doctype/loyalty_program/loyalty_program.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0,
+ "allow_events_in_timeline": 0,
  "allow_guest_to_view": 0,
  "allow_import": 0,
  "allow_rename": 0,
@@ -390,7 +391,7 @@
    "length": 0,
    "no_copy": 0,
    "permlevel": 0,
-   "precision": "",
+   "precision": "9",
    "print_hide": 0,
    "print_hide_if_no_value": 0,
    "read_only": 0,
@@ -639,7 +640,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2018-07-10 19:15:24.994385",
+ "modified": "2018-10-30 15:14:36.888426",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Loyalty Program",

diff --git a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
@@ -228,9 +228,11 @@ def test_pricing_rule_for_stock_qty(self):
 		if not frappe.db.get_value('UOM Conversion Detail',
 			{'parent': '_Test Item', 'uom': 'box'}):
 			item = frappe.get_doc('Item', '_Test Item')
-			item.append('uoms', {
-				'uom': 'Box',
-				'conversion_factor': 5
+			item.append('uom_conversion_graph', {
+				'from_qty': 1,
+				'from_uom': 'Box',
+				'to_qty': 5, # conversion factor
+				'to_uom': item.stock_uom
 			})
 			item.save(ignore_permissions=True)
 

diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -486,7 +486,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "precision": "", 
+   "precision": "9", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
@@ -2626,7 +2626,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2019-01-07 16:52:00.749414", 
+ "modified": "2018-10-30 15:14:34.952705", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice Item", 
@@ -2641,4 +2641,4 @@
  "track_changes": 0, 
  "track_seen": 0, 
  "track_views": 0
-}
+}
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -515,7 +515,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "precision": "", 
+   "precision": "9", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -2766,7 +2766,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2019-01-07 16:51:55.018091", 
+ "modified": "2018-10-30 15:14:16.938130", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Item", 
@@ -2781,4 +2781,4 @@
  "track_changes": 0, 
  "track_seen": 0, 
  "track_views": 0
-}
+}
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -562,7 +562,7 @@
    "oldfieldname": "conversion_factor", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
-   "precision": "", 
+   "precision": "9", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
@@ -2344,7 +2344,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2019-01-07 16:51:57.546323", 
+ "modified": "2018-10-30 15:14:15.694415", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order Item", 
@@ -2359,4 +2359,4 @@
  "track_changes": 1, 
  "track_seen": 0, 
  "track_views": 0
-}
+}
diff --git a/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json b/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
@@ -299,6 +299,7 @@
    "oldfieldname": "conversion_factor", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
+   "precision": "9", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
@@ -388,7 +389,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2019-01-07 16:51:58.016007", 
+ "modified": "2018-10-30 15:14:24.115744", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order Item Supplied", 
@@ -401,4 +402,4 @@
  "track_changes": 0, 
  "track_seen": 0, 
  "track_views": 0
-}
+}
diff --git a/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json b/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
@@ -398,6 +398,7 @@
    "oldfieldname": "conversion_factor", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
+   "precision": "9", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
@@ -519,7 +520,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2019-01-07 16:51:59.536291", 
+ "modified": "2018-10-30 15:14:25.023990", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Receipt Item Supplied", 
@@ -534,4 +535,4 @@
  "track_changes": 1, 
  "track_seen": 0, 
  "track_views": 0
-}
+}
diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
@@ -620,7 +620,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "precision": "", 
+   "precision": "9", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
@@ -1786,7 +1786,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2019-01-07 16:52:02.125715", 
+ "modified": "2018-10-30 15:14:22.358993", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation Item", 
@@ -1801,4 +1801,4 @@
  "track_changes": 1, 
  "track_seen": 0, 
  "track_views": 0
-}
+}
diff --git a/erpnext/healthcare/doctype/clinical_procedure_item/clinical_procedure_item.json b/erpnext/healthcare/doctype/clinical_procedure_item/clinical_procedure_item.json
@@ -291,7 +291,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "precision": "", 
+   "precision": "9",
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
@@ -411,7 +411,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-11-04 03:33:16.833884", 
+ "modified": "2018-11-04 03:33:16.833885", 
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Clinical Procedure Item", 
@@ -428,4 +428,4 @@
  "track_changes": 1, 
  "track_seen": 0, 
  "track_views": 0
-}
+}
diff --git a/erpnext/manufacturing/doctype/bom/test_bom.py b/erpnext/manufacturing/doctype/bom/test_bom.py
@@ -97,7 +97,6 @@ def test_bom_cost(self):
 		self.assertEqual(bom.base_total_cost, 486000)
 
 	def test_bom_cost_multi_uom_multi_currency(self):
-		frappe.db.set_value("Price List", "_Test Price List", "price_not_uom_dependant", 1)
 		for item_code, rate in (("_Test Item", 3600), ("_Test Item Home Desktop Manufactured", 3000)):
 			frappe.db.sql("delete from `tabItem Price` where price_list='_Test Price List' and item_code=%s",
 				item_code)

diff --git a/erpnext/manufacturing/doctype/bom_item/bom_item.json b/erpnext/manufacturing/doctype/bom_item/bom_item.json
@@ -588,7 +588,7 @@
    "length": 0,
    "no_copy": 0,
    "permlevel": 0,
-   "precision": "",
+   "precision": "9",
    "print_hide": 0,
    "print_hide_if_no_value": 0,
    "read_only": 0,
@@ -1115,4 +1115,4 @@
  "track_changes": 0,
  "track_seen": 0,
  "track_views": 0
-}
+}
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
@@ -576,6 +576,7 @@ erpnext.patches.v11_0.ewaybill_fields_gst_india #2018-11-13 #2019-01-09
 erpnext.patches.v11_0.drop_column_max_days_allowed
 erpnext.patches.v11_0.change_healthcare_desktop_icons
 erpnext.patches.v10_0.update_user_image_in_employee
+erpnext.patches.v11_0.item_uom_conversion_table
 erpnext.patches.v10_0.repost_gle_for_purchase_receipts_with_rejected_items
 erpnext.patches.v10_0.allow_operators_in_supplier_scorecard
 erpnext.patches.v11_0.update_delivery_trip_status

diff --git a/erpnext/patches/v11_0/item_uom_conversion_table.py b/erpnext/patches/v11_0/item_uom_conversion_table.py
@@ -0,0 +1,30 @@
+import frappe
+from frappe.utils import flt
+
+def execute():
+	frappe.reload_doc("stock", "doctype", "item")
+	frappe.reload_doc("stock", "doctype", "uom_conversion_detail")
+	frappe.reload_doc("stock", "doctype", "uom_conversion_graph")
+
+	names = frappe.get_all("Item")
+	for name in names:
+		doc = frappe.get_doc("Item", name)
+		for d in doc.uoms:
+			if d.uom == doc.stock_uom:
+				continue
+
+			if abs(d.conversion_factor) >= 1:
+				conv = doc.append("uom_conversion_graph", {
+					"from_qty": flt(d.conversion_factor, doc.precision("to_qty", "uom_conversion_graph")),
+					"from_uom": doc.stock_uom,
+					"to_qty": 1.0,
+					"to_uom": d.uom
+				})
+			else:
+				conv = doc.append("uom_conversion_graph", {
+					"from_qty": 1.0,
+					"from_uom": doc.stock_uom,
+					"to_qty": flt(1/flt(d.conversion_factor), doc.precision("to_qty", "uom_conversion_graph")),
+					"to_uom": d.uom
+				})
+			conv.db_insert()
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -494,7 +494,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "precision": "", 
+   "precision": "9", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
@@ -1914,7 +1914,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2019-01-07 16:51:56.248107", 
+ "modified": "2018-12-27 05:52:46.135944", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation Item", 
@@ -1929,4 +1929,4 @@
  "track_changes": 1, 
  "track_seen": 0, 
  "track_views": 0
-}
+}
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -558,7 +558,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "precision": "", 
+   "precision": "9", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
@@ -2477,7 +2477,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2019-01-07 16:51:51.852343", 
+ "modified": "2018-10-30 15:14:26.284151", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order Item", 
@@ -2492,4 +2492,4 @@
  "track_changes": 1, 
  "track_seen": 0, 
  "track_views": 0
-}
+}
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -525,7 +525,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "precision": "", 
+   "precision": "9", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
@@ -2310,7 +2310,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2019-01-07 16:51:53.322875", 
+ "modified": "2018-10-30 15:14:19.900827", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note Item", 
@@ -2325,4 +2325,4 @@
  "track_changes": 0, 
  "track_seen": 0, 
  "track_views": 0
-}
+}