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/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -48,8 +48,7 @@ class SellingController(StockController):
 	def set_missing_lead_customer_details(self):
 		if getattr(self, "customer", None):
 			from erpnext.accounts.party import _get_party_details
-			party_details = _get_party_details(self.customer,
-				ignore_permissions=getattr(self, "ignore_permissions", None))
+			party_details = _get_party_details(self.customer, ignore_permissions=self.flags.ignore_permissions)
 			if not self.meta.get_field("sales_team"):
 				party_details.pop("sales_team")