diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py index 49a941e2..cb9f1666 100644 --- a/app_odoo_customize/__manifest__.py +++ b/app_odoo_customize/__manifest__.py @@ -23,7 +23,7 @@ { 'name': 'Customize odoo OEM (Boost, My Odoo)', - 'version': '13.20.03.01', + 'version': '13.20.03.05', 'author': 'Sunpop.cn', 'category': 'Productivity', 'website': 'https://www.sunpop.cn', diff --git a/app_odoo_customize/models/res_config_settings.py b/app_odoo_customize/models/res_config_settings.py index af8a98ad..cc77ec8c 100644 --- a/app_odoo_customize/models/res_config_settings.py +++ b/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) diff --git a/app_odoo_customize/views/ir_module_module_views.xml b/app_odoo_customize/views/ir_module_module_views.xml index 3f91b329..9e52fe24 100644 --- a/app_odoo_customize/views/ir_module_module_views.xml +++ b/app_odoo_customize/views/ir_module_module_views.xml @@ -61,4 +61,8 @@ + + + {'search_default_is_local_updatable':1} + diff --git a/l10n_cn_standard_latest/__manifest__.py b/l10n_cn_standard_latest/__manifest__.py index 2354d263..4f9e4031 100644 --- a/l10n_cn_standard_latest/__manifest__.py +++ b/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', diff --git a/l10n_cn_standard_latest/data/account_account_tag_data.xml b/l10n_cn_standard_latest/data/account_account_tag_data.xml index e9e8b543..3d6319bd 100644 --- a/l10n_cn_standard_latest/data/account_account_tag_data.xml +++ b/l10n_cn_standard_latest/data/account_account_tag_data.xml @@ -3,6 +3,14 @@ + + 不计销项税 + taxes + + + 不计进项税 + taxes + 增值税13%销项税 taxes diff --git a/l10n_cn_standard_latest/data/account_tax_group_data.xml b/l10n_cn_standard_latest/data/account_tax_group_data.xml index 12a10aea..a7656736 100644 --- a/l10n_cn_standard_latest/data/account_tax_group_data.xml +++ b/l10n_cn_standard_latest/data/account_tax_group_data.xml @@ -1,12 +1,15 @@ - - VAT 13% - - - VAT 10% + + VAT 0% VAT 9% + + VAT 10% + + + VAT 13% + diff --git a/l10n_cn_standard_latest/data/account_tax_template_data.xml b/l10n_cn_standard_latest/data/account_tax_template_data.xml index f97910c6..d124f22d 100644 --- a/l10n_cn_standard_latest/data/account_tax_template_data.xml +++ b/l10n_cn_standard_latest/data/account_tax_template_data.xml @@ -1,5 +1,72 @@ + + + + 0%销项税 + 增值税销项税0% + 0 + percent + sale + + 0 + + + + + + + 0%进项税 + 增值税进项税0% + 0 + percent + purchase + + 0 + + + + @@ -10,6 +77,7 @@ percent sale + 13 percent sale + 10 percent sale + 9 percent sale + 6 percent sale + 3 - - + 13%销项税 @@ -176,6 +247,7 @@ percent sale + 13 percent sale + 10 percent sale + 9 percent sale + 6 percent sale + 3 percent purchase + 13 percent purchase + 10 percent purchase + 9 percent purchase + 6 percent purchase + 3