diff --git a/intranet/modules/impression/main.py b/intranet/modules/impression/main.py
index b286e26e..5496b4b8 100755
--- a/intranet/modules/impression/main.py
+++ b/intranet/modules/impression/main.py
@@ -108,16 +108,23 @@ class main(ModuleBase):
     #
 
     def devis(self):
-        return {
-    'template':'impression-devis',
-    'values':
-        {
-        'devis':cherrypy.session['impression'].devisDetaille(), 
-        'total':cherrypy.session['impression'].prix(),
-        'nomFichier':cherrypy.session['impression'].fileName(),
-        },
-    'standalone':True,
-    }
+        if cherrypy.session.has_key('impression') and cherrypy.session['impression'] != None :
+            return {
+        'template':'impression-devis',
+        'values':
+            {
+            'devis':cherrypy.session['impression'].devisDetaille(), 
+            'total':cherrypy.session['impression'].prix(),
+            'nomFichier':cherrypy.session['impression'].fileName(),
+            },
+            'standalone':True,
+            }
+        else:
+            return {
+        'template':'impression-devis',
+        'values': { },
+        'standalone':True,
+            }
     devis.exposed=True    
     
     
diff --git a/intranet/modules/impression/templates/impression-devis.tmpl b/intranet/modules/impression/templates/impression-devis.tmpl
index 06c2eb10..1b293018 100644
--- a/intranet/modules/impression/templates/impression-devis.tmpl
+++ b/intranet/modules/impression/templates/impression-devis.tmpl
@@ -29,12 +29,17 @@
         	margin:0;
         	padding:5px 20px;
         }
+	
+	table.factureDetails td.full {
+	text-align:center;
+	border: none;
+	}
     </style>
 </head>
 <body>
 <div style="background:white url(/static/images/petitCr@ns.png) top left no-repeat; padding:2em;width:21cm;border:thin black solid;">
     <h1 style="margin:1em 1em 1em 50px;">Devis pour impression</h1>
-    <span style="font-weight:bold;">Fichier : </span> $nomFichier
+    <span style="font-weight:bold;">Fichier : </span> $getVar('nomFichier', 'XXXXX')
     <div id="facture" style="margin:2em 1em 1em 1em;">
 		<table cellspacing="0" border="0" class="factureDetails">
 			<tr>
@@ -44,7 +49,8 @@
 
 				<th>total</th>
 			</tr>
-		#for anItem in $devis
+		#if $getVar('devis', False)
+		        #for anItem in $devis
 			<tr>
 				<td>$anItem[0]</td>
 				<td>$anItem[1]&nbsp;&euro;</td>
@@ -54,12 +60,18 @@
 				</td>
 
 			</tr>
-        #end for
+      			#end for
 			<tr>
 				<td colspan="3" class="tdTotalDetailIntitule">
 					Total
 				</td>
-				<td class="tdTotalDetail">$total&nbsp;&euro;</td>
+				<td class="tdTotalDetail">$getVar('total', "XXX")&nbsp;&euro;</td>
+			</tr>
+		
+		#else
+		     	<tr><td class="full" colspan="4"><h2>Non disponible </h2></td></tr>
+		#end if
+
 		</table>
 	</div>
 </div>

total
$anItem[0]	$anItem[1] €
Total		$total €	$getVar('total', "XXX") €
Non disponible