From 8b40f33a9d1b131aeffee1a5c5e5ab2fed4ca5a0 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Sat, 4 Aug 2018 08:00:42 +0200
Subject: [PATCH] [IMP]GOLEM Activity Registration Payment : better invoicing
 form organization

---
 .../__manifest__.py                           |  2 +-
 .../golem_activity_registration_invoicing.xml | 38 +++++++++++--------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/golem_activity_registration_payment/__manifest__.py b/golem_activity_registration_payment/__manifest__.py
index 2efc462..5b87131 100644
--- a/golem_activity_registration_payment/__manifest__.py
+++ b/golem_activity_registration_payment/__manifest__.py
@@ -19,7 +19,7 @@
     'name': 'GOLEM Activity Member Registration Payments',
     'summary': 'GOLEM Activities Member Registration Payments',
     'description': 'GOLEM Activities Member Registration Payments',
-    'version': '10.0.0.3.2',
+    'version': '10.0.0.3.3',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
diff --git a/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.xml b/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.xml
index 6669b63..4c37847 100644
--- a/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.xml
+++ b/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.xml
@@ -31,28 +31,34 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             Please confirm activity prices and choose a payment schedule if needed.
           </p>
           <group states="init">
-            <field name="season_id" readonly="1" />
-            <field name="member_id" readonly="1" />
-            <field name="line_ids" string="Activities and Prices">
-              <tree delete="false" create="false" edit="true" editable="bottom">
-                <field name="activity_id" readonly="1" />
-                <field name="currency_id" invisible="1" />
-                <field name="price" sum="Total" />
-              </tree>
-            </field>
-            <field name="schedule_id" context="{'default_season_id': season_id}" />
-            <field name="journal_id" string="Payment method"
-              options="{'no_create': True}"
-              attrs="{'invisible': [('schedule_id', '=', False)],
-              'required': [('schedule_id', '!=', False)]}" />
+            <group name="lines" colspan="2">
+              <field name="season_id" readonly="1" />
+              <field name="member_id" readonly="1" />
+              <field name="line_ids" string="Activities and Prices">
+                <tree delete="false" create="false" edit="true" editable="bottom">
+                  <field name="activity_id" readonly="1" />
+                  <field name="currency_id" invisible="1" />
+                  <field name="price" sum="Total" />
+                </tree>
+              </field>
+            </group>
+            <group name="payment" colspan="2">
+              <field name="schedule_id" context="{'default_season_id': season_id}" />
+              <field name="journal_id" string="Payment method"
+                options="{'no_create': True}"
+                attrs="{'invisible': [('schedule_id', '=', False)],
+                'required': [('schedule_id', '!=', False)]}" />
+            </group>
           </group>
           <p states="init">If the service user wants to pay with several payment methods, please validate with the main one, go to the payments and change journal on those needed.</p>
           <p states="final">
             Congratulations, activities had been confirmed and invoiced.
           </p>
           <group states="final">
-            <field name="invoice_id" readonly="1" />
-            <field name="payment_ids" readonly="1" />
+            <group>
+              <field name="invoice_id" readonly="1" />
+              <field name="payment_ids" readonly="1" />
+            </group>
           </group>
           <footer>
             <button name="validate" string="Validate" type="object"