Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Mod] Removed the Dependency on Frappe PR

Browse Source 
[Fix] Fixed a possible bug
This commit is contained in:
Saurabh 2018-01-31 17:43:58 +05:30
parent 2056ea6fb4
commit 9f5c2002ff
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/doctype/customer/customer.json
View File

@ -922,7 +922,7 @@
"label": "Primary Address", "label": "Primary Address",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "customer_primary_address.complete_address", "options": "",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
@ -1418,7 +1418,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-01-25 17:26:34.847775", "modified": "2018-01-31 16:44:52.191083",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Customer", "name": "Customer",

12
erpnext/selling/doctype/customer/customer.py
View File

@ -20,6 +20,7 @@ class Customer(TransactionBase):
"""Load address and contacts in `__onload`""" """Load address and contacts in `__onload`"""
load_address_and_contact(self) load_address_and_contact(self)
self.load_dashboard_info() self.load_dashboard_info()
self.fetch_primary_address_and_contact_detail()
def load_dashboard_info(self): def load_dashboard_info(self):
info = get_dashboard_info(self.doctype, self.name) info = get_dashboard_info(self.doctype, self.name)
@ -53,6 +54,7 @@ class Customer(TransactionBase):
self.flags.old_lead = self.lead_name self.flags.old_lead = self.lead_name
validate_party_accounts(self) validate_party_accounts(self)
self.validate_credit_limit_on_change() self.validate_credit_limit_on_change()
self.fetch_primary_address_and_contact_detail()
def on_update(self): def on_update(self):
self.validate_name_with_customer_group() self.validate_name_with_customer_group()
@ -65,6 +67,16 @@ class Customer(TransactionBase):
if self.flags.is_new_doc: if self.flags.is_new_doc:
self.create_lead_address_contact() self.create_lead_address_contact()
def fetch_primary_address_and_contact_detail(self):
if(self.customer_primary_contact):
primary_contact_doc = frappe.get_doc("Contact",self.customer_primary_contact)
self.db_set('mobile_no', primary_contact_doc.mobile_no)
self.db_set('email_id', primary_contact_doc.email_id)
if(self.customer_primary_address):
primary_address_doc = frappe.get_doc("Address",self.customer_primary_address)
self.db_set('primary_address', "<br>" + primary_address_doc.get_display())
def create_primary_contact(self): def create_primary_contact(self):
if not self.customer_primary_contact and not self.lead_name: if not self.customer_primary_contact and not self.lead_name:
if self.mobile_no or self.email_id: if self.mobile_no or self.email_id: