Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
bbab5e5b
Commit
bbab5e5b
authored
9 years ago
by
aspangaro
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
parents
54091a06
e673b188
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/core/lib/ajax.lib.php
+0
-6
0 additions, 6 deletions
htdocs/core/lib/ajax.lib.php
htdocs/core/tpl/objectline_create.tpl.php
+0
-1
0 additions, 1 deletion
htdocs/core/tpl/objectline_create.tpl.php
with
0 additions
and
7 deletions
htdocs/core/lib/ajax.lib.php
+
0
−
6
View file @
bbab5e5b
...
...
@@ -52,16 +52,13 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
// Remove product id before select another product
// use keyup instead change to avoid loosing the product id
$("input#search_'
.
$htmlname
.
'").keydown(function() {
//console.log(\'purge_id_after_keydown\');
$("#'
.
$htmlname
.
'").val("");
});
$("input#search_'
.
$htmlname
.
'").change(function() {
//console.log(\'change\');
$("#'
.
$htmlname
.
'").trigger("change");
});
// Check when keyup
$("input#search_'
.
$htmlname
.
'").keyup(function() {
//console.log(\'keyup\');
if ($(this).val().length == 0)
{
$("#search_'
.
$htmlname
.
'").val("");
...
...
@@ -127,7 +124,6 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
dataType: "json",
minLength: '
.
$minLength
.
',
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"); // Select new value
// Disable an element
if (options.option_disabled) {
...
...
@@ -171,8 +167,6 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
}
});
}
console.log("ajax_autocompleter new value selected, we trigger change");
$("#search_'
.
$htmlname
.
'").trigger("change"); // To tell that input text field was modified
}
,delay: 500
}).data("ui-autocomplete")._renderItem = function( ul, item ) {
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/tpl/objectline_create.tpl.php
+
0
−
1
View file @
bbab5e5b
...
...
@@ -523,7 +523,6 @@ jQuery(document).ready(function() {
/* When changing predefined product, we reload list of supplier prices */
$
(
"
#idprod, #idprodfournprice
"
).
change
(
function
()
{
console
.
log
(
"
change #idprod, #idprodfournprice, conf->global->MARGIN_TYPE=
<?php
echo
$conf
->
global
->
MARGIN_TYPE
?>
"
);
setforpredef
();
jQuery
(
'
#trlinefordates
'
).
show
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment