From fdb14fb21e35e761da0c00621047bd025f924d5c Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Tue, 16 May 2017 22:18:30 +0200 Subject: [PATCH 1/2] Add 'post_move' option on account.payment.mode --- account_payment_order/models/account_payment_mode.py | 1 + account_payment_order/models/account_payment_order.py | 4 +++- account_payment_order/views/account_payment_mode.xml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/account_payment_order/models/account_payment_mode.py b/account_payment_order/models/account_payment_mode.py index b41e46e37..0525c5d41 100644 --- a/account_payment_order/models/account_payment_mode.py +++ b/account_payment_order/models/account_payment_mode.py @@ -73,6 +73,7 @@ class AccountPaymentMode(models.Model): ('date', 'One move per payment date'), ('line', 'One move per payment line'), ], string='Move Option', default='date') + post_move = fields.Boolean(string='Post Move') @api.multi @api.constrains( diff --git a/account_payment_order/models/account_payment_order.py b/account_payment_order/models/account_payment_order.py index 3e1013be7..b3254ab8a 100644 --- a/account_payment_order/models/account_payment_order.py +++ b/account_payment_order/models/account_payment_order.py @@ -433,6 +433,7 @@ class AccountPaymentOrder(models.Model): """ self.ensure_one() am_obj = self.env['account.move'] + post_move = self.payment_mode_id.post_move # prepare a dict "trfmoves" that can be used when # self.payment_mode_id.move_option = date or line # key = unique identifier (date or True or line.id) @@ -459,4 +460,5 @@ class AccountPaymentOrder(models.Model): mvals['line_ids'].append((0, 0, trf_ml_vals)) move = am_obj.create(mvals) blines.reconcile_payment_lines() - move.post() + if post_move: + move.post() diff --git a/account_payment_order/views/account_payment_mode.xml b/account_payment_order/views/account_payment_mode.xml index c8f3b628c..3d43f876d 100644 --- a/account_payment_order/views/account_payment_mode.xml +++ b/account_payment_order/views/account_payment_mode.xml @@ -40,6 +40,7 @@ attrs="{'invisible': [('offsetting_account', '!=', 'transfer_account')], 'required': [('offsetting_account', '=', 'transfer_account')]}"/> + From 87d6135cbe47471341eb13c24a0325551db41ae5 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 17 May 2017 09:09:18 +0200 Subject: [PATCH 2/2] post_move default True, to keep the previous behavior Bump up version number --- account_payment_order/__manifest__.py | 2 +- account_payment_order/models/account_payment_mode.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/account_payment_order/__manifest__.py b/account_payment_order/__manifest__.py index b32f0fa07..44c8be222 100644 --- a/account_payment_order/__manifest__.py +++ b/account_payment_order/__manifest__.py @@ -9,7 +9,7 @@ { 'name': 'Account Payment Order', - 'version': '10.0.1.1.1', + 'version': '10.0.1.1.2', 'license': 'AGPL-3', 'author': "ACSONE SA/NV, " "Therp BV, " diff --git a/account_payment_order/models/account_payment_mode.py b/account_payment_order/models/account_payment_mode.py index 0525c5d41..570028dbf 100644 --- a/account_payment_order/models/account_payment_mode.py +++ b/account_payment_order/models/account_payment_mode.py @@ -73,7 +73,7 @@ class AccountPaymentMode(models.Model): ('date', 'One move per payment date'), ('line', 'One move per payment line'), ], string='Move Option', default='date') - post_move = fields.Boolean(string='Post Move') + post_move = fields.Boolean(string='Post Move', default=True) @api.multi @api.constrains(