From 71a29981187851cbc484db35f91554e8df1a2b51 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 30 Dec 2019 15:36:09 +0100 Subject: [PATCH] FIX wrong var name and avoid warning --- htdocs/product/admin/product_tools.php | 2 +- htdocs/product/class/product.class.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php index cfbedbcb7f1..d68b395d5ad 100644 --- a/htdocs/product/admin/product_tools.php +++ b/htdocs/product/admin/product_tools.php @@ -135,7 +135,7 @@ if ($action == 'convert') $newlevel=$level; //print "$objectstatic->id $newprice, $price_base_type, $newvat, $newminprice, $newlevel, $newnpr
\n"; - $retm=$objectstatic->updatePrice($newprice, $price_base_type, $user, $newvatratclean, $newminprice, $newlevel, $newnpr, 0, 0, $localtaxes_type, $newdefaultvatcode); + $retm=$objectstatic->updatePrice($newprice, $price_base_type, $user, $newvatrateclean, $newminprice, $newlevel, $newnpr, 0, 0, $localtaxes_type, $newdefaultvatcode); if ($retm < 0) { $error++; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index d00cba86e6a..e59b52be803 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1859,6 +1859,9 @@ class Product extends CommonObject if (empty($newnpr)) { $newnpr=0; } + if (empty($newminprice)) { + $newminprice=0; + } // Check parameters if ($newvat == '') {