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

Merge pull request #21104 from jyhere/jyhere-patch-1

Browse Source 
FIX : array merges in expedition class
This commit is contained in:
Laurent Destailleur 2022-06-02 14:51:22 +02:00 committed by GitHub
commit e085594950
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/expedition/class/expedition.class.php
View File

@ -1247,7 +1247,8 @@ class Expedition extends CommonObject
if ($conf->productbatch->enabled) {
$lotArray = $shipmentlinebatch->fetchAll($obj->expeditiondet_id);
if (!is_array($lotArray)) {
$error++; $this->errors[] = "Error ".$this->db->lasterror();
$error++;
$this->errors[] = "Error ".$this->db->lasterror();
}
}
@ -1257,7 +1258,8 @@ class Expedition extends CommonObject
// We use warehouse selected for each line
$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ShipmentCanceledInDolibarr", $this->ref)); // Price is set to 0, because we don't want to see WAP changed
if ($result < 0) {
$error++; $this->errors = $this->errors + $mouvS->errors;
$error++;
$this->errors = array_merge($this->errors, $mouvS->errors);
break;
}
} else {
@ -1266,7 +1268,8 @@ class Expedition extends CommonObject
foreach ($lotArray as $lot) {
$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $lot->qty, 0, $langs->trans("ShipmentCanceledInDolibarr", $this->ref), $lot->eatby, $lot->sellby, $lot->batch); // Price is set to 0, because we don't want to see WAP changed
if ($result < 0) {
$error++; $this->errors = $this->errors + $mouvS->errors;
$error++;
$this->errors = array_merge($this->errors, $mouvS->errors);
break;
}
}
@ -1441,7 +1444,8 @@ class Expedition extends CommonObject
// We use warehouse selected for each line
$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref)); // Price is set to 0, because we don't want to see WAP changed
if ($result < 0) {
$error++; $this->errors = $this->errors + $mouvS->errors;
$error++;
$this->errors = array_merge($this->errors, $mouvS->errors);
break;
}
} else {
@ -1450,7 +1454,8 @@ class Expedition extends CommonObject
foreach ($lotArray as $lot) {
$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $lot->qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref), $lot->eatby, $lot->sellby, $lot->batch); // Price is set to 0, because we don't want to see WAP changed
if ($result < 0) {
$error++; $this->errors = $this->errors + $mouvS->errors;
$error++;
$this->errors = array_merge($this->errors, $mouvS->errors);
break;
}
}
@ -2195,7 +2200,8 @@ class Expedition extends CommonObject
if ($result < 0) {
$this->error = $mouvS->error;
$this->errors = $mouvS->errors;
$error++; break;
$error++;
break;
}
} else {
// line with batch detail
@ -2205,7 +2211,8 @@ class Expedition extends CommonObject
if ($result < 0) {
$this->error = $mouvS->error;
$this->errors = $mouvS->errors;
$error++; break;
$error++;
break;
}
}
}
@ -2369,7 +2376,8 @@ class Expedition extends CommonObject
if ($result < 0) {
$this->error = $mouvS->error;
$this->errors = $mouvS->errors;
$error++; break;
$error++;
break;
}
} else {
// line with batch detail
@ -2379,7 +2387,8 @@ class Expedition extends CommonObject
if ($result < 0) {
$this->error = $mouvS->error;
$this->errors = $mouvS->errors;
$error++; break;
$error++;
break;
}
}
}