Ricardo Gomes Rodrigues (rigr)
3dad4b3cb1
This commit improves the payment terms by: - making the payment terms lines editable on-the-fly removing the need for a wizard - refactoring the computation of the payment terms - adds new demo data for payment terms - adds an example section where the user can test and preview the due dates and amount of its payment terms - adding a new parameter "Display terms on invoice". If set, the payment deadlines and respective due amounts will be detailed on invoices. The refactoring: - adds a field `months` (months to add after the invoice date) - adds a field `end_month` (if True, switch to the end of the month after having added months or days) - renames the field `day_of_the_month` to `days_after` (days to be added after the switching to the end of the month, only if `end_month` is set) - deletes the field `option` which was too restrictive - modifies the calculation of the payments terms taking into account these new fields This allows some combinations that were not possible before. Example: The French payment terms "30 jours fin de mois le 10" (which should be interpreted as "10 days after the end of the next month") can be encoded as ``` months = 1 days = 0 end_month = True days_after = 10 ``` Task id 2852814 closes odoo/odoo#91490 Related: odoo/enterprise#29661 Related: odoo/upgrade#3524 Signed-off-by: Laurent Smet <las@odoo.com>
212 lines
8.8 KiB
Python
212 lines
8.8 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
from odoo.addons.account.tests.common import AccountTestInvoicingCommon
|
|
from odoo.exceptions import ValidationError
|
|
from odoo.tests import tagged
|
|
from odoo import fields
|
|
from odoo.tests.common import Form
|
|
|
|
|
|
@tagged('post_install', '-at_install')
|
|
class TestAccountPaymentTerms(AccountTestInvoicingCommon):
|
|
@classmethod
|
|
def setUpClass(cls, chart_template_ref=None):
|
|
super().setUpClass(chart_template_ref=chart_template_ref)
|
|
cls.pay_term_today = cls.env['account.payment.term'].create({
|
|
'name': 'Today',
|
|
'line_ids': [
|
|
(0, 0, {
|
|
'value': 'balance',
|
|
'days': 0,
|
|
}),
|
|
],
|
|
})
|
|
|
|
cls.pay_term_next_month_on_the_15 = cls.env['account.payment.term'].create({
|
|
'name': 'Next month on the 15th',
|
|
'line_ids': [
|
|
(0, 0, {
|
|
'value': 'balance',
|
|
'days': 0,
|
|
'end_month': True,
|
|
'days_after': 15,
|
|
}),
|
|
],
|
|
})
|
|
|
|
cls.pay_term_last_day_of_month = cls.env['account.payment.term'].create({
|
|
'name': 'Last Day of month',
|
|
'line_ids': [
|
|
(0, 0, {
|
|
'value': 'balance',
|
|
'days': 0,
|
|
'end_month': True
|
|
}),
|
|
],
|
|
})
|
|
|
|
cls.pay_term_first_day_next_month = cls.env['account.payment.term'].create({
|
|
'name': 'First day next month',
|
|
'line_ids': [
|
|
(0, 0, {
|
|
'value': 'balance',
|
|
'days': 0,
|
|
'end_month': True,
|
|
'days_after': 1,
|
|
}),
|
|
],
|
|
})
|
|
|
|
cls.pay_term_net_30_days = cls.env['account.payment.term'].create({
|
|
'name': 'Net 30 days',
|
|
'line_ids': [
|
|
(0, 0, {
|
|
'value': 'balance',
|
|
'days': 30,
|
|
}),
|
|
],
|
|
})
|
|
|
|
cls.pay_term_30_days_end_of_month = cls.env['account.payment.term'].create({
|
|
'name': '30 days end of month',
|
|
'line_ids': [
|
|
(0, 0, {
|
|
'value': 'balance',
|
|
'days': 30,
|
|
'end_month': True
|
|
}),
|
|
],
|
|
})
|
|
|
|
cls.pay_term_1_month_end_of_month = cls.env['account.payment.term'].create({
|
|
'name': '1 month, end of month',
|
|
'line_ids': [
|
|
(0, 0, {
|
|
'value': 'balance',
|
|
'months': 1,
|
|
'days': 0,
|
|
'end_month': True
|
|
}),
|
|
],
|
|
})
|
|
|
|
cls.pay_term_30_days_end_of_month_the_10 = cls.env['account.payment.term'].create({
|
|
'name': '30 days end of month the 10th',
|
|
'line_ids': [
|
|
(0, 0, {
|
|
'value': 'balance',
|
|
'days': 30,
|
|
'end_month': True,
|
|
'days_after': 10,
|
|
}),
|
|
],
|
|
})
|
|
|
|
cls.pay_term_90_days_end_of_month_the_10 = cls.env['account.payment.term'].create({
|
|
'name': '90 days end of month the 10',
|
|
'line_ids': [
|
|
(0, 0, {
|
|
'value': 'balance',
|
|
'days': 90,
|
|
'end_month': True,
|
|
'days_after': 10,
|
|
}),
|
|
],
|
|
})
|
|
|
|
cls.pay_term_3_months_end_of_month_the_10 = cls.env['account.payment.term'].create({
|
|
'name': '3 months end of month the 10',
|
|
'line_ids': [
|
|
(0, 0, {
|
|
'value': 'balance',
|
|
'months': 3,
|
|
'end_month': True,
|
|
'days_after': 10,
|
|
}),
|
|
],
|
|
})
|
|
|
|
cls.pay_term_end_month_on_the_30th = cls.env['account.payment.term'].create({
|
|
'name': 'End of month, the 30th',
|
|
'line_ids': [
|
|
(0, 0, {
|
|
'value': 'balance',
|
|
'end_month': True,
|
|
'days_after': 30,
|
|
}),
|
|
],
|
|
})
|
|
|
|
cls.pay_term_1_month_15_days_end_month_45_days = cls.env['account.payment.term'].create({
|
|
'name': '1 month, 15 days, end month, 45 days',
|
|
'line_ids': [
|
|
(0, 0, {
|
|
'value': 'balance',
|
|
'months': 1,
|
|
'days': 15,
|
|
'end_month': True,
|
|
'days_after': 45,
|
|
}),
|
|
],
|
|
})
|
|
|
|
cls.invoice = cls.init_invoice('out_refund', products=cls.product_a+cls.product_b)
|
|
|
|
def assertPaymentTerm(self, pay_term, invoice_date, dates):
|
|
with Form(self.invoice) as move_form:
|
|
move_form.invoice_payment_term_id = pay_term
|
|
move_form.invoice_date = invoice_date
|
|
self.assertEqual(
|
|
self.invoice.line_ids.filtered(
|
|
lambda l: l.account_id == self.company_data['default_account_receivable']
|
|
).mapped('date_maturity'),
|
|
[fields.Date.from_string(date) for date in dates],
|
|
)
|
|
|
|
def test_payment_term(self):
|
|
self.assertPaymentTerm(self.pay_term_today, '2019-01-01', ['2019-01-01'])
|
|
self.assertPaymentTerm(self.pay_term_today, '2019-01-15', ['2019-01-15'])
|
|
self.assertPaymentTerm(self.pay_term_today, '2019-01-31', ['2019-01-31'])
|
|
self.assertPaymentTerm(self.pay_term_next_month_on_the_15, '2019-01-01', ['2019-02-15'])
|
|
self.assertPaymentTerm(self.pay_term_next_month_on_the_15, '2019-01-15', ['2019-02-15'])
|
|
self.assertPaymentTerm(self.pay_term_next_month_on_the_15, '2019-01-31', ['2019-02-15'])
|
|
self.assertPaymentTerm(self.pay_term_last_day_of_month, '2019-01-01', ['2019-01-31'])
|
|
self.assertPaymentTerm(self.pay_term_last_day_of_month, '2019-01-15', ['2019-01-31'])
|
|
self.assertPaymentTerm(self.pay_term_last_day_of_month, '2019-01-31', ['2019-01-31'])
|
|
self.assertPaymentTerm(self.pay_term_first_day_next_month, '2019-01-01', ['2019-02-01'])
|
|
self.assertPaymentTerm(self.pay_term_first_day_next_month, '2019-01-15', ['2019-02-01'])
|
|
self.assertPaymentTerm(self.pay_term_first_day_next_month, '2019-01-31', ['2019-02-01'])
|
|
self.assertPaymentTerm(self.pay_term_net_30_days, '2022-01-01', ['2022-01-31'])
|
|
self.assertPaymentTerm(self.pay_term_net_30_days, '2022-01-15', ['2022-02-14'])
|
|
self.assertPaymentTerm(self.pay_term_net_30_days, '2022-01-31', ['2022-03-02'])
|
|
self.assertPaymentTerm(self.pay_term_30_days_end_of_month, '2022-01-01', ['2022-01-31'])
|
|
self.assertPaymentTerm(self.pay_term_30_days_end_of_month, '2022-01-15', ['2022-02-28'])
|
|
self.assertPaymentTerm(self.pay_term_30_days_end_of_month, '2022-01-31', ['2022-03-31'])
|
|
self.assertPaymentTerm(self.pay_term_1_month_end_of_month, '2022-01-01', ['2022-02-28'])
|
|
self.assertPaymentTerm(self.pay_term_1_month_end_of_month, '2022-01-15', ['2022-02-28'])
|
|
self.assertPaymentTerm(self.pay_term_1_month_end_of_month, '2022-01-31', ['2022-02-28'])
|
|
self.assertPaymentTerm(self.pay_term_30_days_end_of_month_the_10, '2022-01-01', ['2022-02-10'])
|
|
self.assertPaymentTerm(self.pay_term_30_days_end_of_month_the_10, '2022-01-15', ['2022-03-10'])
|
|
self.assertPaymentTerm(self.pay_term_30_days_end_of_month_the_10, '2022-01-31', ['2022-04-10'])
|
|
self.assertPaymentTerm(self.pay_term_90_days_end_of_month_the_10, '2022-01-01', ['2022-05-10'])
|
|
self.assertPaymentTerm(self.pay_term_90_days_end_of_month_the_10, '2022-01-15', ['2022-05-10'])
|
|
self.assertPaymentTerm(self.pay_term_90_days_end_of_month_the_10, '2022-01-31', ['2022-06-10'])
|
|
self.assertPaymentTerm(self.pay_term_3_months_end_of_month_the_10, '2022-01-01', ['2022-05-10'])
|
|
self.assertPaymentTerm(self.pay_term_3_months_end_of_month_the_10, '2022-01-15', ['2022-05-10'])
|
|
self.assertPaymentTerm(self.pay_term_3_months_end_of_month_the_10, '2022-01-31', ['2022-05-10'])
|
|
self.assertPaymentTerm(self.pay_term_1_month_15_days_end_month_45_days, '2022-01-01', ['2022-04-14'])
|
|
self.assertPaymentTerm(self.pay_term_1_month_15_days_end_month_45_days, '2022-01-15', ['2022-05-15'])
|
|
self.assertPaymentTerm(self.pay_term_1_month_15_days_end_month_45_days, '2022-01-31', ['2022-05-15'])
|
|
|
|
def test_wrong_payment_term(self):
|
|
with self.assertRaises(ValidationError):
|
|
self.env['account.payment.term'].create({
|
|
'name': 'Wrong Payment Term',
|
|
'line_ids': [
|
|
(0, 0, {
|
|
'value': 'balance',
|
|
'months': -1,
|
|
}),
|
|
],
|
|
})
|