From 1a7c09b7d5e6dc76c17d7f1ef88385afd68eedfd Mon Sep 17 00:00:00 2001 From: fappels Date: Sun, 4 Mar 2018 12:35:32 +0100 Subject: [PATCH] Fix 0 is also a valid Qty Fix error handling --- htdocs/expedition/class/expedition.class.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 85408c7e14a..90a7abb291e 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -398,7 +398,7 @@ class Expedition extends CommonObject if (($lineId = $expeditionline->insert()) < 0) { - $this->error[]=$expeditionline->error; + $this->errors[]=$expeditionline->error; } return $lineId; } @@ -2386,9 +2386,9 @@ class ExpeditionLigne extends CommonObjectLine $error=0; // Check parameters - if (empty($this->fk_expedition) || empty($this->fk_origin_line) || empty($this->qty)) + if (empty($this->fk_expedition) || empty($this->fk_origin_line) || ! is_numeric($this->qty)) { - $this->errors[] = 'ErrorMandatoryParametersNotProvided'; + $this->error = 'ErrorMandatoryParametersNotProvided'; return -1; } // Clean parameters @@ -2418,6 +2418,7 @@ class ExpeditionLigne extends CommonObjectLine $result=$this->insertExtraFields(); if ($result < 0) { + $this->errors[]=$this->error; $error++; } }