Merge branch 'master' into 2.4

2018-02-25 11:00:15 +01:00 · 2018-02-25 11:00:15 +01:00 · 38e8fb7198
parent d96fffd9f3 f5c432b98d
commit 38e8fb7198
8 changed files with 1 additions and 1 deletions
--- a/templates/fatturato/logo_azienda.jpg
+++ b/templates/fatturato/logo_azienda.jpg
--- a/templates/fatture_accompagnatorie/logo_azienda.jpg
+++ b/templates/fatture_accompagnatorie/logo_azienda.jpg
--- a/templates/magazzino_inventario/logo_azienda.jpg
+++ b/templates/magazzino_inventario/logo_azienda.jpg
--- a/templates/registro_iva/logo_azienda.jpg
+++ b/templates/registro_iva/logo_azienda.jpg
--- a/templates/registro_iva/registroiva_body.html
+++ b/templates/registro_iva/registroiva_body.html
@ -17,7 +17,7 @@
 				</big>
 			</td>
 			<td valign="top" align="right">
-				<img src="$docroot$/templates/fatture/logo_azienda.jpg" alt="Logo" style="width:60mm;" border="0">
+				<img src="$docroot$/templates/registro_iva/logo_azienda.jpg" alt="Logo" style="width:60mm;" border="0">
 			</td>
 		</tr>
 	</table>
--- a/templates/riepilogo_contratti/logo_azienda.jpg
+++ b/templates/riepilogo_contratti/logo_azienda.jpg
--- a/templates/riepilogo_interventi/logo_azienda.jpg
+++ b/templates/riepilogo_interventi/logo_azienda.jpg
--- a/templates/spesometro/logo_azienda.jpg
+++ b/templates/spesometro/logo_azienda.jpg