[IMP] delivery_carrier_label_ups: fix email

VanMoof · Oct 21, 2021 · 04767b0 · 04767b0
1 parent 31b92f7
commit 04767b0
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/delivery_carrier_label_ups/models/stock_picking.py b/delivery_carrier_label_ups/models/stock_picking.py
@@ -171,10 +171,10 @@ def _ups_shipping_data(self):
     def _ups_return_service(self):
         """Return a dict describing the UPS Return Label code"""
         self.ensure_one()
-        recipient = self.picking_type_id.warehouse_id.partner_id
-        recipient_email = recipient.email
-        shipper_email = self.partner_id.email
-        if recipient.country_id.code != 'US':
+        customer_email = self.partner_id.email
+        warehouse_partner = self.picking_type_id.warehouse_id.partner_id
+        warehouse_partner_email = warehouse_partner.email
+        if self.partner_id.country_id.code != 'US':
             subject_code = '01'  # First shipment reference
         else:
             subject_code = '03'  # First package reference
@@ -187,40 +187,40 @@ def _ups_return_service(self):
             ShipmentServiceOptions=dict(
                 LabelDelivery=dict(
                     EMailMessage=dict(
-                        EMailAddress=recipient_email,
-                        FromEMailAddress=shipper_email,
+                        EMailAddress=customer_email,
+                        FromEMailAddress=warehouse_partner_email,
                         SubjectCode=subject_code,
                     )
                 ),
                 Notification=[
                     dict(
                         NotificationCode='2',
                         EMail=dict(
-                            EMailAddress=recipient_email,
-                            UndeliverableEMailAddress=shipper_email,
-                            FromEMailAddress=shipper_email,
+                            EMailAddress=customer_email,
+                            UndeliverableEMailAddress=warehouse_partner_email,
+                            FromEMailAddress=warehouse_partner_email,
                         ),
                     ),
                     dict(
                         NotificationCode='5',
                         EMail=dict(
-                            EMailAddress=recipient_email,
-                            FromEMailAddress=shipper_email,
+                            EMailAddress=customer_email,
+                            FromEMailAddress=warehouse_partner_email,
                         ),
                     ),
                     dict(
                         NotificationCode='7',
                         EMail=dict(
-                            EMailAddress=recipient_email,
-                            FromEMailAddress=shipper_email,
+                            EMailAddress=customer_email,
+                            FromEMailAddress=warehouse_partner_email,
                         ),
                     ),
                     dict(
                         NotificationCode='8',
                         EMail=dict(
-                            EMailAddress=recipient_email,
-                            UndeliverableEMailAddress=shipper_email,
-                            FromEMailAddress=shipper_email,
+                            EMailAddress=customer_email,
+                            UndeliverableEMailAddress=warehouse_partner_email,
+                            FromEMailAddress=warehouse_partner_email,
                         ),
                     )
                 ]