diff --git a/cor_custom/__init__.py b/cor_custom/__init__.py index 1099cf8..a41b57f 100755 --- a/cor_custom/__init__.py +++ b/cor_custom/__init__.py @@ -3,4 +3,4 @@ from . import controllers from . import models from . import wizard -from . import report \ No newline at end of file +#from . import report \ No newline at end of file diff --git a/cor_custom/__manifest__.py b/cor_custom/__manifest__.py index 8b17674..137710f 100755 --- a/cor_custom/__manifest__.py +++ b/cor_custom/__manifest__.py @@ -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', diff --git a/cor_custom/report/__init__.py b/cor_custom/report/__init__.py index 22d6147..666c524 100755 --- a/cor_custom/report/__init__.py +++ b/cor_custom/report/__init__.py @@ -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 diff --git a/project_maintenance/__pycache__/__init__.cpython-36.pyc b/project_maintenance/__pycache__/__init__.cpython-36.pyc index 3e046b7..4e19977 100644 Binary files a/project_maintenance/__pycache__/__init__.cpython-36.pyc and b/project_maintenance/__pycache__/__init__.cpython-36.pyc differ diff --git a/project_maintenance/models/__pycache__/__init__.cpython-36.pyc b/project_maintenance/models/__pycache__/__init__.cpython-36.pyc index 0869ca3..cf21510 100644 Binary files a/project_maintenance/models/__pycache__/__init__.cpython-36.pyc and b/project_maintenance/models/__pycache__/__init__.cpython-36.pyc differ diff --git a/project_maintenance/models/__pycache__/maintenance.cpython-36.pyc b/project_maintenance/models/__pycache__/maintenance.cpython-36.pyc index ab53358..1113ea1 100644 Binary files a/project_maintenance/models/__pycache__/maintenance.cpython-36.pyc and b/project_maintenance/models/__pycache__/maintenance.cpython-36.pyc differ diff --git a/project_maintenance/models/__pycache__/project.cpython-36.pyc b/project_maintenance/models/__pycache__/project.cpython-36.pyc index 0f811bb..8988166 100644 Binary files a/project_maintenance/models/__pycache__/project.cpython-36.pyc and b/project_maintenance/models/__pycache__/project.cpython-36.pyc differ diff --git a/project_maintenance/report/__pycache__/__init__.cpython-36.pyc b/project_maintenance/report/__pycache__/__init__.cpython-36.pyc index 21cd559..20d9841 100644 Binary files a/project_maintenance/report/__pycache__/__init__.cpython-36.pyc and b/project_maintenance/report/__pycache__/__init__.cpython-36.pyc differ diff --git a/project_maintenance/report/__pycache__/maintenance_report.cpython-36.pyc b/project_maintenance/report/__pycache__/maintenance_report.cpython-36.pyc index 356ee8c..87adda0 100644 Binary files a/project_maintenance/report/__pycache__/maintenance_report.cpython-36.pyc and b/project_maintenance/report/__pycache__/maintenance_report.cpython-36.pyc differ diff --git a/project_report/report/project_budget_hrs_analysis.py b/project_report/report/project_budget_hrs_analysis.py index 6b62f34..d8c04ec 100755 --- a/project_report/report/project_budget_hrs_analysis.py +++ b/project_report/report/project_budget_hrs_analysis.py @@ -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,))