lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: muticurrency columns: remove useless column totals that mix currencies together

Browse Source
This commit is contained in:
Marc de Lima Lucio 2020-02-27 17:37:36 +01:00
parent cdddccde16
commit 5d1f91f8ac
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/commande/list.php
View File

@ -1190,24 +1190,18 @@ if ($resql)
{ {
print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n"; print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.multicurrency_total_ht';
$totalarray['val']['c.multicurrency_total_ht'] += $obj->multicurrency_total_ht;
} }
// Amount VAT // Amount VAT
if (!empty($arrayfields['c.multicurrency_total_vat']['checked'])) if (!empty($arrayfields['c.multicurrency_total_vat']['checked']))
{ {
print '<td class="right nowrap">'.price($obj->multicurrency_total_vat)."</td>\n"; print '<td class="right nowrap">'.price($obj->multicurrency_total_vat)."</td>\n";
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.multicurrency_total_vat';
$totalarray['val']['c.multicurrency_total_vat'] += $obj->multicurrency_total_vat;
} }
// Amount TTC // Amount TTC
if (!empty($arrayfields['c.multicurrency_total_ttc']['checked'])) if (!empty($arrayfields['c.multicurrency_total_ttc']['checked']))
{ {
print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n"; print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n";
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.multicurrency_total_ttc';
$totalarray['val']['c.multicurrency_total_ttc'] += $obj->multicurrency_total_ttc;
} }
$userstatic->id = $obj->fk_user_author; $userstatic->id = $obj->fk_user_author;

10
htdocs/compta/facture/list.php
View File

@ -1419,31 +1419,23 @@ if ($resql)
{ {
print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n"; print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.multicurrency_total_ht';
$totalarray['val']['f.multicurrency_total_ht'] += $obj->multicurrency_total_ht;
} }
// Amount VAT // Amount VAT
if (!empty($arrayfields['f.multicurrency_total_vat']['checked'])) if (!empty($arrayfields['f.multicurrency_total_vat']['checked']))
{ {
print '<td class="right nowrap">'.price($obj->multicurrency_total_vat)."</td>\n"; print '<td class="right nowrap">'.price($obj->multicurrency_total_vat)."</td>\n";
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.multicurrency_total_vat';
$totalarray['val']['f.multicurrency_total_vat'] += $obj->multicurrency_total_vat;
} }
// Amount TTC // Amount TTC
if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) if (!empty($arrayfields['f.multicurrency_total_ttc']['checked']))
{ {
print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n"; print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n";
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.multicurrency_total_ttc';
$totalarray['val']['f.multicurrency_total_ttc'] += $obj->multicurrency_total_ttc;
} }
if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) if (!empty($arrayfields['multicurrency_dynamount_payed']['checked']))
{ {
print '<td class="right nowrap">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field print '<td class="right nowrap">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalam';
$totalarray['val']['multicurrency_totalam'] += $multicurrency_totalpay;
} }
// Pending amount // Pending amount
@ -1453,8 +1445,6 @@ if ($resql)
print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '&nbsp;'); print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '&nbsp;');
print '</td>'; // TODO Use a denormalized field print '</td>'; // TODO Use a denormalized field
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'multicurrency_rtp';
$totalarray['val']['multicurrency_rtp'] += $multicurrency_remaintopay;
} }
// Extra fields // Extra fields