diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py index 8a4be40710aef91b4ec302d4c4e38d259e57258d..dca371dfc4baa439ca8a8fe81c0eb10f9a54a8e4 100644 --- a/models/lefilament_tdb.py +++ b/models/lefilament_tdb.py @@ -38,7 +38,6 @@ class LeFilamentTdb(models.Model): self.env.cr.execute("select sum(amount_untaxed) from account_invoice where state!='draft' and type='out_invoice' and date >= date_trunc('month', %s) and date < date_trunc('month', %s + interval '1' month);", (date_tdb, date_tdb) ) ca_mois = self.env.cr.fetchone()[0] - ############## COMMANDES ################ # TOTAL self.env.cr.execute("select sum(amount_untaxed) from sale_order where invoice_status='to invoice' and date_order >= date_trunc('month', %s) and date_order < date_trunc('month', %s + interval '1' month);", (date_tdb, date_tdb) ) @@ -56,8 +55,13 @@ class LeFilamentTdb(models.Model): encaisse = self.env.cr.fetchone()[0] ############## CHARGES ################ - # self.env.cr.execute("select charges_fixes from res_company" ) - # charges_fixes = self.env.cr.fetchone()[0] + self.env.cr.execute("select charges_fixes from res_company" ) + charges_fixes = self.env.cr.fetchone()[0] + + ############## PIPE ################ + # TOTAL + self.env.cr.execute("select sum(planned_revenue*probability/100) from crm_lead where active=True;") + pipe = self.env.cr.fetchone()[0] if not encaisse: encaisse = 0 @@ -70,18 +74,8 @@ class LeFilamentTdb(models.Model): record.charges = charges * (-1.0) record.encaisse = encaisse record.variation = encaisse + charges - # record.charges_fixes = charges_fixes - - @api.multi - def maj_pipe(self): - for record in self: - ############## PIPE ################ - # TOTAL - self.env.cr.execute("select sum(planned_revenue*probability/100) from crm_lead where active=True;") - pipe = self.env.cr.fetchone()[0] - - record.pipe_mois = pipe - + record.charges_fixes = charges_fixes + record.pipe_mois = pipe @api.multi diff --git a/views/views.xml b/views/views.xml index f6c52fdda56ac9c79d5cd86f808ea8c97aee059b..476f5cf985f7b5a914aa287362e1e9f4e3199be4 100644 --- a/views/views.xml +++ b/views/views.xml @@ -81,7 +81,7 @@ <field name="model">lefilament.dashboard</field> <field name="arch" type="xml"> <header> - <button string="MAJ Pipe" type="object" name="maj_pipe" class="oe_highlight"/> + <button string="MàJ Valeurs" type="object" name="dashboard_values" class="oe_highlight"/> </header> <form string="Liste des Mois"> <div class="container">