From 11100c9260917db105a9afaa69dfd396129577e4 Mon Sep 17 00:00:00 2001 From: guanhuan Date: Sun, 29 Sep 2024 16:47:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_message/models/sf_message_purchase.py | 5 ++--- sf_message/models/sf_message_stock_picking.py | 5 ++--- sf_message/models/sf_message_workorder.py | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sf_message/models/sf_message_purchase.py b/sf_message/models/sf_message_purchase.py index 96d0f8dc..b456cc87 100644 --- a/sf_message/models/sf_message_purchase.py +++ b/sf_message/models/sf_message_purchase.py @@ -19,9 +19,8 @@ class SFMessagePurchase(models.Model): return contents def request_url(self, id): - we_config_info = self.env['we.config'].sudo().search([], limit=1) - redirect_domain = self.env['we.app'].sudo().search([('id', '=', we_config_info.odoo_app_id.id)]).redirect_domain - full_url = 'https://%s/' % redirect_domain + url = self.env['ir.config_parameter'].get_param('web.base.url') + full_url = 'https://%s/' % url action_id = self.env.ref('purchase.purchase_form_action').id menu_id = self.env['ir.model.data'].search([('name', '=', 'module_website_payment')]).id # 查询参数 diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py index fdb9d4cf..68095b68 100644 --- a/sf_message/models/sf_message_stock_picking.py +++ b/sf_message/models/sf_message_stock_picking.py @@ -52,9 +52,8 @@ class SFMessageStockPicking(models.Model): return res def request_url(self): - we_config_info = self.env['we.config'].sudo().search([], limit=1) - redirect_domain = self.env['we.app'].sudo().search([('id', '=', we_config_info.odoo_app_id.id)]).redirect_domain - full_url = 'https://%s/' % redirect_domain + url = self.env['ir.config_parameter'].get_param('web.base.url') + full_url = 'https://%s/' % url action_id = self.env.ref('stock.stock_picking_type_action').id menu_id = self.env['ir.model.data'].search([('name', '=', 'module_theme_treehouse')]).id # 查询参数 diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py index 9d18e656..1a3bc253 100644 --- a/sf_message/models/sf_message_workorder.py +++ b/sf_message/models/sf_message_workorder.py @@ -62,9 +62,8 @@ class SFMessageWork(models.Model): return res def request_url(self): - we_config_info = self.env['we.config'].sudo().search([], limit=1) - redirect_domain = self.env['we.app'].sudo().search([('id', '=', we_config_info.odoo_app_id.id)]).redirect_domain - full_url = 'https://%s/' % redirect_domain + url = self.env['ir.config_parameter'].get_param('web.base.url') + full_url = 'https://%s/' % url action_id = self.env.ref('sf_manufacturing.mrp_workorder_action_tablet').id menu_id = self.env['ir.model.data'].search([('name', '=', 'module_stock_dropshipping')]).id # 查询参数 From 97d33adabd49a9a7fce96e0f459fb7fc3c9edd9a Mon Sep 17 00:00:00 2001 From: guanhuan Date: Sun, 29 Sep 2024 17:03:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_message/models/sf_message_purchase.py | 3 +-- sf_message/models/sf_message_stock_picking.py | 3 +-- sf_message/models/sf_message_workorder.py | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sf_message/models/sf_message_purchase.py b/sf_message/models/sf_message_purchase.py index b456cc87..15ad08d9 100644 --- a/sf_message/models/sf_message_purchase.py +++ b/sf_message/models/sf_message_purchase.py @@ -20,7 +20,6 @@ class SFMessagePurchase(models.Model): def request_url(self, id): url = self.env['ir.config_parameter'].get_param('web.base.url') - full_url = 'https://%s/' % url action_id = self.env.ref('purchase.purchase_form_action').id menu_id = self.env['ir.model.data'].search([('name', '=', 'module_website_payment')]).id # 查询参数 @@ -30,5 +29,5 @@ class SFMessagePurchase(models.Model): # 拼接查询参数 query_string = urlencode(params) # 拼接URL - full_url = full_url + "web#" + query_string + full_url = url + "web#" + query_string return full_url diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py index 68095b68..d63d8059 100644 --- a/sf_message/models/sf_message_stock_picking.py +++ b/sf_message/models/sf_message_stock_picking.py @@ -53,7 +53,6 @@ class SFMessageStockPicking(models.Model): def request_url(self): url = self.env['ir.config_parameter'].get_param('web.base.url') - full_url = 'https://%s/' % url action_id = self.env.ref('stock.stock_picking_type_action').id menu_id = self.env['ir.model.data'].search([('name', '=', 'module_theme_treehouse')]).id # 查询参数 @@ -62,5 +61,5 @@ class SFMessageStockPicking(models.Model): # 拼接查询参数 query_string = urlencode(params) # 拼接URL - full_url = full_url + "web#" + query_string + full_url = url + "web#" + query_string return full_url diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py index 1a3bc253..6758103a 100644 --- a/sf_message/models/sf_message_workorder.py +++ b/sf_message/models/sf_message_workorder.py @@ -63,7 +63,6 @@ class SFMessageWork(models.Model): def request_url(self): url = self.env['ir.config_parameter'].get_param('web.base.url') - full_url = 'https://%s/' % url action_id = self.env.ref('sf_manufacturing.mrp_workorder_action_tablet').id menu_id = self.env['ir.model.data'].search([('name', '=', 'module_stock_dropshipping')]).id # 查询参数 @@ -72,5 +71,5 @@ class SFMessageWork(models.Model): # 拼接查询参数 query_string = urlencode(params) # 拼接URL - full_url = full_url + "web#" + query_string + full_url = url + "web#" + query_string return full_url From d2ec420f5702259e3f74b8cb1bf83c4ed2b87a50 Mon Sep 17 00:00:00 2001 From: guanhuan Date: Sun, 29 Sep 2024 17:05:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_message/models/sf_message_purchase.py | 2 +- sf_message/models/sf_message_stock_picking.py | 2 +- sf_message/models/sf_message_workorder.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sf_message/models/sf_message_purchase.py b/sf_message/models/sf_message_purchase.py index 15ad08d9..e3fe269f 100644 --- a/sf_message/models/sf_message_purchase.py +++ b/sf_message/models/sf_message_purchase.py @@ -29,5 +29,5 @@ class SFMessagePurchase(models.Model): # 拼接查询参数 query_string = urlencode(params) # 拼接URL - full_url = url + "web#" + query_string + full_url = url + "/web#" + query_string return full_url diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py index d63d8059..0ff32f77 100644 --- a/sf_message/models/sf_message_stock_picking.py +++ b/sf_message/models/sf_message_stock_picking.py @@ -61,5 +61,5 @@ class SFMessageStockPicking(models.Model): # 拼接查询参数 query_string = urlencode(params) # 拼接URL - full_url = url + "web#" + query_string + full_url = url + "/web#" + query_string return full_url diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py index 6758103a..2e004b69 100644 --- a/sf_message/models/sf_message_workorder.py +++ b/sf_message/models/sf_message_workorder.py @@ -71,5 +71,5 @@ class SFMessageWork(models.Model): # 拼接查询参数 query_string = urlencode(params) # 拼接URL - full_url = url + "web#" + query_string + full_url = url + "/web#" + query_string return full_url