Merge lp:~agilebg/account-financial-report/fix_account_move_line_report_xls into lp:~account-report-core-editor/account-financial-report/7.0

[Alex Comba - Agile BG]

Fixing for https://bugs.launchpad.net/account-financial-report/+bug/1275730

[Pedro Manuel Baeza (pedro.baeza)]

Please see https://code.launchpad.net/~camptocamp/account-financial-report/7.0-fix-crash-without-report_xls-rde/+merge/204432 for the same fix.

Regards.

review: Disapprove

[Alex Comba - Agile BG (tafaru)]

Ok, I've just seen the corresponding merge.

Thanks, Pedro.

Unmerged revisions

72. By Alex Comba - Agile BG on 2014-02-03

[FIX] ImportError: No module named report_xls

=== modified file 'account_move_line_report_xls/__init__.py'
--- account_move_line_report_xls/__init__.py	2014-01-09 11:07:08 +0000
+++ account_move_line_report_xls/__init__.py	2014-02-03 14:15:59 +0000
@@ -19,6 +19,11 @@
 #    along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-from . import account_move_line
-from . import report
+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')