commit da154866240f1a10aecb618ab361d1363837073f
author Makarand Bauskar <mbauskar@gmail.com> Tue Jun 13 17:08:56 2017 +0530
committer GitHub <noreply@github.com> Tue Jun 13 17:08:56 2017 +0530
tree 3c47dcdeee896fa55ff1376f3ce222d5272d9e94
parent a7a7c835cc93bb2884e5096554d54b90266645a5
parent 96ce5821b8293df7028812b17dfa9b825b0901f0

Merge pull request #9260 from mbauskar/address-and-contacts

[hot] fixed ImportError: Module import failed for Company (erpnext.setup.doctype.company.company)

erpnext/setup/doctype/company/company.py

diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 39ad556..d7aa718 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -10,7 +10,7 @@
 
 
 from frappe.model.document import Document
-from frappe.geo.address_and_contact import load_address_and_contact
+from frappe.contacts.address_and_contact import load_address_and_contact
 
 class Company(Document):
 	def onload(self):