report file uncomment
This commit is contained in:
parent
580124e72b
commit
f91db8ea91
|
@ -3,4 +3,4 @@
|
|||
from . import controllers
|
||||
from . import models
|
||||
from . import wizard
|
||||
from . import report
|
||||
#from . import report
|
|
@ -30,7 +30,7 @@
|
|||
'views/project_view.xml',
|
||||
'views/hr_timesheet_templates.xml',
|
||||
# 'views/analytic_view.xml',
|
||||
'report/project_profitability_report_analysis_views.xml',
|
||||
#'report/project_profitability_report_analysis_views.xml',
|
||||
'views/views.xml',
|
||||
'views/templates.xml',
|
||||
'wizard/project_create_sale_order_views.xml',
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from . import project_profitability_report_analysis
|
||||
#from . import project_profitability_report_analysis
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -36,7 +36,7 @@ class BudgetHrsAnalysis(models.Model):
|
|||
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
|
||||
WHERE AAL.amount < 0.0 AND AAL.project_id IS NOT NULL AND PRO.active = 't' AND PRO.allow_timesheets = 't'
|
||||
group by Pro.id, PRO.partner_id, AAL.employee_id, Pro.budgeted_hours, AAL.unit_amount
|
||||
group by Pro.id, PRO.partner_id, AAL.employee_id, AAL.unit_amount,SOL.product_uom_qty
|
||||
)""" % (self._table,))
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue