diff --git a/app_common/__init__.py b/app_common/__init__.py index 04a817c1..7f49029b 100644 --- a/app_common/__init__.py +++ b/app_common/__init__.py @@ -2,7 +2,6 @@ from . import controllers from . import models -from . import wizard from .hooks import pre_init_hook from .hooks import post_init_hook from .hooks import uninstall_hook diff --git a/app_common/__manifest__.py b/app_common/__manifest__.py index e1641fbc..946de0bc 100644 --- a/app_common/__manifest__.py +++ b/app_common/__manifest__.py @@ -38,8 +38,8 @@ ############################################################################## { - 'name': "odooAi Common Util and Tools,欧度智能基础核心优化", - 'version': '16.24.10.09', + 'name': "odooAi Common Util and Tools,欧度智能基础功能及面板", + 'version': '16.24.11.08', 'author': 'odooai.cn', 'category': 'Extra tools', 'website': 'https://www.odooai.cn', @@ -51,7 +51,7 @@ 'images': ['static/description/banner.png'], 'summary': ''' Core for common use for odooai.cn apps. - 基础核心,必须没有要被依赖字段及视图等,实现auto_install + 基础核心及云面板,必须没有要被依赖字段及视图等,实现auto_install ''', 'description': ''' need to setup odoo.conf, add follow: @@ -66,8 +66,8 @@ 8. Boost for less no use mail 9. Customize .rng file 10. Misc like get distance between two points - 11. Multi-language Support. Multi-Company Support - 12. Support Odoo 17,16,15,14,13,12, Enterprise and Community and odoo.sh Edition. + 11. Multi-language Support. Multi-Company Support. + 12. Support Odoo 18,17,16,15,14,13,12, Enterprise and Community and odoo.sh Edition. 13. Full Open Source. ========== 1. @@ -78,11 +78,12 @@ ''', 'depends': [ 'mail', + 'base_setup', 'web', ], 'data': [ + 'views/res_config_settings_views.xml', 'views/ir_cron_views.xml', - 'wizard/mail_compose_message_views.xml', # 'report/.xml', ], 'qweb': [ diff --git a/app_common/i18n/zh_CN.po b/app_common/i18n/zh_CN.po index 53bab727..5751004a 100644 --- a/app_common/i18n/zh_CN.po +++ b/app_common/i18n/zh_CN.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 16.0-20231112\n" +"Project-Id-Version: Odoo Server 16.0+e-20231112\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-08 14:55+0000\n" -"PO-Revision-Date: 2024-08-08 14:55+0000\n" +"POT-Creation-Date: 2024-11-08 11:54+0000\n" +"PO-Revision-Date: 2024-11-08 11:54+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -28,16 +28,21 @@ msgstr "=================被忽略的邮箱: %s" msgid "Base" msgstr "基础" +#. module: app_common +#: model:ir.model.fields,help:app_common.field_res_config_settings__app_saas_ok +msgid "Checked to Enable www.odooapp.cn cloud service." +msgstr "勾选后启用Odoo中文应用商店云服务" + +#. module: app_common +#: model:ir.model,name:app_common.model_res_config_settings +msgid "Config Settings" +msgstr "设置" + #. module: app_common #: model:ir.model,name:app_common.model_res_partner msgid "Contact" msgstr "联系人" -#. module: app_common -#: model:ir.model,name:app_common.model_mail_compose_message -msgid "Email composition wizard" -msgstr "EMail撰写向导" - #. module: app_common #. odoo-python #: code:addons/app_common/models/ir_mail_server.py:0 @@ -45,6 +50,11 @@ msgstr "EMail撰写向导" msgid "Email to ignore: %s" msgstr "忽略的邮箱: %s" +#. module: app_common +#: model:ir.model.fields,field_description:app_common.field_res_config_settings__app_saas_ok +msgid "Enable CN SaaS" +msgstr "启用Odoo中文云服务" + #. module: app_common #: model:ir.model,name:app_common.model_ir_http msgid "HTTP Routing" @@ -55,11 +65,6 @@ msgstr "HTTP 路由" msgid "Last Trigger User" msgstr "手动运行用户" -#. module: app_common -#: model:ir.model.fields,field_description:app_common.field_res_users__login -msgid "Login" -msgstr "登录账号" - #. module: app_common #: model:ir.model,name:app_common.model_ir_mail_server msgid "Mail Server" @@ -75,16 +80,6 @@ msgstr "发出邮件" msgid "Scheduled Actions" msgstr "安排的动作" -#. module: app_common -#: model_terms:ir.ui.view,arch_db:app_common.app_mail_compose_message_form -msgid "Send Without Mail" -msgstr "仅改状态不发邮" - -#. module: app_common -#: model:ir.model.fields,field_description:app_common.field_mail_compose_message__show_send_without_mail -msgid "Show Send Only" -msgstr "显示只改状态" - #. module: app_common #. odoo-python #: code:addons/app_common/wizard/mail_compose_message.py:0 @@ -92,21 +87,20 @@ msgstr "显示只改状态" msgid "This only available in Sale Order or Purchase Order" msgstr "本操作只对销售订单和采购订单生效" -#. module: app_common -#: model:ir.model.fields,help:app_common.field_res_users__login -msgid "Used to log into the system" -msgstr "用此账号名登录系统" - -#. module: app_common -#: model:ir.model,name:app_common.model_res_users -msgid "User" -msgstr "用户" - #. module: app_common #: model:ir.model,name:app_common.model_ir_ui_view msgid "View" msgstr "查看" +#. module: app_common +#: model_terms:ir.ui.view,arch_db:app_common.app_res_config_settings_view_form +msgid "" +"Visit our website for more apps and Support.\n" +"\t\t\t\t\t\t\t\t\t\t\t\t\thttps://www.odooai.cn" +msgstr "" +"欢迎访问欧度智能官方网站,获取Odoo企业级运营支持。\n" +"\t\t\t\t\t\t\t\t\t\t\t\t\t https://www.odooai.cn" + #. module: app_common #. odoo-python #: code:addons/app_common/models/ir_ui_view.py:0 @@ -114,6 +108,10 @@ msgstr "查看" msgid "" "You can Ignore this. Failed to load RelaxNG XML schema for views validation," " file: %s" -msgstr "" -"此警告可忽略:载入文件失败 RelaxNG XML schema for views validation," -" 文件名: %s" +msgstr "此警告可忽略:载入文件失败 RelaxNG XML schema for views validation, 文件名: %s" + +#. module: app_common +#: model:ir.actions.act_window,name:app_common.action_odooai_cloud_config +#: model_terms:ir.ui.view,arch_db:app_common.app_res_config_settings_view_form +msgid "odooAi Cloud" +msgstr "欧度智能云" diff --git a/app_common/models/__init__.py b/app_common/models/__init__.py index 534ba2b7..690ea6e6 100644 --- a/app_common/models/__init__.py +++ b/app_common/models/__init__.py @@ -25,12 +25,12 @@ from . import base from . import ir_ui_view from . import ir_cron -from . import res_users from . import ir_mail_server from . import mail_mail from . import ir_http from . import app_import from . import res_partner +from . import res_config_settings diff --git a/app_common/models/res_config_settings.py b/app_common/models/res_config_settings.py new file mode 100644 index 00000000..7f4129d7 --- /dev/null +++ b/app_common/models/res_config_settings.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- + +import logging + +from odoo import api, fields, models, _ +from odoo.exceptions import UserError, ValidationError + +_logger = logging.getLogger(__name__) + + +class ResConfigSettings(models.TransientModel): + _inherit = 'res.config.settings' + + app_saas_ok = fields.Boolean('Enable CN SaaS', help="Checked to Enable www.odooapp.cn cloud service.", default=True, config_parameter='app_saas_ok') + diff --git a/app_common/static/description/banner1.png b/app_common/static/description/banner1.png index 02afafc2..91d450c8 100644 Binary files a/app_common/static/description/banner1.png and b/app_common/static/description/banner1.png differ diff --git a/app_common/static/description/icon.png b/app_common/static/description/icon.png index 2565562f..4158eace 100644 Binary files a/app_common/static/description/icon.png and b/app_common/static/description/icon.png differ diff --git a/app_common/static/description/index.html b/app_common/static/description/index.html index fa2e5927..54993f7a 100644 --- a/app_common/static/description/index.html +++ b/app_common/static/description/index.html @@ -4,7 +4,7 @@