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

BF [ 2432714 ] Reset accounting ignores automatic period control 

https://sourceforge.net/tracker/index.php?func=detail&aid=2432714&group_id=176962&atid=879332
This commit is contained in:
phib 2008-12-17 01:06:36 +00:00
parent 0b5a09d6a8
commit 5c94be9747
3 changed files with 67 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
base/src/org/compiere/process/FactAcctReset.java
View File

@ -19,11 +19,14 @@ package org.compiere.process;
import java.math.BigDecimal;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Timestamp;
import java.util.logging.Level;
import org.compiere.model.MAcctSchema;
import org.compiere.model.MAllocationHdr;
import org.compiere.model.MBankStatement;
import org.compiere.model.MCash;
import org.compiere.model.MClient;
import org.compiere.model.MInOut;
import org.compiere.model.MInventory;
import org.compiere.model.MInvoice;
@ -38,6 +41,7 @@ import org.compiere.model.MProjectIssue;
import org.compiere.model.MRequisition;
import org.compiere.model.X_M_Production;
import org.compiere.util.DB;
import org.compiere.util.TimeUtil;
import org.eevolution.model.MDDOrder;
import org.eevolution.model.MHRProcess;
import org.eevolution.model.MPPCostCollector;
@ -60,6 +64,8 @@ public class FactAcctReset extends SvrProcess
private int m_countReset = 0;
private int m_countDelete = 0;
private Timestamp p_DateAcct_From = null ;
private Timestamp p_DateAcct_To = null;
/**
* Prepare - e.g., get Parameters.
@ -78,6 +84,11 @@ public class FactAcctReset extends SvrProcess
p_AD_Table_ID = ((BigDecimal)para[i].getParameter()).intValue();
else if (name.equals("DeletePosting"))
p_DeletePosting = "Y".equals(para[i].getParameter());
else if (name.equals("DateAcct"))
{
p_DateAcct_From = (Timestamp)para[i].getParameter();
p_DateAcct_To = (Timestamp)para[i].getParameter_To();
}
else
log.log(Level.SEVERE, "Unknown Parameter: " + name);
}
@ -164,6 +175,20 @@ public class FactAcctReset extends SvrProcess
*/
private void delete (String TableName, int AD_Table_ID)
{
Timestamp today = TimeUtil.trunc(new Timestamp (System.currentTimeMillis()), TimeUtil.TRUNC_DAY);
MAcctSchema as = MClient.get(getCtx(), getAD_Client_ID()).getAcctSchema();
boolean autoPeriod = as != null && as.isAutoPeriodControl();
if (autoPeriod)
{
Timestamp temp = TimeUtil.addDays(today, - as.getPeriod_OpenHistory());
if ( p_DateAcct_From == null || p_DateAcct_From.before(temp) )
p_DateAcct_From = temp;
temp = TimeUtil.addDays(today, as.getPeriod_OpenFuture());
if ( p_DateAcct_To == null || p_DateAcct_To.after(temp) )
p_DateAcct_To = temp;
}
reset(TableName);
m_countReset = 0;
//
@ -234,26 +259,39 @@ public class FactAcctReset extends SvrProcess
+ " AND (Posted<>'N' OR Posted IS NULL OR Processing<>'N' OR Processing IS NULL)"
+ " AND EXISTS (SELECT * FROM C_PeriodControl pc"
+ " INNER JOIN Fact_Acct fact ON (fact.C_Period_ID=pc.C_Period_ID) "
+ "WHERE pc.PeriodStatus = 'O'" + docBaseType
+ " AND fact.AD_Table_ID=" + AD_Table_ID
+ " AND fact.Record_ID=doc." + TableName + "_ID)";
+ " WHERE fact.AD_Table_ID=" + AD_Table_ID
+ " AND fact.Record_ID=doc." + TableName + "_ID";
if ( !autoPeriod )
sql1 += " AND pc.PeriodStatus = 'O'" + docBaseType;
if (p_DateAcct_From != null)
sql1 += " AND TRIM(fact.DateAcct) >= " + DB.TO_DATE(p_DateAcct_From);
if (p_DateAcct_To != null)
sql1 += " AND TRIM(fact.DateAcct) <= " + DB.TO_DATE(p_DateAcct_To);
sql1 += ")";
log.log(Level.FINE, sql1);
int reset = DB.executeUpdate(sql1, get_TrxName());
// Fact
String sql2 = "DELETE Fact_Acct fact "
+ "WHERE AD_Client_ID=" + p_AD_Client_ID
+ " AND AD_Table_ID=" + AD_Table_ID
+ " AND EXISTS (SELECT * FROM C_PeriodControl pc "
+ " AND AD_Table_ID=" + AD_Table_ID;
if ( !autoPeriod )
sql2 += " AND EXISTS (SELECT * FROM C_PeriodControl pc"
+ "WHERE pc.PeriodStatus = 'O'" + docBaseType
+ " AND fact.C_Period_ID=pc.C_Period_ID)";
if (p_DateAcct_From != null)
sql2 += " AND TRIM(fact.DateAcct) >= " + DB.TO_DATE(p_DateAcct_From);
if (p_DateAcct_To != null)
sql2 += " AND TRIM(fact.DateAcct) <= " + DB.TO_DATE(p_DateAcct_To);
log.log(Level.FINE, sql2);
int deleted = DB.executeUpdate(sql2, get_TrxName());
//
log.info(TableName + "(" + AD_Table_ID + ") - Reset=" + reset + " - Deleted=" + deleted);
String s = TableName + " - Reset=" + reset + " - Deleted=" + deleted;
addLog(s);
if (reset == 0)
log.finest(sql1);
if (deleted == 0)
log.finest(sql2);
//
m_countReset += reset;
m_countDelete += deleted;

10
migration/oracle/352a-trunk/362_BF2432714_Reset_accounting_date_control.sql Normal file
View File

@ -0,0 +1,10 @@
-- 17/12/2008 11:50:05
-- Add date range to fact acct reset
INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,Description,DisplayLogic,EntityType,FieldLength,Help,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,263,0,176,53263,15,'DateAcct',TO_DATE('2008-12-17 11:49:54','YYYY-MM-DD HH24:MI:SS'),100,'Optional account date range','@DeletePosting@=Y','D',0,'Only documents within this date range which are also in open periods will be reset.','Y','N','N','Y','Account Date',40,TO_DATE('2008-12-17 11:49:54','YYYY-MM-DD HH24:MI:SS'),100)
;
-- 17/12/2008 11:50:06
-- Add date range to fact acct reset
INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53263 AND EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Process_Para_ID!=t.AD_Process_Para_ID)
;

10
migration/postgresql/352a-trunk/362_BF2432714_Reset_accounting_date_control.sql Normal file
View File

@ -0,0 +1,10 @@
-- 17/12/2008 11:50:06
-- Add date range to fact acct reset
INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,Description,DisplayLogic,EntityType,FieldLength,Help,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,263,0,176,53263,15,'DateAcct',TO_TIMESTAMP('2008-12-17 11:49:54','YYYY-MM-DD HH24:MI:SS'),100,'Optional account date range','@DeletePosting@=Y','D',0,'Only documents within this date range which are also in open periods will be reset.','Y','N','N','Y','Account Date',40,TO_TIMESTAMP('2008-12-17 11:49:54','YYYY-MM-DD HH24:MI:SS'),100)
;
-- 17/12/2008 11:50:06
-- Add date range to fact acct reset
INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53263 AND EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Process_Para_ID!=t.AD_Process_Para_ID)
;