details: https://code.openbravo.com/erp/devel/pi/rev/7d1b4e0de850
changeset: 34273:7d1b4e0de850
user: Armaignac <collazoandy4 <at> gmail.com>
date: Tue Jun 26 12:18:58 2018 -0400
summary: Fixes issue 38816:Sales Invoice Dimensional Report of a Product
Category checked
as summary level does not show data.
If the product category checked as summary with some categories below it is
selected
the report doesn't show data because does not take into account the hierarchy
The Report take into account the product category hierarchy to filter the
categories
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeJR.jrxml
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
| 22 ++++---
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql
| 28 +++++-----
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesMultiComparativeExtendedJR.jrxml
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesMultiComparativeJR.jrxml
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesNoComparativeJR.jrxml
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml
| 2 +-
src/org/openbravo/erpCommon/businessUtility/Tree.java
| 8 ++-
src/org/openbravo/erpCommon/businessUtility/Tree_data.xsql
| 13 ++++-
9 files changed, 50 insertions(+), 31 deletions(-)
diffs (truncated from 346 to 300 lines):
diff -r eed99aa47f9b -r 7d1b4e0de850
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeJR.jrxml
---
a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeJR.jrxml
Fri Jul 06 12:59:08 2018 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeJR.jrxml
Tue Jun 26 12:18:58 2018 -0400
@@ -201,7 +201,7 @@
</parameter>
<parameter name="M_PRODUCT_CATEGORY_ID" class="java.lang.String"/>
<parameter name="aux_productcategory" class="java.lang.String"
isForPrompting="false">
-
<defaultValueExpression><![CDATA[$P{M_PRODUCT_CATEGORY_ID}.equals("") ? " " : "
AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = '" + $P{M_PRODUCT_CATEGORY_ID} +
"'"]]></defaultValueExpression>
+
<defaultValueExpression><![CDATA[$P{M_PRODUCT_CATEGORY_ID}.equals("") ? " " : "
AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID IN " + $P{M_PRODUCT_CATEGORY_ID}
]]></defaultValueExpression>
</parameter>
<parameter name="M_PRODUCT_ID" class="java.lang.String"/>
<parameter name="aux_product" class="java.lang.String"
isForPrompting="false">
diff -r eed99aa47f9b -r 7d1b4e0de850
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
---
a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
Fri Jul 06 12:59:08 2018 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
Tue Jun 26 12:18:58 2018 -0400
@@ -633,7 +633,8 @@
+
ReportInvoiceCustomerDimensionalAnalysesJRData.selectBpgroup(readOnlyCP,
strPartnerGroup);
}
-
+ String treeTable = Tree.getTreeTable(readOnlyCP, vars.getClient(), "209");
+ String productCategoryGroup = Tree.getMembers(readOnlyCP, treeTable,
strProductCategory);
if (StringUtils.isNotEmpty(strProductCategory)) {
strTitle = strTitle
+ ", "
@@ -641,6 +642,7 @@
+ " "
+
ReportInvoiceCustomerDimensionalAnalysesJRData.selectProductCategory(readOnlyCP,
strProductCategory);
+ productCategoryGroup = "(" + productCategoryGroup + ")";
}
if (StringUtils.isNotEmpty(strcProjectId)) {
strTitle = strTitle + ", " + Utility.messageBD(readOnlyCP, "Project",
vars.getLanguage())
@@ -840,7 +842,7 @@
TreeData.getTreeOrg(readOnlyCP, vars.getClient()),
localStrOrg), Utility
.getContext(readOnlyCP, vars, "#User_Client",
"ReportInvoiceCustomerDimensionalAnalysesJR"),
strPartnerGroup,
- strcBpartnerId, strProductCategory, strmProductId,
strsalesrepId,
+ strcBpartnerId, productCategoryGroup, strmProductId,
strsalesrepId,
strPartnerSalesrepId, strcProjectId, strProducttype,
strcDocTypeId, StringUtils
.equals(strVoid, "Y") ? "" : "VO", strDateFrom,
DateTimeData.nDaysAfter(
readOnlyCP, strDateTo, "1"), strDateFromRef,
DateTimeData.nDaysAfter(
@@ -852,7 +854,7 @@
TreeData.getTreeOrg(readOnlyCP, vars.getClient()),
localStrOrg), Utility
.getContext(readOnlyCP, vars, "#User_Client",
"ReportInvoiceCustomerDimensionalAnalysesJR"),
strPartnerGroup,
- strcBpartnerId, strProductCategory, strmProductId,
strsalesrepId,
+ strcBpartnerId, productCategoryGroup, strmProductId,
strsalesrepId,
strPartnerSalesrepId, strcProjectId, strProducttype,
strcDocTypeId, StringUtils
.equals(strVoid, "Y") ? "" : "VO", strDateFrom,
DateTimeData.nDaysAfter(
readOnlyCP, strDateTo, "1")));
@@ -879,7 +881,7 @@
.getContext(readOnlyCP, vars, "#User_Client",
"ReportInvoiceCustomerDimensionalAnalysesJR"),
strDateFrom, DateTimeData
.nDaysAfter(readOnlyCP, strDateTo, "1"), strPartnerGroup,
strcBpartnerId,
- strProductCategory, strmProductId, strsalesrepId,
strPartnerSalesrepId,
+ productCategoryGroup, strmProductId, strsalesrepId,
strPartnerSalesrepId,
strcProjectId, strProducttype, strcDocTypeId,
StringUtils.equals(strVoid, "Y") ? ""
: "VO");
@@ -900,7 +902,7 @@
.getContext(readOnlyCP, vars, "#User_Client",
"ReportInvoiceCustomerDimensionalAnalysesJR"),
strDateFrom,
DateTimeData.nDaysAfter(readOnlyCP, strDateTo, "1"),
strPartnerGroup,
- strcBpartnerId, strProductCategory, strmProductId,
strsalesrepId,
+ strcBpartnerId, productCategoryGroup, strmProductId,
strsalesrepId,
strPartnerSalesrepId, strcProjectId, strProducttype,
strcDocTypeId, StringUtils
.equals(strVoid, "Y") ? "" : "VO", strDateFromRef,
DateTimeData.nDaysAfter(
readOnlyCP, strDateToRef, "1"), localStrDateFromRef2,
DateTimeData
@@ -916,7 +918,7 @@
.getContext(readOnlyCP, vars, "#User_Client",
"ReportInvoiceCustomerDimensionalAnalysesJR"),
strDateFrom,
DateTimeData.nDaysAfter(readOnlyCP, strDateTo, "1"),
strPartnerGroup,
- strcBpartnerId, strProductCategory, strmProductId,
strsalesrepId,
+ strcBpartnerId, productCategoryGroup, strmProductId,
strsalesrepId,
strPartnerSalesrepId, strcProjectId, strProducttype,
strcDocTypeId, StringUtils
.equals(strVoid, "Y") ? "" : "VO", strDateFromRef,
DateTimeData.nDaysAfter(
readOnlyCP, strDateToRef, "1"), localStrDateFromRef2,
DateTimeData
@@ -932,7 +934,7 @@
.getContext(readOnlyCP, vars, "#User_Client",
"ReportInvoiceCustomerDimensionalAnalysesJR"),
strDateFrom, DateTimeData
.nDaysAfter(readOnlyCP, strDateTo, "1"),
strPartnerGroup, strcBpartnerId,
- strProductCategory, strmProductId, strsalesrepId,
strPartnerSalesrepId,
+ productCategoryGroup, strmProductId, strsalesrepId,
strPartnerSalesrepId,
strcProjectId, strProducttype, strcDocTypeId,
StringUtils.equals(strVoid, "Y") ? "" : "VO",
strDateFromRef, DateTimeData
.nDaysAfter(readOnlyCP, strDateToRef, "1"), strOrderby);
@@ -951,7 +953,7 @@
.getContext(readOnlyCP, vars, "#User_Client",
"ReportInvoiceCustomerDimensionalAnalysesJR"),
strDateFrom, DateTimeData
.nDaysAfter(readOnlyCP, strDateTo, "1"), strPartnerGroup,
strcBpartnerId,
- strProductCategory, strmProductId, strsalesrepId,
strPartnerSalesrepId,
+ productCategoryGroup, strmProductId, strsalesrepId,
strPartnerSalesrepId,
strcProjectId, strProducttype, strcDocTypeId,
StringUtils.equals(strVoid, "Y") ? ""
: "VO", strOrderby);
} catch (ServletException ex) {
@@ -1022,7 +1024,7 @@
parameters.put("DateTo", DateTimeData.nDaysAfter(readOnlyCP,
strDateTo, "1"));
parameters.put("C_BP_GROUP_ID", strPartnerGroup);
parameters.put("C_BPARTNER_ID", strcBpartnerId);
- parameters.put("M_PRODUCT_CATEGORY_ID", strProductCategory);
+ parameters.put("M_PRODUCT_CATEGORY_ID", productCategoryGroup);
parameters.put("M_PRODUCT_ID", strmProductId);
parameters.put("SALESREP_ID", strsalesrepId);
parameters.put("PARTNER_SALESREP_ID", strPartnerSalesrepId);
@@ -1086,7 +1088,7 @@
parameters.put("DateTo", DateTimeData.nDaysAfter(readOnlyCP,
strDateTo, "1"));
parameters.put("C_BP_GROUP_ID", strPartnerGroup);
parameters.put("C_BPARTNER_ID", strcBpartnerId);
- parameters.put("M_PRODUCT_CATEGORY_ID", strProductCategory);
+ parameters.put("M_PRODUCT_CATEGORY_ID", productCategoryGroup);
parameters.put("M_PRODUCT_ID", strmProductId);
parameters.put("SALESREP_ID", strsalesrepId);
parameters.put("PARTNER_SALESREP_ID", strPartnerSalesrepId);
diff -r eed99aa47f9b -r 7d1b4e0de850
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql
---
a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql
Fri Jul 06 12:59:08 2018 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql
Tue Jun 26 12:18:58 2018 -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) 2001-2017 Openbravo SLU
+ * All portions are Copyright (C) 2001-2018 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -160,7 +160,7 @@
<Parameter name="dateTo" optional="true" after="AND 1=1"><![CDATA[AND
C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
<Parameter name="cBpartnerGroupId" optional="true" after="AND
1=1"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
<Parameter name="cBpartnerId" optional="true" type="argument" after="AND
1=1"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
- <Parameter name="mProductCategoryId" optional="true" after="AND
1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
+ <Parameter name="mProductCategoryId" optional="true" type="argument"
after="AND 1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
IN]]></Parameter>
<Parameter name="mProductId" optional="true" type="argument" after="AND
1=1"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
<Parameter name="salesrepId" optional="true" after="AND 1=1"><![CDATA[AND
C_INVOICE.SALESREP_ID = ?]]></Parameter>
<Parameter name="partnerSalesrepId" optional="true" after="AND
1=1"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
@@ -185,7 +185,7 @@
<Parameter name="dateToRef" optional="true" after="AND 2=2"><![CDATA[AND
C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
<Parameter name="cBpartnerGroupId" optional="true" after="AND
2=2"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
<Parameter name="cBpartnerId" optional="true" type="argument" after="AND
2=2"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
- <Parameter name="mProductCategoryId" optional="true" after="AND
2=2"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
+ <Parameter name="mProductCategoryId" optional="true" type="argument"
after="AND 2=2"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
IN]]></Parameter>
<Parameter name="mProductId" optional="true" type="argument" after="AND
2=2"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
<Parameter name="salesrepId" optional="true" after="AND 2=2"><![CDATA[AND
C_INVOICE.SALESREP_ID = ?]]></Parameter>
<Parameter name="partnerSalesrepId" optional="true" after="AND
2=2"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
@@ -394,7 +394,7 @@
<Parameter name="dateTo" optional="true" after="AND 1=1"><![CDATA[AND
C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
<Parameter name="cBpartnerGroupId" optional="true" after="AND
1=1"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
<Parameter name="cBpartnerId" optional="true" type="argument" after="AND
1=1"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
- <Parameter name="mProductCategoryId" optional="true" after="AND
1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
+ <Parameter name="mProductCategoryId" optional="true" type="argument"
after="AND 1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
IN]]></Parameter>
<Parameter name="mProductId" optional="true" type="argument" after="AND
1=1"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
<Parameter name="salesrepId" optional="true" after="AND 1=1"><![CDATA[AND
C_INVOICE.SALESREP_ID = ?]]></Parameter>
<Parameter name="partnerSalesrepId" optional="true" after="AND
1=1"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
@@ -419,7 +419,7 @@
<Parameter name="dateToRef" optional="true" after="AND 2=2"><![CDATA[AND
C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
<Parameter name="cBpartnerGroupId" optional="true" after="AND
2=2"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
<Parameter name="cBpartnerId" optional="true" type="argument" after="AND
2=2"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
- <Parameter name="mProductCategoryId" optional="true" after="AND
2=2"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
+ <Parameter name="mProductCategoryId" optional="true" type="argument"
after="AND 2=2"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
IN]]></Parameter>
<Parameter name="mProductId" optional="true" type="argument" after="AND
2=2"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
<Parameter name="salesrepId" optional="true" after="AND 2=2"><![CDATA[AND
C_INVOICE.SALESREP_ID = ?]]></Parameter>
<Parameter name="partnerSalesrepId" optional="true" after="AND
2=2"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
@@ -444,7 +444,7 @@
<Parameter name="dateToRef2" optional="true" after="AND 4=4"><![CDATA[AND
C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
<Parameter name="cBpartnerGroupId" optional="true" after="AND
4=4"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
<Parameter name="cBpartnerId" optional="true" type="argument" after="AND
4=4"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
- <Parameter name="mProductCategoryId" optional="true" after="AND
4=4"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
+ <Parameter name="mProductCategoryId" optional="true" type="argument"
after="AND 4=4"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
IN]]></Parameter>
<Parameter name="mProductId" optional="true" type="argument" after="AND
4=4"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
<Parameter name="salesrepId" optional="true" after="AND 4=4"><![CDATA[AND
C_INVOICE.SALESREP_ID = ?]]></Parameter>
<Parameter name="partnerSalesrepId" optional="true" after="AND
4=4"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
@@ -719,7 +719,7 @@
<Parameter name="dateTo" optional="true" after="AND 1=1"><![CDATA[AND
C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
<Parameter name="cBpartnerGroupId" optional="true" after="AND
1=1"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
<Parameter name="cBpartnerId" optional="true" type="argument" after="AND
1=1"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
- <Parameter name="mProductCategoryId" optional="true" after="AND
1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
+ <Parameter name="mProductCategoryId" optional="true" type="argument"
after="AND 1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
IN]]></Parameter>
<Parameter name="mProductId" optional="true" type="argument" after="AND
1=1"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
<Parameter name="salesrepId" optional="true" after="AND 1=1"><![CDATA[AND
C_INVOICE.SALESREP_ID = ?]]></Parameter>
<Parameter name="partnerSalesrepId" optional="true" after="AND
1=1"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
@@ -744,7 +744,7 @@
<Parameter name="dateToRef" optional="true" after="AND 2=2"><![CDATA[AND
C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
<Parameter name="cBpartnerGroupId" optional="true" after="AND
2=2"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
<Parameter name="cBpartnerId" optional="true" type="argument" after="AND
2=2"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
- <Parameter name="mProductCategoryId" optional="true" after="AND
2=2"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
+ <Parameter name="mProductCategoryId" optional="true" type="argument"
after="AND 2=2"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
IN]]></Parameter>
<Parameter name="mProductId" optional="true" type="argument" after="AND
2=2"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
<Parameter name="salesrepId" optional="true" after="AND 2=2"><![CDATA[AND
C_INVOICE.SALESREP_ID = ?]]></Parameter>
<Parameter name="partnerSalesrepId" optional="true" after="AND
2=2"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
@@ -769,7 +769,7 @@
<Parameter name="dateToRef2" optional="true" after="AND 4=4"><![CDATA[AND
C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
<Parameter name="cBpartnerGroupId" optional="true" after="AND
4=4"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
<Parameter name="cBpartnerId" optional="true" type="argument" after="AND
4=4"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
- <Parameter name="mProductCategoryId" optional="true" after="AND
4=4"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
+ <Parameter name="mProductCategoryId" optional="true" type="argument"
after="AND 4=4"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
IN]]></Parameter>
<Parameter name="mProductId" optional="true" type="argument" after="AND
4=4"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
<Parameter name="salesrepId" optional="true" after="AND 4=4"><![CDATA[AND
C_INVOICE.SALESREP_ID = ?]]></Parameter>
<Parameter name="partnerSalesrepId" optional="true" after="AND
4=4"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
@@ -794,7 +794,7 @@
<Parameter name="dateToRef3" optional="true" after="AND 6=6"><![CDATA[AND
C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
<Parameter name="cBpartnerGroupId" optional="true" after="AND
6=6"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
<Parameter name="cBpartnerId" optional="true" type="argument" after="AND
6=6"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
- <Parameter name="mProductCategoryId" optional="true" after="AND
6=6"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
+ <Parameter name="mProductCategoryId" optional="true" type="argument"
after="AND 6=6"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
IN]]></Parameter>
<Parameter name="mProductId" optional="true" type="argument" after="AND
6=6"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
<Parameter name="salesrepId" optional="true" after="AND 6=6"><![CDATA[AND
C_INVOICE.SALESREP_ID = ?]]></Parameter>
<Parameter name="partnerSalesrepId" optional="true" after="AND
6=6"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
@@ -835,7 +835,7 @@
<Parameter name="adUserClient" type="replace" optional="true" after="AND
C_INVOICE.AD_CLIENT_ID IN (" text="'8'"/>
<Parameter name="cBpartnerGroupId" optional="true" after="AND
1=1"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
<Parameter name="cBpartnerId" optional="true" type="argument" after="AND
1=1"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
- <Parameter name="mProductCategoryId" optional="true" after="AND
1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
+ <Parameter name="mProductCategoryId" optional="true" type="argument"
after="AND 1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
IN]]></Parameter>
<Parameter name="mProductId" optional="true" type="argument" after="AND
1=1"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
<Parameter name="salesrepId" optional="true" after="AND 1=1"><![CDATA[AND
C_INVOICE.SALESREP_ID = ?]]></Parameter>
<Parameter name="partnerSalesrepId" optional="true" after="AND
1=1"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
@@ -940,7 +940,7 @@
<Parameter name="dateTo" optional="true" after="AND 1=1"><![CDATA[AND
C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
<Parameter name="cBpartnerGroupId" optional="true" after="AND
1=1"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
<Parameter name="cBpartnerId" optional="true" type="argument" after="AND
1=1"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
- <Parameter name="mProductCategoryId" optional="true" after="AND
1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
+ <Parameter name="mProductCategoryId" optional="true" type="argument"
after="AND 1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
IN]]></Parameter>
<Parameter name="mProductId" optional="true" type="argument" after="AND
1=1"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
<Parameter name="salesrepId" optional="true" after="AND 1=1"><![CDATA[AND
C_INVOICE.SALESREP_ID = ?]]></Parameter>
<Parameter name="partnerSalesrepId" optional="true" after="AND
1=1"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
@@ -981,7 +981,7 @@
<Parameter name="adUserClient" type="replace" optional="true" after="AND
C_INVOICE.AD_CLIENT_ID IN (" text="'8'"/>
<Parameter name="cBpartnerGroupId" optional="true" after="AND
1=1"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
<Parameter name="cBpartnerId" optional="true" type="argument" after="AND
1=1"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
- <Parameter name="mProductCategoryId" optional="true" after="AND
1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
+ <Parameter name="mProductCategoryId" optional="true" type="argument"
after="AND 1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
IN]]></Parameter>
<Parameter name="mProductId" optional="true" type="argument" after="AND
1=1"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
<Parameter name="salesrepId" optional="true" after="AND 1=1"><![CDATA[AND
C_INVOICE.SALESREP_ID = ?]]></Parameter>
<Parameter name="partnerSalesrepId" optional="true" after="AND
1=1"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
@@ -1181,7 +1181,7 @@
<Parameter name="dateTo" optional="true" after="AND 1=1"><![CDATA[AND
C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
<Parameter name="cBpartnerGroupId" optional="true" after="AND
1=1"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
<Parameter name="cBpartnerId" optional="true" type="argument" after="AND
1=1"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
- <Parameter name="mProductCategoryId" optional="true" after="AND
1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
+ <Parameter name="mProductCategoryId" optional="true" type="argument"
after="AND 1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
IN]]></Parameter>
<Parameter name="mProductId" optional="true" type="argument" after="AND
1=1"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
<Parameter name="salesrepId" optional="true" after="AND 1=1"><![CDATA[AND
C_INVOICE.SALESREP_ID = ?]]></Parameter>
<Parameter name="partnerSalesrepId" optional="true" after="AND
1=1"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
diff -r eed99aa47f9b -r 7d1b4e0de850
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesMultiComparativeExtendedJR.jrxml
---
a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesMultiComparativeExtendedJR.jrxml
Fri Jul 06 12:59:08 2018 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesMultiComparativeExtendedJR.jrxml
Tue Jun 26 12:18:58 2018 -0400
@@ -201,7 +201,7 @@
</parameter>
<parameter name="M_PRODUCT_CATEGORY_ID" class="java.lang.String"/>
<parameter name="aux_productcategory" class="java.lang.String"
isForPrompting="false">
-
<defaultValueExpression><![CDATA[$P{M_PRODUCT_CATEGORY_ID}.equals("") ? " " : "
AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = '" + $P{M_PRODUCT_CATEGORY_ID} +
"'"]]></defaultValueExpression>
+
<defaultValueExpression><![CDATA[$P{M_PRODUCT_CATEGORY_ID}.equals("") ? " " : "
AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID IN " +
$P{M_PRODUCT_CATEGORY_ID}]]></defaultValueExpression>
</parameter>
<parameter name="M_PRODUCT_ID" class="java.lang.String"/>
<parameter name="aux_product" class="java.lang.String"
isForPrompting="false">
diff -r eed99aa47f9b -r 7d1b4e0de850
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesMultiComparativeJR.jrxml
---
a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesMultiComparativeJR.jrxml
Fri Jul 06 12:59:08 2018 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesMultiComparativeJR.jrxml
Tue Jun 26 12:18:58 2018 -0400
@@ -201,7 +201,7 @@
</parameter>
<parameter name="M_PRODUCT_CATEGORY_ID" class="java.lang.String"/>
<parameter name="aux_productcategory" class="java.lang.String"
isForPrompting="false">
-
<defaultValueExpression><![CDATA[$P{M_PRODUCT_CATEGORY_ID}.equals("") ? " " : "
AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = '" + $P{M_PRODUCT_CATEGORY_ID} +
"'"]]></defaultValueExpression>
+
<defaultValueExpression><![CDATA[$P{M_PRODUCT_CATEGORY_ID}.equals("") ? " " : "
AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID IN " +
$P{M_PRODUCT_CATEGORY_ID}]]></defaultValueExpression>
</parameter>
<parameter name="M_PRODUCT_ID" class="java.lang.String"/>
<parameter name="aux_product" class="java.lang.String"
isForPrompting="false">
diff -r eed99aa47f9b -r 7d1b4e0de850
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesNoComparativeJR.jrxml
---
a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesNoComparativeJR.jrxml
Fri Jul 06 12:59:08 2018 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesNoComparativeJR.jrxml
Tue Jun 26 12:18:58 2018 -0400
@@ -201,7 +201,7 @@
</parameter>
<parameter name="M_PRODUCT_CATEGORY_ID" class="java.lang.String"/>
<parameter name="aux_productcategory" class="java.lang.String"
isForPrompting="false">
-
<defaultValueExpression><![CDATA[$P{M_PRODUCT_CATEGORY_ID}.equals("") ? " " : "
AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = '" + $P{M_PRODUCT_CATEGORY_ID} +
"'"]]></defaultValueExpression>
+
<defaultValueExpression><![CDATA[$P{M_PRODUCT_CATEGORY_ID}.equals("") ? " " : "
AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID IN " +
$P{M_PRODUCT_CATEGORY_ID}]]></defaultValueExpression>
</parameter>
<parameter name="M_PRODUCT_ID" class="java.lang.String"/>
<parameter name="aux_product" class="java.lang.String"
isForPrompting="false">
diff -r eed99aa47f9b -r 7d1b4e0de850
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml
---
a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml
Fri Jul 06 12:59:08 2018 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml
Tue Jun 26 12:18:58 2018 -0400
@@ -106,7 +106,7 @@
</parameter>
<parameter name="M_PRODUCT_CATEGORY_ID" class="java.lang.String"/>
<parameter name="aux_productcategory" class="java.lang.String"
isForPrompting="false">
-
<defaultValueExpression><![CDATA[$P{M_PRODUCT_CATEGORY_ID}.equals("") ? " " : "
AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = '" + $P{M_PRODUCT_CATEGORY_ID} +
"'"]]></defaultValueExpression>
+
<defaultValueExpression><![CDATA[$P{M_PRODUCT_CATEGORY_ID}.equals("") ? " " : "
AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID IN" +
$P{M_PRODUCT_CATEGORY_ID}]]></defaultValueExpression>
</parameter>
<parameter name="M_PRODUCT_ID" class="java.lang.String"/>
<parameter name="aux_product" class="java.lang.String"
isForPrompting="false">
diff -r eed99aa47f9b -r 7d1b4e0de850
src/org/openbravo/erpCommon/businessUtility/Tree.java
--- a/src/org/openbravo/erpCommon/businessUtility/Tree.java Fri Jul 06
12:59:08 2018 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/Tree.java Tue Jun 26
12:18:58 2018 -0400
@@ -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-2010 Openbravo SLU
+ * All portions are Copyright (C) 2001-2018 Openbravo SLU
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
