From da2c10ced2e42c8409690ff8d45a3516a3ce7456 Mon Sep 17 00:00:00 2001 From: Ivan Office Date: Wed, 11 Sep 2024 19:47:04 +0800 Subject: [PATCH] =?UTF-8?q?fix=20misc=EF=BC=8C=E4=B8=BB=E8=A6=81=E6=98=AF?= =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/res_config_settings.py | 24 +++++++---- l10n_cn_standard_latest/__manifest__.py | 3 +- .../data/account.account.template.csv | 4 +- .../data/account_chart_template_data.xml | 41 +++++++++++-------- .../account_chart_template_try_loading.xml | 8 ++++ .../data/account_tax_template_data.xml | 4 +- l10n_cn_standard_latest/data/chart_data.xml | 22 +++++----- 7 files changed, 64 insertions(+), 42 deletions(-) create mode 100644 l10n_cn_standard_latest/data/account_chart_template_try_loading.xml diff --git a/app_odoo_customize/models/res_config_settings.py b/app_odoo_customize/models/res_config_settings.py index 5c4f0b13..5c2e5d6f 100644 --- a/app_odoo_customize/models/res_config_settings.py +++ b/app_odoo_customize/models/res_config_settings.py @@ -313,14 +313,17 @@ class ResConfigSettings(models.TransientModel): company_id = self.env.company.id self = self.with_company(self.env.company) to_removes = [ - # 清除财务科目，用于重设 + # 清除财务科目，用于重设。有些是企业版的也处理下 'account.reconcile.model', + 'account.transfer.model.line', + 'account.transfer.model', 'res.partner.bank', # 'account.invoice', 'account.payment', 'account.bank.statement', # 'account.tax.account.tag', 'account.tax', + 'account.tax.template', # 'wizard_multi_charts_accounts', 'account.account', # 'account.journal', @@ -336,7 +339,6 @@ class ResConfigSettings(models.TransientModel): sql2 = "update account_journal set bank_account_id=NULL where company_id=%d;" % company_id self._cr.execute(sql) self._cr.execute(sql2) - self._cr.commit() except Exception as e: _logger.error('remove data error: %s,%s', 'account_chart: set tax and account_journal', e) @@ -354,6 +356,7 @@ class ResConfigSettings(models.TransientModel): 'property_account_receivable_id': None, 'property_account_payable_id': None, }) + self._cr.commit() except Exception as e: _logger.error('remove data error: %s,%s', 'account_chart', e) # 品类处理 @@ -368,6 +371,7 @@ class ResConfigSettings(models.TransientModel): 'property_stock_valuation_account_id': None, 'property_stock_journal': None, }) + self._cr.commit() except Exception as e: pass # 产品处理 @@ -378,6 +382,7 @@ class ResConfigSettings(models.TransientModel): 'property_account_expense_id': None, 'property_account_creditor_price_difference': None, }) + self._cr.commit() except Exception as e: pass # 日记账处理 @@ -402,6 +407,7 @@ class ResConfigSettings(models.TransientModel): 'valuation_in_account_id': None, 'valuation_out_account_id': None, }) + self._cr.commit() except Exception as e: pass # raise Warning(e) # 库存计价默认值处理 @@ -420,6 +426,7 @@ class ResConfigSettings(models.TransientModel): ]) if prop: prop.unlink() + self._cr.commit() except Exception as e: pass # raise Warning(e) # 先 unlink 处理 @@ -427,14 +434,17 @@ class ResConfigSettings(models.TransientModel): if j_ids: try: j_ids.unlink() + self._cr.commit() except Exception as e: pass # raise Warning(e) - - self._cr.commit() + try: + c_ids = self.env['res.company'].sudo().search([]) + c_ids.sudo().write({ + 'chart_template_id': False, + }) + except Exception as e: + pass # raise Warning(e) seqs = [] - self.env.company.sudo().write({ - 'chart_template_id': False, - }) res = self._remove_app_data(to_removes, seqs) return res diff --git a/l10n_cn_standard_latest/__manifest__.py b/l10n_cn_standard_latest/__manifest__.py index 8abb9e13..1645f163 100644 --- a/l10n_cn_standard_latest/__manifest__.py +++ b/l10n_cn_standard_latest/__manifest__.py @@ -9,7 +9,7 @@ { 'name': '2023最新中国会计科目表.企业标准会计.Latest Chinese Accounting for odoo16', - 'version': '16.24.09.06', + 'version': '16.24.09.11', 'author': 'odooai.cn', 'category': 'Accounting/Localizations/Account Charts', 'website': 'https://www.odooai.cn', @@ -65,6 +65,7 @@ 'data/account_tax_group_data.xml', 'data/account_tax_template_data.xml', 'data/account_chart_template_data.xml', + 'data/account_chart_template_try_loading.xml', ], 'post_init_hook': 'post_init_hook', 'installable': True, diff --git a/l10n_cn_standard_latest/data/account.account.template.csv b/l10n_cn_standard_latest/data/account.account.template.csv index 6b1eb20b..c610c428 100644 --- a/l10n_cn_standard_latest/data/account.account.template.csv +++ b/l10n_cn_standard_latest/data/account.account.template.csv @@ -4,8 +4,8 @@ account_1002,1002,银行存款,,TRUE,asset_cash,tag21,l10n_chart_china_standard_ account_1002_01,1002.01,银行存款-人民币,account_1002,TRUE,asset_cash,,l10n_chart_china_standard_business_latest account_1002_02,1002.02,银行存款-利息,account_1002,TRUE,asset_cash,,l10n_chart_china_standard_business_latest account_1002_07,1002.07,银行暂记科目,account_1002,TRUE,asset_current,,l10n_chart_china_standard_business_latest -account_1002_08,1002.08,银行存款-预付款,account_1002,TRUE,asset_current,,l10n_chart_china_standard_business_latest -account_1002_09,1002.09,银行存款-预收款,account_1002,TRUE,asset_current,,l10n_chart_china_standard_business_latest +account_1002_08,1002.08,银行存款-未完成付款,account_1002,TRUE,asset_current,,l10n_chart_china_standard_business_latest +account_1002_09,1002.09,银行存款-未完成收款,account_1002,TRUE,asset_current,,l10n_chart_china_standard_business_latest account_1003,1003,存放中央银行款项,,TRUE,asset_current,tag21,l10n_chart_china_standard_business_latest account_1011,1011,存放同业,,FALSE,asset_current,tag21,l10n_chart_china_standard_business_latest account_1012,1012,其他货币资金,,FALSE,asset_current,,l10n_chart_china_standard_business_latest diff --git a/l10n_cn_standard_latest/data/account_chart_template_data.xml b/l10n_cn_standard_latest/data/account_chart_template_data.xml index a66518ed..36c47d56 100644 --- a/l10n_cn_standard_latest/data/account_chart_template_data.xml +++ b/l10n_cn_standard_latest/data/account_chart_template_data.xml @@ -1,21 +1,26 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/l10n_cn_standard_latest/data/account_chart_template_try_loading.xml b/l10n_cn_standard_latest/data/account_chart_template_try_loading.xml new file mode 100644 index 00000000..e884314a --- /dev/null +++ b/l10n_cn_standard_latest/data/account_chart_template_try_loading.xml @@ -0,0 +1,8 @@ + + + + + + + + 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 ab9a99bb..bc13aaec 100644 --- a/l10n_cn_standard_latest/data/account_tax_template_data.xml +++ b/l10n_cn_standard_latest/data/account_tax_template_data.xml @@ -51,7 +51,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_2221_1_5'), + 'account_id': ref('account_2221_1_1'), }), ]"/> diff --git a/l10n_cn_standard_latest/data/chart_data.xml b/l10n_cn_standard_latest/data/chart_data.xml index 790fe57e..90459cfe 100644 --- a/l10n_cn_standard_latest/data/chart_data.xml +++ b/l10n_cn_standard_latest/data/chart_data.xml @@ -1,15 +1,13 @@ - - - - - 2023中国企业会计科目表-odoo16 - - - 1001 - 1002 - 1003 - - + + + 2023中国企业会计科目表-odoo16 + + + + 1001 + 1002 + 1003 +