svn commit: r1749095 - in /ofbiz/trunk/applications/order: template/reports/PurchasesByOrganizationReport.fo.ftl widget/ordermgr/ReportForms.xml widget/ordermgr/ReportScreens.xml

[diveshdutta]

Author: diveshdutta
Date: Sat Jun 18 21:26:55 2016
New Revision: 1749095

URL: http://svn.apache.org/viewvc?rev=1749095&view=rev
Log:
[OFBIZ-7389] Allowing user to select multiple options in -Purchases by Organization - report from basic search criterias while generating report

Modified:
    ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
    ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
    ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml

Modified: ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl?rev=1749095&r1=1749094&r2=1749095&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl (original)
+++ ofbiz/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl Sat Jun 18 21:26:55 2016
@@ -41,7 +41,14 @@ under the License.
             <#if !showToParty><fo:block font-size="10pt">${uiLabelMap.CommonFor}: ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, toPartyId, false)}</fo:block></#if>
             <#if !showFromParty><fo:block font-size="10pt">${uiLabelMap.CommonFrom}: ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, fromPartyId, false)}</fo:block></#if>
             <fo:block font-size="10pt">${uiLabelMap.FormFieldTitle_orderStatusId}:
-                <#if parameters.orderStatusId?has_content>${parameters.orderStatusId}<#else>${uiLabelMap.CommonAny}</#if>
+                <#if parameters.orderStatusId?has_content>
+                  <#list parameters.orderStatusId as orderStatusId>
+                    <#assign statusItem = delegator.findOne("StatusItem", {"statusId" : orderStatusId}, false)!/>
+                    ${statusItem.description}
+                  </#list>
+                <#else>
+                  ${uiLabelMap.CommonAny}
+                </#if>
             </fo:block>
             <#if parameters.fromOrderDate?has_content><fo:block font-size="10pt">${uiLabelMap.CommonFromDate}: ${parameters.fromOrderDate} (${uiLabelMap.OrderDate} &gt;= ${uiLabelMap.CommonFrom})</fo:block></#if>
             <#if parameters.thruOrderDate?has_content><fo:block font-size="10pt">${uiLabelMap.CommonThruDate}: ${parameters.thruOrderDate} (${uiLabelMap.OrderDate} &lt; ${uiLabelMap.CommonFrom})</fo:block></#if>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml?rev=1749095&r1=1749094&r2=1749095&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml Sat Jun 18 21:26:55 2016
@@ -177,19 +177,18 @@ under the License.
             </drop-down>
         </field>
         <field name="toPartyId" title="${uiLabelMap.AccountingToPartyId}">
-            <drop-down allow-empty="false">
-                <entity-options entity-name="PartyRoleAndPartyDetail" description="${groupName} ${firstName} ${lastName} [${partyId}]" key-field-name="partyId">
-                    <entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
+            <check allow-checked="false">
+                <entity-options entity-name="PartyAcctgPrefAndGroup" description="${groupName} ${firstName} ${lastName} [${partyId}]" key-field-name="partyId">
                 </entity-options>
-            </drop-down>
+            </check>
         </field>
         <field name="orderStatusId">
-            <drop-down allow-empty="false">
+            <check allow-checked="false">
                 <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
                 <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
                 </entity-options>
-            </drop-down>
+            </check>
         </field>
         <field name="fromOrderDate" title="${uiLabelMap.CommonFromDate}"><date-time type="timestamp"/></field>
         <field name="thruOrderDate" title="${uiLabelMap.CommonThruDate}"><date-time type="timestamp"/></field>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=1749095&r1=1749094&r2=1749095&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Sat Jun 18 21:26:55 2016
@@ -267,14 +267,16 @@ under the License.
                 <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="equals" from-field="parameters.toPartyId" ignore-if-empty="true"/>
+                        <condition-expr field-name="toPartyId" operator="in" from-field="partyId" 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="equals" value="${parameters.orderStatusId}" ignore-if-empty="true"/>
+                        <condition-expr field-name="orderStatusId" operator="in" from-field="orderStatusId" 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>