From 54b7edc17a41c990d9605c0740e7bcda8fc80900 Mon Sep 17 00:00:00 2001 From: projectsodoo Date: Wed, 3 Feb 2021 12:21:38 +0530 Subject: [PATCH] Report updated based on MT feedback --- project_report/report/project_budget_amt_analysis.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/project_report/report/project_budget_amt_analysis.py b/project_report/report/project_budget_amt_analysis.py index 8061f96..ced2f42 100755 --- a/project_report/report/project_budget_amt_analysis.py +++ b/project_report/report/project_budget_amt_analysis.py @@ -68,7 +68,8 @@ class BudgetAmtAnalysis(models.Model): pro.pricing_type as pricing_type, pro.project_type as project_type, null::date AS timesheet_date, - (AAL.unit_amount * pro_emp.price_unit) AS revenue + (AAL.unit_amount * pro_emp.employee_price) 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 @@ -128,7 +129,8 @@ class BudgetAmtAnalysis(models.Model): pro.pricing_type as pricing_type, pro.project_type as project_type, AAL.date AS timesheet_date, - (AAL.amount * -1) AS revenue + (AAL.unit_amount * pro_emp.price_unit) AS revenue + --(AAL.amount * -1) AS revenue --(AAL.unit_amount * pro_emp.employee_price) AS revenue FROM project_project PRO Left JOIN project_sale_line_employee_map pro_emp ON pro_emp.project_id = pro.id