Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送
This commit is contained in:
@@ -5,7 +5,7 @@ from odoo import models, fields, api, _
|
|||||||
class SFMessageStockPicking(models.Model):
|
class SFMessageStockPicking(models.Model):
|
||||||
_name = 'stock.picking'
|
_name = 'stock.picking'
|
||||||
_description = "库存调拨"
|
_description = "库存调拨"
|
||||||
_inherit = ['stock.picking', 'jikimo.message.dispatch']
|
_inherit = ['stock.picking', 'jikimo.message.dispatch']
|
||||||
|
|
||||||
def button_validate(self):
|
def button_validate(self):
|
||||||
res = super(SFMessageStockPicking, self).button_validate()
|
res = super(SFMessageStockPicking, self).button_validate()
|
||||||
@@ -34,6 +34,7 @@ class SFMessageStockPicking(models.Model):
|
|||||||
content = content.replace('{{number}}', str(len(stock_picking_info)))
|
content = content.replace('{{number}}', str(len(stock_picking_info)))
|
||||||
product_id.append(stock_picking_info.product_id.id)
|
product_id.append(stock_picking_info.product_id.id)
|
||||||
contents.append(content)
|
contents.append(content)
|
||||||
res = super(SFMessageStockPicking, self)._get_message(message_queue_ids)
|
else:
|
||||||
contents.append(res)
|
res = super(SFMessageStockPicking, self)._get_message(message_queue_id)
|
||||||
|
contents.append(res)
|
||||||
return contents
|
return contents
|
||||||
|
|||||||
Reference in New Issue
Block a user