details: /erp/stable/2.50/rev/7a547b146f20
changeset: 9232:7a547b146f20
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Feb 23 18:49:38 2011 +0100
summary: Fixes issue 0015349: There are references duplicated in the lines of
bank statement
It has been added a function to remove duplicates and has been fixed some wrong
parameters in the SQL query
diffstat:
src/org/openbravo/erpCommon/utility/UsedByLink.java | 15 +++++++++++++--
src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql | 10 +++++-----
2 files changed, 18 insertions(+), 7 deletions(-)
diffs (65 lines):
diff -r 9c159d992bd8 -r 7a547b146f20
src/org/openbravo/erpCommon/utility/UsedByLink.java
--- a/src/org/openbravo/erpCommon/utility/UsedByLink.java Wed Feb 23
18:41:22 2011 +0100
+++ b/src/org/openbravo/erpCommon/utility/UsedByLink.java Wed Feb 23
18:49:38 2011 +0100
@@ -129,7 +129,7 @@
keyColumnId, keyColumn, tableId, linkedTablesQuery.toString());
if (data != null && data.length > 0) {
- final Vector<Object> vecTotal = new Vector<Object>();
+ final Vector<UsedByLinkData> vecTotal = new Vector<UsedByLinkData>();
for (int i = 0; i < data.length; i++) {
String keyValue = keyId;
if (!data[i].referencedColumnId.equals(keyColumnId)) {
@@ -173,7 +173,7 @@
if (data[i].accessible.equals("N") && total > 0) {
nonAccessible = true;
- } else if (total > 0) {
+ } else if (total > 0 && !existsInVector(data[i], vecTotal)) {
vecTotal.addElement(data[i]);
}
}
@@ -198,6 +198,17 @@
out.close();
}
+
+ private boolean existsInVector(UsedByLinkData elem, Vector<UsedByLinkData>
vec) {
+
+ for (UsedByLinkData i : vec) {
+ if (elem.adTabId.equals(i.adTabId)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private void printPageDetail(HttpServletRequest request, HttpServletResponse
response,
VariablesSecureApp vars, String strWindow, String TabId, String
keyColumn, String keyId,
String strAD_TAB_ID, String strTABLENAME, String strCOLUMNNAME, String
adTableId)
diff -r 9c159d992bd8 -r 7a547b146f20
src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql
--- a/src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql Wed Feb 23
18:41:22 2011 +0100
+++ b/src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql Wed Feb 23
18:49:38 2011 +0100
@@ -100,17 +100,17 @@
<Parameter name="adLanguage"/>
<Parameter name="role"/>
<Parameter name="columnnId"/>
- <Parameter name="columnnId"/>
+ <Parameter name="columnname"/>
<Parameter name="columnnId"/>
<Parameter name="columnname"/>
+ <Parameter name="adTableId"/>
+ <Parameter name="adTableId"/>
+ <Parameter name="columnnId"/>
<Parameter name="columnname"/>
- <Parameter name="adTableId"/>
- <Parameter name="adTableId"/>
- <Parameter name="columnname"/>
+ <Parameter name="colList" type="replace" optional="true" after="WHERE
AD_COLUMN_ID IN (" text="'1'"/>
<Parameter name="adLanguage"/>
<Parameter name="adLanguage"/>
<Parameter name="adLanguage"/>
- <Parameter name="colList" type="replace" optional="true" after="WHERE
AD_COLUMN_ID IN (" text="'1'"/>
</SqlMethod>
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits