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

Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch

This commit is contained in:
Pawan Kumar 2021-01-13 18:56:34 +05:30
parent 6088e06296 30dcccce43
commit 0fcc2e7b7f
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
project_report/report/project_budget_amt_analysis.py
View File

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