From 35cc9191840eab6ef731c358df35e92feddf3aac Mon Sep 17 00:00:00 2001 From: "Jni (Open ERP)" Date: Wed, 7 Jul 2010 19:24:58 +0530 Subject: [PATCH] [MOV]:hr_timesheet,hr_timesheet_sheet:Moved Timesheet Analysis in to the hr_timesheet_sheet module. bzr revid: jni@tinyerp.com-20100707135458-11y9sep9trk3x8x1 --- addons/hr_timesheet/__openerp__.py | 1 - addons/hr_timesheet/report/__init__.py | 5 ++--- addons/hr_timesheet/security/ir.model.access.csv | 1 - addons/hr_timesheet_sheet/__openerp__.py | 3 ++- addons/hr_timesheet_sheet/report/__init__.py | 2 +- .../report/hr_timesheet_report.py | 0 .../report/hr_timesheet_report_view.xml | 2 +- addons/hr_timesheet_sheet/security/ir.model.access.csv | 3 ++- 8 files changed, 8 insertions(+), 9 deletions(-) rename addons/{hr_timesheet => hr_timesheet_sheet}/report/hr_timesheet_report.py (100%) rename addons/{hr_timesheet => hr_timesheet_sheet}/report/hr_timesheet_report_view.xml (98%) diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py index 95244d25564..66bcfe46a43 100644 --- a/addons/hr_timesheet/__openerp__.py +++ b/addons/hr_timesheet/__openerp__.py @@ -48,7 +48,6 @@ to set up a management by affair. 'wizard/hr_timesheet_print_employee_view.xml', 'wizard/hr_timesheet_print_users_view.xml', 'wizard/hr_timesheet_sign_in_out_view.xml', - 'report/hr_timesheet_report_view.xml', ], 'demo_xml': ['hr_timesheet_demo.xml'], 'test': ['test/test_hr_timesheet.yml'], diff --git a/addons/hr_timesheet/report/__init__.py b/addons/hr_timesheet/report/__init__.py index d54615fbd0b..98e34ed92d4 100644 --- a/addons/hr_timesheet/report/__init__.py +++ b/addons/hr_timesheet/report/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,11 +15,10 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## -import hr_timesheet_report import user_timesheet import users_timesheet diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv index db0a4b44138..3a5c509981e 100644 --- a/addons/hr_timesheet/security/ir.model.access.csv +++ b/addons/hr_timesheet/security/ir.model.access.csv @@ -2,4 +2,3 @@ "access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","hr.group_hr_user",1,1,1,1 "access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","hr.group_hr_user",1,1,1,0 "access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","hr.group_hr_user",1,0,0,0 -"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","hr.group_hr_manager",1,0,0,0 diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py index 9163219e2a6..7930df1f243 100644 --- a/addons/hr_timesheet_sheet/__openerp__.py +++ b/addons/hr_timesheet_sheet/__openerp__.py @@ -55,9 +55,10 @@ The validation can be configured in the company: 'process/hr_timesheet_sheet_process.xml', 'report/timesheet_report_view.xml', 'board_hr_timesheet_view.xml', + 'report/hr_timesheet_report_view.xml', ], 'demo_xml': ['hr_timesheet_sheet_demo.xml', - + ], 'test':['test/test_hr_timesheet_sheet.yml'], 'installable': True, diff --git a/addons/hr_timesheet_sheet/report/__init__.py b/addons/hr_timesheet_sheet/report/__init__.py index 89f12b7c9a6..b06b0608356 100644 --- a/addons/hr_timesheet_sheet/report/__init__.py +++ b/addons/hr_timesheet_sheet/report/__init__.py @@ -20,6 +20,6 @@ ############################################################################## import timesheet_report - +import hr_timesheet_report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_timesheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py similarity index 100% rename from addons/hr_timesheet/report/hr_timesheet_report.py rename to addons/hr_timesheet_sheet/report/hr_timesheet_report.py diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml similarity index 98% rename from addons/hr_timesheet/report/hr_timesheet_report_view.xml rename to addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml index 648b8f30321..9dadb599ba7 100644 --- a/addons/hr_timesheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -95,6 +95,6 @@ + parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="0"/> diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv index 193035bbca2..141a1667404 100644 --- a/addons/hr_timesheet_sheet/security/ir.model.access.csv +++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv @@ -1,4 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_hr_timesheet_sheet_sheet","hr_timesheet_sheet.sheet","model_hr_timesheet_sheet_sheet","hr.group_hr_user",1,1,1,1 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","hr.group_hr_user",1,1,1,1 -"access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","hr.group_hr_user",1,1,1,1 \ No newline at end of file +"access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","hr.group_hr_user",1,1,1,1 +"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","hr.group_hr_manager",1,0,0,0