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

FIX ref_supplier was not set. We also refered to old var names.

Browse Source
This commit is contained in:
Laurent Destailleur 2016-05-05 20:19:56 +02:00
parent 8a8e7cdf5e
commit c795803da1
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -613,7 +613,9 @@ class ProductFournisseur extends Product
if ($fourn_unitprice < $min || $min == -1) if ($fourn_unitprice < $min || $min == -1)
{ {
$this->product_fourn_price_id = $record["product_fourn_price_id"]; $this->product_fourn_price_id = $record["product_fourn_price_id"];
$this->fourn_ref = $record["ref_fourn"]; $this->ref_supplier = $record["ref_fourn"];
$this->ref_fourn = $record["ref_fourn"]; // deprecated
$this->fourn_ref = $record["ref_fourn"]; // deprecated
$this->fourn_price = $fourn_price; $this->fourn_price = $fourn_price;
$this->fourn_qty = $record["quantity"]; $this->fourn_qty = $record["quantity"];
$this->fourn_remise_percent = $record["remise_percent"]; $this->fourn_remise_percent = $record["remise_percent"];

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

@ -984,17 +984,16 @@ if (empty($reshook))
// If creation from another object of another module (Example: origin=propal, originid=1) // If creation from another object of another module (Example: origin=propal, originid=1)
if (! empty($origin) && ! empty($originid)) if (! empty($origin) && ! empty($originid))
{ {
if ($origin == 'order' || $origin == 'commande') { if ($origin == 'order' || $origin == 'commande')
{
$element = $subelement = 'commande'; $element = $subelement = 'commande';
} }
elseif ($origin =='supplier_proposal'){ else
{
$element = 'supplier_proposal'; $element = 'supplier_proposal';
$subelement = 'supplier_proposal'; $subelement = 'supplier_proposal';
} }
else {
$element = 'comm/askpricesupplier';
$subelement = 'askpricesupplier';
}
$object->origin = $origin; $object->origin = $origin;
$object->origin_id = $originid; $object->origin_id = $originid;
@ -1056,11 +1055,17 @@ if (empty($reshook))
} }
$result = $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);
if ($result>0) { if ($result>0)
$productsupplier->fetch($productsupplier->id); {
$tva_tx = $lines[$i]->tva_tx;
if ($origin=="commande")
{
$soc=new societe($db); $soc=new societe($db);
$soc->fetch($socid); $soc->fetch($socid);
$tva_tx=($origin=="commande")?get_default_tva($soc,$mysoc,$lines[$i]->fk_product,$idprod):$lines[$i]->tva_tx; $tva_tx=get_default_tva($soc, $mysoc, $lines[$i]->fk_product, $productsupplier->product_fourn_price_id);
}
$result = $object->addline( $result = $object->addline(
$desc, $desc,
$lines[$i]->subprice, $lines[$i]->subprice,
@ -1070,7 +1075,7 @@ if (empty($reshook))
$lines[$i]->localtax2_tx, $lines[$i]->localtax2_tx,
$lines[$i]->fk_product, $lines[$i]->fk_product,
$productsupplier->product_fourn_price_id, $productsupplier->product_fourn_price_id,
$productsupplier->ref_fourn, $productsupplier->ref_supplier,
$lines[$i]->remise_percent, $lines[$i]->remise_percent,
'HT', 'HT',
0, 0,