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

Merge pull request #8504 from ATM-Nicolas/develop

Browse Source 
NEW : Add link between credit note invoice and origin
This commit is contained in:
Laurent Destailleur 2018-04-06 09:15:02 +02:00 committed by GitHub
commit e7d69b18bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/compta/facture/card.php
View File

@ -916,9 +916,9 @@ if (empty($reshook))
$id = $object->create($user); $id = $object->create($user);
$facture_source = new Facture($db); // fetch origin object
if (GETPOST('invoiceAvoirWithLines', 'int')==1 && $id>0) if (GETPOST('invoiceAvoirWithLines', 'int')==1 && $id>0)
{ {
$facture_source = new Facture($db); // fetch origin object
if ($facture_source->fetch($object->fk_facture_source)>0) if ($facture_source->fetch($object->fk_facture_source)>0)
{ {
$fk_parent_line = 0; $fk_parent_line = 0;
@ -969,7 +969,6 @@ if (empty($reshook))
if(GETPOST('invoiceAvoirWithPaymentRestAmount', 'int')==1 && $id>0) if(GETPOST('invoiceAvoirWithPaymentRestAmount', 'int')==1 && $id>0)
{ {
$facture_source = new Facture($db); // fetch origin object if not previously defined
if ($facture_source->fetch($object->fk_facture_source)>0) if ($facture_source->fetch($object->fk_facture_source)>0)
{ {
$totalpaye = $facture_source->getSommePaiement(); $totalpaye = $facture_source->getSommePaiement();
@ -980,6 +979,20 @@ if (empty($reshook))
$object->addline($langs->trans('invoiceAvoirLineWithPaymentRestAmount'),$remain_to_pay,1,0,0,0,0,0,'','','TTC'); $object->addline($langs->trans('invoiceAvoirLineWithPaymentRestAmount'),$remain_to_pay,1,0,0,0,0,0,'','','TTC');
} }
} }
// Add link between credit note and origin
if(! empty($object->fk_facture_source)) {
$facture_source->fetch($object->fk_facture_source);
}
$facture_source->fetchObjectLinked();
if(! empty($facture_source->linkedObjectsIds)) {
$linkedObjectIds = $facture_source->linkedObjectsIds;
$sourcetype = key($linkedObjectIds);
$fk_origin = current($facture_source->linkedObjectsIds[$sourcetype]);
$object->add_object_linked($sourcetype, $fk_origin);
}
} }
} }