You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by si...@apache.org on 2007/03/30 23:55:09 UTC
svn commit: r524287 -
/ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
Author: sichen
Date: Fri Mar 30 14:55:08 2007
New Revision: 524287
URL: http://svn.apache.org/viewvc?view=rev&rev=524287
Log:
Show the shipment/order/shipGroup selection form in the ReceiveInventoryAgainstPO screen even if the shipment doesn't exist, plus JS lookup fix
Modified:
ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?view=diff&rev=524287&r1=524286&r2=524287
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl Fri Mar 30 14:55:08 2007
@@ -55,22 +55,24 @@
<script type="text/javascript">window.onload=function(){alert('<@uiLabelWithVar/>')};</script>
</div>
</#if>
+</#if>
- <form name="ReceiveInventoryAgainstPurchaseOrder" action="<@o...@ofbizUrl>">
- <input type="hidden" name="clearAll" value="Y"/>
- <div class="tabletext">
- ${uiLabelMap.ProductShipmentId} : <input type="text" class='inputBox' size="20" name="shipmentId" value="${shipmentId?if_exists}"/>
- ${uiLabelMap.ProductOrderId} : <input type="text" class='inputBox' size="20" name="purchaseOrderId" value="${orderId?if_exists}"/>
- <span class='tabletext'>
- <a href="javascript:call_fieldlookup2(document.additemsfromorder.orderId,'LookupOrderHeaderAndShipInfo');">
- <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'>
- </a>
- </span>
- ${uiLabelMap.ProductOrderShipGroupId} : <input type="text" class='inputBox' size="20" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/>
- <input type="submit" value="${uiLabelMap.CommonSelect}" class="smallSubmit"/>
- </div>
- </form>
+<form name="ReceiveInventoryAgainstPurchaseOrder" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="clearAll" value="Y"/>
+ <div class="tabletext">
+ ${uiLabelMap.ProductShipmentId} : <input type="text" class='inputBox' size="20" name="shipmentId" value="${shipmentId?if_exists}"/>
+ ${uiLabelMap.ProductOrderId} : <input type="text" class='inputBox' size="20" name="purchaseOrderId" value="${orderId?if_exists}"/>
+ <span class='tabletext'>
+ <a href="javascript:call_fieldlookup2(document.ReceiveInventoryAgainstPurchaseOrder.purchaseOrderId,'LookupOrderHeaderAndShipInfo');">
+ <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'>
+ </a>
+ </span>
+ ${uiLabelMap.ProductOrderShipGroupId} : <input type="text" class='inputBox' size="20" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/>
+ <input type="submit" value="${uiLabelMap.CommonSelect}" class="smallSubmit"/>
+ </div>
+</form>
+<#if shipment?exists>
<#if isPurchaseShipment>
<#assign itemsAvailableToReceive = totalAvailableToReceive?default(0) > 0/>
@@ -237,6 +239,6 @@
</script>
</#if>
</#if>
-<#else>
+<#elseif parameters.shipmentId?has_content>
<h3>${uiLabelMap.ProductShipmentNotFoundId}: [${shipmentId?if_exists}]</h3>
</#if>