# HG changeset patch
# User Augusto Mauch <augusto.mauch@openbravo.com>
# Date 1409568517 -7200
#      Mon Sep 01 12:48:37 2014 +0200
# Node ID fa9897fd81dcd0a07d1cac5b6e16f3fb8d809e6d
# Parent  2c62bc3a916f8ed33ad945521c9ae9538d11ff4a
Fixes issue 27322: Param windows opened from the menu fill in _org parameter

If the parameter window has an ad_org_id parameter and is not empty, its value will be used to set _org. Otherwise the current user organization will be used.

diff --git a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
--- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
@@ -1028,6 +1028,12 @@
       isc.addProperties(params, selector.view.sourceView.getContextInfo(false, true, null, selector.isComboReference));
     } else if (selector.grid && selector.grid.contentView && selector.grid.contentView.getContextInfo) {
       isc.addProperties(params, selector.grid.contentView.getContextInfo(false, true, null, selector.isComboReference));
+    } else if (selector.form && selector.form.paramWindow && selector.form.paramWindow.getContextInfo) {
+      isc.addProperties(params, selector.form.paramWindow.getContextInfo());
+      if (!params.inpadOrgId) {
+        // look for an ad_org_id parameter. If there is no such parameter or its value is empty, use the current user organization
+        params.inpadOrgId = params.ad_org_id || OB.User.organizationId;
+      }
     }
 
     if (selector.form && selector.form.view && selector.form.view.standardWindow) {