From 558313211cd246dc2dfbafe27da40fe4cd80f4e8 Mon Sep 17 00:00:00 2001 From: Marc Durepos Date: Sun, 19 Jan 2025 10:17:21 -0500 Subject: [PATCH] changes to delivery_carrier_partner_account --- .../models/carrier_account_mixin.py | 4 +++- delivery_carrier_partner_account/models/sales_order.py | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/delivery_carrier_partner_account/models/carrier_account_mixin.py b/delivery_carrier_partner_account/models/carrier_account_mixin.py index 0a6cce0..c05fa9e 100644 --- a/delivery_carrier_partner_account/models/carrier_account_mixin.py +++ b/delivery_carrier_partner_account/models/carrier_account_mixin.py @@ -138,13 +138,15 @@ class CarrierAccountMixin(models.AbstractModel): if rec.carrier_account_id not in rec.valid_carrier_account_ids: rec.carrier_account_id = False if rec.delivery_billing_mode in ["prepaid", "ppc"]: - rec.carrier_account_id = ( + accounts = ( self.env["delivery.carrier.account"] .search([("partner_id", "=", rec.sender_id.id)]) .filtered( lambda account: account.delivery_carrier_id == rec.carrier_id ) ) + if accounts: + rec.carrier_account_id = accounts[0] if ( rec.delivery_billing_mode == "no charge" or not rec.delivery_billing_mode diff --git a/delivery_carrier_partner_account/models/sales_order.py b/delivery_carrier_partner_account/models/sales_order.py index 4b886e3..7d6c8ab 100644 --- a/delivery_carrier_partner_account/models/sales_order.py +++ b/delivery_carrier_partner_account/models/sales_order.py @@ -28,9 +28,13 @@ class SalesOrder(models.Model): for picking in rec.picking_ids.filtered( lambda pick: pick.state not in ["done", "cancel"] ): - picking.carrier_id = rec.carrier_id - picking.delivery_billing_mode = rec.delivery_billing_mode - picking.carrier_account_id = rec.carrier_account_id + picking.write( + { + "carrier_id": rec.carrier_id, + "carrier_account_id": rec.carrier_account_id, + "delivery_billing_mode": rec.delivery_billing_mode, + } + ) return res def _create_delivery_line(self, carrier, price_unit):