From 78a2fd0de2de0318339d08a32eb1df6723df6840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 4 Aug 2024 17:08:56 +0200
Subject: [PATCH] Remove duplicate country field definition in tariff code

The CountryMatchMixin already defines a country and an organization field.
---
 modules/customs/customs.py                | 2 --
 modules/customs/view/duty_rate_form.xml   | 4 ++--
 modules/customs/view/tariff_code_form.xml | 5 +++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/customs/customs.py b/modules/customs/customs.py
index 0ed0323746..679017669d 100644
--- a/modules/customs/customs.py
+++ b/modules/customs/customs.py
@@ -47,8 +47,6 @@ class TariffCode(DeactivableMixin, CountryMatchMixin, ModelSQL, ModelView):
     code = fields.Char('Code', required=True,
         help='The code from Harmonized System of Nomenclature.')
     description = fields.Char('Description', translate=True)
-    country = fields.Many2One('country.country', 'Country')
-    # TODO country group
     start_month = fields.Many2One('ir.calendar.month', "Start Month",
         states={
             'required': Eval('end_month') | Eval('start_day'),
diff --git a/modules/customs/view/duty_rate_form.xml b/modules/customs/view/duty_rate_form.xml
index 382fb41902..3bdb132921 100644
--- a/modules/customs/view/duty_rate_form.xml
+++ b/modules/customs/view/duty_rate_form.xml
@@ -8,9 +8,9 @@ this repository contains the full copyright notices and license terms. -->
     <field name="type"/>
 
     <label name="country"/>
-    <field name="country"/>
+    <field name="country" colspan="3"/>
     <label name="organization"/>
-    <field name="organization"/>
+    <field name="organization" colspan="3"/>
 
     <label name="start_date"/>
     <field name="start_date"/>
diff --git a/modules/customs/view/tariff_code_form.xml b/modules/customs/view/tariff_code_form.xml
index bcff94f0f0..d6fd48ad96 100644
--- a/modules/customs/view/tariff_code_form.xml
+++ b/modules/customs/view/tariff_code_form.xml
@@ -10,9 +10,10 @@ this repository contains the full copyright notices and license terms. -->
     <field name="description" colspan="3"/>
 
     <label name="country"/>
-    <field name="country"/>
+    <field name="country" colspan="3"/>
+
     <label name="organization"/>
-    <field name="organization"/>
+    <field name="organization" colspan="3"/>
 
     <label id="from" string="From"/>
     <group id="start" col="2">