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

[Pedro Manuel Baeza]

As made on 6.1 branch, _invoice method of account_move_line has been improved for get correct invoice name.

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

102. By Pedro Manuel Baeza on 2013-09-02

[FIX] account_payment_extension: bug in account_move_line.py

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Indeed simple port of what been approved on 6.1 already. Looks good.

review: Approve

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

LGTM, thanks !

review: Approve (code review, no tests)

=== modified file 'account_payment_extension/account_move_line.py'
--- account_payment_extension/account_move_line.py	2013-01-02 17:48:45 +0000
+++ account_payment_extension/account_move_line.py	2013-09-02 13:29:12 +0000
@@ -31,7 +31,24 @@
     _inherit = 'account.move.line'
 
     def _invoice(self, cr, uid, ids, name, arg, context=None):
-        return super(account_move_line, self)._invoice(cr, uid, ids, name, arg, context)
+        invoice_obj = self.pool.get('account.invoice')
+        res = {}
+        for line_id in ids:
+            res[line_id] = False
+        
+        cursor.execute('SELECT l.id, i.id ' \
+                       '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 = []        
+ 
+        for line_id, invoice_id in cursor.fetchall():
+            name = invoice_obj.name_get(cursor, user, [invoice_id], context=context)
+            res[line_id] = name and name[0] or False
+        return res
 
     def _invoice_search(self, cr, uid, obj, name, args, context={}):
         """ Redefinition for searching account move lines without any invoice related ('invoice.id','=',False)"""