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

handle customer orders from supplier orders with id variable name correction

Browse Source 
Conflicts:
	htdocs/fourn/commande/card.php
This commit is contained in:
abb 2016-02-14 00:20:25 +01:00
parent 83b297a9b2
commit 5e2261c9bd
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -941,9 +941,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;
@ -1004,17 +1012,16 @@ 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); $idprod = $productsupplier->find_min_price_product_fournisseur($lines[$i]->fk_product, $lines[$i]->qty);
/*if ($productsupplier->id > 0) $res = $productsupplier->fetch($idprod);
{ $soc=new societe($db);
$res = $productsupplier->fetch($productsupplier->id); $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,