svn commit: r614558 - in /ofbiz/trunk/applications: manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java order/webapp/ordermgr/WEB-INF/controller.xml order/webapp/ordermgr/order/orderitems.ftl

[jacopoc]

Author: jacopoc
Date: Wed Jan 23 07:03:55 2008
New Revision: 614558

URL: http://svn.apache.org/viewvc?rev=614558&view=rev
Log:
Added (commented out) link to rerun reservations for a specific order item; fix for bug in mrp.

Modified:
    ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl

Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=614558&r1=614557&r2=614558&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original)
+++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Wed Jan 23 07:03:55 2008
@@ -297,7 +297,7 @@
             } else if (orderDeliverySchedule != null && orderDeliverySchedule.get("estimatedReadyDate") != null) {
                 estimatedShipDate = orderDeliverySchedule.getTimestamp("estimatedReadyDate");
             } else {
-                estimatedShipDate = genericResult.getTimestamp("estimatedDeliveryDate");
+                estimatedShipDate = genericResult.getTimestamp("oiEstimatedDeliveryDate");
             }
             if (estimatedShipDate == null) {
                 estimatedShipDate = now;

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=614558&r1=614557&r2=614558&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Wed Jan 23 07:03:55 2008
@@ -293,6 +293,12 @@
         <response name="success" type="view" value="orderview"/>
         <response name="error" type="view" value="orderview"/>
     </request-map>
+    <request-map uri="balanceInventoryItems">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="balanceInventoryItems"/>
+        <response name="success" type="view" value="orderview"/>
+        <response name="error" type="view" value="orderview"/>
+    </request-map>
     <request-map uri="editOrderItems">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="editorderitems"/>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=614558&r1=614557&r2=614558&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Wed Jan 23 07:03:55 2008
@@ -459,6 +459,7 @@
                     <td>
                       <#if (orderItemShipGrpInvRes.quantityNotAvailable?has_content && orderItemShipGrpInvRes.quantityNotAvailable > 0)>
                         <span style="color: red;">[${orderItemShipGrpInvRes.quantityNotAvailable?string.number}&nbsp;${uiLabelMap.OrderBackOrdered}]</span>
+                        <#--<a href="<@ofbizUrl>balanceInventoryItems?inventoryItemId=${orderItemShipGrpInvRes.inventoryItemId}&amp;orderId=${orderId}&amp;priorityOrderId=${orderId}&amp;priorityOrderItemSeqId=${orderItemShipGrpInvRes.orderItemSeqId}</@ofbizUrl>" class="buttontext" style="font-size: xx-small;">Raise Priority</a> -->
                       </#if>
                       &nbsp;
                     </td>