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

Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5

Browse Source
This commit is contained in:
Grand Philippe 2013-11-29 08:30:46 +01:00
commit c0650d6da3
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -6,7 +6,7 @@
notifications: notifications:
email: email:
on_success: never # [always|never|change] default: change on_success: never # [always|never|change] default: change
on_failure: always # [always|never|change] default: always on_failure: change # [always|never|change] default: always
services: services:
- memcached # will start memcached - memcached # will start memcached

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

@ -107,7 +107,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($objectstatic->id, $newprice, $price_base_type, $user, $newvat, $newminprice, $newlevel, $newnpr); $retm=$objectstatic->updatePrice($newprice, $price_base_type, $user, $newvat, $newminprice, $newlevel, $newnpr);
if ($retm < 0) if ($retm < 0)
{ {
$error++; $error++;
@ -136,7 +136,7 @@ if ($action == 'convert')
if (! empty($price_base_type) && ! $updatelevel1) if (! empty($price_base_type) && ! $updatelevel1)
{ {
//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";
$ret=$objectstatic->updatePrice($objectstatic->id,$newprice, $price_base_type, $user, $newvat, $newminprice, $newlevel, $newnpr); $ret=$objectstatic->updatePrice($newprice, $price_base_type, $user, $newvat, $newminprice, $newlevel, $newnpr);
} }
if ($ret < 0 || $retm < 0) $error++; if ($ret < 0 || $retm < 0) $error++;