Fix merge
This commit is contained in:
parent
dd06ff3a0d
commit
7ca9fd9dce
@ -59,7 +59,7 @@ if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier'
|
|||||||
}
|
}
|
||||||
|
|
||||||
// VAT
|
// 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)) {
|
if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FACTURE_LOCAL_TAX2_OPTION)) {
|
||||||
print $langs->trans('Taxes');
|
print $langs->trans('Taxes');
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user