From 3880a155af2e0cf55f3932787a79bb17dbe2fbc8 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sun, 2 Sep 2018 15:16:37 +0200 Subject: [PATCH] [10.0] Add filter on partners on wizard "Create Payment Lines from Journal Items" (#489) * Add filter on partners on wizard "Create Payment Lines from Journal Items" * Bump version number --- account_payment_order/__manifest__.py | 2 +- .../wizard/account_payment_line_create.py | 12 ++++++++---- .../wizard/account_payment_line_create_view.xml | 5 ++++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/account_payment_order/__manifest__.py b/account_payment_order/__manifest__.py index 9a973cde3..dfef4ca3d 100644 --- a/account_payment_order/__manifest__.py +++ b/account_payment_order/__manifest__.py @@ -8,7 +8,7 @@ { 'name': 'Account Payment Order', - 'version': '11.0.1.2.2', + 'version': '11.0.1.3.0', 'license': 'AGPL-3', 'author': "ACSONE SA/NV, " "Therp BV, " diff --git a/account_payment_order/wizard/account_payment_line_create.py b/account_payment_order/wizard/account_payment_line_create.py index acb9599de..50ad3417b 100644 --- a/account_payment_order/wizard/account_payment_line_create.py +++ b/account_payment_order/wizard/account_payment_line_create.py @@ -16,6 +16,8 @@ class AccountPaymentLineCreate(models.TransientModel): 'account.payment.order', string='Payment Order') journal_ids = fields.Many2many( 'account.journal', string='Journals Filter') + partner_ids = fields.Many2many( + 'res.partner', string='Partners', domain=[('parent_id', '=', False)]) target_move = fields.Selection([ ('posted', 'All Posted Entries'), ('all', 'All Entries'), @@ -61,10 +63,12 @@ class AccountPaymentLineCreate(models.TransientModel): @api.multi def _prepare_move_line_domain(self): self.ensure_one() - journals = self.journal_ids or self.env['account.journal'].search([]) domain = [('reconciled', '=', False), - ('company_id', '=', self.order_id.company_id.id), - ('journal_id', 'in', journals.ids)] + ('company_id', '=', self.order_id.company_id.id)] + if self.journal_ids: + domain += [('journal_id', 'in', self.journal_ids.ids)] + if self.partner_ids: + domain += [('partner_id', 'in', self.partner_ids.ids)] if self.target_move == 'posted': domain += [('move_id.state', '=', 'posted')] if not self.allow_blocked: @@ -135,7 +139,7 @@ class AccountPaymentLineCreate(models.TransientModel): @api.onchange( 'date_type', 'move_date', 'due_date', 'journal_ids', 'invoice', - 'target_move', 'allow_blocked', 'payment_mode') + 'target_move', 'allow_blocked', 'payment_mode', 'partner_ids') def move_line_filters_change(self): domain = self._prepare_move_line_domain() res = {'domain': {'move_line_ids': domain}} diff --git a/account_payment_order/wizard/account_payment_line_create_view.xml b/account_payment_order/wizard/account_payment_line_create_view.xml index 9919bd0c7..5b1e97382 100644 --- a/account_payment_order/wizard/account_payment_line_create_view.xml +++ b/account_payment_order/wizard/account_payment_line_create_view.xml @@ -19,7 +19,10 @@ + placeholder="Keep empty for using all journals"/> +