diff --git a/addons/crm_project/crm_bugs_menu.xml b/addons/crm_project/crm_bugs_menu.xml
index fbf98b271d0..c73be688d33 100644
--- a/addons/crm_project/crm_bugs_menu.xml
+++ b/addons/crm_project/crm_bugs_menu.xml
@@ -1,7 +1,7 @@
-
+
Bugs
@@ -22,15 +22,15 @@
Awaiting Response
-
+
Future
-
-
-
+
+
+
######################## BUG TRACKING (menu) ###########################
-
@@ -40,14 +40,14 @@
tree,calendar
-
+
tree
-
+
calendar
@@ -60,8 +60,8 @@
-
-
-
+
+
+
diff --git a/addons/crm_project/crm_feature_menu.xml b/addons/crm_project/crm_feature_menu.xml
index 3cedcabba26..7ccfa999246 100644
--- a/addons/crm_project/crm_feature_menu.xml
+++ b/addons/crm_project/crm_feature_menu.xml
@@ -1,8 +1,8 @@
-
+
+
-
Patches
@@ -14,11 +14,11 @@
Awaiting Response
-
-
-
+
+
+
######################## Future Request (menu) ###########################
-
@@ -28,14 +28,14 @@
tree,calendar
-
+
tree
-
+
calendar
@@ -47,8 +47,8 @@
form
-
-
-
+
+
+
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index 9c422c41a1d..e032e4691c1 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -1,7 +1,11 @@
-
+
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 541c38d3b81..7cd931fcc11 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -1,5 +1,6 @@
+
hr.analytic.timesheet.tree
diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py
index 821a3aa7287..d4cb6e943da 100644
--- a/addons/project/__terp__.py
+++ b/addons/project/__terp__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
@@ -26,7 +26,7 @@
"author" : "Tiny",
"website" : "http://www.openerp.com",
"category" : "Generic Modules/Projects & Services",
- "depends" : ["product", "account", "hr", "process", "mail_gateway"],
+ "depends" : ["product", "account", "hr", "process", "mail_gateway","hr_timesheet_sheet","report_timesheet","account_budget"],
"description": """Project management module that track multi-level projects, tasks,
works done on tasks, eso. It is able to render planning, order tasks, eso.
""",
@@ -35,10 +35,10 @@ works done on tasks, eso. It is able to render planning, order tasks, eso.
"update_xml": [
"security/project_security.xml",
"security/ir.model.access.csv",
- "project_data.xml",
- "project_wizard.xml",
- "project_view.xml",
- "project_report.xml",
+ "project_data.xml",
+ "project_wizard.xml",
+ "project_view.xml",
+ "project_report.xml",
"process/task_process.xml"
],
'demo_xml': ['project_demo.xml'],
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 3b4eee97adc..ee89f61e684 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -2,8 +2,25 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -144,7 +161,7 @@
-
+
All projects
@@ -154,7 +171,7 @@
-
+
Templates of Projects
@@ -163,8 +180,9 @@
[('state','=','template')]
-
-
+
+
+
project.task.work.form
project.task.work
@@ -218,10 +236,10 @@
[('parent_id','=',False)]
-
+ parent="project.menu_all_project"/>-->
@@ -485,7 +503,8 @@
-
+
+
My Department Tasks
@@ -728,8 +747,8 @@ menu_main
-
-
+
+
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index b3c8d695a5e..3b9e211cd2c 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -123,11 +123,11 @@
-
+ action="action_prject_task_tree"/>-->
).
#
@@ -15,7 +15,7 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
@@ -31,7 +31,7 @@
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
- 'depends': ['base', 'project', 'hr_timesheet_sheet'],
+ 'depends': ['base', 'project', 'hr_timesheet_sheet','hr_timesheet'],
'init_xml': [],
'update_xml': ["process/project_timesheet_process.xml"],
'demo_xml': [],
diff --git a/addons/project_timesheet/process/project_timesheet_process.xml b/addons/project_timesheet/process/project_timesheet_process.xml
index 301ee3c71ee..213d48f5540 100644
--- a/addons/project_timesheet/process/project_timesheet_process.xml
+++ b/addons/project_timesheet/process/project_timesheet_process.xml
@@ -7,7 +7,7 @@
-->
-
+
diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index 825daf5a6af..7a92460a893 100644
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -1,7 +1,7 @@
-
+
report.account.analytic.planning.tree
@@ -97,9 +97,9 @@
-
@@ -114,7 +114,7 @@
-
+
@@ -154,7 +154,7 @@
-
+
report.account.analytic.planning.search
report_account_analytic.planning
@@ -217,10 +217,10 @@
tree,form
-
+
-
+ parent="menu_pm_planning" />
+
@@ -338,8 +338,8 @@
-
-
+
+
@@ -359,8 +359,8 @@
id="act_task_of_lines" name="Planning tasks" res_model="project.task"
src_model="report_account_analytic.planning"
/>
-
-
+
+
res.company.planning.config
res.company
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index ce88e578221..e88f8865dba 100644
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -359,7 +359,7 @@
ir.actions.act_window
- Random Timesheet Lines
+ Timesheet Lines
random.timesheet.lines
form
tree,form