lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/product/admin/product.php
This commit is contained in:
Laurent Destailleur 2018-01-03 20:21:10 +01:00
commit 48261f793d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/ajax.lib.php
View File

@ -430,7 +430,7 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
if ($forcefocus) $msg.= '.select2(\'focus\')'; if ($forcefocus) $msg.= '.select2(\'focus\')';
$msg.= ';'."\n"; $msg.= ';'."\n";
if (count($events)) // If an array of js events to do were provided. if (is_array($events) && count($events)) // If an array of js events to do were provided.
{ {
$msg.= ' $msg.= '
jQuery("#'.$htmlname.'").change(function () { jQuery("#'.$htmlname.'").change(function () {