svn commit: r795884 - in /ofbiz/trunk/applications: order/config/OrderErrorUiLabels.xml product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy product/widget/facility/ShipmentScreens.xml

[mor-2]

Author: mor
Date: Mon Jul 20 15:54:40 2009
New Revision: 795884

URL: http://svn.apache.org/viewvc?rev=795884&view=rev
Log:
Minor correction to the label names and the script.

Modified:
    ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy
    ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml

Modified: ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml?rev=795884&r1=795883&r2=795884&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Mon Jul 20 15:54:40 2009
@@ -658,7 +658,7 @@
         <value xml:lang="zh">错误：没有为订单标识：${orderId} 找到有效的订单头 </value>
     </property>
     <property key="OrderErrorOrderHasBeenAlreadyVerified">
-        <value xml:lang="en">ERROR: Order #${orderId} has been already verified, go to Weight Package Only screen for further processing</value>
+        <value xml:lang="en">ERROR: Order #${orderId} has been already verified, go to Weigh Package Only screen for further processing</value>
     </property>
     <property key="OrderErrorOrderIdNotFound">
         <value xml:lang="en">ERROR: Order with ID [${orderId}] not found</value>
@@ -709,7 +709,7 @@
         <value xml:lang="th">ใบสั่งซื้อสินค้า ${orderId} ไม่เป็นรายการสั่งซื้อ</value>
     </property>
     <property key="OrderErrorOrderNotVerified">
-        <value xml:lang="en">ERROR: Order #${orderId} is not verified, click Pack Order button instead of Weight Package Only for further processing</value>
+        <value xml:lang="en">ERROR: Order #${orderId} is not verified, click Pack Order button instead of Weigh Package Only for further processing</value>
     </property>
     <property key="OrderErrorOrderNotVerifiedForPacking">
         <value xml:lang="en">ERROR: Order #${orderId} is not verified for packing</value>

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy?rev=795884&r1=795883&r2=795884&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy Mon Jul 20 15:54:40 2009
@@ -94,10 +94,12 @@
         invoiceIds = EntityUtil.getFieldListFromEntityList(orderItemBillingList, "invoiceId", true);
         if (invoiceIds) {
             context.invoiceIds = invoiceIds;
-            orderId = null;
             
         }
     }
+    if (shipment.statusId && "SHIPMENT_PACKED" == shipment.statusId) {
+        orderId = null;
+    }
     shipmentPackageRouteSegs = delegator.findByAnd("ShipmentPackageRouteSeg",  [shipmentId : shipmentId]);
     shipmentPackageRouteSegList = [];
     shipmentPackageRouteSegs.each { shipmentPackageRouteSeg ->

Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=795884&r1=795883&r2=795884&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Mon Jul 20 15:54:40 2009
@@ -301,7 +301,7 @@
     <screen name="WeightPackageOnly">
         <section>
             <actions>
-                <set field="titleProperty" value="ProductWeightPackageOnly"/>
+                <set field="titleProperty" value="ProductWeighPackageOnly"/>
                 <set field="headerItem" value="shipment"/>
                 <script location="component://product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy"/>
             </actions>