diff --git a/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_FinReport.java b/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_FinReport.java
index 173f8f8..da12a28 100644
--- a/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_FinReport.java
+++ b/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_FinReport.java
@@ -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");
diff --git a/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_FinReportPeriod.java b/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_FinReportPeriod.java
index 4d0c918..7fd6777 100644
--- a/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_FinReportPeriod.java
+++ b/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_FinReportPeriod.java
@@ -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;