From 2a9ce6bc21f27d2dd5265af040ceddcf4a9eb4bc Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Mon, 1 Feb 2010 16:28:07 +0530 Subject: [PATCH 1/8] [Fix] : Problem of pending invoice menu fixed bzr revid: vir@tinyerp.com-20100201105807-4z99vnibvgstmjy4 --- addons/purchase/purchase_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 9480f3327c3..2f612c159a6 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -27,8 +27,8 @@ - + Date: Mon, 1 Feb 2010 16:37:19 +0530 Subject: [PATCH 2/8] [ADD] New module added as board_hr bzr revid: vir@tinyerp.com-20100201110719-nf5b0fm61d6e4pdo --- addons/board_hr/__init__.py | 24 +++++++++++ addons/board_hr/__terp__.py | 42 ++++++++++++++++++ addons/board_hr/board_hr_view.xml | 72 +++++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+) create mode 100644 addons/board_hr/__init__.py create mode 100644 addons/board_hr/__terp__.py create mode 100644 addons/board_hr/board_hr_view.xml diff --git a/addons/board_hr/__init__.py b/addons/board_hr/__init__.py new file mode 100644 index 00000000000..e68279cad8d --- /dev/null +++ b/addons/board_hr/__init__.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 . +# +############################################################################## + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/board_hr/__terp__.py b/addons/board_hr/__terp__.py new file mode 100644 index 00000000000..80b00961dbe --- /dev/null +++ b/addons/board_hr/__terp__.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 . +# +############################################################################## + + +{ + 'name': 'Board for Human Reasources Management', + 'version': '1.0', + 'category': '', + 'description': """ +This module implements a dashboard for human resource management that includes: + * My Current Timesheet + * My Leaves + * My Expenses + """, + 'author': 'Tiny', + 'depends': [ 'crm_project','board','hr_expense','hr_timesheet_sheet','hr_holidays' + ], + 'update_xml': ['board_hr_view.xml'], + 'demo_xml': [], + 'installable': True, + 'active': False, + 'certificate': '', +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/board_hr/board_hr_view.xml b/addons/board_hr/board_hr_view.xml new file mode 100644 index 00000000000..2e84eff0749 --- /dev/null +++ b/addons/board_hr/board_hr_view.xml @@ -0,0 +1,72 @@ + + + + + + + + My Expenses + hr.expense.expense + form + [('state','=','draft'),('user_id','=',uid)] + + + + + Timesheets + ir.actions.act_window + hr_timesheet_sheet.sheet + form + + [('date_to','>=',time.strftime('%Y-%m-01')),('date_from','<=',time.strftime('%Y-%m-01'))] + + + + + My Leaves + ir.actions.act_window + hr.holidays.per.user + form + tree,form + + + + + board.hr.form + board.board + form + +
+ + + + + + + + + +
+
+
+ + + Human Resources Dashboard + board.board + form + form + menu + + + + +
+
From 2044339a0ded9ff64357abd258b3d10a408dc603 Mon Sep 17 00:00:00 2001 From: "RCH(Open ERP)" <> Date: Mon, 1 Feb 2010 16:39:48 +0530 Subject: [PATCH 3/8] [MOD] hr_expense,hr_timesheet_sheet,hr_holiday : Modificatin realted to board_hr module bzr revid: vir@tinyerp.com-20100201110948-p6xl1x6tvma8mcld --- addons/hr_expense/hr_expense_view.xml | 15 ++++++++++++ addons/hr_holidays/hr_view.xml | 15 +++++++++++- .../hr_timesheet_sheet_view.xml | 23 +++++++++++++++++-- 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 59452ff7cc8..580a0d371a5 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -37,6 +37,21 @@ + + hr.expense.expense.tree + hr.expense.expense + tree + + + + + + + + + + + hr.expense.form diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml index b8e6c2af47e..68138977d96 100644 --- a/addons/hr_holidays/hr_view.xml +++ b/addons/hr_holidays/hr_view.xml @@ -148,7 +148,20 @@ - + + + hr.holidays.per.user.form + hr.holidays.per.user + tree + + + + + + + + + + + hr.timesheet.sheet.tree + hr_timesheet_sheet.sheet + tree + + + + + + + + + + + + + + hr.timesheet.account.form hr_timesheet_sheet.sheet.account @@ -46,7 +65,7 @@ - - + - + Pipeline of tasks report.task.user.pipeline.open @@ -20,7 +20,7 @@ graph,tree [('user_id','in',department_users_get())] - + hr.timesheet.sheet.tree.simplified.board hr_timesheet_sheet.sheet @@ -43,8 +43,8 @@ form - - + + board.project.manager.form board.board @@ -53,27 +53,27 @@
- - + + - + - + -