diff --git a/account_payment_purchase/__openerp__.py b/account_payment_purchase/__openerp__.py
index e7c258f73..283d67477 100644
--- a/account_payment_purchase/__openerp__.py
+++ b/account_payment_purchase/__openerp__.py
@@ -30,13 +30,13 @@
 Account Payment Purchase
 ========================
 
-This module adds 2 fields on purchase orders : *Bank Account* and *Payment
+This module adds 2 fields on purchase orders: *Bank Account* and *Payment
 Mode*. These fields are copied from partner to purchase order and then from
 purchase order to supplier invoice.
 
-This module is similar to the *purchase_payment* module ; the main difference
+This module is similar to the *purchase_payment* module; the main difference
 is that it doesn't depend on the *account_payment_extension* module (it's not
-the only module to conflict with *account_payment_extension* ; all the SEPA
+the only module to conflict with *account_payment_extension*; all the SEPA
 modules in the banking addons conflict with *account_payment_extension*).
     """,
     'author': 'Akretion',
@@ -44,7 +44,6 @@ modules in the banking addons conflict with *account_payment_extension*).
     'contributors': ['Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>'],
     'depends': [
         'purchase',
-        'stock_account',
         'account_payment_partner'
     ],
     'conflicts': ['purchase_payment'],
@@ -52,5 +51,5 @@ modules in the banking addons conflict with *account_payment_extension*).
         'views/purchase_order_view.xml',
     ],
     'installable': True,
-    'active': False,
+    'auto_install': True,
 }
diff --git a/account_payment_purchase/i18n/account_payment_purchase.pot b/account_payment_purchase/i18n/account_payment_purchase.pot
deleted file mode 100644
index 17ed963d5..000000000
--- a/account_payment_purchase/i18n/account_payment_purchase.pot
+++ /dev/null
@@ -1,42 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_payment_purchase
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-09 23:23+0000\n"
-"PO-Revision-Date: 2014-06-09 23:23+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_payment_purchase
-#: field:purchase.order,payment_mode_id:0
-msgid "Payment Mode"
-msgstr ""
-
-#. module: account_payment_purchase
-#: model:ir.model,name:account_payment_purchase.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: account_payment_purchase
-#: model:ir.model,name:account_payment_purchase.model_purchase_order
-msgid "Purchase Order"
-msgstr ""
-
-#. module: account_payment_purchase
-#: help:purchase.order,supplier_partner_bank_id:0
-msgid "Select the bank account of your supplier on which your company should send the payment. This field is copied from the partner and will be copied to the supplier invoice."
-msgstr ""
-
-#. module: account_payment_purchase
-#: field:purchase.order,supplier_partner_bank_id:0
-msgid "Supplier Bank Account"
-msgstr ""
-
diff --git a/account_payment_purchase/models/purchase_order.py b/account_payment_purchase/models/purchase_order.py
index e1ca139ff..a8d73c235 100644
--- a/account_payment_purchase/models/purchase_order.py
+++ b/account_payment_purchase/models/purchase_order.py
@@ -34,7 +34,8 @@ class PurchaseOrder(models.Model):
              "and will be copied to the supplier invoice.")
     payment_mode_id = fields.Many2one(
         'payment.mode', string='Payment Mode',
-        domain="[('payment_order_type', '=', 'payment')]")
+        domain="['|', ('payment_order_type', '=', 'payment'), "
+               "('payment_order_type', '=', 'both')]")
 
     @api.model
     def _get_default_supplier_partner_bank(self, partner):
diff --git a/account_payment_purchase/view/purchase.xml b/account_payment_purchase/view/purchase.xml
deleted file mode 100644
index f6b2cffec..000000000
--- a/account_payment_purchase/view/purchase.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Copyright (C) 2014 Akretion (http://www.akretion.com/)
-    @author Alexis de Lattre <alexis.delattre@akretion.com>
-    The licence is in the file __openerp__.py
--->
-
-<openerp>
-<data>
-
-<record id="purchase_order_form" model="ir.ui.view">
-    <field name="name">account_payment_purchase.purchase_order.form</field>
-    <field name="model">purchase.order</field>
-    <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="supplier_partner_bank_id"
-                domain="[('partner_id', '=', partner_id)]" />
-        </field>
-    </field>
-</record>
-
-</data>
-</openerp>