From 372c2123478fc603c35664211c4d9ff5ff4f2aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 17 Mar 2024 11:48:43 +0100
Subject: [PATCH] Set only periods or dates on the same line for general ledger
 context

Those fields may become invisible so they should not have any other field next
to them for when they become invisible.
---
 .../view/general_ledger_account_context_form.xml | 16 ++++++++++------
 .../view/general_ledger_line_context_form.xml    |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/account/view/general_ledger_account_context_form.xml b/modules/account/view/general_ledger_account_context_form.xml
index d4def84455..4c6bc1b5d1 100644
--- a/modules/account/view/general_ledger_account_context_form.xml
+++ b/modules/account/view/general_ledger_account_context_form.xml
@@ -1,22 +1,26 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<form col="6">
+<form>
     <label name="fiscalyear"/>
     <field name="fiscalyear"/>
     <label name="company"/>
     <field name="company"/>
-    <label name="posted"/>
-    <field name="posted"/>
+
+    <label name="journal"/>
+    <field name="journal" widget="selection"/>
+    <group col="-1" colspan="2" id="checkboxes">
+        <label name="posted"/>
+        <field name="posted"/>
+    </group>
+
     <label name="start_period"/>
     <field name="start_period"/>
     <label name="end_period"/>
     <field name="end_period"/>
-    <newline/>
+
     <label name="from_date"/>
     <field name="from_date"/>
     <label name="to_date"/>
     <field name="to_date"/>
-    <label name="journal"/>
-    <field name="journal" widget="selection"/>
 </form>
diff --git a/modules/account/view/general_ledger_line_context_form.xml b/modules/account/view/general_ledger_line_context_form.xml
index c790348477..b9e1c47f5b 100644
--- a/modules/account/view/general_ledger_line_context_form.xml
+++ b/modules/account/view/general_ledger_line_context_form.xml
@@ -2,7 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <data>
-    <xpath expr="/form/field[@name='end_period']" position="after">
+    <xpath expr="//group[@id='checkboxes']" position="inside">
         <label name="party_cumulate"/>
         <field name="party_cumulate"/>
     </xpath>