diff --git a/account_payment_partner/i18n/account_payment_partner.pot b/account_payment_partner/i18n/account_payment_partner.pot
deleted file mode 100644
index ca26e532d..000000000
--- a/account_payment_partner/i18n/account_payment_partner.pot
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_payment_partner
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-09 23:22+0000\n"
-"PO-Revision-Date: 2014-06-09 23:22+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_partner
-#: field:res.partner,customer_payment_mode:0
-msgid "Customer Payment Mode"
-msgstr ""
-
-#. module: account_payment_partner
-#: model:ir.model,name:account_payment_partner.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: account_payment_partner
-#: model:ir.model,name:account_payment_partner.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: account_payment_partner
-#: field:account.invoice,payment_mode_id:0
-msgid "Payment Mode"
-msgstr ""
-
-#. module: account_payment_partner
-#: help:res.partner,customer_payment_mode:0
-msgid "Select the default payment mode for this customer."
-msgstr ""
-
-#. module: account_payment_partner
-#: help:res.partner,supplier_payment_mode:0
-msgid "Select the default payment mode for this supplier."
-msgstr ""
-
-#. module: account_payment_partner
-#: field:res.partner,supplier_payment_mode:0
-msgid "Supplier Payment Mode"
-msgstr ""
-
-#. module: account_payment_partner
-#: model:ir.model,name:account_payment_partner.model_payment_order_create
-msgid "payment.order.create"
-msgstr ""
-
diff --git a/account_payment_partner/models/account_invoice.py b/account_payment_partner/models/account_invoice.py
index 9c95f4cda..e14c0d956 100644
--- a/account_payment_partner/models/account_invoice.py
+++ b/account_payment_partner/models/account_invoice.py
@@ -26,8 +26,9 @@ from openerp import models, fields, api
 class AccountInvoice(models.Model):
     _inherit = 'account.invoice'
 
-    payment_mode_id = fields.Many2one('payment.mode', string="Payment Mode",
-                                      domain="[('type', '=', type)]")
+    payment_mode_id = fields.Many2one(
+        comodel_name='payment.mode', string="Payment Mode",
+        domain="[('type', '=', type)]")
 
     @api.multi
     def onchange_partner_id(
diff --git a/account_payment_partner/models/res_partner.py b/account_payment_partner/models/res_partner.py
index c8762f7d5..d5dded203 100644
--- a/account_payment_partner/models/res_partner.py
+++ b/account_payment_partner/models/res_partner.py
@@ -28,11 +28,13 @@ class ResPartner(models.Model):
 
     supplier_payment_mode = fields.Many2one(
         'payment.mode', string='Supplier Payment Mode', company_dependent=True,
-        domain="[('payment_order_type', '=', 'payment')]",
+        domain="['|', ('payment_order_type', '=', 'payment'), "
+               "('payment_order_type', '=', 'both')]",
         help="Select the default payment mode for this supplier.")
     customer_payment_mode = fields.Many2one(
         'payment.mode', string='Customer Payment Mode', company_dependent=True,
-        domain="[('payment_order_type', '=', 'debit')]",
+        domain="['|', ('payment_order_type', '=', 'debit'), "
+               "('payment_order_type', '=', 'both')]",
         help="Select the default payment mode for this customer.")
 
     @api.model
diff --git a/account_payment_partner/views/account_invoice_view.xml b/account_payment_partner/views/account_invoice_view.xml
index f4805fa89..aabddcd49 100644
--- a/account_payment_partner/views/account_invoice_view.xml
+++ b/account_payment_partner/views/account_invoice_view.xml
@@ -17,7 +17,7 @@
         <field name="arch" type="xml">
             <field name="partner_bank_id" position="after">
                 <field name="payment_mode_id"
-                       domain="[('payment_order_type', '=', 'debit')]"/>
+                       domain="['|', ('payment_order_type', '=', 'debit'), ('payment_order_type', '=', 'both')]"/>
             </field>
         </field>
     </record>
@@ -30,7 +30,7 @@
         <field name="arch" type="xml">
             <field name="partner_bank_id" position="after">
                 <field name="payment_mode_id"
-                       domain="[('payment_order_type', '=', 'payment')]"/>
+                       domain="['|', ('payment_order_type', '=', 'payment'), ('payment_order_type', '=', 'both')]"/>
             </field>
         </field>
     </record>