diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py
index dd9d94f55e79694415d3ecf0e7a14d98901f7ef1..cb125a80642c4d8f745786c0fabb5a41c0357c63 100644
--- a/models/lefilament_tdb.py
+++ b/models/lefilament_tdb.py
@@ -62,6 +62,10 @@ class LeFilamentTdb(models.Model):
self.env.cr.execute("select sum(amount) from account_bank_statement_line where amount > 0 and date >= date_trunc('month', %s) and date < date_trunc('month', %s + interval '1' month);", (date_tdb, date_tdb) )
encaisse = self.env.cr.fetchone()[0]
+ ############## CHARGES ################
+ self.env.cr.execute("select charges_fixes from res_company" )
+ charges_fixes = self.env.cr.fetchone()[0]
+
if not encaisse:
encaisse = 0
if not charges:
@@ -74,6 +78,7 @@ class LeFilamentTdb(models.Model):
record.charges = charges * (-1.0)
record.encaisse = encaisse
record.variation = encaisse + charges
+ record.charges_fixes = charges_fixes
@api.multi
diff --git a/models/res_company.py b/models/res_company.py
index ad9197df5977b6cf9f61a2fc993196308eb83135..ddd1b49908895e68319b38075aa0bdeaa322968d 100644
--- a/models/res_company.py
+++ b/models/res_company.py
@@ -5,4 +5,5 @@ class res_company(models.Model):
_name = "res.company"
_inherit = "res.company"
- ca_target = fields.Integer( "Objectif de Chiffre d'Affaire Annuel" )
+ ca_target = fields.Integer( "Objectif de Chiffre d'Affaire" )
+ charges_fixes = fields.Integer( "Charges Fixes" )
diff --git a/static/src/css/lefilament_tdb.css b/static/src/css/lefilament_tdb.css
index 40371a9aa6891460881de62b045ecead017feed7..d40e13c12315e9be4526da3fad1f0f1d05dcd4e9 100644
--- a/static/src/css/lefilament_tdb.css
+++ b/static/src/css/lefilament_tdb.css
@@ -37,7 +37,6 @@
.tresorerie .card-number { font-size: 20px; font-weight: 300; }
.ca_target { font-size: 18px; }
-.ca_target:hover { cursor: pointer; color: rgba(115, 135, 156,0.5); }
.btn-tdb { border: 1px solid #eee; border-radius: 0; font-size: 11px; padding: 6px 10px; text-transform: none; }
diff --git a/static/src/js/dashboard_year.js b/static/src/js/dashboard_year.js
index 243e52169f757954c580126497ff6391dbb6e4e4..05c1ebd8755b01b8f59ba9f134ba4b0c07a5cbc6 100644
--- a/static/src/js/dashboard_year.js
+++ b/static/src/js/dashboard_year.js
@@ -15,7 +15,6 @@ odoo.define('lefilament_tdb.dashboard_year', function (require) {
template: 'YearDashboard',
events: {
- 'click .ca_target': 'target_clicked',
'click .card': function() { this.mychart.reflow(); },
},
@@ -33,7 +32,6 @@ odoo.define('lefilament_tdb.dashboard_year', function (require) {
.call('retrieve_datas_dashboard', [])
.then(function(results) {
self.values = results;
- console.log(results);
self.progress = results.facture / results.target;
deferred.resolve();
});
diff --git a/views/views.xml b/views/views.xml
index 2575f31a1371bf87667b48cba6ea26810b2899e4..e4cc7822bd75a2f024313dbbf25d14f9bf574a35 100644
--- a/views/views.xml
+++ b/views/views.xml
@@ -4,6 +4,13 @@
<act_window id="lefilament_dashboard_action" name="Dashboard - Le Filament" res_model="lefilament.dashboard" view_mode="tree,graph,form,pivot" />
+ <record id="lefilament_dashboard_variables_action" model="ir.actions.act_window" >
+ <field name="name">Variables Dashboard Le Filament</field>
+ <field name="res_model">res.company</field>
+ <field name="res_id">1</field>
+ <field name="view_mode">form</field>
+ </record>
+
<record id="action_home_page" model="ir.actions.client">
<field name="name">Dashboard - Le Filament</field>
<field name="tag">lefilament_tdb.dashboard</field>
@@ -20,7 +27,9 @@
<menuitem id="lefilament_dashboard_report_month" parent="lefilament_dashboard_report" name="Mensuel" sequence="2" action="action_home_page"/>
<menuitem id="lefilament_dashboard_report_year" parent="lefilament_dashboard_report" name="Annuel" sequence="1" action="action_year_page" />
- <menuitem id="lefilament_dashboard_datas" parent="lefilament_dashboard_menu" name="Données" action="lefilament_dashboard_action" sequence="10"/>
+ <menuitem id="lefilament_dashboard_conf" parent="lefilament_dashboard_menu" name="Configuration" sequence="10"/>
+ <menuitem id="lefilament_dashboard_datas" parent="lefilament_dashboard_conf" name="Données" action="lefilament_dashboard_action" sequence="10"/>
+ <menuitem id="lefilament_dashboard_variables" parent="lefilament_dashboard_conf" name="Variables" action="lefilament_dashboard_variables_action" sequence="10"/>
<record id="lefilament_dashboard_tree" model="ir.ui.view">
@@ -113,8 +122,17 @@
<field name="model">res.company</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <xpath expr="//field[@name='website']" position="after">
- <field name="ca_target" />
+ <xpath expr="//page[@name='report']" position="after">
+ <page name="tdb" string="Tableau de Bord">
+ <group>
+ <group srting="Données Annuelles">
+ <field name="ca_target" />
+ </group>
+ <group srting="Données Mensuelles">
+ <field name="charges_fixes" />
+ </group>
+ </group>
+ </page>
</xpath>
</field>
</record>