[update] add comment and date regul on bordereau when validate

models/scop_bordereau_cg.py

@@ -552,6 +552,8 @@ class Bordereau(models.Model):
         self.write({
             'name': self.name[0:10] + '-' + str(self.version + 1),
             'version': self.version + 1,
+            'date_regul': ongoing_version.date,
+            'comment_regul': ongoing_version.comment,
         })
         ongoing_version.write({
             'state': 'validated',

models/scop_bordereau_cg_version.py

@@ -17,10 +17,7 @@ class BordereauVersion(models.Model):
         readonly=True,
         ondelete='cascade')
     version = fields.Integer('Version du bordereau')
-    type = fields.Selection(
-        string='Type',
-        selection=[('refund', 'Avoir'),
-                   ('regul', 'Régulation'), ])
+    comment = fields.Char(string='Motif')
     liasse_fiscale_id_old = fields.Many2one(
         comodel_name='scop.liasse.fiscale',
         string='Ancienne liasse fiscale',

views/scop_bordereau_cg.xml

@@ -68,6 +68,11 @@
                             <strong>Motif : </strong><field name="comment_regul" readonly="True"/><br/>
                             <strong>Nouveau bordereau : </strong><field name="refund_id" readonly="True"/>
                         </div>
+                        <div class="alert alert-warning" role="alert" attrs="{'invisible': ['|', ('is_regul', '=', True), ('comment_regul', '=', False)]}">
+                            <strong>Bordereau version <field name="version"/></strong><br/>
+                            <strong>Modifié le : </strong><field name="date_regul" readonly="True"/><br/>
+                            <strong>Motif : </strong><field name="comment_regul" readonly="True"/><br/>
+                        </div>
                         <group>
                             <group>
                                 <field name="base_cotisation_cg"/>
@@ -133,7 +138,7 @@
                                     <tree edit="false" create="false" delete="false" default_order="version desc">
                                         <field name="date"/>
                                         <field name="version"/>
-                                        <field name="type"/>
+                                        <field name="comment"/>
                                         <field name="liasse_fiscale_id_old"/>
                                         <field name="type_assiette"/>
                                         <field name="montant_assiette"/>

wizard/scop_bordereau_refund_wizard.py

@@ -113,7 +113,7 @@ class ScopBordereauRefundWizard(models.TransientModel):
             self.env['scop.bordereau.version'].create({
                 'bordereau_id': bordereau_id.id,
                 'date': self.date_refund,
-                'type': 'refund',
+                'comment': self.comment,
                 'version': bordereau_id.version,
                 'liasse_fiscale_id_old': bordereau_id.liasse_fiscale_id.id,
                 'type_assiette': bordereau_id.type_assiette,

wizard/scop_cotisation_cg_regul.py

@@ -133,7 +133,7 @@ class ScopCotisationRegul(models.TransientModel):
         self.env['scop.bordereau.version'].create({
             'bordereau_id': bordereau_id.id,
             'date': self.date_regul,
-            'type': 'regul',
+            'comment': self.comment,
             'version': bordereau_id.version,
             'liasse_fiscale_id_old': bordereau_id.liasse_fiscale_id.id,
             'type_assiette': bordereau_id.type_assiette,