From: Jorg J. <jj...@us...> - 2002-07-30 05:50:47
|
Update of /cvsroot/compiere/base/src/org/compiere/model In directory usw-pr-cvs1:/tmp/cvs-serv8598/src/org/compiere/model Modified Files: CalloutSystem.java MLookup.java MLookupFactory.java MLookupInfo.java MTab.java Log Message: . Index: CalloutSystem.java =================================================================== RCS file: /cvsroot/compiere/base/src/org/compiere/model/CalloutSystem.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** CalloutSystem.java 28 Jul 2002 02:39:11 -0000 1.24 --- CalloutSystem.java 30 Jul 2002 05:50:43 -0000 1.25 *************** *** 152,155 **** --- 152,162 ---- /** * Conversion Rate - set Multiply Rate from Divide Rate and vice versa + * + * @param ctx context + * @param WindowNo window + * @param mTab tab + * @param mField field + * @param value value + * @return error message */ private static String Conversion_Rate (Properties ctx, int WindowNo, MTab mTab, MField mField, Object value) *************** *** 264,270 **** DocSubTypeSO = "--"; Env.setContext(ctx, WindowNo, "OrderType", DocSubTypeSO); ! if (DocSubTypeSO.equals("WR")) // POS Order ! mTab.setValue("PaymentRule", "B"); // Cash ! else mTab.setValue("PaymentRule", "P"); // Payment Term --- 271,278 ---- DocSubTypeSO = "--"; Env.setContext(ctx, WindowNo, "OrderType", DocSubTypeSO); ! mTab.setValue("PaymentRule", "P"); // Payment Term ! mTab.setValue("InvoiceRule", "D"); // Delivery ! mTab.setValue("DeliveryRule", "A"); // Availability ! if (DocSubTypeSO.equals(DocSubTypeSO_POS)) // POS Order mTab.setValue("PaymentRule", "P"); // Payment Term *************** *** 461,465 **** // Defaults, if not Walkin Receipt or Walkin Invoice String OrderType = Env.getContext(ctx, WindowNo, "OrderType"); ! if (!OrderType.equals(DocSubTypeSO_POS)) // not for POS or Credit Order { // PaymentRule --- 469,478 ---- // Defaults, if not Walkin Receipt or Walkin Invoice String OrderType = Env.getContext(ctx, WindowNo, "OrderType"); ! mTab.setValue("InvoiceRule", "D"); // Delivery ! mTab.setValue("DeliveryRule", "A"); // Availability ! mTab.setValue("PaymentRule", "P"); // Payment Term ! if (OrderType.equals(DocSubTypeSO_POS)) // for POS ! mTab.setValue("PaymentRule", "B"); // Cash ! else { // PaymentRule Index: MLookup.java =================================================================== RCS file: /cvsroot/compiere/base/src/org/compiere/model/MLookup.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MLookup.java 13 Jul 2002 04:24:28 -0000 1.13 --- MLookup.java 30 Jul 2002 05:50:43 -0000 1.14 *************** *** 379,383 **** public Object getDirect (Object key, boolean saveInCache) { ! Log.trace(Log.l6_Database, "MLookup.getDirect " + m_info.KeyColumn + " - " + key + " SQL=" + m_info.QueryDirect); // Nothing to query if (key == null || m_info.QueryDirect == null || m_info.QueryDirect.length() == 0) --- 379,386 ---- public Object getDirect (Object key, boolean saveInCache) { ! Log.trace(Log.l6_Database, "MLookup.getDirect - " ! + m_info.KeyColumn + "=" + key ! // ,"SQL=" + m_info.QueryDirect ! ); // Nothing to query if (key == null || m_info.QueryDirect == null || m_info.QueryDirect.length() == 0) *************** *** 414,418 **** --- 417,425 ---- m_lookup.put(value, p); } + if (rs.next()) + Log.error("MLookup.getDirect - not unique (first returned) for " + + m_info.KeyColumn + "=" + key + " SQL=" + m_info.QueryDirect); } + rs.close(); pstmt.close(); *************** *** 488,492 **** public void run() { - // Log.trace(Log.l6_Database, "MLookup.Loader.run", m_info.KeyColumn); long startTime = System.currentTimeMillis(); MLookupCache.loadStart (m_info); --- 495,498 ---- *************** *** 522,525 **** --- 528,533 ---- } + // Log.trace(Log.l6_Database, "MLookup.Loader.run - " + m_info.KeyColumn, sql); + // Log.trace(Log.l6_Database, "MLookup.Loader.run - " + m_info.KeyColumn, "Direct= " + m_info.QueryDirect); // Reset m_lookup.clear(); Index: MLookupFactory.java =================================================================== RCS file: /cvsroot/compiere/base/src/org/compiere/model/MLookupFactory.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MLookupFactory.java 1 Jul 2002 02:27:54 -0000 1.9 --- MLookupFactory.java 30 Jul 2002 05:50:43 -0000 1.10 *************** *** 215,228 **** StringBuffer realSQL = new StringBuffer ("SELECT NULL, AD_Ref_List.Value,"); if (Env.isBaseLanguage(ctx)) ! realSQL.append("AD_Ref_List.Name,AD_Ref_List.IsActive FROM AD_Ref_List WHERE "); else ! realSQL.append("trl.Name, AD_Ref_List.IsActive FROM AD_Ref_List, AD_Ref_List_Trl trl" ! + " WHERE AD_Ref_List.AD_Ref_List_ID=trl.AD_Ref_List_ID AND trl.AD_Language='") ! .append(Env.getLanguage(ctx)).append("' AND "); ! realSQL.append("AD_Ref_List.AD_Reference_ID=").append(AD_Reference_Value_ID); realSQL.append(" ORDER BY 2"); // return new MLookupInfo(realSQL.toString(), "AD_Ref_List.Value", ! 101, "AD_Reference_ID=" + AD_Reference_Value_ID); } // getLookup_List --- 215,229 ---- StringBuffer realSQL = new StringBuffer ("SELECT NULL, AD_Ref_List.Value,"); if (Env.isBaseLanguage(ctx)) ! realSQL.append("AD_Ref_List.Name,AD_Ref_List.IsActive FROM AD_Ref_List"); else ! realSQL.append("trl.Name, AD_Ref_List.IsActive " ! + "FROM AD_Ref_List INNER JOIN AD_Ref_List_Trl trl " ! + " ON (AD_Ref_List.AD_Ref_List_ID=trl.AD_Ref_List_ID AND trl.AD_Language='") ! .append(Env.getLanguage(ctx)).append("')"); ! realSQL.append(" WHERE AD_Ref_List.AD_Reference_ID=").append(AD_Reference_Value_ID); realSQL.append(" ORDER BY 2"); // return new MLookupInfo(realSQL.toString(), "AD_Ref_List.Value", ! 101, "AD_Reference_ID=" + AD_Reference_Value_ID); // Zoom Window+Query } // getLookup_List *************** *** 287,291 **** realSQL.append("NULL,"); - boolean hasWhere = false; // Translated if (IsTranslated && !Env.isBaseLanguage(ctx)) --- 288,291 ---- *************** *** 296,305 **** if (isValueDisplayed) realSQL.append(TableName).append(".Value || '-' || "); ! realSQL.append(TableName).append("_Trl.").append(DisplayColumn); ! realSQL.append(",").append(TableName).append(".IsActive"); ! realSQL.append(" FROM ").append(TableName).append(",").append(TableName).append("_Trl"); ! realSQL.append(" WHERE ").append(TableName).append(".").append(KeyColumn); ! realSQL.append("=").append(TableName).append("_Trl.").append(KeyColumn); ! hasWhere = true; } // Not Translated --- 296,306 ---- if (isValueDisplayed) realSQL.append(TableName).append(".Value || '-' || "); ! realSQL.append(TableName).append("_Trl.").append(DisplayColumn) ! .append(",").append(TableName).append(".IsActive"); ! realSQL.append(" FROM ").append(TableName) ! .append(" INNER JOIN ").append(TableName).append("_TRL ON (") ! .append(TableName).append(".").append(KeyColumn) ! .append("=").append(TableName).append("_Trl.").append(KeyColumn) ! .append(" AND ").append(TableName).append("_Trl.AD_Language='").append(Env.getLanguage(ctx)).append("')"); } // Not Translated *************** *** 328,335 **** if (where.length() != 0) { ! if (hasWhere) ! realSQL.append(" AND ").append(where); ! else ! realSQL.append(" WHERE ").append(where); if (where.indexOf(".") == -1) Log.error("MLookupFactory.getLookup_Table - " + TableName --- 329,333 ---- if (where.length() != 0) { ! realSQL.append(" WHERE ").append(where); if (where.indexOf(".") == -1) Log.error("MLookupFactory.getLookup_Table - " + TableName *************** *** 460,467 **** if (isTranslated && !Env.isBaseLanguage(ctx)) { ! realSQL.append(" FROM ").append(TableName).append(",").append(TableName).append("_Trl"); ! realSQL.append(" WHERE ").append(TableName).append(".").append(KeyColumn) .append("=").append(TableName).append("_Trl.").append(KeyColumn) ! .append(" AND ").append(TableName).append("_Trl.AD_Language='").append(Env.getLanguage(ctx)).append("'"); } else // no translation --- 458,466 ---- if (isTranslated && !Env.isBaseLanguage(ctx)) { ! realSQL.append(" FROM ").append(TableName) ! .append(" INNER JOIN ").append(TableName).append("_TRL ON (") ! .append(TableName).append(".").append(KeyColumn) .append("=").append(TableName).append("_Trl.").append(KeyColumn) ! .append(" AND ").append(TableName).append("_Trl.AD_Language='").append(Env.getLanguage(ctx)).append("')"); } else // no translation Index: MLookupInfo.java =================================================================== RCS file: /cvsroot/compiere/base/src/org/compiere/model/MLookupInfo.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MLookupInfo.java 25 May 2002 03:03:18 -0000 1.7 --- MLookupInfo.java 30 Jul 2002 05:50:43 -0000 1.8 *************** *** 30,37 **** /** * Cosntructor ! * @param query ! * @param keyColumn ! * @param zoomWindow ! * @param zoomQuery */ public MLookupInfo (String query, String keyColumn, int zoomWindow, String zoomQuery) --- 30,37 ---- /** * Cosntructor ! * @param query query ! * @param keyColumn key column ! * @param zoomWindow zoom window ! * @param zoomQuery zoom query */ public MLookupInfo (String query, String keyColumn, int zoomWindow, String zoomQuery) *************** *** 77,81 **** * Can have SQL LIKE placeholders. * (This is more a development tool than used for production) ! * @param referenceName * @return AD_Reference_ID */ --- 77,81 ---- * Can have SQL LIKE placeholders. * (This is more a development tool than used for production) ! * @param referenceName reference name * @return AD_Reference_ID */ *************** *** 119,123 **** * Can have SQL LIKE placeholders. * (This is more a development tool than used for production) ! * @param columnName * @return AD_Column_ID */ --- 119,123 ---- * Can have SQL LIKE placeholders. * (This is more a development tool than used for production) ! * @param columnName column name * @return AD_Column_ID */ Index: MTab.java =================================================================== RCS file: /cvsroot/compiere/base/src/org/compiere/model/MTab.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** MTab.java 28 Jul 2002 02:39:11 -0000 1.29 --- MTab.java 30 Jul 2002 05:50:43 -0000 1.30 *************** *** 667,674 **** /** ! * Set Name of link column (Set from MWindow) * @param linkColumnName name of column - or sets name to AD_Column_ID, if exists */ ! public void setLinkColumnName(String linkColumnName) { if (linkColumnName != null) --- 667,677 ---- /** ! * Set Name of link column. ! * Set from MWindow.loadTabData ! * Used in MTab.isCurreny, (.setCurrentRow) .query - APanel.cmd_report ! * and MField.isEditable and .isDefault via context * @param linkColumnName name of column - or sets name to AD_Column_ID, if exists */ ! public void setLinkColumnName (String linkColumnName) { if (linkColumnName != null) *************** *** 676,681 **** else { // we have a link column identified (primary parent column) ! if (m_vo.AD_Column_ID != 0) { String SQL = "SELECT ColumnName FROM AD_Column WHERE AD_Column_ID=?"; --- 679,686 ---- else { + if (m_vo.AD_Column_ID == 0) + return; // we have a link column identified (primary parent column) ! else { String SQL = "SELECT ColumnName FROM AD_Column WHERE AD_Column_ID=?"; *************** *** 683,687 **** { PreparedStatement pstmt = DB.prepareStatement(SQL); ! pstmt.setInt(1, m_vo.AD_Column_ID); ResultSet rs = pstmt.executeQuery(); if (rs.next()) --- 688,692 ---- { PreparedStatement pstmt = DB.prepareStatement(SQL); ! pstmt.setInt(1, m_vo.AD_Column_ID); // Link Column ResultSet rs = pstmt.executeQuery(); if (rs.next()) *************** *** 694,700 **** DB.printException("MTab.setLinkColumn", e); } } } ! Env.setContext(m_vo.ctx, m_vo.WindowNo, m_vo.TabNo, "LinkColumnName", m_linkColumnName); } // setLinkColumnName --- 699,706 ---- DB.printException("MTab.setLinkColumn", e); } + Log.trace(Log.l6_Database, "MTab.setLinkColumnName - " + m_vo.AD_Column_ID, m_linkColumnName); } } ! Env.setContext(m_vo.ctx, m_vo.WindowNo, m_vo.TabNo, "LinkColumnName", linkColumnName); } // setLinkColumnName |