From 5d2bc18e3dbf326204b6d987a7a8c88301099f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 2 Nov 2023 16:21:25 +0100
Subject: [PATCH] Display fields of payment term delta in application order

The user may not know the order in which the relativedelta operations are
applied.
---
 .../payment_term_line_relativedelta_form.xml  | 20 ++++++++++++-------
 .../payment_term_line_relativedelta_list.xml  |  6 +++---
 ..._term_line_relativedelta_list_sequence.xml |  6 +++---
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/modules/account_invoice/view/payment_term_line_relativedelta_form.xml b/modules/account_invoice/view/payment_term_line_relativedelta_form.xml
index 6e9377c780..de15aff84f 100644
--- a/modules/account_invoice/view/payment_term_line_relativedelta_form.xml
+++ b/modules/account_invoice/view/payment_term_line_relativedelta_form.xml
@@ -6,16 +6,22 @@ this repository contains the full copyright notices and license terms. -->
     <field name="line"/>
     <label name="sequence"/>
     <field name="sequence"/>
-    <label name="months"/>
-    <field name="months"/>
+
+    <label id="help" string="Operations are applied in this displayed order." colspan="4" xalign="0"/>
+
     <label name="month"/>
     <field name="month" widget="selection"/>
+    <label name="months"/>
+    <field name="months"/>
+
     <label name="weeks"/>
-    <field name="weeks"/>
-    <label name="weekday"/>
-    <field name="weekday" widget="selection"/>
-    <label name="days"/>
-    <field name="days"/>
+    <field name="weeks" colspan="3"/>
+
     <label name="day"/>
     <field name="day"/>
+    <label name="days"/>
+    <field name="days"/>
+
+    <label name="weekday"/>
+    <field name="weekday" widget="selection" colspan="3"/>
 </form>
diff --git a/modules/account_invoice/view/payment_term_line_relativedelta_list.xml b/modules/account_invoice/view/payment_term_line_relativedelta_list.xml
index d06f4646fb..4086e8e109 100644
--- a/modules/account_invoice/view/payment_term_line_relativedelta_list.xml
+++ b/modules/account_invoice/view/payment_term_line_relativedelta_list.xml
@@ -3,10 +3,10 @@
 this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="line"/>
-    <field name="months"/>
     <field name="month" widget="selection"/>
+    <field name="months"/>
     <field name="weeks"/>
-    <field name="weekday" widget="selection"/>
-    <field name="days"/>
     <field name="day"/>
+    <field name="days"/>
+    <field name="weekday" widget="selection"/>
 </tree>
diff --git a/modules/account_invoice/view/payment_term_line_relativedelta_list_sequence.xml b/modules/account_invoice/view/payment_term_line_relativedelta_list_sequence.xml
index 1997d30359..7843f7d326 100644
--- a/modules/account_invoice/view/payment_term_line_relativedelta_list_sequence.xml
+++ b/modules/account_invoice/view/payment_term_line_relativedelta_list_sequence.xml
@@ -3,10 +3,10 @@
 this repository contains the full copyright notices and license terms. -->
 <tree sequence="sequence">
     <field name="line"/>
-    <field name="months"/>
     <field name="month" widget="selection"/>
+    <field name="months"/>
     <field name="weeks"/>
-    <field name="weekday" widget="selection"/>
-    <field name="days"/>
     <field name="day"/>
+    <field name="days"/>
+    <field name="weekday" widget="selection"/>
 </tree>