[MERGE] forward port of branch 8.0 up to 591e329

[odoo/odoo.git] / addons / payment / models / payment_acquirer.py

diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index 7b8efd9..002fa13 100644 (file)
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -75,6 +75,11 @@ class PaymentAcquirer(osv.Model):
         'website_published': fields.boolean(
             'Visible in Portal / Website', copy=False,
             help="Make this payment acquirer available (Customer invoices, etc.)"),
+        'auto_confirm': fields.selection(
+            [('none', 'No automatic confirmation'),
+             ('at_pay_confirm', 'At payment confirmation'),
+             ('at_pay_now', 'At payment')],
+            string='Order Confirmation', required=True),
         # Fees
         'fees_active': fields.boolean('Compute fees'),
         'fees_dom_fixed': fields.float('Fixed domestic fees'),
@@ -88,6 +93,7 @@ class PaymentAcquirer(osv.Model):
         'environment': 'test',
         'validation': 'automatic',
         'website_published': True,
+        'auto_confirm': 'at_pay_confirm',
     }
 
     def _check_required_if_provider(self, cr, uid, ids, context=None):