From 47809f2fe6b2b1eb7b6bf4dd4bc1a31e0cf41d97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kh=C3=B4i=20=28Ki=C3=AAn=20Kim=29?= <khoikk@trobz.com>
Date: Wed, 15 Jan 2025 11:06:23 +0700
Subject: [PATCH 1/2] [FIX] tms: Replace deprecated 'kanban-box' with 'card'

---
 tms/views/tms_crew.xml   | 2 +-
 tms/views/tms_driver.xml | 2 +-
 tms/views/tms_order.xml  | 2 +-
 tms/views/tms_team.xml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tms/views/tms_crew.xml b/tms/views/tms_crew.xml
index 6a2baad9..3ff63de9 100644
--- a/tms/views/tms_crew.xml
+++ b/tms/views/tms_crew.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <kanban class="o_kanban_mobile" sample="1">
                 <templates>
-                    <t t-name="kanban-box">
+                    <t t-name="card">
                         <div t-attf-class="oe_kanban_global_click card my-3">
                             <div class="card-body">
                                 <div class="d-flex align-items-center mb-2">
diff --git a/tms/views/tms_driver.xml b/tms/views/tms_driver.xml
index 3a273f9d..081cf80f 100644
--- a/tms/views/tms_driver.xml
+++ b/tms/views/tms_driver.xml
@@ -105,7 +105,7 @@
                 <field name="mobile" />
                 <field name="avatar_128" />
                 <templates>
-                    <t t-name="kanban-box">
+                    <t t-name="card">
                         <div
                             t-attf-class="oe_kanban_global_click o_has_icon oe_kanban_content oe_kanban_card"
                         >
diff --git a/tms/views/tms_order.xml b/tms/views/tms_order.xml
index 295a476e..3aafd859 100644
--- a/tms/views/tms_order.xml
+++ b/tms/views/tms_order.xml
@@ -237,7 +237,7 @@
                             </div>
                         </div>
                     </t>
-                    <t t-name="kanban-box">
+                    <t t-name="card">
                         <div
                             t-attf-class="oe_kanban_global_click o_has_icon oe_kanban_content oe_kanban_card"
                         >
diff --git a/tms/views/tms_team.xml b/tms/views/tms_team.xml
index a0123703..cbabf1e2 100644
--- a/tms/views/tms_team.xml
+++ b/tms/views/tms_team.xml
@@ -13,7 +13,7 @@
                 <field name="crew_ids" />
                 <field name="trips_todo_count" />
                 <templates>
-                    <t t-name="kanban-box">
+                    <t t-name="card">
                         <div
                             t-attf-class="oe_kanban_global_click o_has_icon oe_kanban_content oe_kanban_card"
                         >

From e6b0a392d21c8a2a19f0879d705f130895da6825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kh=C3=B4i=20=28Ki=C3=AAn=20Kim=29?= <khoikk@trobz.com>
Date: Wed, 15 Jan 2025 11:14:56 +0700
Subject: [PATCH 2/2] [FIX] tms: Fix duplicate labels for group_tms_uom and
 group_uom

---
 tms/models/res_config_settings.py | 2 +-
 tms/views/res_config_settings.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tms/models/res_config_settings.py b/tms/models/res_config_settings.py
index 1dbfb36f..b2e81309 100644
--- a/tms/models/res_config_settings.py
+++ b/tms/models/res_config_settings.py
@@ -33,7 +33,7 @@ class ResConfigSettings(models.TransientModel):
     )
 
     group_tms_uom = fields.Boolean(
-        string="Units of Measure", implied_group="uom.group_uom"
+        string="TMS Units of Measure", implied_group="uom.group_uom"
     )
 
     # Custom Fields
diff --git a/tms/views/res_config_settings.xml b/tms/views/res_config_settings.xml
index f9523c1d..70370d2a 100644
--- a/tms/views/res_config_settings.xml
+++ b/tms/views/res_config_settings.xml
@@ -14,14 +14,14 @@
                 >
                     <block title="Units" name="general_settings_container">
                         <setting id="tms_uom">
-                            <field name="group_tms_uom" string="Units of Measure" />
+                            <field name="group_tms_uom" string="TMS Units of Measure" />
                             <div class="content-group">
                                 <div class="mt8" invisible="not group_tms_uom">
                                     <button
                                         name="%(uom.product_uom_categ_form_action)d"
                                         icon="oi-arrow-right"
                                         type="action"
-                                        string="Units Of Measure"
+                                        string="TMS Units of Measure"
                                         class="btn-link"
                                     />
                                 </div>