details: /erp/devel/pi/rev/ba4cbeb3d8a7
changeset: 6550:ba4cbeb3d8a7
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Mar 02 17:01:15 2010 +0100
summary: fixed bug 11916: You can select a Warehouse that does not belong to
your organization
diffstat:
src-wad/src/org/openbravo/wad/Wad.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diffs (60 lines):
diff -r fa8455a993b4 -r ba4cbeb3d8a7 src-wad/src/org/openbravo/wad/Wad.java
--- a/src-wad/src/org/openbravo/wad/Wad.java Tue Mar 02 15:06:42 2010 +0100
+++ b/src-wad/src/org/openbravo/wad/Wad.java Tue Mar 02 17:01:15 2010 +0100
@@ -2932,8 +2932,10 @@
data[i].columnname = "inp" +
Sqlc.TransformaNombreColumna(data[i].columnname);
data[i].whereclause = WadUtility.getComboReloadText(code, vecFields,
parentsFieldsData,
vecReloads, "inp");
- if (data[i].whereclause.equals("") && data[i].type.equals("R"))
- data[i].whereclause = "\"inpadOrgId\"";
+
+ // Always add combo reload for organization
+ data[i].whereclause += (!data[i].whereclause.isEmpty() ? ", " : "") +
"\"inpadOrgId\"";
+
if (data[i].reference.equals("17") && data[i].whereclause.equals(""))
data[i].whereclause = "\"inp" + data[i].columnname + "\"";
if (!data[i].whereclause.equals("")
@@ -2973,8 +2975,8 @@
WADControl control = WadUtility.getWadControlClass(pool,
data[i].reference,
data[i].referencevalue);
- control.columnIdentifier(tables[0].tablename, tables[0],
vecCounters, vecFields1, vecTables,
- vecWhere, vecParameters, vecTableParameters);
+ control.columnIdentifier(tables[0].tablename, tables[0],
vecCounters, vecFields1,
+ vecTables, vecWhere, vecParameters, vecTableParameters);
where.append(tables[0].whereclause);
data[i].tablename = "TableList";
@@ -3017,8 +3019,8 @@
WADControl control = WadUtility.getWadControlClass(pool,
data[i].reference,
data[i].referencevalue);
- control.columnIdentifier(table_Name, data[i], vecCounters,
vecFields1, vecTables, vecWhere,
- vecParameters, vecTableParameters);
+ control.columnIdentifier(table_Name, data[i], vecCounters,
vecFields1, vecTables,
+ vecWhere, vecParameters, vecTableParameters);
data[i].xmltext = "";
if (vecTableParameters.size() > 0) {
@@ -3132,8 +3134,8 @@
WADControl control = WadUtility.getWadControlClass(pool,
data[i].reference,
data[i].referencevalue);
- control.columnIdentifier(tables[0].tablename, tables[0],
vecCounters, vecFields1, vecTables,
- vecWhere, vecParameters, vecTableParameters);
+ control.columnIdentifier(tables[0].tablename, tables[0],
vecCounters, vecFields1,
+ vecTables, vecWhere, vecParameters, vecTableParameters);
where.append(tables[0].whereclause);
@@ -3177,8 +3179,8 @@
WADControl control = WadUtility.getWadControlClass(pool,
data[i].reference,
data[i].referencevalue);
- control.columnIdentifier(table_Name, data[i], vecCounters,
vecFields1, vecTables, vecWhere,
- vecParameters, vecTableParameters);
+ control.columnIdentifier(table_Name, data[i], vecCounters,
vecFields1, vecTables,
+ vecWhere, vecParameters, vecTableParameters);
data[i].xmltext = "";
if (vecTableParameters.size() > 0) {
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
