diff --git a/customer_return_restocking_list.fodt b/customer_return_restocking_list.fodt
index 7e69d840fb..5f66e560bb 100644
--- a/customer_return_restocking_list.fodt
+++ b/customer_return_restocking_list.fodt
@@ -469,7 +469,7 @@
       <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text">&lt;move.product.rec_name&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Table1.D4" office:value-type="string">
-      <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text">&lt;format_number(move.quantity, user.language, digits=move.unit_digits)&gt;</text:placeholder> <text:placeholder text:placeholder-type="text">&lt;move.uom.symbol&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(move.quantity, user.language, move.uom, digits=move.uom.digits)&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
diff --git a/delivery_note.fodt b/delivery_note.fodt
index 83ea9fd088..518a683a7b 100644
--- a/delivery_note.fodt
+++ b/delivery_note.fodt
@@ -475,7 +475,7 @@
       <text:p text:style-name="P13"><text:placeholder text:placeholder-type="text">&lt;move.product.rec_name&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Table1.B3" office:value-type="string">
-      <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text">&lt;format_number(move.quantity, shipment.delivery_address.party.lang, digits=move.uom.digits)&gt;</text:placeholder><text:s/><text:placeholder text:placeholder-type="text">&lt;move.uom.symbol&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(move.quantity, shipment.delivery_address.party.lang, move.uom, digits=move.uom.digits)&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
diff --git a/internal_shipment.fodt b/internal_shipment.fodt
index 77b4024934..e69bf8dfa7 100644
--- a/internal_shipment.fodt
+++ b/internal_shipment.fodt
@@ -506,7 +506,7 @@
       <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text">&lt;move.product.rec_name&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Table1.D4" office:value-type="string">
-      <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text">&lt;format_number(move.quantity, user.language, digits=move.uom.digits)&gt;</text:placeholder><text:s/><text:placeholder text:placeholder-type="text">&lt;move.uom.symbol&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(move.quantity, user.language, move.uom, digits=move.uom.digits)&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
diff --git a/move.py b/move.py
index f3f3b3310f..6cce65f9cc 100644
--- a/move.py
+++ b/move.py
@@ -551,9 +551,9 @@ class Move(Workflow, ModelSQL, ModelView):
         pool = Pool()
         Lang = pool.get('ir.lang')
         lang = Lang.get()
-        return (lang.format(
-                '%.*f', (self.uom.digits, self.quantity))
-            + '%s %s' % (self.uom.symbol, self.product.rec_name))
+        return (lang.format_number_symbol(
+                self.quantity, self.uom, digits=self.uom.digits)
+            + ' %s' % self.product.rec_name)
 
     @classmethod
     def search_rec_name(cls, name, clause):
diff --git a/picking_list.fodt b/picking_list.fodt
index d69d20a249..95126355d1 100644
--- a/picking_list.fodt
+++ b/picking_list.fodt
@@ -468,7 +468,7 @@
       <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text">&lt;move.product.rec_name&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Table1.D4" office:value-type="string">
-      <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text">&lt;format_number(move.quantity, user.language, digits=move.uom.digits)&gt;</text:placeholder> <text:placeholder text:placeholder-type="text">&lt;move.uom.symbol&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(move.quantity, user.language, move.uom, digits=move.uom.digits)&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>
diff --git a/supplier_restocking_list.fodt b/supplier_restocking_list.fodt
index 2713221751..ccc30389d7 100644
--- a/supplier_restocking_list.fodt
+++ b/supplier_restocking_list.fodt
@@ -460,7 +460,7 @@
       <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text">&lt;move.product.rec_name&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Table1.D4" office:value-type="string">
-      <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text">&lt;format_number(move.quantity, user.language, digits=move.uom.digits)&gt;</text:placeholder> <text:placeholder text:placeholder-type="text">&lt;move.uom.symbol&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text">&lt;format_number_symbol(move.quantity, user.language, move.uom, digits=move.uom.digits)&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>