diff --git a/account_banking_sepa_credit_transfer/tests/test_sct.py b/account_banking_sepa_credit_transfer/tests/test_sct.py
index 4a2ee56e1..e6caaa2f6 100644
--- a/account_banking_sepa_credit_transfer/tests/test_sct.py
+++ b/account_banking_sepa_credit_transfer/tests/test_sct.py
@@ -199,7 +199,7 @@ class TestSCT(common.HttpCase):
             debtor_acc_xpath[0].text,
             self.payment_order.company_partner_bank_id.sanitized_acc_number)
         self.payment_order.generated2uploaded()
-        self.assertEqual(self.payment_order.state, 'uploaded')
+        self.assertEqual(self.payment_order.state, 'done')
         for inv in [invoice1, invoice2, invoice3, invoice4, invoice5]:
             self.assertEqual(inv.state, 'paid')
         return
@@ -276,7 +276,7 @@ class TestSCT(common.HttpCase):
             debtor_acc_xpath[0].text,
             self.payment_order.company_partner_bank_id.sanitized_acc_number)
         self.payment_order.generated2uploaded()
-        self.assertEqual(self.payment_order.state, 'uploaded')
+        self.assertEqual(self.payment_order.state, 'done')
         for inv in [invoice1, invoice2]:
             self.assertEqual(inv.state, 'paid')
         return
diff --git a/account_banking_sepa_direct_debit/tests/test_sdd.py b/account_banking_sepa_direct_debit/tests/test_sdd.py
index de16fcc65..09d212ff1 100644
--- a/account_banking_sepa_direct_debit/tests/test_sdd.py
+++ b/account_banking_sepa_direct_debit/tests/test_sdd.py
@@ -209,7 +209,7 @@ class TestSDD(common.HttpCase):
             debtor_acc_xpath[0].text,
             payment_order.company_partner_bank_id.sanitized_acc_number)
         payment_order.generated2uploaded()
-        self.assertEqual(payment_order.state, 'uploaded')
+        self.assertEqual(payment_order.state, 'done')
         for inv in [invoice1, invoice2]:
             self.assertEqual(inv.state, 'paid')
         self.assertEqual(self.mandate2.recurrent_sequence_type, 'recurring')
diff --git a/account_payment_order/views/account_payment_order.xml b/account_payment_order/views/account_payment_order.xml
index 155cbb4a8..ca03f600f 100644
--- a/account_payment_order/views/account_payment_order.xml
+++ b/account_payment_order/views/account_payment_order.xml
@@ -21,8 +21,11 @@
                     string="Back to Draft" />
                 <button name="action_cancel" type="object" states="draft,open,generated"
                     string="Cancel Payments"/>
-                <button name="action_done_cancel" type="object" states="uploaded"
+                <button name="action_done_cancel" type="object" states="uploaded,done"
                     string="Cancel Payments"/>
+                <button name="action_done" type="object" states="uploaded"
+                    string="Set Done"
+                    />
                 <field name="state" widget="statusbar"/>
             </header>
             <sheet>