From 7b18b6c8f84c7d229b45958bc934d8cb919caf72 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 8 Jul 2011 16:12:19 +0530 Subject: [PATCH 1/2] Resolved issue of default currency not getting assigned to first company through setup_control --- setup/doctype/setup_control/setup_control.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/doctype/setup_control/setup_control.py b/setup/doctype/setup_control/setup_control.py index 7cbf4d32fb..65ac094167 100644 --- a/setup/doctype/setup_control/setup_control.py +++ b/setup/doctype/setup_control/setup_control.py @@ -58,7 +58,8 @@ class DocType: # Company master_dict = {'Company':{'company_name':company_name, - 'abbr':comp_abbr + 'abbr':comp_abbr, + 'default_currency':currency }} self.create_records(master_dict) From cb54a24ead357c3dbd576106224d8e69ea137797 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 8 Jul 2011 16:25:01 +0530 Subject: [PATCH 2/2] Implemented auto setting of default currency format in global defaults depending on currency after initial setup --- setup/doctype/setup_control/setup_control.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup/doctype/setup_control/setup_control.py b/setup/doctype/setup_control/setup_control.py index 65ac094167..1b30660a82 100644 --- a/setup/doctype/setup_control/setup_control.py +++ b/setup/doctype/setup_control/setup_control.py @@ -75,7 +75,9 @@ class DocType: '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)