diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 9035413b533..5b033fc11f7 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -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; } } }