push

2 files changed, 2 insertions, 2 deletions

diff --git a/fixco_custom/models/detail_order.py b/fixco_custom/models/detail_order.py
index 847c41e..b3e10a2 100755
--- a/fixco_custom/models/detail_order.py
+++ b/fixco_custom/models/detail_order.py
@@ -370,7 +370,7 @@ class DetailOrder(models.Model):
                             sale_order.note_by_buyer = json_data.get('data', [{}])[0].get('extraInfo', []).get('noteByBuyer', [])
 
                             sale_order.action_cancel()
-                            self.execute_status = 'cancelled_so_created'
+                            self.execute_status = 'cancelled_so'
 
                         return
 
diff --git a/fixco_custom/models/shipment_group.py b/fixco_custom/models/shipment_group.py
index 2e2dffa..4c4af4a 100644
--- a/fixco_custom/models/shipment_group.py
+++ b/fixco_custom/models/shipment_group.py
@@ -215,7 +215,7 @@ class ShipmentGroup(models.Model):
             return
 
         for item in contents:
-            order_no = item.get('orderNumber')
+            order_no = item.get('externalOrderId')
             order_status = item.get('orderStatus')
 
             picking_line = order_map.get(order_no)