From 3dde2f80364749c9ee261fd9f9b9c883dfcfb5ae Mon Sep 17 00:00:00 2001
From: mma <>
Date: Wed, 15 Jun 2011 11:45:15 +0200
Subject: [PATCH 1/3] [IMP] hr: create your employees wizard
bzr revid: qdp-launchpad@openerp.com-20110615094515-h35tg9mnktzobnmx
---
addons/hr/hr_view.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 90fd6732639..a302a05ccc2 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -154,6 +154,24 @@
Here you can manage your work force by creating employees and assigning them specific properties in the system. Maintain all employee related information and keep track of anything that needs to be recorded for them. The personal information tab will help you maintain their identity data. The Categories tab gives you the opportunity to assign them related employee categories depending on their position and activities within the company. A category can be a seniority level within the company or a department. The Timesheets tab allows to assign them a specific timesheet and analytic journal where they will be able to enter time through the system. In the note tab, you can enter text data that should be recorded for a specific employee.
+
+
+
+ Create your employees
+ ir.actions.act_window
+ hr.employee
+ form
+ form
+
+
+
+
+
+
+ normal
+ current
+ skip
+
From c16609ebd3ff5763bf0efa979040ebc76d6e1443 Mon Sep 17 00:00:00 2001
From: "mayur maheshwari (Open ERP)"
Date: Thu, 16 Jun 2011 18:28:15 +0530
Subject: [PATCH 2/3] [IMP]hr:move a config wizard in hr_installer.xml
bzr revid: mma@tinyerp.com-20110616125815-ehtuxh57zhgqscqh
---
addons/hr/hr_installer.xml | 18 ++++++++++++++++++
addons/hr/hr_view.xml | 18 ------------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 154e189b242..483f6f870dd 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -29,6 +29,24 @@
HR Management
5
+
+
+
+
+ Create your employees
+ ir.actions.act_window
+ hr.employee
+ form
+ form
+
+
+
+
+
+
+ normal
+ current
+ skip
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index a302a05ccc2..223f7001911 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -155,24 +155,6 @@
Here you can manage your work force by creating employees and assigning them specific properties in the system. Maintain all employee related information and keep track of anything that needs to be recorded for them. The personal information tab will help you maintain their identity data. The Categories tab gives you the opportunity to assign them related employee categories depending on their position and activities within the company. A category can be a seniority level within the company or a department. The Timesheets tab allows to assign them a specific timesheet and analytic journal where they will be able to enter time through the system. In the note tab, you can enter text data that should be recorded for a specific employee.
-
-
- Create your employees
- ir.actions.act_window
- hr.employee
- form
- form
-
-
-
-
-
-
- normal
- current
- skip
-
-
From fdc3ca74bb4ac9767c5ab9b034bdf908909ccdf5 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)"
Date: Fri, 17 Jun 2011 11:17:48 +0530
Subject: [PATCH 3/3] [REM]: hr: removed extra spaces for cleaning unwanted
changes in merge proposal
bzr revid: rpa@tinyerp.com-20110617054748-c72mcpbhjfjg6ngi
---
addons/hr/hr_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 223f7001911..90fd6732639 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -154,7 +154,7 @@
Here you can manage your work force by creating employees and assigning them specific properties in the system. Maintain all employee related information and keep track of anything that needs to be recorded for them. The personal information tab will help you maintain their identity data. The Categories tab gives you the opportunity to assign them related employee categories depending on their position and activities within the company. A category can be a seniority level within the company or a department. The Timesheets tab allows to assign them a specific timesheet and analytic journal where they will be able to enter time through the system. In the note tab, you can enter text data that should be recorded for a specific employee.
-
+