fixed conflict

2015-02-17 11:12:04 +05:30
parent 3237c75d98 46e03eadca
commit 6f0a3ed8d4
62 changed files with 1220 additions and 897 deletions
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -55,7 +55,7 @@ class SellingController(StockController):
 			self.update_if_missing(party_details)

 		elif getattr(self, "lead", None):
-			from erpnext.selling.doctype.lead.lead import get_lead_details
+			from erpnext.crm.doctype.lead.lead import get_lead_details
 			self.update_if_missing(get_lead_details(self.lead))

 	def set_price_list_and_item_details(self):