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

[jftempo]

=== modified file 'bin/addons/purchase_override/report/merged_order.rml'
--- bin/addons/purchase_override/report/merged_order.rml	2016-11-24 10:31:53 +0000
+++ bin/addons/purchase_override/report/merged_order.rml	2016-12-15 08:32:36 +0000
@@ -341,7 +341,7 @@
             </tr>
             <tr>
                 <td>
-                    <para style="TextInformation">Goods value : [[ objects[0].amount_total or '0.00' ]]</para>
+                    <para style="TextInformation">Goods value : [[ objects[0].amount_untaxed or '0.00' ]]</para>
                 </td>
                 <td>
                     <para style="TextInformation"> </para>
 
=== modified file 'bin/addons/purchase_override/report/purchase_order.rml'
--- bin/addons/purchase_override/report/purchase_order.rml	2016-11-09 08:10:08 +0000
+++ bin/addons/purchase_override/report/purchase_order.rml	2016-12-15 08:32:36 +0000
@@ -343,7 +343,7 @@
             </tr>
             <tr>
                 <td>
-                    <para style="TextInformation">Goods value : [[ objects[0].amount_total or '0.00' ]]</para>
+                    <para style="TextInformation">Goods value : [[ objects[0].amount_untaxed or '0.00' ]]</para>
                 </td>
                 <td>
                     <para style="TextInformation"> </para>