[MERGE] forward port branch 12.0 up to 8f21148e1a8

1 files changed, 4 insertions, 5 deletions

diff --git a/addons/payment/static/src/js/payment_processing.js b/addons/payment/static/src/js/payment_processing.js
index 4397bf134f1..5409b915526 100644
--- a/addons/payment/static/src/js/payment_processing.js
+++ b/addons/payment/static/src/js/payment_processing.js
@@ -54,6 +54,8 @@ odoo.define('payment.processing', function (require) {
                 }
                 else {
                     switch(data.error) {
+                    case "tx_process_retry":
+                        break;
                     case "no_tx_found":
                         self.displayContent("payment.no_tx_found", {});
                         break;
@@ -63,11 +65,7 @@ odoo.define('payment.processing', function (require) {
                     }
                 }
                 self.startPolling();
-            }).always(function(){
-                if ($.blockUI) {
-                    $.unblockUI();
-                }
-            }).fail(function(e) {
+             }).fail(function(e) {
                 self.displayContent("payment.rpc_error", {});
                 self.startPolling();
             });
@@ -117,6 +115,7 @@ odoo.define('payment.processing', function (require) {
         },
         displayContent: function (xmlid, render_values) {
             var html = Qweb.render(xmlid, render_values);
+            $.unblockUI();
             this.$el.find('.o_payment_processing_content').html(html);
         },
         displayLoading: function () {