diff options
| author | uco <uco@tinyerp.com> | 2010-07-09 14:50:34 +0530 |
|---|---|---|
| committer | uco <uco@tinyerp.com> | 2010-07-09 14:50:34 +0530 |
| commit | d767e71aebddc7745fecde50d4c1e8fd9d9e4e07 (patch) | |
| tree | 83b8eb40c4aff95e1f75a1266b8c226fad2b961c | |
| parent | 8427bd9883d62f6cc4fdefeca69cf12741ba2b58 (diff) | |
[FIX] mrp, stock: Report errors.
bzr revid: uco@tinyerp.com-20100709092034-lc5tgqzr4ahlgu98
| -rw-r--r-- | addons/mrp/report/order.rml | 4 | ||||
| -rw-r--r-- | addons/stock/report/packing.rml | 6 | ||||
| -rw-r--r-- | addons/stock/report/picking.rml | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml index 200ca5bb76e..3db5396d444 100644 --- a/addons/mrp/report/order.rml +++ b/addons/mrp/report/order.rml @@ -265,10 +265,10 @@ <para style="terp_default_Centre_8">[[ formatLang(o.date_planned, date_time = True) ]]</para> </td> <td> - <para style="terp_default_Centre_8">[[ o.sale_ref or removeParentNode('para')]]</para> + <para style="terp_default_Centre_8">[[ 'sale_ref' in o._columns.keys() and o.sale_ref or removeParentNode('para') ]]</para> </td> <td> - <para style="terp_default_Centre_8">[[ o.sale_name or removeParentNode('para') ]]</para> + <para style="terp_default_Centre_8">[[ 'sale_name' in o._columns.keys() and o.sale_name or removeParentNode('para') ]]</para> </td> </tr> </blockTable> diff --git a/addons/stock/report/packing.rml b/addons/stock/report/packing.rml index 3edb83921a0..07c8758b8c0 100644 --- a/addons/stock/report/packing.rml +++ b/addons/stock/report/packing.rml @@ -276,9 +276,9 @@ <font color="white"> </font> </para> </section> - <para style="terp_default_5cm_Above_Space">[[ (line.state == 'done' or line.state == 'confirmed') and removeParentNode('para') ]]</para> - <para style="terp_default_Bold_9">Non Assigned Products: [[ ( line.state == 'assigned' or line.state == 'done' or line.state == 'confirmed' ) and removeParentNode('para') ]]</para> - <para style="terp_default_1cm_above_space">[[ (line.state == 'done' or line.state == 'confirmed') and removeParentNode('para') ]]</para> + <para style="terp_default_5cm_Above_Space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]</para> + <para style="terp_default_Bold_9">Non Assigned Products: [[ ( move_lines.state == 'assigned' or move_lines.state == 'done' or move_lines.state == 'confirmed' ) and removeParentNode('para') ]]</para> + <para style="terp_default_1cm_above_space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]</para> <section> <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]</para> <blockTable colWidths="197.0,68.0,61.0,57,46.0,26.0,74.0" style="Move_Line_Content_Other_State"> diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 68bae72ba84..677cdfbcfc0 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -268,9 +268,9 @@ <font color="white"> </font> </para> </section> - <para style="terp_default_5cm_Above_Space">[[ (line.state == 'done' or line.state == 'confirmed') and removeParentNode('para') ]]</para> - <para style="terp_default_Bold_9">Non Assigned Products: [[ ( line.state == 'assigned' or line.state == 'done' or line.state == 'confirmed' ) and removeParentNode('para') ]]</para> - <para style="terp_default_1cm_above_space">[[ (line.state == 'done' or line.state == 'confirmed') and removeParentNode('para') ]]</para> + <para style="terp_default_5cm_Above_Space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]</para> + <para style="terp_default_Bold_9">Non Assigned Products: [[ ( move_lines.state == 'assigned' or move_lines.state == 'done' or move_lines.state == 'confirmed' ) and removeParentNode('para') ]]</para> + <para style="terp_default_1cm_above_space">[[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]</para> <section> <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]</para> <blockTable colWidths="257.0,57.0,62.0,46.0,26.0,74.0" style="Move_Line_Content_Other_State"> |