diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 922256dece6..901fe2bc11d 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -198,7 +198,7 @@ - + diff --git a/addons/account/wizard/account_tax_chart.py b/addons/account/wizard/account_tax_chart.py index 1595a603dd0..82925d1a53d 100644 --- a/addons/account/wizard/account_tax_chart.py +++ b/addons/account/wizard/account_tax_chart.py @@ -66,7 +66,8 @@ class account_tax_chart(osv.osv_memory): result['context'] = str({'state': data['target_move']}) if data['period_id']: - result['name'] += ':' + self.pool.get('account.period').read(cr, uid, [data['period_id']], context=context)[0]['code'] + period_code = period_obj.read(cr, uid, [data['period_id']], context=context)[0]['code'] + result['name'] += period_code and (':' + period_code) or '' return result _defaults = { 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, diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 8cf262237da..01b5999cdcd 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -85,7 +85,7 @@