details: https://code.openbravo.com/erp/devel/pi/rev/64738cd96541
changeset: 15139:64738cd96541
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Fri Jan 13 15:05:54 2012 +0100
summary: Fixes issue 19487, issue 19203.
I have deleted the message because it is not going to be use more and I have
changed the code to get the value of the ad_org_id. Now if the value of
inpadOrgId is null I go to the window to get the value.
diffstat:
src-db/database/sourcedata/AD_MESSAGE.xml | 11 -----------
src/org/openbravo/erpCommon/info/Location.java | 12 ++++++++----
2 files changed, 8 insertions(+), 15 deletions(-)
diffs (53 lines):
diff -r f3c74e42f447 -r 64738cd96541 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Fri Jan 13 10:54:37 2012 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Fri Jan 13 15:05:54 2012 +0100
@@ -19374,17 +19374,6 @@
<!--E8E6AAC0FDFE4761A99130A4D945D95A-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--E8E6AAC0FDFE4761A99130A4D945D95A--></AD_MESSAGE>
-<!--EA2BDDB6B3754D0A90454FCB739202F1--><AD_MESSAGE>
-<!--EA2BDDB6B3754D0A90454FCB739202F1-->
<AD_MESSAGE_ID><![CDATA[EA2BDDB6B3754D0A90454FCB739202F1]]></AD_MESSAGE_ID>
-<!--EA2BDDB6B3754D0A90454FCB739202F1-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--EA2BDDB6B3754D0A90454FCB739202F1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--EA2BDDB6B3754D0A90454FCB739202F1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--EA2BDDB6B3754D0A90454FCB739202F1-->
<VALUE><![CDATA[SaveFirstTheRecord]]></VALUE>
-<!--EA2BDDB6B3754D0A90454FCB739202F1--> <MSGTEXT><![CDATA[Before you can
enter a location, you have to save the record.]]></MSGTEXT>
-<!--EA2BDDB6B3754D0A90454FCB739202F1--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
-<!--EA2BDDB6B3754D0A90454FCB739202F1-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--EA2BDDB6B3754D0A90454FCB739202F1--></AD_MESSAGE>
-
<!--EA5B6DBA836D479FBECFD34D6CEE95DC--><AD_MESSAGE>
<!--EA5B6DBA836D479FBECFD34D6CEE95DC-->
<AD_MESSAGE_ID><![CDATA[EA5B6DBA836D479FBECFD34D6CEE95DC]]></AD_MESSAGE_ID>
<!--EA5B6DBA836D479FBECFD34D6CEE95DC-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r f3c74e42f447 -r 64738cd96541
src/org/openbravo/erpCommon/info/Location.java
--- a/src/org/openbravo/erpCommon/info/Location.java Fri Jan 13 10:54:37
2012 +0100
+++ b/src/org/openbravo/erpCommon/info/Location.java Fri Jan 13 15:05:54
2012 +0100
@@ -48,13 +48,14 @@
if (vars.commandIn("DEFAULT")) {
vars.getRequestGlobalVariable("inpIDValue", "Location.inpcLocationId");
- if ("".equals(vars.getRequestGlobalVariable("inpadOrgId",
"Location.inpadOrgId"))) {
- throw new ServletException("@SaveFirstTheRecord@");
- }
// String strcLocationId =
// vars.getRequestGlobalVariable("inpNameValue",
// "Location.inpcLocationId");
- vars.getRequestGlobalVariable("inpwindowId", "Location.inpwindowId");
+ String windowId = vars.getRequestGlobalVariable("WindowID",
"Location.inpwindowId");
+ String adOrgId = vars.getGlobalVariable("inpadOrgId", windowId +
"|AD_Org_ID", "");
+ if (!"".equals(adOrgId)) {
+ vars.setSessionValue("Location.inpadOrgId", adOrgId);
+ }
printPageFS(response, vars);
} else if (vars.commandIn("KEY")) {
String strcLocationId = vars.getStringParameter("inpIDValue");
@@ -103,6 +104,9 @@
data.cLocationId = vars.getStringParameter("inpCLocationId");
data.adClientId = vars.getClient();
data.adOrgId = vars.getStringParameter("inpadOrgId");
+ if ("".equals(data.adOrgId)) {
+ data.adOrgId = vars.getOrg();
+ }
data.createdby = vars.getUser();
data.updatedby = vars.getUser();
data.cCountryId = vars.getStringParameter("inpcCountryId");
------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
