=== modified file 'account_payment_discount_extension/wizard/wizard_payment_discount_order.py' --- account_payment_discount_extension/wizard/wizard_payment_discount_order.py 2010-09-13 08:56:04 +0000 +++ account_payment_discount_extension/wizard/wizard_payment_discount_order.py 2010-09-15 15:39:41 +0000 @@ -62,7 +62,7 @@ ctx = '''context="{'journal_id': %d}"''' % payment.mode.journal.id # Search for move line to pay: - domain = [('reconcile_id', '=', False),('account_id.type', '=', payment.type)]#,('account_id.type', '=', payment.type),('amount_to_pay', '<>', 0)] + domain = [('reconcile_id', '=', False),('account_id.type', '=', payment.type),('amount_to_pay', '>', 0)]#,('account_id.type', '=', payment.type),('amount_to_pay', '<>', 0)] # domain = domain + ['|',('date_maturity','<',search_due_date),('date_maturity','=',False)] #if payment.mode: # domain = [('payment_type','=',payment.mode.type.id)] + domain @@ -73,7 +73,7 @@ if line.invoice.id: invoice_data = invoice_obj.browse(cr, uid, line.invoice.id, context=context) current_date = datetime.now().strftime('%Y-%m-%d') - if invoice_data.date_due >= current_date and invoice_data.date_due <= search_due_date: + if invoice_data.date_due <= search_due_date or (invoice_data.next_payment_date >= current_date and invoice_data.next_payment_date < search_due_date): line_ids.append(line.id) FORM.string = '''