Merge branch 'master' of https://github.com/devcode-it/openstamanager

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>
 

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>';

templates/contratti/footer.php

@@ -0,0 +1,3 @@
+<?php
+echo '$default_footer$';
+?>

templates/contratti/settings.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'footer-height' => 35,
+];

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>';

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$';
 ?>

templates/preventivi/settings.php

@@ -1,6 +1,5 @@
 <?php
 
 return [
-    'header-height' => 35,
+    'footer-height' => 35,
-    'footer-height' => 25,
 ];