openerp-dev-web team mailing list archive

["Sananaz \(Open ERP\)" <sma@xxxxxxxxxxx>]

Sananaz (Open ERP) has proposed merging lp:~openerp-dev/openobject-client-web/6.0-opw-4598-sma into lp:openobject-client-web/6.0.

Requested reviews:
  OpenERP Core Team (openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-4598-sma/+merge/54817

Hello,

Please check with following steps.
- Go to Accounting
- Bank and Cash
- Bank Statements > Create New > Click on `Import Invoices` > Add Accounting Entries > click on `OK`
- So need to add all accounting entries in Statement lines (Which is not updated)

Thanks.


-- 
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-4598-sma/+merge/54817
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client-web/6.0-opw-4598-sma.

=== modified file 'addons/openerp/controllers/actions.py'
--- addons/openerp/controllers/actions.py	2011-02-21 16:41:44 +0000
+++ addons/openerp/controllers/actions.py	2011-03-25 07:34:13 +0000
@@ -486,7 +486,11 @@
     :return: the rendered popup-closing template
     :rtype: str
     """
-    return {'reload': reload}
+    active_id = False
+    if getattr(cherrypy.request, 'params', []):
+        if getattr(cherrypy.request.params, 'context', {}):
+            active_id = cherrypy.request.params.context.get('active_id')
+    return {'reload': reload, 'active_id': active_id}
 
 @tools.expose(template="/openerp/controllers/templates/report.mako")
 def report_link(report_name, **kw):

=== modified file 'addons/openerp/controllers/templates/closepopup.mako'
--- addons/openerp/controllers/templates/closepopup.mako	2011-01-07 09:33:33 +0000
+++ addons/openerp/controllers/templates/closepopup.mako	2011-03-25 07:34:13 +0000
@@ -22,6 +22,18 @@
             */
             var $doc = jQuery(topWindow.document);
             switch($doc.find('#_terp_view_type').val()) {
+            	case 'form':
+                    var terp_id = jQuery(idSelector('_terp_id'),$doc).val();
+                    if(terp_id == "False") {
+                    	terp_id = '${active_id}';
+                    }
+                    if(terp_id == "False" || !terp_id) {
+                    	topWindow.location.href = '/openerp';
+                    	return;
+                    } else {
+                    	topWindow.editRecord(terp_id);
+                    	return;
+                    }
                 case 'tree':
                     new topWindow.ListView('_terp_list').reload();
                     return;