[IMP] payment, payment_*: acquirers installation

The installation of a new acquirer was a bit complicated : from settings,
check the acquirer, then apply (install the module) then list view of
acquirer and finally edit it in form view.

This needed to be simplified. The payment acquirers are pre-filled
in payment. From the kanban view an `Install` button installs and
redirects to the form field.

21 files changed, 274 insertions, 87 deletions

diff --git a/addons/payment/__openerp__.py b/addons/payment/__openerp__.py
index 7b09fba9fd3..b472a4460c6 100644
--- a/addons/payment/__openerp__.py
+++ b/addons/payment/__openerp__.py
@@ -8,7 +8,9 @@
     'description': """Payment Acquirer Base Module""",
     'depends': ['account'],
     'data': [
+        'data/payment_acquirer.xml',
         'views/payment_acquirer.xml',
+        'views/assets.xml',
         'views/res_config_view.xml',
         'views/res_partner_view.xml',
         'security/ir.model.access.csv',
diff --git a/addons/payment/data/payment_acquirer.xml b/addons/payment/data/payment_acquirer.xml
new file mode 100644
index 00000000000..bc95fbc2b5a
--- /dev/null
+++ b/addons/payment/data/payment_acquirer.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+    <template id="default_acquirer_button">
+        <form/>
+    </template>
+
+    <record id="payment_acquirer_buckaroo" model="payment.acquirer">
+        <field name="name">Buckaroo</field>
+        <field name="image" type="base64" file="payment_buckaroo/static/description/icon.png"/>
+        <field name="view_template_id" ref="default_acquirer_button"/>
+        <field name="module_id" ref="base.module_payment_buckaroo"/>
+        <field name="description" type="html">
+            <p>
+                A payment gateway to accept online payments via credit cards.
+            </p>
+            <ul>
+                <li><i class="fa fa-check"/>eCommerce</li>
+            </ul>
+        </field>
+    </record>
+
+    <record id="payment_acquirer_ogone" model="payment.acquirer">
+        <field name="name">Ingenico</field>
+        <field name="view_template_id" ref="default_acquirer_button"/>
+        <field name="image" type="base64" file="payment_ogone/static/description/icon.png"/>
+        <field name="module_id" ref="base.module_payment_ogone"/>
+        <field name="description" type="html">
+            <p>
+                Ingenico Payment Services (formerly Ogone), is a payment gateway to accept online payments via credit cards, debit cards and bank transfers.
+            </p>
+            <ul>
+                <li><i class="fa fa-check"/>eCommerce</li>
+                <li><i class="fa fa-check"/>Subscription</li>
+                <li><i class="fa fa-check"/>Pay button in emails</li>
+            </ul>
+        </field>
+    </record>
+
+    <record id="payment_acquirer_adyen" model="payment.acquirer">
+        <field name="name">Adyen</field>
+        <field name="view_template_id" ref="default_acquirer_button"/>
+        <field name="image" type="base64" file="payment_adyen/static/description/icon.png"/>
+        <field name="module_id" ref="base.module_payment_adyen"/>
+        <field name="description" type="html">
+            <p>
+                A payment gateway to accept online payments via credit cards, debit cards and bank transfers.
+            </p>
+            <ul>
+                <li><i class="fa fa-check"/>eCommerce</li>
+            </ul>
+        </field>
+    </record>
+
+    <record id="payment_acquirer_authorize" model="payment.acquirer">
+        <field name="name">Authorize.net</field>
+        <field name="view_template_id" ref="default_acquirer_button"/>
+        <field name="image" type="base64" file="payment_authorize/static/description/icon.png"/>
+        <field name="module_id" ref="base.module_payment_authorize"/>
+        <field name="description" type="html">
+            <p>
+                A payment gateway to accept online payments via credit cards and e-checks.
+            </p>
+            <ul>
+                <li><i class="fa fa-check"/>eCommerce</li>
+            </ul>
+        </field>
+    </record>
+
+    <record id="payment_acquirer_transfer" model="payment.acquirer">
+        <field name="name">Wire Transfer</field>
+        <field name="view_template_id" ref="default_acquirer_button"/>
+        <field name="image" type="base64" file="payment_transfer/static/description/icon.png"/>
+        <field name="module_id" ref="base.module_payment_transfer"/>
+        <field name="description" type="html">
+            <p>
+                Provide instructions to customers so that they can pay their orders manually.
+            </p>
+            <ul>
+                <li><i class="fa fa-check"/>eCommerce</li>
+            </ul>
+        </field>
+    </record>
+
+    <record id="payment_acquirer_sips" model="payment.acquirer">
+        <field name="name">Sips</field>
+        <field name="view_template_id" ref="default_acquirer_button"/>
+        <field name="image" type="base64" file="payment_sips/static/description/icon.png"/>
+        <field name="module_id" ref="base.module_payment_sips"/>
+        <field name="description" type="html">
+            <p>
+                A payment gateway from Atos Worldline to accept online payments via credit cards.
+            </p>
+            <ul>
+                <li><i class="fa fa-check"/>eCommerce</li>
+            </ul>
+        </field>
+    </record>
+
+    <record id="payment_acquirer_paypal" model="payment.acquirer">
+        <field name="name">Paypal</field>
+        <field name="view_template_id" ref="default_acquirer_button"/>
+        <field name="image" type="base64" file="payment_paypal/static/description/icon.png"/>
+        <field name="module_id" ref="base.module_payment_paypal"/>
+        <field name="description" type="html">
+            <p>
+                PayPal is the easiest way to accept payments via Paypal or credit cards as you do not need an agreement with a payment processor.
+            </p>
+            <ul>
+                <li><i class="fa fa-check"/>eCommerce</li>
+                <li><i class="fa fa-check"/>Pay button in emails</li>
+            </ul>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/payment/models/__init__.py b/addons/payment/models/__init__.py
index 02ea486041a..e9c1546ea12 100644
--- a/addons/payment/models/__init__.py
+++ b/addons/payment/models/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
 
 import payment_acquirer
-import res_config
 import res_partner
diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index ff875331361..dbe84372799 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -54,14 +54,14 @@ class PaymentAcquirer(osv.Model):
     _order = 'sequence'
 
     def _get_providers(self, cr, uid, context=None):
-        return []
+        return [('manual', 'Manual Configuration')]
 
     # indirection to ease inheritance
     _provider_selection = lambda self, *args, **kwargs: self._get_providers(*args, **kwargs)
 
     _columns = {
         'name': fields.char('Name', required=True, translate=True),
-        'provider': fields.selection(_provider_selection, string='Provider', required=True),
+        'provider': fields.selection(_provider_selection, string='Provider', required=True, default='manual'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'pre_msg': fields.html('Help Message', translate=True,
                                help='Message displayed to explain and help the payment process.'),
@@ -92,6 +92,9 @@ class PaymentAcquirer(osv.Model):
         'fees_int_fixed': fields.float('Fixed international fees'),
         'fees_int_var': fields.float('Variable international fees (in percents)'),
         'sequence': fields.integer('Sequence', help="Determine the display order"),
+        'module_id': fields.many2one('ir.module.module', string='Corresponding Module'),
+        'module_state': fields.related('module_id', 'state', type='char', string='Installation State'),
+        'description': fields.html('Description'),
     }
 
     image = openerp.fields.Binary("Image", attachment=True,
@@ -315,6 +318,20 @@ class PaymentAcquirer(osv.Model):
         self.write(cr, uid, prod_ids, {'environment': 'test'}, context=context)
         self.write(cr, uid, test_ids, {'environment': 'prod'}, context=context)
 
+    def button_immediate_install(self, cr, uid, ids, context=None):
+        acquirer_id = self.browse(cr, uid, ids, context=context)
+        if acquirer_id.module_id and acquirer_id.module_state != 'installed':
+            acquirer_id.module_id.button_immediate_install()
+            context['active_id'] = ids[0]
+            return {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'payment.acquirer',
+                'type': 'ir.actions.act_window',
+                'res_id': ids[0],
+                'context': context,
+            }
+
 
 class PaymentTransaction(osv.Model):
     """ Transaction Model. Each specific acquirer can extend the model by adding
diff --git a/addons/payment/models/res_config.py b/addons/payment/models/res_config.py
deleted file mode 100644
index f4b12563b6f..00000000000
--- a/addons/payment/models/res_config.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from openerp.osv import fields, osv
-
-
-class AccountPaymentConfig(osv.TransientModel):
-    _inherit = 'account.config.settings'
-
-    _columns = {
-        'module_payment_transfer': fields.boolean(
-            'Wire Transfer',
-            help='-This installs the module payment_transfer.'),
-        'module_payment_paypal': fields.boolean(
-            'Paypal',
-            help='-This installs the module payment_paypal.'),
-        'module_payment_ogone': fields.boolean(
-            'Ogone',
-            help='-This installs the module payment_ogone.'),
-        'module_payment_adyen': fields.boolean(
-            'Adyen',
-            help='-This installs the module payment_adyen.'),
-        'module_payment_buckaroo': fields.boolean(
-            'Buckaroo',
-            help='-This installs the module payment_buckaroo.'),
-        'module_payment_authorize': fields.boolean(
-            'Authorize.Net',
-            help='-This installs the module payment_authorize.'),
-        'module_payment_sips': fields.boolean(
-            'Sips',
-            help='-This installs the module payment_sips.'),
-    }
-
-    _defaults = {
-        'module_payment_transfer': True
-    }
diff --git a/addons/payment/static/src/less/payment_acquirer.less b/addons/payment/static/src/less/payment_acquirer.less
new file mode 100644
index 00000000000..c36f46f60f3
--- /dev/null
+++ b/addons/payment/static/src/less/payment_acquirer.less
@@ -0,0 +1,57 @@
+.o_kanban_view.o_kanban_payment_acquirer {
+    &.o_kanban_ungrouped {
+        .o_kanban_record {
+            @media (min-width: @screen-sm-min) {
+                min-width: 500px;
+            }
+            .o_kanban_image {
+                float: right;
+
+                + div {
+                    padding-left: 0;
+                    padding-right: @o-kanban-image-width + @o-kanban-inside-hgutter;
+                }
+            }
+
+            .o_payment_acquirer_desc {
+                margin-bottom: 28px;
+
+                i.fa {
+                    margin-right: 5px;
+
+                    &.fa-check {
+                        color: green;
+                    }
+                }
+            }
+
+            .o_payment_acquirer_bottom {
+                > button {
+                    position: absolute;
+                    bottom: 8px;
+                    right: 8px;
+                }
+                > .label {
+                    position: absolute;
+                    bottom: 8px;
+                    left: 8px;
+                }
+            }
+        }
+    }
+}
+
+.o_form_view .o_payment_acquirer_desc {
+    ul {
+        list-style-type: none;
+        padding: 0;
+
+        i.fa {
+            margin-right: 5px;
+
+            &.fa-check {
+                color: green;
+            }
+        }
+    }
+}
diff --git a/addons/payment/views/assets.xml b/addons/payment/views/assets.xml
new file mode 100644
index 00000000000..84047969c46
--- /dev/null
+++ b/addons/payment/views/assets.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="assets_backend" name="Payment Assets Backend" inherit_id="web.assets_backend">
+        <xpath expr="." position="inside">
+            <link rel="stylesheet" href="/payment/static/src/less/payment_acquirer.less"/>
+        </xpath>
+    </template>
+</odoo>
diff --git a/addons/payment/views/payment_acquirer.xml b/addons/payment/views/payment_acquirer.xml
index f680bf92602..a7ad01cddf4 100644
--- a/addons/payment/views/payment_acquirer.xml
+++ b/addons/payment/views/payment_acquirer.xml
@@ -25,7 +25,9 @@
                 <form string="Payment Acquirer">
                     <field name="environment" invisible='1'/>
                     <sheet>
-                        <div class="oe_button_box" name="button_box">
+                        <field name="module_id" invisible="1"/>
+                        <field name="module_state" invisible="1"/>
+                        <div class="oe_button_box" name="button_box" attrs="{'invisible': ['&amp;', ('module_id', '!=', False), ('module_state', '!=', 'installed')]}">
                             <button attrs="{'invisible': [('environment', '=', 'test')]}" class="oe_stat_button" name="toggle_enviroment_value" type="object" icon="fa-play">
                                 <div class="o_stat_info o_form_field">
                                     <span  class="text-success">Production</span>
@@ -42,18 +44,23 @@
                                 type="action" icon="fa-money" string="Payments">
                             </button>
                         </div>
-                        <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
+                        <field name="image" widget='image' class="oe_avatar" options='{"preview_image": "image_medium"}'/>
                         <div class="oe_title">
                             <h1><field name="name" placeholder="Name"/></h1>
-                            <label for="provider" class="oe_edit_only"/>
-                            <field name="provider"/>
                         </div>
-                        <group name="acquirer_base" col="2">
+                        <div attrs="{'invisible': ['|', ('module_state', '=', 'installed'), ('module_id', '=', False)]}">
+                            <button type="object" class="btn btn-primary" name="button_immediate_install" string="Install"/>
+                            <div class="o_payment_acquirer_desc">
+                                <field name="description"/>
+                            </div>
+                        </div>
+                        <group name="acquirer_base" col="2" attrs="{'invisible': ['&amp;', ('module_id', '!=', False), ('module_state', '!=', 'installed')]}">
                             <group name="acquirer_left">
+                                <field name="provider" groups="base.group_no_one"/>
                                 <field name="company_id" groups="base.group_multi_company" options='{"no_open":True}'/>
                             </group>
                         </group>
-                        <notebook>
+                        <notebook attrs="{'invisible': ['&amp;', ('module_id', '!=', False), ('module_state', '!=', 'installed')]}">
                             <page string="Credentials">
                                 <group name="acquirer">
                                 </group>
@@ -105,6 +112,45 @@
             </field>
         </record>
 
+
+        <!-- Acquirer Kanban View -->
+        <record id="acquirer_kanban" model="ir.ui.view">
+            <field name="name">payment.acquirer.kanban</field>
+            <field name="model">payment.acquirer</field>
+            <field name="arch" type="xml">
+                <kanban quick_create="false" create="true" class="o_kanban_payment_acquirer">
+                    <field name="id"/>
+                    <field name="name"/>
+                    <field name="description"/>
+                    <field name="environment"/>
+                    <field name="provider"/>
+                    <field name="module_id"/>
+                    <field name="module_state"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div class="oe_kanban_global_click">
+                                <t t-set="installed" t-value="!record.module_id.value || (record.module_id.value &amp;&amp; record.module_state.raw_value === 'installed')"/>
+                                <div class="o_kanban_image">
+                                    <img type="open" t-att-src="kanban_image('payment.acquirer', 'image_small', record.id.value)"/>
+                                </div>
+                                <div class="o_payment_acquirer_desc">
+                                    <h4><t t-esc="record.name.value"/></h4>
+                                    <t t-if="record.description.raw_value" t-raw="record.description.raw_value"/>
+                                </div>
+                                <div class="o_payment_acquirer_bottom">
+                                    <t t-if="installed">
+                                        <field name="environment" widget="kanban_label_selection" options="{'classes': {'test': 'warning', 'production': 'success'}}"/>
+                                    </t>
+                                    <button t-if="!installed" type="object" class="btn btn-default pull-right btn-sm" name="button_immediate_install">Install</button>
+                                    <button t-if="installed" type="edit" class="btn btn-primary pull-right btn-sm">Configure</button>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
         <record id="acquirer_list" model="ir.ui.view">
             <field name="name">payment.acquirer.list</field>
             <field name="model">payment.acquirer</field>
@@ -127,6 +173,7 @@
                     <field name="provider"/>
                     <group expand="0" string="Group By">
                         <filter string="Provider" name="provider" domain="[]" context="{'group_by': 'provider'}"/>
+                        <filter string="Environment" name="environment" domain="[]" context="{'group_by': 'environment'}"/>
                     </group>
                 </search>
             </field>
@@ -136,7 +183,12 @@
             <field name="name">Payment Acquirers</field>
             <field name="res_model">payment.acquirer</field>
             <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+            <field name='view_mode'>kanban,tree,form</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a payment acquirer.
+                </p>
+            </field>
         </record>
 
         <menuitem
diff --git a/addons/payment/views/res_config_view.xml b/addons/payment/views/res_config_view.xml
index aaabc355dbf..084238e72af 100644
--- a/addons/payment/views/res_config_view.xml
+++ b/addons/payment/views/res_config_view.xml
@@ -11,34 +11,6 @@
                         <button name='%(payment.action_payment_acquirer)d' type="action"
                             string="Configure payment acquiring methods" class="oe_link"/>
                     </div>
-                    <div>
-                        <field name="module_payment_transfer" class="oe_inline"/>
-                        <label for="module_payment_transfer"/>
-                    </div>
-                    <div>
-                        <field name="module_payment_paypal" class="oe_inline"/>
-                        <label for="module_payment_paypal"/>
-                    </div>
-                    <div>
-                        <field name="module_payment_ogone" class="oe_inline"/>
-                        <label for="module_payment_ogone"/>
-                    </div>
-                    <div>
-                        <field name="module_payment_adyen" class="oe_inline"/>
-                        <label for="module_payment_adyen"/>
-                    </div>
-                    <div>
-                        <field name="module_payment_buckaroo" class="oe_inline"/>
-                        <label for="module_payment_buckaroo"/>
-                    </div>
-                    <div>
-                        <field name="module_payment_authorize" class="oe_inline"/>
-                        <label for="module_payment_authorize"/>
-                    </div>
-                    <div>
-                        <field name="module_payment_sips" class="oe_inline"/>
-                        <label for="module_payment_sips"/>
-                    </div>
                 </xpath>
             </field>
         </record>
diff --git a/addons/payment_adyen/data/adyen.xml b/addons/payment_adyen/data/adyen.xml
index 0b29ea95532..dbbc9bfd9bb 100644
--- a/addons/payment_adyen/data/adyen.xml
+++ b/addons/payment_adyen/data/adyen.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="payment_acquirer_adyen" model="payment.acquirer">
+        <record id="payment.payment_acquirer_adyen" model="payment.acquirer">
             <field name="name">Adyen</field>
             <field name="image" type="base64" file="payment_adyen/static/description/icon.png"/>
             <field name="provider">adyen</field>
diff --git a/addons/payment_adyen/tests/test_adyen.py b/addons/payment_adyen/tests/test_adyen.py
index 223d0274b3f..710bdf4e9e0 100644
--- a/addons/payment_adyen/tests/test_adyen.py
+++ b/addons/payment_adyen/tests/test_adyen.py
@@ -17,7 +17,7 @@ class AdyenCommon(PaymentAcquirerCommon):
         self.base_url = self.registry('ir.config_parameter').get_param(cr, uid, 'web.base.url')
 
         # get the adyen account
-        model, self.adyen_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment_adyen', 'payment_acquirer_adyen')
+        model, self.adyen_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment', 'payment_acquirer_adyen')
 
         # some CC (always use expiration date 06 / 2016, cvc 737, cid 7373 (amex))
         self.amex = (('370000000000002', '7373'))
diff --git a/addons/payment_authorize/data/authorize.xml b/addons/payment_authorize/data/authorize.xml
index a574e0e56d2..964b9351061 100644
--- a/addons/payment_authorize/data/authorize.xml
+++ b/addons/payment_authorize/data/authorize.xml
@@ -2,7 +2,7 @@
 <odoo>
     <data noupdate="1">
 
-        <record id="payment_acquirer_authorize" model="payment.acquirer">
+        <record id="payment.payment_acquirer_authorize" model="payment.acquirer">
             <field name="name">Authorize.Net</field>
             <field name="image" type="base64" file="payment_authorize/static/description/icon.png"/>
             <field name="provider">authorize</field>
diff --git a/addons/payment_authorize/tests/test_authorize.py b/addons/payment_authorize/tests/test_authorize.py
index a9e735f6c25..fa477692f4d 100644
--- a/addons/payment_authorize/tests/test_authorize.py
+++ b/addons/payment_authorize/tests/test_authorize.py
@@ -23,7 +23,7 @@ class AuthorizeCommon(PaymentAcquirerCommon):
         # authorize only support USD in test environment
         self.currency_usd = self.env['res.currency'].search([('name', '=', 'USD')], limit=1)[0]
         # get the authorize account
-        model, self.authorize_id = self.env['ir.model.data'].get_object_reference('payment_authorize', 'payment_acquirer_authorize')
+        model, self.authorize_id = self.env['ir.model.data'].get_object_reference('payment', 'payment_acquirer_authorize')
 
 
 @openerp.tests.common.at_install(True)
diff --git a/addons/payment_buckaroo/data/buckaroo.xml b/addons/payment_buckaroo/data/buckaroo.xml
index ff6f2504d97..57e28818212 100644
--- a/addons/payment_buckaroo/data/buckaroo.xml
+++ b/addons/payment_buckaroo/data/buckaroo.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="payment_acquirer_buckaroo" model="payment.acquirer">
+        <record id="payment.payment_acquirer_buckaroo" model="payment.acquirer">
             <field name="name">Buckaroo</field>
             <field name="image" type="base64" file="payment_buckaroo/static/description/icon.png"/>
             <field name="provider">buckaroo</field>
diff --git a/addons/payment_buckaroo/tests/test_buckaroo.py b/addons/payment_buckaroo/tests/test_buckaroo.py
index b23de66c49c..9f8c311b64a 100644
--- a/addons/payment_buckaroo/tests/test_buckaroo.py
+++ b/addons/payment_buckaroo/tests/test_buckaroo.py
@@ -20,7 +20,7 @@ class BuckarooCommon(PaymentAcquirerCommon):
         self.base_url = self.registry('ir.config_parameter').get_param(cr, uid, 'web.base.url')
 
         # get the buckaroo account
-        model, self.buckaroo_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment_buckaroo', 'payment_acquirer_buckaroo')
+        model, self.buckaroo_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment', 'payment_acquirer_buckaroo')
 
 
 @openerp.tests.common.at_install(False)
diff --git a/addons/payment_ogone/data/ogone.xml b/addons/payment_ogone/data/ogone.xml
index 9c1e53be443..308d13e70b9 100644
--- a/addons/payment_ogone/data/ogone.xml
+++ b/addons/payment_ogone/data/ogone.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="payment_acquirer_ogone" model="payment.acquirer">
-            <field name="name">Ogone</field>
+        <record id="payment.payment_acquirer_ogone" model="payment.acquirer">
+            <field name="name">Ingenico</field>
             <field name="image" type="base64" file="payment_ogone/static/description/icon.png"/>
             <field name="provider">ogone</field>
             <field name="company_id" ref="base.main_company"/>
@@ -11,7 +11,7 @@
             <field name="registration_view_template_id" ref="ogone_s2s_form"/>
             <field name="environment">test</field>
             <field name="pre_msg"><![CDATA[
-<p>You will be redirected to the Ogone website after clicking on the payment button.</p>]]></field>
+<p>You will be redirected to the Ingenico website after clicking on the payment button.</p>]]></field>
             <field name='ogone_pspid'>dummy</field>
             <field name='ogone_userid'>dummy</field>
             <field name='ogone_password'>dummy</field>
diff --git a/addons/payment_ogone/tests/test_ogone.py b/addons/payment_ogone/tests/test_ogone.py
index 0db68214bd4..81f09873fa4 100644
--- a/addons/payment_ogone/tests/test_ogone.py
+++ b/addons/payment_ogone/tests/test_ogone.py
@@ -18,7 +18,7 @@ class OgonePayment(PaymentAcquirerCommon):
         self.base_url = self.registry('ir.config_parameter').get_param(cr, uid, 'web.base.url')
 
         # get the adyen account
-        model, self.ogone_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment_ogone', 'payment_acquirer_ogone')
+        model, self.ogone_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment', 'payment_acquirer_ogone')
 
     def test_10_ogone_form_render(self):
         cr, uid, context = self.cr, self.uid, {}
diff --git a/addons/payment_paypal/data/paypal.xml b/addons/payment_paypal/data/paypal.xml
index af2d0da1f4d..fd474b27532 100644
--- a/addons/payment_paypal/data/paypal.xml
+++ b/addons/payment_paypal/data/paypal.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="payment_acquirer_paypal" model="payment.acquirer">
+        <record id="payment.payment_acquirer_paypal" model="payment.acquirer">
             <field name="name">Paypal</field>
             <field name="image" type="base64" file="payment_paypal/static/description/icon.png"/>
             <field name="provider">paypal</field>
diff --git a/addons/payment_paypal/tests/test_paypal.py b/addons/payment_paypal/tests/test_paypal.py
index b0eaa84b7f8..e0e6db55947 100644
--- a/addons/payment_paypal/tests/test_paypal.py
+++ b/addons/payment_paypal/tests/test_paypal.py
@@ -17,7 +17,7 @@ class PaypalCommon(PaymentAcquirerCommon):
         self.base_url = self.registry('ir.config_parameter').get_param(cr, uid, 'web.base.url')
 
         # get the paypal account
-        model, self.paypal_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment_paypal', 'payment_acquirer_paypal')
+        model, self.paypal_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment', 'payment_acquirer_paypal')
         # tde+seller@openerp.com - tde+buyer@openerp.com - tde+buyer-it@openerp.com
 
         # some CC
diff --git a/addons/payment_sips/data/sips.xml b/addons/payment_sips/data/sips.xml
index 65ed03f704f..1c6fd76a63f 100644
--- a/addons/payment_sips/data/sips.xml
+++ b/addons/payment_sips/data/sips.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="0">
 
-        <record id="payment_acquirer_sips" model="payment.acquirer">
+        <record id="payment.payment_acquirer_sips" model="payment.acquirer">
             <field name="name">Sips</field>
             <field name="provider">sips</field>
             <field name="company_id" ref="base.main_company"/>
diff --git a/addons/payment_transfer/data/transfer.xml b/addons/payment_transfer/data/transfer.xml
index 2b89a9e7c85..de0ac941fef 100644
--- a/addons/payment_transfer/data/transfer.xml
+++ b/addons/payment_transfer/data/transfer.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="payment_acquirer_transfer" model="payment.acquirer">
+        <record id="payment.payment_acquirer_transfer" model="payment.acquirer">
             <field name="name">Wire Transfer</field>
             <field name="image" type="base64" file="payment_transfer/static/description/icon.png"/>
             <field name="provider">transfer</field>