From e24a9602f62b687da8844373e6e1a28f67e55ddb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 3 Mar 2010 15:38:27 +0100
Subject: [PATCH 1/2] [fix] hr: Issue with toplevel menu

Two different toplevel menu items are created, generating a single
ir.ui.menu but two different ir.model.data...

lp bug: https://launchpad.net/bugs/530835 fixed

bzr revid: xmo@tinyerp.com-20100303143827-mlzt58p0prvyqlgr
---
 addons/hr/hr_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index fdc55999297..907d2bdbb76 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -377,11 +377,10 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem icon="terp-hr" id="base.menu_hr" name="Human Resources"/>
         <menuitem
             name="Recruitment"
             id="base.menu_crm_case_job_req_main"
-            parent="base.menu_hr"/>
+            parent="menu_hr_root"/>
         <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
 
     </data>

From 60321a3fe5d8347efa6b894dd4048f0bb1b0bbf1 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 3 Mar 2010 21:24:52 +0530
Subject: [PATCH 2/2] [FIX] project_planing : BAD code corrected

lp bug: https://launchpad.net/bugs/531382 fixed

bzr revid: jvo@tinyerp.com-20100303155452-uavskwmhrhi9tw74
---
 addons/project_planning/project_planning.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 96e6dd94bca..359fdd6887f 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -286,7 +286,7 @@ Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holi
         cr.execute(""" CREATE OR REPLACE VIEW report_account_analytic_planning_user AS (
         SELECT
             planning.id AS planning_id,
-            planning.id::varchar(32) || '-' || COALESCE(users.id,0)::varchar(32) AS id,
+            (1000*(planning.id) + users.id)::integer AS id,
             planning.business_days,
             users.id AS user_id,
             (SELECT sum(line1.amount_in_base_uom)
@@ -330,7 +330,7 @@ Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holi
 
         SELECT
             planning.id AS planning_id,
-            planning.id::varchar(32) || '-' || '0' AS id,
+            (1000*(planning.id) - 1)::integer AS id,
             planning.business_days,
             line.user_id,
             (SELECT SUM(line1.amount_in_base_uom)