You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2009/12/11 16:51:14 UTC
svn commit: r889668 - in /ofbiz/trunk/applications/product:
webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy
widget/facility/ShipmentForms.xml
Author: jacopoc
Date: Fri Dec 11 15:51:14 2009
New Revision: 889668
URL: http://svn.apache.org/viewvc?rev=889668&view=rev
Log:
Fixed shipment plan screen; it was not considering quantities actually assigned to ship groups.
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy
ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml
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=889668&r1=889667&r2=889668&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 Fri Dec 11 15:51:14 2009
@@ -201,8 +201,8 @@
oneRow.orderId = orderItem.orderId;
oneRow.orderItemSeqId = orderItem.orderItemSeqId;
oneRow.productId = orderItem.productId;
- orderedQuantity = orderItem.getDouble("quantity");
- canceledQuantity = orderItem.getDouble("cancelQuantity");
+ orderedQuantity = orderItemShipGroupAssoc.getDouble("quantity");
+ canceledQuantity = orderItemShipGroupAssoc.getDouble("cancelQuantity");
if (canceledQuantity) {
orderedQuantity = Double.valueOf(orderedQuantity.doubleValue() - canceledQuantity.doubleValue());
}
Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml?rev=889668&r1=889667&r2=889668&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml Fri Dec 11 15:51:14 2009
@@ -197,10 +197,10 @@
header-row-style="header-row" default-table-style="basic-table">
<field name="action"><hidden value="search"/></field>
<field name="shipmentId"><hidden/></field>
- <field name="shipGroupSeqId"><hidden/></field>
<field name="orderId" title="${uiLabelMap.ProductOrderId}">
<lookup target-form-name="LookupOrderHeaderAndShipInfo"/>
</field>
+ <field name="shipGroupSeqId"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}">
<submit button-type="button"/>
</field>