From a130ee3ecb2d85c60464a188aba9fa7b28278bef Mon Sep 17 00:00:00 2001
From: "Adrien Peiffer (ACSONE)" <adrien.peiffer@acsone.eu>
Date: Tue, 20 Jan 2015 22:03:47 +0100
Subject: [PATCH] [IMP] Overwrite extend_payment_order_domain method instead of
 search_entries

---
 .../wizard/account_payment_create.py          | 49 +++++++------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/account_cash_discount_payment/wizard/account_payment_create.py b/account_cash_discount_payment/wizard/account_payment_create.py
index fb87b7a336b..62a125a2c37 100644
--- a/account_cash_discount_payment/wizard/account_payment_create.py
+++ b/account_cash_discount_payment/wizard/account_payment_create.py
@@ -50,34 +50,21 @@ def _prepare_payment_line(self, payment, line):
         return res
 
     @api.multi
-    def search_entries(self):
-        if not self.cash_discount_date:
-            return super(PaymentOrderCreate, self).search_entries()
-        line_obj = self.env['account.move.line']
-        model_data_obj = self.env['ir.model.data']
-        # -- start account_banking_payment --
-        payment = self.env['payment.order'].browse(
-            self.env.context['active_id'])
-        # Search for move line to pay:
-        domain = [('move_id.state', '=', 'posted'),
-                  ('reconcile_id', '=', False),
-                  ('company_id', '=', payment.mode.company_id.id)]
-        self.extend_payment_order_domain(payment, domain)
-        # -- end account_direct_debit --
-        domain += [('invoice.discount_due_date', '<=', self.duedate)]
-        lines = line_obj.search(domain)
-        context = self.env.context.copy()
-        context['line_ids'] = lines.ids
-        context['populate_results'] = self.populate_results
-        model_datas = model_data_obj.search(
-            [('model', '=', 'ir.ui.view'),
-             ('name', '=', 'view_create_payment_order_lines')])
-        return {'name': _('Entry Lines'),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'payment.order.create',
-                'views': [(model_datas[0].res_id, 'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                }
+    def extend_payment_order_domain(self, payment_order, domain):
+        # TODO : Improvement to remove partial domain (while loop)
+        self.ensure_one()
+        super(PaymentOrderCreate, self)\
+            .extend_payment_order_domain(payment_order, domain)
+        if self.cash_discount_date:
+            pos = 0
+            while pos < len(domain):
+                if pos < len(domain)-2 and domain[pos] == '|' and \
+                        domain[pos+1] == ('date_maturity', '<=', self.duedate) \
+                        and domain[pos+2] == ('date_maturity', '=', False):
+                    domain.pop(pos)
+                    domain.pop(pos)
+                    domain.pop(pos)
+                    break
+                pos += 1
+            domain += [('invoice.discount_due_date', '<=', self.duedate)]
+        return True