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

FIX add object linked supplier order of reception

Browse Source
This commit is contained in:
atm-quentin 2018-10-18 10:26:32 +02:00
parent 8ef7c29d19
commit eeb75bf650
2 changed files with 54 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
htdocs/fourn/facture/card.php
View File

@ -653,6 +653,27 @@ if (empty($reshook))
$object->origin = GETPOST('origin'); $object->origin = GETPOST('origin');
$object->origin_id = GETPOST('originid'); $object->origin_id = GETPOST('originid');
require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';
$classname = ucfirst($subelement);
if ($classname == 'Fournisseur.commande') $classname='CommandeFournisseur';
$objectsrc = new $classname($db);
$objectsrc->fetch($originid);
$objectsrc->fetch_thirdparty();
if ($object->origin == 'reception')
{
$objectsrc->fetchObjectLinked();
if (count($objectsrc->linkedObjectsIds['order_supplier']) > 0)
{
foreach ($objectsrc->linkedObjectsIds['order_supplier'] as $key => $value)
{
$object->linked_objects['order_supplier'] = $value;
}
}
}
$id = $object->create($user); $id = $object->create($user);
// Add lines // Add lines
@ -1412,17 +1433,7 @@ if ($action == 'create')
$objectsrc->fetch($originid); $objectsrc->fetch($originid);
$objectsrc->fetch_thirdparty(); $objectsrc->fetch_thirdparty();
if ($object->origin == 'reception')
{
$objectsrc->fetchObjectLinked();
if (count($objectsrc->linkedObjectsIds['commande']) > 0)
{
foreach ($objectsrc->linkedObjectsIds['commande'] as $key => $value)
{
$object->linked_objects['commande'] = $value;
}
}
}
$projectid = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:''); $projectid = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
//$ref_client = (!empty($objectsrc->ref_client)?$object->ref_client:''); //$ref_client = (!empty($objectsrc->ref_client)?$object->ref_client:'');

33
htdocs/reception/list.php
View File

@ -178,15 +178,35 @@ if (empty($reshook))
} }
$object = new FactureFournisseur($db); $object = new FactureFournisseur($db);
if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])) $object = $TFactThird[$rcp->socid]; // If option "one bill per third" is set, we use already created reception. if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])){
$object = $TFactThird[$rcp->socid]; // If option "one bill per third" is set, we use already created reception.
$object->fetchObjectLinked();
$rcp->fetchObjectLinked();
if (count($rcp->linkedObjectsIds['order_supplier']) > 0)
{
foreach ($rcp->linkedObjectsIds['order_supplier'] as $key => $value)
{
if(empty($object->linkedObjectsIds['order_supplier']) || !in_array($value, $object->linkedObjectsIds['order_supplier']))//Dont try to link if already linked
$object->add_object_linked('order_supplier', $value); // add supplier order linked object
}
}
}
else { else {
$object->socid = $rcp->socid; $object->socid = $rcp->socid;
$object->type = FactureFournisseur::TYPE_STANDARD; $object->type = FactureFournisseur::TYPE_STANDARD;
$object->cond_reglement_id = $rcp->thirdparty->cond_reglement_supplier_id; $object->cond_reglement_id = $rcp->thirdparty->cond_reglement_supplier_id;
$object->mode_reglement_id = $rcp->thirdparty->mode_reglement_supplier_id; $object->mode_reglement_id = $rcp->thirdparty->mode_reglement_supplier_id;
$object->fk_account = !empty($rcp->thirdparty->fk_account)?$rcp->thirdparty->fk_account:0;
$object->remise_percent = !empty($rcp->thirdparty->remise_percent)?$rcp->thirdparty->remise_percent:0;
$object->remise_absolue = !empty($rcp->thirdparty->remise_absolue)?$rcp->thirdparty->remise_absolue:0;
$object->fk_project = $rcp->fk_project; $object->fk_project = $rcp->fk_project;
$object->ref_supplier = $rcp->ref_supplier; $object->ref_supplier = $rcp->ref_supplier;
$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth'),GETPOST('reday'), GETPOST('reyear')); $datefacture = dol_mktime(12, 0, 0, GETPOST('remonth'),GETPOST('reday'), GETPOST('reyear'));
if (empty($datefacture)) if (empty($datefacture))
@ -198,6 +218,15 @@ if (empty($reshook))
$object->origin = 'reception'; $object->origin = 'reception';
$object->origin_id = $id_reception; $object->origin_id = $id_reception;
$rcp->fetchObjectLinked();
if (count($rcp->linkedObjectsIds['order_supplier']) > 0)
{
foreach ($rcp->linkedObjectsIds['order_supplier'] as $key => $value)
{
$object->linked_objects['order_supplier'] = $value;
}
}
$res = $object->create($user); $res = $object->create($user);
//var_dump($object->error);exit; //var_dump($object->error);exit;
if($res > 0){ if($res > 0){