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

Merge pull request #13460 from atm-quentin/FIX_multicurrency_SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL

Browse Source 
FIX multicurrency manage on hidden conf SUPPLIER_PROPOSAL_UPDATE_PRIC…
This commit is contained in:
Laurent Destailleur 2020-04-02 13:04:00 +02:00 committed by GitHub
commit 3b6db77cb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -1848,11 +1848,12 @@ class SupplierProposal extends CommonObject
*/ */
public function createPriceFournisseur($product, $user) public function createPriceFournisseur($product, $user)
{ {
$price=price2num($product->subprice*$product->qty, 'MU'); global $conf;
$price=price2num($product->subprice*$product->qty, 'MU');
$qty=price2num($product->qty); $qty=price2num($product->qty);
$unitPrice = price2num($product->subprice, 'MU'); $unitPrice = price2num($product->subprice, 'MU');
$now=dol_now(); $now=dol_now();
$values = array( $values = array(
"'".$this->db->idate($now)."'", "'".$this->db->idate($now)."'",
$product->fk_product, $product->fk_product,
@ -1864,9 +1865,28 @@ class SupplierProposal extends CommonObject
$product->tva_tx, $product->tva_tx,
$user->id $user->id
); );
if (!empty($conf->multicurrency->enabled)) {
if (!empty($product->multicurrency_code)) {
include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
$multicurrency = new MultiCurrency($this->db); //need to fetch because empty fk_multicurrency and rate
$multicurrency->fetch(0, $product->multicurrency_code);
if(! empty($multicurrency->id)) {
$values[] = $multicurrency->id;
$values[] = "'".$product->multicurrency_code."'";
$values[] = $product->multicurrency_subprice;
$values[] = $product->multicurrency_total_ht;
$values[] = $multicurrency->rate->rate;
}
else {
for($i = 0; $i < 5; $i++) $values[] = 'NULL';
}
}
}
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_fournisseur_price '; $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_fournisseur_price ';
$sql .= '(datec, fk_product, fk_soc, ref_fourn, price, quantity, unitprice, tva_tx, fk_user) VALUES ('.implode(',', $values).')'; $sql .= '(datec, fk_product, fk_soc, ref_fourn, price, quantity, unitprice, tva_tx, fk_user';
if(!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) $sql .= ',fk_multicurrency, multicurrency_code, multicurrency_unitprice, multicurrency_price, multicurrency_tx';
$sql .= ') VALUES ('.implode(',', $values).')';
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (!$resql) { if (!$resql) {