diff --git a/app_base_chinese/__manifest__.py b/app_base_chinese/__manifest__.py index a4cec28f..3610d9c6 100644 --- a/app_base_chinese/__manifest__.py +++ b/app_base_chinese/__manifest__.py @@ -18,7 +18,7 @@ { 'name': 'odoo中文版套件之基础,中国会计基础,Chinese Enhance All in One,', - 'version': '16.23.11.10', + 'version': '16.23.11.17', 'author': 'odooai.cn', 'category': 'Base', 'website': 'https://www.odooai.cn', diff --git a/app_base_chinese/data/product_pricelist_data.xml b/app_base_chinese/data/product_pricelist_data.xml index 37c61161..6baeabd1 100644 --- a/app_base_chinese/data/product_pricelist_data.xml +++ b/app_base_chinese/data/product_pricelist_data.xml @@ -2,8 +2,8 @@ - - - + + + diff --git a/app_base_chinese/data/res_currency_data.xml b/app_base_chinese/data/res_currency_data.xml index 5bf523dd..9e194ab8 100644 --- a/app_base_chinese/data/res_currency_data.xml +++ b/app_base_chinese/data/res_currency_data.xml @@ -2,12 +2,12 @@ - - - - - - + + + + + + 人民币 diff --git a/app_base_chinese/hooks.py b/app_base_chinese/hooks.py index bacb9a69..ea13386d 100644 --- a/app_base_chinese/hooks.py +++ b/app_base_chinese/hooks.py @@ -31,7 +31,7 @@ def post_init_hook(cr, registry): 数据初始化,只在安装后执行,更新时不执行 """ try: - env = api.Environment(cr, SUPERUSER_ID, {}) + env = api.Environment(cr, SUPERUSER_ID, {'active_test': False}) ids = env['product.category'].sudo().with_context(lang='zh_CN').search([ ('parent_id', '!=', False) ], order='parent_path') @@ -43,9 +43,24 @@ def post_init_hook(cr, registry): ], order='parent_path') for rec in ids: rec._compute_complete_name() - # 超级用户改时区为中国 - ids = env['res.users'].sudo().with_context(lang='zh_CN').browse([1, 2]) - ids.write({'tz': "Etc/GMT-8"}) + # 超级用户及模板用户改时区为中国 + ids = env['res.users'].sudo().with_context(lang='zh_CN').browse([1,2,3,4,5]) + # rec_extra = env.ref('base.template_portal_user_id') + # if rec_extra: + # ids += rec_extra + ids.write({ + 'tz': "Etc/GMT-8", + 'lang': "zh_CN", + }) + # 公司价格改人民币 + env = api.Environment(cr, SUPERUSER_ID, {'active_test': True}) + ids = env['res.company'].sudo().search([], limit=1) + if ids: + ids.write({'currency_id': env.ref('base.CNY').id}) + # 价格表改人民币 + ids = env['product.pricelist'].sudo().search([], limit=1) + if ids: + ids.write({'currency_id': env.ref('base.CNY').id}) except Exception as e: raise Warning(e)