Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/setup/doctype/setup_control/setup_control.py b/setup/doctype/setup_control/setup_control.py
index 7cbf4d3..1b30660 100644
--- a/setup/doctype/setup_control/setup_control.py
+++ b/setup/doctype/setup_control/setup_control.py
@@ -58,7 +58,8 @@
# Company
master_dict = {'Company':{'company_name':company_name,
- 'abbr':comp_abbr
+ 'abbr':comp_abbr,
+ 'default_currency':currency
}}
self.create_records(master_dict)
@@ -74,7 +75,9 @@
'pr_required':'No',
'emp_created_by':'Naming Series',
'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
self.set_defaults(def_args)