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

This commit is contained in:
Ravi Dey 2011-07-08 17:01:07 +05:30
commit 121b327703

View File

@ -58,7 +58,8 @@ class DocType:
# Company # Company
master_dict = {'Company':{'company_name':company_name, master_dict = {'Company':{'company_name':company_name,
'abbr':comp_abbr 'abbr':comp_abbr,
'default_currency':currency
}} }}
self.create_records(master_dict) self.create_records(master_dict)
@ -74,7 +75,9 @@ class DocType:
'pr_required':'No', 'pr_required':'No',
'emp_created_by':'Naming Series', 'emp_created_by':'Naming Series',
'cust_master_name':'Customer Name', 'cust_master_name':'Customer Name',
'supp_master_name':'Supplier Name'} 'supp_master_name':'Supplier Name',
'default_currency_format': (currency=='INR') and 'Lacs' or 'Millions'
}
# Set # Set
self.set_defaults(def_args) self.set_defaults(def_args)