From 42a6402355bc02e3213e9ee063aea1287baeaccd Mon Sep 17 00:00:00 2001 From: projectsodoo Date: Wed, 13 Jan 2021 12:15:30 +0530 Subject: [PATCH] Report fixed cons updated --- .../report/project_budget_amt_analysis.py | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/project_report/report/project_budget_amt_analysis.py b/project_report/report/project_budget_amt_analysis.py index a42a023..02b12f9 100755 --- a/project_report/report/project_budget_amt_analysis.py +++ b/project_report/report/project_budget_amt_analysis.py @@ -44,20 +44,21 @@ class BudgetAmtAnalysis(models.Model): PRO.project_type as project_type, PRO.budgeted_revenue AS revenue FROM project_project PRO - WHERE PRO.active = 't' and (PRO.pricing_type = 'fixed_rate' OR PRO.project_type = 'hours_no_limit') - union - SELECT - PRO.id AS project_id, - PRO.create_date AS create_date, - PRO.partner_id AS partner_id, - Pro_emp.employee_id AS employee_id, - 'Budgeted Revenue' as amount_type, - PRO.pricing_type as pricing_type, - PRO.project_type as project_type, - Pro_emp.cost AS revenue - FROM project_project PRO - Left JOIN project_sale_line_employee_map Pro_emp ON Pro_emp.project_id = Pro.id - WHERE PRO.active = 't' and PRO.pricing_type = 'employee_rate' and PRO.project_type = 'hours_in_consultant' + WHERE PRO.active = 't' + --and (PRO.pricing_type = 'fixed_rate' OR PRO.project_type = 'hours_no_limit') + --union + --SELECT + --PRO.id AS project_id, + --PRO.create_date AS create_date, + --PRO.partner_id AS partner_id, + --Pro_emp.employee_id AS employee_id, + --'Budgeted Revenue' as amount_type, + --PRO.pricing_type as pricing_type, + --PRO.project_type as project_type, + --Pro_emp.cost AS revenue + --FROM project_project PRO + --Left JOIN project_sale_line_employee_map Pro_emp ON Pro_emp.project_id = Pro.id + --WHERE PRO.active = 't' and PRO.pricing_type = 'employee_rate' and PRO.project_type = 'hours_in_consultant' --union --SELECT --PRO.id AS project_id,