From 2686d0fcd4e5a48169f780ec01c56c9b2196d311 Mon Sep 17 00:00:00 2001
From: Luca <lucasalva87@users.noreply.github.com>
Date: Mon, 25 Jun 2018 11:50:39 +0200
Subject: [PATCH] Fix minori

---
 modules/interventi/actions.php | 6 +-----
 update/2_4_1.sql               | 4 +++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/interventi/actions.php b/modules/interventi/actions.php
index 68a6561d1..3044761dd 100644
--- a/modules/interventi/actions.php
+++ b/modules/interventi/actions.php
@@ -1,10 +1,6 @@
 <?php
 
-if (file_exists(__DIR__.'/../../../core.php')) {
-    include_once __DIR__.'/../../../core.php';
-} else {
-    include_once __DIR__.'/../../core.php';
-}
+include_once __DIR__.'/core.php';
 if (file_exists($docroot.'/modules/interventi/custom/modutil.php')) {
     include_once $docroot.'/modules/interventi/custom/modutil.php';
 } else {
diff --git a/update/2_4_1.sql b/update/2_4_1.sql
index 4e23d196c..6d7f28bbe 100644
--- a/update/2_4_1.sql
+++ b/update/2_4_1.sql
@@ -46,7 +46,9 @@ ALTER TABLE `co_movimenti_modelli` ADD PRIMARY KEY (`id`);
 ALTER TABLE `co_movimenti_modelli` MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 -- Modulo modelli prima nota
-INSERT INTO `zz_modules` (`id`, `name`, `title`, `directory`, `options`, `options2`, `icon`, `version`, `compatibility`, `order`, `parent`, `default`, `enabled`) VALUES (NULL, 'Modelli prima nota', 'Modelli prima nota', 'modelli_primanota', 'SELECT |select| FROM `co_movimenti_modelli` WHERE 1=1 GROUP BY `idmastrino` HAVING 2=2', '', 'fa fa-angle-right', '2.4.1', '2.4.1', '1', (SELECT `id` FROM `zz_modules` m WHERE `name` = 'Tabelle'), '1', '1');
+INSERT INTO `zz_modules` (`id`, `name`, `title`, `directory`, `options`, `options2`, `icon`, `version`, `compatibility`, `order`, `parent`, `default`, `enabled`) VALUES (NULL, 'Modelli prima nota', 'Modelli prima nota', 'modelli_primanota', 'SELECT |select| FROM `co_movimenti_modelli` WHERE 1=1 GROUP BY `idmastrino` HAVING 2=2', '', 'fa fa-angle-right', '2.4.1', '2.4.1', '1', 1, '1', '1');
+
+UPDATE `zz_modules` `t1` INNER JOIN `zz_modules` `t2` ON (`t1`.`name` = 'Modelli prima nota' AND `t2`.`name` = 'Tabelle') SET `t1`.`parent` = `t2`.`id`;
 
 INSERT INTO `zz_views` (`id`, `id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `search_inside`, `order_by`, `enabled`, `summable`, `default`) VALUES (NULL, (SELECT id FROM zz_modules WHERE name='Modelli prima nota'), 'id', 'co_movimenti_modelli.id', '0', '1', '0', '0', NULL, NULL, '0', '0', '1');
 INSERT INTO `zz_views` (`id`, `id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `search_inside`, `order_by`, `enabled`, `summable`, `default`) VALUES (NULL, (SELECT id FROM zz_modules WHERE name='Modelli prima nota'), 'Causale predefinita', 'co_movimenti_modelli.descrizione', '1', '1', '0', '0', NULL, NULL, '1', '0', '1');