Fixed conflict while merging v4 into v5

2015-02-10 16:44:00 +05:30
parent 15cd12214e 6dfd430a2f
commit 8fa503e177
28 changed files with 52 additions and 53 deletions
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -64,11 +64,11 @@ def get_bin(item_code, warehouse):
 			"item_code": item_code,
 			"warehouse": warehouse,
 		})
-		bin_obj.ignore_permissions = 1
+		bin_obj.flags.ignore_permissions = 1
 		bin_obj.insert()
 	else:
 		bin_obj = frappe.get_doc('Bin', bin)
-	bin_obj.ignore_permissions = True
+	bin_obj.flags.ignore_permissions = True
 	return bin_obj

 def update_bin(args, allow_negative_stock=False):