diff --git a/modules/account_payment/payment.xml b/modules/account_payment/payment.xml
index 691c635cfe..6ba15f15f1 100644
--- a/modules/account_payment/payment.xml
+++ b/modules/account_payment/payment.xml
@@ -420,7 +420,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Payments</field>
             <field name="res_model">account.payment</field>
             <field name="domain"
-                eval="[('group', '=', Eval('active_id'))]" pyson="1"/>
+                eval="[('group', 'in', Eval('active_ids', []))]" pyson="1"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_payment_form_group_open_view1">
@@ -434,9 +434,37 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="payment_view_form"/>
             <field name="act_window" ref="act_payment_form_group_open"/>
         </record>
+        <record model="ir.action.act_window.domain" id="act_payment_form_group_open_domain_processing">
+            <field name="name">Processing</field>
+            <field name="sequence" eval="10"/>
+            <field name="domain" eval="[('state', 'not in', ['succeeded', 'failed'])]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_payment_form_group_open"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_payment_form_group_open_domain_succeeded">
+            <field name="name">Succeeded</field>
+            <field name="sequence" eval="20"/>
+            <field name="domain" eval="[('state', '=', 'succeeded')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_payment_form_group_open"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_payment_form_group_open_domain_failed">
+            <field name="name">Failed</field>
+            <field name="sequence" eval="30"/>
+            <field name="domain" eval="[('state', '=', 'failed')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_payment_form_group_open"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_payment_form_group_open_domain_all">
+            <field name="name">All</field>
+            <field name="sequence" eval="9999"/>
+            <field name="domain"></field>
+            <field name="act_window" ref="act_payment_form_group_open"/>
+        </record>
+
         <record model="ir.action.keyword"
             id="act_payment_form_group_relate_keyword1">
-            <field name="keyword">tree_open</field>
+            <field name="keyword">form_relate</field>
             <field name="model">account.payment.group,-1</field>
             <field name="action" ref="act_payment_form_group_open"/>
         </record>
diff --git a/modules/account_payment/view/payment_group_form.xml b/modules/account_payment/view/payment_group_form.xml
index 9465e616a3..6e449a7e2f 100644
--- a/modules/account_payment/view/payment_group_form.xml
+++ b/modules/account_payment/view/payment_group_form.xml
@@ -20,5 +20,8 @@ this repository contains the full copyright notices and license terms. -->
     <label name="payment_complete" string="Complete"/>
     <field name="payment_complete"/>
 
-    <button name="succeed" colspan="4"/>
+    <group id="links" col="-1" colspan="2">
+        <link name="account_payment.act_payment_form_group_open"/>
+    </group>
+    <button name="succeed" colspan="2"/>
 </form>
diff --git a/modules/account_payment/view/payment_group_list.xml b/modules/account_payment/view/payment_group_list.xml
index 788d776674..67edd21864 100644
--- a/modules/account_payment/view/payment_group_list.xml
+++ b/modules/account_payment/view/payment_group_list.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<tree keyword_open="1">
+<tree>
     <field name="number"/>
     <field name="journal" optional="0"/>
     <field name="kind" optional="0"/>