Financial Report add Date
This commit is contained in:
parent
b62417a620
commit
f91d6118f5
|
|
@ -433,11 +433,11 @@ public class MID_FinReport extends SvrProcess
|
||||||
if (m_lines[line].getPAPeriodType() != null) // line amount type overwrites column
|
if (m_lines[line].getPAPeriodType() != null) // line amount type overwrites column
|
||||||
{
|
{
|
||||||
info.append(" - LineDateAcct=");
|
info.append(" - LineDateAcct=");
|
||||||
if(p_Date1!=null) {
|
// if(p_Date1!=null) {
|
||||||
String sql = frp.getDateRangeWhere();
|
// String sql = frp.getDateRangeWhere();
|
||||||
select.append(sql);
|
// select.append(sql);
|
||||||
}
|
// }
|
||||||
else if (m_lines[line].isPeriod())
|
if (m_lines[line].isPeriod())
|
||||||
{
|
{
|
||||||
String sql = frp.getPeriodWhere();
|
String sql = frp.getPeriodWhere();
|
||||||
info.append("Period");
|
info.append("Period");
|
||||||
|
|
@ -468,11 +468,11 @@ public class MID_FinReport extends SvrProcess
|
||||||
else if (m_columns[col].getPAPeriodType() != null)
|
else if (m_columns[col].getPAPeriodType() != null)
|
||||||
{
|
{
|
||||||
info.append(" - ColumnDateAcct=");
|
info.append(" - ColumnDateAcct=");
|
||||||
if(p_Date1!=null) {
|
// if(p_Date1!=null) {
|
||||||
String sql = frp.getDateRangeWhere();
|
// String sql = frp.getDateRangeWhere();
|
||||||
select.append(sql);
|
// select.append(sql);
|
||||||
}
|
// }
|
||||||
else if (m_columns[col].isPeriod())
|
if (m_columns[col].isPeriod())
|
||||||
{
|
{
|
||||||
String sql = frp.getPeriodWhere();
|
String sql = frp.getPeriodWhere();
|
||||||
info.append("Period");
|
info.append("Period");
|
||||||
|
|
|
||||||
|
|
@ -44,8 +44,10 @@ public class MID_FinReportPeriod
|
||||||
m_StartDate = StartDate;
|
m_StartDate = StartDate;
|
||||||
m_EndDate = EndDate;
|
m_EndDate = EndDate;
|
||||||
m_YearStartDate = YearStartDate;
|
m_YearStartDate = YearStartDate;
|
||||||
m_Date1 = date1;
|
if(date1!=null) {
|
||||||
m_Date2 = date2;
|
m_StartDate = date1;
|
||||||
|
m_EndDate = date2;
|
||||||
|
}
|
||||||
} //
|
} //
|
||||||
|
|
||||||
private int m_C_Period_ID;
|
private int m_C_Period_ID;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue