From 4088d335e551ce23625a6bdc5e3bef16aeb9f434 Mon Sep 17 00:00:00 2001 From: Benjamin <Benjamin@MBP-de-Benj.(none)> Date: Wed, 31 May 2017 10:12:37 +0200 Subject: [PATCH] [add] charges fixes --- models/lefilament_tdb.py | 7 ++++--- static/src/xml/lefilament_tdb.xml | 6 ++++++ views/views.xml | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py index 2000d61..0a48171 100644 --- a/models/lefilament_tdb.py +++ b/models/lefilament_tdb.py @@ -23,6 +23,7 @@ class LeFilamentTdb(models.Model): variation = fields.Float( 'Variation', compute="dashboard_values", store=True ) charges = fields.Float( 'Décaissé', compute="dashboard_values", store=True ) encaisse = fields.Float( 'Encaissé', compute="dashboard_values", store=True ) + charges_fixes = fields.Float( 'Charges Fixes', default=10000 ) runway = fields.Float( 'Runway', compute="runway_value", ) @api.multi @@ -76,11 +77,11 @@ class LeFilamentTdb(models.Model): @api.multi - @api.depends('charges','treso') + @api.depends('charges_fixes','treso') def runway_value(self): for record in self: - if record.charges : - record.runway = record.treso / record.charges + if record.charges_fixes : + record.runway = record.treso / record.charges_fixes @api.one def get_month(self): diff --git a/static/src/xml/lefilament_tdb.xml b/static/src/xml/lefilament_tdb.xml index 41582b1..6fddd69 100644 --- a/static/src/xml/lefilament_tdb.xml +++ b/static/src/xml/lefilament_tdb.xml @@ -58,6 +58,12 @@ <t t-esc="widget.render_monetary(t['charges'])"></t> </td> </tr> + <tr> + <th>Charges</th> + <td t-foreach="widget.request" t-as="t"> + <t t-esc="widget.render_monetary(t['charges_fixes'])"></t> + </td> + </tr> <tr> <th>Runway</th> <td t-foreach="widget.request" t-as="t"> diff --git a/views/views.xml b/views/views.xml index be0a7b5..adb11f9 100644 --- a/views/views.xml +++ b/views/views.xml @@ -36,6 +36,7 @@ <field name="variation" /> <field name="charges" /> <field name="encaisse" /> + <field name="charges_fixes" /> <field name="runway" /> </tree> </field> @@ -97,6 +98,7 @@ <field name="variation" widget="monetary" /> <field name="charges" widget="monetary" /> <field name="encaisse" widget="monetary" /> + <field name="charges_fixes" widget="monetary" /> <field name="runway" widget="monetary" /> </group> </div> -- GitLab