From a80e55d2da45debf71f8306e6e45478bdabb50ea Mon Sep 17 00:00:00 2001 From: Luca Date: Tue, 8 Jan 2019 12:51:32 +0100 Subject: [PATCH] Fix minori --- modules/fatture/row-list.php | 2 +- modules/interventi/edit.php | 26 +++++++++++++++++--------- modules/primanota/add.php | 12 +++++------- update/2_4_3.sql | 2 +- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/modules/fatture/row-list.php b/modules/fatture/row-list.php index 0ce471495..66963c87b 100644 --- a/modules/fatture/row-list.php +++ b/modules/fatture/row-list.php @@ -101,7 +101,7 @@ foreach ($righe as $riga) { '_DESCRIZIONE_CONTO_' => $riga['descrizione_conto'] ?: null, '_CODICE_CIG_' => $riga['codice_cig'] ? '
CIG: '.$riga['codice_cig'] : null, '_CODICE_CUP_' => $riga['codice_cup'] ? '
CUP: '.$riga['codice_cup'] : null, - '_ID_DOCUMENTO_' => $riga['id_documento_fe'] ? '
CUP: '.$riga['id_documento_fe'] : null, + '_ID_DOCUMENTO_' => $riga['id_documento_fe'] ? '
DOC: '.$riga['id_documento_fe'] : null, ]); echo ' diff --git a/modules/interventi/edit.php b/modules/interventi/edit.php index d80c5f4ef..809c4a66e 100644 --- a/modules/interventi/edit.php +++ b/modules/interventi/edit.php @@ -141,34 +141,42 @@ $_SESSION['superselect']['idanagrafica'] = $record['idanagrafica']; fetchOne("SELECT codice_cig,codice_cup,id_documento_fe FROM co_contratti WHERE id = ".prepare($record['idcontratto'])); + $record['id_documento_fe'] = $contratto['id_documento_fe']; + $record['codice_cup'] = $contratto['codice_cup']; + $record['codice_cig'] = $contratto['codice_cig']; + } + ?>
-

+

+ + +

+
- {[ "type": "text", "label": "", "name": "id_documento_fe", "required": 0, "value": "$id_documento_fe$", "maxlength": 20, "readonly": "" ]} + {[ "type": "", "label": "", "name": "id_documento_fe", "required": 0, "value": "", "maxlength": 20, "readonly": "", "extra": "" ]}
- {[ "type": "text", "label": "", "name": "codice_cig", "required": 0, "value": "$codice_cig$", "maxlength": 15, "readonly": "" ]} + {[ "type": "", "label": "", "name": "codice_cig", "required": 0, "value": "", "maxlength": 15, "readonly": "", "extra": "" ]}
- {[ "type": "text", "label": "", "name": "codice_cup", "required": 0, "value": "$codice_cup$", "maxlength": 15, "readonly": "" ]} + {[ "type": "", "label": "", "name": "codice_cup", "required": 0, "value": "", "maxlength": 15, "readonly": "", "extra": "" ]}
- +
diff --git a/modules/primanota/add.php b/modules/primanota/add.php index d039f32a0..941ea9505 100644 --- a/modules/primanota/add.php +++ b/modules/primanota/add.php @@ -242,7 +242,7 @@ include_once __DIR__.'/../../core.php';
- +
@@ -338,10 +338,10 @@ include_once __DIR__.'/../../core.php'; $('#bs-popup #modello_primanota').change(function(){ if ($(this).val()!=''){ - $('#btn_crea_modello').text(''); + $('#btn_crea_modello').html(' '+''); $('#bs-popup #idmastrino').val($(this).val()); }else{ - $('#btn_crea_modello').text(''); + $('#btn_crea_modello').html(' '+''); $('#bs-popup #idmastrino').val(0); } @@ -351,11 +351,9 @@ include_once __DIR__.'/../../core.php'; var causale = $(this).find('option:selected').text(); //aggiornava erroneamente anche la causale ed eventuale numero di fattura e data - + $('#bs-popup #desc').val(causale); - + $.get('/ajax_complete.php?op=get_conti&idmastrino='+idmastrino, function(data){ var conti = data.split(','); diff --git a/update/2_4_3.sql b/update/2_4_3.sql index 0eca9b6bf..d84b1c047 100644 --- a/update/2_4_3.sql +++ b/update/2_4_3.sql @@ -35,7 +35,7 @@ ALTER TABLE `co_righe_documenti` ADD `data_inizio_periodo` date, ADD `data_fine_ ALTER TABLE `co_documenti` ADD `tipo_resa` VARCHAR(3); -- Colonna nome impianto -INSERT INTO `zz_views` (`id`, `id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `search_inside`, `order_by`, `visible`, `summable`, `default` ) VALUES (NULL, (SELECT `id` FROM `zz_modules` WHERE `name` = 'MyImpianti'), 'Nome', 'nome', 2, 1, 0, 0, NULL, NULL, 0, 0, 0); +INSERT INTO `zz_views` (`id`, `id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `search_inside`, `order_by`, `visible`, `summable`, `default` ) VALUES (NULL, (SELECT `id` FROM `zz_modules` WHERE `name` = 'MyImpianti'), 'Nome', 'nome', 2, 1, 0, 0, NULL, NULL, 1, 0, 1); -- Colonna causale predefinita INSERT INTO `zz_views` (`id`, `id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `search_inside`, `order_by`, `visible`, `summable`, `default` ) VALUES (NULL, (SELECT `id` FROM `zz_modules` WHERE `name` = 'Causali'), 'Predefinita', 'IF(predefined, ''Sì'', ''No'')', 2, 1, 0, 0, NULL, NULL, 0, 0, 0);