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

Merge file from Jean Heimberger

Browse Source
This commit is contained in:
Florian Henry 2013-06-13 15:24:09 +02:00
parent 1d8b2fa2c1
commit eb298e0557
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,7 @@ class Product extends CommonObject
//! Base price ('TTC' for price including tax or 'HT' for net price)
var $price_base_type;
//! Arrays for multiprices
var $pricelevel;
var $multiprices=array();
var $multiprices_ttc=array();
var $multiprices_base_type=array();

10
htdocs/product/price.php
View File

@ -88,6 +88,16 @@ if ($action == 'update_price' && ! $_POST["cancel"] && ($user->rights->produit->
$newpsq = empty($newpsq) ? 0 : $newpsq;
}
//save level and multiprices for trigger
$object->pricelevel = $level;
if ($level)
{
$object->multiprices[$level]=$newprice;
$object->multiprices_base_type[$level]=$newpricebase;
$object->multiprices_tva_tx[$level]=$newvat;
$object->multiprices_min[$level]=$newprice_min;
}
if ($object->updatePrice($object->id, $newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq) > 0)
{
$action = '';