From 4b998a263e5a1132af103acdf79a004d862922c5 Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Tue, 28 May 2013 16:42:13 +0200
Subject: [PATCH] [RFR] Sort out view changes between debit and payment modules

---
 .../view/account_payment.xml                  | 21 ++++++++++++++
 account_direct_debit/view/account_invoice.xml | 14 ++++------
 account_direct_debit/view/account_payment.xml | 28 ++-----------------
 3 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/account_banking_payment/view/account_payment.xml b/account_banking_payment/view/account_payment.xml
index b07d6c98f..b2233c225 100644
--- a/account_banking_payment/view/account_payment.xml
+++ b/account_banking_payment/view/account_payment.xml
@@ -41,5 +41,26 @@
             </field>
         </record>
 
+	<!-- Add transfer settings -->
+	<record model="ir.ui.view" id="view_payment_mode_form">
+	  <field name="name">payment.mode.form add transfer account</field>
+	  <field name="model">payment.mode</field>
+	  <field name="inherit_id" ref="account_banking.view_payment_mode_form_inherit"/>
+	  <field name="type">form</field>
+	  <field name="arch" type="xml">
+	    <field name="type" position="after">
+	      <field name="transfer_account_id"
+                     domain="[('type', '=', 'other'),
+                              ('reconcile', '=', True),
+                              ('company_id', '=', company_id)]"
+                     />
+	      <field name="transfer_journal_id"
+                     domain="[('company_id', '=', company_id)]"
+                     />
+              <field name="payment_term_ids"/>
+	    </field>
+	  </field>
+	</record>
+
     </data>
 </openerp>
diff --git a/account_direct_debit/view/account_invoice.xml b/account_direct_debit/view/account_invoice.xml
index 8004dbc84..c43ee8bcb 100644
--- a/account_direct_debit/view/account_invoice.xml
+++ b/account_direct_debit/view/account_invoice.xml
@@ -16,14 +16,6 @@
                     <!-- button name="invoice_open" position="attributes">
                         <attribute name="states">draft,proforma2,debit_denied</attribute>
                     </button -->
-                    <button string='Re-Open' position="attributes">
-                        <attribute name="states">paid,debit_denied</attribute>
-                        <!--
-                            unintentional fix of
-                            https://bugs.launchpad.net/openobject-addons/+bug/807543
-                        -->
-                        <attribute name="groups"/>
-                    </button>
                     <button name="invoice_open" position="after">
                         <button name="invoice_debit_denied" states="paid"
                                 string="Debit Denied" icon="gtk-cancel"/>
@@ -38,7 +30,11 @@
             <field name="inherit_id" ref="account.view_account_invoice_filter"/>
             <field name="arch" type="xml">
                 <filter name="invoices" position="after">
-                    <filter name="debit_denied" icon="terp-dolar_ok!" string="Debit denied" domain="[('state','=','debit_denied')]" help="Show only invoices with state Debit denied"/>
+                    <filter name="debit_denied" icon="terp-dolar_ok!"
+                            string="Debit denied"
+                            domain="[('state','=','debit_denied')]"
+                            help="Show only invoices with state Debit denied"
+                            />
                 </filter>
             </field>
         </record>
diff --git a/account_direct_debit/view/account_payment.xml b/account_direct_debit/view/account_payment.xml
index 1570cca36..8ebb27b35 100644
--- a/account_direct_debit/view/account_payment.xml
+++ b/account_direct_debit/view/account_payment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <!-- distinguish between payment orders and debit orders in the menu -->
         <record id="account_payment.action_payment_order_tree" model="ir.actions.act_window">
             <field name="domain">[('payment_order_type', '=', 'payment')]</field>
@@ -46,36 +47,10 @@
                                 icon="gtk-find"
                                 />
                     </xpath>
-                    <!-- the attrs do not work like this, apparently
-                         <xpath expr="//tree[@string='Payment Line']" position="inside">
-                             <field name="storno" attrs="{'invisible': [(parent.payment_order_type, '!=', 'debit')]}"/>
-                         </xpath>
-                    -->
                 </data>
             </field>
         </record>
 
-	<!-- Add transfer account for debit type modes -->
-	<record model="ir.ui.view" id="view_payment_mode_form">
-	  <field name="name">payment.mode.form add transfer account</field>
-	  <field name="model">payment.mode</field>
-	  <field name="inherit_id" ref="account_banking.view_payment_mode_form_inherit"/>
-	  <field name="type">form</field>
-	  <field name="arch" type="xml">
-	    <field name="type" position="after">
-	      <field name="transfer_account_id"
-                     domain="[('type', '=', 'other'),
-                              ('reconcile', '=', True),
-                              ('company_id', '=', company_id)]"
-                     />
-	      <field name="transfer_journal_id"
-                     domain="[('company_id', '=', company_id)]"
-                     />
-              <field name="payment_term_ids"/>
-	    </field>
-	  </field>
-	</record>
-
         <record id="view_payment_line_tree" model="ir.ui.view">
             <field name="name">Payment Lines</field>
             <field name="model">payment.line</field>
@@ -88,5 +63,6 @@
                 </field>
             </field>
         </record>
+
     </data>
 </openerp>