Merge lp:~mikel-martin/account-payment/6.1-fix-1199076 into lp:~account-payment-team/account-payment/6.1

[mikel]

Fix for https://bugs.launchpad.net/account-payment/+bug/1199076

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Mikel,

Indeed, this bug is very annoying, but I have found one problem in the SQL statement. In the line

left join account_move_line r on l.reconcile_id=r.reconcile_id and l.id<>l.id '

it compares l.id with l.id instead of l.id with r.id.

For the rest, I'm not sure what is the original purpose of this piece of code. Can you explain to me to be able to give a proper review?

Anyways, thanks for the patch :)

review: Needs Information

[lp:~mikel-martin/account-payment/6.1-fix-1199076]

104. By mikel <mikel@hide> on 2013-07-15

[FIX] sql in account_move_line _invoice method

[mikel (mikel-martin)]

Thanks for your review Pedro, you are right.

This method populates the invoice field, putting there invoice names related wtih the move, directly or because this move pays the invoice partially or completly.

[Pedro Manuel Baeza (pedro.baeza)]

OK, now I understand. Maybe avoid SQL code would be desirable, but I think here there will be a performance impact.

Let's wait for another review to proceed to be sure.

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

Can anyone more review this MP so that it can be merged, because this bug is causing troubles to some people?

Thank you.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review, no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Is it also occurring in the module for the version 7?
I see the code is not the same but the query is more simple in V7.

Can you eventually propose a MP for v7 too please?

This one is merged. Thanks

[mikel (mikel-martin)]

Thanks for the Merge ;).

I'm not familiar with V7 yet. I can't MP for v7 in the short term.

[Pedro Manuel Baeza (pedro.baeza)]

I'll check it and do a similar MP to v7.

Regards.

[Pedro Manuel Baeza (pedro.baeza)]

I have made the MP to 7.0:

https://code.launchpad.net/~pedro.baeza/account-payment/7.0-invoice-name/+merge/183240

The question is that standard _invoice method doesn't retrieve correctly the invoice name in all the cases (for example, on partial reconciled entries), and this code is for repairing this behaviour. Maybe it can be merged on core, but for now this formula works.

Regards.

=== modified file 'account_payment_extension/account_move_line.py'
--- account_payment_extension/account_move_line.py	2013-03-12 18:25:33 +0000
+++ account_payment_extension/account_move_line.py	2013-07-15 10:25:31 +0000
@@ -36,51 +36,21 @@
         res = {}
         for line_id in ids:
             res[line_id] = False
+        
         cursor.execute('SELECT l.id, i.id ' \
-                        'FROM account_move_line l, account_invoice i ' \
-                        'WHERE l.move_id = i.move_id ' \
-                        'AND l.id IN %s',
+                       'FROM account_invoice i,account_move_line l ' \
+                       'left join account_move_line r on l.reconcile_id=r.reconcile_id and l.id<>r.id ' \
+                       'left join account_move_line p on l.reconcile_partial_id=p.reconcile_partial_id and l.id<>p.id ' \
+                       'where (i.move_id = l.move_id or i.move_id = r.move_id or i.move_id = p.move_id) ' \
+                       'AND l.id IN %s',
                         (tuple(ids),))
-        invoice_ids = []
-        
+        invoice_ids = []        
  
         for line_id, invoice_id in cursor.fetchall():
-            res[line_id] = invoice_id
-            invoice_ids.append(invoice_id)
-        invoice_names = {False: ''}
-        for invoice_id, name in invoice_obj.name_get(cursor, user, invoice_ids, context=context):
-            invoice_names[invoice_id] = name
-        for line_id in res.keys():
-            invoice_id = res[line_id]
-            res[line_id] = (invoice_id, invoice_names[invoice_id])
-        
-        for key in res.keys():
-            if res[key][0] == False:   
-            # if there is no a direct invoice related
-                move_line_obj = self.pool.get('account.move.line')
-                line1 = move_line_obj.browse(cursor, user, key)
-                move = self.pool.get('account.move').browse (cursor, user, line1.move_id.id)
-                
-                if move:
-                    for line_in in move.line_id:
-                        if line_in.id <> key and (line_in.reconcile_id or line_in.reconcile_partial_id):
-                            if line_in.reconcile_id:
-                                for line_in2 in line_in.reconcile_id.line_id:
-                                    if line_in2.id <> line_in.id:
-                                        dict = self._invoice (cursor, user, [line_in2.id], name, arg, context)
-                                        for item in dict.keys():
-                                            res[key] = dict[item] 
-                            else:
-                                if line_in.reconcile_partial_id:
-                                   for line_in2 in line_in.reconcile_partial_id.line_partial_ids:
-                                       if line_in2.id <> line_in.id:
-                                           dict = self._invoice (cursor, user, [line_in2.id], name, arg, context)
-                                           for item in dict.keys():
-                                               res[key] = dict[item] 
-                                    
-                                    
+            name = invoice_obj.name_get(cursor, user, [invoice_id], context=context)
+            res[line_id] = (invoice_id, len(name)>0 and name[0])
         return res
-
+      
     #===========================================================================
     # def _invoice(self, cr, uid, ids, name, arg, context=None):
     #    return super(account_move_line, self)._invoice(cr, uid, ids, name, arg, context)