svn commit: r1533414 - in /ofbiz/branches/release12.04: ./ applications/order/widget/ordermgr/ReportScreens.xml

Author: jleroux
Date: Fri Oct 18 12:13:00 2013
New Revision: 1533414

URL: http://svn.apache.org/r1533414
Log:
"Applied fix from trunk for revision: 1512573"
------------------------------------------------------------------------
r1512573 | jleroux | 2013-08-10 09:46:55 +0200 (sam. 10 août 2013) | 3 lignes

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/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/order/widget/ordermgr/ReportScreens.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1512573

Modified: ofbiz/branches/release12.04/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/widget/ordermgr/ReportScreens.xml?rev=1533414&r1=1533413&r2=1533414&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/branches/release12.04/applications/order/widget/ordermgr/ReportScreens.xml Fri Oct 18 12:13:00 2013
@@ -163,8 +163,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"/>
@@ -201,8 +201,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"/>
@@ -245,8 +245,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"/>
@@ -313,8 +313,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"/>