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

Merge branch 'master' of https://github.com/devcode-it/openstamanager

This commit is contained in:
MatteoPistorello 2023-06-07 17:09:12 +02:00
parent f4d9ea28a0 144be6cbd7
commit f709daf2c8
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/contratti/variables.php
View File

@ -18,23 +18,25 @@
*/
$r = $dbo->fetchOne('SELECT *,
co_contratti.nome AS nome_contratto,
an_anagrafiche.pec,
IF((an_referenti.email IS NOT NULL AND an_referenti.email != ""), an_referenti.email, an_anagrafiche.email) AS email,
an_anagrafiche.idanagrafica,
an_referenti.nome,
an_referenti.nome AS nome_referente,
an_anagrafiche.ragione_sociale
FROM co_contratti
INNER JOIN an_anagrafiche ON co_contratti.idanagrafica=an_anagrafiche.idanagrafica
LEFT OUTER JOIN an_referenti ON an_referenti.id=co_contratti.idreferente
LEFT JOIN an_referenti ON an_referenti.id=co_contratti.idreferente
WHERE co_contratti.id='.prepare($id_record));
// Variabili da sostituire
return [
'nome' => $r['nome_contratto'],
'email' => $options['is_pec'] ? $r['pec'] : $r['email'],
'ragione_sociale' => $r['ragione_sociale'],
'numero' => $r['numero'],
'descrizione' => $r['descrizione'],
'data' => Translator::dateToLocale($r['data_bozza']),
'id_anagrafica' => $r['idanagrafica'],
'nome_referente' => $r['nome'],
'nome_referente' => $r['nome_referente'],
];

6
modules/ddt/buttons.php
View File

@ -50,7 +50,11 @@ function completaTrasporto() {
confirmButtonText: "'.tr('Completa').'",
}).then(
function() {
location.href = globals.rootdir + "/editor.php?id_module='.$id_module.'&id_segment=" + $("select[name=id_segment]").val() + "&id_record='.$id_record.'&op=completa_trasporto&backto=record-edit";
if ($("select[name=id_segment]").val() == null) {
swal( "'.tr('Attenzione').'", "'.tr('Devi prima selezionare un segmento').'...", "warning");
} else {
location.href = globals.rootdir + "/editor.php?id_module='.$id_module.'&id_segment=" + $("select[name=id_segment]").val() + "&id_record='.$id_record.'&op=completa_trasporto&backto=record-edit";
}
},
function() {},
start_superselect(),

2
update/2_4_47.sql Normal file
View File

@ -0,0 +1,2 @@
-- Aggiunta vincolo fra ddt e righe ddt
ALTER TABLE `dt_righe_ddt` ADD CONSTRAINT `dt_righe_ddt_ibfk_2` FOREIGN KEY (`idddt`) REFERENCES `dt_ddt`(`id`) ON DELETE CASCADE ON UPDATE RESTRICT;