diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index fed51ea23dd16f0c602f7fbb84e82002b4b89fc4..fb39bd564e2faba047489d96a46b20d0657a8be4 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1820,7 +1820,7 @@ if ($_GET['action'] == 'create')
 		$title=$langs->trans('ProductsAndServices');
 
 		$sql = 'SELECT pt.rowid, pt.description, pt.price, pt.fk_product, pt.fk_remise_except,';
-		$sql.= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
+		$sql.= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.product_type, pt.info_bits,';
 		$sql.= ' p.label as product, p.ref, p.fk_product_type, p.rowid as prodid,';
 		$sql.= ' p.description as product_desc';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt';
@@ -1832,7 +1832,8 @@ if ($_GET['action'] == 'create')
 	{
 		$title=$langs->trans('Products');
 
-		$sql = 'SELECT pt.rowid, pt.subprice, pt.tva_tx, pt.qty, pt.fk_remise_except, pt.remise_percent, pt.description, pt.info_bits, pt.date_start as date_debut_prevue, pt.date_end as date_fin_prevue,';
+		$sql = 'SELECT pt.rowid, pt.subprice, pt.tva_tx, pt.qty, pt.fk_remise_except, pt.remise_percent,';
+		$sql.= ' pt.description, pt.info_bits, pt.date_start as date_debut_prevue, pt.date_end as date_fin_prevue,';
 		$sql.= ' p.label as product, p.ref, p.rowid as prodid';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as pt';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product = p.rowid';
@@ -1892,7 +1893,9 @@ if ($_GET['action'] == 'create')
 				}
 				else if ($objp->prodid)
 				{
-					print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->prodid.'">'.img_object($langs->trans(''),'service').' '.$objp->ref.'</a>';
+					print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->prodid.'">';
+					print ($objp->fk_product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product'));
+					print ' '.$objp->ref.'</a>';
 					print $objp->product?' - '.$objp->product:'';
 					// Dates
 					if ($date_start || $date_end)
@@ -1902,6 +1905,7 @@ if ($_GET['action'] == 'create')
 				}
 				else
 				{
+					print ($objp->product_type == -1 ? '&nbsp;' : ($objp->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));
 					// Dates
 					if ($date_start || $date_end)
 					{
@@ -1929,6 +1933,10 @@ if ($_GET['action'] == 'create')
 						print dol_trunc($objp->description,60);
 					}
 				}
+				else
+				{
+					print '&nbsp;';
+				}
 				print '</td>';
 				print '<td align="right">'.vatrate($objp->tva_tx).'%</td>';
 				print '<td align="right">'.price($objp->subprice).'</td>';
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index 5e40788c7230f3b33544c7c87cd279d0c1954cf1..f62b9c273794a6e3eed38843e2d614bbd9f74839 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -186,7 +186,7 @@ if ($id > 0 || ! empty($ref))
 	else print $langs->trans("CompanyHasNoRelativeDiscount");
 	$absolute_discount=$societe->getAvailableDiscounts();
 	print '. ';
-	if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie));
+	if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->monnaie));
 	else print $langs->trans("CompanyHasNoAbsoluteDiscount");
 	print '.';
 	print '</td></tr>';
@@ -319,6 +319,7 @@ if ($id > 0 || ! empty($ref))
 	$sql = 'SELECT pt.rowid, pt.description, pt.price, pt.fk_product, pt.fk_remise_except,';
 	$sql.= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
 	$sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc,';
+	$sql.= ' pt.product_type,';
 	$sql.= ' p.rowid as prodid, p.label as product_label, p.ref, p.fk_product_type, ';
 	$sql.= ' p.description as product_desc';
 	$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt';
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index f9719618fbb037d818b4b87d7feafa8875aa917e..b9a8690e6d50dcde0c0116c2e161f90f68cbaa03 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -863,6 +863,7 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='')
 	global $conf;
 
 	if ($size==0) return $string;
+	if (dol_textishtml($string)) $string = dol_string_nohtmltag($string,1);
 	if (! defined('USE_SHORT_TITLE') || (defined('USE_SHORT_TITLE') && USE_SHORT_TITLE))
 	{
 		// We go always here