[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

@@ -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'],

addons/hr_timesheet/report/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import hr_timesheet_report
 import user_timesheet
 import users_timesheet
 

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

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,

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:
 

addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml

@@ -95,6 +95,6 @@
         <menuitem
             action="action_hr_timesheet_report_stat_all"
             id="menu_hr_timesheet_report_all"
-            parent="menu_hr_reporting_timesheet" sequence="0"/>
+            parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="0"/>
     </data>
 </openerp>

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
+"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