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

Merge pull request #7104 from tuxgasy/develop_shipment_failed_no_error

Browse Source 
Fix #7103 : No error message on validate shipment if stock movement failed
This commit is contained in:
Laurent Destailleur 2017-07-07 19:55:32 +02:00 committed by GitHub
commit 0eb6a25342
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -716,6 +716,7 @@ class Expedition extends CommonObject
if ($result < 0) { if ($result < 0) {
$error++; $error++;
$this->errors[]=$mouvS->error; $this->errors[]=$mouvS->error;
$this->errors = array_merge($this->errors, $mouvS->errors);
break; break;
} }
} }
@ -729,6 +730,7 @@ class Expedition extends CommonObject
if ($result < 0) { if ($result < 0) {
$error++; $error++;
$this->errors[]=$mouvS->error; $this->errors[]=$mouvS->error;
$this->errors = array_merge($this->errors, $mouvS->errors);
break; break;
} }
} }