From 0240730c15487982467ca75f22182355b6d3b15a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20BEAU?= <sebastien.beau@akretion.com>
Date: Thu, 28 Nov 2024 23:36:39 +0100
Subject: [PATCH] delivery_roulier_picking_batch: add partner on
 stock_picking_batch, and improve view

---
 .../models/stock_picking_batch.py             |  8 ++++---
 .../views/stock_picking_batch_views.xml       | 22 ++++++++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/delivery_roulier_picking_batch/models/stock_picking_batch.py b/delivery_roulier_picking_batch/models/stock_picking_batch.py
index ebd5ff234d..0ad801c110 100644
--- a/delivery_roulier_picking_batch/models/stock_picking_batch.py
+++ b/delivery_roulier_picking_batch/models/stock_picking_batch.py
@@ -20,8 +20,10 @@ def _get_default_weight_uom(self):
         "delivery.carrier", string="Carrier", check_company=True
     )
     partner_id = fields.Many2one(
-        "res.partner", string="Delivery Address", check_company=True,
-        )
+        "res.partner",
+        string="Delivery Address",
+        check_company=True,
+    )
     weight = fields.Float(
         compute="_compute_weight",
         digits="Stock Weight",
@@ -52,7 +54,7 @@ def _compute_allowed_picking_ids(self):
             if record.partner_id:
                 record.allowed_picking_ids = record.allowed_picking_ids.filtered(
                     lambda s: s.partner_id == record.partner_id
-                    )
+                )
 
     @api.constrains("carrier_id")
     def _check_carrier_id_is_roulier(self):
diff --git a/delivery_roulier_picking_batch/views/stock_picking_batch_views.xml b/delivery_roulier_picking_batch/views/stock_picking_batch_views.xml
index b3648160fb..674d15c8c9 100644
--- a/delivery_roulier_picking_batch/views/stock_picking_batch_views.xml
+++ b/delivery_roulier_picking_batch/views/stock_picking_batch_views.xml
@@ -10,8 +10,8 @@
         <field name="inherit_id" ref="stock_picking_batch.stock_picking_batch_tree" />
         <field name="arch" type="xml">
             <field name="user_id" position="after">
-                <field name="partner_id"/>
-                <field name="carrier_id"/>
+                <field name="partner_id" />
+                <field name="carrier_id" />
             </field>
         </field>
     </record>
@@ -21,12 +21,22 @@
         <field name="inherit_id" ref="stock_picking_batch.stock_picking_batch_filter" />
         <field name="arch" type="xml">
             <field name="user_id" position="after">
-                <field name="partner_id"/>
-                <field name="carrier_id"/>
+                <field name="partner_id" />
+                <field name="carrier_id" />
             </field>
             <filter name="user" position="after">
-                <filter string="Partner" name="partner" domain="[]" context="{'group_by': 'partner_id'}"/>
-                <filter string="Carrier" name="carrier" domain="[]" context="{'group_by': 'carrier_id'}"/>
+                <filter
+                    string="Partner"
+                    name="partner"
+                    domain="[]"
+                    context="{'group_by': 'partner_id'}"
+                />
+                <filter
+                    string="Carrier"
+                    name="carrier"
+                    domain="[]"
+                    context="{'group_by': 'carrier_id'}"
+                />
             </filter>
         </field>
     </record>