From fc0d9ada6dae0b91b104c6f5b40937e486311426 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 23 Oct 2014 12:49:29 +0200
Subject: [PATCH] [IMP] payment: add the auto_confirm field on form view +
 transfer does not confirm by default

---
 addons/payment/models/payment_acquirer.py |    2 +-
 addons/payment/views/payment_acquirer.xml |    1 +
 addons/payment_transfer/data/transfer.xml |    1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index 37a1c4c..5af47d2 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -79,7 +79,7 @@ class PaymentAcquirer(osv.Model):
             [('none', 'No automatic confirmation'),
              ('at_pay_confirm', 'At payment confirmation'),
              ('at_pay_now', 'At payment')],
-            string='Auto Confirmation', required=True),
+            string='Order Confirmation', required=True),
         # Fees
         'fees_active': fields.boolean('Compute fees'),
         'fees_dom_fixed': fields.float('Fixed domestic fees'),
diff --git a/addons/payment/views/payment_acquirer.xml b/addons/payment/views/payment_acquirer.xml
index 8ff6ed5..69e4805 100644
--- a/addons/payment/views/payment_acquirer.xml
+++ b/addons/payment/views/payment_acquirer.xml
@@ -20,6 +20,7 @@
                                 <field name="company_id"/>
                                 <field name="website_published"/>
                                 <field name="environment"/>
+                                <field name="auto_confirm"/>
                             </group>
                             <group>
                                 <field name="fees_active"/>
diff --git a/addons/payment_transfer/data/transfer.xml b/addons/payment_transfer/data/transfer.xml
index 13dd1f2..f62a8bd 100644
--- a/addons/payment_transfer/data/transfer.xml
+++ b/addons/payment_transfer/data/transfer.xml
@@ -8,6 +8,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="view_template_id" ref="transfer_acquirer_button"/>
             <field name="validation">manual</field>
+            <field name="auto_confirm">none</field>
             <field name="environment">test</field>
             <field name="website_published" eval="True"/>
             <field name="pre_msg"><![CDATA[
-- 
1.7.10.4