From: Jorg J. <jj...@us...> - 2002-09-06 02:53:01
|
Update of /cvsroot/compiere/client/Src/org/compiere/apps/search In directory usw-pr-cvs1:/tmp/cvs-serv9835/Src/org/compiere/apps/search Modified Files: InfoBPartner.java Log Message: . Index: InfoBPartner.java =================================================================== RCS file: /cvsroot/compiere/client/Src/org/compiere/apps/search/InfoBPartner.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** InfoBPartner.java 4 Aug 2002 19:45:14 -0000 1.11 --- InfoBPartner.java 6 Sep 2002 02:52:58 -0000 1.12 *************** *** 82,86 **** /** From Clause */ ! private static String s_partnerFROM = "C_BPartner bp, C_BPartner_Contact c, C_BPartner_Location l, C_Location a"; /** Array of Column Info */ --- 82,89 ---- /** From Clause */ ! private static String s_partnerFROM = "C_BPartner bp" ! + " LEFT OUTER JOIN C_BPartner_Contact c ON (bp.C_BPartner_ID=c.C_BPartner_ID AND c.IsActive='Y')" ! + " LEFT OUTER JOIN C_BPartner_Location l ON (bp.C_BPartner_ID=l.C_BPartner_ID AND l.IsActive='Y')" ! + " LEFT OUTER JOIN C_Location a ON (l.C_Location_ID=a.C_Location_ID)"; /** Array of Column Info */ *************** *** 177,188 **** private void initInfo(String value, String whereClause) { ! // C_BPartner bp, C_BPartner_Contact c, C_BPartner_Location l, C_Location a // Create Grid StringBuffer where = new StringBuffer(); ! where.append("bp.C_BPartner_ID=c.C_BPartner_ID(+) " ! + "AND bp.C_BPartner_ID=l.C_BPartner_ID(+) " ! + "AND l.C_Location_ID=a.C_Location_ID(+) " ! + "AND bp.IsSummary='N' AND bp.IsActive='Y'"); if (whereClause != null && whereClause.length() > 0) where.append(" AND ").append(whereClause); --- 180,193 ---- private void initInfo(String value, String whereClause) { ! /** From ! C_BPartner bp ! LEFT OUTER JOIN C_BPartner_Contact c ON (bp.C_BPartner_ID=c.C_BPartner_ID AND c.IsActive='Y') ! LEFT OUTER JOIN C_BPartner_Location l ON (bp.C_BPartner_ID=l.C_BPartner_ID AND l.IsActive='Y') ! LEFT OUTER JOIN C_Location a ON (l.C_Location_ID=a.C_Location_ID) ! **/ // Create Grid StringBuffer where = new StringBuffer(); ! where.append("bp.IsSummary='N' AND bp.IsActive='Y'"); if (whereClause != null && whereClause.length() > 0) where.append(" AND ").append(whereClause); |