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
@@ -13047,6 +13047,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -13113,6 +13124,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -13157,6 +13190,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -13212,6 +13256,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -13520,6 +13575,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -13564,6 +13630,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -13728,6 +13805,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -13750,6 +13838,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -14168,6 +14267,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -14223,6 +14333,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -14355,6 +14476,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -14773,6 +14905,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -18282,6 +18425,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -18348,6 +18502,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -19853,6 +20018,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -20315,6 +20491,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -20821,6 +21008,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -20854,6 +21052,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -21184,6 +21393,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -21217,6 +21437,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -21283,6 +21514,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -21327,6 +21569,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -21349,6 +21602,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -21536,6 +21811,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -21756,6 +22042,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -21789,6 +22086,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -21811,6 +22119,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -22218,6 +22537,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeXLS.jrxml b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeXLS.jrxml
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeXLS.jrxml
@@ -0,0 +1,1531 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <band splitType="Stretch"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
@@ -799,14 +799,53 @@
OBError myMessage = null;
myMessage = new OBError();
if ("xls".equals(strOutput)) {
+ // Resets Order By
+ strOrderby = "";
+ if (strOrder.equals("Amountasc")) {
+ strOrderby += ", CONVAMOUNT ASC";
+ } else if (strOrder.equals("Amountdesc")) {
+ strOrderby += ", CONVAMOUNT DESC";
+ } else {
+ strOrderby = ", 1";
+ }
try {
- 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, strcDocTypeId);
+ if (strComparative.equals("Y")) {
+ dataXLS = ReportInvoiceCustomerDimensionalAnalysesJRData.selectComparativeXLS(
+ this,
+ strCurrencyId,
+ vars.getLanguage(),
+ 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,
+ strcDocTypeId,
+ "".equals(strDateFromRef) ? "31-12-9999" : strDateFromRef,
+ "".equals(strDateToRef) ? "31-12-9999" : DateTimeData.nDaysAfter(this,
+ strDateToRef, "1"),
+ "".equals(strDateFromRef2) ? "31-12-9999" : strDateFromRef2,
+ "".equals(strDateToRef2) ? "31-12-9999" : DateTimeData.nDaysAfter(this,
+ strDateToRef2, "1"),
+ "".equals(strDateFromRef3) ? "31-12-9999" : strDateFromRef3,
+ "".equals(strDateToRef3) ? "31-12-9999" : DateTimeData.nDaysAfter(this,
+ strDateToRef3, "1"), strHaving, strOrderby);
+ } else {
+ 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, strcDocTypeId);
+ }
} catch (ServletException ex) {
myMessage = Utility.translateError(this, vars, vars.getLanguage(), ex.getMessage());
}
@@ -894,6 +933,9 @@
* LimitRowsScrollableFieldProviderFilter( dataXLS, rowLimit);
*/
String strReportName = "@basedesign@/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml";
+ if (strComparative.equals("Y")) {
+ strReportName = "@basedesign@/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeXLS.jrxml";
+ }
HashMap parameters = new HashMap();
diff --git a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql
@@ -1171,4 +1171,313 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = to_date(?)]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = to_date(?)]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = to_date(?)]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = to_date(?)]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+