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

FIX Advisory ID: usd20190067

Browse Source
This commit is contained in:
Laurent Destailleur 2019-11-14 21:16:18 +01:00
parent f7ab1498a7
commit 7e52c70321
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/functions.lib.php
View File

@ -5134,16 +5134,18 @@ function get_default_npr(Societe $thirdparty_seller, Societe $thirdparty_buyer,
if ($idprodfournprice > 0) if ($idprodfournprice > 0)
{ {
if (! class_exists('ProductFournisseur')) if (! class_exists('ProductFournisseur')) {
require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php'; require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
}
$prodprice = new ProductFournisseur($db); $prodprice = new ProductFournisseur($db);
$prodprice->fetch_product_fournisseur_price($idprodfournprice); $prodprice->fetch_product_fournisseur_price($idprodfournprice);
return $prodprice->fourn_tva_npr; return $prodprice->fourn_tva_npr;
} }
elseif ($idprod > 0) elseif ($idprod > 0)
{ {
if (! class_exists('Product')) if (! class_exists('Product')) {
require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
}
$prod = new Product($db); $prod = new Product($db);
$prod->fetch($idprod); $prod->fetch($idprod);
return $prod->tva_npr; return $prod->tva_npr;

2
htdocs/fourn/class/fournisseur.product.class.php
View File

@ -499,7 +499,7 @@ class ProductFournisseur extends Product
$sql.= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code,"; $sql.= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code,";
$sql.=" pfp.barcode, pfp.fk_barcode_type"; $sql.=" pfp.barcode, pfp.fk_barcode_type";
$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp"; $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
$sql.= " WHERE pfp.rowid = ".$rowid; $sql.= " WHERE pfp.rowid = ".(int) $rowid;
dol_syslog(get_class($this)."::fetch_product_fournisseur_price", LOG_DEBUG); dol_syslog(get_class($this)."::fetch_product_fournisseur_price", LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);

4
htdocs/product/fournisseurs.php
View File

@ -254,8 +254,8 @@ if (empty($reshook))
{ {
$supplier=new Fournisseur($db); $supplier=new Fournisseur($db);
$result=$supplier->fetch($id_fourn); $result=$supplier->fetch($id_fourn);
if (isset($_POST['ref_fourn_price_id'])) if (GETPOSTISSET('ref_fourn_price_id'))
$object->fetch_product_fournisseur_price($_POST['ref_fourn_price_id']); $object->fetch_product_fournisseur_price(GETPOST('ref_fourn_price_id', 'int'));
$newprice = price2num(GETPOST("price", "alpha")); $newprice = price2num(GETPOST("price", "alpha"));