Unifield Server

Merge lp:~unifield-team/unifield-server/us-1946 into lp:unifield-server

  1. us-1946
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4116
Proposed branch: lp:~unifield-team/unifield-server/us-1946
Merge into: lp:unifield-server
Diff against target: 25 lines (+2/-2)
2 files modified
bin/addons/purchase_override/report/merged_order.rml (+1/-1)
bin/addons/purchase_override/report/purchase_order.rml (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1946
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+313317@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/purchase_override/report/merged_order.rml'
2--- bin/addons/purchase_override/report/merged_order.rml 2016-11-24 10:31:53 +0000
3+++ bin/addons/purchase_override/report/merged_order.rml 2016-12-15 08:32:36 +0000
4@@ -341,7 +341,7 @@
5 </tr>
6 <tr>
7 <td>
8- <para style="TextInformation">Goods value : [[ objects[0].amount_total or '0.00' ]]</para>
9+ <para style="TextInformation">Goods value : [[ objects[0].amount_untaxed or '0.00' ]]</para>
10 </td>
11 <td>
12 <para style="TextInformation"> </para>
13
14=== modified file 'bin/addons/purchase_override/report/purchase_order.rml'
15--- bin/addons/purchase_override/report/purchase_order.rml 2016-11-09 08:10:08 +0000
16+++ bin/addons/purchase_override/report/purchase_order.rml 2016-12-15 08:32:36 +0000
17@@ -343,7 +343,7 @@
18 </tr>
19 <tr>
20 <td>
21- <para style="TextInformation">Goods value : [[ objects[0].amount_total or '0.00' ]]</para>
22+ <para style="TextInformation">Goods value : [[ objects[0].amount_untaxed or '0.00' ]]</para>
23 </td>
24 <td>
25 <para style="TextInformation"> </para>

Subscribers

People subscribed via source and target branches

to all changes: