Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-1195703-atp into lp:openobject-addons

  1. trunk-bug-1195703-atp
  2. Merge into trunk
Proposed by Atul Patel(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1195703-atp
Merge into: lp:openobject-addons
Diff against target: 12 lines (+1/-1)
1 file modified
sale/report/sale_order.rml (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1195703-atp
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+172278@code.launchpad.net

Description of the change

Hello,

when we have muliple order lines and without group "Allow setting a discount on the sales order lines". Discount column isn't coming on page number 1 of sales order report but 'Disc%' heading is still visible on second pages and on onward pages.

group is missing in first dis(%) columns..
sxw is correct. need to change only rml file..

Thanks

To post a comment you must log in.

Unmerged revisions

8800. By Atul Patel(OpenERP)

[FIX]: Change rml. make condition in disc(%) columns

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sale/report/sale_order.rml'
2--- sale/report/sale_order.rml 2013-05-27 16:51:33 +0000
3+++ sale/report/sale_order.rml 2013-07-01 07:05:34 +0000
4@@ -124,7 +124,7 @@
5 <para style="terp_tblheader_Details_Right"><b>Unit Price</b></para>
6 </td>
7 <td>
8- <para style="terp_tblheader_Details_Centre"><b>Disc.(%)</b></para>
9+ <para style="terp_tblheader_Details_Centre"><b>[[not show_discount(user.id) and removeParentNode('para') ]]Disc.(%)</b></para>
10 </td>
11 <td>
12 <para style="terp_tblheader_Details_Right"><b>Price</b></para>

Subscribers

People subscribed via source and target branches

to all changes: