From 3cca08716898decc34adbf33cfa9af77404c6501 Mon Sep 17 00:00:00 2001 From: ivan deng Date: Mon, 6 Feb 2023 15:09:33 +0800 Subject: [PATCH] update odoo customize --- app_odoo_customize/__manifest__.py | 6 +- app_odoo_customize/i18n/zh_CN.po | 90 ++++++++++++------- .../models/base_language_install.py | 10 --- app_odoo_customize/models/ir_module_module.py | 30 +++++-- .../static/description/index.html | 5 +- app_odoo_customize/static/src/js/ribbon.js | 7 +- .../static/src/scss/ribbon.scss | 7 ++ .../views/app_theme_config_settings_views.xml | 67 ++++---------- app_odoo_customize/views/ir_views.xml | 5 +- 9 files changed, 112 insertions(+), 115 deletions(-) diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py index dd1df7a6..cbccf28c 100644 --- a/app_odoo_customize/__manifest__.py +++ b/app_odoo_customize/__manifest__.py @@ -23,7 +23,7 @@ { 'name': 'odoo 16 Customize OEM(Boost, Data reset)', - 'version': '16.22.12.29', + 'version': '16.23.02.06', 'author': 'Sunpop.cn', 'category': 'Productivity', 'website': 'https://www.sunpop.cn', @@ -73,7 +73,7 @@ 'app_odoo_customize/static/src/scss/dialog.scss', 'app_odoo_customize/static/src/js/app_window_title.js', 'app_odoo_customize/static/src/js/user_menu.js', - # 'app_odoo_customize/static/src/js/ribbon.js', + 'app_odoo_customize/static/src/js/ribbon.js', 'app_odoo_customize/static/src/js/dialog.js', ], }, @@ -135,7 +135,7 @@ The user can get the help document just by one click. ## 在符合odoo开源协议的前提下，去除odoo版权信息，自定义你的odoo 可完全自行设置下列 odoo 选项，让 odoo 看上去像是你的软件产品 - 支持odoo 15,14,13,12, 11, 10, 9 版本，社区版企业版通用 + 支持odoo 16,15,14,13,12, 11, 10, 9 版本，社区版企业版通用 1. 删除菜单导航页脚的 Odoo 标签 2. 将弹出窗口中 "Odoo" 设置为自定义名称 3. 自定义用户菜单中的 Documentation, Support, About 的链接 diff --git a/app_odoo_customize/i18n/zh_CN.po b/app_odoo_customize/i18n/zh_CN.po index dbf1907f..ed915740 100644 --- a/app_odoo_customize/i18n/zh_CN.po +++ b/app_odoo_customize/i18n/zh_CN.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0+e-20200628\n" +"Project-Id-Version: Odoo Server 16.0-20221228\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-02 08:16+0000\n" -"PO-Revision-Date: 2020-11-02 08:16+0000\n" +"POT-Creation-Date: 2023-02-06 06:40+0000\n" +"PO-Revision-Date: 2023-02-06 06:40+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ msgstr "" "Plural-Forms: \n" #. module: app_odoo_customize -#. openerp-web +#. odoo-javascript #: code:addons/app_odoo_customize/static/src/xml/res_config_edition.xml:0 #, python-format msgid "(Sunpop.cn Professional Edition)" @@ -26,15 +26,13 @@ msgstr "(Sunpop.cn 专业版)" #: model_terms:ir.ui.view,arch_db:app_odoo_customize.view_app_theme_config_settings msgid "" "\n" -" Accounting \n" +" Accounting\n" " " msgstr "" "\n" -" 财务 \n" +" 财务\n" " " - - #. module: app_odoo_customize #: model_terms:ir.ui.view,arch_db:app_odoo_customize.view_app_theme_config_settings msgid "All Business" @@ -96,14 +94,22 @@ msgid "Set to False to hide" msgstr "设置为 False 则不显示" #. module: app_odoo_customize -#. openerp-web +#. odoo-javascript +#: code:addons/app_odoo_customize/static/src/js/user_menu.js:0 +#, python-format +msgid "Activate Assets Debugging" +msgstr "激活开发者模式 (assets)" + +#. module: app_odoo_customize +#. odoo-javascript +#: code:addons/app_odoo_customize/static/src/js/user_menu.js:0 #: code:addons/app_odoo_customize/static/src/xml/customize_user_menu.xml:0 #, python-format msgid "Activate the developer mode" msgstr "激活开发者模式" #. module: app_odoo_customize -#. openerp-web +#. odoo-javascript #: code:addons/app_odoo_customize/static/src/xml/customize_user_menu.xml:0 #, python-format msgid "Activate the developer mode (with assets)" @@ -151,7 +157,7 @@ msgid "Data Cleaning (Be careful to do that!)" msgstr "数据清理（请谨慎操作！）" #. module: app_odoo_customize -#. openerp-web +#. odoo-javascript #: code:addons/app_odoo_customize/static/src/xml/customize_user_menu.xml:0 #, python-format msgid "Deactivate the developer mode" @@ -250,16 +256,18 @@ msgid "Developer Documentation Url" msgstr "开发者手册链接" #. module: app_odoo_customize -#. openerp-web +#. odoo-javascript #: code:addons/app_odoo_customize/static/src/xml/customize_user_menu.xml:0 #, python-format msgid "Developer Manual" msgstr "开发者手册" #. module: app_odoo_customize -#: model:ir.model.fields,field_description:app_odoo_customize.field_web_environment_ribbon_backend__display_name -msgid "Display Name" -msgstr "显示名称" +#. odoo-javascript +#: code:addons/app_odoo_customize/static/src/js/user_menu.js:0 +#, python-format +msgid "Documentation" +msgstr "支持文档" #. module: app_odoo_customize #: model:ir.model.fields,field_description:app_odoo_customize.field_res_config_settings__app_documentation_url @@ -273,19 +281,21 @@ msgid "Export Translation" msgstr "导出翻译" #. module: app_odoo_customize -#: model:ir.model.fields,field_description:app_odoo_customize.field_web_environment_ribbon_backend__id -msgid "ID" -msgstr "" +#: model:ir.model,name:app_odoo_customize.model_ir_http +msgid "HTTP Routing" +msgstr "HTTP 路由" #. module: app_odoo_customize #: model:ir.model,name:app_odoo_customize.model_base_language_install msgid "Install Language" -msgstr "安装语言" +msgstr "" #. module: app_odoo_customize -#: model:ir.model.fields,field_description:app_odoo_customize.field_web_environment_ribbon_backend____last_update -msgid "Last Modified on" -msgstr "" +#. odoo-javascript +#: code:addons/app_odoo_customize/static/src/js/user_menu.js:0 +#, python-format +msgid "Leave the Developer Tools" +msgstr "离开开发者模式" #. module: app_odoo_customize #: model:ir.ui.menu,name:app_odoo_customize.menu_app_demo_data @@ -313,6 +323,16 @@ msgstr "我的帐户显示标题" msgid "My Odoo.com Account Url" msgstr "我的帐户链接" +#. module: app_odoo_customize +#: model_terms:ir.ui.view,arch_db:app_odoo_customize.app_view_model_data_search +msgid "No Updatable" +msgstr "无需更新" + +#. module: app_odoo_customize +#: model_terms:ir.ui.view,arch_db:app_odoo_customize.view_app_theme_config_settings +msgid "Odoo Customize Setting" +msgstr "odoo自定义设置" + #. module: app_odoo_customize #: model_terms:ir.ui.view,arch_db:app_odoo_customize.view_app_theme_config_settings msgid "Please confirm to delete the select data?" @@ -334,6 +354,11 @@ msgstr "刷新翻译" msgid "Reset Category And Location Complete Name" msgstr "重置品类及区位显示名" +#. module: app_odoo_customize +#: model:ir.ui.menu,name:app_odoo_customize.menu_ir_cron +msgid "Scheduled Actions" +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" @@ -405,6 +430,13 @@ msgstr "显示分享Odoo" msgid "Show Support" msgstr "显示支持" +#. module: app_odoo_customize +#. odoo-javascript +#: code:addons/app_odoo_customize/static/src/js/user_menu.js:0 +#, python-format +msgid "Support" +msgstr "技术支持" + #. module: app_odoo_customize #: model:ir.model.fields,field_description:app_odoo_customize.field_res_config_settings__app_support_url msgid "Support Url" @@ -471,11 +503,6 @@ msgstr "用户菜单" msgid "User Menu Content" msgstr "菜单项具体操作设置" -#. module: app_odoo_customize -#: model:ir.model,name:app_odoo_customize.model_ir_ui_view -msgid "View" -msgstr "视图" - #. module: app_odoo_customize #: model_terms:ir.ui.view,arch_db:app_odoo_customize.view_app_theme_config_settings msgid "Visit our website for more apps and Support. https://www.sunpop.cn" @@ -517,17 +544,12 @@ msgid "When enable,everyone login can see the debug menu" msgstr "启用后，会显示快速调试菜单" #. module: app_odoo_customize -#: model_terms:ir.ui.view,arch_db:app_odoo_customize.view_app_theme_config_settings -msgid "White Label Setting" -msgstr "个性化odoo设置" - -#. module: app_odoo_customize -#. openerp-web +#. odoo-javascript #: code:addons/app_odoo_customize/static/src/xml/res_config_edition.xml:0 #: 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/base_language_install.py b/app_odoo_customize/models/base_language_install.py index 1edd0381..a163a6ed 100644 --- a/app_odoo_customize/models/base_language_install.py +++ b/app_odoo_customize/models/base_language_install.py @@ -6,13 +6,3 @@ from odoo import api, fields, models, _ class BaseLanguageInstall(models.TransientModel): _inherit = "base.language.install" - - def lang_install(self): - self.ensure_one() - if self.overwrite: - self.env.cr.execute(""" - delete from ir_translation - where lang=%s - """, (self.lang,)) - self.env.cr.commit() - return super(BaseLanguageInstall, self).lang_install() diff --git a/app_odoo_customize/models/ir_module_module.py b/app_odoo_customize/models/ir_module_module.py index e8028b2b..6d813470 100644 --- a/app_odoo_customize/models/ir_module_module.py +++ b/app_odoo_customize/models/ir_module_module.py @@ -27,16 +27,30 @@ class IrModule(models.Model): # 更新翻译，当前语言 def module_multi_refresh_po(self): lang = self.env.user.lang - modules = self.browse(self.env.context.get('active_ids')) + modules = self.filtered(lambda r: r.state == 'installed') # 先清理, odoo原生经常清理不干净 - for rec in modules: - translate = self.env['ir.translation'].search([ - ('lang', '=', lang), - ('module', '=', rec.name) - ]) - translate.sudo().unlink() + # odoo 16中，不再使用 ir.translation，直接使用json字段 + # for rec in modules: + # translate = self.env['ir.translation'].search([ + # ('lang', '=', lang), + # ('module', '=', rec.name) + # ]) + # translate.sudo().unlink() # 再重载 - self.sudo().with_context(overwrite=True)._update_translations(lang) + modules._update_translations(filter_lang=lang, overwrite=True) + # odoo 16翻译模式改变，仍需更新模块 + return { + 'type': 'ir.actions.client', + 'tag': 'display_notification', + 'target': 'new', + 'params': { + 'message': _("The languages that you selected have been successfully update.\ + You still need to Upgrade the apps to make it worked."), + 'type': 'success', + 'sticky': False, + 'next': {'type': 'ir.actions.act_window_close'}, + } + } def button_get_po(self): self.ensure_one() diff --git a/app_odoo_customize/static/description/index.html b/app_odoo_customize/static/description/index.html index 40150bff..bea7fe99 100644 --- a/app_odoo_customize/static/description/index.html +++ b/app_odoo_customize/static/description/index.html @@ -32,7 +32,7 @@

This moduld allows user to quickly customize and debranding Odoo. Quick debug, Language Switcher, Online Documentation Access,Quick Data Clear.

-

Support odoo 15,14,13, 12, 11, 10, 9. Including community and enterprise version.

+

Support odoo 16,15,14,13, 12, 11, 10, 9. Including community and enterprise version.

If you want to change the login page.

@@ -47,6 +47,9 @@

This is a Long Term Support Apps.

+

Update: v16.23.02.06

+

Fix odoo ribbon.

+

Fix odoo translate update.

Update: v16.22.10.21

Add odoo16 support.

Update: v15.21.10.21

diff --git a/app_odoo_customize/static/src/js/ribbon.js b/app_odoo_customize/static/src/js/ribbon.js index 187b3044..67a45712 100644 --- a/app_odoo_customize/static/src/js/ribbon.js +++ b/app_odoo_customize/static/src/js/ribbon.js @@ -5,9 +5,8 @@ Copyright 2017 Xavier Jiménez License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */ -odoo.define("web_environment_ribbon.ribbon", function(require) { +odoo.define("web_environment_ribbon.ribbon", function (require) { "use strict"; - var rpc = require("web.rpc"); var core = require("web.core"); @@ -33,7 +32,7 @@ odoo.define("web_environment_ribbon.ribbon", function(require) { return image.style.color !== "rgb(255, 255, 255)"; } - core.bus.on("web_client_ready", null, function() { + core.bus.on("web_client_ready", null, function () { var ribbon = $(' -
-
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
+ + + + + + + + + + + + + + +
- Accounting + Accounting