From 7f57ffd1bc8703b8794cfdbd5f8a29b036556532 Mon Sep 17 00:00:00 2001
From: Lorenzo Battistini <lorenzo.battistini@agilebg.com>
Date: Tue, 23 Apr 2019 10:06:36 +0200
Subject: [PATCH] IMP account_vat_period_end_statement views (#4)

---
 .../views/account_view.xml                    | 23 +++++++++++++------
 .../wizard/add_period.xml                     | 11 ++++-----
 .../wizard/remove_period.xml                  | 12 ++++++----
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/account_vat_period_end_statement/views/account_view.xml b/account_vat_period_end_statement/views/account_view.xml
index be2e51d10873..cdb383cbe828 100644
--- a/account_vat_period_end_statement/views/account_view.xml
+++ b/account_vat_period_end_statement/views/account_view.xml
@@ -12,6 +12,12 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Vat statement">
+                <header>
+                    <button name="create_move" states="draft" type="object" string="Create Move" class="oe_highlight"/>
+                    <button name="statement_draft" type="object" states="confirmed,paid" string="Set to draft"/>
+                    <button type="object" name="compute_amounts" string="Recompute amounts" states="draft"/>
+                    <field name="state" widget="statusbar"/>
+                </header>
                 <group>
                     <field name="journal_id"   widget="selection"/>
                     <field name="date"/>
@@ -29,9 +35,16 @@
                 </group>
                 <notebook colspan="4">
                     <page string="Periods">
-                        <button type='action' name="%(action_add_period)d" string="Add period" colspan="2" attrs="{'invisible': [('state', 'in', ('confirmed', 'paid'))]}"/>
-                        <button type='action' name="%(action_remove_period)d" string="Remove period" colspan="2" attrs="{'invisible': [('state', 'in', ('confirmed', 'paid'))]}"/>
-                        <field name="date_range_ids" colspan="4" nolabel="1" readonly="1"/>
+                        <div>
+                            <button type='action' name="%(action_add_period)d" string="Add period" colspan="2"
+                                    attrs="{'invisible': [('state', 'in', ('confirmed', 'paid'))]}" icon="fa-plus"/>
+                            <span>&amp;nbsp;</span>
+                            <button type='action' name="%(action_remove_period)d" string="Remove period" colspan="2"
+                                    attrs="{'invisible': [('state', 'in', ('confirmed', 'paid'))]}" icon="fa-minus"/>
+                        </div>
+                        <group>
+                            <field name="date_range_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </group>
                     </page>
                     <page string="Accounts">
                         <group colspan="4" col="3">
@@ -95,13 +108,9 @@
                                </form>
                             </field>
                         </group>
-                        <button type="object" name="compute_amounts" string="Recompute amounts" states="draft"/>
                         <group>
-                            <field name="state"/>
                             <field name="reconciled"/>
                         </group>
-                        <button name="create_move" states="draft" type="object" string="Create Move" colspan="2"/>
-                        <button name="statement_draft" type="object" states="confirmed,paid" string="Set to draft" colspan="2"/>
                     </page>
                     <page string="Tax Authority">
                         <group>
diff --git a/account_vat_period_end_statement/wizard/add_period.xml b/account_vat_period_end_statement/wizard/add_period.xml
index a39d59016174..e77bbfc40627 100644
--- a/account_vat_period_end_statement/wizard/add_period.xml
+++ b/account_vat_period_end_statement/wizard/add_period.xml
@@ -9,16 +9,15 @@
         <field name="model">add.period.to.vat.statement</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Add period" version="7.0">
+            <form string="Add period">
                 <group>
-                    <label for="period_id"/>
-                    <div>
-                        <field name="period_id" class="oe_inline"/>
-                    </div>
+                    <group>
+                        <field name="period_id"/>
+                    </group>
                 </group>
                 <footer>
                     <button special="cancel" string="Cancel"/>
-                    <button name="add_period" string="Add" type="object"/>
+                    <button name="add_period" string="Add" type="object" class="oe_highlight"/>
                 </footer>
             </form>
         </field>
diff --git a/account_vat_period_end_statement/wizard/remove_period.xml b/account_vat_period_end_statement/wizard/remove_period.xml
index c241085a9cb3..d4ceb63f17a1 100644
--- a/account_vat_period_end_statement/wizard/remove_period.xml
+++ b/account_vat_period_end_statement/wizard/remove_period.xml
@@ -10,11 +10,15 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Remove period">
-                <field name="period_id"/>
-                <group col="2" colspan="4">
-                    <button special="cancel" string="Cancel"/>
-                    <button name="remove_period" string="Remove" type="object"/>
+                <group>
+                    <group>
+                        <field name="period_id"/>
+                    </group>
                 </group>
+                <footer>
+                    <button special="cancel" string="Cancel"/>
+                    <button name="remove_period" string="Remove" type="object" class="oe_highlight"/>
+                </footer>
             </form>
         </field>
     </record>