Skip to content

Commit

Permalink
Fix minore
Browse files Browse the repository at this point in the history
  • Loading branch information
Dasc3er committed Jun 25, 2018
1 parent 6fecb90 commit f3c62c2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion modules/interventi/actions.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
<?php

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 {
include_once $docroot.'/modules/interventi/modutil.php';
}

if (file_exists($docroot.'/modules/articoli/custom/modutil.php')) {
include_once $docroot.'/modules/articoli/custom/modutil.php';
} else {
include_once $docroot.'/modules/articoli/modutil.php';
}

if (file_exists($docroot.'/modules/my_impianti/custom/modutil.php')) {
include_once $docroot.'/modules/my_impianti/custom/modutil.php';
} else {
Expand Down
2 changes: 1 addition & 1 deletion update/2_4_1.sql
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ 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', 1, '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', NULL, '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`;

Expand Down

0 comments on commit f3c62c2

Please sign in to comment.