[add] type and source of liasse when 'change' or 'regul' from bordereau

wizard/scop_bordereau_update_liasse_wizard.py

@@ -62,6 +62,10 @@ class ScopBordereauChangeLiasse(models.TransientModel):
         string='Nouveau montant total de(s) cotisation(s)',
         currency_field='company_currency_id',
         readonly=1)
+    type_id_new = fields.Selection(
+        'Type de liasse', related='liasse_fiscale_new_id.type_id')
+    source_new = fields.Selection(
+        'Source de la liasse', related='liasse_fiscale_new_id.source')
     amount_cg_new = fields.Float(
         'Cotisation CG Scop',
         related='liasse_fiscale_new_id.contribution_cg')

wizard/scop_bordereau_update_liasse_wizard.xml

@@ -38,6 +38,8 @@
                                            domain="[('partner_id', '=', partner_id),
                                                     ('is_qualified', '=', True),
                                                     ('id', '!=', liasse_fiscale_id)]"/>
+                                    <field name="type_id_new" attrs="{'invisible':[('liasse_fiscale_new_id','=',False)]}"/>
+                                    <field name="source_new" attrs="{'invisible':[('liasse_fiscale_new_id','=',False)]}"/>
                                 </group>
                                 <group string="Nouveaux calculs (Sans arrondi)" attrs="{'invisible':[('liasse_fiscale_new_id','=',False)]}">
                                     <field name="amount_total_cotiz_new"/>
@@ -50,10 +52,6 @@
                                     <field name="type_assiette_new"/>
                                     <field name="montant_assiette_new"/>
                                     <hr/>
-<!--                                    <field name="ca_new"/>-->
-<!--                                    <field name="va_new"/>-->
-<!--                                    <field name="net_results_new"/>-->
-<!--                                    <field name="wage_cg_new"/>-->
                                 </group>
                             </div>
                         </div>

wizard/scop_cotisation_cg_regul.py

@@ -47,6 +47,10 @@ class ScopCotisationRegul(models.TransientModel):
         comodel_name='scop.liasse.fiscale',
         string='Liasse Fiscale',
     )
+    type_id_new = fields.Selection(
+        string='Type de liasse', related='liasse_fiscale_new_id.type_id')
+    source_new = fields.Selection(
+        string='Source de la liasse', related='liasse_fiscale_new_id.source')
     type_assiette_new = fields.Selection(
         related='liasse_fiscale_new_id.contribution_base_type')
     montant_assiette_new = fields.Integer(

wizard/scop_cotisation_cg_regul_wizard.xml

@@ -40,7 +40,12 @@
                                 <group string="Nouveaux calculs">
                                     <field name="date_regul" required="1"/>
                                     <separator/>
-                                    <field name="liasse_fiscale_new_id" domain="[('partner_id', '=', partner_id)]" options='{"no_create": True}' help="Nouvelle liasse fiscale à prendre en compte"/>
+                                    <field name="liasse_fiscale_new_id" domain="[('partner_id', '=', partner_id)]"
+                                           options='{"no_create": True}' help="Nouvelle liasse fiscale à prendre en compte"/>
+                                </group>
+                                <group>
+                                    <field name="type_id_new" attrs="{'invisible': [('liasse_fiscale_new_id', '=', False)]}"/>
+                                    <field name="source_new" attrs="{'invisible': [('liasse_fiscale_new_id', '=', False)]}"/>
                                 </group>
                                 <group>
                                     <field name="type_assiette_new" attrs="{'invisible': [('amount_cg', '=', 0.0)]}" readonly="1"/>