diff --git a/modules/purchase_trade/stock.py b/modules/purchase_trade/stock.py
index 64d9ec1..15944c5 100755
--- a/modules/purchase_trade/stock.py
+++ b/modules/purchase_trade/stock.py
@@ -865,6 +865,20 @@ class ShipmentIn(metaclass=PoolMeta):
     def report_coo_gross_weight(self):
         return self.report_packing_gross_weight
 
+    @property
+    def report_coo_weight_unit(self):
+        return self.report_packing_weight_unit or ''
+
+    @property
+    def report_coo_net_weight_display(self):
+        parts = [self.report_coo_net_weight, self.report_coo_weight_unit]
+        return ' '.join(part for part in parts if part)
+
+    @property
+    def report_coo_gross_weight_display(self):
+        parts = [self.report_coo_gross_weight, self.report_coo_weight_unit]
+        return ' '.join(part for part in parts if part)
+
     @property
     def report_coo_issue_date(self):
         Date = Pool().get('ir.date')
diff --git a/modules/stock/coo.fodt b/modules/stock/coo.fodt
index 7063291..06dff29 100644
--- a/modules/stock/coo.fodt
+++ b/modules/stock/coo.fodt
@@ -253,8 +253,8 @@
       <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text">&lt;records[0].report_coo_goods_description or &apos;&apos;&gt;</text:placeholder></text:p>
     </table:table-cell>
     <table:table-cell table:style-name="CellTall" office:value-type="string">
-      <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text">&lt;records[0].report_coo_net_weight or &apos;&apos;&gt;</text:placeholder></text:p>
-      <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text">&lt;records[0].report_coo_gross_weight or &apos;&apos;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text">&lt;records[0].report_coo_net_weight_display or &apos;&apos;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="Standard"> </text:p>
       <text:p text:style-name="Standard"> </text:p>
       <text:p text:style-name="Standard"> </text:p>
       <text:p text:style-name="Standard"> </text:p>
@@ -263,6 +263,7 @@
       <text:p text:style-name="CellSubLabel">Bruttogewicht</text:p>
       <text:p text:style-name="CellSubLabel">Peso lordo</text:p>
       <text:p text:style-name="CellSubLabel">Gross weight</text:p>
+      <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text">&lt;records[0].report_coo_gross_weight_display or &apos;&apos;&gt;</text:placeholder></text:p>
     </table:table-cell>
   </table:table-row>