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

Fix: avoid Warning: A non-numeric value encountered

Browse Source
This commit is contained in:
Regis Houssin 2018-02-12 08:21:35 +01:00
parent 60a848de5a
commit 40fe3849dc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1649,7 +1649,7 @@ class Product extends CommonObject
* @param string $newdefaultvatcode Default vat code * @param string $newdefaultvatcode Default vat code
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function updatePrice($newprice, $newpricebase, $user, $newvat='',$newminprice='', $level=0, $newnpr=0, $newpbq=0, $ignore_autogen=0, $localtaxes_array=array(), $newdefaultvatcode='') function updatePrice($newprice, $newpricebase, $user, $newvat='',$newminprice=0, $level=0, $newnpr=0, $newpbq=0, $ignore_autogen=0, $localtaxes_array=array(), $newdefaultvatcode='')
{ {
global $conf,$langs; global $conf,$langs;
@ -1677,7 +1677,7 @@ class Product extends CommonObject
return -1; return -1;
} }
if ($newprice!='' || $newprice==0) if ($newprice != '' || $newprice == 0)
{ {
if ($newpricebase == 'TTC') if ($newpricebase == 'TTC')
{ {
@ -1685,7 +1685,7 @@ class Product extends CommonObject
$price = price2num($newprice) / (1 + ($newvat / 100)); $price = price2num($newprice) / (1 + ($newvat / 100));
$price = price2num($price,'MU'); $price = price2num($price,'MU');
if ($newminprice!='' || $newminprice==0) if ($newminprice != '' || $newminprice == 0)
{ {
$price_min_ttc = price2num($newminprice,'MU'); $price_min_ttc = price2num($newminprice,'MU');
$price_min = price2num($newminprice) / (1 + ($newvat / 100)); $price_min = price2num($newminprice) / (1 + ($newvat / 100));
@ -1703,7 +1703,7 @@ class Product extends CommonObject
$price_ttc = ( $newnpr != 1 ) ? price2num($newprice) * (1 + ($newvat / 100)) : $price; $price_ttc = ( $newnpr != 1 ) ? price2num($newprice) * (1 + ($newvat / 100)) : $price;
$price_ttc = price2num($price_ttc,'MU'); $price_ttc = price2num($price_ttc,'MU');
if ($newminprice!='' || $newminprice==0) if ($newminprice != '' || $newminprice == 0)
{ {
$price_min = price2num($newminprice,'MU'); $price_min = price2num($newminprice,'MU');
$price_min_ttc = price2num($newminprice) * (1 + ($newvat / 100)); $price_min_ttc = price2num($newminprice) * (1 + ($newvat / 100));