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

fix: gettext import and changed function order in address.py

Browse Source
This commit is contained in:
Abhishek Balam 2020-10-14 19:48:57 +05:30
parent c0215d257c
commit 2f528c1c73
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/accounts/custom/address.py
View File

@ -1,4 +1,5 @@
import frappe import frappe
from frappe import _
from frappe.contacts.doctype.address.address import Address from frappe.contacts.doctype.address.address import Address
from frappe.contacts.address_and_contact import set_link_title from frappe.contacts.address_and_contact import set_link_title
from frappe.core.doctype.dynamic_link.dynamic_link import deduplicate_dynamic_links from frappe.core.doctype.dynamic_link.dynamic_link import deduplicate_dynamic_links
@ -11,12 +12,6 @@ class CustomAddress(Address):
set_link_title(self) set_link_title(self)
deduplicate_dynamic_links(self) deduplicate_dynamic_links(self)
def validate_reference(self):
if self.is_your_company_address:
if not [row for row in self.links if row.link_doctype == "Company"]:
frappe.throw(_("Address needs to be linked to a Company. Please add a row for Company in the Links table below."),
title =_("Company not Linked"))
def link_address(self): def link_address(self):
"""Link address based on owner""" """Link address based on owner"""
if not self.links and not self.is_your_company_address: if not self.links and not self.is_your_company_address:
@ -27,5 +22,12 @@ class CustomAddress(Address):
for link in contact.links: for link in contact.links:
self.append('links', dict(link_doctype=link.link_doctype, link_name=link.link_name)) self.append('links', dict(link_doctype=link.link_doctype, link_name=link.link_name))
return True return True
return False
return False def validate_reference(self):
if self.is_your_company_address:
print('here')
if not [row for row in self.links if row.link_doctype == "Company"]:
frappe.throw(_("Address needs to be linked to a Company. Please add a row for Company in the Links table below."),
title =_("Company not Linked"))