details: https://code.openbravo.com/erp/devel/pi/rev/b3cfbd87a803 changeset: 20401:b3cfbd87a803 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed May 15 17:33:52 2013 +0200 summary: Fixed bug 23698 Ability to delete operations in work requeriment
details: https://code.openbravo.com/erp/devel/pi/rev/ed386ace01e4 changeset: 20402:ed386ace01e4 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu May 16 10:03:22 2013 +0200 summary: Fixed bug 23368 Fix locator filter in physical inventory diffstat: src-db/database/sourcedata/AD_COLUMN.xml | 2 +- src-db/database/sourcedata/AD_TABLE.xml | 2 +- src/org/openbravo/erpCommon/info/Locator.java | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diffs (58 lines): diff -r a40f5609747d -r ed386ace01e4 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Mon May 20 11:48:01 2013 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu May 16 10:03:22 2013 +0200 @@ -62081,7 +62081,7 @@ <!--3815--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--3815--> <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN> <!--3815--> <AD_ELEMENT_ID><![CDATA[459]]></AD_ELEMENT_ID> -<!--3815--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--3815--> <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR> <!--3815--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--3815--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--3815--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> diff -r a40f5609747d -r ed386ace01e4 src-db/database/sourcedata/AD_TABLE.xml --- a/src-db/database/sourcedata/AD_TABLE.xml Mon May 20 11:48:01 2013 +0200 +++ b/src-db/database/sourcedata/AD_TABLE.xml Thu May 16 10:03:22 2013 +0200 @@ -5954,7 +5954,7 @@ <!--800099--> <ACCESSLEVEL><![CDATA[1]]></ACCESSLEVEL> <!--800099--> <AD_WINDOW_ID><![CDATA[800052]]></AD_WINDOW_ID> <!--800099--> <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED> -<!--800099--> <ISDELETEABLE><![CDATA[N]]></ISDELETEABLE> +<!--800099--> <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE> <!--800099--> <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME> <!--800099--> <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE> <!--800099--> <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG> diff -r a40f5609747d -r ed386ace01e4 src/org/openbravo/erpCommon/info/Locator.java --- a/src/org/openbravo/erpCommon/info/Locator.java Mon May 20 11:48:01 2013 +0200 +++ b/src/org/openbravo/erpCommon/info/Locator.java Thu May 16 10:03:22 2013 +0200 @@ -61,20 +61,30 @@ String strName = vars.getRequestGlobalVariable("inpNameValue", "Locator.warehousename"); String strWarehouse = ""; String windowId = vars.getRequestGlobalVariable("WindowID", "Locator.windowId"); + if (!windowId.equals("") && windowId != null) { strWarehouse = LocatorData.selectname(this, Utility.getContext(this, vars, "M_Warehouse_ID", windowId)); } + if ("168".equals(windowId)) { + strWarehouse = LocatorData.selectname(this, + vars.getGlobalVariable("inpmWarehouseId", "168|m_warehouse_id", "")); + } strName = strName + "%"; strWarehouse = strWarehouse + "%"; vars.setSessionValue("Locator.name", strName); vars.setSessionValue("Locator.warehousename", strWarehouse); String strOrg = vars.getGlobalVariable("inpadOrgId", "Locator.adorgid", ""); + if ("".equals(strOrg) || strOrg == null) { if ("184".equals(windowId) || "169".equals(windowId) || "800013".equals(windowId) || "800014".equals(windowId)) { strOrg = vars.getGlobalVariable("inpadOrgId", "CreateFrom|adOrgId", ""); } + if ("168".equals(windowId)) { + strOrg = vars.getGlobalVariable("inpadOrgId", "168|ad_org_id", ""); + } + } if ("".equals(strOrg) || strOrg == null) { strOrg = vars.getStringParameter("paramOrgTree"); ------------------------------------------------------------------------------ AlienVault Unified Security Management (USM) platform delivers complete security visibility with the essential security capabilities. Easily and efficiently configure, manage, and operate all of your security controls from a single console and one unified framework. Download a free trial. http://p.sf.net/sfu/alienvault_d2d _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
