From d5fc46242d976e5dba171236ea30ba6d4592afd9 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Mon, 19 Jan 2015 22:52:38 +0100
Subject: [PATCH] Add sale_ok and purchase_ok filters in partner/sale/purchase
 form views Use widget=selection for payment_mode_id fields Update demo data

---
 account_banking_payment_export/demo/banking_demo.xml      | 3 +++
 .../demo/sepa_credit_transfer_demo.xml                    | 1 +
 .../demo/sepa_direct_debit_demo.xml                       | 1 +
 account_payment_partner/views/account_invoice_view.xml    | 6 ++++--
 account_payment_partner/views/res_partner_view.xml        | 8 ++++++--
 account_payment_purchase/views/purchase_order_view.xml    | 4 +++-
 account_payment_sale/views/sale_order_view.xml            | 4 +++-
 7 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/account_banking_payment_export/demo/banking_demo.xml b/account_banking_payment_export/demo/banking_demo.xml
index b11367bb8..2698bcb77 100644
--- a/account_banking_payment_export/demo/banking_demo.xml
+++ b/account_banking_payment_export/demo/banking_demo.xml
@@ -59,6 +59,7 @@
 
 <record id="account_payment.payment_mode_1" model="payment.mode">
     <field name="type" ref="account_banking_payment_export.manual_bank_tranfer"/>
+    <field name="sale_ok" eval="False"/>
 </record>
 
 <record id="payment_mode_2" model="payment.mode">
@@ -67,6 +68,7 @@
     <field name="bank_id" ref="main_company_iban"/>
     <field name="company_id" ref="base.main_company"/>
     <field name="type" ref="account_banking_payment_export.manual_bank_tranfer"/>
+    <field name="sale_ok" eval="False"/>
 </record>
 
 <record id="payment_mode_3" model="payment.mode">
@@ -75,6 +77,7 @@
     <field name="bank_id" ref="main_company_iban2"/>
     <field name="company_id" ref="base.main_company"/>
     <field name="type" ref="account_banking_payment_export.manual_bank_tranfer"/>
+    <field name="sale_ok" eval="False"/>
 </record>
 
 
diff --git a/account_banking_sepa_credit_transfer/demo/sepa_credit_transfer_demo.xml b/account_banking_sepa_credit_transfer/demo/sepa_credit_transfer_demo.xml
index 77abf1b34..48e69a780 100644
--- a/account_banking_sepa_credit_transfer/demo/sepa_credit_transfer_demo.xml
+++ b/account_banking_sepa_credit_transfer/demo/sepa_credit_transfer_demo.xml
@@ -9,6 +9,7 @@
     <field name="bank_id" ref="account_banking_payment_export.main_company_iban"/>
     <field name="company_id" ref="base.main_company"/>
     <field name="type" ref="export_sepa_sct_001_001_03"/>
+    <field name="sale_ok" eval="False"/>
 </record>
 
 </data>
diff --git a/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml b/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml
index 041082d76..ba6c0ad80 100644
--- a/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml
+++ b/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml
@@ -9,6 +9,7 @@
     <field name="bank_id" ref="account_banking_payment_export.main_company_iban"/>
     <field name="company_id" ref="base.main_company"/>
     <field name="type" ref="export_sdd_008_001_02"/>
+    <field name="purchase_ok" eval="False"/>
 </record>
 
 <record id="base.main_company" model="res.company">
diff --git a/account_payment_partner/views/account_invoice_view.xml b/account_payment_partner/views/account_invoice_view.xml
index 534822ea9..e9650abfe 100644
--- a/account_payment_partner/views/account_invoice_view.xml
+++ b/account_payment_partner/views/account_invoice_view.xml
@@ -17,7 +17,8 @@
         <field name="arch" type="xml">
             <field name="partner_bank_id" position="after">
                 <field name="payment_mode_id"
-                       domain="[('sale_ok', '=', True)]"/>
+                       domain="[('sale_ok', '=', True)]"
+                       widget="selection"/>
             </field>
         </field>
     </record>
@@ -30,7 +31,8 @@
         <field name="arch" type="xml">
             <field name="partner_bank_id" position="after">
                 <field name="payment_mode_id"
-                       domain="[('purchase_ok', '=', True)]"/>
+                       domain="[('purchase_ok', '=', True)]"
+                       widget="selection"/>
             </field>
         </field>
     </record>
diff --git a/account_payment_partner/views/res_partner_view.xml b/account_payment_partner/views/res_partner_view.xml
index 3c6d670aa..f52579b2c 100644
--- a/account_payment_partner/views/res_partner_view.xml
+++ b/account_payment_partner/views/res_partner_view.xml
@@ -15,10 +15,14 @@
     <field name="inherit_id" ref="account.view_partner_property_form" />
     <field name="arch" type="xml">
         <field name="property_payment_term" position="after">
-            <field name="customer_payment_mode"/>
+            <field name="customer_payment_mode"
+                domain="[('sale_ok', '=', True)]"
+                widget="selection"/>
         </field>
         <field name="property_supplier_payment_term" position="after">
-            <field name="supplier_payment_mode"/>
+            <field name="supplier_payment_mode"
+                domain="[('purchase_ok', '=', True)]"
+                widget="selection"/>
         </field>
     </field>
 </record>
diff --git a/account_payment_purchase/views/purchase_order_view.xml b/account_payment_purchase/views/purchase_order_view.xml
index 0e25c175e..ae5d62110 100644
--- a/account_payment_purchase/views/purchase_order_view.xml
+++ b/account_payment_purchase/views/purchase_order_view.xml
@@ -15,7 +15,9 @@
     <field name="inherit_id" ref="purchase.purchase_order_form"/>
     <field name="arch" type="xml">
         <field name="payment_term_id" position="after">
-            <field name="payment_mode_id"/>
+            <field name="payment_mode_id"
+                domain="[('purchase_ok', '=', True)]"
+                widget="selection"/>
             <field name="supplier_partner_bank_id"/>
         </field>
     </field>
diff --git a/account_payment_sale/views/sale_order_view.xml b/account_payment_sale/views/sale_order_view.xml
index 016598e09..c5f5c65d8 100644
--- a/account_payment_sale/views/sale_order_view.xml
+++ b/account_payment_sale/views/sale_order_view.xml
@@ -15,7 +15,9 @@
     <field name="inherit_id" ref="sale.view_order_form"/>
     <field name="arch" type="xml">
         <field name="payment_term" position="after">
-            <field name="payment_mode_id"/>
+            <field name="payment_mode_id"
+                domain="[('sale_ok', '=', True)]"
+                widget="selection"/>
         </field>
     </field>
 </record>