nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Browse Source 
Conflicts:
	utilities/doctype/address/address.txt
This commit is contained in:
Anand Doshi
2013-07-02 11:43:54 +05:30
parent edbf3e1e19 d420401ba3
commit 2023012b0e
32 changed files with 210 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utilities/doctype/address/address.py
View File

@@ -27,13 +27,13 @@ class DocType:
def autoname(self):
if not self.doc.address_title:
self.doc.address_title = self.doc.customer or self.doc.supplier or self.doc.sales_partner or self.doc.lead
self.doc.address_title = self.doc.customer \
or self.doc.supplier or self.doc.sales_partner or self.doc.lead
if self.doc.address_title:
self.doc.name = cstr(self.doc.address_title).strip() + "-" + cstr(self.doc.address_type).strip()
else:
webnotes.msgprint("""Address Title is mandatory.""", raise_exception=True)
webnotes.msgprint("""Address Title is mandatory.""" + self.doc.customer, raise_exception=True)
def validate(self):
self.validate_primary_address()
@@ -85,4 +85,4 @@ def get_website_args():
}),
"cint": cint
}

2
utilities/doctype/address/address.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:32",
"docstatus": 0,
"modified": "2013-07-01 17:24:17",
"modified": "2013-07-01 17:25:00",
"modified_by": "Administrator",
"owner": "Administrator"
},