From: Jorg J. <jj...@us...> - 2004-11-29 06:31:39
|
Update of /cvsroot/compiere/base/src/org/compiere/report In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17823/src/org/compiere/report Modified Files: TrialBalance.java Log Message: . Index: TrialBalance.java =================================================================== RCS file: /cvsroot/compiere/base/src/org/compiere/report/TrialBalance.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrialBalance.java 19 Oct 2004 06:00:28 -0000 1.3 --- TrialBalance.java 29 Nov 2004 06:31:28 -0000 1.4 *************** *** 17,21 **** import java.sql.*; import java.util.*; - import org.compiere.model.*; import org.compiere.process.*; --- 17,20 ---- *************** *** 41,44 **** --- 40,45 ---- /** Account Parameter */ private int p_Account_ID = 0; + private String p_AccountValue_From = null; + private String p_AccountValue_To = null; /** BPartner Parameter */ private int p_C_BPartner_ID = 0; *************** *** 74,78 **** + "(AD_PInstance_ID, Fact_Acct_ID," + " AD_Client_ID, AD_Org_ID, Created,CreatedBy, Updated,UpdatedBy," ! + " C_AcctSchema_ID, Account_ID, DateTrx, DateAcct, C_Period_ID," + " AD_Table_ID, Record_ID, Line_ID," + " GL_Category_ID, GL_Budget_ID, C_Tax_ID, M_Locator_ID, PostingType," --- 75,79 ---- + "(AD_PInstance_ID, Fact_Acct_ID," + " AD_Client_ID, AD_Org_ID, Created,CreatedBy, Updated,UpdatedBy," ! + " C_AcctSchema_ID, Account_ID, AccountValue, DateTrx, DateAcct, C_Period_ID," + " AD_Table_ID, Record_ID, Line_ID," + " GL_Category_ID, GL_Budget_ID, C_Tax_ID, M_Locator_ID, PostingType," *************** *** 111,114 **** --- 112,120 ---- else if (name.equals("Account_ID")) p_Account_ID = ((BigDecimal)para[i].getParameter()).intValue(); + else if (name.equals("AccountValue")) + { + p_AccountValue_From = (String)para[i].getParameter(); + p_AccountValue_To = (String)para[i].getParameter_To(); + } else if (name.equals("C_BPartner_ID")) p_C_BPartner_ID = ((BigDecimal)para[i].getParameter()).intValue(); *************** *** 134,137 **** --- 140,160 ---- m_parameterWhere.append(" AND ").append(MReportTree.getWhereClause(getCtx(), MAcctSchemaElement.ELEMENTTYPE_Account, p_Account_ID)); + if (p_AccountValue_From != null && p_AccountValue_From.length() == 0) + p_AccountValue_From = null; + if (p_AccountValue_To != null && p_AccountValue_To.length() == 0) + p_AccountValue_To = null; + if (p_AccountValue_From != null && p_AccountValue_To != null) + m_parameterWhere.append(" AND (Account_ID IS NULL OR EXISTS (SELECT * FROM C_ElementValue ev ") + .append("WHERE Account_ID=ev.C_ElementValue_ID AND ev.Value >= ") + .append(DB.TO_STRING(p_AccountValue_From)).append(" AND ev.Value <= ") + .append(DB.TO_STRING(p_AccountValue_To)).append("))"); + else if (p_AccountValue_From != null && p_AccountValue_To == null) + m_parameterWhere.append(" AND (Account_ID IS NULL OR EXISTS (SELECT * FROM C_ElementValue ev ") + .append("WHERE Account_ID=ev.C_ElementValue_ID AND ev.Value >= ") + .append(DB.TO_STRING(p_AccountValue_From)).append("))"); + else if (p_AccountValue_From == null && p_AccountValue_To != null) + m_parameterWhere.append(" AND (Account_ID IS NULL OR EXISTS (SELECT * FROM C_ElementValue ev ") + .append("WHERE Account_ID=ev.C_ElementValue_ID AND ev.Value <= ") + .append(DB.TO_STRING(p_AccountValue_To)).append("))"); // Optional Org if (p_AD_Org_ID != 0) *************** *** 268,272 **** sql.append(", SysDate,").append(getAD_User_ID()) .append(",SysDate,").append(getAD_User_ID()).append(","); ! // C_AcctSchema_ID, Account_ID, DateTrx, DateAcct, C_Period_ID, sql.append(p_C_AcctSchema_ID).append(","); if (p_Account_ID == 0) --- 291,295 ---- sql.append(", SysDate,").append(getAD_User_ID()) .append(",SysDate,").append(getAD_User_ID()).append(","); ! // C_AcctSchema_ID, Account_ID, AccountValue, DateTrx, DateAcct, C_Period_ID, sql.append(p_C_AcctSchema_ID).append(","); if (p_Account_ID == 0) *************** *** 274,277 **** --- 297,306 ---- else sql.append (p_Account_ID); + if (p_AccountValue_From != null) + sql.append(",").append(DB.TO_STRING(p_AccountValue_From)); + else if (p_AccountValue_To != null) + sql.append(",' '"); + else + sql.append(",null"); Timestamp balanceDay = p_DateAcct_From; // TimeUtil.addDays(p_DateAcct_From, -1); sql.append(",null,").append(DB.TO_DATE(balanceDay, true)).append(","); *************** *** 383,388 **** // AD_Client_ID, AD_Org_ID, Created,CreatedBy, Updated,UpdatedBy, sql.append(getAD_Client_ID()).append(",AD_Org_ID,Created,CreatedBy, Updated,UpdatedBy,"); ! // C_AcctSchema_ID, Account_ID, DateTrx, DateAcct, C_Period_ID, ! sql.append("C_AcctSchema_ID, Account_ID, DateTrx, DateAcct, C_Period_ID,"); // AD_Table_ID, Record_ID, Line_ID, sql.append("AD_Table_ID, Record_ID, Line_ID,"); --- 412,417 ---- // AD_Client_ID, AD_Org_ID, Created,CreatedBy, Updated,UpdatedBy, sql.append(getAD_Client_ID()).append(",AD_Org_ID,Created,CreatedBy, Updated,UpdatedBy,"); ! // C_AcctSchema_ID, Account_ID, DateTrx, AccountValue, DateAcct, C_Period_ID, ! sql.append("C_AcctSchema_ID, Account_ID, null, DateTrx, DateAcct, C_Period_ID,"); // AD_Table_ID, Record_ID, Line_ID, sql.append("AD_Table_ID, Record_ID, Line_ID,"); *************** *** 409,412 **** --- 438,450 ---- log.debug("createDetailLines - " + sql); log.debug("createDetailLines #" + no + " (Account_ID=" + p_Account_ID + ")"); + + // Update AccountValue + String sql2 = "UPDATE T_TrialBalance tb SET AccountValue = " + + "(SELECT Value FROM C_ElementValue ev WHERE ev.C_ElementValue_ID=tb.Account_ID) " + + "WHERE tb.Account_ID IS NOT NULL"; + no = DB.executeUpdate(sql2); + if (no > 0) + log.debug("createDetailLines Set AccountValue #" + no); + } // createDetailLines |