From 9baa4f29349cfcdc48c442f37b3f945e1cc1f6a8 Mon Sep 17 00:00:00 2001
From: Cedric Collins <cedric@hibou.io>
Date: Wed, 22 Sep 2021 17:45:00 -0500
Subject: [PATCH 1/2] [IMP] delivery_hibou: filter shipping account by partner
 on delivery orders

H7261
---
 delivery_hibou/views/stock_views.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/delivery_hibou/views/stock_views.xml b/delivery_hibou/views/stock_views.xml
index 6bb47f34..f806127d 100644
--- a/delivery_hibou/views/stock_views.xml
+++ b/delivery_hibou/views/stock_views.xml
@@ -29,7 +29,9 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='carrier_id']" position="before">
                 <field name="require_insurance" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"/>
-                <field name="shipping_account_id" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"/>
+                <field name="shipping_account_id" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
+                       options="{'no_create': True, 'no_open': True}"
+                       domain="['|', ('partner_id', '=', False), ('partner_id', '=', partner_id)]"/>
                 <field name="package_carrier_tracking_ref" attrs="{'invisible': [('package_carrier_tracking_ref', '=', False)]}" />
                 <button name="clear_carrier_tracking_ref" type="object" string="Clear Tracking" attrs="{'invisible': [('carrier_tracking_ref', '!=', False)]}" />
                 <button name="reset_carrier_tracking_ref" type="object" string="Reset Tracking" attrs="{'invisible': [('package_carrier_tracking_ref', '!=', False)]}" />

From 5c5eefdd54f19430b0cc0aa91118158f144386f8 Mon Sep 17 00:00:00 2001
From: Kaylie Kipe <kaylie@hibou.io>
Date: Tue, 12 Oct 2021 14:19:40 -0700
Subject: [PATCH 2/2] [IMP] delivery_hibou: Added new field for
 `commercial_partner_id` and improved domain to show Shipping Accounts
 accordingly

---
 delivery_hibou/models/stock.py       | 1 +
 delivery_hibou/views/stock_views.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/delivery_hibou/models/stock.py b/delivery_hibou/models/stock.py
index 592ac96c..d5e4b81f 100644
--- a/delivery_hibou/models/stock.py
+++ b/delivery_hibou/models/stock.py
@@ -35,6 +35,7 @@ class StockPicking(models.Model):
         ], string='Require Insurance', default='auto',
         help='If your carrier supports it, auto should be calculated off of the "Automatic Insurance Value" field.')
     package_carrier_tracking_ref = fields.Char(string='Package Tracking Numbers', compute='_compute_package_carrier_tracking_ref')
+    commercial_partner_id = fields.Many2one('res.partner', related='partner_id.commercial_partner_id')
 
     @api.depends('package_ids.carrier_tracking_ref')
     def _compute_package_carrier_tracking_ref(self):
diff --git a/delivery_hibou/views/stock_views.xml b/delivery_hibou/views/stock_views.xml
index f806127d..1f920118 100644
--- a/delivery_hibou/views/stock_views.xml
+++ b/delivery_hibou/views/stock_views.xml
@@ -28,10 +28,11 @@
         <field name="priority" eval="200" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='carrier_id']" position="before">
+                <field name="commercial_partner_id" invisible="1" />
                 <field name="require_insurance" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"/>
                 <field name="shipping_account_id" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
                        options="{'no_create': True, 'no_open': True}"
-                       domain="['|', ('partner_id', '=', False), ('partner_id', '=', partner_id)]"/>
+                       domain="[('partner_id', 'in', (False, partner_id, commercial_partner_id))]"/>
                 <field name="package_carrier_tracking_ref" attrs="{'invisible': [('package_carrier_tracking_ref', '=', False)]}" />
                 <button name="clear_carrier_tracking_ref" type="object" string="Clear Tracking" attrs="{'invisible': [('carrier_tracking_ref', '!=', False)]}" />
                 <button name="reset_carrier_tracking_ref" type="object" string="Reset Tracking" attrs="{'invisible': [('package_carrier_tracking_ref', '!=', False)]}" />