Merge lp:~openerp-dev/openobject-addons/6.1-opw-577012-msh into lp:openobject-addons/6.1

[Mohammed Shekha(Open ERP)]

Hello,

Sale Layout report (Order with layout) is not showing Notes in the report when layout_type is text, actually when type is text at that time both name as well as notes should be shown in the report.

Thanks.

[Vinay Rana (OpenERP) (vra-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Not Relevant on Trunk as the module has been dropped from official addons on trunk and so this bug has no meaning anymore. If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6895. By Mohammed Shekha(Open ERP) on 2012-07-18

[FIX]Fixed the issue of notes not shown in the report when layout_type = text

=== modified file 'sale_layout/report/report_sale_layout.rml'
--- sale_layout/report/report_sale_layout.rml	2012-03-15 18:11:12 +0000
+++ sale_layout/report/report_sale_layout.rml	2012-07-18 09:26:30 +0000
@@ -277,6 +277,11 @@
             <para style="terp_default_9">[[ a['layout_type']=='text' and a['name'] or removeParentNode('blockTable') ]]</para>
           </td>
         </tr>
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ a['layout_type']=='text' and a['note'] or removeParentNode('blockTable') ]]</para>
+          </td>
+        </tr>
       </blockTable>
       <pageBreak>[[ a['layout_type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
       <blockTable colWidths="198.0,85.0,71.0,57.0,57.0,71.0" style="Table13">