Fix merge

This commit is contained in:
Laurent Destailleur 2020-09-14 03:49:31 +02:00
parent dd06ff3a0d
commit 7ca9fd9dce

View File

@ -59,7 +59,7 @@ if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier'
}
// VAT
print '<td class="linecolvat right" style="width: 80px">'
print '<td class="linecolvat right" style="width: 80px">';
if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FACTURE_LOCAL_TAX2_OPTION)) {
print $langs->trans('Taxes');
} else {