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

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/expedition/list.php
This commit is contained in:
Laurent Destailleur
2015-04-18 04:18:59 +02:00
parent aab9b0ec60 49977f8b87
commit deb62f1ffd
3 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,7 +315,7 @@ function ajax_dialog($title,$message,$w=350,$h=150)
* @param array $events More events option. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
* @param int $minLengthToAutocomplete Minimum length of input string to start autocomplete
* @param int $forcefocus Force focus on field
* @return string Return html string to convert a select field into a combo
* @return string Return html string to convert a select field into a combo, or '' if feature has been disabled for some reason.
*/
function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $forcefocus=0)
{