| Attached Files |  TrialBalanceReportAdjPeriod.diff [^] (45,629 bytes) 2014-09-30 13:24 [Show Content] [Hide Content]diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -18673,6 +18673,18 @@
<!--47B524D00C99444EBB128AFF52F66225--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--47B524D00C99444EBB128AFF52F66225--></AD_MESSAGE>
+<!--47DED7BAE49A417D8B4BEE4DAFFE8413--><AD_MESSAGE>
+<!--47DED7BAE49A417D8B4BEE4DAFFE8413--> <AD_MESSAGE_ID><![CDATA[47DED7BAE49A417D8B4BEE4DAFFE8413]]></AD_MESSAGE_ID>
+<!--47DED7BAE49A417D8B4BEE4DAFFE8413--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--47DED7BAE49A417D8B4BEE4DAFFE8413--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--47DED7BAE49A417D8B4BEE4DAFFE8413--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--47DED7BAE49A417D8B4BEE4DAFFE8413--> <VALUE><![CDATA[OnlyAdjustmentPeriods]]></VALUE>
+<!--47DED7BAE49A417D8B4BEE4DAFFE8413--> <MSGTEXT><![CDATA[only Adjustment Periods]]></MSGTEXT>
+<!--47DED7BAE49A417D8B4BEE4DAFFE8413--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--47DED7BAE49A417D8B4BEE4DAFFE8413--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--47DED7BAE49A417D8B4BEE4DAFFE8413--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--47DED7BAE49A417D8B4BEE4DAFFE8413--></AD_MESSAGE>
+
<!--4824BDCE0FDA46ADA4D79BA676791DFF--><AD_MESSAGE>
<!--4824BDCE0FDA46ADA4D79BA676791DFF--> <AD_MESSAGE_ID><![CDATA[4824BDCE0FDA46ADA4D79BA676791DFF]]></AD_MESSAGE_ID>
<!--4824BDCE0FDA46ADA4D79BA676791DFF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -22376,6 +22388,18 @@
<!--A814C994393748C5905053E3607DDFFE--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--A814C994393748C5905053E3607DDFFE--></AD_MESSAGE>
+<!--A81CA54C4815413395BC0D5B4C65983A--><AD_MESSAGE>
+<!--A81CA54C4815413395BC0D5B4C65983A--> <AD_MESSAGE_ID><![CDATA[A81CA54C4815413395BC0D5B4C65983A]]></AD_MESSAGE_ID>
+<!--A81CA54C4815413395BC0D5B4C65983A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A81CA54C4815413395BC0D5B4C65983A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A81CA54C4815413395BC0D5B4C65983A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A81CA54C4815413395BC0D5B4C65983A--> <VALUE><![CDATA[WithoutAdjustmentPeriods]]></VALUE>
+<!--A81CA54C4815413395BC0D5B4C65983A--> <MSGTEXT><![CDATA[without Adjustment Periods]]></MSGTEXT>
+<!--A81CA54C4815413395BC0D5B4C65983A--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--A81CA54C4815413395BC0D5B4C65983A--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A81CA54C4815413395BC0D5B4C65983A--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--A81CA54C4815413395BC0D5B4C65983A--></AD_MESSAGE>
+
<!--A833B74092AB46698E7FBE68721800F1--><AD_MESSAGE>
<!--A833B74092AB46698E7FBE68721800F1--> <AD_MESSAGE_ID><![CDATA[A833B74092AB46698E7FBE68721800F1]]></AD_MESSAGE_ID>
<!--A833B74092AB46698E7FBE68721800F1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -25196,6 +25220,18 @@
<!--EF6ECE31E8474A289803BC07D3774F17--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--EF6ECE31E8474A289803BC07D3774F17--></AD_MESSAGE>
+<!--EF79EA4F913E4D07968BD22C22C02539--><AD_MESSAGE>
+<!--EF79EA4F913E4D07968BD22C22C02539--> <AD_MESSAGE_ID><![CDATA[EF79EA4F913E4D07968BD22C22C02539]]></AD_MESSAGE_ID>
+<!--EF79EA4F913E4D07968BD22C22C02539--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EF79EA4F913E4D07968BD22C22C02539--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EF79EA4F913E4D07968BD22C22C02539--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EF79EA4F913E4D07968BD22C22C02539--> <VALUE><![CDATA[WithAdjustmentPeriods]]></VALUE>
+<!--EF79EA4F913E4D07968BD22C22C02539--> <MSGTEXT><![CDATA[with Adjustment Periods]]></MSGTEXT>
+<!--EF79EA4F913E4D07968BD22C22C02539--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--EF79EA4F913E4D07968BD22C22C02539--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EF79EA4F913E4D07968BD22C22C02539--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--EF79EA4F913E4D07968BD22C22C02539--></AD_MESSAGE>
+
<!--EF95449A17A04724B44873FD5EEFD249--><AD_MESSAGE>
<!--EF95449A17A04724B44873FD5EEFD249--> <AD_MESSAGE_ID><![CDATA[EF95449A17A04724B44873FD5EEFD249]]></AD_MESSAGE_ID>
<!--EF95449A17A04724B44873FD5EEFD249--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
@@ -17886,6 +17886,17 @@
<!--7C2C3EE3A7C2434EAA5F891AA3BA1420--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--7C2C3EE3A7C2434EAA5F891AA3BA1420--></AD_TEXTINTERFACES>
+<!--7C347E727CAE4E6E9EE0683108A3F487--><AD_TEXTINTERFACES>
+<!--7C347E727CAE4E6E9EE0683108A3F487--> <AD_TEXTINTERFACES_ID><![CDATA[7C347E727CAE4E6E9EE0683108A3F487]]></AD_TEXTINTERFACES_ID>
+<!--7C347E727CAE4E6E9EE0683108A3F487--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7C347E727CAE4E6E9EE0683108A3F487--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7C347E727CAE4E6E9EE0683108A3F487--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7C347E727CAE4E6E9EE0683108A3F487--> <TEXT><![CDATA[Show only Adjustment Periods]]></TEXT>
+<!--7C347E727CAE4E6E9EE0683108A3F487--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html]]></FILENAME>
+<!--7C347E727CAE4E6E9EE0683108A3F487--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--7C347E727CAE4E6E9EE0683108A3F487--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7C347E727CAE4E6E9EE0683108A3F487--></AD_TEXTINTERFACES>
+
<!--7C713208B45A4DA2B0D299BDC229C879--><AD_TEXTINTERFACES>
<!--7C713208B45A4DA2B0D299BDC229C879--> <AD_TEXTINTERFACES_ID><![CDATA[7C713208B45A4DA2B0D299BDC229C879]]></AD_TEXTINTERFACES_ID>
<!--7C713208B45A4DA2B0D299BDC229C879--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19534,6 +19545,17 @@
<!--95CA79458E3CC420E040007F01015644--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--95CA79458E3CC420E040007F01015644--></AD_TEXTINTERFACES>
+<!--976217F2274F4F0486F7821B66FB6346--><AD_TEXTINTERFACES>
+<!--976217F2274F4F0486F7821B66FB6346--> <AD_TEXTINTERFACES_ID><![CDATA[976217F2274F4F0486F7821B66FB6346]]></AD_TEXTINTERFACES_ID>
+<!--976217F2274F4F0486F7821B66FB6346--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--976217F2274F4F0486F7821B66FB6346--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--976217F2274F4F0486F7821B66FB6346--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--976217F2274F4F0486F7821B66FB6346--> <TEXT><![CDATA[Hide Adjustment Periods]]></TEXT>
+<!--976217F2274F4F0486F7821B66FB6346--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html]]></FILENAME>
+<!--976217F2274F4F0486F7821B66FB6346--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--976217F2274F4F0486F7821B66FB6346--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--976217F2274F4F0486F7821B66FB6346--></AD_TEXTINTERFACES>
+
<!--982644405A4C4BC6AD687D6014C11878--><AD_TEXTINTERFACES>
<!--982644405A4C4BC6AD687D6014C11878--> <AD_TEXTINTERFACES_ID><![CDATA[982644405A4C4BC6AD687D6014C11878]]></AD_TEXTINTERFACES_ID>
<!--982644405A4C4BC6AD687D6014C11878--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20579,6 +20601,17 @@
<!--C62BE991FD2C4427841F8EC7FD2D1FCE--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--C62BE991FD2C4427841F8EC7FD2D1FCE--></AD_TEXTINTERFACES>
+<!--C6429B616DF540D69566EAF709B487F6--><AD_TEXTINTERFACES>
+<!--C6429B616DF540D69566EAF709B487F6--> <AD_TEXTINTERFACES_ID><![CDATA[C6429B616DF540D69566EAF709B487F6]]></AD_TEXTINTERFACES_ID>
+<!--C6429B616DF540D69566EAF709B487F6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C6429B616DF540D69566EAF709B487F6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C6429B616DF540D69566EAF709B487F6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C6429B616DF540D69566EAF709B487F6--> <TEXT><![CDATA[Show Adjustment Periods]]></TEXT>
+<!--C6429B616DF540D69566EAF709B487F6--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html]]></FILENAME>
+<!--C6429B616DF540D69566EAF709B487F6--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--C6429B616DF540D69566EAF709B487F6--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C6429B616DF540D69566EAF709B487F6--></AD_TEXTINTERFACES>
+
<!--C68BD2CAFFA6451391940FEEE0928CE7--><AD_TEXTINTERFACES>
<!--C68BD2CAFFA6451391940FEEE0928CE7--> <AD_TEXTINTERFACES_ID><![CDATA[C68BD2CAFFA6451391940FEEE0928CE7]]></AD_TEXTINTERFACES_ID>
<!--C68BD2CAFFA6451391940FEEE0928CE7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html
@@ -123,6 +123,10 @@
setWindowElementFocus(frm.inpDateTo);
showJSMessage(5);
return false;
+ } else if (inputValue(frm.inpPeriodType)==null || inputValue(frm.inpPeriodType)=="") {
+ setWindowElementFocus(frm.inpPeriodType);
+ showJSMessage(7);
+ return false;
}
markCheckedAllElements(frm.inpcBPartnerId_IN);
markCheckedAllElements(frm.inpcProjectId_IN);
@@ -265,6 +269,13 @@
if (groupby[i].value == selectedGroupBy)
groupby[i].selected = true;
}
+
+ var selectedPeriodType = document.getElementById("paramSelectedPeriodType").value;
+ var periodtype = document.getElementById("inpPeriodType");
+ for (i=0;i<periodtype.length;i++){
+ if (periodtype[i].value == selectedPeriodType)
+ periodtype[i].selected = true;
+ }
try {
onloadFunctions();
@@ -966,6 +977,7 @@
</tr>
<tr><td> </td></tr>
<tr>
+ <td class="ContentCell"></td>
<td>
<div>
<button type="button"
@@ -991,11 +1003,15 @@
</button>
</div>
</td>
- <td class="ContentCell"></input>
- </td>
- <td class="TitleCell"></td>
<td class="ContentCell"></td>
- <td class="ContentCell"></td>
+ <td class="Combo_ContentCell" colspan="2"> <select name="inpPeriodType" id="inpPeriodType" class="ComboKey Combo_TwoCells_width" required="true">
+ <option value="ShowAdjustmentPeriods">Show Adjustment Periods</option>
+ <option value="HideAdjustmentPeriods">Hide Adjustment Periods</option>
+ <option value="ShowOnlyAdjustmentPeriods">Show only Adjustment Periods</option>
+ </select>
+ <input type="hidden" value="" id="paramSelectedPeriodType"/>
+ </td>
+ <td class="ContentCell"></td>
</tr>
<tr>
diff --git a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2013 Openbravo SLU
+ * All portions are Copyright (C) 2001-2014 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -68,6 +68,8 @@
String strDateTo = vars.getGlobalVariable("inpDateTo", "ReportTrialBalance|DateTo", "");
String strPageNo = vars.getGlobalVariable("inpPageNo", "ReportTrialBalance|PageNo", "1");
String strOrg = vars.getGlobalVariable("inpOrg", "ReportTrialBalance|Org", "");
+ String strPeriodType = vars.getGlobalVariable("inpPeriodType",
+ "ReportTrialBalance|PeriodType", "");
String strLevel = vars.getGlobalVariable("inpLevel", "ReportTrialBalance|Level", "");
String strcBpartnerId = vars.getInGlobalVariable("inpcBPartnerId_IN",
"ReportTrialBalance|cBpartnerId", "", IsIDFilter.instance);
@@ -98,10 +100,10 @@
vars.setSessionValue("inpElementValueIdFrom_DES", strcElementValueFromDes);
vars.setSessionValue("inpElementValueIdTo_DES", strcElementValueToDes);
- printPageDataSheet(response, vars, strDateFrom, strDateTo, strPageNo, strOrg, strLevel,
- strcElementValueFrom, strcElementValueTo, strcElementValueFromDes, strcElementValueToDes,
- strcBpartnerId, strmProductId, strcProjectId, strcAcctSchemaId, strNotInitialBalance,
- strGroupBy);
+ printPageDataSheet(response, vars, strDateFrom, strDateTo, strPageNo, strOrg, strPeriodType,
+ strLevel, strcElementValueFrom, strcElementValueTo, strcElementValueFromDes,
+ strcElementValueToDes, strcBpartnerId, strmProductId, strcProjectId, strcAcctSchemaId,
+ strNotInitialBalance, strGroupBy);
} else if (vars.commandIn("FIND")) {
String strcAcctSchemaId = vars.getRequestGlobalVariable("inpcAcctSchemaId",
@@ -111,6 +113,8 @@
String strDateTo = vars.getRequestGlobalVariable("inpDateTo", "ReportTrialBalance|DateTo");
String strPageNo = vars.getRequestGlobalVariable("inpPageNo", "ReportTrialBalance|PageNo");
String strOrg = vars.getRequestGlobalVariable("inpOrg", "ReportTrialBalance|Org");
+ String strPeriodType = vars.getRequestGlobalVariable("inpPeriodType",
+ "ReportTrialBalance|PeriodType");
String strLevel = vars.getRequestGlobalVariable("inpLevel", "ReportTrialBalance|Level");
String strcBpartnerId = vars.getRequestInGlobalVariable("inpcBPartnerId_IN",
"ReportTrialBalance|cBpartnerId", IsIDFilter.instance);
@@ -135,10 +139,10 @@
vars.setSessionValue("inpElementValueIdFrom_DES", strcElementValueFromDes);
vars.setSessionValue("inpElementValueIdTo_DES", strcElementValueToDes);
- printPageDataSheet(response, vars, strDateFrom, strDateTo, strPageNo, strOrg, strLevel,
- strcElementValueFrom, strcElementValueTo, strcElementValueFromDes, strcElementValueToDes,
- strcBpartnerId, strmProductId, strcProjectId, strcAcctSchemaId, strNotInitialBalance,
- strGroupBy);
+ printPageDataSheet(response, vars, strDateFrom, strDateTo, strPageNo, strOrg, strPeriodType,
+ strLevel, strcElementValueFrom, strcElementValueTo, strcElementValueFromDes,
+ strcElementValueToDes, strcBpartnerId, strmProductId, strcProjectId, strcAcctSchemaId,
+ strNotInitialBalance, strGroupBy);
} else if (vars.commandIn("PDF", "XLS")) {
String strcAcctSchemaId = vars.getRequestGlobalVariable("inpcAcctSchemaId",
@@ -147,6 +151,8 @@
"ReportTrialBalance|DateFrom");
String strDateTo = vars.getRequestGlobalVariable("inpDateTo", "ReportTrialBalance|DateTo");
String strOrg = vars.getRequestGlobalVariable("inpOrg", "ReportTrialBalance|Org");
+ String strPeriodType = vars.getRequestGlobalVariable("inpPeriodType",
+ "ReportTrialBalance|PeriodType");
String strLevel = vars.getRequestGlobalVariable("inpLevel", "ReportTrialBalance|Level");
String strcElementValueFrom = vars.getGlobalVariable("inpcElementValueIdFrom",
"ReportTrialBalance|C_ElementValue_IDFROM", "");
@@ -171,16 +177,15 @@
String strPageNo = vars.getRequestGlobalVariable("inpPageNo", "ReportTrialBalance|PageNo");
String strNotInitialBalance = vars.getStringParameter("inpNotInitialBalance", "N");
vars.setSessionValue("ReportTrialBalance|notInitialBalance", strNotInitialBalance);
-
if (vars.commandIn("PDF"))
- printPageDataPDF(request, response, vars, strDateFrom, strDateTo, strOrg, strLevel,
- strcElementValueFrom, strcElementValueFromDes, strcElementValueTo,
+ printPageDataPDF(request, response, vars, strDateFrom, strDateTo, strOrg, strPeriodType,
+ strLevel, strcElementValueFrom, strcElementValueFromDes, strcElementValueTo,
strcElementValueToDes, strcBpartnerId, strmProductId, strcProjectId, strcAcctSchemaId,
strNotInitialBalance, strGroupBy, strPageNo);
else
- printPageDataXLS(request, response, vars, strDateFrom, strDateTo, strOrg, strLevel,
- strcElementValueFrom, strcElementValueTo, strcBpartnerId, strmProductId, strcProjectId,
- strcAcctSchemaId, strNotInitialBalance, strGroupBy);
+ printPageDataXLS(request, response, vars, strDateFrom, strDateTo, strOrg, strPeriodType,
+ strLevel, strcElementValueFrom, strcElementValueTo, strcBpartnerId, strmProductId,
+ strcProjectId, strcAcctSchemaId, strNotInitialBalance, strGroupBy);
} else if (vars.commandIn("OPEN")) {
String strAccountId = vars.getRequiredStringParameter("inpcAccountId");
@@ -190,6 +195,8 @@
"ReportTrialBalance|DateFrom");
String strDateTo = vars.getRequestGlobalVariable("inpDateTo", "ReportTrialBalance|DateTo");
String strOrg = vars.getRequestGlobalVariable("inpOrg", "ReportTrialBalance|Org");
+ String strPeriodType = vars.getRequestGlobalVariable("inpPeriodType",
+ "ReportTrialBalance|PeriodType");
String strLevel = vars.getRequestGlobalVariable("inpLevel", "ReportTrialBalance|Level");
String strcBpartnerId = vars.getInGlobalVariable("inpcBPartnerId_IN",
"ReportTrialBalance|cBpartnerId", "", IsIDFilter.instance);
@@ -201,8 +208,8 @@
String strNotInitialBalance = vars.getStringParameter("inpNotInitialBalance", "N");
vars.setSessionValue("ReportTrialBalance|notInitialBalance", strNotInitialBalance);
- printPageOpen(response, vars, strDateFrom, strDateTo, strOrg, strLevel, strcBpartnerId,
- strmProductId, strcProjectId, strcAcctSchemaId, strGroupBy, strAccountId,
+ printPageOpen(response, vars, strDateFrom, strDateTo, strOrg, strPeriodType, strLevel,
+ strcBpartnerId, strmProductId, strcProjectId, strcAcctSchemaId, strGroupBy, strAccountId,
strNotInitialBalance);
} else {
@@ -211,22 +218,30 @@
}
private void printPageOpen(HttpServletResponse response, VariablesSecureApp vars,
- String strDateFrom, String strDateTo, String strOrg, String strLevel, String strcBpartnerId,
- String strmProductId, String strcProjectId, String strcAcctSchemaId, String strGroupBy,
- String strAccountId, String strNotInitialBalance) throws IOException, ServletException {
+ String strDateFrom, String strDateTo, String strOrg, String strPeriodType, String strLevel,
+ String strcBpartnerId, String strmProductId, String strcProjectId, String strcAcctSchemaId,
+ String strGroupBy, String strAccountId, String strNotInitialBalance) throws IOException,
+ ServletException {
ReportTrialBalanceData[] data = null;
String strTreeOrg = TreeData.getTreeOrg(this, vars.getClient());
String strOrgFamily = getFamily(strTreeOrg, strOrg);
+ String strcPeriodType = "'S','A'";
+ if ("HideAdjustmentPeriods".equals(strPeriodType)) {
+ strcPeriodType = "'S'";
+ } else if ("ShowOnlyAdjustmentPeriods".equals(strPeriodType)) {
+ strcPeriodType = "'A'";
+ }
+
log4j.debug("Output: Expand subaccount details " + strAccountId);
data = ReportTrialBalanceData.selectAccountLines(this, strGroupBy, vars.getLanguage(),
strLevel, strOrgFamily,
Utility.getContext(this, vars, "#User_Client", "ReportTrialBalance"),
- Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportTrialBalance"), null, null,
- strDateFrom, strAccountId, strcBpartnerId, strmProductId, strcProjectId, strcAcctSchemaId,
- (strNotInitialBalance.equals("Y") ? "O" : "P"),
+ Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportTrialBalance"), strcPeriodType,
+ null, null, strDateFrom, strAccountId, strcBpartnerId, strmProductId, strcProjectId,
+ strcAcctSchemaId, (strNotInitialBalance.equals("Y") ? "O" : "P"),
DateTimeData.nDaysAfter(this, strDateTo, "1"));
if (data == null) {
@@ -276,11 +291,11 @@
}
private void printPageDataSheet(HttpServletResponse response, VariablesSecureApp vars,
- String strDateFrom, String strDateTo, String strPageNo, String strOrg, String strLevel,
- String strcElementValueFrom, String strcElementValueTo, String strcElementValueFromDes,
- String strcElementValueToDes, String strcBpartnerId, String strmProductId,
- String strcProjectId, String strcAcctSchemaId, String strNotInitialBalance, String strGroupBy)
- throws IOException, ServletException {
+ String strDateFrom, String strDateTo, String strPageNo, String strOrg, String strPeriodType,
+ String strLevel, String strcElementValueFrom, String strcElementValueTo,
+ String strcElementValueFromDes, String strcElementValueToDes, String strcBpartnerId,
+ String strmProductId, String strcProjectId, String strcAcctSchemaId,
+ String strNotInitialBalance, String strGroupBy) throws IOException, ServletException {
String strMessage = "";
XmlDocument xmlDocument = null;
@@ -299,6 +314,12 @@
String strTreeOrg = TreeData.getTreeOrg(this, vars.getClient());
String strOrgFamily = getFamily(strTreeOrg, strOrg);
String strTreeAccount = ReportTrialBalanceData.treeAccount(this, vars.getClient());
+ String strcPeriodType = "'S','A'";
+ if ("HideAdjustmentPeriods".equals(strPeriodType)) {
+ strcPeriodType = "'S'";
+ } else if ("ShowOnlyAdjustmentPeriods".equals(strPeriodType)) {
+ strcPeriodType = "'A'";
+ }
// Remember values
String strcBpartnerIdAux = strcBpartnerId;
String strmProductIdAux = strmProductId;
@@ -327,16 +348,17 @@
data = ReportTrialBalanceData.selectAccountLines(this, "", vars.getLanguage(), strLevel,
strOrgFamily, Utility.getContext(this, vars, "#User_Client", "ReportTrialBalance"),
Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportTrialBalance"),
- strAccountFromValue, strAccountToValue, strDateFrom, null, strcBpartnerId,
- strmProductId, strcProjectId, strcAcctSchemaId, (strNotInitialBalance.equals("Y") ? "O"
- : "P"), DateTimeData.nDaysAfter(this, strDateTo, "1"));
+ strcPeriodType, strAccountFromValue, strAccountToValue, strDateFrom, null,
+ strcBpartnerId, strmProductId, strcProjectId, strcAcctSchemaId,
+ (strNotInitialBalance.equals("Y") ? "O" : "P"),
+ DateTimeData.nDaysAfter(this, strDateTo, "1"));
if (strGroupBy.equals(""))
discard[2] = "showExpand";
} else {
discard[2] = "showExpand";
data = getDataWhenNotSubAccount(vars, strDateFrom, strDateTo, strOrg, strOrgFamily,
- strcAcctSchemaId, strLevel, strTreeAccount, strNotInitialBalance);
+ strcPeriodType, strcAcctSchemaId, strLevel, strTreeAccount, strNotInitialBalance);
}
if (data != null && data.length > 0)
@@ -430,6 +452,7 @@
xmlDocument.setParameter("paramMessage", (strMessage.equals("") ? "" : "alert('" + strMessage
+ "');"));
xmlDocument.setParameter("groupbyselected", strGroupBy);
+ xmlDocument.setParameter("periodtypeselected", strPeriodType);
xmlDocument.setParameter("notInitialBalance", strNotInitialBalance);
xmlDocument.setData(
@@ -472,9 +495,10 @@
private void printPageDataXLS(HttpServletRequest request, HttpServletResponse response,
VariablesSecureApp vars, String strDateFrom, String strDateTo, String strOrg,
- String strLevel, String strcElementValueFrom, String strcElementValueTo,
- String strcBpartnerId, String strmProductId, String strcProjectId, String strcAcctSchemaId,
- String strNotInitialBalance, String strGroupBy) throws IOException, ServletException {
+ String strPeriodType, String strLevel, String strcElementValueFrom,
+ String strcElementValueTo, String strcBpartnerId, String strmProductId, String strcProjectId,
+ String strcAcctSchemaId, String strNotInitialBalance, String strGroupBy) throws IOException,
+ ServletException {
response.setContentType("text/html; charset=UTF-8");
ReportTrialBalanceData[] data = null;
@@ -485,6 +509,16 @@
String strOrgFamily = getFamily(strTreeOrg, strOrg);
String strTreeAccount = ReportTrialBalanceData.treeAccount(this, vars.getClient());
+ String strcPeriodType = "'S','A'";
+ String strPeriodTypeText = Utility.messageBD(this, "WithAdjustmentPeriods", vars.getLanguage());
+ if ("HideAdjustmentPeriods".equals(strPeriodType)) {
+ strcPeriodType = "'S'";
+ strPeriodTypeText = Utility.messageBD(this, "WithoutAdjustmentPeriods", vars.getLanguage());
+ } else if ("ShowOnlyAdjustmentPeriods".equals(strPeriodType)) {
+ strcPeriodType = "'A'";
+ strPeriodTypeText = Utility.messageBD(this, "OnlyAdjustmentPeriods", vars.getLanguage());
+ }
+
String strAccountFromValue = ReportTrialBalanceData.selectAccountValue(this,
strcElementValueFrom);
String strAccountToValue = ReportTrialBalanceData.selectAccountValue(this, strcElementValueTo);
@@ -500,11 +534,11 @@
if (strLevel.equals("S")) {
data = ReportTrialBalanceData.selectXLS(this, vars.getLanguage(), strLevel, strOrgFamily,
- Utility.getContext(this, vars, "#User_Client", "ReportTrialBalance"),
- Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportTrialBalance"),
- strAccountFromValue, strAccountToValue, strDateFrom, strcBpartnerId, strmProductId,
- strcProjectId, strcAcctSchemaId, (strNotInitialBalance.equals("Y") ? "O" : "P"),
- DateTimeData.nDaysAfter(this, strDateTo, "1"));
+ Utility.getContext(this, vars, "#User_Client", "ReportTrialBalance"), Utility
+ .getContext(this, vars, "#AccessibleOrgTree", "ReportTrialBalance"),
+ strcPeriodType, strAccountFromValue, strAccountToValue, strDateFrom, strcBpartnerId,
+ strmProductId, strcProjectId, strcAcctSchemaId, (strNotInitialBalance.equals("Y") ? "O"
+ : "P"), DateTimeData.nDaysAfter(this, strDateTo, "1"));
if (strGroupBy.equals("BPartner")) {
showbpartner = true;
showproduct = false;
@@ -524,7 +558,7 @@
}
} else {
data = getDataWhenNotSubAccount(vars, strDateFrom, strDateTo, strOrg, strOrgFamily,
- strcAcctSchemaId, strLevel, strTreeAccount, strNotInitialBalance);
+ strcPeriodType, strcAcctSchemaId, strLevel, strTreeAccount, strNotInitialBalance);
}
if (data == null || data.length == 0) {
@@ -548,7 +582,7 @@
strSubTitle.append(Utility.messageBD(this, "ACCS_AD_ORG_ID_D", vars.getLanguage()) + ": ");
strSubTitle.append(ReportTrialBalanceData.selectOrgName(this, strOrg) + ") \n");
strSubTitle.append(Utility.messageBD(this, "asof", vars.getLanguage()) + ": " + strDateTo
- + " \n");
+ + " (" + Utility.messageBD(this, strPeriodTypeText, vars.getLanguage()) + ") \n");
strSubTitle.append(Utility.messageBD(this, "generalLedger", vars.getLanguage()) + ": "
+ acctSchema.getName());
@@ -572,9 +606,9 @@
private void printPageDataPDF(HttpServletRequest request, HttpServletResponse response,
VariablesSecureApp vars, String strDateFrom, String strDateTo, String strOrg,
- String strLevel, String strcElementValueFrom, String strcElementValueFromDes,
- String strcElementValueTo, String strcElementValueToDes, String strcBpartnerId,
- String strmProductId, String strcProjectId, String strcAcctSchemaId,
+ String strPeriodType, String strLevel, String strcElementValueFrom,
+ String strcElementValueFromDes, String strcElementValueTo, String strcElementValueToDes,
+ String strcBpartnerId, String strmProductId, String strcProjectId, String strcAcctSchemaId,
String strNotInitialBalance, String strGroupBy, String strPageNo) throws IOException,
ServletException {
@@ -585,6 +619,16 @@
String strTreeAccount = ReportTrialBalanceData.treeAccount(this, vars.getClient());
boolean strIsSubAccount = false;
+ String strcPeriodType = "'S','A'";
+ String strPeriodTypeText = Utility.messageBD(this, "WithAdjustmentPeriods", vars.getLanguage());
+ if ("HideAdjustmentPeriods".equals(strPeriodType)) {
+ strcPeriodType = "'S'";
+ strPeriodTypeText = Utility.messageBD(this, "WithoutAdjustmentPeriods", vars.getLanguage());
+ } else if ("ShowOnlyAdjustmentPeriods".equals(strPeriodType)) {
+ strcPeriodType = "'A'";
+ strPeriodTypeText = Utility.messageBD(this, "OnlyAdjustmentPeriods", vars.getLanguage());
+ }
+
String strAccountFromValue = ReportTrialBalanceData.selectAccountValue(this,
strcElementValueFrom);
String strAccountToValue = ReportTrialBalanceData.selectAccountValue(this, strcElementValueTo);
@@ -600,17 +644,19 @@
if (strLevel.equals("S")) {
data = ReportTrialBalanceData.selectAccountLines(this, strGroupBy, vars.getLanguage(),
- strLevel, strOrgFamily, Utility.getContext(this, vars, "#User_Client",
- "ReportTrialBalance"), Utility.getContext(this, vars, "#AccessibleOrgTree",
- "ReportTrialBalance"), strAccountFromValue, strAccountToValue, strDateFrom, null,
- strcBpartnerId, strmProductId, strcProjectId, strcAcctSchemaId, (strNotInitialBalance
- .equals("Y") ? "O" : "P"), DateTimeData.nDaysAfter(this, strDateTo, "1"));
+ strLevel, strOrgFamily,
+ Utility.getContext(this, vars, "#User_Client", "ReportTrialBalance"),
+ Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportTrialBalance"),
+ strcPeriodType, strAccountFromValue, strAccountToValue, strDateFrom, null,
+ strcBpartnerId, strmProductId, strcProjectId, strcAcctSchemaId,
+ (strNotInitialBalance.equals("Y") ? "O" : "P"),
+ DateTimeData.nDaysAfter(this, strDateTo, "1"));
if (!strGroupBy.equals(""))
strIsSubAccount = true;
} else {
data = getDataWhenNotSubAccount(vars, strDateFrom, strDateTo, strOrg, strOrgFamily,
- strcAcctSchemaId, strLevel, strTreeAccount, strNotInitialBalance);
+ strcPeriodType, strcAcctSchemaId, strLevel, strTreeAccount, strNotInitialBalance);
}
if (data == null || data.length == 0) {
@@ -631,7 +677,7 @@
strSubTitle.append(Utility.messageBD(this, "LegalEntity", vars.getLanguage()) + ": ");
strSubTitle.append(ReportTrialBalanceData.selectCompany(this, vars.getClient()) + " \n");
strSubTitle.append(Utility.messageBD(this, "asof", vars.getLanguage()) + ": " + strDateTo
- + " \n");
+ + " (" + Utility.messageBD(this, strPeriodTypeText, vars.getLanguage()) + ") \n");
if (!("0".equals(strOrg)))
strSubTitle.append(Utility.messageBD(this, "ACCS_AD_ORG_ID_D", vars.getLanguage()) + ": "
@@ -663,18 +709,18 @@
private ReportTrialBalanceData[] getDataWhenNotSubAccount(VariablesSecureApp vars,
String strDateFrom, String strDateTo, String strOrg, String strOrgFamily,
- String strcAcctSchemaId, String strLevel, String strTreeAccount, String strNotInitialBalance)
- throws IOException, ServletException {
+ String strcPeriodType, String strcAcctSchemaId, String strLevel, String strTreeAccount,
+ String strNotInitialBalance) throws IOException, ServletException {
ReportTrialBalanceData[] data = null;
ReportTrialBalanceData[] dataAux = null;
dataAux = ReportTrialBalanceData.select(this, strDateFrom, strDateTo, strOrg, strTreeAccount,
strcAcctSchemaId, strNotInitialBalance.equals("Y") ? "O" : "P", strOrgFamily,
Utility.getContext(this, vars, "#User_Client", "ReportTrialBalance"),
- Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportTrialBalance"), strDateFrom,
- DateTimeData.nDaysAfter(this, strDateTo, "1"), "", "");
+ Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportTrialBalance"), strcPeriodType,
+ strDateFrom, DateTimeData.nDaysAfter(this, strDateTo, "1"), "", "");
ReportTrialBalanceData[] dataInitialBalance = ReportTrialBalanceData.selectInitialBalance(this,
strDateFrom, strcAcctSchemaId, "", "", "", strOrgFamily,
- Utility.getContext(this, vars, "#User_Client", "ReportTrialBalance"),
+ Utility.getContext(this, vars, "#User_Client", "ReportTrialBalance"), strcPeriodType,
strNotInitialBalance.equals("Y") ? "initial" : "notinitial",
strNotInitialBalance.equals("Y") ? "initial" : "notinitial");
diff --git a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.xml b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.xml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.xml
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.xml
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2009 Openbravo SLU
+* All portions are Copyright (C) 2001-2014 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -49,6 +49,7 @@
<PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
<PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>
<PARAMETER id="paramSelectedGroupBy" name="groupbyselected" attribute="value" default=""/>
+ <PARAMETER id="paramSelectedPeriodType" name="periodtypeselected" attribute="value" default=""/>
<PARAMETER id="paramPageNo" name="PageNo" attribute="value"/>
<PARAMETER id="fieldCheck" name="check" default="Y"/>
<PARAMETER id="fieldNotInitialBalance" name="notInitialBalance" boolean="checked" withId="fieldCheck"/>
diff --git a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2011 Openbravo SLU
+ * All portions are Copyright (C) 2001-2014 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -48,6 +48,7 @@
AND f.AD_ORG_ID IN('2')
AND F.AD_CLIENT_ID IN ('1')
AND F.AD_ORG_ID IN('1')
+ AND (SELECT P.PERIODTYPE FROM C_PERIOD P WHERE P.C_PERIOD_ID = F.C_PERIOD_ID) IN ('S','A')
AND 1=1
AND F.FACTACCTTYPE <> 'R'
AND F.FACTACCTTYPE <> 'C'
@@ -67,6 +68,7 @@
<Parameter name="orgFamily" type="replace" optional="true" after="f.AD_ORG_ID IN(" text="'2'"/>
<Parameter name="adUserClient" type="replace" optional="true" after="F.AD_CLIENT_ID IN (" text="'1'"/>
<Parameter name="adUserOrg" type="replace" optional="true" after="F.AD_ORG_ID IN(" text="'1'"/>
+ <Parameter name="periodType" type="replace" optional="true" after="F.C_PERIOD_ID) IN (" text="'S','A'"/>
<Parameter name="parDateFrom" optional="true" after="AND 1=1"><![CDATA[AND F.DATEACCT >= TO_DATE(?)]]></Parameter>
<Parameter name="parDateTo" optional="true" after="AND 1=1"><![CDATA[AND F.DATEACCT < TO_DATE(?)]]></Parameter>
<Parameter name="accountFrom" optional="true" after="AND 1=1"><![CDATA[AND EV.VALUE >= ?]]></Parameter>
@@ -134,7 +136,8 @@
AND f.AD_ORG_ID IN('2')
AND F.AD_CLIENT_ID IN ('1')
AND F.AD_ORG_ID IN('1')
- AND 1=1
+ AND (SELECT P.PERIODTYPE FROM C_PERIOD P WHERE P.C_PERIOD_ID = F.C_PERIOD_ID) IN ('S','A')
+ AND 1=1
AND F.ISACTIVE = 'Y')
UNION ALL
(SELECT F.ACCOUNT_ID AS ID, EV.VALUE AS ACCOUNT_ID, EV.NAME AS NAME,
@@ -158,7 +161,8 @@
AND f.AD_ORG_ID IN('2')
AND F.AD_CLIENT_ID IN ('1')
AND F.AD_ORG_ID IN('1')
- AND 3=3
+ AND (SELECT P.PERIODTYPE FROM C_PERIOD P WHERE P.C_PERIOD_ID = F.C_PERIOD_ID) IN ('S','A')
+ AND 3=3
AND F.ISACTIVE = 'Y'
)) A
GROUP BY ACCOUNT_ID, ID, groupbyname, groupbyid, NAME
@@ -189,9 +193,10 @@
AND f.AD_ORG_ID IN('2')
AND F.AD_CLIENT_ID IN ('1')
AND F.AD_ORG_ID IN('1')
+ AND (SELECT P.PERIODTYPE FROM C_PERIOD P WHERE P.C_PERIOD_ID = F.C_PERIOD_ID) IN ('S','A')
AND 2=2
AND F.FACTACCTTYPE <> 'R'
- AND F.FACTACCTTYPE <> 'C'
+ AND F.FACTACCTTYPE <> 'C'
AND F.ISACTIVE = 'Y') B
GROUP BY ACCOUNT_ID, ID, groupbyname, groupbyid, NAME
HAVING SUM(AMTACCTDR) <> 0 OR SUM(AMTACCTCR) <> 0 )) C
@@ -212,6 +217,7 @@
<Parameter name="orgFamily" type="replace" optional="true" after="f.AD_ORG_ID IN(" text="'2'"/>
<Parameter name="adUserClient" type="replace" optional="true" after="F.AD_CLIENT_ID IN (" text="'1'"/>
<Parameter name="adUserOrg" type="replace" optional="true" after="F.AD_ORG_ID IN(" text="'1'"/>
+ <Parameter name="periodType" type="replace" optional="true" after="F.C_PERIOD_ID) IN (" text="'S','A'"/>
<Parameter name="accountFrom" optional="true" after="AND 1=1"><![CDATA[AND EV.VALUE >= ?]]></Parameter>
<Parameter name="accountTo" optional="true" after="AND 1=1"><![CDATA[AND EV.VALUE <= ?]]></Parameter>
<Parameter name="parDateFrom" optional="true" after="AND 1=1"><![CDATA[AND F.DATEACCT < TO_DATE(?)]]></Parameter>
@@ -227,6 +233,7 @@
<Parameter name="orgFamily" type="replace" optional="true" after=" f.AD_ORG_ID IN(" text="'2'"/>
<Parameter name="adUserClient" type="replace" optional="true" after=" F.AD_CLIENT_ID IN (" text="'1'"/>
<Parameter name="adUserOrg" type="replace" optional="true" after=" F.AD_ORG_ID IN(" text="'1'"/>
+ <Parameter name="periodType" type="replace" optional="true" after="F.C_PERIOD_ID) IN (" text="'S','A'"/>
<Parameter name="accountFrom" optional="true" after="AND 3=3"><![CDATA[AND EV.VALUE >= ?]]></Parameter>
<Parameter name="accountTo" optional="true" after="AND 3=3"><![CDATA[AND EV.VALUE <= ?]]></Parameter>
<Parameter name="parDateFrom" optional="true" after="AND 3=3"><![CDATA[AND F.DATEACCT = TO_DATE(?)]]></Parameter>
@@ -243,6 +250,7 @@
<Parameter name="orgFamily" type="replace" optional="true" after="AND f.AD_ORG_ID IN(" text="'2'"/>
<Parameter name="adUserClient" type="replace" optional="true" after="AND F.AD_CLIENT_ID IN (" text="'1'"/>
<Parameter name="adUserOrg" type="replace" optional="true" after="AND F.AD_ORG_ID IN(" text="'1'"/>
+ <Parameter name="periodType" type="replace" optional="true" after="F.C_PERIOD_ID) IN (" text="'S','A'"/>
<Parameter name="accountFrom" optional="true" after="AND 2=2"><![CDATA[AND EV.VALUE >= ?]]></Parameter>
<Parameter name="accountTo" optional="true" after="AND 2=2"><![CDATA[AND EV.VALUE <= ?]]></Parameter>
<Parameter name="parDateFrom" optional="true" after="AND 2=2"><![CDATA[AND DATEACCT >= TO_DATE(?) ]]></Parameter>
@@ -296,6 +304,7 @@
AND f.AD_ORG_ID IN('2')
AND F.AD_CLIENT_ID IN ('1')
AND F.AD_ORG_ID IN('1')
+ AND (SELECT P.PERIODTYPE FROM C_PERIOD P WHERE P.C_PERIOD_ID = F.C_PERIOD_ID) IN ('S','A')
AND 1=1
AND F.ISACTIVE = 'Y')
UNION ALL
@@ -312,6 +321,7 @@
AND f.AD_ORG_ID IN('2')
AND F.AD_CLIENT_ID IN ('1')
AND F.AD_ORG_ID IN('1')
+ AND (SELECT P.PERIODTYPE FROM C_PERIOD P WHERE P.C_PERIOD_ID = F.C_PERIOD_ID) IN ('S','A')
AND 3=3
AND F.ISACTIVE = 'Y'
)) A
@@ -336,6 +346,7 @@
AND f.AD_ORG_ID IN('2')
AND F.AD_CLIENT_ID IN ('1')
AND F.AD_ORG_ID IN('1')
+ AND (SELECT P.PERIODTYPE FROM C_PERIOD P WHERE P.C_PERIOD_ID = F.C_PERIOD_ID) IN ('S','A')
AND 2=2
AND F.FACTACCTTYPE <> 'R'
AND F.FACTACCTTYPE <> 'C'
@@ -355,6 +366,7 @@
<Parameter name="orgFamily" type="replace" optional="true" after="f.AD_ORG_ID IN(" text="'2'"/>
<Parameter name="adUserClient" type="replace" optional="true" after="F.AD_CLIENT_ID IN (" text="'1'"/>
<Parameter name="adUserOrg" type="replace" optional="true" after="F.AD_ORG_ID IN(" text="'1'"/>
+ <Parameter name="periodType" type="replace" optional="true" after="F.C_PERIOD_ID) IN (" text="'S','A'"/>
<Parameter name="accountFrom" optional="true" after="AND 1=1"><![CDATA[AND EV.VALUE >= ?]]></Parameter>
<Parameter name="accountTo" optional="true" after="AND 1=1"><![CDATA[AND EV.VALUE <= ?]]></Parameter>
<Parameter name="parDateFrom" optional="true" after="AND 1=1"><![CDATA[AND F.DATEACCT < TO_DATE(?)]]></Parameter>
@@ -367,6 +379,7 @@
<Parameter name="orgFamily" type="replace" optional="true" after=" f.AD_ORG_ID IN(" text="'2'"/>
<Parameter name="adUserClient" type="replace" optional="true" after=" F.AD_CLIENT_ID IN (" text="'1'"/>
<Parameter name="adUserOrg" type="replace" optional="true" after=" F.AD_ORG_ID IN(" text="'1'"/>
+ <Parameter name="periodType" type="replace" optional="true" after="F.C_PERIOD_ID) IN (" text="'S','A'"/>
<Parameter name="accountFrom" optional="true" after="AND 3=3"><![CDATA[AND EV.VALUE >= ?]]></Parameter>
<Parameter name="accountTo" optional="true" after="AND 3=3"><![CDATA[AND EV.VALUE <= ?]]></Parameter>
<Parameter name="parDateFrom" optional="true" after="AND 3=3"><![CDATA[AND F.DATEACCT = TO_DATE(?)]]></Parameter>
@@ -380,6 +393,7 @@
<Parameter name="orgFamily" type="replace" optional="true" after="AND f.AD_ORG_ID IN(" text="'2'"/>
<Parameter name="adUserClient" type="replace" optional="true" after="AND F.AD_CLIENT_ID IN (" text="'1'"/>
<Parameter name="adUserOrg" type="replace" optional="true" after="AND F.AD_ORG_ID IN(" text="'1'"/>
+ <Parameter name="periodType" type="replace" optional="true" after="F.C_PERIOD_ID) IN (" text="'S','A'"/>
<Parameter name="parDateFrom" optional="true" after="AND 2=2"><![CDATA[AND DATEACCT >= TO_DATE(?) ]]></Parameter>
<Parameter name="parDateTo" optional="true" after="AND 2=2"><![CDATA[AND DATEACCT < TO_DATE(?) ]]></Parameter>
<Parameter name="accountFrom" optional="true" after="AND 2=2"><![CDATA[AND EV.VALUE >= ?]]></Parameter>
@@ -405,6 +419,7 @@
AND F.C_ACCTSCHEMA_ID = ?
AND F.AD_ORG_ID IN ('1')
AND F.AD_CLIENT_ID IN ('1')
+ AND (SELECT P.PERIODTYPE FROM C_PERIOD P WHERE P.C_PERIOD_ID = F.C_PERIOD_ID) IN ('S','A')
AND F.ISACTIVE = 'Y')
UNION ALL
(SELECT F.ACCOUNT_ID AS ACCOUNT_ID, F.AMTACCTDR AS AMTACCTDR, F.AMTACCTCR AS AMTACCTCR,
@@ -415,6 +430,7 @@
AND F.C_ACCTSCHEMA_ID = ?
AND F.AD_ORG_ID IN ('1')
AND F.AD_CLIENT_ID IN ('1')
+ AND (SELECT P.PERIODTYPE FROM C_PERIOD P WHERE P.C_PERIOD_ID = F.C_PERIOD_ID) IN ('S','A')
AND F.ISACTIVE = 'Y'
AND 3=3)) A
GROUP BY ACCOUNT_ID
@@ -428,6 +444,7 @@
<Parameter name="project" optional="true" type="argument" after="1=1"><![CDATA[ AND F.C_PROJECT_ID IN]]></Parameter>
<Parameter name="orgFamily" type="replace" optional="true" after="AND F.AD_ORG_ID IN (" text="'1'"/>
<Parameter name="clientFamily" type="replace" optional="true" after="AND F.AD_CLIENT_ID IN (" text="'1'"/>
+ <Parameter name="periodType" type="replace" optional="true" after="F.C_PERIOD_ID) IN (" text="'S','A'"/>
<!-- -->
<Parameter name="dateFrom"/>
<Parameter name="acctschema"/>
@@ -436,6 +453,7 @@
<Parameter name="project" optional="true" type="argument" after="2=2"><![CDATA[ AND F.C_PROJECT_ID IN]]></Parameter>
<Parameter name="orgFamily" type="replace" optional="true" after="AND F.AD_ORG_ID IN (" text="'1'"/>
<Parameter name="clientFamily" type="replace" optional="true" after="AND F.AD_CLIENT_ID IN (" text="'1'"/>
+ <Parameter name="periodType" type="replace" optional="true" after="F.C_PERIOD_ID) IN (" text="'S','A'"/>
<Parameter name="initial" type="none" optional="true" after="AND 3=3"><![CDATA[ AND F.FACTACCTTYPE = 'O']]></Parameter>
<Parameter name="notinitial" type="none" optional="true" after="AND 3=3"><![CDATA[ AND F.FACTACCTTYPE <> 'O']]></Parameter>
</SqlMethod>
|
Relationships [ Relation Graph ]
[ Dependency Graph ]
Relationships 