From 53cc1667d59b204197d2b71d5e41ce05c28106c1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Jul 2012 01:26:31 +0200 Subject: [PATCH] Fix: error when validating shipment for non predefined products with a selected warehouse. --- htdocs/product/stock/class/mouvementstock.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 42fdcf93c0b..00dc44d13f7 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -56,7 +56,7 @@ class MouvementStock * @param int $price Unit price HT of product * @param string $label Label of stock movement * @param string $datem Force date of movement - * @return int <0 if KO, >0 if OK + * @return int <0 if KO, 0 if fk_product is null, >0 if OK */ function _create($user, $fk_product, $entrepot_id, $qty, $type, $price=0, $label='', $datem='') { @@ -65,6 +65,8 @@ class MouvementStock $error = 0; dol_syslog("MouvementStock::_create start userid=$user->id, fk_product=$fk_product, warehouse=$entrepot_id, qty=$qty, type=$type, price=$price label=$label"); + if (empty($fk_product)) return 0; + $now=(! empty($datem) ? $datem : dol_now()); $this->db->begin();