From 2f0b631129e2a222052d54e1384076538c81f418 Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Thu, 19 Oct 2023 21:27:49 +0200
Subject: [PATCH 1/2] [FIX] bad translation of tours

---
 joint_buying_base/i18n/fr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/joint_buying_base/i18n/fr.po b/joint_buying_base/i18n/fr.po
index 2e35c23e..c2f6e432 100644
--- a/joint_buying_base/i18n/fr.po
+++ b/joint_buying_base/i18n/fr.po
@@ -1032,7 +1032,7 @@ msgstr "Types de tournées"
 #: 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 "Tours"
-msgstr "Visites"
+msgstr "Tournées"
 
 #. module: joint_buying_base
 #: model:ir.model.fields,field_description:joint_buying_base.field_joint_buying_tour__type_id

From dc20d5719d69cc9ca0f14d1ee84eac5278fa65d8 Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Thu, 19 Oct 2023 21:28:11 +0200
Subject: [PATCH 2/2] [IMP] joint_buying_base : group by carrier, instead of
 type, in calendar view

---
 joint_buying_base/views/view_joint_buying_tour.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/joint_buying_base/views/view_joint_buying_tour.xml b/joint_buying_base/views/view_joint_buying_tour.xml
index a4f0112d..5c8d7816 100644
--- a/joint_buying_base/views/view_joint_buying_tour.xml
+++ b/joint_buying_base/views/view_joint_buying_tour.xml
@@ -29,8 +29,8 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
     <record id="view_joint_buying_tour_calendar" model="ir.ui.view">
         <field name="model">joint.buying.tour</field>
         <field name="arch" type="xml">
-            <calendar date_start="start_date" date_stop="end_date" color="type_id">
-                <field name="type_id"/>
+            <calendar date_start="start_date" date_stop="end_date" color="carrier_id">
+                <field name="carrier_id"/>
                 <field name="summary"/>
             </calendar>
         </field>