Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-opw-606559-dhs into lp:openobject-addons/7.0

  1. 7.0-opw-606559-dhs
  2. Merge into 7.0
Proposed by Dhruti Shastri(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-606559-dhs
Merge into: lp:openobject-addons/7.0
Diff against target: 34 lines (+7/-0)
2 files modified
purchase/report/order.rml (+6/-0)
purchase/report/request_quotation.rml (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-606559-dhs
Reviewer Review Type Date Requested Status
Vinay Rana (OpenERP) Pending
Naresh(OpenERP) Pending
Review via email: mp+216816@code.launchpad.net

Description of the change

Reports, 'Request for Quotation' and 'Purchase Order' doesn't print Payment Terms

To post a comment you must log in.

Unmerged revisions

10006. By Dhruti Shastri(OpenERP)

[purchase]: Report doesn't print with Payment Term (Case:606559)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'purchase/report/order.rml'
2--- purchase/report/order.rml 2013-05-28 08:19:55 +0000
3+++ purchase/report/order.rml 2014-04-23 05:32:42 +0000
4@@ -310,7 +310,13 @@
5 <para style="terp_default_9">[[ format(o.notes or '') ]]</para>
6 </td>
7 </tr>
8+ <tr>
9+ <td>
10+ <para style="terp_default_9">[[ format(o.payment_term_id and o.payment_term_id.note or (o.partner_id.property_payment_term and o.partner_id.property_payment_term.note or '')) ]]</para>
11+ </td>
12+ </tr>
13 </blockTable>
14+
15 <para style="terp_default_9">
16 <font color="white"> </font>
17 </para>
18
19=== modified file 'purchase/report/order.sxw'
20Binary files purchase/report/order.sxw 2013-09-03 09:41:43 +0000 and purchase/report/order.sxw 2014-04-23 05:32:42 +0000 differ
21=== modified file 'purchase/report/request_quotation.rml'
22--- purchase/report/request_quotation.rml 2013-05-28 08:19:55 +0000
23+++ purchase/report/request_quotation.rml 2014-04-23 05:32:42 +0000
24@@ -131,6 +131,7 @@
25 <font color="white"> </font>
26 </para>
27 <para style="terp_default_9">[[ format(order.notes or '') ]]</para>
28+ <para style="terp_default_9">[[ format(order.payment_term_id and order.payment_term_id.note or (order.partner_id.property_payment_term and order.partner_id.property_payment_term.note or '')) ]]</para>
29 <para style="terp_default_9">
30 <font color="white"> </font>
31 </para>
32
33=== modified file 'purchase/report/request_quotation.sxw'
34Binary files purchase/report/request_quotation.sxw 2012-12-08 10:33:38 +0000 and purchase/report/request_quotation.sxw 2014-04-23 05:32:42 +0000 differ