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

Merge pull request #12244 from TobiasSekan/FixInvoiceSupplierCountArray

Browse Source 
Fix count array for invoice supplier
This commit is contained in:
Laurent Destailleur 2019-10-30 02:51:06 +01:00 committed by GitHub
commit 7e4ceeb08a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2085,12 +2085,21 @@ if ($action == 'create')
print '<tr><td>'.$txt.'</td><td>'.$objectsrc->getNomUrl(1); print '<tr><td>'.$txt.'</td><td>'.$objectsrc->getNomUrl(1);
// We check if Origin document (id and type is known) has already at least one invoice attached to it // We check if Origin document (id and type is known) has already at least one invoice attached to it
$objectsrc->fetchObjectLinked($originid, $origin, '', 'invoice_supplier'); $objectsrc->fetchObjectLinked($originid, $origin, '', 'invoice_supplier');
$cntinvoice=count($objectsrc->linkedObjects['invoice_supplier']);
if ($cntinvoice>=1) $invoice_supplier = $objectsrc->linkedObjects['invoice_supplier'];
// count function need a array as argument (Note: the array must implement Countable too)
if(is_array($invoice_supplier))
{ {
setEventMessages('WarningBillExist', null, 'warnings'); $cntinvoice = count($invoice_supplier);
echo ' ('.$langs->trans('LatestRelatedBill').end($objectsrc->linkedObjects['invoice_supplier'])->getNomUrl(1).')';
if ($cntinvoice >= 1)
{
setEventMessages('WarningBillExist', null, 'warnings');
echo ' ('.$langs->trans('LatestRelatedBill').end($invoice_supplier)->getNomUrl(1).')';
}
} }
echo '</td></tr>'; echo '</td></tr>';
print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($objectsrc->total_ht).'</td></tr>'; print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($objectsrc->total_ht).'</td></tr>';
print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($objectsrc->total_tva)."</td></tr>"; print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($objectsrc->total_tva)."</td></tr>";