diff --git a/models/res_company.py b/models/res_company.py index d86c08e2d114c1b6d0acd7b369f3542b511e6938..a20c65c3e5b29ca7500b2fdc98137660a54cd363 100644 --- a/models/res_company.py +++ b/models/res_company.py @@ -14,6 +14,7 @@ class res_company(models.Model): class previ_treso(models.Model): _name = "previ.treso" _description = "Previsionnel de tresorerie" + _order = 'name' company_id = fields.Many2one('res.company', 'Company', default=lambda self: self.env.user.company_id.id ) name = fields.Char('Nom') diff --git a/static/src/js/previ_tresorerie.js b/static/src/js/previ_tresorerie.js index 22a619afc4a671daa8e9cd80ad7320342f0db442..1b79d894c4582c29db55a2155fe8e2f07ae56d41 100644 --- a/static/src/js/previ_tresorerie.js +++ b/static/src/js/previ_tresorerie.js @@ -104,10 +104,11 @@ odoo.define('lefilament_tdb.previ_tresorerie', function (require) { if ( i < 5 ) { charges_fixes.push(null); } else if ( i == 5 ) { charges_fixes.push(treso_r[5].treso); } else { + // Trimestres if (['01', '04', '07', '10'].indexOf(data_months[i]) >= 0) { - charges_fixes.push( charges_fixes[i-1] + this.values.charges_periode[0].sum + this.values.charges_periode[1].sum ); + charges_fixes.push( this.values.charges_periode[0].sum + this.values.charges_periode[1].sum ); } else { - charges_fixes.push( charges_fixes[i-1] + this.values.charges_periode[1].sum ); + charges_fixes.push( this.values.charges_periode[1].sum ); } } @@ -115,7 +116,7 @@ odoo.define('lefilament_tdb.previ_tresorerie', function (require) { for (var i = 0; i < 12 ; i++) { if (i > 4 ) { - previsionnel.push(charges_fixes[i]+f_client[i]-f_fournisseur[i]-charges_fixes_an[i]); + previsionnel.push( previsionnel[i-1] + charges_fixes[i]+f_client[i]-f_fournisseur[i]-charges_fixes_an[i]); } else { previsionnel.push(null); } diff --git a/views/views.xml b/views/views.xml index ba72dac1a6ea82624bfe2b3c4576c55e24cd25f8..a6c8991687ab0cd74d6702708a15a55c06d0eb1e 100644 --- a/views/views.xml +++ b/views/views.xml @@ -195,7 +195,7 @@ <field name="name" /> <field name="periode" /> <field name="date" /> - <field name="montant" /> + <field name="montant" sum="Total" /> </tree> </field> </record>