Fixed conflict

erpnext/patches/v6_0/fix_planned_qty.py

@@ -0,0 +1,14 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from erpnext.stock.stock_balance import get_planned_qty, update_bin_qty
+
+def execute():
+	for item_code, warehouse in frappe.db.sql("""select distinct production_item, fg_warehouse
+		from `tabProduction Order`"""):
+			if frappe.db.exists("Item", item_code) and frappe.db.exists("Warehouse", warehouse):
+				update_bin_qty(item_code, warehouse, {
+					"planned_qty": get_planned_qty(item_code, warehouse)
+				})