Merge pull request #3012 from fmarcet/3.7
Fix: Not reading external barcode numeration module
This commit is contained in:
commit
10d27ea594
@ -10,7 +10,7 @@
|
||||
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
|
||||
* Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
|
||||
* Copyright (C) 2014 Cédric Gross <c.gross@kreiz-it.fr>
|
||||
* Copyright (C) 2014 Ferran Marcet <fmarcet@2byte.es>
|
||||
* Copyright (C) 2014-2015 Ferran Marcet <fmarcet@2byte.es>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -820,8 +820,13 @@ else
|
||||
if (! empty($conf->barcode->enabled) && ! empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
|
||||
{
|
||||
$module=strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
|
||||
$result=dol_include_once('/core/modules/barcode/'.$module.'.php');
|
||||
if ($result > 0)
|
||||
$dirbarcode=array_merge(array('/core/modules/barcode/'),$conf->modules_parts['barcode']);
|
||||
foreach ($dirbarcode as $dirroot)
|
||||
{
|
||||
$res=dol_include_once($dirroot.$module.'.php');
|
||||
if ($res) break;
|
||||
}
|
||||
if ($res > 0)
|
||||
{
|
||||
$modBarCodeProduct =new $module();
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user