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

Fix totale consuntivi su preventivi e contratti

This commit is contained in:
loviuz 2019-09-06 15:08:31 +02:00
parent 8094d7d77d
commit 2994279dbe
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/contratti/plugins/contratti.consuntivo.php
View File

@ -105,10 +105,10 @@ if (!empty($rsi)) {
<th width="230">'.tr('Tipo attività').'</th>
<th width="120">'.tr('Ore').'</th>
<th width="120">'.tr('Km').'</th>
<th width="120">'.tr('Costo orario').'</th>
<th width="120">'.tr('Costo ore').'</th>
<th width="120">'.tr('Costo km').'</th>
<th width="120">'.tr('Diritto ch.').'</th>
<th width="120">'.tr('Costo addebitato').'</th>
<th width="120">'.tr('Prezzo ore').'</th>
<th width="120">'.tr('Prezzo km').'</th>
<th width="120">'.tr('Diritto ch.').'</th>
</tr>';
@ -215,9 +215,9 @@ if (!empty($rsi)) {
$totale_ore_interventi += $int['ore'];
$totale_ore_completate += !empty($int['completato']) ? $int['ore'] : 0;
$totale_km += $int['km'];
$totale_costo += $int['totale_costo'];
$totale_addebito += $int['totale_addebito'];
$totale += $int['totale_scontato'];
$totale_costo += $intervento->spesa;
$totale_addebito += $intervento->imponibile;
$totale += $intervento->totale_imponibile;
}
// Totali

10
modules/preventivi/plugins/preventivi.consuntivo.php
View File

@ -92,10 +92,10 @@ if (!empty($rsi)) {
<th width="230">'.tr('Tipo attività').'</th>
<th width="120">'.tr('Ore').'</th>
<th width="120">'.tr('Km').'</th>
<th width="120">'.tr('Costo orario').'</th>
<th width="120">'.tr('Costo ore').'</th>
<th width="120">'.tr('Costo km').'</th>
<th width="120">'.tr('Diritto ch.').'</th>
<th width="120">'.tr('Prezzo orario').'</th>
<th width="120">'.tr('Prezzo ore').'</th>
<th width="120">'.tr('Prezzo km').'</th>
<th width="120">'.tr('Diritto ch.').'</th>
</tr>';
@ -201,9 +201,9 @@ if (!empty($rsi)) {
$totale_ore += $int['ore'];
$totale_km += $int['km'];
$totale_costo += $int['totale_costo'];
$totale_addebito += $int['totale_addebito'];
$totale += $int['totale_scontato'];
$totale_costo += $intervento->spesa;
$totale_addebito += $intervento->imponibile;
$totale += $intervento->totale_imponibile;
}
// Totali