diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py index bd609629fe344e7a92ee5e6e58196d4a679b9cb7..8a4be40710aef91b4ec302d4c4e38d259e57258d 100644 --- a/models/lefilament_tdb.py +++ b/models/lefilament_tdb.py @@ -44,13 +44,6 @@ class LeFilamentTdb(models.Model): 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) ) cmd_mois = 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] - - ############## TRESO ################ # Trésorerie self.env.cr.execute("select sum(amount) from account_bank_statement_line where date < date_trunc('month', %s + interval '1' month);", (date_tdb, ) ) @@ -73,13 +66,23 @@ class LeFilamentTdb(models.Model): record.ca_mois = ca_mois record.cmd_mois = cmd_mois - record.pipe_mois = pipe record.treso = treso_total 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 + + @api.multi @api.depends('charges_fixes','treso') diff --git a/models/res_company.py b/models/res_company.py index 4e5cebba30ffe6a77ac1a6564fbedcbd6e38fce1..58281848c353106f82089c7985c6316c61c94a09 100644 --- a/models/res_company.py +++ b/models/res_company.py @@ -6,5 +6,5 @@ class res_company(models.Model): _inherit = "res.company" ca_target = fields.Integer( "Objectif Chiffre d'Affaire" ) - # charges_fixes = fields.Integer( "Charges Fixes" ) + charges_fixes = fields.Integer( "Charges Fixes" ) diff --git a/views/views.xml b/views/views.xml index e4cc7822bd75a2f024313dbbf25d14f9bf574a35..d29395c714f2a32fcb9758a56559d6cdba9a4ea8 100644 --- a/views/views.xml +++ b/views/views.xml @@ -80,6 +80,9 @@ <field name="name">Le Filament Dashboard Formview</field> <field name="model">lefilament.dashboard</field> <field name="arch" type="xml"> + <header> + <button string="Appliquer" type="object" name="maj_pipe" class="oe_highlight"/> + </header> <form string="Liste des Mois"> <div class="container"> <div class="col-xs-12 tdb_form">