diff --git a/__manifest__.py b/__manifest__.py index 5578dc0429417fb8c9965ccce71d7a47ce16f5e8..b4fb4ba559b0beee0a6f687c4cc21944f99c3ee1 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -20,7 +20,7 @@ 'author': "LE FILAMENT", 'category': 'dashboard', 'website': "https://le-filament.com", - 'version': '13.0.1.0.0', + 'version': '14.0.1.0.0', 'license': 'AGPL-3', 'depends': ['account', 'crm', 'hr_expense', 'sale'], 'data': [ diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py index 42ba8170d794f15f0b469a5c882954a6ca48159d..d7473f745ef59eaf1489b9ab1dc8eaa9bedd9502 100644 --- a/models/lefilament_tdb.py +++ b/models/lefilament_tdb.py @@ -44,7 +44,7 @@ class LeFilamentTdb(models.Model): "SELECT SUM(amount_untaxed_signed) \ FROM account_move \ WHERE state != 'draft' \ - AND (type = 'out_invoice' OR type = 'out_refund') \ + AND (move_type = 'out_invoice' OR move_type = 'out_refund') \ AND date >= date_trunc('month', %s) \ AND date < date_trunc('month', %s + interval '1' month);", (date_tdb, date_tdb) @@ -102,7 +102,7 @@ class LeFilamentTdb(models.Model): # PIPE self.env.cr.execute( - "SELECT SUM(planned_revenue * probability / 100) \ + "SELECT SUM(expected_revenue * probability / 100) \ FROM crm_lead \ WHERE active = True" ) @@ -198,32 +198,32 @@ class LeFilamentTdb(models.Model): (SELECT SUM(amount_untaxed_signed) FROM account_move WHERE state!='draft' - AND (type='out_invoice' OR type='out_refund') + AND (move_type='out_invoice' OR move_type='out_refund') AND date > %s AND date <= %s ) AS facture, (SELECT SUM(amount_residual_signed) FROM account_move - WHERE state!='draft' AND type='out_invoice' + WHERE state!='draft' AND move_type='out_invoice' ) AS a_encaisser, (SELECT SUM(amount_residual_signed) FROM account_move - WHERE state!='draft' AND type='in_invoice' + WHERE state!='draft' AND move_type='in_invoice' ) AS a_payer, - (SELECT SUM(planned_revenue * probability / 100) + (SELECT SUM(expected_revenue * probability / 100) FROM crm_lead WHERE active=True AND (date_deadline <= %s OR date_deadline is NULL) ) AS pipe, - (SELECT SUM(planned_revenue * probability / 100) + (SELECT SUM(expected_revenue * probability / 100) FROM crm_lead WHERE active=True AND date_deadline > %s ) AS pipe_n1, - (SELECT SUM(planned_revenue * probability / 100) + (SELECT SUM(expected_revenue * probability / 100) FROM crm_lead WHERE active=True AND probability = 100 AND (date_deadline <= %s OR date_deadline is NULL) ) AS pipe_win, - (SELECT SUM(planned_revenue * probability / 100) + (SELECT SUM(expected_revenue * probability / 100) FROM crm_lead WHERE active=True AND probability != 100 @@ -378,11 +378,11 @@ class LeFilamentTdb(models.Model): self._cr.execute( """ SELECT to_char(date_trunc('month', invoice_date_due),'YYYY-MM') AS mois, - SUM(CASE WHEN type = 'in_invoice' + SUM(CASE WHEN move_type = 'in_invoice' THEN amount_residual_signed ELSE 0 END ) AS f_fournisseur, - SUM(CASE WHEN type = 'out_invoice' + SUM(CASE WHEN move_type = 'out_invoice' THEN amount_residual_signed ELSE 0 END ) AS f_client