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

Merge Request: 价格计算

Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1375

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
         # 查询参数

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
         # 查询参数

sf_message/models/sf_message_workorder.py

@@ -40,9 +40,8 @@ class SFMessageWork(models.Model):
         return contents
 
     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
         # 查询参数

sf_mrs_connect/models/order_price.py

@@ -18,6 +18,7 @@ class OrderPrice(models.Model):
             return True
         except ValueError:
             return False
+    @api.depends('sale_order_id.order_line.remark')
     def _compute_bfm_amount_total(self):
         for record in self:
             amount_total = 0