Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects

Browse Source 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/product/admin/product.php
	htdocs/product/card.php
This commit is contained in:
arnaud
2017-03-10 12:16:55 +01:00
parent b3d27521cb 1d31603ad2
commit a796a321cc
18 changed files with 931 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1530,7 +1530,6 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
$const=$obj->description;
$dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
$listoffiles=array();
// Now we add models found in directories scanned