diff --git a/app_odoo_customize/models/res_config_settings.py b/app_odoo_customize/models/res_config_settings.py
index 18619df4..dd9a4e0c 100644
--- a/app_odoo_customize/models/res_config_settings.py
+++ b/app_odoo_customize/models/res_config_settings.py
@@ -127,9 +127,9 @@ class ResConfigSettings(models.TransientModel):
sql = "delete from %s" % t_name
try:
self._cr.execute(sql)
+ self._cr.commit()
except Exception as e:
_logger.error('remove data error: %s,%s', line, e)
- self._cr.commit()
# 更新序号
for line in s:
domain = [('code', '=ilike', line + '%')]
@@ -354,7 +354,14 @@ class ResConfigSettings(models.TransientModel):
self._cr.execute(sql2)
self._cr.commit()
except Exception as e:
- pass # raise Warning(e)
+ pass
+ try:
+ # 增加对 pos的处理
+ sql = ("update pos_config set journal_id=NULL;")
+ self._cr.execute(sql)
+ self._cr.commit()
+ except Exception as e:
+ pass
try:
rec = self.env['res.partner'].search([])
for r in rec:
@@ -376,7 +383,7 @@ class ResConfigSettings(models.TransientModel):
'property_stock_valuation_account_id': None,
})
except Exception as e:
- pass # raise Warning(e)
+ pass
try:
rec = self.env['stock.location'].search([])
for r in rec:
@@ -385,7 +392,7 @@ class ResConfigSettings(models.TransientModel):
'valuation_out_account_id': None,
})
except Exception as e:
- pass # raise Warning(e)
+ pass
seqs = []
return 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 19257190..5a026589 100644
--- a/l10n_cn_standard_latest/data/account_chart_template_data.xml
+++ b/l10n_cn_standard_latest/data/account_chart_template_data.xml
@@ -11,8 +11,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 21ea90d4..4e4c5e3b 100644
--- a/l10n_cn_standard_latest/data/account_tax_template_data.xml
+++ b/l10n_cn_standard_latest/data/account_tax_template_data.xml
@@ -199,39 +199,7 @@
]"/>
-
-
- 3%销项税(含)
- 增值税销项税3%,单价含税
- 3
- percent
- sale
-
-
-
-
-
-
+
13%销项税
@@ -364,39 +332,6 @@
]"/>
-
-
- 3%销项税
- 增值税销项税3%,单价不含税
- 3
- percent
- sale
-
-
-
-
-
-
@@ -530,36 +465,4 @@
]"/>
-
-
- 3%进项税
- 增值税进项税3%,单价不含税
- 3
- percent
- purchase
-
-
-
-
-
diff --git a/l10n_cn_standard_latest/data/chart_data.xml b/l10n_cn_standard_latest/data/chart_data.xml
index 4c9b9207..6523a8e0 100644
--- a/l10n_cn_standard_latest/data/chart_data.xml
+++ b/l10n_cn_standard_latest/data/chart_data.xml
@@ -4,7 +4,7 @@
- 2020中国企业会计科目表
+ 2021中国企业会计科目表-odoo14
1001
diff --git a/l10n_cn_standard_latest/hooks.py b/l10n_cn_standard_latest/hooks.py
index 6a2c4e6b..6d4a35f1 100644
--- a/l10n_cn_standard_latest/hooks.py
+++ b/l10n_cn_standard_latest/hooks.py
@@ -29,11 +29,11 @@ def post_init_hook(cr, registry):
数据初始化,只在安装后执行,更新时不执行
此处不执行,只是记录,该数据已处理完成
"""
- cr.execute("UPDATE account_account_template set group_id = "
- "(select id from account_group where account_group.code_prefix=trim(substring(account_account_template.code from 1 for 1)) limit 1);")
+ # cr.execute("UPDATE account_account_template set group_id = "
+ # "(select id from account_group where account_group.code_prefix_start=trim(substring(account_account_template.code from 1 for 1)) limit 1);")
cr.execute("UPDATE account_account set group_id = "
- "(select id from account_group where account_group.code_prefix=trim(substring(account_account.code from 1 for 1)) limit 1);")
+ "(select id from account_group where account_group.code_prefix_start=trim(substring(account_account.code from 1 for 1)) limit 1);")
cr.commit()
pass