Merge lp:~openerp-dev/openerp-web/7.0-opw-596129-msh into lp:openerp-web/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of form reloading when wizard is closed.

Demo:- Accounting -> Payment -> Payment Order -> open form and click on "Select invoices to Pay" button it opens wizard, click on search and then again new wizard is opened add Entries to many2many field and click on "Add to Payment Order" button, Form should be reloaded so that new lines fetched in line_ids.

For further reference go through bugs:
https://bugs.launchpad.net/openerp-web/+bug/1155525
https://bugs.launchpad.net/openobject-addons/+bug/1191547

Thanks.

[lp:~openerp-dev/openerp-web/7.0-opw-596129-msh]

4013. By Launchpad Translations on behalf of openerp on 2013-08-15

Launchpad automatic translations update.

[Stefan Rijnhart (Opener) (stefan-opener)]

Great work! Thank you for fixing this.

review: Approve (test)

[lp:~openerp-dev/openerp-web/7.0-opw-596129-msh]

4014. By Martin Trigaux (OpenERP) on 2013-08-21

[FIX] vertical alignment of fields on firefox (opw #590181)

4015. By Martin Trigaux (OpenERP) on 2013-08-21

[MERGE] [FIX] reload form if button has option reload_on_button

[Stéphane Bidoul (Acsone) (sbi)]

Works for me. Thanks!

review: Approve (test)

[lp:~openerp-dev/openerp-web/7.0-opw-596129-msh]

4016. By Launchpad Translations on behalf of openerp on 2013-08-22

Launchpad automatic translations update.

4017. By Launchpad Translations on behalf of openerp on 2013-08-23

Launchpad automatic translations update.

4018. By Martin Trigaux (OpenERP) on 2013-08-23

[FIX] tree view: correct toggeling of hierarchic tree, correctly pass ids

4019. By Launchpad Translations on behalf of openerp on 2013-08-25

Launchpad automatic translations update.

4020. By Launchpad Translations on behalf of openerp on 2013-08-26

Launchpad automatic translations update.

4021. By Martin Trigaux (OpenERP) on 2013-08-29

[FIX] tree views: rename variable parent-id to avoid conflicts with record fields name (eg: account.account)

4022. By Launchpad Translations on behalf of openerp on 2013-08-30

Launchpad automatic translations update.

4023. By Launchpad Translations on behalf of openerp on 2013-09-02

Launchpad automatic translations update.

[Stefan Rijnhart (Opener) (stefan-opener)]

Found the following problem with this change:

Go to a payment order and click 'Select invoices to pay'. In the popup, or in the next popup, press ESC or click the upper right corner to cancel the operation.

Click 'Select invoices to pay' again. You now get

    TypeError: this.get_action_manager(...) is undefined

Without this change, the error does not occur.

review: Needs Fixing

[Stéphane Bidoul (Acsone) (sbi)]

Nice catch Stefan. I confirm the issue, although with a different error message in my case:

      Uncaught TypeError: Cannot call method 'get_title' of undefined

-sbi

review: Needs Fixing

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

OPW ticket reopened. Please fix this issue

review: Needs Fixing

[lp:~openerp-dev/openerp-web/7.0-opw-596129-msh]

4024. By Launchpad Translations on behalf of openerp on 2013-09-04

Launchpad automatic translations update.

4025. By Mohammed Shekha<email address hidden> on 2013-09-04

[FIX]Refixed the issue of form reload on wizard close, clicking on cross sign on dialog breaks wizard re-opening, dialog should be null when close is triggered.

[Mohammed Shekha(Open ERP) (msh-openerp)]

Hello Stefan Rijnhart and Stéphane Bidoul,

Thanks for drawing attention on this issue.

I have refixed the issue, would you please retry to test your scenarios with this branch.

Thanks.

review: Needs Resubmitting

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

It works!

Thanks

review: Approve (test)

[Stéphane Bidoul (Acsone) (sbi)]

Works for me too.

review: Approve (test)

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks, I confirm that this fixes the problem that we observed in the first version.

review: Approve

[Ruchir Shukla(BizzAppDev) (ruchir.shukla)]

with this branch it has solved the problem but it introduces new bug.
Bug in multiple popup weird behavior
Lets say in case of the multiple popup. in second wizard there is a problem in footer .
E.G load translation menu . when you select language . and load it . As a result it will popup new wizard .
in this new wizard it has a problem as there are 2 footers one for init state and second is done state .
some how "OR" is there from init state in second popup.

I have provided fix in https://code.launchpad.net/~ruchir.shukla/openerp-web/7.0-opw-596129-fix-destroy and already requested to merge fix into this branch. Please do needful.

review: Needs Fixing

Unmerged revisions

4025. By Mohammed Shekha<email address hidden> on 2013-09-04

[FIX]Refixed the issue of form reload on wizard close, clicking on cross sign on dialog breaks wizard re-opening, dialog should be null when close is triggered.

=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js	2013-06-21 12:44:49 +0000
+++ addons/web/static/src/js/views.js	2013-09-04 10:15:42 +0000
@@ -364,6 +364,7 @@
      * @return {*}
      */
     ir_actions_common: function(executor, options) {
+        var self = this;
         if (this.inner_widget && executor.action.target !== 'new') {
             if (this.getParent().has_uncommitted_changes()) {
                 return $.Deferred().reject();
@@ -373,14 +374,23 @@
         }
         var widget = executor.widget();
         if (executor.action.target === 'new') {
-            if (this.dialog_widget && !this.dialog_widget.isDestroyed()) {
+            if(this.dialog == null) {
+                if (this.dialog_widget && !this.dialog_widget.isDestroyed()) {
+                    this.dialog_widget.destroy();
+                }
+                this.dialog_stop();
+                this.dialog = new instance.web.Dialog(this, {
+                    dialogClass: executor.klass,
+                });
+                if (options.on_close) {
+                    this.dialog.on("closing", null, function() {
+                        self.dialog = null;
+                        options.on_close.apply(null, arguments)
+                    });
+                }
+            } else {
                 this.dialog_widget.destroy();
             }
-            this.dialog_stop();
-            this.dialog = new instance.web.Dialog(this, {
-                dialogClass: executor.klass,
-            });
-            this.dialog.on("closing", null, options.on_close);
             this.dialog.dialog_title = executor.action.name;
             if (widget instanceof instance.web.ViewManager) {
                 _.extend(widget.flags, {