From b4cde303ebcef8742e9650b761d2720c52e921b0 Mon Sep 17 00:00:00 2001
From: David Ramia <david.ramia@processcontrol.es>
Date: Wed, 5 Jun 2024 11:27:02 +0200
Subject: [PATCH 1/2] [FIX] account_payment_term_extension: Add selection
 options translatable

---
 .../models/account_payment_term_line.py       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/account_payment_term_extension/models/account_payment_term_line.py b/account_payment_term_extension/models/account_payment_term_line.py
index 89e3bc5f101..1eef5619225 100644
--- a/account_payment_term_extension/models/account_payment_term_line.py
+++ b/account_payment_term_extension/models/account_payment_term_line.py
@@ -23,7 +23,7 @@ class AccountPaymentTermLine(models.Model):
         help="Sets the amount so that it is a multiple of this value.",
     )
     delay_type = fields.Selection(
-        selection=lambda self: self._get_delay_type(),
+        selection=lambda self: self._selection_delay_type(),
         ondelete={
             "weeks_after": "set default",
             "weeks_after_end_of_month": "set default",
@@ -47,25 +47,25 @@ class AccountPaymentTermLine(models.Model):
         "or spaces ( ).",
     )
 
-    def _get_delay_type(self):
+    def _selection_delay_type(self):
         delay_setting = self.env.company.payment_terms_delay_type
         payment_terms_delay_type = delay_setting or False
 
         delay_type = [
-            ("days_after", "Days after invoice date"),
-            ("days_after_end_of_month", "Days after end of month"),
-            ("days_after_end_of_next_month", "Days after end of next month"),
-            ("days_end_of_month_on_the", "Days end of month on the"),
+            ("days_after", _("Days after invoice date")),
+            ("days_after_end_of_month", _("Days after end of month")),
+            ("days_after_end_of_next_month", _("Days after end of next month")),
+            ("days_end_of_month_on_the", _("Days end of month on the")),
         ]
 
         weeks_delay_type = [
-            ("weeks_after", "Weeks after invoice date"),
-            ("weeks_after_end_of_month", "Weeks after end of month"),
-            ("weeks_after_end_of_next_month", "Weeks after end of next month"),
+            ("weeks_after", _("Weeks after invoice date")),
+            ("weeks_after_end_of_month", _("Weeks after end of month")),
+            ("weeks_after_end_of_next_month", _("Weeks after end of next month")),
         ]
         months_delay_type = [
-            ("months_after", "Months after invoice date"),
-            ("months_after_end_of_month", "Months after end of month"),
+            ("months_after", _("Months after invoice date")),
+            ("months_after_end_of_month", _("Months after end of month")),
         ]
 
         if payment_terms_delay_type:

From c72902db0a394cced31ea68a7e02c625090bcb47 Mon Sep 17 00:00:00 2001
From: David Ramia <david.ramia@processcontrol.es>
Date: Thu, 6 Jun 2024 22:21:48 +0200
Subject: [PATCH 2/2] [FIX] account_payment_term_extension: Fix form view

---
 account_payment_term_extension/views/account_payment_term.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/account_payment_term_extension/views/account_payment_term.xml b/account_payment_term_extension/views/account_payment_term.xml
index 27470fa6b38..77ac94801e8 100644
--- a/account_payment_term_extension/views/account_payment_term.xml
+++ b/account_payment_term_extension/views/account_payment_term.xml
@@ -16,9 +16,9 @@
         <field name="model">account.payment.term</field>
         <field name="inherit_id" ref="account.view_payment_term_form" />
         <field name="arch" type="xml">
-            <field name="company_id" position="after">
+            <xpath expr="//group/field[@name='company_id']" position="after">
                 <field name="sequential_lines" />
-            </field>
+            </xpath>
             <data>
                 <xpath expr="//sheet" position="inside">
                     <separator string="Holidays" col="12" />