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

Merge pull request #4 from ravidey/master

Browse Source 
Customer / Supplier Name fix
This commit is contained in:
Ravi Dey 2011-06-10 01:08:56 -07:00
commit f9fa27e399
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README Normal file
View File

@ -0,0 +1 @@
erpnext

3
crm/doctype/customer/customer.py
View File

@ -25,7 +25,8 @@ class DocType:
if cust_master_name == 'Customer Name': if cust_master_name == 'Customer Name':
# filter out bad characters in name # filter out bad characters in name
cust = self.doc.customer_name.replace('&','and').replace('.','').replace("'",'').replace('"','').replace(',','').replace('`','') #cust = self.doc.customer_name.replace('&','and').replace('.','').replace("'",'').replace('"','').replace(',','').replace('`','')
cust = self.doc.customer_name
supp = sql("select name from `tabSupplier` where name = %s", (cust)) supp = sql("select name from `tabSupplier` where name = %s", (cust))
supp = supp and supp[0][0] or '' supp = supp and supp[0][0] or ''

3
srm/doctype/supplier/supplier.py
View File

@ -29,7 +29,8 @@ class DocType:
if supp_master_name == 'Supplier Name': if supp_master_name == 'Supplier Name':
# filter out bad characters in name # filter out bad characters in name
supp = self.doc.supplier_name.replace('&','and').replace('.','').replace("'",'').replace('"','').replace(',','').replace('`','') #supp = self.doc.supplier_name.replace('&','and').replace('.','').replace("'",'').replace('"','').replace(',','').replace('`','')
supp = self.doc.supplier_name
cust = sql("select name from `tabCustomer` where name = '%s'" % (supp)) cust = sql("select name from `tabCustomer` where name = '%s'" % (supp))
cust = cust and cust[0][0] or '' cust = cust and cust[0][0] or ''

2
tools/doctype/address/address.py
View File

@ -22,7 +22,7 @@ class DocType:
self.doc.name = self.doc.sales_partner + '-' + self.doc.address_type self.doc.name = self.doc.sales_partner + '-' + self.doc.address_type
# filter out bad characters in name # filter out bad characters in name
self.doc.name = self.doc.name.replace('&','and').replace('.','').replace("'",'').replace('"','').replace(',','').replace('`','') #self.doc.name = self.doc.name.replace('&','and').replace('.','').replace("'",'').replace('"','').replace(',','').replace('`','')
#---------------------- #----------------------
# Call to Validate # Call to Validate

2
tools/doctype/contact/contact.py
View File

@ -22,7 +22,7 @@ class DocType:
self.doc.name = self.doc.first_name + (self.doc.last_name and ' ' + self.doc.last_name or '') + '-' + self.doc.sales_partner self.doc.name = self.doc.first_name + (self.doc.last_name and ' ' + self.doc.last_name or '') + '-' + self.doc.sales_partner
# filter out bad characters in name # filter out bad characters in name
self.doc.name = self.doc.name.replace('&','and').replace('.','').replace("'",'').replace('"','').replace(',','') #self.doc.name = self.doc.name.replace('&','and').replace('.','').replace("'",'').replace('"','').replace(',','')
#---------------------- #----------------------
# Call to Validate # Call to Validate