details: https://code.openbravo.com/erp/devel/pi/rev/33ab19458665
changeset: 35880:33ab19458665
user: Nono Carballo <nonofce <at> gmail.com>
date: Mon May 20 08:49:31 2019 -0400
summary: Fixes issue 40762: Makes inactive organizations available in reports.
Inactive organizations are included in Organization selector in reports.
diffstat:
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql |
2 -
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java |
15 +++------
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java |
13 ++------
src/org/openbravo/erpCommon/info/SelectorUtility_data.xsql |
15 +++++++++-
4 files changed, 23 insertions(+), 22 deletions(-)
diffs (105 lines):
diff -r 898c207324d9 -r 33ab19458665
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql
Wed May 15 18:14:49 2019 -0400
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql
Mon May 20 08:49:31 2019 -0400
@@ -149,7 +149,6 @@
(CASE WHEN
AD_ORGTYPE.ISBUSINESSUNIT='Y' OR AD_ORGTYPE.ISLEGALENTITY='Y' THEN 'Y' ELSE 'N'
END) AS BALANCED
FROM AD_ORG, AD_ORGTYPE
WHERE AD_ORGTYPE.AD_ORGTYPE_ID =
AD_ORG.AD_ORGTYPE_ID
- AND AD_ORG.ISACTIVE = 'Y'
) O, AD_ORG ORG
WHERE R.C_ACCTSCHEMA_ID = S.C_ACCTSCHEMA_ID
AND AD_ISORGINCLUDED(O.AD_ORG_ID, S.AD_ORG_ID, S.AD_CLIENT_ID) <> -1
@@ -169,7 +168,6 @@
(CASE WHEN
AD_ORGTYPE.ISBUSINESSUNIT='Y' OR AD_ORGTYPE.ISLEGALENTITY='Y' THEN 'Y' ELSE 'N'
END) AS BALANCED
FROM AD_ORG, AD_ORGTYPE
WHERE AD_ORGTYPE.AD_ORGTYPE_ID =
AD_ORG.AD_ORGTYPE_ID
- AND AD_ORG.ISACTIVE = 'Y'
) O
WHERE R.C_ACCTSCHEMA_ID = S.C_ACCTSCHEMA_ID
AND (AD_ISORGINCLUDED(O.AD_ORG_ID, S.AD_ORG_ID, S.AD_CLIENT_ID) <> -1
diff -r 898c207324d9 -r 33ab19458665
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Wed May
15 18:14:49 2019 -0400
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Mon May
20 08:49:31 2019 -0400
@@ -42,7 +42,6 @@
import org.openbravo.erpCommon.businessUtility.WindowTabs;
import org.openbravo.erpCommon.info.SelectorUtilityData;
import org.openbravo.erpCommon.utility.AbstractScrollableFieldProviderFilter;
-import org.openbravo.erpCommon.utility.ComboTableData;
import org.openbravo.erpCommon.utility.DateTimeData;
import org.openbravo.erpCommon.utility.LeftTabsBar;
import org.openbravo.erpCommon.utility.LimitRowsScrollableFieldProviderFilter;
@@ -511,15 +510,11 @@
xmlDocument.setParameter("calendar", vars.getLanguage().substring(0, 2));
- try {
- ComboTableData comboTableData = new ComboTableData(vars, readOnlyCP,
"TABLEDIR", "AD_ORG_ID",
- "", "", Utility.getContext(readOnlyCP, vars, "#User_Org",
"ReportGeneralLedger"),
- Utility.getContext(readOnlyCP, vars, "#User_Client",
"ReportGeneralLedger"), '*');
- comboTableData.fillParameters(null, "ReportGeneralLedger", "");
- xmlDocument.setData("reportAD_ORGID", "liststructure",
comboTableData.select(false));
- } catch (Exception ex) {
- throw new ServletException(ex);
- }
+
+ xmlDocument.setData("reportAD_ORGID", "liststructure",
+ SelectorUtilityData.selectAllOrganizations(readOnlyCP,
+ Utility.getContext(readOnlyCP, vars, "#User_Org",
"ReportGeneralLedger"),
+ Utility.getContext(readOnlyCP, vars, "#User_Client",
"ReportGeneralLedger")));
xmlDocument.setParameter("directory", "var baseDirectory = \"" +
strReplaceWith + "/\";\n");
xmlDocument.setParameter("paramLanguage", "defaultLang=\"" +
vars.getLanguage() + "\";");
diff -r 898c207324d9 -r 33ab19458665
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java Wed May
15 18:14:49 2019 -0400
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java Mon May
20 08:49:31 2019 -0400
@@ -444,15 +444,10 @@
xmlDocument.setParameter("messageMessage", myMessage.getMessage());
}
- try {
- ComboTableData comboTableData = new ComboTableData(vars, readOnlyCP,
"TABLEDIR", "AD_ORG_ID",
- "", "", Utility.getContext(readOnlyCP, vars, "#User_Org",
"ReportTrialBalance"),
- Utility.getContext(readOnlyCP, vars, "#User_Client",
"ReportTrialBalance"), '*');
- comboTableData.fillParameters(null, "ReportTrialBalance", "");
- xmlDocument.setData("reportAD_ORGID", "liststructure",
comboTableData.select(false));
- } catch (Exception ex) {
- throw new ServletException(ex);
- }
+ xmlDocument.setData("reportAD_ORGID", "liststructure",
+ SelectorUtilityData.selectAllOrganizations(readOnlyCP,
+ Utility.getContext(readOnlyCP, vars, "#User_Org",
"ReportTrialBalance"),
+ Utility.getContext(readOnlyCP, vars, "#User_Client",
"ReportTrialBalance")));
xmlDocument.setData("reportC_ACCTSCHEMA_ID", "liststructure",
AccountingSchemaMiscData.selectC_ACCTSCHEMA_ID(readOnlyCP,
diff -r 898c207324d9 -r 33ab19458665
src/org/openbravo/erpCommon/info/SelectorUtility_data.xsql
--- a/src/org/openbravo/erpCommon/info/SelectorUtility_data.xsql Wed May
15 18:14:49 2019 -0400
+++ b/src/org/openbravo/erpCommon/info/SelectorUtility_data.xsql Mon May
20 08:49:31 2019 -0400
@@ -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) 2009-2014 Openbravo SLU
+ * All portions are Copyright (C) 2009-2019 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -94,5 +94,18 @@
<Parameter name="adUserClient" type="replace" optional="true"
after="AD_CLIENT_ID IN (" text="'1'"/>
<Parameter name="mLocatorId" optional="true" type="argument" after="(1=2"
text=" OR C_DOCTYPE_ID IN"/>
</SqlMethod>
+
+ <SqlMethod name="selectAllOrganizations" type="preparedStatement"
return="multiple">
+ <Sql>
+ <![CDATA[
+ SELECT AD_ORG.AD_ORG_ID AS ID, AD_ORG.NAME
+ FROM AD_ORG
+ WHERE AD_ORG.AD_ORG_ID IN ('1')
+ AND AD_ORG.AD_CLIENT_ID IN ('1')
+ ORDER BY 2
+ ]]></Sql>
+ <Parameter name="adOrgClient" type="replace" optional="true"
after="AD_ORG_ID IN (" text="'1'"/>
+ <Parameter name="adUserClient" type="replace" optional="true"
after="AD_ORG.AD_CLIENT_ID IN (" text="'1'"/>
+ </SqlMethod>
</SqlClass>
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
