subh_pal_org
/
cor
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Report updated based on MT feedback

This commit is contained in:
projectsodoo 2021-02-03 12:21:38 +05:30
parent d48cddbd71
commit 54b7edc17a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
project_report/report/project_budget_amt_analysis.py
View File

@ -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