FIX php8 compatibility
This commit is contained in:
parent
1ec7f640a7
commit
3bb1a2387b
@ -424,12 +424,12 @@ if ($socid > 0) {
|
|||||||
print '<td>'.$langs->trans("ReasonDiscount").'</td>';
|
print '<td>'.$langs->trans("ReasonDiscount").'</td>';
|
||||||
print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
|
print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
|
||||||
print '<td class="right">'.$langs->trans("AmountHT").'</td>';
|
print '<td class="right">'.$langs->trans("AmountHT").'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
|
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
|
||||||
}
|
}
|
||||||
print '<td class="right">'.$langs->trans("VATRate").'</td>';
|
print '<td class="right">'.$langs->trans("VATRate").'</td>';
|
||||||
print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
|
print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
|
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
|
||||||
}
|
}
|
||||||
print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
|
print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
|
||||||
@ -474,12 +474,12 @@ if ($socid > 0) {
|
|||||||
}
|
}
|
||||||
print '<td class="nowrap"><span class="opacitymedium">'.$langs->trans("NotConsumed").'</span></td>';
|
print '<td class="nowrap"><span class="opacitymedium">'.$langs->trans("NotConsumed").'</span></td>';
|
||||||
print '<td class="right amount">'.price($obj->amount_ht).'</td>';
|
print '<td class="right amount">'.price($obj->amount_ht).'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right amount">'.price($obj->multicurrency_amount_ht).'</td>';
|
print '<td class="right amount">'.price($obj->multicurrency_amount_ht).'</td>';
|
||||||
}
|
}
|
||||||
print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
|
print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
|
||||||
print '<td class="right amount">'.price($obj->amount_ttc).'</td>';
|
print '<td class="right amount">'.price($obj->amount_ttc).'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right amount">'.price($obj->multicurrency_amount_ttc).'</td>';
|
print '<td class="right amount">'.price($obj->multicurrency_amount_ttc).'</td>';
|
||||||
}
|
}
|
||||||
print '<td class="center">';
|
print '<td class="center">';
|
||||||
@ -503,7 +503,7 @@ if ($socid > 0) {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$colspan = 8;
|
$colspan = 8;
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
$colspan += 2;
|
$colspan += 2;
|
||||||
}
|
}
|
||||||
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
|
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
|
||||||
@ -562,12 +562,12 @@ if ($socid > 0) {
|
|||||||
print '<td>'.$langs->trans("ReasonDiscount").'</td>';
|
print '<td>'.$langs->trans("ReasonDiscount").'</td>';
|
||||||
print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
|
print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
|
||||||
print '<td class="right">'.$langs->trans("AmountHT").'</td>';
|
print '<td class="right">'.$langs->trans("AmountHT").'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
|
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
|
||||||
}
|
}
|
||||||
print '<td class="right">'.$langs->trans("VATRate").'</td>';
|
print '<td class="right">'.$langs->trans("VATRate").'</td>';
|
||||||
print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
|
print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
|
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
|
||||||
}
|
}
|
||||||
print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
|
print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
|
||||||
@ -612,12 +612,12 @@ if ($socid > 0) {
|
|||||||
}
|
}
|
||||||
print '<td class="nowrap"><span class="opacitymedium">'.$langs->trans("NotConsumed").'</span></td>';
|
print '<td class="nowrap"><span class="opacitymedium">'.$langs->trans("NotConsumed").'</span></td>';
|
||||||
print '<td class="right amount">'.price($obj->amount_ht).'</td>';
|
print '<td class="right amount">'.price($obj->amount_ht).'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right amount">'.price($obj->multicurrency_amount_ht).'</td>';
|
print '<td class="right amount">'.price($obj->multicurrency_amount_ht).'</td>';
|
||||||
}
|
}
|
||||||
print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
|
print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
|
||||||
print '<td class="right amount">'.price($obj->amount_ttc).'</td>';
|
print '<td class="right amount">'.price($obj->amount_ttc).'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right amount">'.price($obj->multicurrency_amount_ttc).'</td>';
|
print '<td class="right amount">'.price($obj->multicurrency_amount_ttc).'</td>';
|
||||||
}
|
}
|
||||||
print '<td class="center">';
|
print '<td class="center">';
|
||||||
@ -641,7 +641,7 @@ if ($socid > 0) {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$colspan = 8;
|
$colspan = 8;
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
$colspan += 2;
|
$colspan += 2;
|
||||||
}
|
}
|
||||||
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
|
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
|
||||||
@ -735,12 +735,12 @@ if ($socid > 0) {
|
|||||||
print '<td>'.$langs->trans("ReasonDiscount").'</td>';
|
print '<td>'.$langs->trans("ReasonDiscount").'</td>';
|
||||||
print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
|
print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
|
||||||
print '<td class="right">'.$langs->trans("AmountHT").'</td>';
|
print '<td class="right">'.$langs->trans("AmountHT").'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
|
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
|
||||||
}
|
}
|
||||||
print '<td class="right">'.$langs->trans("VATRate").'</td>';
|
print '<td class="right">'.$langs->trans("VATRate").'</td>';
|
||||||
print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
|
print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
|
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
|
||||||
}
|
}
|
||||||
print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
|
print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
|
||||||
@ -808,12 +808,12 @@ if ($socid > 0) {
|
|||||||
}
|
}
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '<td class="right">'.price($obj->amount_ht).'</td>';
|
print '<td class="right">'.price($obj->amount_ht).'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
|
print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
|
||||||
}
|
}
|
||||||
print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
|
print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
|
||||||
print '<td class="right">'.price($obj->amount_ttc).'</td>';
|
print '<td class="right">'.price($obj->amount_ttc).'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
|
print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
|
||||||
}
|
}
|
||||||
print '<td class="center">';
|
print '<td class="center">';
|
||||||
@ -825,7 +825,7 @@ if ($socid > 0) {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$colspan = 8;
|
$colspan = 8;
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
$colspan += 2;
|
$colspan += 2;
|
||||||
}
|
}
|
||||||
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
|
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
|
||||||
@ -896,12 +896,12 @@ if ($socid > 0) {
|
|||||||
print '<td>'.$langs->trans("ReasonDiscount").'</td>';
|
print '<td>'.$langs->trans("ReasonDiscount").'</td>';
|
||||||
print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
|
print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
|
||||||
print '<td class="right">'.$langs->trans("AmountHT").'</td>';
|
print '<td class="right">'.$langs->trans("AmountHT").'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right toverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
|
print '<td class="right toverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
|
||||||
}
|
}
|
||||||
print '<td class="right">'.$langs->trans("VATRate").'</td>';
|
print '<td class="right">'.$langs->trans("VATRate").'</td>';
|
||||||
print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
|
print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
|
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
|
||||||
}
|
}
|
||||||
print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
|
print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
|
||||||
@ -969,12 +969,12 @@ if ($socid > 0) {
|
|||||||
}
|
}
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '<td class="right">'.price($obj->amount_ht).'</td>';
|
print '<td class="right">'.price($obj->amount_ht).'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
|
print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
|
||||||
}
|
}
|
||||||
print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
|
print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
|
||||||
print '<td class="right">'.price($obj->amount_ttc).'</td>';
|
print '<td class="right">'.price($obj->amount_ttc).'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
|
print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
|
||||||
}
|
}
|
||||||
print '<td class="center">';
|
print '<td class="center">';
|
||||||
@ -986,7 +986,7 @@ if ($socid > 0) {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$colspan = 8;
|
$colspan = 8;
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
$colspan += 2;
|
$colspan += 2;
|
||||||
}
|
}
|
||||||
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
|
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user