Author: mor
Date: Wed Apr 22 12:40:14 2009
New Revision: 767493
URL: http://svn.apache.org/viewvc?rev=767493&view=rev
Log:
Order Items in Verify Pick Screen are shown only when order is in approved
status. Patch from Akash Jain.
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy
ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy?rev=767493&r1=767492&r2=767493&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy
Wed Apr 22 12:40:14 2009
@@ -76,6 +76,7 @@
context.orderId = orderId;
context.shipGroupSeqId = shipGroupSeqId;
context.picklistBinId = picklistBinId;
+context.isOrderStatusApproved = false;
if (orderId) {
orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false);
@@ -89,6 +90,7 @@
orderItems = orh.getOrderItems();
context.orderItems = orderItems;
if ("ORDER_APPROVED".equals(orderHeader.statusId)) {
+ context.isOrderStatusApproved = true;
if (shipGroupSeqId) {
productStoreId = orh.getProductStoreId();
context.productStoreId = productStoreId;
@@ -100,6 +102,7 @@
request.setAttribute("_ERROR_MESSAGE_",
UtilProperties.getMessage("ProductErrorUiLabels",
"ProductErrorNoShipGroupSequenceIdFoundCannotProcess", locale));
}
} else {
+ context.isOrderStatusApproved = false;
request.setAttribute("_ERROR_MESSAGE_",
UtilProperties.getMessage("OrderErrorUiLabels",
"OrderErrorOrderNotApprovedForPicking", [orderId : orderId], locale));
}
} else {
Modified:
ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl?rev=767493&r1=767492&r2=767493&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl
(original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl
Wed Apr 22 12:40:14 2009
@@ -26,7 +26,7 @@
</ul>
<br class="clear"/>
</div>
- <#if shipmentId?has_content>
+ <#if (shipmentId?has_content) || (isOrderStatusApproved == false)>
<#assign showInput = "N">
</#if>
<#if shipmentId?has_content>
