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

Merge branch 'copy_master' into 'master' 

Report project hours updated

See merge request prakash.jain/cor-odoo!208
This commit is contained in:
prakash.jain 2022-03-11 07:44:49 +00:00
parent 1416aca01a 89ceefed79
commit 2f74fddc3b
1 changed files with 3 additions and 3 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

@ -85,12 +85,12 @@ class BudgetAmtAnalysis(models.Model):
pro.date AS end_date,
pro.partner_id AS partner_id,
AAL.employee_id AS employee_id,
'Actual Cost' as amount_type,
'Actual Revenue' as amount_type,
pro.pricing_type as pricing_type,
pro.project_type as project_type,
AAL.date AS timesheet_date,
AAL.start_datetime AS timesheet_sdatetime,
(sum(AAL.unit_amount) * pro.budgeted_hours2) AS revenue
(sum(AAL.unit_amount) * pro.hourly_rate) AS revenue
FROM project_project PRO
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
@ -121,7 +121,7 @@ class BudgetAmtAnalysis(models.Model):
pro.date AS end_date,
pro.partner_id AS partner_id,
AAL.employee_id AS employee_id,
'Actual Revenue' as amount_type,
'Actual Cost' as amount_type,
pro.pricing_type as pricing_type,
pro.project_type as project_type,
AAL.date AS timesheet_date,