diff --git a/addons/payment/models/account_payment.py b/addons/payment/models/account_payment.py
index 20bc9c9cd28..ea8da16b54b 100644
--- a/addons/payment/models/account_payment.py
+++ b/addons/payment/models/account_payment.py
@@ -1,8 +1,53 @@
 # coding: utf-8
 
-from odoo import fields, models
+import datetime
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
 
 class AccountPayment(models.Model):
     _inherit = 'account.payment'
 
+    @api.onchange('partner_id')
+    def onchange_partner_id(self):
+        res = {}
+        if self.partner_id:
+            res['domain'] = {'electronic_payment_method_id': [('partner_id', '=', self.partner_id.id)]}
+
+        return res
+
     payment_transaction_id = fields.Many2one('payment.transaction', string="Payment Transaction")
+    electronic_payment_method_id = fields.Many2one('payment.method', string="Saved payment method")
+
+    def _do_payment(self):
+        tx_obj = self.env['payment.transaction']
+        reference = "PAYMENT-%s-%s" % (self.id, datetime.datetime.now().strftime('%y%m%d_%H%M%S'))
+
+        tx_values = {
+            'amount': self.amount,
+            'acquirer_id': self.electronic_payment_method_id.acquirer_id.id,
+            'type': 'server2server',
+            'currency_id': self.currency_id.id,
+            'reference': reference,
+            'payment_method_id': self.electronic_payment_method_id.id,
+            'partner_id': self.partner_id.id,
+            'partner_country_id': self.partner_id.country_id.id,
+        }
+
+        tx = tx_obj.create(tx_values)
+
+        s2s_result = tx.s2s_do_transaction()
+
+        if not s2s_result or tx.state != 'done': # todo jov: what about pending transactions
+            raise ValidationError(_("Payment transaction failed (%s)") % tx.state_message)
+
+        self.payment_transaction_id = tx
+
+    @api.model
+    def create(self, vals):
+        res = super(AccountPayment, self).create(vals)
+
+        if res.electronic_payment_method_id:
+            res._do_payment()
+
+        return res
+
diff --git a/addons/payment/views/account_payment.xml b/addons/payment/views/account_payment.xml
index 00c25c4af8f..80e0707f21a 100644
--- a/addons/payment/views/account_payment.xml
+++ b/addons/payment/views/account_payment.xml
@@ -11,5 +11,16 @@
                     </xpath>
                 </field>
         </record>
+
+        <record id="view_account_payment_invoice_form_inherit_payment" model="ir.ui.view">
+                <field name="name">view.account.payment.invoice.form.inherit.payment</field>
+                <field name="model">account.payment</field>
+                <field name="inherit_id" ref="account.view_account_payment_invoice_form"/>
+                <field name="arch" type="xml">
+                    <field name="payment_method_id" position="after">
+                        <field name="electronic_payment_method_id"/>
+                    </field>
+                </field>
+        </record>
     </data>
 </odoo>