diff --git a/include/common/importa.php b/include/common/importa.php
index e87bc0ffe..8efbfd68a 100755
--- a/include/common/importa.php
+++ b/include/common/importa.php
@@ -366,7 +366,7 @@ if (!$righe_evase->isEmpty()) {
echo '
';
-
-}elseif (!$record['predefined']) {
-?>
+} elseif (!$record['predefined']) {
+ ?>
diff --git a/modules/emails/init.php b/modules/emails/init.php
index 836073157..f0fec6fed 100755
--- a/modules/emails/init.php
+++ b/modules/emails/init.php
@@ -25,5 +25,5 @@ if (isset($id_record)) {
$record = $dbo->fetchOne('SELECT * FROM em_templates WHERE id='.prepare($id_record).' AND deleted_at IS NULL');
//Controllo se ci sono newletter collegate a questo template
- $newsletters = Newsletter::where('id_template',$id_record)->get();
+ $newsletters = Newsletter::where('id_template', $id_record)->get();
}
diff --git a/modules/newsletter/edit.php b/modules/newsletter/edit.php
index 6760919b4..fce917d86 100755
--- a/modules/newsletter/edit.php
+++ b/modules/newsletter/edit.php
@@ -23,7 +23,7 @@ use Modules\Emails\Template;
include_once __DIR__.'/../../core.php';
//Controllo se il template è ancora attivo
-if( empty($template) ){
+if (empty($template)) {
echo '
'.tr('ATTENZIONE! Questa newsletter risulta collegata ad un template non più presente a sistema').'
';
}
diff --git a/modules/newsletter/init.php b/modules/newsletter/init.php
index 6a22d78b4..be0b97d69 100755
--- a/modules/newsletter/init.php
+++ b/modules/newsletter/init.php
@@ -17,8 +17,8 @@
* along with this program. If not, see
.
*/
-use Modules\Newsletter\Newsletter;
use Modules\Emails\Template;
+use Modules\Newsletter\Newsletter;
include_once __DIR__.'/../../core.php';
diff --git a/update/2_4_24.sql b/update/2_4_24.sql
index a29a3e85e..6ac0da86b 100644
--- a/update/2_4_24.sql
+++ b/update/2_4_24.sql
@@ -135,3 +135,6 @@ INSERT INTO `zz_api_resources` (`id`, `version`, `type`, `resource`, `class`, `e
(NULL, 'app-v1', 'retrieve', 'controllo-clienti', 'API\\App\\v1\\ControlloClienti', '1'),
(NULL, 'app-v1', 'retrieve', 'segnalazione-bug', 'API\\App\\v1\\SegnalazioneBug', '1'),
(NULL, 'app-v1', 'create', 'segnalazione-bug', 'API\\App\\v1\\SegnalazioneBug', '1');
+
+-- Aggiunto collegamento tra DDT in direzioni opposte per gestione movimentazioni interne tra sedi
+ALTER TABLE `dt_ddt` ADD `id_ddt_trasporto_interno` INT(11) NULL, ADD FOREIGN KEY (`id_ddt_trasporto_interno`) REFERENCES `dt_ddt`(`id`) ON DELETE CASCADE;