[MERGE] Merged main branch

bzr revid: dhs@tinyerp.com-20101026071633-v9t8xjhwx71i4zwo

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index cee60e6..ac75c81 100644 (file)
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -26,6 +26,7 @@ from osv import osv, fields
 from tools.translate import _
 import netsvc
 import time
+import tools
 
 
 #----------------------------------------------------------
@@ -311,7 +312,7 @@ class mrp_bom(osv.osv):
                     mult = (d + (m and 1.0 or 0.0))
                     cycle = mult * wc_use.cycle_nbr
                     result2.append({
-                        'name': bom.routing_id.name,
+                        'name': tools.ustr(wc_use.name) + ' - '  + tools.ustr(bom.product_id.name),
                         'workcenter_id': wc.id,
                         'sequence': level+(wc_use.sequence or 0),
                         'cycle': cycle,

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8cf2622..29b7e24 100644 (file)
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -85,7 +85,7 @@
                                 <label string="ID: %%(task_id)s"/>
                                 <label string="Status: %%(state)s"/>
                                 <label string="Date Start: %%(date_start)s"/>
-                                <label string="Date Stop: %%(date_stop)s"/>
+                                <label string="Date Stop: %%(date_end)s"/>
                             </group>
                         </page>
                         <page string="Tasks Stages" groups="base.group_extended">