From 604a8eac6ba19d6c5ef11e2c15a16cf53f09e91f Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Thu, 25 Jul 2019 17:39:55 +0200
Subject: [PATCH] Fix minori

---
 modules/anagrafiche/edit.php  | 2 +-
 modules/fatture/variables.php | 7 ++++++-
 update/2_4_11.sql             | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/anagrafiche/edit.php b/modules/anagrafiche/edit.php
index ac0087c17..a17e4bffc 100644
--- a/modules/anagrafiche/edit.php
+++ b/modules/anagrafiche/edit.php
@@ -26,7 +26,7 @@ if (!$is_cliente) {
 
 ?>
 
-<form action="" method="post" id="edit-form"  autocomplete="<?php echo setting('Autocomple web form'); ?>" >
+<form action="" method="post" id="edit-form"  autocomplete="<?php echo setting('Autocompletamento form'); ?>" >
 	<fieldset>
 		<input type="hidden" name="backto" value="record-edit">
 		<input type="hidden" name="op" value="update">
diff --git a/modules/fatture/variables.php b/modules/fatture/variables.php
index d9d6b68f3..2d5cb416e 100644
--- a/modules/fatture/variables.php
+++ b/modules/fatture/variables.php
@@ -13,7 +13,12 @@ FROM co_documenti
     INNER JOIN co_tipidocumento ON co_tipidocumento.id=co_documenti.idtipodocumento
 WHERE co_documenti.id='.prepare($id_record));
 
-$logo_azienda = str_replace(DOCROOT, BASEURL, App::filepath('templates/base|custom|/logo_azienda.jpg'));
+if (!empty(setting('Logo stampe'))) {
+    $logo_azienda = BASEURL.'/'.Models\Upload::where('filename', setting('Logo stampe'))->first()->fileurl;
+}else{
+    $logo_azienda = str_replace(DOCROOT, BASEURL, App::filepath('templates/base|custom|/logo_azienda.jpg'));
+    $logo_azienda = str_replace('\\', '/', $logo_azienda);
+}
 
 //cliente
 if ($r['idconto_cliente'] != '') {
diff --git a/update/2_4_11.sql b/update/2_4_11.sql
index be4efe3f8..925828088 100644
--- a/update/2_4_11.sql
+++ b/update/2_4_11.sql
@@ -182,4 +182,4 @@ HAVING 2=2
 ORDER BY `scadenza` ASC' WHERE `name` = 'Scadenzario';
 
 -- Aggiunte impostazione Autocomple web form
-INSERT INTO `zz_settings` (`id`, `nome`, `valore`, `tipo`, `editable`, `sezione`, `order`, `help`) VALUES (NULL, 'Autocomple web form', 'on', 'list[on,off]', '1', 'Generali', '', NULL);
\ No newline at end of file
+INSERT INTO `zz_settings` (`id`, `nome`, `valore`, `tipo`, `editable`, `sezione`, `order`, `help`) VALUES (NULL, 'Autocompletamento form', 'on', 'list[on,off]', '1', 'Generali', '', NULL);
\ No newline at end of file