jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #1380: (feature/销售和排程添加消息推送 -> develop)

Browse Source 
Merge Request: 域名获取修改

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1380
This commit is contained in:
管欢
2024-09-29 17:09:47 +08:00
committed by Coding
parent 6b4a7e35a9 d2ec420f57
commit ea88d8284a
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sf_message/models/sf_message_purchase.py
View File

@@ -20,7 +20,6 @@ class SFMessagePurchase(models.Model):
def request_url(self, id): def request_url(self, id):
url = self.env['ir.config_parameter'].get_param('web.base.url') 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 action_id = self.env.ref('purchase.purchase_form_action').id
menu_id = self.env['ir.model.data'].search([('name', '=', 'module_website_payment')]).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) query_string = urlencode(params)
# 拼接URL # 拼接URL
full_url = full_url + "web#" + query_string full_url = url + "/web#" + query_string
return full_url return full_url

3
sf_message/models/sf_message_stock_picking.py
View File

@@ -53,7 +53,6 @@ class SFMessageStockPicking(models.Model):
def request_url(self): def request_url(self):
url = self.env['ir.config_parameter'].get_param('web.base.url') 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 action_id = self.env.ref('stock.stock_picking_type_action').id
menu_id = self.env['ir.model.data'].search([('name', '=', 'module_theme_treehouse')]).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) query_string = urlencode(params)
# 拼接URL # 拼接URL
full_url = full_url + "web#" + query_string full_url = url + "/web#" + query_string
return full_url return full_url

3
sf_message/models/sf_message_workorder.py
View File

@@ -41,7 +41,6 @@ class SFMessageWork(models.Model):
def request_url(self): def request_url(self):
url = self.env['ir.config_parameter'].get_param('web.base.url') 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 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 menu_id = self.env['ir.model.data'].search([('name', '=', 'module_stock_dropshipping')]).id
# 查询参数 # 查询参数
@@ -50,6 +49,6 @@ class SFMessageWork(models.Model):
# 拼接查询参数 # 拼接查询参数
query_string = urlencode(params) query_string = urlencode(params)
# 拼接URL # 拼接URL
full_url = full_url + "web#" + query_string full_url = url + "/web#" + query_string
return full_url return full_url