From d413651001e5c9cd7a33fb2bab7e93fbea520dc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 3 Jun 2026 16:01:25 +0200
Subject: [PATCH] Bill duties and charges to the customs agent for UPS shipment
 charges

Closes #14876
(grafted from e04bd7218a1bd78bc27439c7995ba5decbb48415)

--HG--
branch : 8.0
---
 modules/stock_package_shipping_ups/stock.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/stock_package_shipping_ups/stock.py b/modules/stock_package_shipping_ups/stock.py
index 6ddd5d6d3b..66bcdaf4ed 100644
--- a/modules/stock_package_shipping_ups/stock.py
+++ b/modules/stock_package_shipping_ups/stock.py
@@ -421,11 +421,15 @@ class CreateShippingUPS_Customs_Incoterm(metaclass=PoolMeta):
         if (shipment.customs_international
                 and shipment.incoterm
                 and shipment.incoterm.import_duties == 'seller'):
+            if customs_agent := shipment.customs_agent:
+                account_number = customs_agent.ups_account_number
+            else:
+                account_number = credential.account_number
             payment_information['ShipmentCharge'].append({
                     # Type 02 is for Duties and Taxes
                     'Type': '02',
                     'BillShipper': {
-                        'AccountNumber': credential.account_number,
+                        'AccountNumber': account_number,
                         },
                     })
         return payment_information