diff --git a/project_report/report/project_budget_amt_analysis.py b/project_report/report/project_budget_amt_analysis.py index fee3449..320d952 100755 --- a/project_report/report/project_budget_amt_analysis.py +++ b/project_report/report/project_budget_amt_analysis.py @@ -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,