From 8b3fd2eacfc4128f1167a902f0aa5396c4d54193 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Mon, 18 Mar 2019 16:10:17 +0100 Subject: [PATCH] NEW : add constant NO_CONCAT_DESCRIPTION --- htdocs/comm/propal/card.php | 3 ++- htdocs/commande/card.php | 3 ++- htdocs/compta/facture/card.php | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) mode change 100644 => 100755 htdocs/commande/card.php mode change 100644 => 100755 htdocs/compta/facture/card.php diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 9a296def86b..60dd298e941 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1039,7 +1039,8 @@ if (empty($reshook)) $desc = $prod->description; } - $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->CHANGE_ORDER_CONCAT_DESCRIPTION)); + if (!empty($product_desc) && !empty($conf->global->NO_CONCAT_DESCRIPTION)) $desc= $product_desc; + else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->CHANGE_ORDER_CONCAT_DESCRIPTION)); // Add dimensions into product description /*if (empty($conf->global->MAIN_PRODUCT_DISABLE_AUTOADD_DIM)) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php old mode 100644 new mode 100755 index f85870bd6f1..f62413d8274 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -868,7 +868,8 @@ if (empty($reshook)) $desc = $prod->description; } - $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->CHANGE_ORDER_CONCAT_DESCRIPTION)); + if (!empty($product_desc) && !empty($conf->global->NO_CONCAT_DESCRIPTION)) $desc= $product_desc; + else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->CHANGE_ORDER_CONCAT_DESCRIPTION)); // Add custom code and origin country into description if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code))) { diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php old mode 100644 new mode 100755 index daf090483c3..050e53debdd --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -1845,7 +1845,8 @@ if (empty($reshook)) $desc = $prod->description; } - $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->CHANGE_ORDER_CONCAT_DESCRIPTION)); + if (!empty($product_desc) && !empty($conf->global->NO_CONCAT_DESCRIPTION)) $desc= $product_desc; + else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->CHANGE_ORDER_CONCAT_DESCRIPTION)); // Add custom code and origin country into description if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code))) {