Author: mor
Date: Mon Jul 6 14:05:18 2009
New Revision: 791485
URL: http://svn.apache.org/viewvc?rev=791485&view=rev
Log:
Quick Receive Purchase Order link under Actions block on Order Detail Page now
also show up when partial order is received.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=791485&r1=791484&r2=791485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Mon Jul 6 14:05:18 2009
@@ -67,6 +67,19 @@
<input type="submit" class="smallSubmit"
value="${uiLabelMap.OrderQuickReceivePurchaseOrder}"/>
</li>
</form>
+ <#else>
+ <form name="receiveInventoryForm"
action="/facility/control/ReceiveInventory" method="POST">
+ <input type="hidden" name="initialSelected" value="Y"/>
+ <input type="hidden" name="purchaseOrderId"
value="${orderId?if_exists}"/>
+ <li>
+ <select name="facilityId">
+ <#list ownedFacilities as facility>
+ <option
value="${facility.facilityId}">${facility.facilityName}</option>
+ </#list>
+ </select>
+ <a
href="javascript:document.receiveInventoryForm.submit()"
class="buttontext">${uiLabelMap.OrderQuickReceivePurchaseOrder}</a>
+ </li>
+ </form>
</#if>
<#if orderHeader.statusId != "ORDER_COMPLETED">
<form
action="<@ofbizUrl>completePurchaseOrder?externalLoginKey=${externalLoginKey}</@ofbizUrl>"
method="POST">