From adc92d6c44f5af6b80866908488932edbcfdd7b9 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 12:58:58 +0530 Subject: [PATCH 01/11] [IMP] hr:improved view of dashboard and remove unnecessary code bzr revid: tpa@tinyerp.com-20120606072858-b42s1lk81n3geonm --- addons/hr/hr_board.xml | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml index e665c5067eb..4f3cc1ccf8e 100644 --- a/addons/hr/hr_board.xml +++ b/addons/hr/hr_board.xml @@ -7,7 +7,7 @@ board.board form -
+ @@ -24,32 +24,7 @@ - - - - - - - board.hr.manager.form - board.board - form - - - - - - - - - - - HR Manager Dashboard - board.board - form - form - menu - - + From 830ca22dca946bda869f41ed112fc99ea5c4ed10 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 14:14:17 +0530 Subject: [PATCH 02/11] [IMP] hr_expanse:remove unnecessary code bzr revid: tpa@tinyerp.com-20120606084417-rxit2qq4nw3x3vx3 --- addons/hr_expense/__openerp__.py | 1 - .../board_hr_expense_manager_view.xml | 25 ------------------- 2 files changed, 26 deletions(-) delete mode 100644 addons/hr_expense/board_hr_expense_manager_view.xml diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py index cbf8b322b36..2a1d302e094 100644 --- a/addons/hr_expense/__openerp__.py +++ b/addons/hr_expense/__openerp__.py @@ -56,7 +56,6 @@ re-invoice your customer's expenses if your work by project. 'security/ir_rule.xml', 'report/hr_expense_report_view.xml', 'board_hr_expense_view.xml', - 'board_hr_expense_manager_view.xml', 'hr_expense_installer_view.xml', ], 'demo_xml': [ diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml deleted file mode 100644 index 0f09c9a3290..00000000000 --- a/addons/hr_expense/board_hr_expense_manager_view.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - All Employee Expenses - hr.expense.expense - form - [('state','in',('confirm', 'accepted'))] - - - - - board.hr.manager.expense.form - board.board - - form - - - - - - - - From 05337fa8e75d6a7cb87889d505eb247a617fa793 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 14:28:25 +0530 Subject: [PATCH 03/11] [IMP] hr_holidays:remove unnecessary code bzr revid: tpa@tinyerp.com-20120606085825-mam2fm5lxbzm4lba --- addons/hr_holidays/__openerp__.py | 1 - .../board_hr_manager_holidays_view.xml | 28 ------------------- addons/hr_holidays/hr_holidays_view.xml | 1 - 3 files changed, 30 deletions(-) delete mode 100644 addons/hr_holidays/board_hr_manager_holidays_view.xml diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py index e60f53d7d1e..09809e488ba 100644 --- a/addons/hr_holidays/__openerp__.py +++ b/addons/hr_holidays/__openerp__.py @@ -65,7 +65,6 @@ Note that: 'wizard/hr_holidays_summary_department_view.xml', 'wizard/hr_holidays_summary_employees_view.xml', 'board_hr_holidays_view.xml', - 'board_hr_manager_holidays_view.xml', ], 'demo_xml': ['hr_holidays_demo.xml',], 'test': ['test/test_hr_holiday.yml', diff --git a/addons/hr_holidays/board_hr_manager_holidays_view.xml b/addons/hr_holidays/board_hr_manager_holidays_view.xml deleted file mode 100644 index 1c7c6280f8b..00000000000 --- a/addons/hr_holidays/board_hr_manager_holidays_view.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - Leaves To Validate - ir.actions.act_window - hr.holidays - form - tree,form - [('state','in',('confirm', 'validate', 'validate1'))] - - - - - board.hr.holidays.manager.form - board.board - - form - - - - - - - - - diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 58abaae02ac..730e90df9c7 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -255,7 +255,6 @@ - From 560cc943aedddc8e588e11a49803d216166cd7cb Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 14:31:12 +0530 Subject: [PATCH 04/11] [IMP] hr_recruitmeent:remove unnecessary code bzr revid: tpa@tinyerp.com-20120606090112-ceo9u952gtb8uli7 --- addons/hr_recruitment/__openerp__.py | 1 - .../board_hr_recruitment_statistical_view.xml | 42 ------------------- 2 files changed, 43 deletions(-) delete mode 100644 addons/hr_recruitment/board_hr_recruitment_statistical_view.xml diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py index b83a482e1c1..be11b205d24 100644 --- a/addons/hr_recruitment/__openerp__.py +++ b/addons/hr_recruitment/__openerp__.py @@ -54,7 +54,6 @@ system to store and search in your CV base. 'security/hr_recruitment_security.xml', 'security/ir.model.access.csv', 'report/hr_recruitment_report_view.xml', - 'board_hr_recruitment_statistical_view.xml', 'hr_recruitment_installer_view.xml', 'res_config_view.xml', ], diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml deleted file mode 100644 index e9054416eea..00000000000 --- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - applicants.status.tree - hr.applicant - tree - - - - - - - - - - - - - Applicants Status - ir.actions.act_window - hr.applicant - form - tree,form - [('state','in',('draft','open'))] - - - - - board.hr.applicants.status.form - board.board - - form - - - - - - - - From 4606bb66ceebf3174cfe8d3dda3bb46471ec440e Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 14:46:35 +0530 Subject: [PATCH 05/11] [IMP] hr_timesheet_sheet:improved view of dashboard and remove unnecessary code bzr revid: tpa@tinyerp.com-20120606091635-tglt5l9sk8cbf3dv --- .../board_hr_timesheet_view.xml | 28 ++++++------------- .../hr_timesheet_sheet_view.xml | 23 --------------- 2 files changed, 9 insertions(+), 42 deletions(-) diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml index 74530b81859..2b165334739 100644 --- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml +++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml @@ -2,30 +2,18 @@ - - Timesheets - ir.actions.act_window - hr_timesheet_sheet.sheet - form - graph,tree - - - - hr.timesheet.sheet.tree.simplified.board + + hr.timesheet.sheet.sheet.graph hr_timesheet_sheet.sheet - tree + graph - - - - + - - - - + + + My Total Attendances By Week hr_timesheet_sheet.sheet @@ -34,6 +22,7 @@ [('user_id','=',uid)] + board.hr.timesheet.sheet.form board.board @@ -45,5 +34,6 @@
+ diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index afd04aed1e1..0715ba1bdc2 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -2,18 +2,6 @@ - - hr.timesheet.sheet.graph - hr_timesheet_sheet.sheet - graph - - - - - - - - hr.timesheet.account.form hr_timesheet_sheet.sheet.account @@ -336,17 +324,6 @@ - - hr.timesheet.sheet.sheet.graph - hr_timesheet_sheet.sheet - graph - - - - - - - hr.timesheet.day.tree From 674468f69531b8c5cca5cc64bdce924627f8ac4f Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 15:02:31 +0530 Subject: [PATCH 06/11] [IMP] hr_timesheet_invoice:improved view of dashboard and remove unnecessary code bzr revid: tpa@tinyerp.com-20120606093231-qhs7vz691cpuve2k --- addons/hr_timesheet_invoice/__openerp__.py | 1 - .../board_hr_timesheet_invoice.xml | 77 ------------------- 2 files changed, 78 deletions(-) delete mode 100644 addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py index 7e11fdad723..65b8905fca0 100644 --- a/addons/hr_timesheet_invoice/__openerp__.py +++ b/addons/hr_timesheet_invoice/__openerp__.py @@ -45,7 +45,6 @@ reports, etc.""", 'wizard/hr_timesheet_analytic_profit_view.xml', 'wizard/hr_timesheet_invoice_create_view.xml', 'wizard/hr_timesheet_invoice_create_final_view.xml', - 'board_hr_timesheet_invoice.xml', ], 'demo': [ 'hr_timesheet_invoice_demo.xml', diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml deleted file mode 100644 index 7327ca66f63..00000000000 --- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - Costs to invoice - report.account.analytic.line.to.invoice - form - graph,tree - - - - - - - - - timesheet.uninvoiced.line.tree - report.timesheet.line - tree - - - - - - - - - - - - - Uninvoice lines with billing rate - report.timesheet.line - form - form,tree - [('invoice_id','=',False)] - - - - - board.hr.timesheet.uninvoiced.form - board.board - form - - - - - - - - - - From 694ac5345f10ddb0d88288b84a5a70ab38e582a3 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 15:09:54 +0530 Subject: [PATCH 07/11] [IMP] improved code bzr revid: tpa@tinyerp.com-20120606093954-jz37e8dn3strmtra --- addons/hr/hr_board.xml | 3 ++- addons/hr_evaluation/board_hr_evaluation_view.xml | 6 +++--- addons/hr_holidays/board_hr_holidays_view.xml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml index 4f3cc1ccf8e..1a78c5507a4 100644 --- a/addons/hr/hr_board.xml +++ b/addons/hr/hr_board.xml @@ -1,7 +1,7 @@ - + board.hr.form board.board @@ -15,6 +15,7 @@ + Human Resources Dashboard board.board diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml index f25c669a973..8ea2ecc906b 100644 --- a/addons/hr_evaluation/board_hr_evaluation_view.xml +++ b/addons/hr_evaluation/board_hr_evaluation_view.xml @@ -16,9 +16,9 @@ form - - - + + + diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml index 178602725ae..8a63136a42c 100644 --- a/addons/hr_holidays/board_hr_holidays_view.xml +++ b/addons/hr_holidays/board_hr_holidays_view.xml @@ -17,7 +17,7 @@ - + From 036a2fa00c77c38d2b6626c54a9bac07102079e7 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 15:24:54 +0530 Subject: [PATCH 08/11] [IMP] hr_recruitment:improved view of dashboard bzr revid: tpa@tinyerp.com-20120606095454-q5vvkly3hk9qxr1s --- addons/hr_recruitment/__openerp__.py | 1 + .../board_hr_recruitment_statistical_view.xml | 43 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 addons/hr_recruitment/board_hr_recruitment_statistical_view.xml diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py index be11b205d24..b83a482e1c1 100644 --- a/addons/hr_recruitment/__openerp__.py +++ b/addons/hr_recruitment/__openerp__.py @@ -54,6 +54,7 @@ system to store and search in your CV base. 'security/hr_recruitment_security.xml', 'security/ir.model.access.csv', 'report/hr_recruitment_report_view.xml', + 'board_hr_recruitment_statistical_view.xml', 'hr_recruitment_installer_view.xml', 'res_config_view.xml', ], diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml new file mode 100644 index 00000000000..468d3a8d66e --- /dev/null +++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml @@ -0,0 +1,43 @@ + + + + + + applicants.status.tree + hr.applicant + tree + + + + + + + + + + + + + Applicants Status + ir.actions.act_window + hr.applicant + form + tree,form + [('state','in',('draft','open'))] + + + + + board.hr.applicants.status.form + board.board + + form + + + + + + + + + From a28952a6b25b04f2ff28983ddc6744105ce96752 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 15:30:17 +0530 Subject: [PATCH 09/11] [IMP] hr:improved view of dashboard bzr revid: tpa@tinyerp.com-20120606100017-6h4gzyug5o74yxjq --- addons/hr_evaluation/board_hr_evaluation_view.xml | 3 ++- addons/hr_holidays/board_hr_holidays_view.xml | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml index 8ea2ecc906b..c0306cef0e1 100644 --- a/addons/hr_evaluation/board_hr_evaluation_view.xml +++ b/addons/hr_evaluation/board_hr_evaluation_view.xml @@ -1,6 +1,7 @@ + Interview Requests hr.evaluation.interview @@ -16,7 +17,7 @@ form - + diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml index 8a63136a42c..eb3b671af6b 100644 --- a/addons/hr_holidays/board_hr_holidays_view.xml +++ b/addons/hr_holidays/board_hr_holidays_view.xml @@ -1,6 +1,7 @@ + My Leaves hr.holidays.status @@ -10,6 +11,7 @@ {} [] + board.hr.holidays.leave.month.form board.board @@ -17,9 +19,10 @@ - + + From 0cd492bb6708bf0ce0e43c29009ad321efc462fb Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 15:44:38 +0530 Subject: [PATCH 10/11] [IMP] improved code in .pot files in hr reated modules bzr revid: tpa@tinyerp.com-20120606101438-qk5mctjef85ltffh --- addons/hr/i18n/hr.pot | 6 ------ addons/hr_holidays/i18n/hr_holidays.pot | 5 ----- .../i18n/hr_timesheet_invoice.pot | 11 ----------- addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot | 1 - 4 files changed, 23 deletions(-) diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot index c0f57787a35..24969013f2e 100644 --- a/addons/hr/i18n/hr.pot +++ b/addons/hr/i18n/hr.pot @@ -408,12 +408,6 @@ msgstr "" msgid "Working Address" msgstr "" -#. module: hr -#: model:ir.actions.act_window,name:hr.open_board_hr_manager -#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager -msgid "HR Manager Dashboard" -msgstr "" - #. module: hr #: field:hr.department,child_ids:0 msgid "Child Departments" diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot index 76cbd507c0e..8720565bf40 100644 --- a/addons/hr_holidays/i18n/hr_holidays.pot +++ b/addons/hr_holidays/i18n/hr_holidays.pot @@ -540,11 +540,6 @@ msgstr "" msgid "Active" msgstr "" -#. module: hr_holidays -#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board -msgid "Leaves To Validate" -msgstr "" - #. module: hr_holidays #: constraint:hr.employee:0 msgid "Error ! You cannot create recursive Hierarchy of Employees." diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot index ca1fd1105fd..768c4be3dac 100644 --- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot +++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot @@ -243,11 +243,6 @@ msgstr "" msgid "Deadline" msgstr "" -#. module: hr_timesheet_invoice -#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account -msgid "Accounts to invoice" -msgstr "" - #. module: hr_timesheet_invoice #: field:report.analytic.account.close,partner_id:0 msgid "Partner" @@ -285,7 +280,6 @@ msgstr "" #. module: hr_timesheet_invoice #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice -#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice msgid "Costs to invoice" msgstr "" @@ -907,11 +901,6 @@ msgstr "" msgid "Product" msgstr "" -#. module: hr_timesheet_invoice -#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line -msgid "Uninvoice lines with billing rate" -msgstr "" - #. module: hr_timesheet_invoice #: report:account.analytic.profit:0 msgid "%" diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot index 70ba5d24f82..8e02c395881 100644 --- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot +++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot @@ -272,7 +272,6 @@ msgstr "" #: view:hr_timesheet_sheet.sheet:0 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form -#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form #: view:res.company:0 msgid "Timesheets" From 875b6f28342dc29c4e0a96ab94b57969d25e8622 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 17:18:05 +0530 Subject: [PATCH 11/11] [IMP] improved code. bzr revid: tpa@tinyerp.com-20120606114805-p26tg8fyhsiabm2j --- addons/hr/hr_board.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml index 1a78c5507a4..cb2c039cbb1 100644 --- a/addons/hr/hr_board.xml +++ b/addons/hr/hr_board.xml @@ -24,7 +24,7 @@ menu - +