From 4c1d2a7b6c4b36181013de7d745fbc49a71f6fd3 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Tue, 21 Sep 2021 15:01:14 -0700
Subject: [PATCH 1/3] [FIX] delivery_hibou: unsafe new kwarg, use context
 instead, better domain on packaging

---
 delivery_hibou/models/stock.py          | 10 ++++++----
 delivery_hibou/views/delivery_views.xml |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/delivery_hibou/models/stock.py b/delivery_hibou/models/stock.py
index ec2d2664..592ac96c 100644
--- a/delivery_hibou/models/stock.py
+++ b/delivery_hibou/models/stock.py
@@ -17,11 +17,11 @@ class StockQuantPackage(models.Model):
 
     def send_to_shipper(self):
         picking = self._get_active_picking()
-        picking.send_to_shipper(packages=self)
+        picking.with_context(packages=self).send_to_shipper()
 
     def cancel_shipment(self):
         picking = self._get_active_picking()
-        picking.cancel_shipment(packages=self)
+        picking.with_context(packages=self).cancel_shipment()
 
 
 class StockPicking(models.Model):
@@ -83,7 +83,8 @@ class StockPicking(models.Model):
             picking.carrier_tracking_ref = picking.package_carrier_tracking_ref
 
     # Override to send to specific packaging carriers
-    def send_to_shipper(self, packages=None):
+    def send_to_shipper(self):
+        packages = self._context.get('packages')
         self.ensure_one()
         if not packages:
             packages = self.package_ids
@@ -130,7 +131,8 @@ class StockPicking(models.Model):
         self._add_delivery_cost_to_so()
 
     # Override to provide per-package versions...
-    def cancel_shipment(self, packages=None):
+    def cancel_shipment(self):
+        packages = self._context.get('packages')
         pickings_with_package_tracking = self.filtered(lambda p: p.package_carrier_tracking_ref)
         for picking in pickings_with_package_tracking:
             if packages:
diff --git a/delivery_hibou/views/delivery_views.xml b/delivery_hibou/views/delivery_views.xml
index 960df1c2..638ef921 100644
--- a/delivery_hibou/views/delivery_views.xml
+++ b/delivery_hibou/views/delivery_views.xml
@@ -18,7 +18,7 @@
         <field name="inherit_id" ref="delivery.choose_delivery_package_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='delivery_packaging_id']" position="attributes">
-                <attribute name="domain">[('package_carrier_type', '!=', False)]</attribute>
+                <attribute name="domain">[('product_id', '=', False)]</attribute>
             </xpath>
         </field>
     </record>

From 54cbded40bc78d7346f32404e440263c2acd6c0a Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Tue, 21 Sep 2021 15:05:07 -0700
Subject: [PATCH 2/3] [IMP] stock_delivery_planner: better sorting for options

---
 stock_delivery_planner/wizard/stock_delivery_planner_views.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stock_delivery_planner/wizard/stock_delivery_planner_views.xml b/stock_delivery_planner/wizard/stock_delivery_planner_views.xml
index 6b942319..0ae594f9 100644
--- a/stock_delivery_planner/wizard/stock_delivery_planner_views.xml
+++ b/stock_delivery_planner/wizard/stock_delivery_planner_views.xml
@@ -13,6 +13,7 @@
                               decoration-danger="days_different &gt; 0.0 and not selection"
                               decoration-info="selection == 'selected'"
                               decoration-muted="selection == 'deselected'"
+                              default_order="package_id, price"
                               create="false" edit="false" delete="false">
                             <field name="package_id"/>
                             <field name="carrier_id"/>

From 2ae82c9ceb161ff673fe6c2685be8f2ad574f244 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Tue, 21 Sep 2021 15:07:35 -0700
Subject: [PATCH 3/3] Bump submodule hiboubox

---
 external/hiboubox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/hiboubox b/external/hiboubox
index 7efcd659..48634476 160000
--- a/external/hiboubox
+++ b/external/hiboubox
@@ -1 +1 @@
-Subproject commit 7efcd6594c156e850959281625e0595aaff0f673
+Subproject commit 486344760ed19fdef41d91a6ab0784f1a7c99ec5