|
@@ -4,7 +4,7 @@
|
|
|
* Copyright (C) 2017 Pierre-Henry Favre <support@atm-consulting.fr>
|
|
|
* Copyright (C) 2020 Maxime DEMAREST <maxime@indelog.fr>
|
|
|
* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
|
|
|
- * Copyright (C) 2022 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
|
|
+ * Copyright (C) 2022-2024 Alexandre Spangaro <aspangaro@easya.solutions>
|
|
|
*
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
@@ -734,18 +734,18 @@ if (!empty($date_start) && !empty($date_stop)) {
|
|
|
print_liste_field_titre($arrayfields['date']['label'], $_SERVER["PHP_SELF"], "date", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
|
|
|
print_liste_field_titre($arrayfields['date_due']['label'], $_SERVER["PHP_SELF"], "date_due", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
|
|
|
print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'nowraponall ');
|
|
|
- print '<td>'.$langs->trans("Document").'</td>';
|
|
|
- print '<td>'.$langs->trans("Paid").'</td>';
|
|
|
- print '<td align="right">'.$langs->trans("TotalHT").(isModEnabled('multicurrency') ? ' ('.$langs->getCurrencySymbol($conf->currency).')' : '').'</td>';
|
|
|
- print '<td align="right">'.$langs->trans("TotalTTC").(isModEnabled('multicurrency') ? ' ('.$langs->getCurrencySymbol($conf->currency).')' : '').'</td>';
|
|
|
- print '<td align="right">'.$langs->trans("TotalVAT").(isModEnabled('multicurrency') ? ' ('.$langs->getCurrencySymbol($conf->currency).')' : '').'</td>';
|
|
|
-
|
|
|
- print '<td>'.$langs->trans("ThirdParty").'</td>';
|
|
|
- print '<td class="center">'.$langs->trans("Code").'</td>';
|
|
|
- print '<td class="center">'.$langs->trans("Country").'</td>';
|
|
|
- print '<td class="center">'.$langs->trans("VATIntra").'</td>';
|
|
|
+ print '<th>'.$langs->trans("Document").'</th>';
|
|
|
+ print '<th>'.$langs->trans("Paid").'</th>';
|
|
|
+ print '<th class="right">'.$langs->trans("TotalHT").(isModEnabled('multicurrency') ? ' ('.$langs->getCurrencySymbol($conf->currency).')' : '').'</th>';
|
|
|
+ print '<th class="right">'.$langs->trans("TotalTTC").(isModEnabled('multicurrency') ? ' ('.$langs->getCurrencySymbol($conf->currency).')' : '').'</th>';
|
|
|
+ print '<th class="right">'.$langs->trans("TotalVAT").(isModEnabled('multicurrency') ? ' ('.$langs->getCurrencySymbol($conf->currency).')' : '').'</th>';
|
|
|
+
|
|
|
+ print '<th>'.$langs->trans("ThirdParty").'</th>';
|
|
|
+ print '<th class="center">'.$langs->trans("Code").'</th>';
|
|
|
+ print '<th class="center">'.$langs->trans("Country").'</th>';
|
|
|
+ print '<th class="center">'.$langs->trans("VATIntra").'</th>';
|
|
|
if (isModEnabled('multicurrency')) {
|
|
|
- print '<td class="center">'.$langs->trans("Currency").'</td>';
|
|
|
+ print '<th class="center">'.$langs->trans("Currency").'</th>';
|
|
|
}
|
|
|
print '</tr>';
|
|
|
|
|
@@ -862,9 +862,9 @@ if (!empty($date_start) && !empty($date_stop)) {
|
|
|
print '<td class="center">'.($data['paid'] ? yn($data['paid']) : '').'</td>';
|
|
|
|
|
|
// Total WOT
|
|
|
- print '<td align="right"><span class="amount">'.price(price2num($data['sens'] ? $data['amount_ht'] : -$data['amount_ht'], 'MT'))."</span></td>\n";
|
|
|
+ print '<td class="right"><span class="amount">'.price(price2num($data['sens'] ? $data['amount_ht'] : -$data['amount_ht'], 'MT'))."</span></td>\n";
|
|
|
// Total INCT
|
|
|
- print '<td align="right"><span class="amount">';
|
|
|
+ print '<td class="right"><span class="amount">';
|
|
|
$tooltip = $langs->trans("TotalVAT").' : '.price(price2num($data['sens'] ? $data['amount_vat'] : -$data['amount_vat'], 'MT'));
|
|
|
if (!empty($data['amount_localtax1'])) {
|
|
|
$tooltip .= '<br>'.$langs->transcountrynoentities("TotalLT1", $mysoc->country_code).' : '.price(price2num($data['sens'] ? $data['amount_localtax1'] : -$data['amount_localtax1'], 'MT'));
|
|
@@ -878,7 +878,7 @@ if (!empty($date_start) && !empty($date_stop)) {
|
|
|
print '<span class="classfortooltip" title="'.dol_escape_htmltag($tooltip).'">'.price(price2num($data['sens'] ? $data['amount_ttc'] : -$data['amount_ttc'], 'MT')).'</span>';
|
|
|
print "</span></td>\n";
|
|
|
// Total VAT
|
|
|
- print '<td align="right"><span class="amount">'.price(price2num($data['sens'] ? $data['amount_vat'] : -$data['amount_vat'], 'MT'))."</span></td>\n";
|
|
|
+ print '<td class="right"><span class="amount">'.price(price2num($data['sens'] ? $data['amount_vat'] : -$data['amount_vat'], 'MT'))."</span></td>\n";
|
|
|
|
|
|
print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($data['thirdparty_name']).'">'.dol_escape_htmltag($data['thirdparty_name'])."</td>\n";
|
|
|
|
|
@@ -909,9 +909,9 @@ if (!empty($date_start) && !empty($date_stop)) {
|
|
|
// Total credits
|
|
|
print '<tr class="liste_total">';
|
|
|
print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Income').'</td>';
|
|
|
- print '<td align="right">'.price(price2num($totalET_credit, 'MT')).'</td>';
|
|
|
- print '<td align="right">'.price(price2num($totalIT_credit, 'MT')).'</td>';
|
|
|
- print '<td align="right">'.price(price2num($totalVAT_credit, 'MT')).'</td>';
|
|
|
+ print '<td class="right">'.price(price2num($totalET_credit, 'MT')).'</td>';
|
|
|
+ print '<td class="right">'.price(price2num($totalIT_credit, 'MT')).'</td>';
|
|
|
+ print '<td class="right">'.price(price2num($totalVAT_credit, 'MT')).'</td>';
|
|
|
print '<td colspan="4"></td>';
|
|
|
if (isModEnabled('multicurrency')) {
|
|
|
print '<td></td>';
|
|
@@ -920,9 +920,9 @@ if (!empty($date_start) && !empty($date_stop)) {
|
|
|
// Total debits
|
|
|
print '<tr class="liste_total">';
|
|
|
print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Outcome').'</td>';
|
|
|
- print '<td align="right">'.price(price2num($totalET_debit, 'MT')).'</td>';
|
|
|
- print '<td align="right">'.price(price2num($totalIT_debit, 'MT')).'</td>';
|
|
|
- print '<td align="right">'.price(price2num($totalVAT_debit, 'MT')).'</td>';
|
|
|
+ print '<td class="right">'.price(price2num($totalET_debit, 'MT')).'</td>';
|
|
|
+ print '<td class="right">'.price(price2num($totalIT_debit, 'MT')).'</td>';
|
|
|
+ print '<td class="right">'.price(price2num($totalVAT_debit, 'MT')).'</td>';
|
|
|
print '<td colspan="4"></td>';
|
|
|
if (isModEnabled('multicurrency')) {
|
|
|
print '<td></td>';
|
|
@@ -931,9 +931,9 @@ if (!empty($date_start) && !empty($date_stop)) {
|
|
|
// Balance
|
|
|
print '<tr class="liste_total">';
|
|
|
print '<td colspan="6" class="right">'.$langs->trans('Total').'</td>';
|
|
|
- print '<td align="right">'.price(price2num($totalET_credit + $totalET_debit, 'MT')).'</td>';
|
|
|
- print '<td align="right">'.price(price2num($totalIT_credit + $totalIT_debit, 'MT')).'</td>';
|
|
|
- print '<td align="right">'.price(price2num($totalVAT_credit + $totalVAT_debit, 'MT')).'</td>';
|
|
|
+ print '<td class="right">'.price(price2num($totalET_credit + $totalET_debit, 'MT')).'</td>';
|
|
|
+ print '<td class="right">'.price(price2num($totalIT_credit + $totalIT_debit, 'MT')).'</td>';
|
|
|
+ print '<td class="right">'.price(price2num($totalVAT_credit + $totalVAT_debit, 'MT')).'</td>';
|
|
|
print '<td colspan="4"></td>';
|
|
|
if (isModEnabled('multicurrency')) {
|
|
|
print '<td></td>';
|