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

Fix: displays error when the supplier price does not exist.

Browse Source
This commit is contained in:
Bahfir Abbes 2016-02-26 22:48:01 +01:00
parent 5e2261c9bd
commit 4cbc1539b9
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
htdocs/fourn/commande/card.php
View File

@ -1012,33 +1012,34 @@ if (empty($reshook))
$array_option = $lines[$i]->array_options; $array_option = $lines[$i]->array_options;
} }
$idprod = $productsupplier->find_min_price_product_fournisseur($lines[$i]->fk_product, $lines[$i]->qty); $result = $productsupplier->find_min_price_product_fournisseur($lines[$i]->fk_product, $lines[$i]->qty);
$res = $productsupplier->fetch($idprod); if ($result>0) {
$soc=new societe($db); $productsupplier->fetch($productsupplier->id);
$soc->fetch($socid); $soc=new societe($db);
$tva_tx=($origin=="commande")?get_default_tva($soc,$mysoc,$lines[$i]->fk_product,$idprod):$lines[$i]->tva_tx; $soc->fetch($socid);
$result = $object->addline( $tva_tx=($origin=="commande")?get_default_tva($soc,$mysoc,$lines[$i]->fk_product,$idprod):$lines[$i]->tva_tx;
$desc, $result = $object->addline(
$lines[$i]->subprice, $desc,
$lines[$i]->qty, $lines[$i]->subprice,
$tva_tx, $lines[$i]->qty,
$lines[$i]->localtax1_tx, $tva_tx,
$lines[$i]->localtax2_tx, $lines[$i]->localtax1_tx,
$lines[$i]->fk_product, $lines[$i]->localtax2_tx,
$productsupplier->product_fourn_price_id, $lines[$i]->fk_product,
$productsupplier->ref_fourn, $productsupplier->product_fourn_price_id,
$lines[$i]->remise_percent, $productsupplier->ref_fourn,
'HT', $lines[$i]->remise_percent,
0, 'HT',
$lines[$i]->product_type, 0,
'', $lines[$i]->product_type,
'', '',
null, '',
null, null,
array(), null,
$lines[$i]->fk_unit array(),
); $lines[$i]->fk_unit
);
}
if ($result < 0) { if ($result < 0) {
$error++; $error++;
break; break;