Author: mrisaliti
Date: Sat Oct 24 19:36:03 2009
New Revision: 829436
URL: http://svn.apache.org/viewvc?rev=829436&view=rev
Log:
ShipmentForms.xml has been now moved to product/widget/facility
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy?rev=829436&r1=829435&r2=829436&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy
Sat Oct 24 19:36:03 2009
@@ -34,7 +34,7 @@
}
orderHeader = delegator.findOne("OrderHeader", [orderId : primaryOrderId],
false);
-HtmlFormWrapper editShipmentWrapper = new
HtmlFormWrapper("component://product/webapp/facility/shipment/ShipmentForms.xml",
"EditShipment", request, response);
+HtmlFormWrapper editShipmentWrapper = new
HtmlFormWrapper("component://product/widget/facility//ShipmentForms.xml",
"EditShipment", request, response);
editShipmentWrapper.putInContext("shipmentId", shipmentId);
editShipmentWrapper.putInContext("shipment", shipment);
editShipmentWrapper.putInContext("productStoreId", null); // seems to be
needed not exist != null
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy?rev=829436&r1=829435&r2=829436&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy
Sat Oct 24 19:36:03 2009
@@ -186,7 +186,7 @@
rows.add(oneRow);
}
}
-HtmlFormWrapper listShipmentPlanForm = new
HtmlFormWrapper("component://product/webapp/facility/shipment/ShipmentForms.xml",
"listShipmentPlan", request, response);
+HtmlFormWrapper listShipmentPlanForm = new
HtmlFormWrapper("component://product/widget/facility//ShipmentForms.xml",
"listShipmentPlan", request, response);
listShipmentPlanForm.putInContext("shipmentPlan", rows);
// **************************************
@@ -277,10 +277,10 @@
}
}
// Add form
-HtmlFormWrapper addToShipmentPlanForm = new
HtmlFormWrapper("component://product/webapp/facility/shipment/ShipmentForms.xml",
"addToShipmentPlan", request, response);
+HtmlFormWrapper addToShipmentPlanForm = new
HtmlFormWrapper("component://product/widget/facility//ShipmentForms.xml",
"addToShipmentPlan", request, response);
addToShipmentPlanForm.putInContext("shipmentPlan", addRows);
-HtmlFormWrapper findOrderItemsForm = new
HtmlFormWrapper("component://product/webapp/facility/shipment/ShipmentForms.xml",
"findOrderItems", request, response);
+HtmlFormWrapper findOrderItemsForm = new
HtmlFormWrapper("component://product/widget/facility//ShipmentForms.xml",
"findOrderItems", request, response);
findOrderItemsForm.putInContext("shipmentId", shipmentId);
if (shipment && shipment.primaryOrderId) {
findOrderItemsForm.putInContext("orderId", shipment.primaryOrderId);
@@ -289,7 +289,7 @@
}
}
-HtmlFormWrapper shipmentPlanToOrderItemsForm = new
HtmlFormWrapper("component://product/webapp/facility/shipment/ShipmentForms.xml",
"shipmentPlanToOrderItems", request, response);
+HtmlFormWrapper shipmentPlanToOrderItemsForm = new
HtmlFormWrapper("component://product/widget/facility//ShipmentForms.xml",
"shipmentPlanToOrderItems", request, response);
shipmentPlanToOrderItemsForm.putInContext("shipmentId", shipmentId);
context.findOrderItemsForm = findOrderItemsForm; // Form for Order search:
find By orderId
