MMICore : Option to prefer use of XML tags

htdocs/comm/propal/card.php

@@ -1135,7 +1135,7 @@ if (empty($reshook)) {
 				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
 					$desc = $product_desc;
 				} else {
-					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+					$desc = dol_concatdesc($desc, $product_desc, !empty($conf->global->MAIN_USE_XML_TAGS), !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 				}
 
 				// Add dimensions into product description
@@ -1147,7 +1147,7 @@ if (empty($reshook)) {
 					if ($prod->surface) $text.=($text?"\n":"").$outputlangs->trans("Surface").': '.$prod->surface.' '.$prod->surface_units;
 					if ($prod->volume) $text.=($text?"\n":"").$outputlangs->trans("Volume").': '.$prod->volume.' '.$prod->volume_units;
 
-					$desc = dol_concatdesc($desc, $text);
+					$desc = dol_concatdesc($desc, $text, !empty($conf->global->MAIN_USE_XML_TAGS));
 				}*/
 
 				// Add custom code and origin country into description
@@ -1189,7 +1189,7 @@ if (empty($reshook)) {
 						}
 					}
 					$tmptxt .= ')';
-					$desc = dol_concatdesc($desc, $tmptxt);
+					$desc = dol_concatdesc($desc, $tmptxt, !empty($conf->global->MAIN_USE_XML_TAGS));
 				}
 
 				$type = $prod->type;

htdocs/commande/card.php

@@ -872,7 +872,7 @@ if (empty($reshook)) {
 				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
 					$desc = $product_desc;
 				} else {
-					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+					$desc = dol_concatdesc($desc, $product_desc, !empty($conf->global->MAIN_USE_XML_TAGS), !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 				}
 
 				// Add custom code and origin country into description
@@ -914,7 +914,7 @@ if (empty($reshook)) {
 						}
 					}
 					$tmptxt .= ')';
-					$desc = dol_concatdesc($desc, $tmptxt);
+					$desc = dol_concatdesc($desc, $tmptxt, !empty($conf->global->MAIN_USE_XML_TAGS));
 				}
 
 				$type = $prod->type;

htdocs/compta/facture/card.php

@@ -2192,7 +2192,7 @@ if (empty($reshook)) {
 				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
 					$desc = $product_desc;
 				} else {
-					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+					$desc = dol_concatdesc($desc, $product_desc, !empty($conf->global->MAIN_USE_XML_TAGS), !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 				}
 
 				// Add custom code and origin country into description
@@ -2234,7 +2234,7 @@ if (empty($reshook)) {
 						}
 					}
 					$tmptxt .= ')';
-					$desc = dol_concatdesc($desc, $tmptxt);
+					$desc = dol_concatdesc($desc, $tmptxt, !empty($conf->global->MAIN_USE_XML_TAGS));
 				}
 
 				$type = $prod->type;

htdocs/custom/mmicommon

@@ -1 +1 @@
-Subproject commit 717a9858ec0faaf32f0f378f2efd42a4ed7cd8ab
+Subproject commit 64c0724f34c7950eef13a4f05b272198c9ba305c