diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py index f42321dc75c..9db64bbb27c 100644 --- a/addons/hr_evaluation/__openerp__.py +++ b/addons/hr_evaluation/__openerp__.py @@ -43,7 +43,8 @@ "security/hr_evaluation_security.xml", "wizard/hr_evaluation_mail_view.xml", "hr_evaluation_view.xml", - "report/hr_evaluation_report_view.xml" + "report/hr_evaluation_report_view.xml", + "board_hr_evaluation_view.xml" ], "test": ["test/test_hr_evaluation.yml"], "active": False, diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml index 7822c0d3111..5a67fe1945d 100644 --- a/addons/hr_evaluation/board_hr_evaluation_view.xml +++ b/addons/hr_evaluation/board_hr_evaluation_view.xml @@ -2,12 +2,12 @@ - My Current Evaluations + My Evaluation Remaining ir.actions.act_window hr_evaluation.evaluation form - [('state','!=','done'),('create_uid','=',uid)] + [('state','in',('wait', 'progress')),('create_uid','=',uid)] @@ -18,9 +18,15 @@ form - + + diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml index 1f679953610..9063ac32458 100644 --- a/addons/hr_expense/board_hr_expense_manager_view.xml +++ b/addons/hr_expense/board_hr_expense_manager_view.xml @@ -6,7 +6,7 @@ All Employee Expenses hr.expense.expense form - [('state','=','accepted')] + [('state','in',('confirm', 'accepted'))] diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml index 4b06cd758b1..69dbad767d9 100644 --- a/addons/hr_expense/board_hr_expense_view.xml +++ b/addons/hr_expense/board_hr_expense_view.xml @@ -13,7 +13,7 @@ My Expenses hr.expense.expense form - [('state','in',('draft', 'confirm')),('user_id','=',uid)] + [('state','in',('confirm', 'accepted')),('user_id','=',uid)] diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml index 20bd2aaecb8..8659e3de51d 100644 --- a/addons/hr_holidays/board_hr_holidays_view.xml +++ b/addons/hr_holidays/board_hr_holidays_view.xml @@ -15,20 +15,10 @@ hr.holidays form tree,form - [('user_id','=',uid)] + [('state','in',('confirm', 'validate')),('user_id','=',uid)] - - Remaining Leaves by User - ir.actions.act_window - hr.holidays.remaining.leaves.user - form - graph,tree - [('user_id','=',uid)] - - - board.hr.holidays.form board.board @@ -42,17 +32,27 @@ - - board.hr.holidays.remaining.form + + + Leaves by Month + ir.actions.act_window + available.holidays.report + form + graph,tree + [('user_id','=',uid)] + {'group_by_no_leaf':1,'group_by':['month']} + + + + board.hr.holidays.leave.month.form board.board form - + - diff --git a/addons/hr_holidays/board_hr_manager_holidays_view.xml b/addons/hr_holidays/board_hr_manager_holidays_view.xml index f0fa8fe0e3a..eb3af2781f6 100644 --- a/addons/hr_holidays/board_hr_manager_holidays_view.xml +++ b/addons/hr_holidays/board_hr_manager_holidays_view.xml @@ -13,7 +13,7 @@ - Remaining Leaves by Employee + Remaining Leaves by User ir.actions.act_window hr.holidays.remaining.leaves.user form @@ -40,7 +40,7 @@ - + diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml index 4374e2b461a..0057f5a3f9b 100644 --- a/addons/hr_holidays/hr_holidays_wizard.xml +++ b/addons/hr_holidays/hr_holidays_wizard.xml @@ -11,6 +11,7 @@ id="menu_hr_reporting_holidays" name="Holidays" parent="hr.menu_hr_reporting" - sequence="6" /> + sequence="6" + groups="base.group_hr_manager" /> diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml index 0b9f91e37dc..ebdd65b84c8 100644 --- a/addons/hr_holidays/report/available_holidays_view.xml +++ b/addons/hr_holidays/report/available_holidays_view.xml @@ -35,6 +35,7 @@ + diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv index 0e7b122a943..238d526bf5e 100644 --- a/addons/hr_holidays/security/ir.model.access.csv +++ b/addons/hr_holidays/security/ir.model.access.csv @@ -12,3 +12,4 @@ "access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,0,0,0 "access_hr_holydays_status_employee","hr.holidays.status.employee","model_hr_holidays_status","base.group_user",1,0,0,0 "access_resource_calendar_leaves_manager","resource_calendar_leaves_manager","resource.model_resource_calendar_leaves","base.group_hr_manager",1,1,1,1 +"access_available_holidays_report_user","hr.available.holidays.report.user","model_available_holidays_report","base.group_hr_user",1,1,1,0 diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py index e740affd567..69bdd97da58 100644 --- a/addons/hr_recruitment/__openerp__.py +++ b/addons/hr_recruitment/__openerp__.py @@ -41,8 +41,8 @@ system to store and search in your CV base. 'hr_recruitment_menu.xml', 'security/hr_recruitment_security.xml', 'security/ir.model.access.csv', - 'board_hr_recruitment_statistical_view.xml', 'report/hr_recruitment_report_view.xml', + 'board_hr_recruitment_statistical_view.xml', ], 'init_xml': [ 'hr_recruitment_data.xml' diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml index 5304f95ea52..7416ff8b0ab 100644 --- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml +++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml @@ -30,7 +30,7 @@ board.hr.applicants.status.form board.board - + form @@ -38,6 +38,13 @@ - + + diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index d527120c801..d1f06577fb2 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -133,7 +133,7 @@ {'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]} - + diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml index 2d38011f279..ff61617661c 100644 --- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml +++ b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml @@ -65,7 +65,7 @@ board.hr.timesheet.uninvoiced.form board.board form - + diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv index c2101a8c6e7..2dd928fc924 100644 --- a/addons/hr_timesheet_invoice/security/ir.model.access.csv +++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv @@ -17,3 +17,4 @@ "access_account_invoice_hr_manager","account.invoice.hr.manager","account.model_account_invoice","base.group_hr_manager",1,1,1,1 "access_hr_timesheet_invoice_factor_hr_manager","hr_timesheet_invoice.factor.hr.manager","model_hr_timesheet_invoice_factor","base.group_hr_manager",1,1,1,1 "access_account_invoice_tax_hr_manager","account.invoice.tax.hr.manager","account.model_account_invoice_tax","base.group_hr_manager",1,1,1,1 +"access_report_timesheet_line_employee","report.timesheet.line.employee","model_report_timesheet_line","base.group_user",1,1,1,0 diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml index 1fa5206fa90..f299cb94298 100644 --- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml +++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml @@ -52,7 +52,7 @@ board.hr.timesheet.form board.board - + form @@ -77,5 +77,31 @@ + + My Total Attendances By Week + hr_timesheet_sheet.sheet + form + graph + [('user_id','=',uid)] + + + + board.hr.timesheet.sheet.form + board.board + + form + + + + + + + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 657ec40288d..19a9af3c33d 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -313,7 +313,17 @@ - + + hr.timesheet.sheet.sheet.graph + hr_timesheet_sheet.sheet + graph + + + + + + + diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv index de19d325f5f..116396612e8 100644 --- a/addons/hr_timesheet_sheet/security/ir.model.access.csv +++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv @@ -5,7 +5,7 @@ "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1 "access_hr_timesheet_sheet_sheet_manager","hr_timesheet_sheet.sheet.manager","model_hr_timesheet_sheet_sheet","base.group_hr_manager",1,1,1,1 "access_hr_timesheet_sheet_sheet_system","hr_timesheet_sheet.sheet.system","model_hr_timesheet_sheet_sheet","base.group_system",1,0,0,0 -"access_timesheet_report_manager","timesheet.report.manager","model_timesheet_report","base.group_hr_manager",1,1,1,1 +"access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_user",1,1,1,0 "access_hr_timesheet_sheet_sheet_employee","hr_timesheet_sheet.sheet.employee","model_hr_timesheet_sheet_sheet","base.group_user",1,1,1,0 "access_hr_timesheet_sheet_sheet_day_manager","hr_timesheet_sheet.sheet.day.manager","model_hr_timesheet_sheet_sheet_day","base.group_hr_manager",1,1,1,1 "access_hr_timesheet_sheet_sheet_account_manager","hr_timesheet_sheet.sheet.account.manager","model_hr_timesheet_sheet_sheet_account","base.group_hr_manager",1,1,1,1