From c9a630bd41194365d931ffd82e34c3bbf84bf824 Mon Sep 17 00:00:00 2001 From: nikolausweingartmair Date: Mon, 19 Dec 2022 16:12:59 +0100 Subject: [PATCH] [MIG] rma_delivery: Migration to 15.0 --- rma_delivery/__manifest__.py | 2 +- rma_delivery/models/rma.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rma_delivery/__manifest__.py b/rma_delivery/__manifest__.py index 740435d2..6750e264 100644 --- a/rma_delivery/__manifest__.py +++ b/rma_delivery/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Return Merchandise Authorization Management - Link with deliveries", "summary": "Allow to choose a default delivery carrier for returns", - "version": "14.0.1.0.0", + "version": "15.0.1.0.0", "development_status": "Beta", "category": "RMA", "website": "https://github.com/OCA/rma", diff --git a/rma_delivery/models/rma.py b/rma_delivery/models/rma.py index c7008741..f6866ca2 100644 --- a/rma_delivery/models/rma.py +++ b/rma_delivery/models/rma.py @@ -26,16 +26,18 @@ class Rma(models.Model): return delivery_method def _prepare_returning_picking(self, picking_form, origin=None): - super()._prepare_returning_picking(picking_form, origin) + res = super()._prepare_returning_picking(picking_form, origin) picking_form.carrier_id = self._get_default_carrier_id( picking_form.company_id, picking_form.partner_id ) + return res def create_replace(self, scheduled_date, warehouse, product, qty, uom): existing_pickings = self.delivery_move_ids.mapped("picking_id") - super().create_replace(scheduled_date, warehouse, product, qty, uom) + res = super().create_replace(scheduled_date, warehouse, product, qty, uom) new_pickings = self.delivery_move_ids.mapped("picking_id") - existing_pickings for picking in new_pickings: picking.carrier_id = self._get_default_carrier_id( picking.company_id, picking.partner_id ) + return res