From 8248aa7006ecb894b94987e4ba5d1e3884ff6d98 Mon Sep 17 00:00:00 2001 From: prakash Date: Mon, 28 Mar 2022 13:40:05 +0530 Subject: [PATCH] Unused report menu hide --- project_report/__manifest__.py | 2 +- project_report/report/__init__.py | 2 +- project_report/report/project_revenue_custom_report.py | 4 ++-- project_report/security/ir.model.access.csv | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/project_report/__manifest__.py b/project_report/__manifest__.py index 00bc49f..5b4eb09 100755 --- a/project_report/__manifest__.py +++ b/project_report/__manifest__.py @@ -23,7 +23,7 @@ 'report/project_timesheet_report_views.xml', 'report/project_revenue_custom_report_views.xml', 'report/project_consultant_custom_report_views.xml', - 'report/cor_project_report_views.xml', + #'report/cor_project_report_views.xml', ], 'qweb': [ "static/src/xml/base.xml", diff --git a/project_report/report/__init__.py b/project_report/report/__init__.py index 2c47515..dac41ee 100755 --- a/project_report/report/__init__.py +++ b/project_report/report/__init__.py @@ -7,4 +7,4 @@ from . import project_timeline_report from . import project_timesheet_report from . import project_revenue_custom_report from . import project_consultant_custom_report -from . import cor_project_report +#from . import cor_project_report diff --git a/project_report/report/project_revenue_custom_report.py b/project_report/report/project_revenue_custom_report.py index 0c96ba9..a08aef3 100755 --- a/project_report/report/project_revenue_custom_report.py +++ b/project_report/report/project_revenue_custom_report.py @@ -115,8 +115,8 @@ class ProjectRevenueCustomReport(models.Model): ((AAL.amount * -1)/NULLIF(AAL.unit_amount, 0)) as timesheet_cost, AAL.start_datetime AS timesheet_sdatetime 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 + RIGHT JOIN account_analytic_account AA ON PRO.analytic_account_id = AA.id + RIGHT JOIN account_analytic_line AAL ON AAL.account_id = AA.id and AAL.project_id = PRO.id WHERE PRO.active = 't' and PRO.pricing_type = 'employee_rate' and PRO.project_type='hours_no_limit' UNION select diff --git a/project_report/security/ir.model.access.csv b/project_report/security/ir.model.access.csv index 74b448a..961fa44 100755 --- a/project_report/security/ir.model.access.csv +++ b/project_report/security/ir.model.access.csv @@ -13,5 +13,4 @@ access_project_revenue_custom_report_manager,project_revenue_custom_report_manag access_project_revenue_custom_report_user,project_revenue_custom_report_user,model_project_revenue_custom_report,project.group_project_user,1,0,0,0 access_project_consultant_custom_report_manager,project_consultant_custom_report_manager,model_project_consultant_custom_report,project.group_project_manager,1,1,1,1 access_project_consultant_custom_report_user,project_consultant_custom_report_user,model_project_consultant_custom_report,project.group_project_user,1,0,0,0 -access_cor_project_report_manager,cor.project.report,model_cor_project_report,project.group_project_manager,1,1,1,1 -access_cor_project_report_user,cor.project.report,model_cor_project_report,project.group_project_user,1,0,0,0 +