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

Fix error management in API

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-18 20:17:21 +01:00
parent a1b03e094c
commit 45f322cce8
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/product/stock/class/api_stockmovements.class.php
View File

@ -156,6 +156,12 @@ class StockMovements extends DolibarrApi
/** /**
* Create stock movement object. * Create stock movement object.
* You can use the following message to test this RES API:
* { "product_id": 1, "warehouse_id": 1, "qty": 1, "lot": "", "movementcode": "INV123", "movementlabel": "Inventory 123", "price": 0 }
* $price Can be set to update AWP (Average Weighted Price) when you make a stock increase
* $dlc Eat-by date. Will be used if lot does not exists yet and will be created.
* $dluo Sell-by date. Will be used if lot does not exists yet and will be created.
*
* @param int $product_id Id product id {@min 1} {@from body} {@required true} * @param int $product_id Id product id {@min 1} {@from body} {@required true}
* @param int $warehouse_id Id warehouse {@min 1} {@from body} {@required true} * @param int $warehouse_id Id warehouse {@min 1} {@from body} {@required true}
* @param float $qty Qty to add (Use negative value for a stock decrease) {@min 0} {@message qty must be higher than 0} {@from body} {@required true} * @param float $qty Qty to add (Use negative value for a stock decrease) {@min 0} {@message qty must be higher than 0} {@from body} {@required true}
@ -163,8 +169,8 @@ class StockMovements extends DolibarrApi
* @param string $movementcode Movement code {@example INV123} {@from body} * @param string $movementcode Movement code {@example INV123} {@from body}
* @param string $movementlabel Movement label {@example Inventory number 123} {@from body} * @param string $movementlabel Movement label {@example Inventory number 123} {@from body}
* @param string $price To update AWP (Average Weighted Price) when you make a stock increase (qty must be higher then 0). {@from body} * @param string $price To update AWP (Average Weighted Price) when you make a stock increase (qty must be higher then 0). {@from body}
* @param string $dlc {@from body} {@type date} * @param string $dlc Eat-by date. {@from body} {@type date}
* @param string $dluo {@from body} {@type date} * @param string $dluo Sell-by date. {@from body} {@type date}
* *
* @return int ID of stock movement * @return int ID of stock movement
* @throws RestException * @throws RestException
@ -175,6 +181,10 @@ class StockMovements extends DolibarrApi
throw new RestException(401); throw new RestException(401);
} }
if ($qty == 0) {
throw new RestException(503, "Making a stock movement with a quentity of 0 is not possible");
}
// Type increase or decrease // Type increase or decrease
if ($qty >= 0) $type = 3; if ($qty >= 0) $type = 3;
else $type = 2; else $type = 2;

7
htdocs/product/stock/class/mouvementstock.class.php
View File

@ -157,6 +157,8 @@ class MouvementStock extends CommonObject
$result=$product->fetch($fk_product); $result=$product->fetch($fk_product);
if ($result < 0) if ($result < 0)
{ {
$this->error = $product->error;
$this->errors = $product->errors;
dol_print_error('', "Failed to fetch product"); dol_print_error('', "Failed to fetch product");
return -1; return -1;
} }
@ -352,7 +354,7 @@ class MouvementStock extends CommonObject
if(!empty($this->origin)) { // This is set by caller for tracking reason if(!empty($this->origin)) { // This is set by caller for tracking reason
$origintype = $this->origin->element; $origintype = $this->origin->element;
$fk_origin = $this->origin->id; $fk_origin = $this->origin->id;
if($origintype == 'project') $fk_project = $fk_origin; if ($origintype == 'project') $fk_project = $fk_origin;
else else
{ {
$res = $this->origin->fetch($fk_origin); $res = $this->origin->fetch($fk_origin);
@ -398,7 +400,8 @@ class MouvementStock extends CommonObject
} }
else else
{ {
$this->errors[]=$this->db->lasterror(); $this->error = $this->db->lasterror();
$this->errors[] = $this->error;
$error = -1; $error = -1;
} }