From 17560f6579ead817c0f7a17dddf1d03f69a94ebd Mon Sep 17 00:00:00 2001
From: Leonardo Pistone <leonardo.pistone@camptocamp.com>
Date: Tue, 25 Aug 2015 14:13:51 +0200
Subject: [PATCH] import guard for report_xls

The dependency is indeed declared in __openerp__.py and will be
enforced. Odoo evaluates all python files, even for modules which are
not installed, and crashes if an unneeded dependency is needed.

Conflicts:
	mis_builder/report/__init__.py

cherry picked
---
 mis_builder/report/__init__.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mis_builder/report/__init__.py b/mis_builder/report/__init__.py
index 4a6549d5..e948be91 100644
--- a/mis_builder/report/__init__.py
+++ b/mis_builder/report/__init__.py
@@ -22,4 +22,13 @@
 #
 ##############################################################################
 
+<<<<<<< HEAD
 from . import mis_builder_xls
+=======
+try:
+    from . import mis_builder_xls
+except ImportError:
+    pass  # this module is not installed
+
+from . import report_mis_report_instance
+>>>>>>> 586ddbe... import guard for report_xls