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:
Thomas Zilio 2020-07-19 15:07:25 +02:00
parent 97e58bb2b1 6b945c2edd
commit 69973dc53f
7 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/stato_servizi/widgets/spazio_utilizzato.php
View File

@ -53,7 +53,7 @@ function crea_grafico(values){
if (element.count<element.dbCount){ if (element.count<element.dbCount){
var diff = (element.dbCount-element.count); var diff = (element.dbCount-element.count);
$("#message").append("<div class=\"label label-warning\" ><i class=\"fa fa-exclamation-triangle\" aria-hidden=\"true\"></i> "+diff+" di file mancanti per allegati.</div><br>"); $("#message").append("<div class=\"label label-warning\" ><i class=\"fa fa-exclamation-triangle\" aria-hidden=\"true\"></i> "+diff+" file non trovati sul disco.</div><br>");
} }
} }
@ -61,7 +61,7 @@ function crea_grafico(values){
//Numero di file in Allegati per estensione //Numero di file in Allegati per estensione
if (element.dbExtensions.length > 0){ if (element.dbExtensions.length > 0){
$("#message").append("<p><b>Top 10 allegati:</b></p>"); $("#message").append("<br><p><b>Top 10 allegati:</b></p>");
element.dbExtensions.forEach(function(extension) { element.dbExtensions.forEach(function(extension) {

6
templates/fatture/body.php
View File

@ -7,7 +7,7 @@ $v_totale = [];
// Creazione righe fantasma // Creazione righe fantasma
$autofill = new \Util\Autofill(6, 40); $autofill = new \Util\Autofill(6, 40);
$rows_per_page = $fattura_accompagnatoria ? 15 : 20; $rows_per_page = $fattura_accompagnatoria ? 13 : 18;
if (!empty($options['last-page-footer'])) { if (!empty($options['last-page-footer'])) {
$rows_per_page += 7; $rows_per_page += 7;
} }
@ -185,8 +185,8 @@ $dicitura = $dbo->fetchOne('SELECT diciturafissafattura AS dicitura FROM an_anag
if (!empty($dicitura['dicitura'])) { if (!empty($dicitura['dicitura'])) {
echo ' echo '
<p class="text-center"> <p class="text-left">
<b>'.nl2br($dicitura['dicitura']).'</b> <span>'.nl2br($dicitura['dicitura']).'</span>
</p>'; </p>';
} }

4
templates/fatture/footer.php
View File

@ -383,8 +383,8 @@ if ($fattura_accompagnatoria) {
} }
echo ' echo '
<div style="font-size: 7pt; color: #999; text-align: center"> <div style="font-size: 6pt; color: #999; text-align: left;">
<p>$dicitura_fissa_fattura$</p> <span>$dicitura_fissa_fattura$</span>
</div>'; </div>';
if (empty($options['last-page-footer'])) { if (empty($options['last-page-footer'])) {

2
templates/fatture/header.php
View File

@ -58,7 +58,7 @@ echo '
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2" style="height:10mm;padding-top:2mm;"> <td colspan="2" style="height:10mm;padding-top:2mm;white-space: nowrap;">
<p class="small-bold">'.tr('IBAN').'</p> <p class="small-bold">'.tr('IBAN').'</p>
<p>$codiceiban$</p> <p>$codiceiban$</p>
</td> </td>

2
templates/info.php
View File

@ -119,7 +119,7 @@ $replaces = array_merge($replaces, [
'rootdir' => ROOTDIR, 'rootdir' => ROOTDIR,
'directory' => Prints::get($id_print)['full_directory'], 'directory' => Prints::get($id_print)['full_directory'],
'footer' => !empty($footer) ? $footer : '', 'footer' => !empty($footer) ? $footer : '',
'dicitura_fissa_fattura' => setting('Dicitura fissa fattura').((!empty(setting('OSMCloud Services API Token'))) ? tr(' Documento privo di valenza fiscale (art 21 dpr 633/72).') : ''), 'dicitura_fissa_fattura' => setting('Dicitura fissa fattura').((!empty(setting('OSMCloud Services API Token'))) ? tr('Documento privo di valenza fiscale (art 21 dpr 633/72).') : ''),
]); ]);
unset($replace); unset($replace);

44
templates/preventivi/body.php
View File

@ -33,30 +33,28 @@ echo '
], ['upper' => true]).'</b> ], ['upper' => true]).'</b>
</div> </div>
<table> <table class="table">
<tr> <tr>
<td colspan="2" style="height:10mm;padding-top:2mm;"> <td colspan="2" style="height:10mm;padding-top:2mm;">
<p class="small-bold">'.tr('Pagamento', [], ['upper' => true]).'</p> <p class="small-bold">'.tr('Pagamento', [], ['upper' => true]).'</p>
<p>'.$pagamento['descrizione'].'</p> <p>'.$pagamento['descrizione'].'</p>
</td> </td>
<td colspan="2" style="height:10mm;padding-top:2mm;"> <td colspan="2" style="height:10mm;padding-top:2mm;">
<p class="small-bold">'.tr('Banca di appoggio', [], ['upper' => true]).'</p> <p class="small-bold">'.tr('Banca di appoggio', [], ['upper' => true]).'</p>
<p><small>'.$banca['nome'].'</small></p> <p><small>'.$banca['nome'].'</small></p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2" style="height:10mm;padding-top:2mm;"> <td colspan="2" style="height:10mm;padding-top:2mm;white-space: nowrap;">
<p class="small-bold">'.tr('IBAN').'</p> <p class="small-bold">'.tr('IBAN').'</p>
<p>'.$banca['iban'].'</p> <p>'.$banca['iban'].'</p>
</td> </td>
<td colspan="2" style="height:10mm;padding-top:2mm;"> <td colspan="2" style="height:10mm;padding-top:2mm;">
<p class="small-bold">'.tr('BIC').'</p> <p class="small-bold">'.tr('BIC').'</p>
<p>'.$banca['bic'].'</p> <p>'.$banca['bic'].'</p>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="col-xs-6" style="margin-left: 10px"> <div class="col-xs-6" style="margin-left: 10px">

5
update/2_4_16.sql
View File

@ -131,4 +131,7 @@ ALTER TABLE `co_righe_documenti` ADD INDEX(`iddocumento`);
-- Aggiunta colonna data negli ordini -- Aggiunta colonna data negli ordini
INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `format`, `default`, `visible`) VALUES INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `format`, `default`, `visible`) VALUES
((SELECT `id` FROM `zz_modules` WHERE `name` = 'Ordini fornitore'), 'Data', 'or_ordini.data', 3, 1, 0, 0, 1); ((SELECT `id` FROM `zz_modules` WHERE `name` = 'Ordini fornitore'), 'Data', 'or_ordini.data', 3, 1, 0, 0, 1);
-- Plugin storico attività scheda Aanagrafiche
INSERT INTO `zz_plugins` (`id`, `name`, `title`, `idmodule_from`, `idmodule_to`, `position`, `script`, `enabled`, `default`, `order`, `compatibility`, `version`, `options2`, `options`, `directory`, `help`) VALUES (NULL, 'Storico attività', 'Storico attività', (SELECT id FROM zz_modules WHERE name = 'Interventi'), (SELECT id FROM zz_modules WHERE name='Anagrafiche'), 'tab', '', '1', '1', '0', '2.*', '0.1', NULL, '{ "main_query": [ { "type": "table", "fields": "Numero, Data inizio, Data fine, Tipo", "query": "SELECT in_interventi.id, in_interventi.codice AS Numero, DATE_FORMAT(MAX(orario_inizio),''%d/%m/%Y'') AS ''Data inizio'', DATE_FORMAT(MAX(orario_fine),''%d/%m/%Y'') AS ''Data fine'', (SELECT descrizione FROM in_tipiintervento WHERE idtipointervento=in_interventi.idtipointervento) AS ''Tipo'', (SELECT `id` FROM `zz_modules` WHERE `name` = ''Interventi'') AS _link_module_, in_interventi.id AS _link_record_ FROM in_interventi LEFT JOIN `in_interventi_tecnici` ON `in_interventi_tecnici`.`idintervento` = `in_interventi`.`id` LEFT JOIN `in_statiintervento` ON `in_interventi`.`idstatointervento`=`in_statiintervento`.`idstatointervento` WHERE 1=1 AND in_interventi.deleted_at IS NULL AND idanagrafica = |id_parent| HAVING 2=2 ORDER BY in_interventi.id DESC"} ]}', '', '');