diff --git a/modules/account_invoice/payment_order.fodt b/modules/account_invoice/payment_order_melya.fodt
similarity index 100%
rename from modules/account_invoice/payment_order.fodt
rename to modules/account_invoice/payment_order_melya.fodt
diff --git a/modules/carrier_carriage/view/shipment_form.xml b/modules/carrier_carriage/view/shipment_form.xml
index fffad0c..3f590d0 100755
--- a/modules/carrier_carriage/view/shipment_form.xml
+++ b/modules/carrier_carriage/view/shipment_form.xml
@@ -2,9 +2,4 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <data>
-    <xpath expr="//page[@id='costs']" position="inside">
-        <field name="before_carriages" colspan="4"/>
-
-        <field name="after_carriages" colspan="4"/>
-    </xpath>
 </data>
diff --git a/modules/purchase_shipment_cost/view/shipment_in_form.xml b/modules/purchase_shipment_cost/view/shipment_in_form.xml
index 52cbd26..3f590d0 100755
--- a/modules/purchase_shipment_cost/view/shipment_in_form.xml
+++ b/modules/purchase_shipment_cost/view/shipment_in_form.xml
@@ -2,14 +2,4 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <data>
-    <xpath expr="//page[@id='other']" position="before">
-        <page id="costs" string="Costs">
-            <label name="cost_used"/>
-            <group id="cost_used" col="-1" colspan="3">
-                <field name="cost_used" xexpand="0"/>
-                <field name="cost_currency_used"/>
-                <field name="cost_edit" xexpand="0" xalign="0"/>
-            </group>
-        </page>
-    </xpath>
 </data>
diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py
index 32734f8..06ef5e7 100755
--- a/modules/purchase_trade/sale.py
+++ b/modules/purchase_trade/sale.py
@@ -541,10 +541,11 @@ class Sale(metaclass=PoolMeta):
             return lines[0]
 
     @staticmethod
-    def _format_report_number(value, digits='0.0000', keep_trailing_decimal=False,
-            strip_trailing_zeros=True):
+    def _format_report_number(value, digits='0.0000',
+            keep_trailing_decimal=False, strip_trailing_zeros=True,
+            use_grouping=False):
         value = Decimal(str(value or 0)).quantize(Decimal(digits))
-        text = format(value, 'f')
+        text = format(value, ',f' if use_grouping else 'f')
         if strip_trailing_zeros:
             text = text.rstrip('0').rstrip('.')
         if keep_trailing_decimal and '.' not in text:
@@ -1268,7 +1269,8 @@ class Sale(metaclass=PoolMeta):
                         'amount': amount,
                         'amount_text': self._format_report_number(
                             amount, digits='0.01',
-                            strip_trailing_zeros=False),
+                            strip_trailing_zeros=False,
+                            use_grouping=True),
                     })
         return lines
 
diff --git a/modules/purchase_trade/tests/test_module.py b/modules/purchase_trade/tests/test_module.py
index b1d8610..c2f8379 100644
--- a/modules/purchase_trade/tests/test_module.py
+++ b/modules/purchase_trade/tests/test_module.py
@@ -5072,12 +5072,12 @@ class PurchaseTradeTestCase(ModuleTestCase):
                 {
                     'label': 'FOB value in EUR',
                     'amount': Decimal('2500'),
-                    'amount_text': '2500.00',
+                    'amount_text': '2,500.00',
                 },
                 {
                     'label': 'FREIGHT value in EUR',
                     'amount': Decimal('59993.75'),
-                    'amount_text': '59993.75',
+                    'amount_text': '59,993.75',
                 },
             ])
 
diff --git a/modules/sale_shipment_cost/view/shipment_out_form.xml b/modules/sale_shipment_cost/view/shipment_out_form.xml
index ff721eb..3f590d0 100755
--- a/modules/sale_shipment_cost/view/shipment_out_form.xml
+++ b/modules/sale_shipment_cost/view/shipment_out_form.xml
@@ -2,11 +2,4 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <data>
-    <xpath expr="//group[@id='cost_used']" position="after">
-        <label name="cost_sale_used"/>
-        <group id="cost_sale_used" col="-1" colspan="3">
-            <field name="cost_sale_used" xexpand="0"/>
-            <field name="cost_sale_currency_used"/>
-        </group>
-    </xpath>
 </data>
diff --git a/modules/stock_shipment_cost/view/shipment_out_form.xml b/modules/stock_shipment_cost/view/shipment_out_form.xml
index f5f5a5a..50b9537 100755
--- a/modules/stock_shipment_cost/view/shipment_out_form.xml
+++ b/modules/stock_shipment_cost/view/shipment_out_form.xml
@@ -6,14 +6,4 @@ this repository contains the full copyright notices and license terms. -->
         <label name="carrier"/>
         <field name="carrier"/>
     </xpath>
-    <xpath expr="//page[@id='other']" position="before">
-        <page id="costs" string="Costs">
-            <label name="cost_used"/>
-            <group id="cost_used" col="-1" colspan="3">
-                <field name="cost_used" xexpand="0"/>
-                <field name="cost_currency_used"/>
-                <field name="cost_edit" xexpand="0" xalign="0"/>
-            </group>
-        </page>
-    </xpath>
 </data>