Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into

Browse Source 
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
This commit is contained in:
Laurent Destailleur
2019-03-22 13:00:48 +01:00
parent a7181750c6
commit 28fede950f
9 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/commande/card.php
View File

@@ -868,8 +868,8 @@ if (empty($reshook))
$desc = $prod->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));
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));
// Add custom code and origin country into description
if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code))) {