From 8adb594ba2d55e1f655c77abdccf97d329c6c359 Mon Sep 17 00:00:00 2001
From: Ludovic CHEVALIER <ludovic@beurresarrasin.net>
Date: Thu, 28 Mar 2024 16:30:53 +0100
Subject: [PATCH] [PYTHON][VIEW] siren-->siret

---
 i18n/fr.po           | 65 ++++++++++++++++++++++++--------------------
 i18n/lhc.pot         | 53 ++++++++++++++++++++----------------
 lhc.py               | 16 +++++------
 view/membership.xml  |  2 --
 view/res_partner.xml | 10 +++++++
 5 files changed, 82 insertions(+), 64 deletions(-)

diff --git a/i18n/fr.po b/i18n/fr.po
index 89f6f45..1bcf919 100644
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-08 16:39+0000\n"
-"PO-Revision-Date: 2023-01-08 17:41+0100\n"
+"POT-Creation-Date: 2024-03-28 15:23+0000\n"
+"PO-Revision-Date: 2024-03-28 16:29+0100\n"
 "Last-Translator: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>\n"
 "Language-Team: \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.2.2\n"
+"X-Generator: Poedit 3.4.2\n"
 
 #. module: lhc
 #: field:res.partner,rna:0
@@ -31,6 +31,11 @@ msgstr "Code du département"
 msgid "Unsent"
 msgstr "Non envoyée"
 
+#. module: lhc
+#: model:ir.model,name:lhc.model_hr_expense_line
+msgid "Expense Line"
+msgstr "Ligne de dépense"
+
 #. module: lhc
 #: view:res.partner:0
 msgid "All Companies Members"
@@ -86,6 +91,11 @@ msgstr "Année de démarrage de l'activité d'atelier"
 msgid "Invoicing"
 msgstr "Facturation"
 
+#. module: lhc
+#: model:ir.ui.menu,name:lhc.menu_rencontres_2016
+msgid "Rencontres 2016"
+msgstr "Rencontres 2016"
+
 #. module: lhc
 #: model:res.groups,name:lhc.group_rencontres
 msgid "Annual meeting organisation"
@@ -113,13 +123,8 @@ msgstr "Inscriptions"
 
 #. module: lhc
 #: view:res.partner:0
-msgid "W123456789"
-msgstr "W123456789"
-
-#. module: lhc
-#: view:res.partner:0
-msgid "123456789"
-msgstr "123456789"
+msgid "e.g. W123456789"
+msgstr "ex. W123456789"
 
 #. module: lhc
 #: model:ir.module.category,description:lhc.module_category_lhc
@@ -148,11 +153,6 @@ msgstr "Autres informations"
 msgid "Customer"
 msgstr "Client"
 
-#. module: lhc
-#: field:res.partner,siren:0
-msgid "SIREN"
-msgstr "SIREN"
-
 #. module: lhc
 #: field:event.registration,funding_main:0
 msgid "Main funding"
@@ -178,6 +178,11 @@ msgstr "Genre"
 msgid "Related sale order(s)"
 msgstr "Devis associé(s)"
 
+#. module: lhc
+#: view:res.partner:0
+msgid "e.g. 12345678901234"
+msgstr "ex. 12345678901234"
+
 #. module: lhc
 #: model:res.groups,name:lhc.group_ca
 msgid "Administration board members"
@@ -198,6 +203,11 @@ msgstr "Envoyer  par courriel"
 msgid "Partner"
 msgstr "Partenaire"
 
+#. module: lhc
+#: field:res.partner,siret:0
+msgid "SIRET"
+msgstr "SIRET"
+
 #. module: lhc
 #: field:event.registration,position:0
 msgid "Position"
@@ -251,21 +261,15 @@ msgstr "Durée en heures"
 msgid "L'Heureux Cyclage"
 msgstr "L'Heureux Cyclage"
 
-#. module: lhc
-#: constraint:res.partner:0
-msgid "Error: SIREN must take exactly 10 digits."
-msgstr ""
-"Erreur: Le numéro de SIREN doit exclusivement être composé de 10 chiffres."
-
 #. module: lhc
 #: selection:event.registration,position:0
 msgid "Invividual"
 msgstr "Individuel·le"
 
 #. module: lhc
-#: view:res.partner:0
-msgid "All Individual Members"
-msgstr "Tou·tes les membres individuel·les"
+#: model:ir.model,name:lhc.model_event_event
+msgid "Event"
+msgstr "Événement"
 
 #. module: lhc
 #: view:res.partner:0
@@ -273,9 +277,10 @@ msgid "County"
 msgstr "Département"
 
 #. module: lhc
-#: model:ir.ui.menu,name:lhc.menu_rencontres_2016
-msgid "Rencontres 2016"
-msgstr "Rencontres 2016"
+#: constraint:res.partner:0
+msgid "Error: SIRET must take exactly 14 digits."
+msgstr ""
+"Erreur: Le numéro de SIRET doit exclusivement être composé de 14 chiffres."
 
 #. module: lhc
 #: selection:event.registration,funding_main:0
@@ -314,9 +319,9 @@ msgid "Volunteer"
 msgstr "Bénévole"
 
 #. module: lhc
-#: model:ir.model,name:lhc.model_event_event
-msgid "Event"
-msgstr "Événement"
+#: view:res.partner:0
+msgid "All Individual Members"
+msgstr "Tou·tes les membres individuel·les"
 
 #. module: lhc
 #: view:res.partner:0
diff --git a/i18n/lhc.pot b/i18n/lhc.pot
index e900348..57549fc 100644
--- a/i18n/lhc.pot
+++ b/i18n/lhc.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-08 16:39+0000\n"
-"PO-Revision-Date: 2023-01-08 16:39+0000\n"
+"POT-Creation-Date: 2024-03-28 15:23+0000\n"
+"PO-Revision-Date: 2024-03-28 15:23+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,11 @@ msgstr ""
 msgid "Unsent"
 msgstr ""
 
+#. module: lhc
+#: model:ir.model,name:lhc.model_hr_expense_line
+msgid "Expense Line"
+msgstr ""
+
 #. module: lhc
 #: view:res.partner:0
 msgid "All Companies Members"
@@ -81,6 +86,11 @@ msgstr ""
 msgid "Invoicing"
 msgstr ""
 
+#. module: lhc
+#: model:ir.ui.menu,name:lhc.menu_rencontres_2016
+msgid "Rencontres 2016"
+msgstr ""
+
 #. module: lhc
 #: model:res.groups,name:lhc.group_rencontres
 msgid "Annual meeting organisation"
@@ -108,12 +118,7 @@ msgstr ""
 
 #. module: lhc
 #: view:res.partner:0
-msgid "W123456789"
-msgstr ""
-
-#. module: lhc
-#: view:res.partner:0
-msgid "123456789"
+msgid "e.g. W123456789"
 msgstr ""
 
 #. module: lhc
@@ -143,11 +148,6 @@ msgstr ""
 msgid "Customer"
 msgstr ""
 
-#. module: lhc
-#: field:res.partner,siren:0
-msgid "SIREN"
-msgstr ""
-
 #. module: lhc
 #: field:event.registration,funding_main:0
 msgid "Main funding"
@@ -173,6 +173,11 @@ msgstr ""
 msgid "Related sale order(s)"
 msgstr ""
 
+#. module: lhc
+#: view:res.partner:0
+msgid "e.g. 12345678901234"
+msgstr ""
+
 #. module: lhc
 #: model:res.groups,name:lhc.group_ca
 msgid "Administration board members"
@@ -193,6 +198,11 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: lhc
+#: field:res.partner,siret:0
+msgid "SIRET"
+msgstr ""
+
 #. module: lhc
 #: field:event.registration,position:0
 msgid "Position"
@@ -240,19 +250,14 @@ msgstr ""
 msgid "L'Heureux Cyclage"
 msgstr ""
 
-#. module: lhc
-#: constraint:res.partner:0
-msgid "Error: SIREN must take exactly 10 digits."
-msgstr ""
-
 #. module: lhc
 #: selection:event.registration,position:0
 msgid "Invividual"
 msgstr ""
 
 #. module: lhc
-#: view:res.partner:0
-msgid "All Individual Members"
+#: model:ir.model,name:lhc.model_event_event
+msgid "Event"
 msgstr ""
 
 #. module: lhc
@@ -261,8 +266,8 @@ msgid "County"
 msgstr ""
 
 #. module: lhc
-#: model:ir.ui.menu,name:lhc.menu_rencontres_2016
-msgid "Rencontres 2016"
+#: constraint:res.partner:0
+msgid "Error: SIRET must take exactly 14 digits."
 msgstr ""
 
 #. module: lhc
@@ -302,8 +307,8 @@ msgid "Volunteer"
 msgstr ""
 
 #. module: lhc
-#: model:ir.model,name:lhc.model_event_event
-msgid "Event"
+#: view:res.partner:0
+msgid "All Individual Members"
 msgstr ""
 
 #. module: lhc
diff --git a/lhc.py b/lhc.py
index a862953..6d5398e 100644
--- a/lhc.py
+++ b/lhc.py
@@ -43,7 +43,7 @@ class res_partner(orm.Model):
         return res
 
     def _bikecoop_activity_dates_check(self, cr, uid, ids, context=None):
-        #TODO : check condition and return boolean accordingly
+        # TODO: check condition and return boolean accordingly
         currentDateTime = datetime.datetime.now()
         date = currentDateTime.date()
         year = date.strftime("%Y")
@@ -86,14 +86,14 @@ class res_partner(orm.Model):
                 return True
 
 
-    def _siren_check(self, cr, uid, ids, context=None):
-        """Check if SIREN code is well formatted"""
+    def _siret_check(self, cr, uid, ids, context=None):
+        """Check if SIRET code is well formatted"""
         for partner in self.browse(cr, uid, ids, context=context):
-            if partner.siren:
-                if len(partner.siren) != 9:
+            if partner.siret:
+                if len(partner.siret) != 14:
                     return False
                 try:
-                    int(partner.siren)
+                    int(partner.siret)
                 except ValueError:
                     return False
                 return True
@@ -128,7 +128,7 @@ class res_partner(orm.Model):
         'bikecoop_activity_start': fields.integer('Bikecoop activity start year'),
         'bikecoop_activity_stop': fields.integer('Bikecoop activity end year'),
         'rna': fields.char('RNA code', size=10),
-        'siren': fields.char('SIREN', size=9),
+        'siret': fields.char('SIRET', size=14),
     }
 
     _defaults = {
@@ -138,7 +138,7 @@ class res_partner(orm.Model):
     _constraints = [
         (_bikecoop_activity_dates_check, 'Error: Bikecoop activity dates are inconsistent!', ['Bikecoop activity dates']),
         (_rna_check, 'Error: RNA code must begin with a "W" followed by exactly 9 digits.', ['RNA']),
-        (_siren_check, 'Error: SIREN must take exactly 10 digits.', ['SIREN']),
+        (_siret_check, 'Error: SIRET must take exactly 14 digits.', ['SIRET']),
     ]
 
 
diff --git a/view/membership.xml b/view/membership.xml
index 49a347a..a5078d0 100644
--- a/view/membership.xml
+++ b/view/membership.xml
@@ -13,8 +13,6 @@
                     <field name="kit_sent" attrs="{'invisible': [('membership_state','not in', ('old', 'waiting', 'invoiced', 'free', 'paid'))]}"/>
                     <field name="bikecoop_activity_start" attrs="{'invisible': [('is_company','=', False)]}" />
                     <field name="bikecoop_activity_stop" attrs="{'invisible': [('is_company','=', False)]}"/>
-                    <field name="rna" placeholder="W123456789" attrs="{'invisible': [('is_company','=', False)]}"/>
-                    <field name="siren" placeholder="123456789" attrs="{'invisible': [('is_company','=', False)]}"/>
                 </xpath>
             </field>
         </record>
diff --git a/view/res_partner.xml b/view/res_partner.xml
index fd59a92..8c85bc6 100644
--- a/view/res_partner.xml
+++ b/view/res_partner.xml
@@ -12,6 +12,16 @@
                 <xpath expr="//field[@name='email']" position="after">
                     <field name="email2" widget="email"/>
                 </xpath>
+                <xpath expr="//field[@name='title']/../.." position="after">
+                    <group>
+                        <group>
+                            <field name="rna" placeholder="e.g. W123456789" attrs="{'invisible': [('is_company','=', False)]}"/>
+                        </group>
+                        <group>
+                            <field name="siret" placeholder="e.g. 12345678901234" attrs="{'invisible': [('is_company','=', False)]}"/>
+                        </group>
+                    </group>
+                </xpath>
             </field>
         </record>
         <record id="view_res_partner_search" model="ir.ui.view">
-- 
2.20.1