account-payment-team team mailing list archive
-
account-payment-team team
-
Mailing list archive
-
Message #00167
[Merge] lp:~pedro.baeza/account-payment/7.0-invoice-name into lp:account-payment/7.0
Pedro Manuel Baeza has proposed merging lp:~pedro.baeza/account-payment/7.0-invoice-name into lp:account-payment/7.0.
Requested reviews:
Account Payment (account-payment-team)
For more details, see:
https://code.launchpad.net/~pedro.baeza/account-payment/7.0-invoice-name/+merge/183240
As made on 6.1 branch, _invoice method of account_move_line has been improved for get correct invoice name.
--
https://code.launchpad.net/~pedro.baeza/account-payment/7.0-invoice-name/+merge/183240
Your team Account Payment is requested to review the proposed merge of lp:~pedro.baeza/account-payment/7.0-invoice-name into lp:account-payment/7.0.
=== 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-08-30 17:29:30 +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] = (invoice_id, len(name)>0 and name[0])
+ 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)"""
Follow ups