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

Merge branch 'master' of https://github.com/devcode-it/openstamanager

This commit is contained in:
Luca 2021-10-29 11:05:07 +02:00
parent bfe189683a 457123c625
commit fcb4becd4c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -76,7 +76,6 @@ package-lock.json
assets/dist/
backup/*
!backup/.htaccess
custom/
files/*
!files/.htaccess
!files/impianti/

4
modules/articoli/plugins/articoli.lotti.php
View File

@ -176,7 +176,7 @@ for ($i = 0; $i < count($rs2); ++$i) {
$id = $data[0]['idordine'];
}
$totali[] = [($data[0]['prezzo_unitario']-$data[0]['sconto_unitario']), $data[0]['iva']];
$totali[] = [($data[0]['prezzo_unitario']-$data[0]['sconto_unitario']), $data[0]['iva_unitaria']];
$numero = !empty($data[0]['numero_esterno']) ? $data[0]['numero_esterno'] : $data[0]['numero'];
@ -278,7 +278,7 @@ for ($i = 0; $i < count($rs2); ++$i) {
]);
}
$totali[] = [($data[0]['prezzo_unitario']-$data[0]['sconto_unitario']), $data[0]['iva']];
$totali[] = [($data[0]['prezzo_unitario']-$data[0]['sconto_unitario']), $data[0]['iva_unitaria']];
$numero = !empty($data[0]['numero_esterno']) ? $data[0]['numero_esterno'] : $data[0]['numero'];