From 2b4fa0374784feafa3f49e7eb3cf877a71742dc3 Mon Sep 17 00:00:00 2001 From: Luca Date: Thu, 14 Feb 2019 18:30:41 +0100 Subject: [PATCH] Piccole migliorie --- include/common/riga.php | 2 +- templates/registro_iva/pdfgen.registro_iva.php | 12 ++++++------ templates/registro_iva/registroiva_body.html | 7 ++----- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/include/common/riga.php b/include/common/riga.php index 4a96a96dc..115a65f91 100644 --- a/include/common/riga.php +++ b/include/common/riga.php @@ -81,7 +81,7 @@ echo ' // Sconto unitario echo '
- {[ "type": "number", "label": "'.tr('Sconto unitario').'", "name": "sconto", "value": "'.$result['sconto_unitario'].'", "icon-after": "choice|untprc|'.$result['tipo_sconto'].'" ]} + {[ "type": "number", "label": "'.tr('Sconto unitario').'", "name": "sconto", "value": "'.$result['sconto_unitario'].'", "icon-after": "choice|untprc|'.$result['tipo_sconto'].'", "help": "'.tr('Il valore positivo indica uno sconto. Per applicare un rincaro inserire un valore negativo.').'" ]}
'; diff --git a/templates/registro_iva/pdfgen.registro_iva.php b/templates/registro_iva/pdfgen.registro_iva.php index b6a681aa4..a9f09036d 100644 --- a/templates/registro_iva/pdfgen.registro_iva.php +++ b/templates/registro_iva/pdfgen.registro_iva.php @@ -48,12 +48,12 @@ $query = 'SELECT *, SUM(subtotale-co_righe_documenti.sconto) AS subtotale, SUM(i $rs = $dbo->fetchArray($query); if ('entrata' == $dir) { - $body .= "".tr('Registro iva vendita dal _START_ al _END_', [ + $body .= "".tr('Registro iva vendita dal _START_ al _END_', [ '_START_' => Translator::dateToLocale($date_start), '_END_' => Translator::dateToLocale($date_end), ], ['upper' => true]).'

'; } elseif ('uscita' == $dir) { - $body .= "".tr('Registro iva acquisto dal _START_ al _END_', [ + $body .= "".tr('Registro iva acquisto dal _START_ al _END_', [ '_START_' => Translator::dateToLocale($date_start), '_END_' => Translator::dateToLocale($date_end), ], ['upper' => true]).'

'; @@ -80,9 +80,9 @@ for ($i = 0; $i < sizeof($rs); ++$i) { $body .= ''; if ($rs[$i]['numero'] == $rs[$i - 1]['numero']) { - $body .= " "; - $body .= " "; - $body .= " "; + $body .= " - "; + $body .= " - "; + $body .= " - "; } else { $body .= " ".$rs[$i]['numero'].''; $body .= " ".$rs[$i]['numero_esterno'].''; @@ -108,7 +108,7 @@ $body .= ' '; -$body .= "

RIEPILOGO IVA

"; +$body .= "

RIEPILOGO IVA

"; $body .= " diff --git a/templates/registro_iva/registroiva_body.html b/templates/registro_iva/registroiva_body.html index 3fb65d993..e0873d30e 100644 --- a/templates/registro_iva/registroiva_body.html +++ b/templates/registro_iva/registroiva_body.html @@ -4,10 +4,7 @@
- - $f_ragionesociale$ -

- $f_indirizzo$ + $f_ragionesociale$

$f_indirizzo$ $f_citta$ $f_piva$ $f_codicefiscale$ @@ -22,4 +19,4 @@


- + \ No newline at end of file