fix warnings
This commit is contained in:
parent
1933072712
commit
4138353d7f
@ -205,11 +205,11 @@ if ($id > 0 || !empty($ref)) {
|
|||||||
}
|
}
|
||||||
print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
|
print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
|
||||||
}
|
}
|
||||||
if ($facidnext > 0) {
|
//if ($facidnext > 0) {
|
||||||
$facthatreplace = new FactureFournisseur($db);
|
// $facthatreplace = new FactureFournisseur($db);
|
||||||
$facthatreplace->fetch($facidnext);
|
// $facthatreplace->fetch($facidnext);
|
||||||
print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
|
// print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
|
||||||
}
|
//}
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Label
|
// Label
|
||||||
@ -223,13 +223,13 @@ if ($id > 0 || !empty($ref)) {
|
|||||||
|
|
||||||
// Amount Local Taxes
|
// Amount Local Taxes
|
||||||
//TODO: Place into a function to control showing by country or study better option
|
//TODO: Place into a function to control showing by country or study better option
|
||||||
if ($societe->localtax1_assuj == "1") { //Localtax1
|
if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { //Localtax1
|
||||||
print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
|
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 '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
if ($societe->localtax2_assuj == "1") { //Localtax2
|
if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { //Localtax2
|
||||||
print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
|
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 '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user