From 41c24b61ab8ba7171214ce0745c11ebdd5c5e770 Mon Sep 17 00:00:00 2001 From: projectsodoo Date: Wed, 30 Dec 2020 16:03:22 +0530 Subject: [PATCH] updated report --- project_report/report/project_budget_amt_analysis.py | 2 +- project_report/report/project_budget_hrs_analysis.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project_report/report/project_budget_amt_analysis.py b/project_report/report/project_budget_amt_analysis.py index 7147d48..48f6ed8 100755 --- a/project_report/report/project_budget_amt_analysis.py +++ b/project_report/report/project_budget_amt_analysis.py @@ -33,7 +33,7 @@ class BudgetAmtAnalysis(models.Model): LEFT JOIN sale_order SO ON PRO.sale_order_id = SO.id LEFT JOIN account_analytic_account AA ON PRO.analytic_account_id = AA.id LEFT JOIN account_analytic_line AAL ON AAL.account_id = AA.id and AAL.project_id = PRO.id - WHERE PRO.active = 't' + WHERE PRO.active = 't' and PRO.pricing_type!='fixed_rate' group by Pro.id, PRO.partner_id, Pro.budgeted_revenue, so.amount_total )""" % (self._table,)) diff --git a/project_report/report/project_budget_hrs_analysis.py b/project_report/report/project_budget_hrs_analysis.py index d29cff4..206b1b7 100755 --- a/project_report/report/project_budget_hrs_analysis.py +++ b/project_report/report/project_budget_hrs_analysis.py @@ -37,7 +37,7 @@ class BudgetHrsAnalysis(models.Model): LEFT JOIN account_analytic_account AA ON Pro.analytic_account_id = AA.id LEFT JOIN account_analytic_line AAL ON AAL.account_id = AA.id and AAL.project_id = Pro.id and AAL.employee_id = Pro_emp.employee_id - Where PRO.active = 't' + Where PRO.active = 't' and PRO.pricing_type!='fixed_rate' group by Pro.id, Pro_emp.id, PRO.partner_id, AAL.employee_id, AAL.unit_amount )""" % (self._table,))