[IMP] analytic: Replaced account_type field by active field

Currently there is a selection field 'account_type' on the
account.analytic.account model with 2 values : Active or Archived

Let's use an active field instead and add a Archive stat button on the
form. That way, we can remove all the domain ('account_type','=','normal')
which are implicit with the generic active field behavior

3 files changed, 8 insertions, 22 deletions

diff --git a/addons/analytic/data/analytic_account_demo.xml b/addons/analytic/data/analytic_account_demo.xml
index 09ddaf96846..5e7478605ee 100644
--- a/addons/analytic/data/analytic_account_demo.xml
+++ b/addons/analytic/data/analytic_account_demo.xml
@@ -14,74 +14,60 @@
         </record>
         <record id="analytic_seagate_p2" model="account.analytic.account">
             <field name="name">Seagate P2</field>
-            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_2"/>
             <field name="tag_ids" eval="[(6,0, (ref('analytic.tag_contract'),))]"/>
         </record>
         <record id="analytic_millennium_industries" model="account.analytic.account">
             <field name="name">Millennium Industries</field>
-            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_3"/>
             <field name="tag_ids" eval="[(6,0, (ref('analytic.tag_contract'),))]"/>
         </record>
         <record id="analytic_integration_c2c" model="account.analytic.account">
             <field name="name">CampToCamp</field>
-            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_12"/>
             <field name="tag_ids" eval="[(6,0, (ref('analytic.tag_contract'),))]"/>
         </record>
         <record id="analytic_agrolait" model="account.analytic.account">
             <field name="name">Agrolait</field>
-            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_2"/>
         </record>
         <record id="analytic_asustek" model="account.analytic.account">
             <field name="name">Asustek</field>
-            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_1"/>
         </record>
         <record id="analytic_deltapc" model="account.analytic.account">
             <field name="name">Delta PC</field>
-            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_4"/>
         </record>
         <record id="analytic_spark" model="account.analytic.account">
             <field name="name">Spark Systems</field>
-            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_1"/>
         </record>
         <record id="analytic_nebula" model="account.analytic.account">
             <field name="name">Nebula</field>
-            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_12"/>
         </record>
         <record id="analytic_luminous_technologies" model="account.analytic.account">
             <field name="name">Luminous Technologies</field>
-            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_3"/>
         </record>
         <record id="analytic_desertic_hispafuentes" model="account.analytic.account">
             <field name="name">Desertic - Hispafuentes</field>
-            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_12"/>
         </record>
         <record id="analytic_think_big_systems" model="account.analytic.account">
             <field name="name">Think Big Systems</field>
-            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_18"/>
         </record>
         <record id="analytic_partners_camp_to_camp" model="account.analytic.account">
             <field name="name">Camp to Camp</field>
-            <field name="account_type">normal</field>
             <field name="partner_id" ref="base.res_partner_12"/>
         </record>
         <record id="analytic_administratif" model="account.analytic.account">
             <field name="name">Administrative</field>
-            <field name="account_type">normal</field>
         </record>
         <record id="analytic_commercial_marketing" model="account.analytic.account">
             <field name="name">Commercial &amp; Marketing</field>
-            <field name="account_type">normal</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/analytic/models/analytic.py b/addons/analytic/models/analytic.py
index e7fbb36f8f6..20b186c51a4 100644
--- a/addons/analytic/models/analytic.py
+++ b/addons/analytic/models/analytic.py
@@ -44,10 +44,7 @@ class account_analytic_account(models.Model):
     name = fields.Char(string='Analytic Account', index=True, required=True, track_visibility='onchange')
     code = fields.Char(string='Reference', index=True, track_visibility='onchange')
     # FIXME: we reused account_type to implement the closed accounts (feature removed by mistake on release of v9) without modifying the schemas on already released v9, but it would be more clean to rename it
-    account_type = fields.Selection([
-        ('normal', 'Active'),
-        ('closed', 'Archived')
-        ], string='State', required=True, default='normal')
+    active = fields.Boolean('Active', help="If the active field is set to False, it will allow you to hide the account without removing it.", default=True)
 
     tag_ids = fields.Many2many('account.analytic.tag', 'account_analytic_account_tag_rel', 'account_id', 'tag_id', string='Tags', copy=True)
     line_ids = fields.One2many('account.analytic.line', 'account_id', string="Analytic Lines")
diff --git a/addons/analytic/views/analytic_view.xml b/addons/analytic/views/analytic_view.xml
index c6bea569973..ee769474347 100644
--- a/addons/analytic/views/analytic_view.xml
+++ b/addons/analytic/views/analytic_view.xml
@@ -76,6 +76,10 @@
                 <form string="Analytic Account">
                     <sheet string="Analytic Account">
                         <div class="oe_button_box" name="button_box">
+                            <button class="oe_stat_button" type="object" name="toggle_active" icon="fa-archive">
+                                <field name="active" widget="boolean_button"
+                                options='{"terminology": "archive"}'/>
+                            </button>
                             <button class="oe_stat_button" type="action" name="%(account_analytic_line_action)d"
                         icon="fa-usd"  string="Cost/Revenue" widget="statinfo"/>
                         </div>
@@ -93,7 +97,6 @@
                             </group>
                             <group>
                                 <field name="tag_ids" widget="many2many_tags"/>
-                                <field name="account_type"/>
                                 <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
                                 <field name="currency_id" options="{'no_create': True}" groups="base.group_multi_currency"/>
                             </group>
@@ -118,7 +121,7 @@
                     <field name="display_name"/>
                     <field name="code"/>
                     <field name="partner_id"/>
-                    <field name="account_type" invisible="1"/>
+                    <field name="active" invisible="1"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="debit"/>
                     <field name="credit"/>
@@ -135,7 +138,7 @@
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
                     <field name="tag_ids"/>
                     <field name="partner_id"/>
-                    <filter string="Active" domain="[('account_type','=','normal')]" name="active"/>
+                    <filter string="Archived" domain="[('active', '=', False)]" name="inactive"/>
                     <group expand="0" string="Group By...">
                         <filter string="Associated Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                     </group>
@@ -179,7 +182,7 @@
                         <group>
                             <group>
                                 <field name="name"/>
-                                <field name="account_id" domain="[('account_type', '=', 'normal')]"/>
+                                <field name="account_id"/>
                                 <field name="date"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </group>