OpenERP Community Backports (Addons)

Merge lp:~camptocamp/ocb-addons/7.0-fix-lp-1192195-RDE into lp:ocb-addons

  1. 7.0-fix-lp-1192195-RDE
  2. Merge into 7.0
Proposed by Romain Deheele - Camptocamp
Status: Merged
Merged at revision: 9312
Proposed branch: lp:~camptocamp/ocb-addons/7.0-fix-lp-1192195-RDE
Merge into: lp:ocb-addons
Diff against target: 16 lines (+3/-3)
1 file modified
stock/report/picking.rml (+3/-3)
To merge this branch: bzr merge lp:~camptocamp/ocb-addons/7.0-fix-lp-1192195-RDE
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) Approve
Stefan Rijnhart (Opener) Approve
Alexandre Fayolle - camptocamp Pending
Review via email: mp+170292@code.launchpad.net

Description of the change

Hello,
On picking list report (at level of move lines),a not relevant boolean value was displayed on column state.
This boolean value is simply a test to recognize stock.picking's type (in, out or internal), therefore it's not necessary to display it.
This revision allows to display empty chain '' instead of displaying this not relevant boolean value.

Backport of https://code.launchpad.net/~camptocamp/openobject-addons/7.0-fix-lp-1192195-RDE/+merge/170280

Romain

To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Thanks, LGTM!

review: Approve
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve

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-25 08:49:55 +0000
3+++ stock/report/picking.rml 2013-06-19 10:27:33 +0000
4@@ -285,9 +285,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">[[ (picking.type == 'in' or removeParentNode('para')) ]][[ move_lines.state == 'done' and 'Received' or move_lines.state]]</para>
9- <para style="terp_default_9">[[ (picking.type == 'out' or removeParentNode('para')) ]][[ move_lines.state == 'done' and 'Delivered' or move_lines.state]]</para>
10- <para style="terp_default_9">[[ (picking.type == 'internal' or removeParentNode('para')) ]][[ move_lines.state == 'done' and 'Transferred' or move_lines.state]]</para>
11+ <para style="terp_default_9">[[ (picking.type == 'in' or removeParentNode('para')) and '' ]][[ move_lines.state == 'done' and 'Received' or move_lines.state]]</para>
12+ <para style="terp_default_9">[[ (picking.type == 'out' or removeParentNode('para')) and '']][[ move_lines.state == 'done' and 'Delivered' or move_lines.state]]</para>
13+ <para style="terp_default_9">[[ (picking.type == 'internal' or removeParentNode('para')) and '' ]][[ move_lines.state == 'done' and 'Transferred' or move_lines.state]]</para>
14 </td>
15 <td>
16 <para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para>