loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Fix sconti non considerati in fattura

This commit is contained in:
Luca 2018-07-30 15:28:54 +02:00
parent 217a33c3d5
commit fb9a23c976
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
templates/fatture/body.php
View File

@ -59,10 +59,16 @@ foreach ($righe as $r) {
// Valori assoluti
$r['qta'] = abs($r['qta']);
if (empty($r['sconto_globale']))
$r['subtotale'] = abs($r['subtotale']);
else
$r['subtotale'] = ($r['subtotale']);
$r['sconto_unitario'] = abs($r['sconto_unitario']);
$r['sconto'] = abs($r['sconto']);
if (empty($r['sconto_globale']))
$r['iva'] = abs($r['iva']);
else
$r['iva'] = ($r['iva']);
echo '
<tr>
@ -183,25 +189,14 @@ foreach ($righe as $r) {
echo '
'.Translator::numberToLocale($r['perc_iva']);
}
echo '
</td>
</tr>';
$autofill['count'] += $count;
$imponibile = sum(array_column($righe, 'subtotale'));
$sconto = sum(array_column($righe, 'sconto'));
$iva = sum(array_column($righe, 'iva'));
echo "ciao".$sconto;
$v_iva[$r['desc_iva']] = sum($v_iva[$r['desc_iva']], $iva);
$v_iva[$r['desc_iva']] = sum($v_iva[$r['desc_iva']], $r['iva']);
$v_totale[$r['desc_iva']] = sum($v_totale[$r['desc_iva']], [
$imponibile, -$sconto
$r['subtotale'], -$r['sconto'],
]);
}
@ -280,9 +275,9 @@ echo '
// Calcoli
//$imponibile = sum(array_column($righe, 'subtotale'));
//$sconto = sum(array_column($righe, 'sconto'));
//$iva = sum(array_column($righe, 'iva'));
$imponibile = sum(array_column($righe, 'subtotale'));
$sconto = sum(array_column($righe, 'sconto'));
$iva = sum(array_column($righe, 'iva'));
$imponibile_scontato = sum($imponibile, -$sconto);

2
templates/fatture/footer.php
View File

@ -149,7 +149,7 @@ if (!empty($sconto)) {
echo "
<td class='cell-padded text-center'>
".Translator::numberToLocale($iva)." &euro;
".Translator::numberToLocale($totale_iva)." &euro;
</td>
<td class='cell-padded text-center'>