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 @@ + + + + + + + + + + + + @@ -22376,6 +22388,18 @@ + + + + + + + + + + + + @@ -25196,6 +25220,18 @@ + + + + + + + + + + + + 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 @@ + + + + + + + + + + + @@ -19534,6 +19545,17 @@ + + + + + + + + + + + @@ -20579,6 +20601,17 @@ + + + + + + + + + + + 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   +
- - - - + + + + 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 @@ + 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 @@ + = TO_DATE(?)]]> = ?]]> @@ -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 @@ + = ?]]> @@ -227,6 +233,7 @@ + = ?]]> @@ -243,6 +250,7 @@ + = ?]]> = TO_DATE(?) ]]> @@ -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 @@ + = ?]]> @@ -367,6 +379,7 @@ + = ?]]> @@ -380,6 +393,7 @@ + = TO_DATE(?) ]]> = ?]]> @@ -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 @@ + @@ -436,6 +453,7 @@ + 'O']]>