Merge lp:~openerp-dev/openerp-web/7.0-bug-1095366-vja into lp:openerp-web/7.0

[Vishmita Jadeja (openerp)]

Hello,

To Reproduce:
1. Go to Accounting => Suppliers => Supplier payments
2. Create a new payment
3. select eg AsusTEK as supplier
4. add a line, create a journal item and select asustek as partner,click ok, click on "validate"
5. then click on unreconcile button
6. close the dialog that opens => the unreconcile button becomes greyed out

Fixed this issue by resolve deferred object on close of confirm dialog.

Thanks.

[Christophe Matthieu (OpenERP) (chm-openerp)]

Hi,
It's fixed in 7.0 (see view_form: ligne 1932, line 1938).
Thanks.

view_form.js
ligne 1932:
self.on_confirmed().always(function() {
   $(self2).dialog("close");
});

line 1938:

beforeClose: function() {
   def.resolve();
},

review: Disapprove

Unmerged revisions

3709. By Vishmita Jadeja (openerp) on 2013-01-22

[Fix]Resolve deferred on close of dialog

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-01-07 16:18:07 +0000
+++ addons/web/static/src/js/view_form.js	2013-01-22 09:25:32 +0000
@@ -1913,6 +1913,7 @@
                 var dialog = instance.web.dialog($('<div/>').text(self.node.attrs.confirm), {
                     title: _t('Confirm'),
                     modal: true,
+                    close: function(){def.resolve(); },
                     buttons: [
                         {text: _t("Cancel"), click: function() {
                                 def.resolve();
@@ -1920,9 +1921,7 @@
                             }
                         },
                         {text: _t("Ok"), click: function() {
-                                self.on_confirmed().done(function() {
-                                    def.resolve();
-                                });
+                                self.on_confirmed();
                                 $(this).dialog("close");
                             }
                         }