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

Merge branch 'copy_master' into 'master' 

Copy master

See merge request prakash.jain/cor-odoo!212
This commit is contained in:
prakash.jain 2022-03-11 09:36:30 +00:00
parent afea07a3b0 4454191c4a
commit 4ca7d0549a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
project_report/report/project_budget_amt_analysis.py
View File

@ -132,9 +132,8 @@ class BudgetAmtAnalysis(models.Model):
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 and AAL.employee_id = pro_emp.employee_id
WHERE PRO.active = 't' and AAL.employee_id is not null and PRO.pricing_type = 'employee_rate'
WHERE PRO.active = 't' and AAL.employee_id is not null and PRO.pricing_type = 'employee_rate' and PRO.project_type = 'hours_in_consultant'
group by pro.id, aal.employee_id, aal.date, aal.start_datetime, pro_emp.price_unit
--and PRO.project_type = 'hours_in_consultant'
union
SELECT
pro.id AS project_id,