details: https://code.openbravo.com/erp/devel/pi/rev/605a1d203445
changeset: 24094:605a1d203445
user: Rafa Roda Palacios <rafa.roda <at> ubiquads.com>
date: Tue Jul 22 08:11:07 2014 +0200
summary: Fixes issue 26935 Feature request to make Sales Invoice Dimensional
Report exportable to excel
diffstat:
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
| 10 +
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 77 +
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
| 193 ++-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html
| 42 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql
| 72 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml
| 590 ++++++++++
6 files changed, 914 insertions(+), 70 deletions(-)
diffs (truncated from 1134 to 300 lines):
diff -r 063228ee428e -r 605a1d203445
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Tue Jul 22
08:09:03 2014 +0200
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Tue Jul 22
08:11:07 2014 +0200
@@ -3790,6 +3790,16 @@
<!--4A9AF7FBED4D4FE891EF7E2AAA389FBA--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--4A9AF7FBED4D4FE891EF7E2AAA389FBA--></AD_MODEL_OBJECT_MAPPING>
+<!--504D9EF71BC448F4B9AD3B1B00456FF8--><AD_MODEL_OBJECT_MAPPING>
+<!--504D9EF71BC448F4B9AD3B1B00456FF8-->
<AD_MODEL_OBJECT_MAPPING_ID><![CDATA[504D9EF71BC448F4B9AD3B1B00456FF8]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--504D9EF71BC448F4B9AD3B1B00456FF8-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--504D9EF71BC448F4B9AD3B1B00456FF8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--504D9EF71BC448F4B9AD3B1B00456FF8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--504D9EF71BC448F4B9AD3B1B00456FF8-->
<AD_MODEL_OBJECT_ID><![CDATA[970E07E33FD1412D84D9155EBBAD4E0B]]></AD_MODEL_OBJECT_ID>
+<!--504D9EF71BC448F4B9AD3B1B00456FF8-->
<MAPPINGNAME><![CDATA[/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.xls]]></MAPPINGNAME>
+<!--504D9EF71BC448F4B9AD3B1B00456FF8--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--504D9EF71BC448F4B9AD3B1B00456FF8--></AD_MODEL_OBJECT_MAPPING>
+
<!--527057E70F3145A78A293DC1B0AD5E53--><AD_MODEL_OBJECT_MAPPING>
<!--527057E70F3145A78A293DC1B0AD5E53-->
<AD_MODEL_OBJECT_MAPPING_ID><![CDATA[527057E70F3145A78A293DC1B0AD5E53]]></AD_MODEL_OBJECT_MAPPING_ID>
<!--527057E70F3145A78A293DC1B0AD5E53-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 063228ee428e -r 605a1d203445
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Jul 22 08:09:03
2014 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Jul 22 08:11:07
2014 +0200
@@ -14333,6 +14333,17 @@
<!--520A3E4E01744392BBBD82F6DD1D8A7E-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--520A3E4E01744392BBBD82F6DD1D8A7E--></AD_TEXTINTERFACES>
+<!--52D06903C08F4CBA87D3F9C41859DEF5--><AD_TEXTINTERFACES>
+<!--52D06903C08F4CBA87D3F9C41859DEF5-->
<AD_TEXTINTERFACES_ID><![CDATA[52D06903C08F4CBA87D3F9C41859DEF5]]></AD_TEXTINTERFACES_ID>
+<!--52D06903C08F4CBA87D3F9C41859DEF5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--52D06903C08F4CBA87D3F9C41859DEF5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--52D06903C08F4CBA87D3F9C41859DEF5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--52D06903C08F4CBA87D3F9C41859DEF5--> <TEXT><![CDATA[XLS Format]]></TEXT>
+<!--52D06903C08F4CBA87D3F9C41859DEF5-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html]]></FILENAME>
+<!--52D06903C08F4CBA87D3F9C41859DEF5--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--52D06903C08F4CBA87D3F9C41859DEF5-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--52D06903C08F4CBA87D3F9C41859DEF5--></AD_TEXTINTERFACES>
+
<!--53275D35722A4AE28B74C04938BF33B7--><AD_TEXTINTERFACES>
<!--53275D35722A4AE28B74C04938BF33B7-->
<AD_TEXTINTERFACES_ID><![CDATA[53275D35722A4AE28B74C04938BF33B7]]></AD_TEXTINTERFACES_ID>
<!--53275D35722A4AE28B74C04938BF33B7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21272,6 +21283,17 @@
<!--E33FEC38995D11DD8940001D09C4A2FE-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--E33FEC38995D11DD8940001D09C4A2FE--></AD_TEXTINTERFACES>
+<!--E3ECECD2706D40BD82B294885BB2E096--><AD_TEXTINTERFACES>
+<!--E3ECECD2706D40BD82B294885BB2E096-->
<AD_TEXTINTERFACES_ID><![CDATA[E3ECECD2706D40BD82B294885BB2E096]]></AD_TEXTINTERFACES_ID>
+<!--E3ECECD2706D40BD82B294885BB2E096-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E3ECECD2706D40BD82B294885BB2E096--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E3ECECD2706D40BD82B294885BB2E096--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E3ECECD2706D40BD82B294885BB2E096--> <TEXT><![CDATA[Generate
Excel]]></TEXT>
+<!--E3ECECD2706D40BD82B294885BB2E096-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html]]></FILENAME>
+<!--E3ECECD2706D40BD82B294885BB2E096--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--E3ECECD2706D40BD82B294885BB2E096-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E3ECECD2706D40BD82B294885BB2E096--></AD_TEXTINTERFACES>
+
<!--E447A26C82EC4442A557AA56CD8FCE79--><AD_TEXTINTERFACES>
<!--E447A26C82EC4442A557AA56CD8FCE79-->
<AD_TEXTINTERFACES_ID><![CDATA[E447A26C82EC4442A557AA56CD8FCE79]]></AD_TEXTINTERFACES_ID>
<!--E447A26C82EC4442A557AA56CD8FCE79-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21756,6 +21778,61 @@
<!--FD4B9BD0445179A0E040007F01014582-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--FD4B9BD0445179A0E040007F01014582--></AD_TEXTINTERFACES>
+<!--FD59FDD69133BE06E040007F01017371--><AD_TEXTINTERFACES>
+<!--FD59FDD69133BE06E040007F01017371-->
<AD_TEXTINTERFACES_ID><![CDATA[FD59FDD69133BE06E040007F01017371]]></AD_TEXTINTERFACES_ID>
+<!--FD59FDD69133BE06E040007F01017371-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD59FDD69133BE06E040007F01017371--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD59FDD69133BE06E040007F01017371--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD59FDD69133BE06E040007F01017371--> <TEXT><![CDATA[Document No]]></TEXT>
+<!--FD59FDD69133BE06E040007F01017371-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml]]></FILENAME>
+<!--FD59FDD69133BE06E040007F01017371--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FD59FDD69133BE06E040007F01017371-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FD59FDD69133BE06E040007F01017371--></AD_TEXTINTERFACES>
+
+<!--FD59FDD69135BE06E040007F01017371--><AD_TEXTINTERFACES>
+<!--FD59FDD69135BE06E040007F01017371-->
<AD_TEXTINTERFACES_ID><![CDATA[FD59FDD69135BE06E040007F01017371]]></AD_TEXTINTERFACES_ID>
+<!--FD59FDD69135BE06E040007F01017371-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD59FDD69135BE06E040007F01017371--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD59FDD69135BE06E040007F01017371--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD59FDD69135BE06E040007F01017371--> <TEXT><![CDATA[Invoice Date]]></TEXT>
+<!--FD59FDD69135BE06E040007F01017371-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml]]></FILENAME>
+<!--FD59FDD69135BE06E040007F01017371--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FD59FDD69135BE06E040007F01017371-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FD59FDD69135BE06E040007F01017371--></AD_TEXTINTERFACES>
+
+<!--FD59FDD69137BE06E040007F01017371--><AD_TEXTINTERFACES>
+<!--FD59FDD69137BE06E040007F01017371-->
<AD_TEXTINTERFACES_ID><![CDATA[FD59FDD69137BE06E040007F01017371]]></AD_TEXTINTERFACES_ID>
+<!--FD59FDD69137BE06E040007F01017371-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD59FDD69137BE06E040007F01017371--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD59FDD69137BE06E040007F01017371--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD59FDD69137BE06E040007F01017371--> <TEXT><![CDATA[M.%]]></TEXT>
+<!--FD59FDD69137BE06E040007F01017371-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml]]></FILENAME>
+<!--FD59FDD69137BE06E040007F01017371--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FD59FDD69137BE06E040007F01017371-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FD59FDD69137BE06E040007F01017371--></AD_TEXTINTERFACES>
+
+<!--FD59FDD69139BE06E040007F01017371--><AD_TEXTINTERFACES>
+<!--FD59FDD69139BE06E040007F01017371-->
<AD_TEXTINTERFACES_ID><![CDATA[FD59FDD69139BE06E040007F01017371]]></AD_TEXTINTERFACES_ID>
+<!--FD59FDD69139BE06E040007F01017371-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD59FDD69139BE06E040007F01017371--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD59FDD69139BE06E040007F01017371--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD59FDD69139BE06E040007F01017371--> <TEXT><![CDATA[Ship to
address]]></TEXT>
+<!--FD59FDD69139BE06E040007F01017371-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml]]></FILENAME>
+<!--FD59FDD69139BE06E040007F01017371--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FD59FDD69139BE06E040007F01017371-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FD59FDD69139BE06E040007F01017371--></AD_TEXTINTERFACES>
+
+<!--FD5AABFA24C70066E040007F01017D64--><AD_TEXTINTERFACES>
+<!--FD5AABFA24C70066E040007F01017D64-->
<AD_TEXTINTERFACES_ID><![CDATA[FD5AABFA24C70066E040007F01017D64]]></AD_TEXTINTERFACES_ID>
+<!--FD5AABFA24C70066E040007F01017D64-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD5AABFA24C70066E040007F01017D64--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD5AABFA24C70066E040007F01017D64--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD5AABFA24C70066E040007F01017D64--> <TEXT><![CDATA[Sales rep.]]></TEXT>
+<!--FD5AABFA24C70066E040007F01017D64-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml]]></FILENAME>
+<!--FD5AABFA24C70066E040007F01017D64--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FD5AABFA24C70066E040007F01017D64-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FD5AABFA24C70066E040007F01017D64--></AD_TEXTINTERFACES>
+
<!--FD6E8FB2F09445C0B2CC4E09D4C3BF69--><AD_TEXTINTERFACES>
<!--FD6E8FB2F09445C0B2CC4E09D4C3BF69-->
<AD_TEXTINTERFACES_ID><![CDATA[FD6E8FB2F09445C0B2CC4E09D4C3BF69]]></AD_TEXTINTERFACES_ID>
<!--FD6E8FB2F09445C0B2CC4E09D4C3BF69-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 063228ee428e -r 605a1d203445
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
---
a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
Tue Jul 22 08:09:03 2014 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
Tue Jul 22 08:11:07 2014 +0200
@@ -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-2011 Openbravo SLU
+ * All portions are Copyright (C) 2001-2014 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -188,6 +188,47 @@
strPartnerGroup, strcBpartnerId, strProductCategory, strmProductId,
strNotShown,
strShown, strDateFromRef, strDateToRef, strOrg, strsalesrepId,
strcProjectId,
strProducttype, strOrder, strMayor, strMenor, strPartnerSalesrepId,
strCurrencyId, "pdf");
+ } else if (vars.commandIn("EXCEL")) {
+ String strDateFrom = vars.getRequestGlobalVariable("inpDateFrom",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|dateFrom");
+ String strDateTo = vars.getRequestGlobalVariable("inpDateTo",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|dateTo");
+ String strDateFromRef = vars.getRequestGlobalVariable("inpDateFromRef",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|dateFromRef");
+ String strDateToRef = vars.getRequestGlobalVariable("inpDateToRef",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|dateToRef");
+ String strPartnerGroup = vars.getRequestGlobalVariable("inpPartnerGroup",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|partnerGroup");
+ String strcBpartnerId =
vars.getRequestInGlobalVariable("inpcBPartnerId_IN",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|partner",
IsIDFilter.instance);
+ String strProductCategory =
vars.getRequestGlobalVariable("inpProductCategory",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|productCategory");
+ String strmProductId =
vars.getRequestInGlobalVariable("inpmProductId_IN",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|product",
IsIDFilter.instance);
+ // ad_ref_list.value for refercence_id 800087
+ String strNotShown = vars.getInStringParameter("inpNotShown",
IsPositiveIntFilter.instance);
+ String strShown = vars.getInStringParameter("inpShown",
IsPositiveIntFilter.instance);
+ String strOrg = vars.getRequestGlobalVariable("inpOrg",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|org");
+ String strsalesrepId = vars.getRequestGlobalVariable("inpSalesrepId",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|salesrep");
+ String strcProjectId = vars.getRequestGlobalVariable("inpcProjectId",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|project");
+ String strProducttype = vars.getRequestGlobalVariable("inpProducttype",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|producttype");
+ String strOrder = vars.getRequestGlobalVariable("inpOrder",
+ "ReportSalesDimensionalAnalyze|order");
+ String strMayor = vars.getNumericParameter("inpMayor", "");
+ String strMenor = vars.getNumericParameter("inpMenor", "");
+ String strComparative = vars.getStringParameter("inpComparative", "N");
+ String strPartnerSalesrepId =
vars.getRequestGlobalVariable("inpPartnerSalesrepId",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|partnersalesrep");
+ String strCurrencyId = vars.getGlobalVariable("inpCurrencyId",
+ "ReportInvoiceCustomerDimensionalAnalysesJR|currency",
strUserCurrencyId);
+ printPageHtml(request, response, vars, strComparative, strDateFrom,
strDateTo,
+ strPartnerGroup, strcBpartnerId, strProductCategory, strmProductId,
strNotShown,
+ strShown, strDateFromRef, strDateToRef, strOrg, strsalesrepId,
strcProjectId,
+ strProducttype, strOrder, strMayor, strMenor, strPartnerSalesrepId,
strCurrencyId, "xls");
} else
pageErrorPopUp(response);
}
@@ -262,14 +303,6 @@
xmlDocument.setParameter("dateToRef", strDateToRef);
xmlDocument.setParameter("dateToRefdisplayFormat",
vars.getSessionValue("#AD_SqlDateFormat"));
xmlDocument.setParameter("dateToRefsaveFormat",
vars.getSessionValue("#AD_SqlDateFormat"));
- /*
- * xmlDocument.setParameter("paramBPartnerId", strcBpartnerId);
- * xmlDocument.setParameter("bPartnerDescription",
- * ReportInvoiceCustomerDimensionalAnalysesJRData.selectBpartner(this,
strcBpartnerId));
- * xmlDocument.setParameter("mProduct", strmProductId);
- * xmlDocument.setParameter("productDescription",
- * ReportInvoiceCustomerDimensionalAnalysesJRData.selectMproduct(this,
strmProductId));
- */
xmlDocument.setParameter("cBpGroupId", strPartnerGroup);
xmlDocument.setParameter("mProductCategoryId", strProductCategory);
xmlDocument.setParameter("adOrgId", strOrg);
@@ -478,6 +511,7 @@
strPartnerSalesrepId);
ReportInvoiceCustomerDimensionalAnalysesJRData[] data = null;
+ ReportInvoiceCustomerDimensionalAnalysesJRData dataXLS = null;
String[] strShownArray = { "", "", "", "", "", "", "", "", "", "" };
if (strShown.startsWith("("))
strShown = strShown.substring(1, strShown.length() - 1);
@@ -671,77 +705,116 @@
advisePopUp(request, response, "ERROR",
Utility.messageBD(this, "ReportsLimitHeader", vars.getLanguage()),
msgbody);
} else {
- // Checks if there is a conversion rate for each of the transactions
- // of
- // the report
+ // Checks if there is a conversion rate for each of the transactions of
the report
String strConvRateErrorMsg = "";
OBError myMessage = null;
myMessage = new OBError();
- if (strComparative.equals("Y")) {
+ if ("xls".equals(strOutput)) {
try {
- data = ReportInvoiceCustomerDimensionalAnalysesJRData.select(this,
strCurrencyId,
- strTextShow[0], strTextShow[1], strTextShow[2], strTextShow[3],
strTextShow[4],
- strTextShow[5], strTextShow[6], strTextShow[7], strTextShow[8],
strTextShow[9], Tree
- .getMembers(this, TreeData.getTreeOrg(this,
vars.getClient()), strOrg), Utility
+ dataXLS =
ReportInvoiceCustomerDimensionalAnalysesJRData.selectXLS(this, strCurrencyId,
+ Tree.getMembers(this, TreeData.getTreeOrg(this,
vars.getClient()), strOrg), Utility
.getContext(this, vars, "#User_Client",
"ReportInvoiceCustomerDimensionalAnalysesJR"),
strDateFrom, DateTimeData
.nDaysAfter(this, strDateTo, "1"), strPartnerGroup,
strcBpartnerId,
strProductCategory, strmProductId, strsalesrepId,
strPartnerSalesrepId,
- strcProjectId, strProducttype, strDateFromRef,
DateTimeData.nDaysAfter(this,
- strDateToRef, "1"), strOrderby);
+ strcProjectId, strProducttype);
} catch (ServletException ex) {
myMessage = Utility.translateError(this, vars, vars.getLanguage(),
ex.getMessage());
}
} else {
- try {
- data =
ReportInvoiceCustomerDimensionalAnalysesJRData.selectNoComparative(this,
- strCurrencyId, strTextShow[0], strTextShow[1], strTextShow[2],
strTextShow[3],
- strTextShow[4], strTextShow[5], strTextShow[6], strTextShow[7],
strTextShow[8],
- strTextShow[9], Tree.getMembers(this, TreeData.getTreeOrg(this,
vars.getClient()),
- strOrg), Utility.getContext(this, vars, "#User_Client",
- "ReportInvoiceCustomerDimensionalAnalysesJR"), strDateFrom,
DateTimeData
- .nDaysAfter(this, strDateTo, "1"), strPartnerGroup,
strcBpartnerId,
- strProductCategory, strmProductId, strsalesrepId,
strPartnerSalesrepId,
- strcProjectId, strProducttype, strOrderby);
- } catch (ServletException ex) {
- myMessage = Utility.translateError(this, vars, vars.getLanguage(),
ex.getMessage());
+ if (strComparative.equals("Y")) {
+ try {
+ data = ReportInvoiceCustomerDimensionalAnalysesJRData.select(this,
strCurrencyId,
+ strTextShow[0], strTextShow[1], strTextShow[2],
strTextShow[3], strTextShow[4],
+ strTextShow[5], strTextShow[6], strTextShow[7],
strTextShow[8], strTextShow[9],
+ Tree.getMembers(this, TreeData.getTreeOrg(this,
vars.getClient()), strOrg), Utility
+ .getContext(this, vars, "#User_Client",
+ "ReportInvoiceCustomerDimensionalAnalysesJR"),
strDateFrom, DateTimeData
+ .nDaysAfter(this, strDateTo, "1"), strPartnerGroup,
strcBpartnerId,
+ strProductCategory, strmProductId, strsalesrepId,
strPartnerSalesrepId,
+ strcProjectId, strProducttype, strDateFromRef,
DateTimeData.nDaysAfter(this,
+ strDateToRef, "1"), strOrderby);
+ } catch (ServletException ex) {
+ myMessage = Utility.translateError(this, vars, vars.getLanguage(),
ex.getMessage());
+ }
+ } else {
+ try {
+ data =
ReportInvoiceCustomerDimensionalAnalysesJRData.selectNoComparative(this,
+ strCurrencyId, strTextShow[0], strTextShow[1], strTextShow[2],
strTextShow[3],
+ strTextShow[4], strTextShow[5], strTextShow[6],
strTextShow[7], strTextShow[8],
+ strTextShow[9], Tree.getMembers(this,
TreeData.getTreeOrg(this, vars.getClient()),
+ strOrg), Utility.getContext(this, vars, "#User_Client",
+ "ReportInvoiceCustomerDimensionalAnalysesJR"),
strDateFrom, DateTimeData
+ .nDaysAfter(this, strDateTo, "1"), strPartnerGroup,
strcBpartnerId,
+ strProductCategory, strmProductId, strsalesrepId,
strPartnerSalesrepId,
+ strcProjectId, strProducttype, strOrderby);
+ } catch (ServletException ex) {
+ myMessage = Utility.translateError(this, vars, vars.getLanguage(),
ex.getMessage());
+ }
}
}
strConvRateErrorMsg = myMessage.getMessage();
- // If a conversion rate is missing for a certain transaction, an
- // error
- // message window pops-up.
+ // If a conversion rate is missing for a certain transaction, an error
message window pops-up.
if (!strConvRateErrorMsg.equals("") && strConvRateErrorMsg != null) {
advisePopUp(request, response, "ERROR",
Utility.messageBD(this, "NoConversionRateHeader",
vars.getLanguage()),
strConvRateErrorMsg);
- } else { // Otherwise, the report is launched
- String strReportPath;
- if (strComparative.equals("Y")) {
- strReportPath =
"@basedesign@/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeJR.jrxml";
+ } else {
+ // Otherwise, the report is launched
+ if ("xls".equals(strOutput)) {
+ try {
+ if (!dataXLS.hasData()) {
+ advisePopUp(request, response, "WARNING",
+ Utility.messageBD(this, "ProcessStatus-W",
vars.getLanguage()),
+ Utility.messageBD(this, "NoDataFound", vars.getLanguage()));
+ } else {
------------------------------------------------------------------------------
Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world's largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
