svn commit: r948020 - in /ofbiz/trunk/applications/order: entitydef/entitymodel_view.xml widget/ordermgr/FieldLookupForms.xml

Author: jleroux
Date: Tue May 25 12:17:09 2010
New Revision: 948020

URL: http://svn.apache.org/viewvc?rev=948020&view=rev
Log:
A patch from Sam Hamilton "Extending the search when receiving a Purchase Order" (https://issues.apache.org/jira/browse/OFBIZ-3777) - OFBIZ-3777

This patch is to add a couple of extra ways to look for a purchase order when receiving it into a facility

Modified:
    ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
    ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml

Modified: ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml?rev=948020&r1=948019&r2=948020&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml Tue May 25 12:17:09 2010
@@ -1108,6 +1108,40 @@ under the License.
         <key-map field-name="orderId"/>
       </view-link>
     </view-entity>
+    
+    <view-entity entity-name="OrderHeaderAndShipGroupsByProduct"
+            package-name="org.ofbiz.order.order"
+            never-cache="true"
+            title="Order Header And Ship Groups By Product">
+      <member-entity entity-alias="OISG" entity-name="OrderItemShipGroup"/>
+      <member-entity entity-alias="PA" entity-name="PostalAddress"/>
+      <member-entity entity-alias="OH" entity-name="OrderHeader"/>
+      <member-entity entity-alias="ORR" entity-name="OrderRole"/>
+      <member-entity entity-alias="OI" entity-name="OrderItem"/>
+      <member-entity entity-alias="PR" entity-name="Product"/>
+      <alias-all entity-alias="OISG"/>
+      <alias-all entity-alias="PA"/>
+      <alias-all entity-alias="ORR"/>
+      <alias-all entity-alias="OH"/>
+      <alias name="productId" field="productId" entity-alias="PR"/>
+      <alias name="brandName" field="brandName" entity-alias="PR"/>
+      <alias name="internalName" field="internalName" entity-alias="PR"/>
+      <view-link entity-alias="OH" rel-entity-alias="OISG">
+        <key-map field-name="orderId"/>
+      </view-link>
+      <view-link entity-alias="OISG" rel-entity-alias="PA">
+        <key-map field-name="contactMechId"/>
+      </view-link>
+      <view-link entity-alias="OH" rel-entity-alias="ORR">
+        <key-map field-name="orderId"/>
+      </view-link>
+      <view-link entity-alias="OH" rel-entity-alias="OI">
+        <key-map field-name="orderId"/>
+      </view-link>
+      <view-link entity-alias="OI" rel-entity-alias="PR">
+        <key-map field-name="productId"/>
+      </view-link>
+    </view-entity>
 
     <view-entity entity-name="OrderReportSalesGroupByProduct"
             package-name="org.ofbiz.order.order"

Modified: ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml?rev=948020&r1=948019&r2=948020&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml Tue May 25 12:17:09 2010
@@ -122,7 +122,7 @@ under the License.
         <actions>
             <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
-                <field-map field-name="entityName" value="OrderHeaderAndShipGroups"/>
+                <field-map field-name="entityName" value="OrderHeaderAndShipGroupsByProduct"/>
                 <field-map field-name="viewIndex" from-field="viewIndex"/>
                 <field-map field-name="viewSize" from-field="viewSize"/>
             </service>
@@ -142,6 +142,9 @@ under the License.
         <field name="countryGeoId"><display/></field>
         <field name="stateProvinceGeoId"><display/></field>
         <field name="grandTotal"><display/></field>
+        <field name="productId"><display/></field>
+        <field name="brandName"><display/></field>
+        <field name="internalName"><display/></field>
     </form>
 
     <form name="lookupPurchaseOrderHeaderAndShipInfo" target="LookupPurchaseOrderHeaderAndShipInfo" title="" type="single"
@@ -177,7 +180,10 @@ under the License.
              </drop-down>
         </field>
         <field name="grandTotal"><range-find/></field>
-
+        <field name="productId"><text-find/></field>
+        <field name="brandName"><text-find/></field>
+        <field name="internalName"><text-find/></field>
+        
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
         <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>