diff --git a/org.adempiere.base/src/org/compiere/acct/Doc.java b/org.adempiere.base/src/org/compiere/acct/Doc.java index d03ac4aab2..8a146028cc 100644 --- a/org.adempiere.base/src/org/compiere/acct/Doc.java +++ b/org.adempiere.base/src/org/compiere/acct/Doc.java @@ -1004,7 +1004,7 @@ public abstract class Doc m_period = MPeriod.get(getCtx(), ii.intValue()); } if (m_period == null) - m_period = MPeriod.get(getCtx(), getDateAcct(), getAD_Org_ID()); + m_period = MPeriod.get(getCtx(), getDateAcct(), getAD_Org_ID(), m_trxName); // Is Period Open? if (m_period != null && m_period.isOpen(getDocumentType(), getDateAcct())) diff --git a/org.adempiere.base/src/org/compiere/model/MAssetDisposed.java b/org.adempiere.base/src/org/compiere/model/MAssetDisposed.java index a391976fe3..6e28a1a77b 100644 --- a/org.adempiere.base/src/org/compiere/model/MAssetDisposed.java +++ b/org.adempiere.base/src/org/compiere/model/MAssetDisposed.java @@ -325,7 +325,7 @@ implements DocAction } if (newRecord || is_ValueChanged(COLUMNNAME_DateAcct)) { - setC_Period_ID(MPeriod.get(getCtx(), getDateAcct(), getAD_Org_ID()).get_ID()); + setC_Period_ID(MPeriod.get(getCtx(), getDateAcct(), getAD_Org_ID(), get_TrxName()).get_ID()); } if (getA_Disposed_Date() == null) { diff --git a/org.adempiere.base/src/org/compiere/model/MAssetTransfer.java b/org.adempiere.base/src/org/compiere/model/MAssetTransfer.java index 3a8174751a..b571bcc66b 100644 --- a/org.adempiere.base/src/org/compiere/model/MAssetTransfer.java +++ b/org.adempiere.base/src/org/compiere/model/MAssetTransfer.java @@ -71,7 +71,7 @@ implements DocAction public void setC_Period_ID() { - MPeriod period = MPeriod.get(getCtx(), getDateAcct(), getAD_Org_ID()); + MPeriod period = MPeriod.get(getCtx(), getDateAcct(), getAD_Org_ID(), get_TrxName()); if (period == null) { throw new AdempiereException("@NotFound@ @C_Period_ID@"); diff --git a/org.adempiere.base/src/org/compiere/model/MDepreciationEntry.java b/org.adempiere.base/src/org/compiere/model/MDepreciationEntry.java index 0ad5af1767..10995f7dfc 100644 --- a/org.adempiere.base/src/org/compiere/model/MDepreciationEntry.java +++ b/org.adempiere.base/src/org/compiere/model/MDepreciationEntry.java @@ -93,7 +93,7 @@ implements DocAction public void setC_Period_ID() { - MPeriod period = MPeriod.get(getCtx(), getDateAcct(), getAD_Org_ID()); + MPeriod period = MPeriod.get(getCtx(), getDateAcct(), getAD_Org_ID(), get_TrxName()); if (period == null) { throw new AdempiereException("@NotFound@ @C_Period_ID@"); diff --git a/org.adempiere.base/src/org/compiere/model/MJournal.java b/org.adempiere.base/src/org/compiere/model/MJournal.java index add27fd13b..84fdb645ff 100644 --- a/org.adempiere.base/src/org/compiere/model/MJournal.java +++ b/org.adempiere.base/src/org/compiere/model/MJournal.java @@ -438,7 +438,7 @@ public class MJournal extends X_GL_Journal implements DocAction MDocType dt = MDocType.get(getCtx(), getC_DocType_ID()); // Get Period - MPeriod period = MPeriod.get (getCtx(), getDateAcct(), getAD_Org_ID()); + MPeriod period = MPeriod.get (getCtx(), getDateAcct(), getAD_Org_ID(), get_TrxName()); if (period == null) { log.warning("No Period for " + getDateAcct()); diff --git a/org.adempiere.base/src/org/compiere/model/MPeriod.java b/org.adempiere.base/src/org/compiere/model/MPeriod.java index a93227c3d2..525e92bed9 100644 --- a/org.adempiere.base/src/org/compiere/model/MPeriod.java +++ b/org.adempiere.base/src/org/compiere/model/MPeriod.java @@ -54,7 +54,7 @@ public class MPeriod extends X_C_Period /** * */ - private static final long serialVersionUID = 6498973218391994963L; + private static final long serialVersionUID = -1636783790829454894L; /** * Get Period from Cache @@ -97,7 +97,7 @@ public class MPeriod extends X_C_Period * @param AD_Org_ID Organization * @return active Period or null */ - public static MPeriod get (Properties ctx, Timestamp DateAcct, int AD_Org_ID) + public static MPeriod get (Properties ctx, Timestamp DateAcct, int AD_Org_ID, String trxName) { if (DateAcct == null) @@ -105,9 +105,15 @@ public class MPeriod extends X_C_Period int C_Calendar_ID = getC_Calendar_ID(ctx,AD_Org_ID); - return findByCalendar(ctx, DateAcct, C_Calendar_ID); + return findByCalendar(ctx, DateAcct, C_Calendar_ID, trxName); } // get + @Deprecated + public static MPeriod get (Properties ctx, Timestamp DateAcct, int AD_Org_ID) + { + return get(ctx, DateAcct, AD_Org_ID, null); + } + /** * * @param ctx