Merge lp:~pedro.baeza/account-payment/7.0-account_payment_extension_store into lp:~account-payment-team/account-payment/7.0

[Pedro Manuel Baeza]

Methods for storing correctly the value amount_to_pay, that in 6.1 is stored, but not recomputed whenever its conditions changes, and for 7.0 is directly not stored, impacting on the performance on some operations.

[Pedro Manuel Baeza (pedro.baeza)]

Same for 6.1: https://code.launchpad.net/~pedro.baeza/account-payment/6.1-account_payment_extension_store/+merge/203596

[Lorenzo Battistini (elbati)]

Since 'amount_to_pay' is stored, is '_to_pay_search' still needed?

review: Needs Information

[lp:~pedro.baeza/account-payment/7.0-account_payment_extension_store]

108. By Pedro Manuel Baeza on 2014-01-30

[IMP] account_payment_extension: method _to_pay_search removed.

[Pedro Manuel Baeza (pedro.baeza)]

Indeed, it is not needed anymore.

I have remove it.

Thanks for the review.

Regards.

[Lorenzo Battistini (elbati)]

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

review: Approve (code review)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

    result = {}
    line_obj = self.pool['payment.line']
    for line in line_obj.browse(cr, uid, ids, context=context):
        result[line.move_line_id.id] = True
        result[line.payment_move_id.id] = True
    return result.keys()

is a somewhat awkward manner to do:

    result = set()
    line_obj = self.pool['payment.line']
    for line in line_obj.browse(cr, uid, ids, context=context):
        result.add(line.move_line_id.id)
        result.add(line.payment_move_id.id)
    return list(result)

On line 72 of the diff:

    'account.move.line': (lambda self, cr, uid, ids, c={}: ids,

There is a mutable default argument, it should be replaced by None

Would you agree to change that?
Thanks

review: Needs Fixing

[lp:~pedro.baeza/account-payment/7.0-account_payment_extension_store]

109. By Pedro Manuel Baeza on 2014-03-21

[IMP] account_payment_extension: dicts replaced by sets on store functions an mutable argument removed.

[Pedro Manuel Baeza (pedro.baeza)]

Guewen, thanks for your comments. They are done.

Regards.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks!

review: Approve (code review)

=== modified file 'account_payment_extension/account_move_line.py'
--- account_payment_extension/account_move_line.py	2013-11-10 17:00:26 +0000
+++ account_payment_extension/account_move_line.py	2014-03-21 11:20:36 +0000
@@ -120,27 +120,6 @@
             result[move_id] = debt
         return result
 
-    def _to_pay_search(self, cr, uid, obj, name, args, context={}):
-        if not len(args):
-            return []
-        currency = self.pool.get('res.users').browse(
-            cr, uid, uid, context).company_id.currency_id
-
-        # For searching we first discard reconciled moves
-        # because the filter is fast and discards most records quickly.
-        ids = self.pool.get('account.move.line').search(
-            cr, uid, [('reconcile_id', '=', False)], context=context)
-        records = self.pool.get('account.move.line').read(
-            cr, uid, ids, ['id', 'amount_to_pay'], context)
-        ids = []
-        for record in records:
-            if not self.pool.get('res.currency').is_zero(
-                cr, uid, currency, record['amount_to_pay']):
-                ids.append(record['id'])
-        if not ids:
-            return [('id', '=', False)]
-        return [('id', 'in', ids)]
-
     def _payment_type_get(self, cr, uid, ids, field_name, arg, context={}):
         result = {}
         invoice_obj = self.pool.get('account.invoice')
@@ -184,6 +163,33 @@
                 result = [('id', 'in', [x[0] for x in res])]
         return result
 
+    def _get_move_lines(self, cr, uid, ids, context=None):
+        result = set()
+        line_obj = self.pool['payment.line']
+        for line in line_obj.browse(cr, uid, ids, context=context):
+            result.add(line.move_line_id.id)
+            result.add(line.payment_move_id.id)
+        return list(result)
+
+    def _get_move_lines_order(self, cr, uid, ids, context=None):
+        result = set()
+        order_obj = self.pool['payment.order']
+        for order in order_obj.browse(cr, uid, ids, context=context):
+            for line in order.line_ids:
+                result.add(line.move_line_id.id)
+                result.add(line.payment_move_id.id)
+        return list(result)
+
+    def _get_reconcile(self, cr, uid, ids, context=None):
+        result = set()
+        reconcile_obj = self.pool['account.move.reconcile']
+        for reconcile in reconcile_obj.browse(cr, uid, ids, context=context):
+            for line in reconcile.line_id:
+                result.add(line.id)
+            for line in reconcile.line_partial_ids:
+                result.add(line.id)
+        return list(result)
+
     _columns = {
         'received_check': fields.boolean('Received check',
             help="""To write down that a check in paper support has
@@ -191,7 +197,15 @@
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account'),
         'amount_to_pay': fields.function(
             amount_to_pay, method=True, type='float', string='Amount to pay',
-            fnct_search=_to_pay_search),
+            store={
+                   'account.move.line': (lambda self, cr, uid, ids,
+                                         context=None: ids, None, 20),
+                   'payment.order': (_get_move_lines_order, ['line_ids'], 20),
+                   'payment.line': (_get_move_lines,
+                        ['type', 'move_line_id', 'payment_move_id'], 20),
+                   'account.move.reconcile': (_get_reconcile,
+                        ['line_id', 'line_partial_ids'], 20)
+                   }),
         'payment_type': fields.function(_payment_type_get,
             type="many2one", relation="payment.type", method=True,
             string="Payment type", fnct_search=_payment_type_search),