1
0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-02-23 06:47:40 +01:00

Piccole migliorie

This commit is contained in:
Luca 2019-02-14 18:30:41 +01:00
parent 0ef7f7ad09
commit 2b4fa03747
3 changed files with 9 additions and 12 deletions

View File

@ -81,7 +81,7 @@ echo '
// Sconto unitario // Sconto unitario
echo ' echo '
<div class="col-md-'.$width.'"> <div class="col-md-'.$width.'">
{[ "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.').'" ]}
</div> </div>
</div>'; </div>';

View File

@ -48,12 +48,12 @@ $query = 'SELECT *, SUM(subtotale-co_righe_documenti.sconto) AS subtotale, SUM(i
$rs = $dbo->fetchArray($query); $rs = $dbo->fetchArray($query);
if ('entrata' == $dir) { if ('entrata' == $dir) {
$body .= "<span style='font-size:15pt; margin-left:6px;'><b>".tr('Registro iva vendita dal _START_ al _END_', [ $body .= "<span style='font-size:15pt;'><b>".tr('Registro iva vendita dal _START_ al _END_', [
'_START_' => Translator::dateToLocale($date_start), '_START_' => Translator::dateToLocale($date_start),
'_END_' => Translator::dateToLocale($date_end), '_END_' => Translator::dateToLocale($date_end),
], ['upper' => true]).'</b></span><br><br>'; ], ['upper' => true]).'</b></span><br><br>';
} elseif ('uscita' == $dir) { } elseif ('uscita' == $dir) {
$body .= "<span style='font-size:15pt; margin-left:6px;'><b>".tr('Registro iva acquisto dal _START_ al _END_', [ $body .= "<span style='font-size:15pt;'><b>".tr('Registro iva acquisto dal _START_ al _END_', [
'_START_' => Translator::dateToLocale($date_start), '_START_' => Translator::dateToLocale($date_start),
'_END_' => Translator::dateToLocale($date_end), '_END_' => Translator::dateToLocale($date_end),
], ['upper' => true]).'</b></span><br><br>'; ], ['upper' => true]).'</b></span><br><br>';
@ -80,9 +80,9 @@ for ($i = 0; $i < sizeof($rs); ++$i) {
$body .= '<tr>'; $body .= '<tr>';
if ($rs[$i]['numero'] == $rs[$i - 1]['numero']) { if ($rs[$i]['numero'] == $rs[$i - 1]['numero']) {
$body .= " <td class='first_cell cell-padded text-center'></td>"; $body .= " <td class='first_cell cell-padded text-center'> - </td>";
$body .= " <td class='table_cell cell-padded text-center'></td>"; $body .= " <td class='table_cell cell-padded text-center'> - </td>";
$body .= " <td class='table_cell cell-padded text-center'></td>"; $body .= " <td class='table_cell cell-padded text-center'> - </td>";
} else { } else {
$body .= " <td class='first_cell cell-padded text-center'>".$rs[$i]['numero'].'</td>'; $body .= " <td class='first_cell cell-padded text-center'>".$rs[$i]['numero'].'</td>';
$body .= " <td class='table_cell cell-padded text-center'>".$rs[$i]['numero_esterno'].'</td>'; $body .= " <td class='table_cell cell-padded text-center'>".$rs[$i]['numero_esterno'].'</td>';
@ -108,7 +108,7 @@ $body .= '
</table> </table>
'; ';
$body .= "<br><br><span style='font-size:12pt; margin-left:6px;'><b>RIEPILOGO IVA</b></span><br><br>"; $body .= "<br><br><span style='font-size:12pt;'><b>RIEPILOGO IVA</b></span><br><br>";
$body .= " $body .= "
<table cellspacing='0' style='table-layout:fixed;'> <table cellspacing='0' style='table-layout:fixed;'>

View File

@ -4,10 +4,7 @@
<table> <table>
<tr> <tr>
<td style="width:215mm;" align="left"> <td style="width:215mm;" align="left">
<big> <big><big><big><b>$f_ragionesociale$</b></big></big><p style="margin-left:4px; font-size:11px; line-height:12px;">$f_indirizzo$
<big><big><b>$f_ragionesociale$</b></big></big>
<p style="margin-left:4px; font-size:11px; line-height:12px;">
$f_indirizzo$
$f_citta$ $f_citta$
$f_piva$ $f_piva$
$f_codicefiscale$ $f_codicefiscale$
@ -22,4 +19,4 @@
</tr> </tr>
</table> </table>
<br> <br>
</page_header> </page_header>