[merge]

[odoo/odoo.git] / addons / web / controllers / main.py
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py

index c159929..540e57f 100644 (file)
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -92,7 +92,7 @@ def concat_files(file_list, reader=None, intersperse=""):
      return files_concat, checksum.hexdigest()
  
  html_template = """<!DOCTYPE html>
-<html style="height: 100%%">
+<html>
      <head>
          <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
          <meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -1154,6 +1154,7 @@ class View(openerpweb.Controller):
              arch = fvg['arch'].encode('utf-8')
          else:
              arch = fvg['arch']
+        fvg['arch_string'] = arch
  
          if transform:
              evaluation_context = session.evaluation_context(context or {})