midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Bug [ 1811885 ] Financial Reports are not managing multi-budget

This commit is contained in:
Carlos Ruiz 2007-10-11 22:57:31 +00:00
parent 89a28c6716
commit 3f19ecb88b
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
base/src/org/compiere/report/FinReport.java
View File

@ -398,6 +398,12 @@ public class FinReport extends SvrProcess
String PostingType = m_columns[col].getPostingType(); String PostingType = m_columns[col].getPostingType();
if (PostingType != null && PostingType.length() > 0) if (PostingType != null && PostingType.length() > 0)
select.append(" AND PostingType='").append(PostingType).append("'"); select.append(" AND PostingType='").append(PostingType).append("'");
// globalqss - CarlosRuiz
if (PostingType.equals(MReportColumn.POSTINGTYPE_Budget)) {
if (m_columns[col].getGL_Budget_ID() > 0)
select.append(" AND GL_Budget_ID=" + m_columns[col].getGL_Budget_ID());
}
// end globalqss
} }
if (m_columns[col].isColumnTypeSegmentValue()) if (m_columns[col].isColumnTypeSegmentValue())
@ -908,6 +914,12 @@ public class FinReport extends SvrProcess
String PostingType = m_columns[col].getPostingType(); String PostingType = m_columns[col].getPostingType();
if (PostingType != null && PostingType.length() > 0) if (PostingType != null && PostingType.length() > 0)
select.append(" AND fb.PostingType='").append(PostingType).append("'"); select.append(" AND fb.PostingType='").append(PostingType).append("'");
// globalqss - CarlosRuiz
if (PostingType.equals(MReportColumn.POSTINGTYPE_Budget)) {
if (m_columns[col].getGL_Budget_ID() > 0)
select.append(" AND GL_Budget_ID=" + m_columns[col].getGL_Budget_ID());
}
// end globalqss
} }
// Report Where // Report Where
String s = m_report.getWhereClause(); String s = m_report.getWhereClause();
@ -1049,6 +1061,12 @@ public class FinReport extends SvrProcess
// String PostingType = m_columns[col].getPostingType(); // String PostingType = m_columns[col].getPostingType();
// if (PostingType != null && PostingType.length() > 0) // if (PostingType != null && PostingType.length() > 0)
// insert.append(" AND PostingType='").append(PostingType).append("'"); // insert.append(" AND PostingType='").append(PostingType).append("'");
// // globalqss - CarlosRuiz
// if (PostingType.equals(MReportColumn.POSTINGTYPE_Budget)) {
// if (m_columns[col].getGL_Budget_ID() > 0)
// select.append(" AND GL_Budget_ID=" + m_columns[col].getGL_Budget_ID());
// }
// // end globalqss
// } // }
int no = DB.executeUpdate(insert.toString(), get_TrxName()); int no = DB.executeUpdate(insert.toString(), get_TrxName());

6
base/src/org/compiere/report/MReportLine.java
View File

@ -274,6 +274,12 @@ public class MReportLine extends X_PA_ReportLine
if (m_whereClause.length() > 0) if (m_whereClause.length() > 0)
m_whereClause += " AND "; m_whereClause += " AND ";
m_whereClause += "PostingType='" + PostingType + "'"; m_whereClause += "PostingType='" + PostingType + "'";
// globalqss - CarlosRuiz
if (PostingType.equals(MReportLine.POSTINGTYPE_Budget)) {
if (getGL_Budget_ID() > 0)
m_whereClause += " AND GL_Budget_ID=" + getGL_Budget_ID();
}
// end globalqss
} }
log.fine(m_whereClause); log.fine(m_whereClause);
} }