From 4a778d7d815c1f5fcf6952575d88c85e9c9fa5bb Mon Sep 17 00:00:00 2001 From: Marc Durepos Date: Wed, 22 Jan 2025 13:53:28 -0500 Subject: [PATCH] remove debug logging for delivery_carrier_partner_account --- .../models/carrier_account_mixin.py | 6 ------ .../models/sales_order.py | 2 -- .../models/stock_picking.py | 20 +++++++++++++++---- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/delivery_carrier_partner_account/models/carrier_account_mixin.py b/delivery_carrier_partner_account/models/carrier_account_mixin.py index d1db19f..5d62333 100644 --- a/delivery_carrier_partner_account/models/carrier_account_mixin.py +++ b/delivery_carrier_partner_account/models/carrier_account_mixin.py @@ -136,13 +136,7 @@ class CarrierAccountMixin(models.AbstractModel): lambda rec: not rec.carrier_account_id or rec.carrier_account_id not in rec.valid_carrier_account_ids ): - _logger.debug( - f"Setting carrier account. Carrier: {rec.carrier_id}," - f" billing mode: {rec.delivery_billing_mode}" - f" account: {rec.carrier_account_id}" - ) rec.carrier_account_id = rec._get_default_carrier_account() - _logger.debug(f"Set account to {rec.carrier_account_id}") def _get_default_carrier_account(self): self.ensure_one() diff --git a/delivery_carrier_partner_account/models/sales_order.py b/delivery_carrier_partner_account/models/sales_order.py index 4bd52f6..5f31c6d 100644 --- a/delivery_carrier_partner_account/models/sales_order.py +++ b/delivery_carrier_partner_account/models/sales_order.py @@ -33,12 +33,10 @@ class SalesOrder(models.Model): def _on_carrier_fields_changed(self): """Propagate carrier field changes to pickings.""" super()._on_carrier_fields_changed() - _logger.debug("In sale_order._on_carrier_fields_changed") for rec in self: for picking in rec.picking_ids.filtered( lambda pick: pick.state not in ["done", "cancel"] ): - _logger.debug("Writing to picking") picking.write( { "carrier_id": rec.carrier_id and rec.carrier_id.id, diff --git a/delivery_carrier_partner_account/models/stock_picking.py b/delivery_carrier_partner_account/models/stock_picking.py index 2fa8c87..75c4658 100644 --- a/delivery_carrier_partner_account/models/stock_picking.py +++ b/delivery_carrier_partner_account/models/stock_picking.py @@ -21,13 +21,25 @@ class Picking(models.Model): match (src_usage, dest_usage): case ("internal", "customer") | ("internal", "supplier"): picking.recipient_id = picking.partner_id - picking.sender_id = picking.picking_type_id.warehouse_id.partner_id or picking.company_id.partner_id + picking.sender_id = ( + picking.picking_type_id.warehouse_id.partner_id + or picking.company_id.partner_id + ) case ("customer", "internal") | ("supplier", "internal"): - picking.recipient_id = picking.picking_type_id.warehouse_id.partner_id or picking.company_id.partner_id + picking.recipient_id = ( + picking.picking_type_id.warehouse_id.partner_id + or picking.company_id.partner_id + ) picking.sender_id = picking.partner_id case _: - picking.recipient_id = picking.location_dest_id.warehouse_id.partner_id or picking.partner_id - picking.sender_id = picking.location_id.warehouse_id.partner_id or picking.partner_id + picking.recipient_id = ( + picking.location_dest_id.warehouse_id.partner_id + or picking.partner_id + ) + picking.sender_id = ( + picking.location_id.warehouse_id.partner_id + or picking.partner_id + ) def _add_delivery_cost_to_so(self): self.ensure_one()