From 2e0bb2ae8f9bee79e0fe4397f9508ca3c871efe9 Mon Sep 17 00:00:00 2001 From: Ivan Office Date: Fri, 3 Jan 2025 18:41:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20=E7=94=A8=E6=88=B7=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_saas/models/res_users.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/app_saas/models/res_users.py b/app_saas/models/res_users.py index 3da6fab7..abf4aa5f 100644 --- a/app_saas/models/res_users.py +++ b/app_saas/models/res_users.py @@ -95,6 +95,37 @@ class ResUsers(models.Model): res = super(ResUsers, self)._auth_oauth_signin(provider, validation, params) return res + def _create_user_from_template(self, values): + # todo: 注意，选模板用户的功能暂时不可开放，因为会与 social_login 不兼容 + # 注意，没有装 app_partner_user时删除 user 时不会删除 partner，故容易出错，测试时要手工再把partner删除 + # self = self.sudo() + # oauth_provider_id = values.get('oauth_provider_id') + # if oauth_provider_id: + # provider = request.env['auth.oauth.provider'].sudo().browse(int(oauth_provider_id)) + # if provider: + # template_user = provider.user_template_id + # if not template_user and provider.scope.find('odoo') >= 0: + # template_user = self.env.ref('base.default_user', False) + # if not template_user: + # template_user_id = literal_eval(self.env['ir.config_parameter'].sudo().get_param('base.template_portal_user_id', 'False')) + # template_user = self.browse(template_user_id) + # + # if not values.get('login'): + # raise ValueError(_('Signup: no login given for new user')) + # if not values.get('partner_id') and not values.get('name'): + # raise ValueError(_('Signup: no name or partner given for new user')) + # + # # create a copy of the template user (attached to a specific partner_id if given) + # values['active'] = True + # try: + # with self.env.cr.savepoint(): + # return template_user.sudo().with_context(no_reset_password=True).copy(values) + # except Exception as e: + # # copy may failed if asked login is not available. + # raise SignupError(str(e)) + res = super(ResUsers, self)._create_user_from_template(values) + return res + @api.model def _generate_signup_values(self, provider, validation, params): # 此处生成 创建 odoo user 的初始值，增加字段如头像 From 2a228309d69f18b5509f465d9731dfd75f5f3dd2 Mon Sep 17 00:00:00 2001 From: Ivan Office Date: Sun, 5 Jan 2025 04:18:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8Cui=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_common/__manifest__.py | 2 +- app_common/i18n/zh_CN.po | 34 +++++++++++++++ app_common/models/res_config_settings.py | 4 +- .../views/res_config_settings_views.xml | 42 +++++++++++++++++-- .../views/res_config_settings_views.xml | 5 +-- 5 files changed, 77 insertions(+), 10 deletions(-) diff --git a/app_common/__manifest__.py b/app_common/__manifest__.py index 946de0bc..19702c28 100644 --- a/app_common/__manifest__.py +++ b/app_common/__manifest__.py @@ -39,7 +39,7 @@ { 'name': "odooAi Common Util and Tools,欧度智能基础功能及面板", - 'version': '16.24.11.08', + 'version': '16.0.25.01.03', 'author': 'odooai.cn', 'category': 'Extra tools', 'website': 'https://www.odooai.cn', diff --git a/app_common/i18n/zh_CN.po b/app_common/i18n/zh_CN.po index 5751004a..2e145e96 100644 --- a/app_common/i18n/zh_CN.po +++ b/app_common/i18n/zh_CN.po @@ -28,6 +28,11 @@ msgstr "=================被忽略的邮箱: %s" msgid "Base" msgstr "基础" +#. module: app_common +#: model_terms:ir.ui.view,arch_db:app_common.app_res_config_settings_view_form +msgid "Checked and Save to Enable odoo China cloud service." +msgstr "勾选并保存，即可启用Odoo中文应用商店云服务" + #. 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." @@ -43,6 +48,15 @@ msgstr "设置" msgid "Contact" msgstr "联系人" +#. module: app_common +#: model_terms:ir.ui.view,arch_db:app_common.app_res_config_settings_view_form +msgid "" +"Easy Get Odoo Chinese App, Theme, and industry solution. You can get the SaaS client from\n" +"
" +msgstr "" +"您可快速获取Odoo中文应用模块，主题，行业应用方案等。我们不会搜索您系统的敏感信息，信息上传前都会征得您的同意。" +"SaaS云客户端在此免费下载
" + #. module: app_common #. odoo-python #: code:addons/app_common/models/ir_mail_server.py:0 @@ -52,9 +66,19 @@ msgstr "忽略的邮箱: %s" #. module: app_common #: model:ir.model.fields,field_description:app_common.field_res_config_settings__app_saas_ok +#: model_terms:ir.ui.view,arch_db:app_common.app_res_config_settings_view_form msgid "Enable CN SaaS" msgstr "启用Odoo中文云服务" +#. module: app_common +#: model_terms:ir.ui.view,arch_db:app_common.app_res_config_settings_view_form +msgid "" +"Get the Industry Apps, Themes and Support from China odooapp store.\n" +" https://www.odooapp.cn" +msgstr "" +"获取Odoo行业应用，模块，主题。请访问Odoo中国应用商店\n" +" https://www.odooapp.cn" + #. module: app_common #: model:ir.model,name:app_common.model_ir_http msgid "HTTP Routing" @@ -80,6 +104,11 @@ msgstr "发出邮件" msgid "Scheduled Actions" msgstr "安排的动作" +#. module: app_common +#: model_terms:ir.ui.view,arch_db:app_common.app_res_config_settings_view_form +msgid "Setup the communication to odooAi Cloud" +msgstr "设置云面板" + #. module: app_common #. odoo-python #: code:addons/app_common/wizard/mail_compose_message.py:0 @@ -101,6 +130,11 @@ msgstr "" "欢迎访问欧度智能官方网站，获取Odoo企业级运营支持。\n" "\t\t\t\t\t\t\t\t\t\t\t\t\t https://www.odooai.cn" +#. module: app_common +#: model_terms:ir.ui.view,arch_db:app_common.app_res_config_settings_view_form +msgid "https://www.odooapp.cn/apps/modules/app_saas" +msgstr "https://www.odooapp.cn/apps/modules/app_saas" + #. module: app_common #. odoo-python #: code:addons/app_common/models/ir_ui_view.py:0 diff --git a/app_common/models/res_config_settings.py b/app_common/models/res_config_settings.py index 7f4129d7..87164de9 100644 --- a/app_common/models/res_config_settings.py +++ b/app_common/models/res_config_settings.py @@ -11,5 +11,5 @@ _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') - + app_saas_ok = fields.Boolean('Enable CN SaaS', default=True, config_parameter='app_saas_ok', + help="Checked to Enable www.odooapp.cn cloud service.") diff --git a/app_common/views/res_config_settings_views.xml b/app_common/views/res_config_settings_views.xml index 780787d8..55247c94 100644 --- a/app_common/views/res_config_settings_views.xml +++ b/app_common/views/res_config_settings_views.xml @@ -6,10 +6,12 @@ res.config.settings +
-
+
+
@@ -24,10 +26,42 @@
+

Setup the communication to odooAi Cloud

+
+ + + +
+
+ +
+
+
+
+
+
- - - + + + odooAi Cloud diff --git a/app_odoo_customize/views/res_config_settings_views.xml b/app_odoo_customize/views/res_config_settings_views.xml index 9eae1d88..0ff92b81 100644 --- a/app_odoo_customize/views/res_config_settings_views.xml +++ b/app_odoo_customize/views/res_config_settings_views.xml @@ -11,8 +11,8 @@
-

Data Cleaning (Be careful to do that!)

From 016bd5ad36d9b998b9689484060cbfed77178088 Mon Sep 17 00:00:00 2001 From: Ivan Office Date: Sun, 5 Jan 2025 04:33:49 +0800 Subject: [PATCH 3/3] fix misc --- app_saas/models/res_config_settings.py | 2 ++ app_website_blog_editor/__manifest__.py | 2 +- app_website_blog_editor/views/website_page_views.xml | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app_saas/models/res_config_settings.py b/app_saas/models/res_config_settings.py index 01c8ed94..86f4e239 100644 --- a/app_saas/models/res_config_settings.py +++ b/app_saas/models/res_config_settings.py @@ -12,3 +12,5 @@ class ResConfigSettings(models.TransientModel): _inherit = 'res.config.settings' module_app_cn_po = fields.Boolean('SaaS Chinese PO', help="Checked to Sync Odoo Chinese from www.odooapp.cn") + app_saas_db_token = fields.Boolean('Ai Cloud Token', default=True, config_parameter='app_saas_db_token', + help="The odooapp SaaS Token for this Odoo Database. You can reset in https://www.odooapp.cn") diff --git a/app_website_blog_editor/__manifest__.py b/app_website_blog_editor/__manifest__.py index ec7f8cd2..62a7ea56 100644 --- a/app_website_blog_editor/__manifest__.py +++ b/app_website_blog_editor/__manifest__.py @@ -39,7 +39,7 @@ { 'name': "Website Blogs,Page Editor in source code. mass edit blog and page.Odoo网页与博文源码编辑器", - 'version': '16.24.08.04', + 'version': '16.0.25.01.05', 'author': 'odooai.cn', 'category': 'Website', 'website': 'https://www.odooai.cn', diff --git a/app_website_blog_editor/views/website_page_views.xml b/app_website_blog_editor/views/website_page_views.xml index ce5dadc6..1cc152fe 100644 --- a/app_website_blog_editor/views/website_page_views.xml +++ b/app_website_blog_editor/views/website_page_views.xml @@ -26,9 +26,10 @@ show - - show - + + + +