svn commit: r589769 - in /ofbiz/trunk/applications/manufacturing: webapp/manufacturing/WEB-INF/actions/mrp/findInventoryEventPlan.bsh widget/manufacturing/MrpScreens.xml

[jacopoc]

Author: jacopoc
Date: Mon Oct 29 10:45:59 2007
New Revision: 589769

URL: http://svn.apache.org/viewvc?rev=589769&view=rev
Log:
Misc cleanups to improve old (bad) code that was throwing an error after recent framework updates.

Modified:
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/findInventoryEventPlan.bsh
    ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/findInventoryEventPlan.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/findInventoryEventPlan.bsh?rev=589769&r1=589768&r2=589769&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/findInventoryEventPlan.bsh (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/findInventoryEventPlan.bsh Mon Oct 29 10:45:59 2007
@@ -35,17 +35,6 @@
 //get the inventory (inventoryEventPlanned)
 productId = request.getParameter("productId");
 
-// create the eventDate for calendar
-UtilDateTime fromDate = new UtilDateTime();
-Timestamp fromTs = fromDate.nowTimestamp();
-fromTs = fromDate.getDayStart( fromTs );
-
-String fromStr = fromTs.toString();
-fromStr = fromStr.substring(0, fromStr.indexOf('.'));
-
-context.put("eventDateStr", fromStr);
-Debug.logInfo("eventDateStr =  " + fromStr, "truc");
-
 // get the lookup flag
 lookupFlag = request.getParameter("lookupFlag");
 
@@ -109,9 +98,9 @@
     highIndex = listSize;
 if( highIndex < 1 )
     highIndex = 0;
-
 context.put("viewIndex", viewIndex);
 context.put("listSize", listSize);
 context.put("highIndex", highIndex);
 context.put("lowIndex", lowIndex);
 context.put("viewSize", viewSize);
+

Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml?rev=589769&r1=589768&r2=589769&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml Mon Oct 29 10:45:59 2007
@@ -99,7 +99,7 @@
                     </condition-list>
                     <order-by field-name="-createdStamp"/>
                 </entity-condition>
-                <entity-condition entity-name="JobSandbox" list-name="mrpFinishedJobs">
+                <entity-condition entity-name="JobSandbox" list-name="lastFinishedJobs">
                     <condition-list combine="and">
                         <condition-expr field-name="serviceName" value="executeMrp"/>
                         <condition-list combine="or">
@@ -110,10 +110,8 @@
                         </condition-list>
                     </condition-list>
                     <order-by field-name="-finishDateTime"/>
+                    <limit-range start="0" size="1"/>
                 </entity-condition>
-                <set field="lastFinishedJob" from-field="mrpFinishedJobs[0]"/>
-                <set field="lastFinishedJobs[]" from-field="lastFinishedJob"/>
-                
                 <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/findInventoryEventPlan.bsh"/>
             </actions>
             <widgets>