svn commit: r1757963 - in /ofbiz/trunk/applications: order/widget/ordermgr/LookupScreens.xml product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl

[deepak]

Author: deepak
Date: Sat Aug 27 07:58:07 2016
New Revision: 1757963

URL: http://svn.apache.org/viewvc?rev=1757963&view=rev
Log:
(OFBIZ-7427) Applied patch from jira issue
================================
OrderId, PartId showing multiple times in ReceiveInventoryAgainstPurchaseOrder 
screen.
Also fixed markup of Receive Inventory Against PurchaseOrder scrren.
================================
Thanks Renuka for your contribution.

Modified:
    ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml
    
ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl

Modified: ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml?rev=1757963&r1=1757962&r2=1757963&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml Sat Aug 27 
07:58:07 2016
@@ -64,6 +64,7 @@ under the License.
                 <property-to-field resource="widget" 
property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" 
type="Integer" default-value="${viewSizeDefaultValue}"/>
                 <set field="entityName" value="OrderHeaderAndShipGroups"/>
+                <set field="searchDistinct" value="true" type="Boolean"/>
                 <set field="searchFields" value="[orderId, orderName, 
toName]"/>
             </actions>
             <widgets>

Modified: 
ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=1757963&r1=1757962&r2=1757963&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
 (original)
+++ 
ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
 Sat Aug 27 07:58:07 2016
@@ -73,16 +73,25 @@ under the License.
 </#if>
 
 <form name="ReceiveInventoryAgainstPurchaseOrder" 
action="<@ofbizUrl>ReceiveInventoryAgainstPurchaseOrder</@ofbizUrl>">
-    <input type="hidden" name="clearAll" value="Y"/>
-    <div>
-        <span class="label">${uiLabelMap.ProductShipmentId}</span>&nbsp;<input 
type="text" size="20" name="shipmentId" value="${shipmentId!}"/>
-        <span class="label">${uiLabelMap.ProductOrderId}</span>&nbsp;
-        <span>
-            <@htmlTemplate.lookupField value="${orderId!}" 
formName="ReceiveInventoryAgainstPurchaseOrder" name="purchaseOrderId" 
id="purchaseOrderId" fieldFormName="LookupOrderHeaderAndShipInfo"/>
-        </span>
-        <span 
class="label">${uiLabelMap.ProductOrderShipGroupId}</span>&nbsp;<input 
type="text" size="20" name="shipGroupSeqId" value="${shipGroupSeqId!}"/>
-        <input type="submit" value="${uiLabelMap.CommonSelect}" 
class="smallSubmit"/>
-    </div>
+  <input type="hidden" name="clearAll" value="Y"/>
+  <table class="basic-table" cellspacing="0">
+    <tr>
+      <td class="label">${uiLabelMap.ProductShipmentId}</td>
+      <td><input type="text" size="20" name="shipmentId" 
value="${shipmentId!}"/></td>
+    </tr>
+    <tr>
+      <td class="label">${uiLabelMap.ProductOrderId}</td>
+      <td><@htmlTemplate.lookupField value="${orderId!}" 
formName="ReceiveInventoryAgainstPurchaseOrder" name="purchaseOrderId" 
id="purchaseOrderId" fieldFormName="LookupOrderHeaderAndShipInfo"/></td>
+    </tr>
+    <tr>
+      <td class="label">${uiLabelMap.ProductOrderShipGroupId}</td>
+      <td><input type="text" size="20" name="shipGroupSeqId" 
value="${shipGroupSeqId!}"/></td>
+    </tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td><input type="submit" value="${uiLabelMap.CommonSelect}" 
class="smallSubmit"/></td>
+    </tr>
+  </table>
 </form>
 
 <#if shipment??>