From 77773fddf96fafefbb24d6d075371806e3361cd5 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Thu, 7 May 2020 07:44:01 +0000 Subject: [PATCH] [FIX] point_of_sale, stock_sms: do not send mail and SMS Complement of PR #50720 to aovid sending email as well. opw-2250185 closes odoo/odoo#50814 closes odoo/odoo#51042 X-original-commit: 64ef9d74753ddf532cb4fc3d9769cd4913a2d9d7 Signed-off-by: Nicolas Martinelli (nim) --- addons/point_of_sale/models/stock_picking.py | 5 +++++ addons/stock_sms/models/stock_picking.py | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/point_of_sale/models/stock_picking.py b/addons/point_of_sale/models/stock_picking.py index c9d631ee4c6..06da59d3f06 100644 --- a/addons/point_of_sale/models/stock_picking.py +++ b/addons/point_of_sale/models/stock_picking.py @@ -131,3 +131,8 @@ class StockPicking(models.Model): self.env['stock.move.line'].create(ml_vals) else: current_move.quantity_done = abs(sum(order_lines.mapped('qty'))) + + def _send_confirmation_email(self): + # Avoid sending Mail/SMS for POS deliveries + pickings = self.filtered(lambda p: p.picking_type_id != p.picking_type_id.warehouse_id.pos_type_id) + return super(StockPicking, pickings)._send_confirmation_email() diff --git a/addons/stock_sms/models/stock_picking.py b/addons/stock_sms/models/stock_picking.py index f3344a483e6..846af19271f 100644 --- a/addons/stock_sms/models/stock_picking.py +++ b/addons/stock_sms/models/stock_picking.py @@ -54,10 +54,6 @@ class Picking(models.Model): super(Picking, self)._send_confirmation_email() if not self.env.context.get('skip_sms') and not getattr(threading.currentThread(), 'testing', False) and not self.env.registry.in_test_mode(): pickings = self.filtered(lambda p: p.company_id.stock_move_sms_validation and p.picking_type_id.code == 'outgoing' and (p.partner_id.mobile or p.partner_id.phone)) - # Avoid sending SMS for POS deliveries - if 'pos_type_id' in self.env['stock.warehouse']: - pickings = pickings.filtered(lambda p: p.picking_type_id != p.picking_type_id.warehouse_id.pos_type_id) - for picking in pickings: # Sudo as the user has not always the right to read this sms template. template = picking.company_id.sudo().stock_sms_confirmation_template_id