midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-137 Enhancement of GL Reconciliation 

Fix problem created with the new column
This commit is contained in:
Carlos Ruiz 2012-02-29 23:20:25 -05:00
parent 020458f56d
commit 0005e7276f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.adempiere.base/src/org/compiere/process/FactReconcile.java
View File

@ -21,8 +21,11 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.logging.Level; import java.util.logging.Level;
import org.adempiere.exceptions.AdempiereException;
import org.compiere.model.MElementValue; import org.compiere.model.MElementValue;
import org.compiere.model.MFactReconciliation;
import org.compiere.model.MRule; import org.compiere.model.MRule;
import org.compiere.model.MSequence;
import org.compiere.util.DB; import org.compiere.util.DB;
/** /**
@ -118,14 +121,18 @@ public class FactReconcile extends SvrProcess
ResultSet rs = null; ResultSet rs = null;
int count; int count;
int unmatched; int unmatched;
MSequence seq = MSequence.get(getCtx(), MFactReconciliation.Table_Name);
if (seq == null)
throw new AdempiereException("No sequence for Fact_Reconciliation table");
try try
{ {
// add new facts into reconciliation table // add new facts into reconciliation table
sql = "INSERT into Fact_Reconciliation " + sql = "INSERT into Fact_Reconciliation " +
"(AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy, " + "(Fact_Reconciliation_ID, AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy, " +
"IsActive, Fact_Acct_ID) " + "IsActive, Fact_Acct_ID) " +
"SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, " + "SELECT nextIDFunc(?, 'N'), AD_Client_ID, AD_Org_ID, Created, CreatedBy, " +
"Updated, UpdatedBy, IsActive, " + "Updated, UpdatedBy, IsActive, " +
"Fact_Acct_ID " + "Fact_Acct_ID " +
"FROM Fact_Acct f " + "FROM Fact_Acct f " +
@ -134,7 +141,8 @@ public class FactReconcile extends SvrProcess
"WHERE r.Fact_Acct_ID = f.Fact_Acct_ID) "; "WHERE r.Fact_Acct_ID = f.Fact_Acct_ID) ";
pstmt = DB.prepareStatement(sql, get_TrxName()); pstmt = DB.prepareStatement(sql, get_TrxName());
pstmt.setInt(1, account.get_ID()); pstmt.setInt(1, seq.getAD_Sequence_ID());
pstmt.setInt(2, account.get_ID());
count = pstmt.executeUpdate(); count = pstmt.executeUpdate();
log.log(Level.FINE, "Inserted " + count + " new facts into Fact_Reconciliation"); log.log(Level.FINE, "Inserted " + count + " new facts into Fact_Reconciliation");