midsuit
/
bali-nusa-plugin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Financial Report add Date

This commit is contained in:
hodianto 2018-05-08 10:33:30 +07:00
parent b62417a620
commit f91d6118f5
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
andromeida.midsuit.project/src/andromedia/midsuit/process/MID_FinReport.java
View File

@ -433,11 +433,11 @@ public class MID_FinReport extends SvrProcess
if (m_lines[line].getPAPeriodType() != null) // line amount type overwrites column
{
info.append(" - LineDateAcct=");
if(p_Date1!=null) {
String sql = frp.getDateRangeWhere();
select.append(sql);
}
else if (m_lines[line].isPeriod())
// if(p_Date1!=null) {
// String sql = frp.getDateRangeWhere();
// select.append(sql);
// }
if (m_lines[line].isPeriod())
{
String sql = frp.getPeriodWhere();
info.append("Period");
@ -468,11 +468,11 @@ public class MID_FinReport extends SvrProcess
else if (m_columns[col].getPAPeriodType() != null)
{
info.append(" - ColumnDateAcct=");
if(p_Date1!=null) {
String sql = frp.getDateRangeWhere();
select.append(sql);
}
else if (m_columns[col].isPeriod())
// if(p_Date1!=null) {
// String sql = frp.getDateRangeWhere();
// select.append(sql);
// }
if (m_columns[col].isPeriod())
{
String sql = frp.getPeriodWhere();
info.append("Period");

6
andromeida.midsuit.project/src/andromedia/midsuit/process/MID_FinReportPeriod.java
View File

@ -44,8 +44,10 @@ public class MID_FinReportPeriod
m_StartDate = StartDate;
m_EndDate = EndDate;
m_YearStartDate = YearStartDate;
m_Date1 = date1;
m_Date2 = date2;
if(date1!=null) {
m_StartDate = date1;
m_EndDate = date2;
}
} //
private int m_C_Period_ID;