Merge lp:~therp-nl/banking-addons/ba70-fix_payment_detection into lp:banking-addons

[Stefan Rijnhart (Opener)]

As payment functionality has been split off to account_banking_payment now, account_banking only interacts with the payment model very minimally. There was already a check to see if account_payment was installed but it assumed that account_banking_payment is then also installed as this is now an autoinstalled glue module depending on the two other modules. Of course, it can easily be the case that this module is not in the addons path so that we need to check if this module itself is actually installed. This branch fixes this by checking for a column that account_banking_payment adds to the model.

[Holger Brunn (Therp) (hbrunn)]

I think
try:
  from openerp.addons import $module_name
except:
...

is a cleaner (and more pythonic) approach to detect the availability of a module

And are lines 18f an artifact of your prerequisite-frenzy or do they have anything to do with the issue at hand?

review: Needs Fixing

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> I think
> try:
> from openerp.addons import $module_name
> except:
> ...
>
> is a cleaner (and more pythonic) approach to detect the availability of a
> module

A module could be importable from python (as soon as it lives in the addons path), but not actually installed on the current database.

[Stefan Rijnhart (Opener) (stefan-opener)]

Import seems unsafe as per Guewens comment, as it covers the current situation in which the module may be available but is set to uninstallable pending the migration of the code.

l.18/19 are redundant as payment_lines is already assigned an empty value a couple of lines earlier (not shown in the diff). Consider it an unrelated refactoring.

[Holger Brunn (Therp) (hbrunn)]

Thanks for the clarifications!

review: Approve

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

review: Approve

=== modified file 'account_banking/banking_import_transaction.py'
--- account_banking/banking_import_transaction.py	2013-05-03 13:56:25 +0000
+++ account_banking/banking_import_transaction.py	2013-05-03 13:56:26 +0000
@@ -820,7 +820,8 @@
         journal_obj = self.pool.get('account.journal')
         move_line_obj = self.pool.get('account.move.line')
         payment_line_obj = self.pool.get('payment.line')
-        has_payment = bool(payment_line_obj)
+        has_payment = bool(
+            payment_line_obj and 'date_done' in payment_line_obj._columns)
         statement_line_obj = self.pool.get('account.bank.statement.line')
         statement_obj = self.pool.get('account.bank.statement')
         imported_statement_ids = []
@@ -856,8 +857,6 @@
                 ('date_done', '=', False)], context=context)
             payment_lines = payment_line_obj.browse(
                 cr, uid, payment_line_ids)
-        else:
-            payment_lines = False
 
         # Start the loop over the transactions requested to match
         transactions = self.browse(cr, uid, ids, context)