[fix] Montant rejeté

models/scop_cotisations_idf.py

@@ -28,6 +28,7 @@ class ScopCotisationsIDF(models.Model):
     type = fields.Selection([
         ('inv', 'Cotisation'),
         ('refund', 'Avoir'),
+        ('reject', 'Rejet'),
         ('pay', 'Paiment')],
         string='Type', )
     lettrage = fields.Char('Lettrage')
@@ -70,11 +71,6 @@ class ScopCotisationsIDF(models.Model):
     # ------------------------------------------------------
     # Computed fields
     # ------------------------------------------------------
-    # @api.multi
-    # def _compute_currency(self):
-    #     for r in self:
-    #         r.currency_id = r.env
-
     @api.depends('payment_or_refund_ids', 'debit',
                  'payment_or_refund_ids.debit', 'payment_or_refund_ids.debit')
     @api.multi

models/scop_invoice_idf.py

@@ -28,6 +28,7 @@ class ScopinvoiceIDF(models.Model):
     type = fields.Selection([
         ('inv', 'Facture'),
         ('refund', 'Avoir'),
+        ('reject', 'Rejet'),
         ('pay', 'Paiment')],
         string='Type',)
     lettrage = fields.Char('Lettrage')

views/scop_cotisations_idf.xml

@@ -73,6 +73,7 @@
                                 <field name="currency_id" invisible="1"/>
                                 <field name="credit" widget="monetary" string="Montant" attrs="{'invisible': [('type', '=', 'inv')]}"/>
                                 <field name="debit" widget="monetary" string="Montant" attrs="{'invisible': [('type', '!=', 'inv')]}"/>
+                                <field name="debit" widget="monetary" string="Montant rejeté" attrs="{'invisible': [('type', '!=', 'reject')]}"/>
                                 <field name="amount_residual" widget="monetary"
                                        attrs="{'invisible': [('type', '!=', 'inv')]}"/>
                                 <field name="invoice_id"
@@ -157,6 +158,7 @@
                         <filter name="group_by_partner_id" string="Adhérent" context="{'group_by':'partner_id'}"/>
                         <separator/>
                         <filter string="Date écriture" name="groupby_writing_date" context="{'group_by':'writing_date'}"/>
+                        <filter string="Type" name="groupby_type" context="{'group_by':'type'}"/>
                     </group>
                 </search>
             </field>

views/scop_invoice_idf.xml

@@ -69,6 +69,7 @@
                                 <field name="currency_id" invisible="1"/>
                                 <field name="credit" widget="monetary" string="Montant" attrs="{'invisible': [('type', '=', 'inv')]}"/>
                                 <field name="debit" widget="monetary" string="Montant" attrs="{'invisible': [('type', '!=', 'inv')]}"/>
+                                <field name="debit" widget="monetary" string="Montant rejeté" attrs="{'invisible': [('type', '!=', 'reject')]}"/>
                                 <field name="amount_residual" widget="monetary"
                                        attrs="{'invisible': [('type', '!=', 'inv')]}"/>
                                 <field name="invoice_id"
@@ -149,6 +150,7 @@
                         <filter name="group_by_partner_id" string="Adhérent" context="{'group_by':'partner_id'}"/>
                         <separator/>
                         <filter string="Date écriture" name="groupby_writing_date" context="{'group_by':'writing_date'}"/>
+                        <filter string="Type" name="groupby_type" context="{'group_by':'type'}"/>
                     </group>
                 </search>
             </field>

wizard/scop_invoice_idf_wizard.py

@@ -126,10 +126,16 @@ class ScopImportIDFWizard(models.TransientModel):
                     else:
                         debit = int(row['Débit euro'])
                         credit = int(row['Crédit euro'])
+                        if debit > 0 and credit > 0:
+                            logs += "<li> Ligne " + str(
+                                line) + ": Montants incorrects</li>"
+                        else:
                             if journal == "VE" and debit > 0:
                                 line_type = "inv"
-                        elif journal == "BFC" and debit == 0:
+                            elif journal == "BFC" and credit > 0:
                                 line_type = "pay"
+                            elif journal == "BFC" and debit > 0:
+                                line_type = "reject"
                             else:
                                 line_type = "refund"