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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2023-04-01 15:01:41 +02:00
commit 490d372ab9
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/expedition/card.php
View File

@ -594,6 +594,7 @@ if (empty($reshook)) {
$num_prod = count($lines); $num_prod = count($lines);
for ($i = 0; $i < $num_prod; $i++) { for ($i = 0; $i < $num_prod; $i++) {
if ($lines[$i]->id == $line_id) { // we have found line to update if ($lines[$i]->id == $line_id) { // we have found line to update
$update_done = false;
$line = new ExpeditionLigne($db); $line = new ExpeditionLigne($db);
$line->fk_expedition = $object->id; $line->fk_expedition = $object->id;
@ -634,6 +635,8 @@ if (empty($reshook)) {
if ($line->update($user) < 0) { if ($line->update($user) < 0) {
setEventMessages($line->error, $line->errors, 'errors'); setEventMessages($line->error, $line->errors, 'errors');
$error++; $error++;
} else {
$update_done=true;
} }
} else { } else {
setEventMessages($lotStock->error, $lotStock->errors, 'errors'); setEventMessages($lotStock->error, $lotStock->errors, 'errors');
@ -676,6 +679,8 @@ if (empty($reshook)) {
if ($line->update($user) < 0) { if ($line->update($user) < 0) {
setEventMessages($line->error, $line->errors, 'errors'); setEventMessages($line->error, $line->errors, 'errors');
$error++; $error++;
} else {
$update_done=true;
} }
} else { } else {
setEventMessages($line->error, $line->errors, 'errors'); setEventMessages($line->error, $line->errors, 'errors');
@ -693,6 +698,8 @@ if (empty($reshook)) {
if ($object->create_line_batch($line, $line->array_options) < 0) { if ($object->create_line_batch($line, $line->array_options) < 0) {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
$error++; $error++;
} else {
$update_done=true;
} }
} }
} else { } else {
@ -730,6 +737,8 @@ if (empty($reshook)) {
if ($line->update($user) < 0) { if ($line->update($user) < 0) {
setEventMessages($line->error, $line->errors, 'errors'); setEventMessages($line->error, $line->errors, 'errors');
$error++; $error++;
} else {
$update_done=true;
} }
} }
unset($_POST[$stockLocation]); unset($_POST[$stockLocation]);
@ -744,6 +753,8 @@ if (empty($reshook)) {
if ($line->update($user) < 0) { if ($line->update($user) < 0) {
setEventMessages($line->error, $line->errors, 'errors'); setEventMessages($line->error, $line->errors, 'errors');
$error++; $error++;
} else {
$update_done=true;
} }
unset($_POST[$qty]); unset($_POST[$qty]);
} }
@ -756,10 +767,17 @@ if (empty($reshook)) {
if ($line->update($user) < 0) { if ($line->update($user) < 0) {
setEventMessages($line->error, $line->errors, 'errors'); setEventMessages($line->error, $line->errors, 'errors');
$error++; $error++;
} else {
$update_done=true;
} }
unset($_POST[$qty]); unset($_POST[$qty]);
} }
} }
if (empty($update_done)) {
$line->id = $lines[$i]->id;
$line->insertExtraFields();
}
} }
} }