diff --git a/models/res_partner.py b/models/res_partner.py
index 0f7d34c717ae1f8121615d32dee2b93424682225..3b6bc8af7c8f8c6ac05a290f988dded440e7b430 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -28,13 +28,9 @@ class EticPartner(models.Model):
     instagram = fields.Char(string="Instagram", required=False)
 
     # Commerce
-<<<<<<< HEAD
     business_name = fields.Char(
         string='Raison sociale',
         required=False)
-=======
-    business_name = fields.Char(string="Nom commercial", required=False)
->>>>>>> [enh] pre-commit
     commerce_type_id = fields.Many2one(
         comodel_name="res.partner.commerce.type",
         string="Type de commerce",
@@ -84,12 +80,20 @@ class EticPartner(models.Model):
 
     # Consignes
     deposit_balance = fields.Float(
-        string="Solde consignes",
-        # currency_field='company_id.currency_id',
+        string="Solde initial consigne",
         required=False,
     )
     deposit_balance_date = fields.Date(
-        string="Date relevé solde consignes", required=False
+        string="Date initiale solde consigne", required=False
+    )
+
+    # Caisses
+    intial_boxes = fields.Integer(
+        string="Qté initiale Caisses",
+        required=False,
+    )
+    initial_boxes_date = fields.Date(
+        string="Date initiale qté caisses", required=False
     )
 
     # Horaires
diff --git a/views/res_partner.xml b/views/res_partner.xml
index 15554ed68a79de2b5b96c1384a59ea99ea6046e3..eeecaa5f9f02749427606b5df7f5c5838af55511 100644
--- a/views/res_partner.xml
+++ b/views/res_partner.xml
@@ -165,8 +165,6 @@
                                     options="{'no_open': True, 'no_create': True}"
                                     widget="many2many_tags"
                                 />
-                                <field name="deposit_balance" widget="monetary" />
-                                <field name="deposit_balance_date" />
                             </group>
                         </group>
                         <group>
@@ -184,6 +182,12 @@
                                 </tree>
                             </field>
                         </group>
+                        <group name="init">
+                            <field name="deposit_balance" widget="monetary" />
+                            <field name="deposit_balance_date" />
+                            <field name="intial_boxes" widget="monetary" />
+                            <field name="initial_boxes_date" />
+                        </group>
                     </page>
 
                     <page name='association' string="Association">