From b90e7056449b76581bdc77d0b5533d58ce675dcb Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Tue, 12 Dec 2023 17:25:29 +0100
Subject: [PATCH 1/9] [IMP] joint_buying_base : merge transports and tours main
 menu items

---
 joint_buying_base/views/menu.xml                            | 6 ------
 joint_buying_base/views/view_joint_buying_tour.xml          | 2 +-
 .../views/view_joint_buying_transport_request.xml           | 2 +-
 joint_buying_base/views/view_res_partner.xml                | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/joint_buying_base/views/menu.xml b/joint_buying_base/views/menu.xml
index 39d200b2..2f1c8e34 100644
--- a/joint_buying_base/views/menu.xml
+++ b/joint_buying_base/views/menu.xml
@@ -24,12 +24,6 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         sequence="15"
     />
 
-    <menuitem id="menu_journey"
-        name="Journeys"
-        parent="menu_root"
-        sequence="20"
-    />
-
     <menuitem id="menu_configuration"
         name="Configuration"
         parent="menu_root"
diff --git a/joint_buying_base/views/view_joint_buying_tour.xml b/joint_buying_base/views/view_joint_buying_tour.xml
index dd0220db..c4c2421b 100644
--- a/joint_buying_base/views/view_joint_buying_tour.xml
+++ b/joint_buying_base/views/view_joint_buying_tour.xml
@@ -172,7 +172,7 @@ There may be traffic jams, delays, unforeseen events, etc...
 
     <menuitem id="menu_joint_buying_tour_all"
         name="Tours"
-        parent="menu_journey"
+        parent="menu_transport"
         action="action_joint_buying_tour_all"
         sequence="10"
     />
diff --git a/joint_buying_base/views/view_joint_buying_transport_request.xml b/joint_buying_base/views/view_joint_buying_transport_request.xml
index be49a98f..c6481ccc 100644
--- a/joint_buying_base/views/view_joint_buying_transport_request.xml
+++ b/joint_buying_base/views/view_joint_buying_transport_request.xml
@@ -194,7 +194,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         name="Transport Requests"
         parent="joint_buying_base.menu_transport"
         action="action_joint_buying_transport_request"
-        sequence="1"
+        sequence="100"
         groups="joint_buying_base.group_joint_buying_user"
     />
 
diff --git a/joint_buying_base/views/view_res_partner.xml b/joint_buying_base/views/view_res_partner.xml
index f9642fc9..0444efca 100644
--- a/joint_buying_base/views/view_res_partner.xml
+++ b/joint_buying_base/views/view_res_partner.xml
@@ -252,7 +252,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
     <menuitem id="menu_res_partner_stage"
         name="Stages"
-        parent="menu_journey"
+        parent="menu_transport"
         action="action_res_partner_stage"
         sequence="20"
     />

From f159fe519d6bf5d90631a3e1413a946a522680c7 Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Tue, 12 Dec 2023 17:31:36 +0100
Subject: [PATCH 2/9] [REF] joint_buying_product : refactor Orders / grouped
 orders menu items, creating sub items

---
 joint_buying_product/views/menu.xml              | 14 +++++++++++++-
 .../views/view_joint_buying_purchase_order.xml   | 16 ++++++++--------
 .../view_joint_buying_purchase_order_grouped.xml | 10 +++++-----
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/joint_buying_product/views/menu.xml b/joint_buying_product/views/menu.xml
index 134653c0..2061a08b 100644
--- a/joint_buying_product/views/menu.xml
+++ b/joint_buying_product/views/menu.xml
@@ -6,10 +6,22 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 <odoo>
 
-    <menuitem id="menu_order"
+    <menuitem id="menu_order_main"
         name="Orders"
         parent="joint_buying_base.menu_root"
         sequence="1"
     />
 
+    <menuitem id="menu_joint_buying_purchase_order"
+        name="Orders"
+        parent="joint_buying_product.menu_order_main"
+        sequence="10"
+    />
+
+    <menuitem id="menu_joint_buying_purchase_order_grouped"
+        name="Grouped Orders"
+        parent="joint_buying_product.menu_order_main"
+        sequence="100"
+    />
+
 </odoo>
diff --git a/joint_buying_product/views/view_joint_buying_purchase_order.xml b/joint_buying_product/views/view_joint_buying_purchase_order.xml
index c68a936f..f8c2649c 100644
--- a/joint_buying_product/views/view_joint_buying_purchase_order.xml
+++ b/joint_buying_product/views/view_joint_buying_purchase_order.xml
@@ -208,9 +208,9 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
     <menuitem id="menu_joint_buying_purchase_order_to_place_my"
         name="My Orders to Place"
-        parent="joint_buying_product.menu_order"
+        parent="joint_buying_product.menu_joint_buying_purchase_order"
         action="action_joint_buying_purchase_order_to_place_my"
-        sequence="1"
+        sequence="10"
     />
 
     <record id="view_joint_buying_purchase_order_placed_my_tree" model="ir.ui.view">
@@ -240,9 +240,9 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
     <menuitem id="menu_joint_buying_purchase_order_placed_my"
         name="My Placed Orders"
-        parent="joint_buying_product.menu_order"
+        parent="joint_buying_product.menu_joint_buying_purchase_order"
         action="action_joint_buying_purchase_order_placed_my"
-        sequence="2"
+        sequence="20"
     />
 
     <record id="action_joint_buying_purchase_order_skipped_my" model="ir.actions.act_window">
@@ -261,9 +261,9 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
     <menuitem id="menu_joint_buying_purchase_order_skipped_my"
         name="My Skipped Orders"
-        parent="joint_buying_product.menu_order"
+        parent="joint_buying_product.menu_joint_buying_purchase_order"
         action="action_joint_buying_purchase_order_skipped_my"
-        sequence="3"
+        sequence="30"
     />
 
     <record id="action_joint_buying_purchase_order_all" model="ir.actions.act_window">
@@ -279,9 +279,9 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
     <menuitem id="menu_joint_buying_purchase_order_all"
         name="All Orders"
-        parent="joint_buying_product.menu_order"
+        parent="joint_buying_product.menu_joint_buying_purchase_order"
         action="action_joint_buying_purchase_order_all"
-        sequence="55"
+        sequence="100"
         groups="joint_buying_base.group_joint_buying_manager"
     />
 
diff --git a/joint_buying_product/views/view_joint_buying_purchase_order_grouped.xml b/joint_buying_product/views/view_joint_buying_purchase_order_grouped.xml
index 0c491779..508ea9ec 100644
--- a/joint_buying_product/views/view_joint_buying_purchase_order_grouped.xml
+++ b/joint_buying_product/views/view_joint_buying_purchase_order_grouped.xml
@@ -250,9 +250,9 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
     <menuitem id="menu_joint_buying_purchase_order_grouped_pending"
         name="Pending Grouped Orders"
-        parent="joint_buying_product.menu_order"
+        parent="joint_buying_product.menu_joint_buying_purchase_order_grouped"
         action="action_joint_buying_purchase_order_grouped_pending"
-        sequence="40"
+        sequence="10"
         groups="joint_buying_base.group_joint_buying_user"
     />
 
@@ -267,11 +267,11 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         }</field>
     </record>
 
-    <menuitem id="menu_joint_buying_purchase_order_grouped"
+    <menuitem id="menu_joint_buying_purchase_order_grouped_all"
         name="All Grouped Orders"
-        parent="joint_buying_product.menu_order"
+        parent="joint_buying_product.menu_joint_buying_purchase_order_grouped"
         action="action_joint_buying_purchase_order_grouped_all"
-        sequence="50"
+        sequence="100"
         groups="joint_buying_base.group_joint_buying_user"
     />
 

From 1c7532ae29283ce0ec5485748e772e6fbe69befc Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Tue, 12 Dec 2023 17:38:00 +0100
Subject: [PATCH 3/9] [REF] joint_buying_base/product : Create a new 'Catalog'
 Menu entry that merges 'Suppliers' and 'Products' Items

---
 joint_buying_base/views/menu.xml                    | 6 ++++++
 joint_buying_base/views/view_res_partner.xml        | 2 +-
 joint_buying_product/views/view_product_product.xml | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/joint_buying_base/views/menu.xml b/joint_buying_base/views/menu.xml
index 2f1c8e34..702a1475 100644
--- a/joint_buying_base/views/menu.xml
+++ b/joint_buying_base/views/menu.xml
@@ -12,6 +12,12 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         groups="group_joint_buying_user"
     />
 
+    <menuitem id="menu_catalog_main"
+        name="Catalog"
+        parent="menu_root"
+        sequence="5"
+    />
+
     <menuitem id="menu_transport"
         name="Transports"
         parent="menu_root"
diff --git a/joint_buying_base/views/view_res_partner.xml b/joint_buying_base/views/view_res_partner.xml
index 0444efca..488875da 100644
--- a/joint_buying_base/views/view_res_partner.xml
+++ b/joint_buying_base/views/view_res_partner.xml
@@ -225,7 +225,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
     <menuitem id="menu_res_partner_supplier"
         name="Suppliers"
-        parent="menu_root"
+        parent="menu_catalog_main"
         action="action_res_partner_supplier"
         sequence="5"
     />
diff --git a/joint_buying_product/views/view_product_product.xml b/joint_buying_product/views/view_product_product.xml
index 0253b55e..58856082 100644
--- a/joint_buying_product/views/view_product_product.xml
+++ b/joint_buying_product/views/view_product_product.xml
@@ -168,7 +168,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
     <menuitem id="menu_product_product"
         name="Products"
-        parent="joint_buying_base.menu_root"
+        parent="joint_buying_base.menu_catalog_main"
         action="action_product_product"
         sequence="20"
     />

From e9b324f37bc3097cc9eacdd246681fa4eb694179 Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Tue, 12 Dec 2023 17:50:08 +0100
Subject: [PATCH 4/9] [IMP] joint_buying_base : Add server action to mass
 recompute transport requests

---
 .../views/view_joint_buying_transport_request.xml        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/joint_buying_base/views/view_joint_buying_transport_request.xml b/joint_buying_base/views/view_joint_buying_transport_request.xml
index c6481ccc..4d6c898f 100644
--- a/joint_buying_base/views/view_joint_buying_transport_request.xml
+++ b/joint_buying_base/views/view_joint_buying_transport_request.xml
@@ -6,6 +6,15 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 <odoo>
 
+    <record id="action_server_module_immediate_install" model="ir.actions.server">
+        <field name="name">Compute Route</field>
+        <field name="type">ir.actions.server</field>
+        <field name="model_id" ref="model_joint_buying_transport_request" />
+        <field name="binding_model_id" ref="model_joint_buying_transport_request" />
+        <field name="state">code</field>
+        <field name="code">records.button_compute_tour()</field>
+    </record>
+
     <record id="action_request_2_wizard_find_route" model="ir.actions.act_window">
         <field name="name">Find the Best Route</field>
         <field name="type">ir.actions.act_window</field>

From ded79f1fb60ab9e65de563d07a4121bc5f4f6e6f Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Tue, 12 Dec 2023 22:25:00 +0100
Subject: [PATCH 5/9] [IMP] joint_buying_base : Add a new menu entry to display
 tours that passes thought the current company

---
 joint_buying_base/models/joint_buying_tour.py | 31 +++++++++++++++++++
 joint_buying_base/views/menu.xml              |  9 +++++-
 .../views/view_joint_buying_tour.xml          | 26 +++++++++++++---
 .../view_joint_buying_transport_request.xml   |  4 +--
 joint_buying_base/views/view_res_partner.xml  |  2 +-
 5 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/joint_buying_base/models/joint_buying_tour.py b/joint_buying_base/models/joint_buying_tour.py
index a7391ef6..e200581b 100644
--- a/joint_buying_base/models/joint_buying_tour.py
+++ b/joint_buying_base/models/joint_buying_tour.py
@@ -101,6 +101,13 @@ class JointBuyingTour(models.Model):
 
     transport_request_qty = fields.Integer(compute="_compute_transport_request_qty")
 
+    is_on_my_way = fields.Boolean(
+        compute="_compute_is_on_my_way",
+        search="_search_is_on_my_way",
+        help="Technical field that indicates that the tour"
+        " passes through the current company.",
+    )
+
     @api.onchange("type_id")
     def _onchange_type_id(self):
         if self.type_id and self.type_id.carrier_id:
@@ -271,6 +278,30 @@ def _compute_points(self):
             tour.starting_point_id = journey_lines[0].starting_point_id
             tour.arrival_point_id = journey_lines[-1].arrival_point_id
 
+    @api.depends("line_ids.starting_point_id", "line_ids.arrival_point_id")
+    def _compute_is_on_my_way(self):
+        current_partner = self.env.user.company_id.joint_buying_partner_id
+        for tour in self:
+            tour.is_on_my_way = current_partner in self.mapped(
+                "line_ids.starting_point_id"
+            ) or current_partner in self.mapped("line_ids.arrival_point_id")
+
+    # Search Section
+    def _search_is_on_my_way(self, operator, value):
+        current_partner = self.env.user.company_id.joint_buying_partner_id
+        if (operator == "=" and value) or (operator == "!=" and not value):
+            search_operator = "in"
+        else:
+            search_operator = "not in"
+        tour_lines = self.env["joint.buying.tour.line"].search(
+            [
+                "|",
+                ("starting_point_id", "=", current_partner.id),
+                ("arrival_point_id", "=", current_partner.id),
+            ]
+        )
+        return [("id", search_operator, tour_lines.mapped("tour_id").ids)]
+
     # Overload Section
     @api.multi
     def copy(self, default=None):
diff --git a/joint_buying_base/views/menu.xml b/joint_buying_base/views/menu.xml
index 702a1475..8346ad0a 100644
--- a/joint_buying_base/views/menu.xml
+++ b/joint_buying_base/views/menu.xml
@@ -18,12 +18,19 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         sequence="5"
     />
 
-    <menuitem id="menu_transport"
+    <menuitem id="menu_transport_main"
         name="Transports"
         parent="menu_root"
         sequence="10"
     />
 
+    <menuitem id="menu_tour"
+        name="Tours"
+        parent="menu_transport_main"
+        sequence="100"
+    />
+
+
     <menuitem id="menu_pivot"
         name="Pivot Role"
         parent="menu_root"
diff --git a/joint_buying_base/views/view_joint_buying_tour.xml b/joint_buying_base/views/view_joint_buying_tour.xml
index c4c2421b..4287b9eb 100644
--- a/joint_buying_base/views/view_joint_buying_tour.xml
+++ b/joint_buying_base/views/view_joint_buying_tour.xml
@@ -22,6 +22,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                 <field name="name"/>
                 <field name="start_date"/>
                 <field name="carrier_id"/>
+                <field name="is_on_my_way"/>
             </search>
         </field>
     </record>
@@ -162,19 +163,36 @@ There may be traffic jams, delays, unforeseen events, etc...
         </field>
     </record>
 
+    <record id="action_joint_buying_tour_my" model="ir.actions.act_window">
+        <field name="name">My Tours</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">joint.buying.tour</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">calendar,tree,form</field>
+        <field name="domain">[('is_on_my_way', '=', True)]</field>
+    </record>
+
+    <menuitem id="menu_joint_buying_tour_my"
+        name="My Tours"
+        parent="menu_tour"
+        action="action_joint_buying_tour_my"
+        sequence="10"
+    />
+
     <record id="action_joint_buying_tour_all" model="ir.actions.act_window">
-        <field name="name">Tours</field>
+        <field name="name">All Tours</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">joint.buying.tour</field>
         <field name="view_type">form</field>
         <field name="view_mode">calendar,tree,form</field>
     </record>
 
+
     <menuitem id="menu_joint_buying_tour_all"
-        name="Tours"
-        parent="menu_transport"
+        name="All Tours"
+        parent="menu_tour"
         action="action_joint_buying_tour_all"
-        sequence="10"
+        sequence="20"
     />
 
 </odoo>
diff --git a/joint_buying_base/views/view_joint_buying_transport_request.xml b/joint_buying_base/views/view_joint_buying_transport_request.xml
index 4d6c898f..64474b5f 100644
--- a/joint_buying_base/views/view_joint_buying_transport_request.xml
+++ b/joint_buying_base/views/view_joint_buying_transport_request.xml
@@ -201,9 +201,9 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
     <menuitem id="menu_joint_buying_transport_request"
         name="Transport Requests"
-        parent="joint_buying_base.menu_transport"
+        parent="joint_buying_base.menu_transport_main"
         action="action_joint_buying_transport_request"
-        sequence="100"
+        sequence="200"
         groups="joint_buying_base.group_joint_buying_user"
     />
 
diff --git a/joint_buying_base/views/view_res_partner.xml b/joint_buying_base/views/view_res_partner.xml
index 488875da..650b41e8 100644
--- a/joint_buying_base/views/view_res_partner.xml
+++ b/joint_buying_base/views/view_res_partner.xml
@@ -252,7 +252,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
     <menuitem id="menu_res_partner_stage"
         name="Stages"
-        parent="menu_transport"
+        parent="menu_transport_main"
         action="action_res_partner_stage"
         sequence="20"
     />

From 6775276f167f05434af15f8cb745114650a8b7f1 Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Tue, 12 Dec 2023 22:26:15 +0100
Subject: [PATCH 6/9] [REM] joint_buying_base : Remove 'Stages' Entry in
 transport menu

---
 joint_buying_base/views/view_res_partner.xml | 27 --------------------
 1 file changed, 27 deletions(-)

diff --git a/joint_buying_base/views/view_res_partner.xml b/joint_buying_base/views/view_res_partner.xml
index 650b41e8..f5c44bc9 100644
--- a/joint_buying_base/views/view_res_partner.xml
+++ b/joint_buying_base/views/view_res_partner.xml
@@ -230,33 +230,6 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         sequence="5"
     />
 
-
-    <record id="action_res_partner_stage" model="ir.actions.act_window">
-        <field name="name">Stages</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">res.partner</field>
-        <field name="view_mode">leaflet_map,tree,form</field>
-        <field name="search_view_id" ref="view_res_partner_joint_buying_search"></field>
-        <field name="domain">[('is_joint_buying_stage', '=', 1)]</field>
-        <field name="context">
-            {
-                "joint_buying": 1,
-                "default_customer": 0,
-                "default_supplier": 1,
-                "form_view_ref": "joint_buying_base.view_res_partner_form",
-                "tree_view_ref": "joint_buying_base.view_res_partner_tree",
-                "leaflet_map_view_ref": "joint_buying_base.view_res_partner_leaflet_map_from_tour",
-            }
-        </field>
-    </record>
-
-    <menuitem id="menu_res_partner_stage"
-        name="Stages"
-        parent="menu_transport_main"
-        action="action_res_partner_stage"
-        sequence="20"
-    />
-
     <record id="action_res_partner_supplier_editable" model="ir.actions.act_window">
         <field name="name">Suppliers (Editable View)</field>
         <field name="type">ir.actions.act_window</field>

From d3e097455659719e1fdef766470c4538d181a5d5 Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Tue, 12 Dec 2023 22:29:45 +0100
Subject: [PATCH 7/9] [IMP] joint_buying_product : Add new view to displays all
 'My' Orders

---
 .../view_joint_buying_purchase_order.xml      | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/joint_buying_product/views/view_joint_buying_purchase_order.xml b/joint_buying_product/views/view_joint_buying_purchase_order.xml
index f8c2649c..a8970ccc 100644
--- a/joint_buying_product/views/view_joint_buying_purchase_order.xml
+++ b/joint_buying_product/views/view_joint_buying_purchase_order.xml
@@ -266,6 +266,27 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         sequence="30"
     />
 
+    <record id="action_joint_buying_purchase_order_my" model="ir.actions.act_window">
+        <field name="name">My Orders</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">joint.buying.purchase.order</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,calendar,form</field>
+        <field name="domain">[("is_mine_customer", "=", True)]</field>
+        <field name="view_id" ref="view_joint_buying_purchase_order_placed_my_tree"/>
+        <field name="context">{
+            "joint_buying": 1,
+            "invisible_customer_id": 1,
+        }</field>
+    </record>
+
+    <menuitem id="menu_joint_buying_purchase_order_my"
+        name="My Orders"
+        parent="joint_buying_product.menu_joint_buying_purchase_order"
+        action="action_joint_buying_purchase_order_my"
+        sequence="40"
+    />
+
     <record id="action_joint_buying_purchase_order_all" model="ir.actions.act_window">
         <field name="name">All Orders</field>
         <field name="type">ir.actions.act_window</field>

From 81cb1a523e9909e61db09a44a5c37634509e3a98 Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Tue, 12 Dec 2023 22:30:17 +0100
Subject: [PATCH 8/9] [FIX] joint_buying_base : typo in loop

---
 joint_buying_base/models/joint_buying_tour.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/joint_buying_base/models/joint_buying_tour.py b/joint_buying_base/models/joint_buying_tour.py
index e200581b..3d62cb0d 100644
--- a/joint_buying_base/models/joint_buying_tour.py
+++ b/joint_buying_base/models/joint_buying_tour.py
@@ -134,9 +134,9 @@ def _compute_name(self):
 
     @api.depends("line_ids.transport_request_line_ids.request_id")
     def _compute_transport_request_qty(self):
-        for request in self:
-            request.transport_request_qty = len(
-                request.mapped("line_ids.transport_request_line_ids.request_id")
+        for tour in self:
+            tour.transport_request_qty = len(
+                tour.mapped("line_ids.transport_request_line_ids.request_id")
             )
 
     @api.depends("salary_cost", "toll_cost", "vehicle_cost")

From 66ea13f2e756665510758d8277b5bc8533d6efff Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Wed, 13 Dec 2023 21:36:01 +0100
Subject: [PATCH 9/9] [TR] Update french translation

---
 joint_buying_base/i18n/fr.po    | 70 ++++++++++++++++++++-------------
 joint_buying_product/i18n/fr.po | 20 +++++++---
 joint_buying_sale/i18n/fr.po    |  6 +--
 3 files changed, 60 insertions(+), 36 deletions(-)

diff --git a/joint_buying_base/i18n/fr.po b/joint_buying_base/i18n/fr.po
index 0dbe9b35..42cd1927 100644
--- a/joint_buying_base/i18n/fr.po
+++ b/joint_buying_base/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-04 21:11+0000\n"
-"PO-Revision-Date: 2023-09-04 21:11+0000\n"
+"POT-Creation-Date: 2023-12-13 20:27+0000\n"
+"PO-Revision-Date: 2023-12-13 20:27+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: joint_buying_base
-#: code:addons/joint_buying_base/models/joint_buying_tour.py:279
+#: code:addons/joint_buying_base/models/joint_buying_tour.py:310
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copie)"
@@ -32,19 +32,19 @@ msgid "<b>Company Address:</b>"
 msgstr "<b>Adresse de la société:</b>"
 
 #. module: joint_buying_base
-#: code:addons/joint_buying_base/models/joint_buying_tour.py:234
+#: code:addons/joint_buying_base/models/joint_buying_tour.py:241
 #, python-format
 msgid "<i>Delivery and pick-up</i>"
 msgstr "<i>Livraison et retrait</i>"
 
 #. module: joint_buying_base
-#: code:addons/joint_buying_base/models/joint_buying_tour.py:230
+#: code:addons/joint_buying_base/models/joint_buying_tour.py:237
 #, python-format
 msgid "<i>Truck loading</i>"
 msgstr "<i>Chargement du camion</i>"
 
 #. module: joint_buying_base
-#: code:addons/joint_buying_base/models/joint_buying_tour.py:232
+#: code:addons/joint_buying_base/models/joint_buying_tour.py:239
 #, python-format
 msgid "<i>Truck unloading</i>"
 msgstr "<i>Déchargement du camion</i>"
@@ -65,7 +65,7 @@ msgid "<span class=\"oe_inline\"> ( On  </span>"
 msgstr "<span class=\"oe_inline\"> ( Dans </span>"
 
 #. module: joint_buying_base
-#: code:addons/joint_buying_base/models/joint_buying_tour.py:227
+#: code:addons/joint_buying_base/models/joint_buying_tour.py:234
 #, python-format
 msgid "<span style='color: green'><b>Pause</b></span>"
 msgstr ""
@@ -156,6 +156,12 @@ msgstr "Adresse"
 msgid "All Contacts"
 msgstr "Tous les contacts"
 
+#. module: joint_buying_base
+#: model:ir.actions.act_window,name:joint_buying_base.action_joint_buying_tour_all
+#: model:ir.ui.menu,name:joint_buying_base.menu_joint_buying_tour_all
+msgid "All Tours"
+msgstr "Toutes les tournées"
+
 #. module: joint_buying_base
 #: model_terms:ir.ui.view,arch_db:joint_buying_base.view_joint_buying_wizard_find_route_form
 msgid "Apply"
@@ -265,6 +271,11 @@ msgstr "Transporteur"
 msgid "Carriers"
 msgstr "Transporteurs"
 
+#. module: joint_buying_base
+#: model:ir.ui.menu,name:joint_buying_base.menu_catalog_main
+msgid "Catalog"
+msgstr "Catalogue"
+
 #. module: joint_buying_base
 #: model:ir.model.fields,help:joint_buying_base.field_res_partner__is_joint_buying_stage
 #: model:ir.model.fields,help:joint_buying_base.field_res_users__is_joint_buying_stage
@@ -345,6 +356,7 @@ msgid "Complete Description"
 msgstr "Description complète"
 
 #. module: joint_buying_base
+#: model:ir.actions.server,name:joint_buying_base.action_server_module_immediate_install
 #: model_terms:ir.ui.view,arch_db:joint_buying_base.view_joint_buying_transport_request_form
 msgid "Compute Route"
 msgstr "Calculer l'itinéraire"
@@ -512,7 +524,7 @@ msgid "Distance"
 msgstr ""
 
 #. module: joint_buying_base
-#: code:addons/joint_buying_base/models/joint_buying_tour.py:126
+#: code:addons/joint_buying_base/models/joint_buying_tour.py:133
 #, python-format
 msgid "Draft Tour"
 msgstr "Tournée en brouillon"
@@ -683,6 +695,11 @@ msgstr "Est une simulation différente"
 msgid "Is Follower"
 msgstr "Est un abonné"
 
+#. module: joint_buying_base
+#: model:ir.model.fields,field_description:joint_buying_base.field_joint_buying_tour__is_on_my_way
+msgid "Is On My Way"
+msgstr "Passe par ici"
+
 #. module: joint_buying_base
 #: model:ir.model.fields,field_description:joint_buying_base.field_res_partner__is_joint_buying_stage
 #: model:ir.model.fields,field_description:joint_buying_base.field_res_users__is_joint_buying_stage
@@ -849,7 +866,7 @@ msgid "Journey"
 msgstr "Trajet"
 
 #. module: joint_buying_base
-#: code:addons/joint_buying_base/models/joint_buying_tour.py:222
+#: code:addons/joint_buying_base/models/joint_buying_tour.py:229
 #, python-format
 msgid "Journey from %s to %s"
 msgstr "Trajet de %s à %s"
@@ -859,11 +876,6 @@ msgstr "Trajet de %s à %s"
 msgid "Journey to"
 msgstr "Trajet vers"
 
-#. module: joint_buying_base
-#: model:ir.ui.menu,name:joint_buying_base.menu_journey
-msgid "Journeys"
-msgstr "Trajets"
-
 #. module: joint_buying_base
 #: model:ir.model.fields,field_description:joint_buying_base.field_joint_buying_carrier__kilometer_cost
 #: model:ir.model.fields,field_description:joint_buying_base.field_joint_buying_tour__kilometer_cost
@@ -979,6 +991,12 @@ msgstr ""
 msgid "My Suppliers"
 msgstr "Mes fournisseurs"
 
+#. module: joint_buying_base
+#: model:ir.actions.act_window,name:joint_buying_base.action_joint_buying_tour_my
+#: model:ir.ui.menu,name:joint_buying_base.menu_joint_buying_tour_my
+msgid "My Tours"
+msgstr "Mes tournées"
+
 #. module: joint_buying_base
 #: model:ir.model.fields,field_description:joint_buying_base.field_joint_buying_carrier__name
 #: model:ir.model.fields,field_description:joint_buying_base.field_joint_buying_tour__name
@@ -1157,7 +1175,7 @@ msgstr "Les prévisions de trajets sont données à titre indicatif seulement !
 " Il peut y avoir des bouchons, des retards, des imprévus, etc..."
 
 #. module: joint_buying_base
-#: code:addons/joint_buying_base/models/joint_buying_tour.py:154
+#: code:addons/joint_buying_base/models/joint_buying_tour.py:161
 #, python-format
 msgid "Salary"
 msgstr "Salaire"
@@ -1204,12 +1222,6 @@ msgstr "Configuration"
 msgid "Signed"
 msgstr "Signé"
 
-#. module: joint_buying_base
-#: model:ir.actions.act_window,name:joint_buying_base.action_res_partner_stage
-#: model:ir.ui.menu,name:joint_buying_base.menu_res_partner_stage
-msgid "Stages"
-msgstr "Etapes"
-
 #. module: joint_buying_base
 #: model:ir.model.fields,field_description:joint_buying_base.field_joint_buying_transport_request_line__start_action_type
 msgid "Start Action Type"
@@ -1342,6 +1354,11 @@ msgstr "Champs techniques"
 msgid "Technical Information"
 msgstr "Informations techniques"
 
+#. module: joint_buying_base
+#: model:ir.model.fields,help:joint_buying_base.field_joint_buying_tour__is_on_my_way
+msgid "Technical field that indicates that the tour passes through the current company."
+msgstr "Champ technique qui indique que la tournée passe par la société en cours."
+
 #. module: joint_buying_base
 #: model:ir.model.fields,help:joint_buying_base.field_res_partner__joint_buying_display_name_step
 #: model:ir.model.fields,help:joint_buying_base.field_res_users__joint_buying_display_name_step
@@ -1373,7 +1390,7 @@ msgid "Today"
 msgstr "Aujourd'hui"
 
 #. module: joint_buying_base
-#: code:addons/joint_buying_base/models/joint_buying_tour.py:156
+#: code:addons/joint_buying_base/models/joint_buying_tour.py:163
 #, python-format
 msgid "Toll"
 msgstr "Péage"
@@ -1433,8 +1450,7 @@ msgid "Tour Types"
 msgstr "Types de tournées"
 
 #. module: joint_buying_base
-#: model:ir.actions.act_window,name:joint_buying_base.action_joint_buying_tour_all
-#: model:ir.ui.menu,name:joint_buying_base.menu_joint_buying_tour_all
+#: model:ir.ui.menu,name:joint_buying_base.menu_tour
 msgid "Tours"
 msgstr "Tournées"
 
@@ -1462,9 +1478,9 @@ msgid "Transport Requests"
 msgstr "Demandes de transport"
 
 #. module: joint_buying_base
-#: model:ir.ui.menu,name:joint_buying_base.menu_transport
+#: model:ir.ui.menu,name:joint_buying_base.menu_transport_main
 msgid "Transports"
-msgstr "Transports"
+msgstr ""
 
 #. module: joint_buying_base
 #: model:ir.model.fields,field_description:joint_buying_base.field_joint_buying_wizard_find_route__tree_text
@@ -1535,7 +1551,7 @@ msgid "Vegetable"
 msgstr "Légumes"
 
 #. module: joint_buying_base
-#: code:addons/joint_buying_base/models/joint_buying_tour.py:155
+#: code:addons/joint_buying_base/models/joint_buying_tour.py:162
 #, python-format
 msgid "Vehicle"
 msgstr "Véhicule"
diff --git a/joint_buying_product/i18n/fr.po b/joint_buying_product/i18n/fr.po
index 42382617..d4b5d112 100644
--- a/joint_buying_product/i18n/fr.po
+++ b/joint_buying_product/i18n/fr.po
@@ -1,13 +1,13 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* joint_buying_product
+#   * joint_buying_product
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-08-02 15:41+0000\n"
-"PO-Revision-Date: 2022-08-02 15:41+0000\n"
+"POT-Creation-Date: 2023-12-13 20:31+0000\n"
+"PO-Revision-Date: 2023-12-13 20:31+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -351,7 +351,7 @@ msgstr "Contacts supplémentaires"
 
 #. module: joint_buying_product
 #: model:ir.actions.act_window,name:joint_buying_product.action_joint_buying_purchase_order_grouped_all
-#: model:ir.ui.menu,name:joint_buying_product.menu_joint_buying_purchase_order_grouped
+#: model:ir.ui.menu,name:joint_buying_product.menu_joint_buying_purchase_order_grouped_all
 msgid "All Grouped Orders"
 msgstr "Toutes les commandes groupées"
 
@@ -847,6 +847,7 @@ msgstr "La Commande groupée (Réf ${object.name}) vient de commencer"
 
 #. module: joint_buying_product
 #: model:ir.actions.act_window,name:joint_buying_product.action_res_partner_2_joint_buying_purchase_order_grouped
+#: model:ir.ui.menu,name:joint_buying_product.menu_joint_buying_purchase_order_grouped
 msgid "Grouped Orders"
 msgstr "Commandes groupées"
 
@@ -1334,7 +1335,7 @@ msgstr "Minima pour les commandes groupées ponctuelles"
 #: model_terms:ir.ui.view,arch_db:joint_buying_product.view_joint_buying_purchase_order_grouped_form
 #: model_terms:ir.ui.view,arch_db:joint_buying_product.view_joint_buying_wizard_create_order_form
 msgid "Minimum Amount"
-msgstr "Franco"
+msgstr "Montant minimal"
 
 #. module: joint_buying_product
 #: model:ir.model.fields,field_description:joint_buying_product.field_joint_buying_frequency__minimum_amount
@@ -1416,6 +1417,12 @@ msgstr "Statut de la Modération"
 msgid "My Grouped Orders"
 msgstr "Mes commandes groupées"
 
+#. module: joint_buying_product
+#: model:ir.actions.act_window,name:joint_buying_product.action_joint_buying_purchase_order_my
+#: model:ir.ui.menu,name:joint_buying_product.menu_joint_buying_purchase_order_my
+msgid "My Orders"
+msgstr "Mes commandes"
+
 #. module: joint_buying_product
 #: model:ir.actions.act_window,name:joint_buying_product.action_joint_buying_purchase_order_to_place_my
 #: model:ir.ui.menu,name:joint_buying_product.menu_joint_buying_purchase_order_to_place_my
@@ -1707,7 +1714,8 @@ msgstr "Ligne de commande"
 
 #. module: joint_buying_product
 #: model:ir.actions.act_window,name:joint_buying_product.action_order_grouped_2_order
-#: model:ir.ui.menu,name:joint_buying_product.menu_order
+#: model:ir.ui.menu,name:joint_buying_product.menu_joint_buying_purchase_order
+#: model:ir.ui.menu,name:joint_buying_product.menu_order_main
 #: model_terms:ir.ui.view,arch_db:joint_buying_product.view_joint_buying_purchase_order_grouped_form
 msgid "Orders"
 msgstr "Commandes"
diff --git a/joint_buying_sale/i18n/fr.po b/joint_buying_sale/i18n/fr.po
index b3ce5b13..9391fcd0 100644
--- a/joint_buying_sale/i18n/fr.po
+++ b/joint_buying_sale/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-16 14:27+0000\n"
-"PO-Revision-Date: 2022-11-16 14:27+0000\n"
+"POT-Creation-Date: 2023-12-13 20:34+0000\n"
+"PO-Revision-Date: 2023-12-13 20:34+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -201,7 +201,7 @@ msgstr "Bon de commande associé dans la base de données locale du fournisseur,
 #. module: joint_buying_sale
 #: model:ir.model.fields,field_description:joint_buying_sale.field_joint_buying_transport_request__request_type
 msgid "Request Type"
-msgstr "Type de requête"
+msgstr "Type de demande"
 
 #. module: joint_buying_sale
 #: model:ir.model,name:joint_buying_sale.model_sale_order