diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index f6fe33aa932..d180c00426f 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -929,6 +929,7 @@ class BOM extends CommonObject
 		global $conf, $langs;
 
 		$langs->load("mrp");
+		$outputlangs->load("products");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'standard';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index ccaabcbe765..c6d2ab46ff6 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3664,6 +3664,7 @@ class Propal extends CommonObject
 		global $conf, $langs;
 
 		$langs->load("propale");
+		$outputlangs->load("products");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'azur';
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 28d2170e49a..a30d04fd761 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3859,6 +3859,7 @@ class Commande extends CommonOrder
 		global $conf, $langs;
 
 		$langs->load("orders");
+		$outputlangs->load("products");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'einstein';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index ce6f948aa0a..50b84840901 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4296,6 +4296,7 @@ class Facture extends CommonInvoice
 		global $conf, $langs;
 
 		$langs->load("bills");
+		$outputlangs->load("products");
 
 		if (!dol_strlen($modele))
 		{
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 12ad603ea14..ab94e73b58c 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2393,6 +2393,7 @@ class Contrat extends CommonObject
 		global $conf, $langs;
 
 		$langs->load("contracts");
+		$outputlangs->load("products");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'strato';
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index f92004120ff..59b0acee232 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -74,12 +74,12 @@ abstract class CommonObjectLine extends CommonObject
 			$label_type = 'short_label';
 		}
 
-		$sql = 'select '.$label_type.' from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
+		$sql = 'select '.$label_type.',code from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
 		$resql = $this->db->query($sql);
 		if ($resql && $this->db->num_rows($resql) > 0)
 		{
 			$res = $this->db->fetch_array($resql);
-			$label = $res[$label_type];
+			$label = ($label_type == 'short' ? $res[$label_type] : 'unit'.$res['code']);
 			$this->db->free($resql);
 			return $label;
 		} else {
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 4bc56c4cd71..e6dbf827fce 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2463,6 +2463,7 @@ class Expedition extends CommonObject
 		global $conf, $langs;
 
 		$langs->load("sendings");
+		$outputlangs->load("products");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'rouget';
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index c483206fd1f..f6d506a28be 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2966,6 +2966,7 @@ class CommandeFournisseur extends CommonOrder
 		global $conf, $langs;
 
 		$langs->load("suppliers");
+		$outputlangs->load("products");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'muscadet';
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index aa724e528f1..95f2f97a7fd 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2641,6 +2641,7 @@ class FactureFournisseur extends CommonInvoice
 		global $conf, $user, $langs;
 
 		$langs->load("suppliers");
+		$outputlangs->load("products");
 
 		// Set the model on the model name to use
 		if (empty($modele))
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 6199bc4ec88..1429e39be8e 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -1035,6 +1035,7 @@ class Livraison extends CommonObject
 		global $conf, $user, $langs;
 
 		$langs->load("deliveries");
+		$outputlangs->load("products");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'typhon';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 055a0702cab..d5dbc0204c0 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4428,6 +4428,7 @@ class Product extends CommonObject
         global $conf, $user, $langs;
 
         $langs->load("products");
+		$outputlangs->load("products");
 
         // Positionne le modele sur le nom du modele a utiliser
         if (!dol_strlen($modele)) {
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 0239aa627f5..5904df5e7e7 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -859,6 +859,7 @@ class Entrepot extends CommonObject
 		global $conf, $user, $langs;
 
 		$langs->load("stocks");
+		$outputlangs->load("products");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'standard';
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 509379860c3..d1c703924d4 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -1167,6 +1167,7 @@ class MouvementStock extends CommonObject
 		global $conf, $user, $langs;
 
 		$langs->load("stocks");
+		$outputlangs->load("products");
 
 		if (!dol_strlen($modele)) {
 			$modele = 'stdmovement';
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 9d6ce02c8ee..44d5e3bbd1a 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2630,6 +2630,7 @@ class SupplierProposal extends CommonObject
         global $conf, $langs;
 
         $langs->load("supplier_proposal");
+		$outputlangs->load("products");
 
         if (!dol_strlen($modele)) {
             $modele = 'aurore';