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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta 2012-10-29 09:35:51 +01:00
commit 2465452df1
1 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
utilities/transaction_base.py
View File

@ -28,13 +28,9 @@ class TransactionBase:
# ----------------------- # -----------------------
def get_default_customer_address(self, args=''): def get_default_customer_address(self, args=''):
address_text, address_name = self.get_address_text(customer=self.doc.customer) address_text, address_name = self.get_address_text(customer=self.doc.customer)
contact_text, contact_name, contact_email, contact_mobile = self.get_contact_text(customer=self.doc.customer)
self.doc.customer_address = address_name or '' self.doc.customer_address = address_name or ''
self.doc.contact_person = contact_name or ''
self.doc.address_display = address_text or '' self.doc.address_display = address_text or ''
self.doc.contact_display = contact_text or '' self.doc.fields.update(self.get_contact_text(customer=self.doc.customer))
self.doc.contact_email = contact_email or ''
self.doc.contact_mobile = contact_mobile or ''
if args != 'onload': if args != 'onload':
self.get_customer_details(self.doc.customer) self.get_customer_details(self.doc.customer)
@ -44,13 +40,9 @@ class TransactionBase:
# ----------------------- # -----------------------
def get_default_customer_shipping_address(self, args=''): def get_default_customer_shipping_address(self, args=''):
address_text, address_name = self.get_address_text(customer=self.doc.customer,is_shipping_address=1) address_text, address_name = self.get_address_text(customer=self.doc.customer,is_shipping_address=1)
contact_text, contact_name, contact_email, contact_mobile = self.get_contact_text(customer=self.doc.customer)
self.doc.customer_address = address_name or '' self.doc.customer_address = address_name or ''
self.doc.contact_person = contact_name or ''
self.doc.address_display = address_text or '' self.doc.address_display = address_text or ''
self.doc.contact_display = contact_text or '' self.doc.fields.update(self.get_contact_text(customer=self.doc.customer))
self.doc.contact_email = contact_email or ''
self.doc.contact_mobile = contact_mobile or ''
if self.doc.doctype != 'Quotation' and args != 'onload': if self.doc.doctype != 'Quotation' and args != 'onload':
self.get_customer_details(self.doc.customer) self.get_customer_details(self.doc.customer)
@ -61,15 +53,13 @@ class TransactionBase:
def get_customer_address(self, args): def get_customer_address(self, args):
args = load_json(args) args = load_json(args)
address_text, address_name = self.get_address_text(address_name=args['address']) address_text, address_name = self.get_address_text(address_name=args['address'])
contact_text, contact_name, contact_email, contact_mobile = self.get_contact_text(contact_name=args['contact'])
ret = { ret = {
'customer_address' : address_name, 'customer_address' : address_name,
'contact_person' : contact_name,
'address_display' : address_text, 'address_display' : address_text,
'contact_display' : contact_text,
'contact_email' : contact_email,
'contact_mobile' : contact_mobile
} }
ret.update(self.get_contact_text(contact_name=args['contact']))
return ret return ret
# Get Address Text # Get Address Text
@ -112,10 +102,14 @@ class TransactionBase:
contact_display = ''.join([a[0]+cstr(extract(a[1])) for a in contact_fields if extract(a[1])]) contact_display = ''.join([a[0]+cstr(extract(a[1])) for a in contact_fields if extract(a[1])])
if contact_display.startswith('\n'): contact_display = contact_display[1:] if contact_display.startswith('\n'): contact_display = contact_display[1:]
contact_name = details and details[0]['name'] or '' return {
contact_email = details and details[0]['email_id'] or '' "contact_display": contact_display,
contact_mobile = details and details[0]['mobile_no'] or '' "contact_person": details and details[0]["name"] or "",
return contact_display, contact_name, contact_email, contact_mobile "contact_email": details and details[0]["email_id"] or "",
"contact_mobile": details and details[0]["mobile_no"] or "",
"contact_designation": details and details[0]["designation"] or "",
"contact_department": details and details[0]["department"] or "",
}
def get_customer_details(self, name): def get_customer_details(self, name):
""" """
@ -185,15 +179,11 @@ class TransactionBase:
def get_default_supplier_address(self, args): def get_default_supplier_address(self, args):
args = load_json(args) args = load_json(args)
address_text, address_name = self.get_address_text(supplier=args['supplier']) address_text, address_name = self.get_address_text(supplier=args['supplier'])
contact_text, contact_name, contact_email, contact_mobile = self.get_contact_text(supplier=args['supplier'])
ret = { ret = {
'supplier_address' : address_name, 'supplier_address' : address_name,
'address_display' : address_text, 'address_display' : address_text,
'contact_person' : contact_name,
'contact_display' : contact_text,
'contact_email' : contact_email,
'contact_mobile' : contact_mobile
} }
ret.update(self.get_contact_text(supplier=args['supplier']))
ret.update(self.get_supplier_details(args['supplier'])) ret.update(self.get_supplier_details(args['supplier']))
return ret return ret
@ -202,15 +192,11 @@ class TransactionBase:
def get_supplier_address(self, args): def get_supplier_address(self, args):
args = load_json(args) args = load_json(args)
address_text, address_name = self.get_address_text(address_name=args['address']) address_text, address_name = self.get_address_text(address_name=args['address'])
contact_text, contact_name, contact_email, contact_mobile = self.get_contact_text(contact_name=args['contact'])
ret = { ret = {
'supplier_address' : address_name, 'supplier_address' : address_name,
'address_display' : address_text, 'address_display' : address_text,
'contact_person' : contact_name,
'contact_display' : contact_text,
'contact_email' : contact_email,
'contact_mobile' : contact_mobile
} }
ret.update(self.get_contact_text(contact_name=args['contact']))
return ret return ret
# Get Supplier Details # Get Supplier Details