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

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-07-29 13:31:00 +05:30
5 changed files with 65 additions and 15 deletions

View File

@@ -8,5 +8,5 @@ class DocType:
self.doc, self.doclist = d, dl
def validate(self):
for key in ["cust_master_name", "customer_group", "territory", "allow_same_sales_rate"]:
for key in ["cust_master_name", "customer_group", "territory", "maintain_same_sales_rate"]:
webnotes.conn.set_default(key, self.doc.fields.get(key, ""))