From f773f57a723c8add83e59f91774e8c1b307ba923 Mon Sep 17 00:00:00 2001
From: Luca <lucasalva87@users.noreply.github.com>
Date: Tue, 20 Feb 2018 10:55:00 +0100
Subject: [PATCH 1/2] Firma anche per contratti

---
 modules/preventivi/edit.php       |  8 ++++----
 templates/contratti/footer.php    | 17 +++++++++++++++++
 templates/contratti/settings.php  |  5 +++++
 templates/preventivi/settings.php |  3 +--
 4 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 templates/contratti/footer.php
 create mode 100644 templates/contratti/settings.php

diff --git a/modules/preventivi/edit.php b/modules/preventivi/edit.php
index 6096e66dd..667e08888 100644
--- a/modules/preventivi/edit.php
+++ b/modules/preventivi/edit.php
@@ -120,9 +120,9 @@ $_SESSION['superselect']['idanagrafica'] = $records[0]['idanagrafica'];
 				</div>
 			</div>
 
-            <div class="pull-right">
+            <!--div class="pull-right">
 				<button type="submit" class="btn btn-success"><i class="fa fa-check"></i> <?php echo tr('Salva modifiche'); ?></button>
-			</div>
+			</div-->
 
 		</div>
 	</div>
@@ -148,9 +148,9 @@ $_SESSION['superselect']['idanagrafica'] = $records[0]['idanagrafica'];
 
 } ?>
 
-        <div class="pull-right">
+        <!--div class="pull-right">
             <a class="btn btn-info" href="<?php echo $rootdir ?>/pdfgen.php?ptype=preventivi&idpreventivo=<?php echo $id_record ?>" target="_blank"><i class="fa fa-print"></i> Stampa preventivo</a>
-        </div>
+        </div-->
         <div class="clearfix"></div>
         <br>
 
diff --git a/templates/contratti/footer.php b/templates/contratti/footer.php
new file mode 100644
index 000000000..6bad627b8
--- /dev/null
+++ b/templates/contratti/footer.php
@@ -0,0 +1,17 @@
+<table>
+    <tr>
+        <td style="vertical-align:bottom;" width="50%">
+            lì, ___________________________
+        </td>
+
+        <td align="center" style="vertical-align:bottom;" width="50%">
+            FIRMA PER ACCETTAZIONE<br><br>
+            _____________________________________
+        </td>
+    </tr>
+</table>
+<br>
+
+<?php
+echo '$default_footer$';
+?>
\ No newline at end of file
diff --git a/templates/contratti/settings.php b/templates/contratti/settings.php
new file mode 100644
index 000000000..888b0d27f
--- /dev/null
+++ b/templates/contratti/settings.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'footer-height' => 30,
+];
diff --git a/templates/preventivi/settings.php b/templates/preventivi/settings.php
index fb250224b..888b0d27f 100644
--- a/templates/preventivi/settings.php
+++ b/templates/preventivi/settings.php
@@ -1,6 +1,5 @@
 <?php
 
 return [
-    'header-height' => 35,
-    'footer-height' => 25,
+    'footer-height' => 30,
 ];

From 752195dbb094411ac3dcc5716e18ef846546cf7f Mon Sep 17 00:00:00 2001
From: Luca <lucasalva87@users.noreply.github.com>
Date: Tue, 20 Feb 2018 12:05:10 +0100
Subject: [PATCH 2/2] Stampe preventivi e contratti, firma in fondo alla pagina

---
 templates/contratti/body.php      | 16 ++++++++++++++++
 templates/contratti/footer.php    | 14 --------------
 templates/contratti/settings.php  |  2 +-
 templates/preventivi/body.php     | 16 ++++++++++++++++
 templates/preventivi/footer.php   | 14 --------------
 templates/preventivi/settings.php |  2 +-
 6 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/templates/contratti/body.php b/templates/contratti/body.php
index 1fe8df860..0a12335ee 100644
--- a/templates/contratti/body.php
+++ b/templates/contratti/body.php
@@ -292,3 +292,19 @@ echo '
 echo '
 <p class="text-center"><b>'.tr('Il tutto S.E. & O.').'</b></p>
 <p class="text-center">'.tr("In attesa di un Vostro Cortese riscontro, colgo l'occasione per porgere Cordiali Saluti").'</p>';
+
+
+//Firma
+echo '<div style=\'position:absolute; bottom:'.($settings['margins']['bottom'] + $settings['footer-height']).'px\' > <table >
+    <tr>
+        <td style="vertical-align:bottom;" width="50%">
+            lì, ___________________________
+        </td>
+
+        <td align="center" style="vertical-align:bottom;" width="50%">
+            FIRMA PER ACCETTAZIONE<br><br>
+            _____________________________________
+        </td>
+    </tr>
+</table>
+<br></div>';
diff --git a/templates/contratti/footer.php b/templates/contratti/footer.php
index 6bad627b8..f8bab89ab 100644
--- a/templates/contratti/footer.php
+++ b/templates/contratti/footer.php
@@ -1,17 +1,3 @@
-<table>
-    <tr>
-        <td style="vertical-align:bottom;" width="50%">
-            lì, ___________________________
-        </td>
-
-        <td align="center" style="vertical-align:bottom;" width="50%">
-            FIRMA PER ACCETTAZIONE<br><br>
-            _____________________________________
-        </td>
-    </tr>
-</table>
-<br>
-
 <?php
 echo '$default_footer$';
 ?>
\ No newline at end of file
diff --git a/templates/contratti/settings.php b/templates/contratti/settings.php
index 888b0d27f..0f521bee5 100644
--- a/templates/contratti/settings.php
+++ b/templates/contratti/settings.php
@@ -1,5 +1,5 @@
 <?php
 
 return [
-    'footer-height' => 30,
+    'footer-height' => 35,
 ];
diff --git a/templates/preventivi/body.php b/templates/preventivi/body.php
index c35117aa0..2c6154161 100644
--- a/templates/preventivi/body.php
+++ b/templates/preventivi/body.php
@@ -344,3 +344,19 @@ echo '
 // Conclusione
 echo '
 <p class="text-center">'.tr("In attesa di un Vostro Cortese riscontro, colgo l'occasione per porgere Cordiali Saluti").'</p>';
+
+
+//Firma
+echo '<div style=\'position:absolute; bottom:'.($settings['margins']['bottom'] + $settings['footer-height']).'px\' > <table >
+    <tr>
+        <td style="vertical-align:bottom;" width="50%">
+            lì, ___________________________
+        </td>
+
+        <td align="center" style="vertical-align:bottom;" width="50%">
+            FIRMA PER ACCETTAZIONE<br><br>
+            _____________________________________
+        </td>
+    </tr>
+</table>
+<br></div>';
\ No newline at end of file
diff --git a/templates/preventivi/footer.php b/templates/preventivi/footer.php
index 6bad627b8..f8bab89ab 100644
--- a/templates/preventivi/footer.php
+++ b/templates/preventivi/footer.php
@@ -1,17 +1,3 @@
-<table>
-    <tr>
-        <td style="vertical-align:bottom;" width="50%">
-            lì, ___________________________
-        </td>
-
-        <td align="center" style="vertical-align:bottom;" width="50%">
-            FIRMA PER ACCETTAZIONE<br><br>
-            _____________________________________
-        </td>
-    </tr>
-</table>
-<br>
-
 <?php
 echo '$default_footer$';
 ?>
\ No newline at end of file
diff --git a/templates/preventivi/settings.php b/templates/preventivi/settings.php
index 888b0d27f..0f521bee5 100644
--- a/templates/preventivi/settings.php
+++ b/templates/preventivi/settings.php
@@ -1,5 +1,5 @@
 <?php
 
 return [
-    'footer-height' => 30,
+    'footer-height' => 35,
 ];