From fbb1ad3960173d0d6d66efe4043609fba723a18b Mon Sep 17 00:00:00 2001 From: ivan deng Date: Mon, 11 May 2020 00:08:35 +0800 Subject: [PATCH] opt chinese --- app_base_chinese/__manifest__.py | 2 +- app_base_chinese/hooks.py | 19 +++++++++--------- app_odoo_customize/__manifest__.py | 4 +++- app_odoo_customize/i18n/zh_CN.po | 13 ++++++++---- .../models/res_config_settings.py | 20 +++++++++++++++++++ .../views/app_theme_config_settings_views.xml | 2 ++ 6 files changed, 45 insertions(+), 15 deletions(-) diff --git a/app_base_chinese/__manifest__.py b/app_base_chinese/__manifest__.py index 30ac1b98..258f66ca 100644 --- a/app_base_chinese/__manifest__.py +++ b/app_base_chinese/__manifest__.py @@ -18,7 +18,7 @@ { 'name': "App base chinese，中国化基本模块增强", - 'version': '13.20.04.13', + 'version': '13.20.05.11', 'author': 'Sunpop.cn', 'category': 'Base', 'website': 'https://www.sunpop.cn', diff --git a/app_base_chinese/hooks.py b/app_base_chinese/hooks.py index a4fe4c6c..519e6004 100644 --- a/app_base_chinese/hooks.py +++ b/app_base_chinese/hooks.py @@ -32,17 +32,18 @@ def post_init_hook(cr, registry): try: env = api.Environment(cr, SUPERUSER_ID, {}) ids = env['product.category'].sudo().with_context(lang='zh_CN').search([ - ('parent_id', '=', False) - ]) - ids._compute_complete_name() + ('parent_id', '!=', False) + ], order='complete_name') + for rec in ids: + rec._compute_complete_name() ids = env['stock.location'].sudo().with_context(lang='zh_CN').search([ - ('location_id', '=', False) - ]) - ids._compute_complete_name() + ('location_id', '!=', False), + ('usage', '!=', 'views'), + ], order='complete_name') + for rec in ids: + rec._compute_complete_name() # 超级用户改时区为中国 - ids = env['res.users'].sudo().with_context(lang='zh_CN').search([ - ('id', '=', 2) - ]) + ids = env['res.users'].sudo().with_context(lang='zh_CN').browse([1, 2]) ids.write({'tz': "Asia/Shanghai"}) except Exception as e: raise Warning(e) diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py index 28fb5038..580f3a6b 100644 --- a/app_odoo_customize/__manifest__.py +++ b/app_odoo_customize/__manifest__.py @@ -23,7 +23,7 @@ { 'name': 'Customize odoo OEM (Boost, My Odoo)', - 'version': '13.20.04.12', + 'version': '13.20.05.10', 'author': 'Sunpop.cn', 'category': 'Productivity', 'website': 'https://www.sunpop.cn', @@ -72,6 +72,7 @@ 29. Apps version compare. Add Install version in App list. Add Local updatable filter in app list. 30. 1 key export app translate file like .po file. 31. Show or hide odoo Referral in the top menu. + 32. Fix odoo bug of complete name bug of product category and stock location.. This module can help to white label the Odoo. Also helpful for training and support for your odoo end-user. @@ -110,6 +111,7 @@ 29. App版本比较，快速查看可本地更新的模块 30. 一键导出翻译文件 po 31. 显示或去除 odoo 推荐 + 32. 增加修复品类及区位名的操作 """, 'images': ['static/description/banner.gif'], 'depends': [ diff --git a/app_odoo_customize/i18n/zh_CN.po b/app_odoo_customize/i18n/zh_CN.po index 799c15b8..a7a516fc 100644 --- a/app_odoo_customize/i18n/zh_CN.po +++ b/app_odoo_customize/i18n/zh_CN.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 13.0+e\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-12 10:21+0000\n" -"PO-Revision-Date: 2020-04-12 10:21+0000\n" +"POT-Creation-Date: 2020-05-10 15:54+0000\n" +"PO-Revision-Date: 2020-05-10 15:54+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" #: code:addons/app_odoo_customize/static/src/xml/res_config_edition.xml:0 #, python-format msgid "(Sunpop.cn Professional Edition)" -msgstr "" +msgstr "(Sunpop.cn 专业版)" #. module: app_odoo_customize #: model_terms:ir.ui.view,arch_db:app_odoo_customize.view_app_theme_config_settings @@ -280,6 +280,11 @@ msgstr "您确认要删除指定数据？" msgid "Powered by odooApp" msgstr "Powered by Sunpop.cn" +#. module: app_odoo_customize +#: model_terms:ir.ui.view,arch_db:app_odoo_customize.view_app_theme_config_settings +msgid "Reset Category And Location Complete Name" +msgstr "重置品类及区位显示名" + #. module: app_odoo_customize #: model:ir.model.fields,help:app_odoo_customize.field_res_config_settings__app_system_name msgid "Setup System Name,which replace Odoo" @@ -463,7 +468,7 @@ msgstr "个性化odoo设置" #: model:ir.ui.menu,name:app_odoo_customize.menu_app_group #, python-format msgid "odooApp" -msgstr "" +msgstr "odooApp" #. module: app_odoo_customize #: model_terms:ir.ui.view,arch_db:app_odoo_customize.view_app_theme_config_settings diff --git a/app_odoo_customize/models/res_config_settings.py b/app_odoo_customize/models/res_config_settings.py index ad7db050..625f49d3 100644 --- a/app_odoo_customize/models/res_config_settings.py +++ b/app_odoo_customize/models/res_config_settings.py @@ -591,3 +591,23 @@ class ResConfigSettings(models.TransientModel): self.remove_expense() self.remove_message() return True + + def reset_cat_loc_name(self): + ids = self.env['product.category'].search([ + ('parent_id', '!=', False) + ], order='complete_name') + for rec in ids: + try: + rec._compute_complete_name() + except: + pass + ids = self.env['stock.location'].search([ + ('location_id', '!=', False), + ('usage', '!=', 'views'), + ], order='complete_name') + for rec in ids: + try: + rec._compute_complete_name() + except: + pass + return True diff --git a/app_odoo_customize/views/app_theme_config_settings_views.xml b/app_odoo_customize/views/app_theme_config_settings_views.xml index 80645777..3a749e50 100644 --- a/app_odoo_customize/views/app_theme_config_settings_views.xml +++ b/app_odoo_customize/views/app_theme_config_settings_views.xml @@ -166,6 +166,8 @@ |