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

This commit is contained in:
Laurent Destailleur 2023-10-10 22:38:23 +02:00
commit 6f31fd89f3
2 changed files with 5 additions and 5 deletions

View file

@ -370,7 +370,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
$action = 'presend';
} else {
$result = $mailfile->sendfile();
if ($result) {
if ($result >= 0) {
// Initialisation of datas of object to call trigger
if (is_object($object)) {
if (empty($actiontypecode)) {

View file

@ -67,16 +67,16 @@ print '<script type="text/javascript">
init_price();
});
jQuery("#nbpiece").keyup(function(event) {
console.log("We enter a qty on "+event.which);
if ( event.which == 54 ) { /* char - */
console.log("We enter a qty on "+event.key);
if ( event.key == "-" ) { /* char - */
console.log("We set direction to value 1");
jQuery("#nbpiece").val(jQuery("#nbpiece").val().replace("-", ""));
jQuery("#mouvement option").removeAttr("selected").change();
jQuery("#mouvement option[value=1]").attr("selected","selected").trigger("change");
jQuery("#mouvement").trigger("change");
} else if ( event.which == 187 ) { /* char + */
} else if ( event.key == "+" ) { /* char + */
console.log("We set direction to value 0");
jQuery("#nbpiece").val(jQuery("#nbpiece").val().replace("+", ""));
jQuery("#mouvement option").removeAttr("selected").change();
jQuery("#mouvement option[value=0]").attr("selected","selected").trigger("change");
jQuery("#mouvement").trigger("change");