Merge lp:~openerp-dev/openobject-addons/7.0-opw-587561-han into lp:openobject-addons/7.0

Proposed by Hardik Ansodariya (OpenERP) on 2013-04-11
Status: Merged
Merged at revision: 9210
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-587561-han
Merge into: lp:openobject-addons/7.0
Diff against target: 14 lines (+3/-1)
1 file modified
stock/report/picking.rml (+3/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-587561-han
Reviewer Review Type Date Requested Status
Naresh(OpenERP) 2013-04-11 Pending
Review via email: mp+158300@code.launchpad.net

Description of the change

Hello,

Fixed the issue of translation:

The value of state field were not translated in Delivery Slip report.

Thanks

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stock/report/picking.rml'
2--- stock/report/picking.rml 2013-03-06 15:36:19 +0000
3+++ stock/report/picking.rml 2013-04-11 10:53:39 +0000
4@@ -258,7 +258,9 @@
5 <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
6 </td>
7 <td>
8- <para style="terp_default_9">[[ move_lines.state ]]</para>
9+ <para style="terp_default_9">Waiting Availability[[ move_lines.state == 'confirmed' and ' ' or removeParentNode('para') ]]</para>
10+ <para style="terp_default_9">Done[[ move_lines.state == 'done' and ' ' or removeParentNode('para') ]]</para>
11+ <para style="terp_default_9">Available[[ move_lines.state == 'assigned' and ' ' or removeParentNode('para') ]]</para>
12 </td>
13 <td>
14 <para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para>