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

Merge branch 'develop' into prod-attr

Browse Source 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/core/tpl/objectline_create.tpl.php
#	htdocs/fourn/facture/card.php
#	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
This commit is contained in:
Marcos García de La Fuente
2016-11-06 15:01:40 +01:00
parent 05728075d6 18d1878775
commit 286095f5cd
2924 changed files with 65183 additions and 91745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/core/lib/functions2.lib.php
View File

@@ -1524,7 +1524,7 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
// If this generation module needs to scan a directory, then description field is filled
// with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).
if (! empty($obj->description)) // List of directories to scan is defined
if (! empty($obj->description)) // A list of directories to scan is defined
{
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -1562,7 +1562,19 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
}
else
{
$liste[$obj->id]=$obj->label?$obj->label:$obj->lib;
if ($type == 'member' && $obj->lib == 'standard') // Special case, if member template, we add variant per format
{
global $_Avery_Labels;
include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
foreach($_Avery_Labels as $key => $val)
{
$liste[$obj->id.':'.$key]=($obj->label?$obj->label:$obj->lib).' '.$val['name'];
}
}
else // Common usage
{
$liste[$obj->id]=$obj->label?$obj->label:$obj->lib;
}
}
$i++;
}