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

Proposed by Mohammed Shekha(Open ERP)
Status: Approved
Approved by: Vinay Rana (OpenERP)
Approved revision: 6895
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-577012-msh
Merge into: lp:openobject-addons/6.1
Diff against target: 15 lines (+5/-0)
1 file modified
sale_layout/report/report_sale_layout.rml (+5/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-577012-msh
Reviewer Review Type Date Requested Status
Vinay Rana (OpenERP) (community) Approve
Review via email:

Description of the change


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.


To post a comment you must log in.
Revision history for this message
Vinay Rana (OpenERP) (vra-openerp) :
review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :


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.

Naresh Soni

Unmerged revisions

6895. By Mohammed Shekha(Open ERP)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sale_layout/report/report_sale_layout.rml'
2--- sale_layout/report/report_sale_layout.rml 2012-03-15 18:11:12 +0000
3+++ sale_layout/report/report_sale_layout.rml 2012-07-18 09:26:30 +0000
4@@ -277,6 +277,11 @@
5 <para style="terp_default_9">[[ a['layout_type']=='text' and a['name'] or removeParentNode('blockTable') ]]</para>
6 </td>
7 </tr>
8+ <tr>
9+ <td>
10+ <para style="terp_default_9">[[ a['layout_type']=='text' and a['note'] or removeParentNode('blockTable') ]]</para>
11+ </td>
12+ </tr>
13 </blockTable>
14 <pageBreak>[[ a['layout_type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
15 <blockTable colWidths="198.0,85.0,71.0,57.0,57.0,71.0" style="Table13">