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

Aggiunta colonna immagine per stampa preventivi

This commit is contained in:
Luca 2020-05-18 17:18:56 +02:00
parent 8ef4916959
commit 4361787092
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
templates/preventivi/body.php
View File

@ -3,7 +3,7 @@
include_once __DIR__.'/../../core.php';
// Creazione righe fantasma
$autofill = new \Util\Autofill($options['pricing'] ? 5 : 2);
$autofill = new \Util\Autofill($options['pricing'] ? 6 : 3);
$autofill->setRows(20, 10);
echo '
@ -61,6 +61,7 @@ echo "
<table class='table table-striped table-bordered' id='contents'>
<thead>
<tr>
<th class='text-center'></th>
<th class='text-center' style='width:50%'>".tr('Descrizione', [], ['upper' => true])."</th>
<th class='text-center' style='width:10%'>".tr('Q.tà', [], ['upper' => true]).'</th>';
@ -85,7 +86,13 @@ foreach ($righe as $riga) {
$autofill->count($r['descrizione']);
echo '
<tr>
<tr>';
echo '<td>';
if (!empty($riga->articolo->immagine)) {echo '<img src="files/articoli/'.$riga->articolo->immagine.'" width="95" height="95">';}
echo '</td>';
echo '
<td style="vertical-align: middle">
'.nl2br($r['descrizione']);
@ -175,11 +182,11 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
// Totale imponibile
echo '
<tr>
<td colspan="'.($options['show_only_total'] ? 1 : 3).'" class="text-right border-top">
<td colspan="'.($options['show_only_total'] ? 2 : 4).'" class="text-right border-top">
<b>'.tr('Imponibile', [], ['upper' => true]).':</b>
</td>
<th colspan="'.($options['show_only_total'] ? 1 : 2).'" class="text-right">
<th colspan="'.($options['show_only_total'] ? 2 : 3).'" class="text-right">
<b>'.moneyFormat($show_sconto ? $imponibile : $totale_imponibile, 2).'</b>
</th>
</tr>';
@ -188,11 +195,11 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
if ($show_sconto) {
echo '
<tr>
<td colspan="'.($options['show_only_total'] ? 1 : 3).'" class="text-right border-top">
<td colspan="'.($options['show_only_total'] ? 2 : 4).'" class="text-right border-top">
<b>'.tr('Sconto', [], ['upper' => true]).':</b>
</td>
<th colspan="'.($options['show_only_total'] ? 1 : 2).'" class="text-right">
<th colspan="'.($options['show_only_total'] ? 2 : 3).'" class="text-right">
<b>'.moneyFormat($sconto, 2).'</b>
</th>
</tr>';
@ -200,11 +207,11 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
// Totale imponibile
echo '
<tr>
<td colspan="'.($options['show_only_total'] ? 1 : 3).'" class="text-right border-top">
<td colspan="'.($options['show_only_total'] ? 2 : 4).'" class="text-right border-top">
<b>'.tr('Totale imponibile', [], ['upper' => true]).':</b>
</td>
<th colspan="'.($options['show_only_total'] ? 1 : 2).'" class="text-right">
<th colspan="'.($options['show_only_total'] ? 2 : 3).'" class="text-right">
<b>'.moneyFormat($totale_imponibile, 2).'</b>
</th>
</tr>';
@ -213,11 +220,11 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
// IVA
echo '
<tr>
<td colspan="'.($options['show_only_total'] ? 1 : 3).'" class="text-right border-top">
<td colspan="'.($options['show_only_total'] ? 2 : 4).'" class="text-right border-top">
<b>'.tr('Totale IVA', [], ['upper' => true]).':</b>
</td>
<th colspan="'.($options['show_only_total'] ? 1 : 2).'" class="text-right">
<th colspan="'.($options['show_only_total'] ? 2 : 3).'" class="text-right">
<b>'.moneyFormat($totale_iva, 2).'</b>
</th>
</tr>';
@ -225,10 +232,10 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
// TOTALE
echo '
<tr>
<td colspan="'.($options['show_only_total'] ? 1 : 3).'" class="text-right border-top">
<td colspan="'.($options['show_only_total'] ? 2 : 4).'" class="text-right border-top">
<b>'.tr('Totale documento', [], ['upper' => true]).':</b>
</td>
<th colspan="'.($options['show_only_total'] ? 1 : 2).'" class="text-right">
<th colspan="'.($options['show_only_total'] ? 2 : 3).'" class="text-right">
<b>'.moneyFormat($totale, 2).'</b>
</th>
</tr>';

2
update/2_4_11.sql
View File

@ -310,7 +310,7 @@ UPDATE `zz_modules` SET `options` = 'SELECT |select| FROM `mg_articoli` WHERE 1=
ALTER TABLE `zz_hooks` ADD `processing_at` TIMESTAMP NULL DEFAULT NULL, ADD `processing_token` varchar(255);
INSERT INTO `zz_hooks` (`id`, `name`, `class`, `frequency`, `id_module`) VALUES (NULL, 'Backup', 'Modules\\Backups\\BackupHook', '1 day', (SELECT `id` FROM `zz_modules` WHERE `name` = 'Backup'));
-- Miglioramento gestione email
-- Miglioramento gestione email (questo RENAME genera un errore rif. tabella se mysql <= 5.5.55)
RENAME TABLE `zz_emails` TO `em_templates`;
RENAME TABLE `zz_smtps` TO `em_accounts`;
RENAME TABLE `zz_email_print` TO `em_print_template`;