diff --git a/i18n/es_AR.po b/i18n/es_AR.po
index 8362cccd14e6145b0236fcd4e0794786e0ba7d26..dba85590c104657d200d533c957f5e1a4640e191 100644
--- a/i18n/es_AR.po
+++ b/i18n/es_AR.po
@@ -1462,8 +1462,8 @@ msgstr "Si la UdM del producto es 'Kg': Cantidad de cajas = Cantidad pedida / Pe
 #. module: customer_purchase_order
 #: code:addons/customer_purchase_order/models/customer_purchase_order_config.py:86
 #, python-format
-msgid "If product UoM is 'Kg': Box Quantity = Units per Box."
-msgstr "Si la UdM del producto es 'Kg': Cantidad de cajas = Unidades por caja."
+msgid "If product UoM is 'Kg': Box Quantity = Ordered quantity / Box kilograms."
+msgstr "Si la UdM del producto es 'Kg': Cantidad de cajas = Cantidad solicitada / Peso de la caja."
 
 #. module: customer_purchase_order
 #: code:addons/customer_purchase_order/models/customer_purchase_order_config.py:80
diff --git a/models/customer_purchase_order_config.py b/models/customer_purchase_order_config.py
index 1a355604d3fd1afb251d2842fd1f64389b7b0dfa..106290b4fde6eb3d6f699333bf99041bcad859d6 100644
--- a/models/customer_purchase_order_config.py
+++ b/models/customer_purchase_order_config.py
@@ -83,7 +83,7 @@ class CustomerPurchaseOrderConfig(models.Model):
                 'Ordered Quantity / Box Kilograms.'
             )
         elif self.config_type == 'units_as_boxes':
-            msg = _("If product UoM is 'Kg': Box Quantity = Units per Box.")
+            msg = _("If product UoM is 'Kg': Box Quantity = Ordered quantity / Box kilograms.")
 
         self.config_type_description = msg
 
diff --git a/models/customer_purchase_order_importer.py b/models/customer_purchase_order_importer.py
index b0db07a42bb37a45e4e6594bcb8d7f679f2e4f57..774d0faf2476d5191d33a19a2a805251f4ba9e06 100644
--- a/models/customer_purchase_order_importer.py
+++ b/models/customer_purchase_order_importer.py
@@ -281,8 +281,14 @@ class CustomerPurchaseOrderImporter(models.Model):
         for line in vals['pre_order_line_ids']:
             units_per_box = line[2]['units_per_box']['original']
             content = line[2]['content']
+            product_uom = line[2]['product_uom']
 
-            if units_per_box and content and content > 0:
+            if (
+                units_per_box
+                and content
+                and content > 0
+                and product_uom == self.env.ref('uom.product_uom_unit').id
+            ):
                 line[2]['gross_price_unit']['modified'] /= content
 
         return vals