[ADD] add an active field for tax type model

l10n_cn_fapiao/__openerp__.py

@@ -13,7 +13,7 @@
     'depends': ['account'],
     'data': [
         'views/fapiao_view.xml',
-        'data/fapiao.xml',
+        'data/fapiao_tax_type.xml',
     ],
     'demo': [
         'demo/fapiao_demo.xml',

l10n_cn_fapiao/data/fapiao.xml → l10n_cn_fapiao/data/fapiao_tax_type.xml

@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         <record id="fapiao_tax_type_6" model="fapiao.tax.type">
             <field name="name">6%</field>
+            <field name="active">True</field>
         </record>
         <record id="fapiao_tax_type_13" model="fapiao.tax.type">
             <field name="name">13%</field>
+            <field name="active">True</field>
         </record>
         <record id="fapiao_tax_type_17" model="fapiao.tax.type">
             <field name="name">17%</field>
+            <field name="active">True</field>
         </record>
         <record id="fapiao_tax_type_normal" model="fapiao.tax.type">
             <field name="name">normal</field>
+            <field name="active">True</field>
         </record>
         <record id="fapiao_tax_type_no_tax" model="fapiao.tax.type">
             <field name="name">no tax</field>
+            <field name="active">True</field>
         </record>
     </data>
 </openerp>

l10n_cn_fapiao/demo/fapiao_demo.xml

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <!-- fapiao tag -->
         <record id="demo_fapiao_tag_1" model="fapiao.tag">
             <field name="name">SH</field>
         </record>
         <record id="demo_fapiao_tag_2" model="fapiao.tag">
             <field name="name">EXPORT</field>
         </record>
+
         <!-- A fapiao statement -->
         <record id="demo_fapiao_1" model="fapiao">
             <field name="fapiao_number" eval="'80'+time.strftime('%S')"/>
             <field name="fapiao_date" eval="time.strftime('%Y-%m')+'-01'"/>
             <field name="reception_date" eval="time.strftime('%Y-%m')+'-02'"/>
             <field name="amount_with_taxes">2</field>
-            <field name="invoice_ids" eval="[(6,0,
-                [ref('account.invoice_1'),ref('account.invoice_2')])]"/>
-            <field name="tag_ids" eval="[(6,0,
-                [ref('demo_fapiao_tag_1'),ref('demo_fapiao_tag_2')])]"/>
+            <field name="invoice_ids" eval="[(6,0,[ref('account.invoice_1'),ref('account.invoice_2')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('demo_fapiao_tag_1'),ref('demo_fapiao_tag_2')])]"/>
+            <field name="tax_type" eval="ref('fapiao_tax_type_6')"/>
         </record>
         <record id="demo_fapiao_2" model="fapiao">
             <field name="fapiao_number" eval="'80'+time.strftime('%S')"/>
             <field name="fapiao_date" eval="time.strftime('%Y-%m')+'-01'"/>
             <field name="reception_date" eval="time.strftime('%Y-%m')+'-02'"/>
             <field name="amount_with_taxes">50</field>
-            <field name="invoice_ids" eval="[(6,0,
-                [ref('account.invoice_2'),ref('account.invoice_3')])]"/>
-            <field name="tag_ids" eval="[(6,0,
-                [ref('demo_fapiao_tag_1'),ref('demo_fapiao_tag_2')])]"/>
+            <field name="invoice_ids" eval="[(6,0,[ref('account.invoice_2'),ref('account.invoice_3')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('demo_fapiao_tag_1'),ref('demo_fapiao_tag_2')])]"/>
+            <field name="tax_type" eval="ref('fapiao_tax_type_normal')"/>
         </record>
     </data>
 </openerp>

l10n_cn_fapiao/models/fapiao_tag.py

@@ -8,7 +8,7 @@ class FapiaoTag(models.Model):
     _name = 'fapiao.tag'
     _order = 'name'
 
-    name = fields.Char("Name")
+    name = fields.Char('Name')
 
     _sql_constraints = [
         ('name_uniq', 'unique(name)', 'Tag must be unique.')

l10n_cn_fapiao/models/fapiao_tax_type.py

@@ -8,7 +8,8 @@ class FapiaoTaxType(models.Model):
     _name = 'fapiao.tax.type'
     _order = 'name'
 
-    name = fields.Char("name")
+    name = fields.Char('Name')
+    active = fields.Boolean(default=True)
 
     _sql_constraints = [
         ('name_uniq', 'unique(name)', 'Tax type must be unique.')

l10n_cn_fapiao/views/fapiao_view.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <!-- fapiao -->
         <record id="view_fapiao_tree" model="ir.ui.view">
             <field name="name">fapiao.tree</field>
             <field name="model">fapiao</field>
@@ -12,6 +13,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_fapiao_form" model="ir.ui.view">
             <field name="name">fapiao.line.form</field>
             <field name="model">fapiao</field>
@@ -27,7 +29,7 @@
                             <group>
                                 <field name="fapiao_date"/>
                                 <field name="amount_with_taxes"/>
-                                <field name="tax_type"/>
+                                <field name="tax_type" domain="[('active', '=', True)]"/>
                             </group>
                         </group>
                         <field name="invoice_ids"/>
@@ -39,6 +41,7 @@
                 </form>
             </field>
         </record>
+
         <record id="view_fapiao_filter" model="ir.ui.view">
             <field name="name">fapiao.select</field>
             <field name="model">fapiao</field>
@@ -55,6 +58,55 @@
                 </search>
             </field>
         </record>
+
+        <record id="action_fapiao_tree" model="ir.actions.act_window">
+            <field name="name">Customer Fapiao</field>
+            <field name="res_model">fapiao</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_fapiao_filter"/>
+        </record>
+        <menuitem id="menu_fapiao" name="Fapiao" parent="account.menu_finance" sequence="3"/>
+        <menuitem id="fapiao_tree_lines" action="action_fapiao_tree" parent="menu_fapiao"/>
+
+
+        <!-- fapiao tax type -->
+        <record id="view_fapiao_tax_type_tree" model="ir.ui.view">
+            <field name="name">fapiao.tax.type.tree</field>
+            <field name="model">fapiao.tax.type</field>
+            <field name="arch" type="xml">
+                <tree string="Fapiao Tax Type">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_fapiao_tax_type_form" model="ir.ui.view">
+            <field name="name">fapiao.tax.type.form</field>
+            <field name="model">fapiao.tax.type</field>
+            <field name="arch" type="xml">
+                <form string="Fapiao Tax Type" version="7.0">
+                    <sheet string="Fapiao Tax Type">
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="active"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_fapiao_tax_type" model="ir.actions.act_window">
+            <field name="name">Tax Type</field>
+            <field name="res_model">fapiao.tax.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem id="menu_fapiao_tax_type" action="action_fapiao_tax_type" parent="menu_fapiao"/>
+
+        <!-- account.invoice -->
         <record id="invoice_form" model="ir.ui.view">
             <field name="name">account.invoice.form</field>
             <field name="model">account.invoice</field>
@@ -73,15 +125,5 @@
                 </xpath>
             </field>
         </record>
-
-        <record id="action_fapiao_tree" model="ir.actions.act_window">
-            <field name="name">Customer Fapiao</field>
-            <field name="res_model">fapiao</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_fapiao_filter"/>
-        </record>
-        <menuitem id="menu_fapiao" name="Fapiao" parent="account.menu_finance" sequence="3"/>
-        <menuitem id="fapiao_tree_lines" action="action_fapiao_tree" parent="menu_fapiao"/>
     </data>
 </openerp>