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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dasc3er 2020-10-12 16:40:26 +02:00
parent d984c5d184 3d15e44b85
commit 48ae5388d6
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
templates/barcode/body.php
View File

@ -31,16 +31,11 @@ echo '<style>
}
</style>';
$width_factor = 0.33 * 110;
$height_factor = 25.93;
$size = $settings['width'] / $width_factor;
$height = $settings['height'] / $height_factor / $size;
$number = 1; // 32
for ($i = 0; $i < $number; ++$i) {
echo '
<div class="barcode-cell">
<barcode code="'.$articolo->barcode.'" type="EAN13" height="'.$height.'" size="'.$size.'" class="barcode" />
<barcode code="'.$articolo->barcode.'" type="C39" height="2" size="0.65" class="barcode" />
<p><b>'.$articolo->barcode.'</b></p>
</div>';
}

6
templates/registro_iva/init.php
View File

@ -35,9 +35,9 @@ $v_totale = [];
$query = 'SELECT *,
co_movimenti.id AS idmovimenti, co_documenti.id AS id,
IF(numero = "", numero_esterno, numero) AS numero,
(SELECT SUM(subtotale - sconto) FROM co_righe_documenti WHERE co_righe_documenti.iddocumento=co_documenti.id GROUP BY iddocumento) AS subtotale,
(SELECT SUM(subtotale - sconto + iva + rivalsainps - ritenutaacconto) FROM co_righe_documenti WHERE co_righe_documenti.iddocumento=co_documenti.id GROUP BY iddocumento) + co_documenti.iva_rivalsainps AS totale,
(SELECT SUM(iva) FROM co_righe_documenti WHERE co_righe_documenti.iddocumento=co_documenti.id GROUP BY iddocumento) + co_documenti.iva_rivalsainps AS iva,
(SELECT SUM(subtotale - sconto) FROM co_righe_documenti AS righe2 WHERE righe2.iddocumento=co_documenti.id AND righe2.idiva=co_righe_documenti.idiva GROUP BY iddocumento) AS subtotale,
(SELECT SUM(subtotale - sconto + iva + rivalsainps - ritenutaacconto) FROM co_righe_documenti AS righe2 WHERE righe2.iddocumento=co_documenti.id AND righe2.idiva=co_righe_documenti.idiva GROUP BY iddocumento) + co_documenti.iva_rivalsainps AS totale,
(SELECT SUM(iva) FROM co_righe_documenti AS righe2 WHERE righe2.iddocumento=co_documenti.id AND righe2.idiva=co_righe_documenti.idiva GROUP BY iddocumento) + co_documenti.iva_rivalsainps AS iva,
an_anagrafiche.ragione_sociale,
an_anagrafiche.codice AS codice_anagrafica
FROM co_movimenti