svn commit: r1749101 - /ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml

[diveshdutta]

Author: diveshdutta
Date: Sat Jun 18 22:28:58 2016
New Revision: 1749101

URL: http://svn.apache.org/viewvc?rev=1749101&view=rev
Log:
[OFBIZ-7389] After reviewing again the patch which I Committed, I found few more code improvements and one bug. produtStoreId was set in partyId List, toPartyId should be set instead. Also improved the name of Lists, changed from singular to plural. No functional changes, only code improvements.

Modified:
    ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.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=1749101&r1=1749100&r2=1749101&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Sat Jun 18 22:28:58 2016
@@ -261,22 +261,21 @@ under the License.
         <section>
             <actions>
                 <set field="titleProperty" value="OrderReportPurchasesByOrganization"/>
-                <set field="toPartyId" from-field="parameters.toPartyId"/>
                 <set field="fromPartyId" from-field="parameters.fromPartyId"/>
+                <set field="partyIds" from-field="parameters.toPartyId" type="List"/>
+                <set field="orderStatusIds" from-field="parameters.orderStatusId" type="List"/>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="partyId" from-field="parameters.productStoreId" type="List"/>
-                <set field="orderStatusId" from-field="parameters.orderStatusId" type="List"/>
                 <entity-condition entity-name="OrderReportPurchasesGroupByProduct" list="productReportList">
                     <condition-list combine="and">
-                        <condition-expr field-name="toPartyId" operator="in" from-field="partyId" ignore-if-empty="true"/>
+                        <condition-expr field-name="toPartyId" operator="in" from-field="partyIds" ignore-if-empty="true"/>
                         <condition-expr field-name="toRoleTypeId" operator="equals" value="BILL_TO_CUSTOMER"/>
                         <condition-expr field-name="fromPartyId" operator="equals" from-field="parameters.fromPartyId" ignore-if-empty="true"/>
                         <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="in" from-field="orderStatusId" ignore-if-empty="true"/>
+                        <condition-expr field-name="orderStatusId" operator="in" from-field="orderStatusIds" ignore-if-empty="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>