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

Fix update price when updating products

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-01 21:20:54 +01:00
parent a7357e67f9
commit fae7616281
1 changed files with 57 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
htdocs/product/class/api_products.class.php
View File

@ -197,7 +197,8 @@ class Products extends DolibarrApi
} }
/** /**
* Update product * Update product.
* Price will be updated by this API only if option is set on "One price per product". See other APIs for other price modes.
* *
* @param int $id Id of product to update * @param int $id Id of product to update
* @param array $request_data Datas * @param array $request_data Datas
@ -209,6 +210,8 @@ class Products extends DolibarrApi
*/ */
function put($id, $request_data = NULL) function put($id, $request_data = NULL)
{ {
global $conf;
if(! DolibarrApiAccess::$user->rights->produit->creer) { if(! DolibarrApiAccess::$user->rights->produit->creer) {
throw new RestException(401); throw new RestException(401);
} }
@ -222,15 +225,63 @@ class Products extends DolibarrApi
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
} }
$oldproduct = dol_clone($this->product, 0);
foreach($request_data as $field => $value) { foreach($request_data as $field => $value) {
if ($field == 'id') continue; if ($field == 'id') continue;
$this->product->$field = $value; $this->product->$field = $value;
} }
if($this->product->update($id, DolibarrApiAccess::$user,1,'update')) $result = $this->product->update($id, DolibarrApiAccess::$user, 1, 'update');
return $this->get ($id);
return false; // If price mode is 1 price per product
if ($result > 0 && ! empty($conf->global->PRODUCT_PRICE_UNIQ))
{
// We update price only if it was changed
$pricemodified = false;
if ($this->product->price_base_type != $oldproduct->price_base_type) $pricemodified = true;
else
{
if ($this->product->tva_tx != $oldproduct->tva_tx) $pricemodified = true;
if ($this->product->tva_npr != $oldproduct->tva_npr) $pricemodified = true;
if ($this->product->default_vat_code != $oldproduct->default_vat_code) $pricemodified = true;
if ($this->product->price_base_type == 'TTC')
{
if ($this->product->price_ttc != $oldproduct->price_ttc) $pricemodified = true;
if ($this->product->price_min_ttc != $oldproduct->price_min_ttc) $pricemodified = true;
}
else
{
if ($this->product->price != $oldproduct->price) $pricemodified = true;
if ($this->product->price_min != $oldproduct->price_min) $pricemodified = true;
}
}
if ($pricemodified)
{
$newvat = $this->product->tva_tx;
$newnpr = $this->product->tva_npr;
$newvatsrccode = $this->product->default_vat_code;
$newprice = $this->product->price;
$newpricemin = $this->product->price_min;
if ($this->product->price_base_type == 'TTC')
{
$newprice = $this->product->price_ttc;
$newpricemin = $this->product->price_min_ttc;
}
$result = $this->product->updatePrice($newprice, $this->product->price_base_type, DolibarrApiAccess::$user, $newvat, $newpricemin, 0, $newnpr, 0, 0, array(), $newvatsrccode);
}
}
if ($result <= 0)
{
throw new RestException(500, "Error updating product", array_merge(array($this->product->error), $this->product->errors));
}
return $this->get($id);
} }
/** /**
@ -431,6 +482,8 @@ class Products extends DolibarrApi
unset($object->lastname); unset($object->lastname);
unset($object->civility_id); unset($object->civility_id);
unset($object->recuperableonly);
return $object; return $object;
} }