From 36dd47081b0e526172d13ebc62e3b06af0546302 Mon Sep 17 00:00:00 2001 From: "JMA (OpenERP)" Date: Thu, 21 Oct 2010 18:16:32 +0530 Subject: [PATCH 1/4] [FIX] mrp : Corrections for Work Order names bzr revid: jma@tinyerp.com-20101021124632-vfv5jesa55mzkxz7 --- addons/mrp/mrp.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index cee60e63023..ac75c81426a 100644 --- 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, From 015e3d3a34f0f56410294a47f1c81ecce4afce9d Mon Sep 17 00:00:00 2001 From: "JMA (OpenERP)" Date: Mon, 25 Oct 2010 12:28:54 +0530 Subject: [PATCH 2/4] [FIX] project : Corrected field name bzr revid: jma@tinyerp.com-20101025065854-og24p6yxmapnrhxk --- addons/project/project_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 8cf262237da..29b7e244ee6 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -85,7 +85,7 @@