project revenue report filter type query added

This commit is contained in:
prakash 2022-03-28 14:01:18 +05:30
parent 8248aa7006
commit 8820fb9115
1 changed files with 7 additions and 0 deletions

View File

@ -46,6 +46,7 @@ class ProjectRevenueCustomReport(models.Model):
project_id,
parentproject as parent_project,
project_type,
pricing_type,
employee_id,
partner_id,
budgeted_revenue,
@ -63,6 +64,7 @@ class ProjectRevenueCustomReport(models.Model):
(select project_id from project_subproject_rel as par where pro.id=par.id limit 1) as parentproject,
pro.partner_id AS partner_id,
pro.project_type AS project_type,
pro.pricing_type as pricing_type,
AAL.employee_id AS employee_id,
0.0 AS budgeted_revenue,
0.0 AS budgeted_hours,
@ -84,6 +86,7 @@ class ProjectRevenueCustomReport(models.Model):
(select project_id from project_subproject_rel as par where pro.id=par.id limit 1) as parentproject,
pro.partner_id AS partner_id,
pro.project_type AS project_type,
pro.pricing_type as pricing_type,
null::int AS employee_id,
pro.budgeted_revenue AS budgeted_revenue,
pro.budgeted_hours2 AS budgeted_hours,
@ -103,6 +106,7 @@ class ProjectRevenueCustomReport(models.Model):
(select project_id from project_subproject_rel as par where pro.id=par.id limit 1) as parentproject,
pro.partner_id AS partner_id,
pro.project_type AS project_type,
pro.pricing_type as pricing_type,
AAL.employee_id AS employee_id,
0.0 AS budgeted_revenue,
0.0 AS budgeted_hours,
@ -124,6 +128,7 @@ class ProjectRevenueCustomReport(models.Model):
(select project_id from project_subproject_rel as par where pro.id=par.id limit 1) as parentproject,
pro.partner_id AS partner_id,
pro.project_type AS project_type,
pro.pricing_type as pricing_type,
pro_emp.employee_id AS employee_id,
pro_emp.cost AS budgeted_revenue,
pro_emp.budgeted_qty AS budgeted_hours,
@ -146,6 +151,7 @@ class ProjectRevenueCustomReport(models.Model):
(select project_id from project_subproject_rel as par where pro.id=par.id limit 1) as parentproject,
pro.partner_id AS partner_id,
pro.project_type AS project_type,
pro.pricing_type as pricing_type,
null::int AS employee_id,
0.0 as pro_hourly_rate,
0.0 AS budgeted_revenue,
@ -165,6 +171,7 @@ class ProjectRevenueCustomReport(models.Model):
(select project_id from project_subproject_rel as par where pro.id=par.id limit 1) as parentproject,
pro.partner_id AS partner_id,
pro.project_type AS project_type,
pro.pricing_type as pricing_type,
AAL.employee_id AS employee_id,
COALESCE(pro_emp.price_unit, 0) as pro_hourly_rate,
0.0 AS budgeted_revenue,