diff --git a/app_base_chinese/__init__.py b/app_base_chinese/__init__.py index 0190a7f5..63a26a5a 100644 --- a/app_base_chinese/__init__.py +++ b/app_base_chinese/__init__.py @@ -5,4 +5,4 @@ from .hooks import post_init_hook from . import controllers from . import models from . import ir -from . import res \ No newline at end of file +from . import res diff --git a/app_base_chinese/__manifest__.py b/app_base_chinese/__manifest__.py index 75d056ab..b595e53a 100644 --- a/app_base_chinese/__manifest__.py +++ b/app_base_chinese/__manifest__.py @@ -77,6 +77,7 @@ 'depends': [ 'base_address_extended', 'account', + 'l10n_multilang', 'sales_team', 'sale', 'stock', 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_company_data.xml b/app_base_chinese/data/res_company_data.xml index fc3f7dea..239ab259 100644 --- a/app_base_chinese/data/res_company_data.xml +++ b/app_base_chinese/data/res_company_data.xml @@ -1,8 +1,8 @@ - - - + + + diff --git a/app_base_chinese/data/res_currency_data.xml b/app_base_chinese/data/res_currency_data.xml index d80d7862..d6def48b 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..7c2bdf21 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') @@ -46,6 +46,14 @@ def post_init_hook(cr, registry): # 超级用户改时区为中国 ids = env['res.users'].sudo().with_context(lang='zh_CN').browse([1, 2]) ids.write({'tz': "Etc/GMT-8"}) + # 公司价格改人民币 + 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) diff --git a/app_base_chinese/views/ir_module_module_views.xml b/app_base_chinese/views/ir_module_module_views.xml index 264b81fa..26f0d475 100644 --- a/app_base_chinese/views/ir_module_module_views.xml +++ b/app_base_chinese/views/ir_module_module_views.xml @@ -6,7 +6,7 @@ - + diff --git a/l10n_cn_standard_latest/__manifest__.py b/l10n_cn_standard_latest/__manifest__.py index 1f8afe56..c193ab09 100644 --- a/l10n_cn_standard_latest/__manifest__.py +++ b/l10n_cn_standard_latest/__manifest__.py @@ -47,7 +47,9 @@ * 税金模板 """, 'depends': [ + 'base', 'account', + 'l10n_multilang', 'app_odoo_customize', ], 'images': ['static/description/banner.png'],