Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
This commit is contained in:
commit
76b7f80443
@ -64,6 +64,7 @@ if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
|
|||||||
if (preg_match('/^mod_barcode_product_.*php$/', $file)) {
|
if (preg_match('/^mod_barcode_product_.*php$/', $file)) {
|
||||||
$file = substr($file, 0, dol_strlen($file) - 4);
|
$file = substr($file, 0, dol_strlen($file) - 4);
|
||||||
|
|
||||||
|
if ($file == $conf->global->BARCODE_PRODUCT_ADDON_NUM) {
|
||||||
try {
|
try {
|
||||||
dol_include_once($dirroot.$file.'.php');
|
dol_include_once($dirroot.$file.'.php');
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
@ -74,6 +75,7 @@ if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
closedir($handle);
|
closedir($handle);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user