diff --git a/base/src/org/compiere/report/FinReportPeriod.java b/base/src/org/compiere/report/FinReportPeriod.java index 2e9da6586f..68d263b567 100644 --- a/base/src/org/compiere/report/FinReportPeriod.java +++ b/base/src/org/compiere/report/FinReportPeriod.java @@ -147,6 +147,11 @@ public class FinReportPeriod return m_YearStartDate; } + /** + * Get natural balance dateacct filter + * @param alias table name or alias name + * @return is balance sheet a/c and <= end or BETWEEN start AND end + */ public String getNaturalWhere(String alias) { String yearWhere = getYearWhere(); String totalWhere = getTotalWhere(); diff --git a/base/src/org/compiere/report/MReportColumn.java b/base/src/org/compiere/report/MReportColumn.java index f62c0305fc..756436b99c 100644 --- a/base/src/org/compiere/report/MReportColumn.java +++ b/base/src/org/compiere/report/MReportColumn.java @@ -134,6 +134,17 @@ public class MReportColumn extends X_PA_ReportColumn || AMOUNTTYPE_TotalQuantity.equals(at); } // isTotalBalance + /** + * Is it natural balance ? + * Natural balance means year balance for profit and loss a/c, total balance for balance sheet account + * @return true if Natural Balance Amount Type + */ + public boolean isNatural() { + String at = getAmountType(); + if (at == null) + return false; + return AMOUNTTYPE_NaturalBalance.equals(at); + } /** * Get Segment Value Where Clause @@ -500,12 +511,4 @@ public class MReportColumn extends X_PA_ReportColumn retValue.setOper_2_ID(0); return retValue; } // copy - - public boolean isNatural() { - String at = getAmountType(); - if (at == null) - return false; - return AMOUNTTYPE_NaturalBalance.equals(at); - } - } // MReportColumn