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

Merge pull request #12772 from hregis/10.0_mc

Browse Source 
FIX wrong var name and avoid warning
This commit is contained in:
Laurent Destailleur 2019-12-30 21:48:56 +01:00 committed by GitHub
commit e2c7ee7d09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/product/admin/product_tools.php
View File

@ -135,7 +135,7 @@ if ($action == 'convert')
$newlevel=$level; $newlevel=$level;
//print "$objectstatic->id $newprice, $price_base_type, $newvat, $newminprice, $newlevel, $newnpr<br>\n"; //print "$objectstatic->id $newprice, $price_base_type, $newvat, $newminprice, $newlevel, $newnpr<br>\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) if ($retm < 0)
{ {
$error++; $error++;

3
htdocs/product/class/product.class.php
View File

@ -1859,6 +1859,9 @@ class Product extends CommonObject
if (empty($newnpr)) { if (empty($newnpr)) {
$newnpr=0; $newnpr=0;
} }
if (empty($newminprice)) {
$newminprice=0;
}
// Check parameters // Check parameters
if ($newvat == '') { if ($newvat == '') {