fix order dict

app_odoo_customize/__manifest__.py

@@ -23,7 +23,7 @@
 
 {
     'name': 'Customize odoo OEM (Boost, My Odoo)',
-    'version': '13.20.03.04',
+    'version': '13.20.03.05',
     'author': 'Sunpop.cn',
     'category': 'Productivity',
     'website': 'https://www.sunpop.cn',

app_odoo_customize/models/res_config_settings.py

@@ -421,11 +421,10 @@ class ResConfigSettings(models.TransientModel):
             ['account.bank.statement', ],
             ['account.tax.account.tag', ],
             ['account.tax', ],
-            ['account.tax', ],
             ['account.account.account.tag', ],
             ['wizard_multi_charts_accounts'],
-            ['account.account', ],
             ['account.journal', ],
+            ['account.account', ],
         ]
         # todo: 要做 remove_hr，因为工资表会用到 account
         # 更新account关联，很多是多公司字段，故只存在 ir_property，故在原模型，只能用update
@@ -435,7 +434,9 @@ class ResConfigSettings(models.TransientModel):
             field2 = self.env['ir.model.fields']._get('product.template', "supplier_taxes_id").id
 
             sql = ("delete from ir_default where field_id = %s or field_id = %s") % (field1, field2)
+            sql2 = ("update account_journal set bank_account_id=NULL;")
             self._cr.execute(sql)
+            self._cr.execute(sql2)
             self._cr.commit()
         except Exception as e:
             pass  # raise Warning(e)

app_odoo_customize/views/ir_module_module_views.xml

@@ -62,7 +62,7 @@
             </field>
         </record>
     <!--默认打开可更新模块-->
-        <record id="base.open_module_tree" model="ir.module.module">
+        <record id="base.open_module_tree" model="ir.actions.act_window">
             <field name="context">{'search_default_is_local_updatable':1}</field>
         </record>
 </odoo>

l10n_cn_standard_latest/__manifest__.py

@@ -9,7 +9,7 @@
 
 {
     'name': '2020最新中国企业会计表.Latest Chinese Accounting.',
-    'version': '13.20.03.02',
+    'version': '13.20.03.05',
     'author': 'Sunpop.cn',
     'category': 'Localization',
     'website': 'https://www.sunpop.cn',

l10n_cn_standard_latest/data/account_account_tag_data.xml

@@ -3,6 +3,14 @@
 
     <data noupdate="1">
         <!-- Account Tax -->
+        <record id="tag_cn0_s" model="account.account.tag">
+            <field name="name">不计销项税</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_cn0_p" model="account.account.tag">
+            <field name="name">不计进项税</field>
+            <field name="applicability">taxes</field>
+        </record>
         <record id="tag_cn13_s" model="account.account.tag">
             <field name="name">增值税13%销项税</field>
             <field name="applicability">taxes</field>

l10n_cn_standard_latest/data/account_tax_group_data.xml

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
-    <record id="l10n_cn_tax_group_vat_13" model="account.tax.group">
+    <record id="l10n_cn_tax_group_vat_0" model="account.tax.group">
-        <field name="name">VAT 13%</field>
+        <field name="name">VAT 0%</field>
-    </record>
-    <record id="l10n_cn_tax_group_vat_10" model="account.tax.group">
-        <field name="name">VAT 10%</field>
     </record>
     <record id="l10n_cn_tax_group_vat_9" model="account.tax.group">
         <field name="name">VAT 9%</field>
     </record>
+    <record id="l10n_cn_tax_group_vat_10" model="account.tax.group">
+        <field name="name">VAT 10%</field>
+    </record>
+    <record id="l10n_cn_tax_group_vat_13" model="account.tax.group">
+        <field name="name">VAT 13%</field>
+    </record>
 </odoo>

l10n_cn_standard_latest/data/account_tax_template_data.xml

@@ -1,5 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
+    <!-- 不计税-->
+    <record id="l10n_cn_standard_sale_0" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_chart_china_standard_business_latest"/>
+        <field name="name">0%销项税</field>
+        <field name="description">增值税销项税0%</field>
+        <field name="amount">0</field>
+        <field name="amount_type">percent</field>
+        <field name="type_tax_use">sale</field>
+        <field name="price_include" eval="0"/>
+        <field name="sequence">0</field>
+        <field name="tax_group_id" ref="l10n_cn_tax_group_vat_0"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('account_2221_1_5'),
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('account_2221_1_5'),
+            }),
+        ]"/>
+    </record>
+    <record id="l10n_cn_standard_purchase_0" model="account.tax.template">
+        <field name="chart_template_id" ref="l10n_chart_china_standard_business_latest"/>
+        <field name="name">0%进项税</field>
+        <field name="description">增值税进项税0%</field>
+        <field name="amount">0</field>
+        <field name="amount_type">percent</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="price_include" eval="0"/>
+        <field name="sequence">0</field>
+        <field name="tax_group_id" ref="l10n_cn_tax_group_vat_0"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('account_2221_1_5'),
+            }),
+        ]"/>
+        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+            }),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+                'account_id': ref('account_2221_1_5'),
+            }),
+        ]"/>
+    </record>
 
     <!-- sale tax included -->
     <record id="l10n_cn_standard_sale_included_13" model="account.tax.template">
@@ -10,6 +77,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="price_include" eval="1"/>
+        <field name="sequence">13</field>
         <field name="tax_group_id" ref="l10n_cn_tax_group_vat_13"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -43,6 +111,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="price_include" eval="1"/>
+        <field name="sequence">10</field>
         <field name="tax_group_id" ref="l10n_cn_tax_group_vat_10"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -76,6 +145,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="price_include" eval="1"/>
+        <field name="sequence">9</field>
         <field name="tax_group_id" ref="l10n_cn_tax_group_vat_9"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -109,6 +179,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="price_include" eval="1"/>
+        <field name="sequence">6</field>
         <field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_6"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -142,6 +213,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="price_include" eval="1"/>
+        <field name="sequence">3</field>
         <field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_3"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -166,8 +238,7 @@
             }),
         ]"/>
     </record>
-
+        <!-- sale tax excluded -->
-    <!-- sale tax excluded -->
     <record id="l10n_cn_standard_sale_excluded_13" model="account.tax.template">
         <field name="chart_template_id" ref="l10n_chart_china_standard_business_latest"/>
         <field name="name">13%销项税</field>
@@ -176,6 +247,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="price_include" eval="0"/>
+        <field name="sequence">13</field>
         <field name="tax_group_id" ref="l10n_cn_tax_group_vat_13"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -209,6 +281,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="price_include" eval="0"/>
+        <field name="sequence">10</field>
         <field name="tax_group_id" ref="l10n_cn_tax_group_vat_10"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -242,6 +315,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="price_include" eval="0"/>
+        <field name="sequence">9</field>
         <field name="tax_group_id" ref="l10n_cn_tax_group_vat_9"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -275,6 +349,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="price_include" eval="0"/>
+        <field name="sequence">6</field>
         <field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_6"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -308,6 +383,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="price_include" eval="0"/>
+        <field name="sequence">3</field>
         <field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_3"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -342,6 +418,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="price_include" eval="0"/>
+        <field name="sequence">13</field>
         <field name="tax_group_id" ref="l10n_cn_tax_group_vat_13"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -375,6 +452,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="price_include" eval="0"/>
+        <field name="sequence">10</field>
         <field name="tax_group_id" ref="l10n_cn_tax_group_vat_10"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -408,6 +486,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="price_include" eval="0"/>
+        <field name="sequence">9</field>
         <field name="tax_group_id" ref="l10n_cn_tax_group_vat_9"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -441,6 +520,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="price_include" eval="0"/>
+        <field name="sequence">6</field>
         <field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_6"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -474,6 +554,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="price_include" eval="0"/>
+        <field name="sequence">3</field>
         <field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_3"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {

l10n_cn_standard_latest/models/__init__.py

@@ -2,6 +2,7 @@
 
 from . import account_account_template
 from . import account_account
+from . import account_tax_group
 from . import account_chart_template
 from . import account_journal
 from . import res_currency

l10n_cn_standard_latest/models/account_tax_group.py

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models, _, tools
+
+class AccountTaxGroup(models.Model):
+    _inherit = 'account.tax.group'
+
+    active = fields.Boolean(default=True, help="Set active to false to hide the tax without removing it.")
+