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

Merge pull request #17902 from frederic34/patch-9

Browse Source 
fix warnings
This commit is contained in:
Laurent Destailleur 2021-06-13 16:16:21 +02:00 committed by GitHub
commit 6708800d54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/fourn/facture/contact.php
View File

@ -205,11 +205,11 @@ if ($id > 0 || !empty($ref)) {
}
print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
}
if ($facidnext > 0) {
$facthatreplace = new FactureFournisseur($db);
$facthatreplace->fetch($facidnext);
print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
}
//if ($facidnext > 0) {
// $facthatreplace = new FactureFournisseur($db);
// $facthatreplace->fetch($facidnext);
// print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
//}
print '</td></tr>';
// Label
@ -223,13 +223,13 @@ if ($id > 0 || !empty($ref)) {
// Amount Local Taxes
//TODO: Place into a function to control showing by country or study better option
if ($societe->localtax1_assuj == "1") { //Localtax1
print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { //Localtax1
print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
print '</tr>';
}
if ($societe->localtax2_assuj == "1") { //Localtax2
print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { //Localtax2
print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
print '</tr>';
}