Merge lp:~openerp-dev/openobject-addons/trunk-account-config-sgo into lp:openobject-addons

[Sanjay Gohel (Open ERP)]

Hello,
   I have resolved all issue listed on this pad https://pad.openerp.com/p/openerp-project.task-2IQSD70XD6.

Thank You.

[Jigar A. (ifixthat)]

I don't understand why this branch and mp exists !!!
Again same work has been done while this task was already been codded as per specification, in a branch given below, way back in October
  - https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-configtab

and As far as i see, specification even didn't changed since then :O, above branch has to be taken over instead of doing everything form scratch???

[lp:~openerp-dev/openobject-addons/trunk-account-config-sgo]

9039. By Sanjay Gohel (Open ERP) on 2014-01-03

[MERGE]sync with trunk

9040. By Sanjay Gohel (Open ERP) on 2014-01-08

[MERGE]sync with trunk

9041. By Sanjay Gohel (Open ERP) on 2014-02-10

[MERGE]sync with trunk

9042. By Chirag Dodiya(OpenERP) on 2014-03-20

[MRG]Merge with lp:openobject-addons

9043. By Sunil Sharma(OpenERP) on 2014-04-28

[MRG]:lp:openobject-addons

9044. By Sunil Sharma(OpenERP) on 2014-04-29

[imp]:improve oe_inline class as per ado sir suggestion

9045. By Sunil Sharma(OpenERP) on 2014-05-02

[mrg]:lp:openobject-addons

Unmerged revisions

9045. By Sunil Sharma(OpenERP) on 2014-05-02

[mrg]:lp:openobject-addons

9044. By Sunil Sharma(OpenERP) on 2014-04-29

[imp]:improve oe_inline class as per ado sir suggestion

9043. By Sunil Sharma(OpenERP) on 2014-04-28

[MRG]:lp:openobject-addons

9042. By Chirag Dodiya(OpenERP) on 2014-03-20

[MRG]Merge with lp:openobject-addons

9041. By Sanjay Gohel (Open ERP) on 2014-02-10

[MERGE]sync with trunk

9040. By Sanjay Gohel (Open ERP) on 2014-01-08

[MERGE]sync with trunk

9039. By Sanjay Gohel (Open ERP) on 2014-01-03

[MERGE]sync with trunk

9038. By Sanjay Gohel (Open ERP) on 2014-01-01

[IMP]improve view

9037. By Sanjay Gohel (Open ERP) on 2014-01-01

[MERGE]sync with trunk

9036. By Sanjay Gohel (Open ERP) on 2013-12-31

[IMP]improve view

=== modified file 'account/res_config.py'
--- account/res_config.py	2014-04-23 11:40:53 +0000
+++ account/res_config.py	2014-05-02 05:11:44 +0000
@@ -37,7 +37,7 @@
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'has_default_company': fields.boolean('Has default company', readonly=True),
         'expects_chart_of_accounts': fields.related('company_id', 'expects_chart_of_accounts', type='boolean',
-            string='This company has its own chart of accounts',
+            string='There is no chart of accounts installed for this company, select an existing one or install a new one.',
             help="""Check this box if this company is a legal entity."""),
         'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', required=True,
             string='Default company currency', help="Main currency of the company."),
@@ -46,9 +46,9 @@
         'company_footer': fields.related('company_id', 'rml_footer', type='text', readonly=True,
             string='Bank accounts footer preview', help="Bank accounts as printed in the footer of each printed document"),
 
-        'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
+        'has_chart_of_accounts': fields.boolean('This company has a chart of accounts installed already.'),
         'chart_template_id': fields.many2one('account.chart.template', 'Template', domain="[('visible','=', True)]"),
-        'code_digits': fields.integer('# of Digits', help="No. of digits to use for account code"),
+        'code_digits': fields.integer('# of Digits', help="Number of digits to use for account code"),
         'tax_calculation_rounding_method': fields.related('company_id',
             'tax_calculation_rounding_method', type='selection', selection=[
             ('round_per_line', 'Round per line'),
@@ -172,6 +172,7 @@
     _defaults = {
         'company_id': _default_company,
         'has_default_company': _default_has_default_company,
+        'code_digits': 6,
     }
 
     def create(self, cr, uid, values, context=None):
@@ -311,11 +312,17 @@
                 'currency_id': config.currency_id.id,
             }, context)
             wizard.execute(cr, uid, [wizard_id], context)
+            install_wiz = self.pool.get('ir.model.data').get_object(cr, uid, 'account', 'account_configuration_installer_todo')
+            if install_wiz.state == 'open':
+                install_wiz.write({'state': 'done'})
+            multichart_wiz = self.pool.get('ir.model.data').get_object(cr, uid, 'account', 'action_wizard_multi_chart_todo')
+            if multichart_wiz.state == 'open':
+                multichart_wiz.write({'state': 'done'})
 
     def set_fiscalyear(self, cr, uid, ids, context=None):
         """ create a fiscal year for the given company (if necessary) """
         config = self.browse(cr, uid, ids[0], context)
-        if config.has_chart_of_accounts or config.chart_template_id:
+        if not config.has_fiscal_year:
             fiscalyear = self.pool.get('account.fiscalyear')
             fiscalyear_count = fiscalyear.search_count(cr, uid,
                 [('date_start', '<=', config.date_start), ('date_stop', '>=', config.date_stop),
@@ -338,6 +345,7 @@
                     fiscalyear.create_period(cr, uid, [fiscalyear_id])
                 elif config.period == '3months':
                     fiscalyear.create_period3(cr, uid, [fiscalyear_id])
+                config.write({'has_fiscal_year': True})
 
     def get_default_dp(self, cr, uid, fields, context=None):
         dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_account')

=== modified file 'account/res_config_view.xml'
--- account/res_config_view.xml	2014-04-21 05:34:56 +0000
+++ account/res_config_view.xml	2014-05-02 05:11:44 +0000
@@ -22,35 +22,38 @@
                     </header>
 
                     <field name="has_default_company" invisible="1" />
-                    <field name="has_chart_of_accounts" invisible="1"/>
                     <field name="complete_tax_set" invisible="1"/>
                     <field name="has_fiscal_year" invisible="1"/>
-                    <separator string="Chart of Accounts" groups="base.group_multi_company"/>
-                    <group groups="base.group_multi_company">
-                        <label for="id" string="Chart of Accounts"/>
+                    <separator string="Chart of Accounts"/>
+                    <group>
+                        <label for="company_id" string="Select Company" groups='base.group_multi_company' attrs="{'invisible': [('has_default_company', '=', True)]}"/>
                         <div>
                             <div attrs="{'invisible': [('has_default_company', '=', True)]}">
-                                <label for="company_id" string="Select Company"/>
                                 <field name="company_id"
                                     widget="selection"
+                                    groups='base.group_multi_company'
                                     on_change="onchange_company_id(company_id, context)"
                                     class="oe_inline"/>
                             </div>
-                            <div>
+                            <div attrs="{'invisible': [('has_chart_of_accounts','=',True)]}">
                                 <field name="expects_chart_of_accounts" class="oe_inline"/>
                                 <label for="expects_chart_of_accounts"/>
                             </div>
-                        </div>
-                    </group>
-                    <separator string="Chart of Accounts" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}"/>
-                    <group attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
-                        <label for="id" string="Chart of Account"/>
-                        <div>
+                            <div attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
+                                <field name="has_chart_of_accounts" class="oe_inline" readonly='True'/>
+                                <label for="has_chart_of_accounts"/>
+                            </div>
+                         </div>
+                        </group>
+                       <group>
+                        <label for="id" string="Chart of Accounts" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}"/>
+                        <div attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
                             <div>
                                 <label for="chart_template_id"/>
                                 <field name="chart_template_id"
                                     widget="selection"
                                     domain="[('visible','=', True)]"
+                                    attrs="{'required': [('expects_chart_of_accounts','=',True)]}"
                                     on_change="onchange_chart_template_id(chart_template_id)"
                                     class="oe_inline"/>
                                 <button string="Install more chart templates"
@@ -77,16 +80,16 @@
                             </div>
                             <div attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}">
                                 <label for="sale_tax_rate"/>
-                                <field name="sale_tax_rate" on_change="onchange_tax_rate(sale_tax_rate)"/>
+                                <field name="sale_tax_rate" on_change="onchange_tax_rate(sale_tax_rate)" class="oe_inline"/>
                             </div>
                             <div attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}">
                                 <label for="purchase_tax_rate"/>
-                                <field name="purchase_tax_rate" />
+                                <field name="purchase_tax_rate" class="oe_inline"/>
                             </div>
                         </div>
                     </group>
-                    <separator string="No Fiscal Year Defined for This Company" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}"/>
-                    <group attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
+                    <separator string="Fiscal Year Setup" attrs="{'invisible': [('has_fiscal_year','=',True)]}"/>
+                    <group attrs="{'invisible': [('has_fiscal_year','=',True)]}">
                         <label for="id" string="Fiscal Year"/>
                         <div>
                             <div>