Skip to content

Commit

Permalink
[FIX] account_payment_order: Remove leftover options
Browse files Browse the repository at this point in the history
They are ignored since OCA#979, and there can't be equivalent.
  • Loading branch information
pedrobaeza authored and agyamuta committed Sep 11, 2023
1 parent d53ee7c commit 0e87b63
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 56 deletions.
34 changes: 1 addition & 33 deletions account_payment_order/models/account_payment_mode.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
# © 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# 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):
Expand Down Expand Up @@ -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):
Expand All @@ -116,11 +92,3 @@ def payment_method_id_change(self):
]
).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
8 changes: 0 additions & 8 deletions account_payment_order/tests/test_payment_mode.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,6 @@ def setUp(self):
}
)

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()
Expand Down
15 changes: 0 additions & 15 deletions account_payment_order/views/account_payment_mode.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,6 @@
<field name="default_invoice" />
<field name="default_date_type" />
</group>
<group
name="accounting-config"
string="Accounting Entries Options"
attrs="{'invisible': [('payment_order_ok', '=', False)]}"
>
<field name="generate_move" />
<field
name="move_option"
attrs="{'invisible': [('generate_move', '=', False)], 'required': [('generate_move', '=', True)]}"
/>
<field
name="post_move"
attrs="{'invisible': [('generate_move', '=', False)]}"
/>
</group>
</group>
</field>
</record>
Expand Down

0 comments on commit 0e87b63

Please sign in to comment.