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

Merge pull request #4686 from bafbes/abb-10

Browse Source 
New + Fix : handle supplier orders from customer orders with id variable name correction
This commit is contained in:
Laurent Destailleur 2016-05-05 20:07:42 +02:00
commit 8a8e7cdf5e
1 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -984,9 +984,17 @@ 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))
{ {
$element = 'supplier_proposal'; if ($origin == 'order' || $origin == 'commande') {
$subelement = 'supplier_proposal'; $element = $subelement = 'commande';
}
elseif ($origin =='supplier_proposal'){
$element = '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;
@ -1047,34 +1055,34 @@ if (empty($reshook))
$array_option = $lines[$i]->array_options; $array_option = $lines[$i]->array_options;
} }
$res = $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 ($productsupplier->id > 0) if ($result>0) {
{ $productsupplier->fetch($productsupplier->id);
$res = $productsupplier->fetch($productsupplier->id); $soc=new societe($db);
}*/ $soc->fetch($socid);
$tva_tx=($origin=="commande")?get_default_tva($soc,$mysoc,$lines[$i]->fk_product,$idprod):$lines[$i]->tva_tx;
$result = $object->addline( $result = $object->addline(
$desc, $desc,
$lines[$i]->subprice, $lines[$i]->subprice,
$lines[$i]->qty, $lines[$i]->qty,
$lines[$i]->tva_tx, $tva_tx,
$lines[$i]->localtax1_tx, $lines[$i]->localtax1_tx,
$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_fourn,
$lines[$i]->remise_percent, $lines[$i]->remise_percent,
'HT', 'HT',
0, 0,
$lines[$i]->product_type, $lines[$i]->product_type,
'', '',
'', '',
null, null,
null, null,
array(), array(),
$lines[$i]->fk_unit $lines[$i]->fk_unit
); );
}
if ($result < 0) { if ($result < 0) {
$error++; $error++;
break; break;