remove debug logging for delivery_carrier_partner_account
This commit is contained in:
parent
4563b8b8b1
commit
4a778d7d81
3 changed files with 16 additions and 12 deletions
|
|
@ -136,13 +136,7 @@ class CarrierAccountMixin(models.AbstractModel):
|
||||||
lambda rec: not rec.carrier_account_id
|
lambda rec: not rec.carrier_account_id
|
||||||
or rec.carrier_account_id not in rec.valid_carrier_account_ids
|
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()
|
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):
|
def _get_default_carrier_account(self):
|
||||||
self.ensure_one()
|
self.ensure_one()
|
||||||
|
|
|
||||||
|
|
@ -33,12 +33,10 @@ class SalesOrder(models.Model):
|
||||||
def _on_carrier_fields_changed(self):
|
def _on_carrier_fields_changed(self):
|
||||||
"""Propagate carrier field changes to pickings."""
|
"""Propagate carrier field changes to pickings."""
|
||||||
super()._on_carrier_fields_changed()
|
super()._on_carrier_fields_changed()
|
||||||
_logger.debug("In sale_order._on_carrier_fields_changed")
|
|
||||||
for rec in self:
|
for rec in self:
|
||||||
for picking in rec.picking_ids.filtered(
|
for picking in rec.picking_ids.filtered(
|
||||||
lambda pick: pick.state not in ["done", "cancel"]
|
lambda pick: pick.state not in ["done", "cancel"]
|
||||||
):
|
):
|
||||||
_logger.debug("Writing to picking")
|
|
||||||
picking.write(
|
picking.write(
|
||||||
{
|
{
|
||||||
"carrier_id": rec.carrier_id and rec.carrier_id.id,
|
"carrier_id": rec.carrier_id and rec.carrier_id.id,
|
||||||
|
|
|
||||||
|
|
@ -21,13 +21,25 @@ class Picking(models.Model):
|
||||||
match (src_usage, dest_usage):
|
match (src_usage, dest_usage):
|
||||||
case ("internal", "customer") | ("internal", "supplier"):
|
case ("internal", "customer") | ("internal", "supplier"):
|
||||||
picking.recipient_id = picking.partner_id
|
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"):
|
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
|
picking.sender_id = picking.partner_id
|
||||||
case _:
|
case _:
|
||||||
picking.recipient_id = picking.location_dest_id.warehouse_id.partner_id or picking.partner_id
|
picking.recipient_id = (
|
||||||
picking.sender_id = picking.location_id.warehouse_id.partner_id or picking.partner_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):
|
def _add_delivery_cost_to_so(self):
|
||||||
self.ensure_one()
|
self.ensure_one()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue