From f0c997d4bc138b8c9c8f1c2b88c4ee1a1e4524aa Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 27 Jan 2009 22:25:44 +0100
Subject: [PATCH] merge

bzr revid: fp@tinyerp.com-20090127212544-gcntt9aubtnuv3cg
---
 addons/project/project.py   | 6 ++++--
 addons/stock/stock_view.xml | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 8fe10ea38e2..d823b5920b6 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -88,7 +88,8 @@ class project(osv.osv):
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team."),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose."),
         'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
-        'parent_id': fields.many2one('project.project', 'Parent Project'),
+        'parent_id': fields.many2one('project.project', 'Parent Project',\
+            help="If you have [?] in the name, it means there are no analytic account linked to project."),
         'child_id': fields.one2many('project.project', 'parent_id', 'Subproject'),
         'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project."),
         'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project."),
@@ -263,7 +264,8 @@ class task(osv.osv):
         'date_start': fields.datetime('Starting Date'),
         'date_deadline': fields.datetime('Deadline'),
         'date_close': fields.datetime('Date Closed', readonly=True),
-        'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'),
+        'project_id': fields.many2one('project.project', 'Project', ondelete='cascade',
+            help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
         'parent_id': fields.many2one('project.task', 'Parent Task'),
         'child_ids': fields.one2many('project.task', 'parent_id', 'Delegated Tasks'),
         'history': fields.function(_history_get, method=True, string="Task Details", type="text"),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 4497501df35..c2699adb1c3 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -991,6 +991,7 @@
                         <field name="invoice_state" select="2" string="Invoice Control"/>
                         <field name="name" readonly="1" select="1"/>
                         <field name="min_date" select="2" readonly="1"/>
+                        <field name="backorder_id" select="2" readonly="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">