From 714a0f02c026591eb9dd049dabb2d68fb170ab70 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 3 Jan 2013 16:49:29 +0100
Subject: [PATCH] [IMP] account_easy_reconcile views

---
 account_easy_reconcile/easy_reconcile.xml     | 112 ++++++++++--------
 .../easy_reconcile_history_view.xml           |  43 +++----
 2 files changed, 86 insertions(+), 69 deletions(-)

diff --git a/account_easy_reconcile/easy_reconcile.xml b/account_easy_reconcile/easy_reconcile.xml
index 6c93e70d..28388fcc 100644
--- a/account_easy_reconcile/easy_reconcile.xml
+++ b/account_easy_reconcile/easy_reconcile.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> 
+<?xml version="1.0" encoding="UTF-8"?>
 <openerp>
 <data>
 
@@ -7,52 +7,67 @@
         <field name="name">account.easy.reconcile.form</field>
         <field name="priority">20</field>
         <field name="model">account.easy.reconcile</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Automatic Easy Reconcile">
-                <separator colspan="4" string="Task Information" />
-                <field name="name" select="1"/>
-                <field name="account"/>
-                <field name="unreconciled_count"/>
-                <field name="reconciled_partial_count"/>
-                <separator colspan="4" string="Reconcile Method" />
-                <notebook colspan="4">
-                    <page name="methods" string="Configuration">
-                        <field name="reconcile_method" colspan = "4" nolabel="1"/>
-                        <button icon="gtk-ok" name="run_reconcile" colspan="4"
-                            string="Start Auto Reconcilation" type="object"/>
-                        <button icon="STOCK_JUMP_TO" name="last_history_reconcile" colspan="2"
-                            string="Display items reconciled on the last run" type="object"/>
-                        <button icon="STOCK_JUMP_TO" name="last_history_partial" colspan="2"
-                            string="Display items partially reconciled on the last run"
-                            type="object"/>
-                    </page>
-                    <page name="history" string="History">
-                        <field name="history_ids" nolabel="1">
-                            <tree string="Automatic Easy Reconcile History">
-                                <field name="date"/>
-                                <!-- display the count of lines -->
-                                <field name="reconcile_line_ids"/>
-                                <button icon="STOCK_JUMP_TO" name="open_reconcile"
-                                    string="Go to reconciled items" type="object"/>
-                                <!-- display the count of lines -->
-                                <field name="partial_line_ids"/>
-                                <button icon="STOCK_JUMP_TO" name="open_partial"
-                                    string="Go to partially reconciled items" type="object"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page name="information" string="Information">
-                      <separator colspan="4" string="Simple. Amount and Name"/>
-                      <label string="Match one debit line vs one credit line. Do not allow partial reconcilation.
+            <form string="Automatic Easy Reconcile" version="7.0">
+                <header>
+                    <button name="run_reconcile" class="oe_highlight"
+                        string="Start Auto Reconciliation" type="object"/>
+                    <button icon="STOCK_JUMP_TO" name="last_history_reconcile"
+                        class="oe_highlight"
+                        string="Display items reconciled on the last run"
+                        type="object"/>
+                    <button icon="STOCK_JUMP_TO" name="last_history_partial"
+                        class="oe_highlight"
+                        string="Display items partially reconciled on the last run"
+                        type="object"/>
+                </header>
+                <sheet>
+                    <separator colspan="4" string="Task Information" />
+                    <group>
+                        <group>
+                            <field name="name" select="1"/>
+                            <field name="account"/>
+                        </group>
+                        <group>
+                            <field name="unreconciled_count"/>
+                            <field name="reconciled_partial_count"/>
+                        </group>
+                    </group>
+                    <notebook colspan="4">
+                        <page name="methods" string="Configuration">
+                            <field name="reconcile_method" colspan = "4" nolabel="1"/>
+                        </page>
+                        <page name="history" string="History">
+                            <field name="history_ids" nolabel="1">
+                                <tree string="Automatic Easy Reconcile History">
+                                    <field name="date"/>
+                                    <!-- display the count of lines -->
+                                    <field name="reconcile_line_ids"/>
+                                    <button icon="STOCK_JUMP_TO" name="open_reconcile"
+                                        string="Go to reconciled items" type="object"/>
+                                    <!-- display the count of lines -->
+                                    <field name="partial_line_ids"/>
+                                    <button icon="STOCK_JUMP_TO" name="open_partial"
+                                        string="Go to partially reconciled items" type="object"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page name="information" string="Information">
+                          <separator colspan="4" string="Simple. Amount and Name"/>
+                          <label string="Match one debit line vs one credit line. Do not allow partial reconciliation.
 The lines should have the same amount (with the write-off) and the same name to be reconciled." colspan="4"/>
 
-                      <separator colspan="4" string="Simple. Amount and Name"/>
-                      <label string="Match one debit line vs one credit line. Do not allow partial reconcilation.
+                          <separator colspan="4" string="Simple. Amount and Partner"/>
+                          <label string="Match one debit line vs one credit line. Do not allow partial reconciliation.
 The lines should have the same amount (with the write-off) and the same partner to be reconciled." colspan="4"/>
 
-                    </page>
-                </notebook>
+                          <separator colspan="4" string="Simple. Amount and Reference"/>
+                          <label string="Match one debit line vs one credit line. Do not allow partial reconciliation.
+The lines should have the same amount (with the write-off) and the same reference to be reconciled." colspan="4"/>
+
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
@@ -61,7 +76,6 @@ The lines should have the same amount (with the write-off) and the same partner
         <field name="name">account.easy.reconcile.tree</field>
         <field name="priority">20</field>
         <field name="model">account.easy.reconcile</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Automatic Easy Reconcile">
                 <field name="name"/>
@@ -88,13 +102,12 @@ The lines should have the same amount (with the write-off) and the same partner
     </record>
 
 
-<!-- account.easy.reconcile.method view -->
+    <!-- account.easy.reconcile.method view -->
 
     <record id="account_easy_reconcile_method_form" model="ir.ui.view">
         <field name="name">account.easy.reconcile.method.form</field>
         <field name="priority">20</field>
         <field name="model">account.easy.reconcile.method</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Automatic Easy Reconcile Method">
                 <field name="sequence"/>
@@ -113,8 +126,7 @@ The lines should have the same amount (with the write-off) and the same partner
         <field name="name">account.easy.reconcile.method.tree</field>
         <field name="priority">20</field>
         <field name="model">account.easy.reconcile.method</field>
-        <field name="type">tree</field>
-        <field  name="arch" type="xml">
+        <field name="arch" type="xml">
             <tree editable="top" string="Automatic Easy Reconcile Method">
                 <field name="sequence"/>
                 <field name="name"/>
@@ -128,9 +140,11 @@ The lines should have the same amount (with the write-off) and the same partner
         </field>
     </record>
 
-<!-- menu item -->
+    <!-- menu item -->
 
-    <menuitem action="action_account_easy_reconcile" id="menu_easy_reconcile" parent="account.periodical_processing_reconciliation"/>
+    <menuitem action="action_account_easy_reconcile"
+        id="menu_easy_reconcile"
+        parent="account.periodical_processing_reconciliation"/>
 
 </data>
 </openerp>
diff --git a/account_easy_reconcile/easy_reconcile_history_view.xml b/account_easy_reconcile/easy_reconcile_history_view.xml
index 29b484ae..04ed3978 100644
--- a/account_easy_reconcile/easy_reconcile_history_view.xml
+++ b/account_easy_reconcile/easy_reconcile_history_view.xml
@@ -5,7 +5,6 @@
     <record id="view_easy_reconcile_history_search" model="ir.ui.view">
         <field name="name">easy.reconcile.history.search</field>
         <field name="model">easy.reconcile.history</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Automatic Easy Reconcile History">
                 <filter icon="terp-go-today" string="Today"
@@ -34,34 +33,38 @@
 
     <record id="easy_reconcile_history_form" model="ir.ui.view">
         <field name="name">easy.reconcile.history.form</field>
-        <field name="priority">16</field>
         <field name="model">easy.reconcile.history</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Automatic Easy Reconcile History">
-                <field name="easy_reconcile_id"/>
-                <field name="date"/>
-                <group colspan="2" col="2">
-                    <separator colspan="2" string="Reconcilations"/>
-                    <field name="reconcile_ids" nolabel="1"/>
-                </group>
-                <group colspan="2" col="2">
-                    <separator colspan="2" string="Partial Reconcilations"/>
-                    <field name="reconcile_partial_ids" nolabel="1"/>
-                </group>
-                <group col="2" colspan="4">
-                    <button icon="STOCK_JUMP_TO" name="open_reconcile" string="Go to reconciled items" type="object"/>
-                    <button icon="STOCK_JUMP_TO" name="open_partial" string="Go to partially reconciled items" type="object"/>
-                </group>
+            <form string="Automatic Easy Reconcile History" version="7.0">
+                <header>
+                    <button name="open_reconcile"
+                        string="Go to reconciled items"
+                        icon="STOCK_JUMP_TO" type="object"/>
+                    <button name="open_partial"
+                        string="Go to partially reconciled items"
+                        icon="STOCK_JUMP_TO" type="object"/>
+                </header>
+                <sheet>
+                    <group>
+                        <field name="easy_reconcile_id"/>
+                        <field name="date"/>
+                    </group>
+                    <group col="2">
+                        <separator colspan="2" string="Reconciliations"/>
+                        <field name="reconcile_ids" nolabel="1"/>
+                    </group>
+                    <group col="2">
+                        <separator colspan="2" string="Partial Reconciliations"/>
+                        <field name="reconcile_partial_ids" nolabel="1"/>
+                    </group>
+                </sheet>
             </form>
         </field>
     </record>
 
     <record id="easy_reconcile_history_tree" model="ir.ui.view">
         <field name="name">easy.reconcile.history.tree</field>
-        <field name="priority">16</field>
         <field name="model">easy.reconcile.history</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Automatic Easy Reconcile History">
                 <field name="easy_reconcile_id"/>