From 1be861dcc22baa93adb605babc2050e0363785cc Mon Sep 17 00:00:00 2001 From: Ivan Office Date: Tue, 10 Sep 2024 04:49:57 +0800 Subject: [PATCH] =?UTF-8?q?fix=20misc=20=E4=BC=9A=E8=AE=A1=E7=A7=91?= =?UTF-8?q?=E7=9B=AE=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_odoo_customize/__manifest__.py | 2 +- .../models/res_config_settings.py | 31 +++++++++++++++++-- .../data/account_chart_template_data.xml | 6 ++-- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py index 392b8c1d..79783f22 100644 --- a/app_odoo_customize/__manifest__.py +++ b/app_odoo_customize/__manifest__.py @@ -23,7 +23,7 @@ { 'name': 'odoo Tweak,Ai Employee,Boost,Customize All in One. Customize,UI,Boost,Security,Data', - 'version': '16.24.08.20', + 'version': '16.24.09.10', 'author': 'odooai.cn', 'category': 'Extra Tools', 'website': 'https://www.odooai.cn', diff --git a/app_odoo_customize/models/res_config_settings.py b/app_odoo_customize/models/res_config_settings.py index 616ee87a..5c4f0b13 100644 --- a/app_odoo_customize/models/res_config_settings.py +++ b/app_odoo_customize/models/res_config_settings.py @@ -323,6 +323,7 @@ class ResConfigSettings(models.TransientModel): 'account.tax', # 'wizard_multi_charts_accounts', 'account.account', + # 'account.journal', ] # todo: 要做 remove_hr，因为工资表会用到 account # 更新account关联，很多是多公司字段，故只存在 ir_property，故在原模型，只能用update @@ -381,7 +382,6 @@ class ResConfigSettings(models.TransientModel): pass # 日记账处理 try: - #todo: 当前有些日记账的默认值要在 ir.property 处理 _set_default，比较麻烦，先修改下该日记账 code，创建新日记账后删除旧的即可 rec = self.env['account.journal'].search([]) rec.write({ 'account_control_ids': None, @@ -391,6 +391,7 @@ class ResConfigSettings(models.TransientModel): 'profit_account_id': None, 'suspense_account_id': None, }) + self._cr.commit() except Exception as e: pass # raise Warning(e) @@ -403,9 +404,35 @@ class ResConfigSettings(models.TransientModel): }) except Exception as e: pass # raise Warning(e) + # 库存计价默认值处理 + try: + # 当前有些日记账的默认值要在 ir.property 处理 _set_default，比较麻烦 + todo_list = [ + 'property_stock_account_input_categ_id', + 'property_stock_account_output_categ_id', + 'property_stock_valuation_account_id', + 'property_stock_journal', + ] + for name in todo_list: + field_id = self.env['ir.model.fields']._get('product.category', name).id + prop = self.env['ir.property'].sudo().search([ + ('fields_id', '=', field_id), + ]) + if prop: + prop.unlink() + except Exception as e: + pass # raise Warning(e) + # 先 unlink 处理 + j_ids = self.env['account.journal'].sudo().search([]) + if j_ids: + try: + j_ids.unlink() + except Exception as e: + pass # raise Warning(e) + self._cr.commit() seqs = [] - self.env.company.write({ + self.env.company.sudo().write({ 'chart_template_id': False, }) res = self._remove_app_data(to_removes, seqs) 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 e81544e4..a66518ed 100644 --- a/l10n_cn_standard_latest/data/account_chart_template_data.xml +++ b/l10n_cn_standard_latest/data/account_chart_template_data.xml @@ -14,8 +14,8 @@ - - - + + +