Author: jleroux
Date: Sat Aug 10 07:46:55 2013
New Revision: 1512573
URL: http://svn.apache.org/r1512573
Log:
Fixes https://issues.apache.org/jira/browse/OFBIZ-5272 "Sales by Store report
generates an error"
jleroux: I vaguely remember a change related to ignore-if-null and
ignore-if-empty. Anyway replacing ignore-if-null by ignore-if-empty does the
trick, which makes sense
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml
Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=1512573&r1=1512572&r2=1512573&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Sat Aug 10
07:46:55 2013
@@ -123,8 +123,8 @@ under the License.
<condition-expr field-name="originFacilityId"
operator="equals" from-field="parameters.originFacilityId"
ignore-if-empty="true"/>
<condition-expr field-name="terminalId"
operator="equals" from-field="parameters.terminalId" ignore-if-empty="true"/>
<condition-expr field-name="statusId"
operator="equals" from-field="parameters.statusId" ignore-if-empty="true"/>
- <condition-expr field-name="orderDate"
operator="greater-equals" from-field="parameters.fromOrderDate"
ignore-if-null="true"/>
- <condition-expr field-name="orderDate" operator="less"
from-field="parameters.thruOrderDate" ignore-if-null="true"/>
+ <condition-expr field-name="orderDate"
operator="greater-equals" from-field="parameters.fromOrderDate"
ignore-if-empty="true"/>
+ <condition-expr field-name="orderDate" operator="less"
from-field="parameters.thruOrderDate" ignore-if-empty="true"/>
</condition-list>
<select-field field-name="productStoreId"/>
<select-field field-name="originFacilityId"/>
@@ -161,8 +161,8 @@ under the License.
<condition-expr field-name="originFacilityId"
operator="equals" from-field="parameters.originFacilityId"
ignore-if-empty="true"/>
<condition-expr field-name="terminalId"
operator="equals" from-field="parameters.terminalId" ignore-if-empty="true"/>
<condition-expr field-name="statusId"
operator="equals" from-field="parameters.statusId" ignore-if-empty="true"/>
- <condition-expr field-name="orderDate"
operator="greater-equals" from-field="parameters.fromOrderDate"
ignore-if-null="true"/>
- <condition-expr field-name="orderDate" operator="less"
from-field="parameters.thruOrderDate" ignore-if-null="true"/>
+ <condition-expr field-name="orderDate"
operator="greater-equals" from-field="parameters.fromOrderDate"
ignore-if-empty="true"/>
+ <condition-expr field-name="orderDate" operator="less"
from-field="parameters.thruOrderDate" ignore-if-empty="true"/>
</condition-list>
<select-field field-name="productStoreId"/>
<select-field field-name="originFacilityId"/>
@@ -205,8 +205,8 @@ under the License.
<condition-expr field-name="orderTypeId"
operator="equals" value="SALES_ORDER"/>
<!-- possible bug: using
from-field="parameters.orderStatusId" did not work for the following line -->
<condition-expr field-name="orderStatusId"
operator="equals" value="${parameters.orderStatusId}" ignore-if-empty="true"/>
- <condition-expr field-name="orderDate"
operator="greater-equals" from-field="parameters.fromOrderDate"
ignore-if-null="true"/>
- <condition-expr field-name="orderDate" operator="less"
from-field="parameters.thruOrderDate" ignore-if-null="true"/>
+ <condition-expr field-name="orderDate"
operator="greater-equals" from-field="parameters.fromOrderDate"
ignore-if-empty="true"/>
+ <condition-expr field-name="orderDate" operator="less"
from-field="parameters.thruOrderDate" ignore-if-empty="true"/>
</condition-list>
<!-- note that we need to explicitly identify the fields
to select, otherwise the query will include fields that can't logically be
grouped -->
<select-field field-name="productStoreId"/>
@@ -273,8 +273,8 @@ under the License.
<condition-expr field-name="fromRoleTypeId"
operator="equals" value="BILL_FROM_VENDOR"/>
<condition-expr field-name="orderTypeId"
operator="equals" value="PURCHASE_ORDER"/>
<condition-expr field-name="orderStatusId"
operator="equals" value="${parameters.orderStatusId}" ignore-if-empty="true"/>
- <condition-expr field-name="orderDate"
operator="greater-equals" from-field="parameters.fromOrderDate"
ignore-if-null="true"/>
- <condition-expr field-name="orderDate" operator="less"
from-field="parameters.thruOrderDate" ignore-if-null="true"/>
+ <condition-expr field-name="orderDate"
operator="greater-equals" from-field="parameters.fromOrderDate"
ignore-if-empty="true"/>
+ <condition-expr field-name="orderDate" operator="less"
from-field="parameters.thruOrderDate" ignore-if-empty="true"/>
</condition-list>
<!-- note that we need to explicitly identify the fields
to select, otherwise the query will include fields that can't logically be
grouped -->
<select-field field-name="productId"/>
Modified: ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml?rev=1512573&r1=1512572&r2=1512573&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml Sat Aug 10
07:46:55 2013
@@ -120,8 +120,8 @@ under the License.
<actions>
<entity-condition entity-name="SalesOrderItemStarSchema"
list="SalesReportList">
<condition-list combine="and">
- <condition-expr field-name="orderDate"
operator="greater-equals" from-field="parameters.fromOrderDate"
ignore-if-null="true"/>
- <condition-expr field-name="orderDate" operator="less"
from-field="parameters.thruOrderDate" ignore-if-null="true"/>
+ <condition-expr field-name="orderDate"
operator="greater-equals" from-field="parameters.fromOrderDate"
ignore-if-empty="true"/>
+ <condition-expr field-name="orderDate" operator="less"
from-field="parameters.thruOrderDate" ignore-if-empty="true"/>
</condition-list>
</entity-condition>
</actions>
