Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/README b/README
new file mode 100644
index 0000000..3796729
--- /dev/null
+++ b/README
@@ -0,0 +1 @@
+erpnext
diff --git a/crm/doctype/customer/customer.py b/crm/doctype/customer/customer.py
index d480a6c..3d2fa59 100644
--- a/crm/doctype/customer/customer.py
+++ b/crm/doctype/customer/customer.py
@@ -25,7 +25,8 @@
if cust_master_name == 'Customer 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 = supp and supp[0][0] or ''
diff --git a/srm/doctype/supplier/supplier.py b/srm/doctype/supplier/supplier.py
index af5b85a..e6db6c3 100644
--- a/srm/doctype/supplier/supplier.py
+++ b/srm/doctype/supplier/supplier.py
@@ -29,7 +29,8 @@
if supp_master_name == 'Supplier 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 = cust and cust[0][0] or ''
diff --git a/tools/doctype/address/address.py b/tools/doctype/address/address.py
index dc17743..eabf624 100644
--- a/tools/doctype/address/address.py
+++ b/tools/doctype/address/address.py
@@ -22,7 +22,7 @@
self.doc.name = self.doc.sales_partner + '-' + self.doc.address_type
# 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
diff --git a/tools/doctype/contact/contact.py b/tools/doctype/contact/contact.py
index 7498619..6d7c4c4 100644
--- a/tools/doctype/contact/contact.py
+++ b/tools/doctype/contact/contact.py
@@ -22,7 +22,7 @@
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
- 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