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

Accept Merge Request #1375: (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/1375
This commit is contained in:
廖丹龙
2024-09-29 16:48:53 +08:00
committed by Coding
parent 941c3ca43a 11100c9260
commit 6b4a7e35a9
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sf_message/models/sf_message_purchase.py
View File

@@ -19,9 +19,8 @@ class SFMessagePurchase(models.Model):
return contents return contents
def request_url(self, id): def request_url(self, id):
we_config_info = self.env['we.config'].sudo().search([], limit=1) url = self.env['ir.config_parameter'].get_param('web.base.url')
redirect_domain = self.env['we.app'].sudo().search([('id', '=', we_config_info.odoo_app_id.id)]).redirect_domain full_url = 'https://%s/' % url
full_url = 'https://%s/' % redirect_domain
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
# 查询参数 # 查询参数

5
sf_message/models/sf_message_stock_picking.py
View File

@@ -52,9 +52,8 @@ class SFMessageStockPicking(models.Model):
return res return res
def request_url(self): def request_url(self):
we_config_info = self.env['we.config'].sudo().search([], limit=1) url = self.env['ir.config_parameter'].get_param('web.base.url')
redirect_domain = self.env['we.app'].sudo().search([('id', '=', we_config_info.odoo_app_id.id)]).redirect_domain full_url = 'https://%s/' % url
full_url = 'https://%s/' % redirect_domain
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
# 查询参数 # 查询参数

5
sf_message/models/sf_message_workorder.py
View File

@@ -40,9 +40,8 @@ class SFMessageWork(models.Model):
return contents return contents
def request_url(self): def request_url(self):
we_config_info = self.env['we.config'].sudo().search([], limit=1) url = self.env['ir.config_parameter'].get_param('web.base.url')
redirect_domain = self.env['we.app'].sudo().search([('id', '=', we_config_info.odoo_app_id.id)]).redirect_domain full_url = 'https://%s/' % url
full_url = 'https://%s/' % redirect_domain
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
# 查询参数 # 查询参数

1
sf_mrs_connect/models/order_price.py
View File

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