Merge 892e482 into d8f17d7

OCA · Aug 31, 2015 · a6a8098 · a6a8098
2 parents d8f17d7 + 892e482
commit a6a8098
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/account_financial_report_webkit_xls/__init__.py b/account_financial_report_webkit_xls/__init__.py
@@ -20,10 +20,9 @@
 #
 ##############################################################################
 
+from . import wizard
+
 try:
-    from . import wizard
     from . import report
 except ImportError:
-    import logging
-    logging.getLogger('openerp.module').warning('''report_xls not available in
-    addons path. account_financial_report_webkit_xls will not be usable''')
+    pass  # this module is not installed, and tries to import report_xls
diff --git a/account_journal_report_xls/__init__.py b/account_journal_report_xls/__init__.py
@@ -20,11 +20,10 @@
 #
 ##############################################################################
 
+from . import account_journal
+from . import wizard
+
 try:
-    from . import account_journal
-    from . import wizard
     from . import report
 except ImportError:
-    import logging
-    logging.getLogger('openerp.module').warning('''report_xls not available in
-    addons path. account_financial_report_webkit_xls will not be usable''')
+    pass  # this module is not installed, and tries to import report_xls
diff --git a/account_move_line_report_xls/__init__.py b/account_move_line_report_xls/__init__.py
@@ -20,11 +20,9 @@
 #
 ##############################################################################
 
+from . import account_move_line
+
 try:
-    from . import account_move_line
     from . import report
 except ImportError:
-    import logging
-    logging.getLogger('openerp.module').\
-        warning('''report_xls not available in addons path.
-    account_financial_report_webkit_xls will not be usable''')
+    pass  # this module is not installed, and tries to import report_xls