From d5cb35de7341f2d60a8bfbdeaca0bec556353978 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Wed, 12 Mar 2014 23:18:33 +0100
Subject: [PATCH] Add missing utf-8 header Update state field on SEPA file
 objects and display it in tree+form views. Migrate form views to version 7.0
 and simplify them.

---
 account_banking_pain_base/__openerp__.py      |  1 +
 .../__openerp__.py                            |  1 +
 .../account_banking_sepa.py                   |  2 +-
 .../account_banking_sepa_view.xml             | 33 +++++++++----------
 .../__openerp__.py                            |  1 +
 .../account_banking_sdd.py                    |  2 +-
 .../account_banking_sdd_view.xml              | 33 +++++++++----------
 account_banking_sepa_direct_debit/company.py  |  1 +
 8 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/account_banking_pain_base/__openerp__.py b/account_banking_pain_base/__openerp__.py
index 9803980d5..71c52d5d0 100644
--- a/account_banking_pain_base/__openerp__.py
+++ b/account_banking_pain_base/__openerp__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    PAIN base module for OpenERP
diff --git a/account_banking_sepa_credit_transfer/__openerp__.py b/account_banking_sepa_credit_transfer/__openerp__.py
index 9b0521aea..cdffa6eab 100644
--- a/account_banking_sepa_credit_transfer/__openerp__.py
+++ b/account_banking_sepa_credit_transfer/__openerp__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    SEPA Credit Transfer module for OpenERP
diff --git a/account_banking_sepa_credit_transfer/account_banking_sepa.py b/account_banking_sepa_credit_transfer/account_banking_sepa.py
index a54888bb9..99d5b022b 100644
--- a/account_banking_sepa_credit_transfer/account_banking_sepa.py
+++ b/account_banking_sepa_credit_transfer/account_banking_sepa.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    SEPA Credit Transfer module for OpenERP
@@ -81,7 +82,6 @@ class banking_export_sepa(orm.Model):
         'state': fields.selection([
             ('draft', 'Draft'),
             ('sent', 'Sent'),
-            ('done', 'Reconciled'),
             ], 'State', readonly=True),
     }
 
diff --git a/account_banking_sepa_credit_transfer/account_banking_sepa_view.xml b/account_banking_sepa_credit_transfer/account_banking_sepa_view.xml
index 8bf13cf1d..a5896c757 100644
--- a/account_banking_sepa_credit_transfer/account_banking_sepa_view.xml
+++ b/account_banking_sepa_credit_transfer/account_banking_sepa_view.xml
@@ -11,28 +11,24 @@
     <field name="name">account.banking.export.sepa.form</field>
     <field name="model">banking.export.sepa</field>
     <field name="arch" type="xml">
-        <form string="SEPA Credit Transfer">
+        <form string="SEPA Credit Transfer" version="7.0">
+            <header>
+                <field name="state" widget="statusbar"/>
+            </header>
             <notebook>
                 <page string="General Information">
-                    <field name="total_amount" />
-                    <field name="nb_transactions" />
-                    <field name="batch_booking" />
-                    <field name="charge_bearer"/>
-                    <field name="create_date" />
-                    <newline />
-                    <field name="file" filename="filename"/>
-                    <field name="filename" invisible="True"/>
+                    <group name="main">
+                        <field name="total_amount" />
+                        <field name="nb_transactions" />
+                        <field name="batch_booking" />
+                        <field name="charge_bearer"/>
+                        <field name="create_date" />
+                        <field name="file" filename="filename"/>
+                        <field name="filename" invisible="True"/>
+                    </group>
                 </page>
                 <page string="Payment Orders">
-                    <field name="payment_order_ids" colspan="4" nolabel="1">
-                        <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment Orders">
-                            <field name="reference"/>
-                            <field name="date_created"/>
-                            <field name="date_done"/>
-                            <field name="total"/>
-                            <field name="state"/>
-                        </tree>
-                    </field>
+                    <field name="payment_order_ids" nolabel="1"/>
                 </page>
             </notebook>
         </form>
@@ -48,6 +44,7 @@
             <field name="filename"/>
             <field name="create_date"/>
             <field name="nb_transactions"/>
+            <field name="state"/>
         </tree>
     </field>
 </record>
diff --git a/account_banking_sepa_direct_debit/__openerp__.py b/account_banking_sepa_direct_debit/__openerp__.py
index cd603fc03..611127a84 100644
--- a/account_banking_sepa_direct_debit/__openerp__.py
+++ b/account_banking_sepa_direct_debit/__openerp__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    SEPA Direct Debit module for OpenERP
diff --git a/account_banking_sepa_direct_debit/account_banking_sdd.py b/account_banking_sepa_direct_debit/account_banking_sdd.py
index d0edb5e90..cbf0d0d10 100644
--- a/account_banking_sepa_direct_debit/account_banking_sdd.py
+++ b/account_banking_sepa_direct_debit/account_banking_sdd.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    SEPA Direct Debit module for OpenERP
@@ -89,7 +90,6 @@ class banking_export_sdd(orm.Model):
         'state': fields.selection([
             ('draft', 'Draft'),
             ('sent', 'Sent'),
-            ('done', 'Reconciled'),
             ], 'State', readonly=True),
     }
 
diff --git a/account_banking_sepa_direct_debit/account_banking_sdd_view.xml b/account_banking_sepa_direct_debit/account_banking_sdd_view.xml
index f89ec7389..f74b60353 100644
--- a/account_banking_sepa_direct_debit/account_banking_sdd_view.xml
+++ b/account_banking_sepa_direct_debit/account_banking_sdd_view.xml
@@ -11,28 +11,24 @@
     <field name="name">account.banking.export.sdd.form</field>
     <field name="model">banking.export.sdd</field>
     <field name="arch" type="xml">
-        <form string="SEPA Direct Debit">
+        <form string="SEPA Direct Debit" version="7.0">
+            <header>
+                <field name="state" widget="statusbar"/>
+            </header>
             <notebook>
                 <page string="General Information">
-                    <field name="total_amount" />
-                    <field name="nb_transactions" />
-                    <field name="batch_booking" />
-                    <field name="charge_bearer"/>
-                    <field name="create_date" />
-                    <newline />
-                    <field name="file" filename="filename"/>
-                    <field name="filename" invisible="True"/>
+                    <group name="main">
+                        <field name="total_amount" />
+                        <field name="nb_transactions" />
+                        <field name="batch_booking" />
+                        <field name="charge_bearer"/>
+                        <field name="create_date" />
+                        <field name="file" filename="filename"/>
+                        <field name="filename" invisible="True"/>
+                    </group>
                 </page>
                 <page string="Payment Orders">
-                    <field name="payment_order_ids" colspan="4" nolabel="1">
-                        <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment Orders">
-                            <field name="reference"/>
-                            <field name="date_created"/>
-                            <field name="date_done"/>
-                            <field name="total"/>
-                            <field name="state"/>
-                        </tree>
-                    </field>
+                    <field name="payment_order_ids" nolabel="1"/>
                 </page>
             </notebook>
         </form>
@@ -48,6 +44,7 @@
             <field name="filename"/>
             <field name="create_date"/>
             <field name="nb_transactions"/>
+            <field name="state"/>
         </tree>
     </field>
 </record>
diff --git a/account_banking_sepa_direct_debit/company.py b/account_banking_sepa_direct_debit/company.py
index 5dd960224..6d54ba8e6 100644
--- a/account_banking_sepa_direct_debit/company.py
+++ b/account_banking_sepa_direct_debit/company.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    SEPA Direct Debit module for OpenERP