diff --git a/account_payment_order/models/account_payment_mode.py b/account_payment_order/models/account_payment_mode.py index cc134930e..d1685e45e 100644 --- a/account_payment_order/models/account_payment_mode.py +++ b/account_payment_order/models/account_payment_mode.py @@ -4,8 +4,7 @@ # © 2016 Akretion (Alexis de Lattre ) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from odoo import _, api, fields, models -from odoo.exceptions import ValidationError +from odoo import api, fields, models class AccountPaymentMode(models.Model): @@ -72,29 +71,6 @@ class AccountPaymentMode(models.Model): "(other modules can set additional fields to restrict the " "grouping.)", ) - generate_move = fields.Boolean( - string="Generate Accounting Entries On File Upload", default=True - ) - move_option = fields.Selection( - selection=[ - ("date", "One move per payment date"), - ("line", "One move per payment line"), - ], - default="date", - ) - post_move = fields.Boolean(default=True) - - @api.constrains("generate_move", "move_option") - def transfer_move_constrains(self): - for mode in self: - if mode.generate_move and not mode.move_option: - raise ValidationError( - _( - "On the payment mode '%s', you must " - "choose an option for the 'Move Option' parameter." - ) - % mode.name - ) @api.onchange("payment_method_id") def payment_method_id_change(self): @@ -116,11 +92,3 @@ class AccountPaymentMode(models.Model): ] ).ids self.default_journal_ids = [(6, 0, aj_ids)] - - @api.onchange("generate_move") - def generate_move_change(self): - if self.generate_move: - # default values - self.move_option = "date" - else: - self.move_option = False diff --git a/account_payment_order/tests/test_payment_mode.py b/account_payment_order/tests/test_payment_mode.py index 0141fd510..ac7e468ca 100644 --- a/account_payment_order/tests/test_payment_mode.py +++ b/account_payment_order/tests/test_payment_mode.py @@ -47,14 +47,6 @@ class TestPaymentMode(TransactionCase): } ) - def test_onchange_generate_move(self): - self.payment_mode_c1.generate_move = True - self.payment_mode_c1.generate_move_change() - self.assertEqual(self.payment_mode_c1.move_option, "date") - self.payment_mode_c1.generate_move = False - self.payment_mode_c1.generate_move_change() - self.assertFalse(self.payment_mode_c1.move_option) - def test_onchange_payment_type(self): self.payment_mode_c1.payment_method_id = self.manual_in self.payment_mode_c1.payment_method_id_change() diff --git a/account_payment_order/views/account_payment_mode.xml b/account_payment_order/views/account_payment_mode.xml index 303d96704..1b7bdb01b 100644 --- a/account_payment_order/views/account_payment_mode.xml +++ b/account_payment_order/views/account_payment_mode.xml @@ -32,21 +32,6 @@ - - - - -