diff --git a/account_payment_partner/models/res_partner.py b/account_payment_partner/models/res_partner.py
index d5dded203..5726da446 100644
--- a/account_payment_partner/models/res_partner.py
+++ b/account_payment_partner/models/res_partner.py
@@ -28,13 +28,11 @@ class ResPartner(models.Model):
 
     supplier_payment_mode = fields.Many2one(
         'payment.mode', string='Supplier Payment Mode', company_dependent=True,
-        domain="['|', ('payment_order_type', '=', 'payment'), "
-               "('payment_order_type', '=', 'both')]",
+        domain="[('purchase_ok', '=', True)]",
         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'), "
-               "('payment_order_type', '=', 'both')]",
+        domain="[('sale_ok', '=', True)]",
         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 aabddcd49..534822ea9 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'), ('payment_order_type', '=', 'both')]"/>
+                       domain="[('sale_ok', '=', True)]"/>
             </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'), ('payment_order_type', '=', 'both')]"/>
+                       domain="[('purchase_ok', '=', True)]"/>
             </field>
         </field>
     </record>