';
print '';
if ($obj->rowid == 0)
{
- //$langs->load("companies");
- //print '';
+ // No Ajax search
+ print 'use_javascript_ajax)
+ {
+ $javaScript = "window.location='".$_SERVER['PHP_SELF']."?".$var_id."=".($forceid>0?$forceid:$object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
+ print ' onChange="'.$javaScript.'"';
+ }
+ print '>';
$num = $this->db->num_rows($resql);
$i = 0;
if ($num)
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index cc5ca841c52..aee2ff5dff6 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -25,7 +25,8 @@
/**
- * Get value of an HTML field, do Ajax process and show result
+ * Get value of an HTML field, do Ajax process and show result.
+ * The HTML field must be an input text with id=search_$htmlname.
*
* @param string $selected Preselecte value
* @param string $htmlname HTML name of input field
@@ -54,11 +55,12 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
$("#'.$htmlname.'").val("");
});
$("input#search_'.$htmlname.'").change(function() {
- //console.log(\'keyup\');
+ //console.log(\'change\');
$("#'.$htmlname.'").trigger("change");
});
// Check when keyup
$("input#search_'.$htmlname.'").onDelayedKeyup({ handler: function() {
+ //console.log(\'keyup\');
if ($(this).val().length == 0)
{
$("#search_'.$htmlname.'").val("");
@@ -120,9 +122,9 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
},
dataType: "json",
minLength: '.$minLength.',
- select: function( event, ui ) {
+ select: function( event, ui ) { // Function ran when new value is selected into javascript combo
//console.log(\'set value of id with \'+ui.item.id);
- $("#'.$htmlname.'").val(ui.item.id).trigger("change");
+ $("#'.$htmlname.'").val(ui.item.id).trigger("change"); // Select new value
// Disable an element
if (options.option_disabled) {
if (ui.item.disabled) {
@@ -162,6 +164,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
}
});
}
+ $("#search_'.$htmlname.'").trigger("change"); // To tell that input text field was modified
}
}).data( "autocomplete" )._renderItem = function( ul, item ) {
return $( "\' + item.label + " trans("Users"); ?>
global->MAIN_INFO_SOCIETE_NOM; ?>
select_dolusers($user->id, 'userid', 0, (! empty($userAlreadySelected)?$userAlreadySelected:null), 0, null, null, 0, 56); ?>
@@ -79,29 +84,24 @@ $userstatic=new User($db);
trans("ThirdPartyContacts"); ?>
- use_javascript_ajax && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) { ?>
+ 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
+ ?>
- 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
- print $form->select_company($object->socid,'socid','',1,0,0,$events);
- ?>
-
-
- select_contacts($object->socid, '', 'contactid'); ?>
-
-
-
socid; ?>
- selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany'); ?>
+ selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, $events); ?>
select_contacts($selectedCompany, '', 'contactid'); ?>
-
- selectTypeContact($object, '', 'type','external'); ?>
+ element == 'shipping' && is_object($objectsrc)) $tmpobject=$objectsrc;
+ $formcompany->selectTypeContact($tmpobject, '', 'type','external'); ?>
@@ -124,7 +124,11 @@ $userstatic=new User($db);
liste_contact(-1,$source);
+
+ $tmpobject=$object;
+ if ($object->element == 'shipping' && is_object($objectsrc)) $tmpobject=$objectsrc;
+
+ $tab = $tmpobject->liste_contact(-1,$source);
$num=count($tab);
$i = 0;
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index ef5faa79e3b..6cfd835925d 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -106,9 +106,9 @@ else if ($action == 'swapstatut' && $user->rights->expedition->creer)
}
// Efface un contact
-else if ($action == 'deleteline' && $user->rights->expedition->creer)
+else if ($action == 'deletecontact' && $user->rights->expedition->creer)
{
- $result = $objectsrc->delete_contact($_GET["lineid"]);
+ $result = $objectsrc->delete_contact(GETPOST("lineid"));
if ($result >= 0)
{
@@ -233,186 +233,20 @@ if ($id > 0 || ! empty($ref))
print "