From c2765cc20e9b7fa41abe83d91edb433e46de0458 Mon Sep 17 00:00:00 2001
From: Thomas Zilio <Dasc3er@users.noreply.github.com>
Date: Wed, 27 Feb 2019 20:32:40 +0100
Subject: [PATCH] Fix creazione categorie articoli

---
 modules/categorie_articoli/add.php | 10 +++++++---
 modules/categorie_impianti/add.php | 22 ----------------------
 update/2_4_8.sql                   |  2 +-
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/modules/categorie_articoli/add.php b/modules/categorie_articoli/add.php
index 4973e405a..458c53f9d 100644
--- a/modules/categorie_articoli/add.php
+++ b/modules/categorie_articoli/add.php
@@ -8,9 +8,13 @@ if (isset($id_record)) {
     include __DIR__.'/init.php';
 }
 
-?><form action="<?php echo ROOTDIR; ?>/controller.php?id_module=$id_module$<?php
-if (isset($id_record)) {
-    echo '&id_record='.$id_record;
+?><form action="<?php
+if (isset($id_original)) {
+    echo ROOTDIR.'/editor.php?id_module='.$id_module;
+
+    if (isset($id_record)) {
+        echo '&id_record='.$id_record;
+    }
 }
 ?>" method="post" id="add-form">
 	<input type="hidden" name="backto" value="record-edit">
diff --git a/modules/categorie_impianti/add.php b/modules/categorie_impianti/add.php
index 6c822d407..9376ee25d 100644
--- a/modules/categorie_impianti/add.php
+++ b/modules/categorie_impianti/add.php
@@ -10,19 +10,7 @@ if (isset($id_record)) {
 
 ?><form action="" method="post" id="add-form">
 	<input type="hidden" name="backto" value="record-edit">
-
-<?php
-if (!isset($id_original)) {
-    ?>
 	<input type="hidden" name="op" value="add">
-<?php
-} else {
-        ?>
-	<input type="hidden" name="op" value="row">
-	<input type="hidden" name="id_original" value="<?php echo $id_original; ?>">
-<?php
-    }
-?>
 
 	<div class="row">
         <div class="col-md-8">
@@ -43,17 +31,7 @@ if (!isset($id_original)) {
 	<!-- PULSANTI -->
 	<div class="row">
 		<div class="col-md-12 text-right">
-	<?php
-if (isset($id_record)) {
-    ?>
-			<button type="submit" class="btn btn-success"><i class="fa fa-save"></i> <?php echo tr('Salva'); ?></button>
-<?php
-} else {
-        ?>
 			<button type="submit" class="btn btn-primary"><i class="fa fa-plus"></i> <?php echo tr('Aggiungi'); ?></button>
-<?php
-    }
-?>
 		</div>
 	</div>
 </form>
diff --git a/update/2_4_8.sql b/update/2_4_8.sql
index acb8565c0..5d80990a2 100644
--- a/update/2_4_8.sql
+++ b/update/2_4_8.sql
@@ -12,4 +12,4 @@ ALTER TABLE `or_ordini` ADD `num_item` VARCHAR(15) AFTER `id_documento_fe`;
 ALTER TABLE `co_preventivi` ADD `num_item` VARCHAR(15) AFTER `id_documento_fe`;
 
 -- Aggiunta data scadenza attività
-ALTER TABLE `in_interventi` ADD `data_scadenza` DATETIME NOT NULL AFTER `data_invio`;
\ No newline at end of file
+ALTER TABLE `in_interventi` ADD `data_scadenza` DATETIME AFTER `data_invio`;