From acbb48375cf370e5ab8beb52e0ad3c6f2b9c94f8 Mon Sep 17 00:00:00 2001 From: projectsodoo Date: Wed, 27 Jan 2021 12:40:19 +0530 Subject: [PATCH] Report updated --- project_report/report/project_budget_amt_analysis.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/project_report/report/project_budget_amt_analysis.py b/project_report/report/project_budget_amt_analysis.py index b20a4ed..37b64aa 100755 --- a/project_report/report/project_budget_amt_analysis.py +++ b/project_report/report/project_budget_amt_analysis.py @@ -104,16 +104,17 @@ class BudgetAmtAnalysis(models.Model): pro.pricing_type as pricing_type, pro.project_type as project_type, null::date AS timesheet_date, - (pro.hourly_rate * sum(AAL.unit_amount)) AS revenue + (pro.hourly_rate * pro.timesheet_hour) AS revenue + --(pro.hourly_rate * sum(AAL.unit_amount)) AS revenue --(AAL.unit_amount) AS revenue --(AAL.unit_amount * pro_emp.price_unit) AS revenue FROM project_project PRO --Left JOIN project_sale_line_employee_map pro_emp ON pro_emp.project_id = pro.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 + --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' and PRO.pricing_type = 'employee_rate' and PRO.project_type = 'hours_no_limit' - group by pro.id + --group by pro.id union SELECT pro.id AS project_id,