svn commit: r662219 - in /ofbiz/trunk/applications/product/script/org/ofbiz/shipment: issuance/IssuanceServices.xml shipment/ShipmentServices.xml

[bibryam]

Author: bibryam
Date: Sun Jun  1 07:20:24 2008
New Revision: 662219

URL: http://svn.apache.org/viewvc?rev=662219&view=rev
Log:
Fixed bug, where shipment status checks were not performed correctly.

Modified:
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=662219&r1=662218&r2=662219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Sun Jun  1 07:20:24 2008
@@ -476,7 +476,7 @@
 
         <!-- make sure specified quantity is not greater than issued quantity left -->      
         <if-compare-field field-name="toCancelQuantity" operator="greater" to-field-name="qtyIssuedLeft" type="Double">
-            <add-error><fail-message message="Not cancelling ItemIssuanc because the quantity to cancel [${toCancelQuantity}] is greater than the quantity left [${qtyIssuedLeft}] for ItemIssuance [${itemIssuanceId}]"/></add-error>
+            <add-error><fail-message message="Not cancelling ItemIssuanc because the quantity to cancel [${toCancelQuantity}] is greater than the quantity left [${qtyIssuedLeft}] for ItemIssuance [${parameters.itemIssuanceId}]"/></add-error>
         </if-compare-field>
         <check-errors/>
 

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=662219&r1=662218&r2=662219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Sun Jun  1 07:20:24 2008
@@ -1133,12 +1133,15 @@
     <!-- Check the Status of a Shipment to see if it can be changed - meant to be called in-line -->
     <simple-method method-name="checkCanChangeShipmentStatusPacked" short-description="Check the Status of a Shipment to see if it can be changed - meant to be called in-line">
         <set value="SHIPMENT_PACKED" field="fromStatusId"/>
+        <call-simple-method method-name="checkCanChangeShipmentStatusGeneral"/>
     </simple-method>
     <simple-method method-name="checkCanChangeShipmentStatusShipped" short-description="Check the Status of a Shipment to see if it can be changed - meant to be called in-line">
         <set value="SHIPMENT_SHIPPED" field="fromStatusId"/>
+        <call-simple-method method-name="checkCanChangeShipmentStatusGeneral"/>        
     </simple-method>
     <simple-method method-name="checkCanChangeShipmentStatusDelivered" short-description="Check the Status of a Shipment to see if it can be changed - meant to be called in-line">
         <set value="SHIPMENT_DELIVERED" field="fromStatusId"/>
+        <call-simple-method method-name="checkCanChangeShipmentStatusGeneral"/>        
     </simple-method>
     <simple-method method-name="checkCanChangeShipmentStatusGeneral" short-description="Check the Status of a Shipment to see if it can be changed - meant to be called in-line">
         <entity-one entity-name="Shipment" value-name="testShipment"/>
@@ -1150,14 +1153,14 @@
                             <if-empty field-name="fromStatusId"/>
                             <if-compare field-name="fromStatusId" operator="equals" value="SHIPMENT_PACKED"/>
                         </or>
-                        <if-compare field-name="shipment.statusId" operator="equals" value="SHIPMENT_PACKED"/>
+                        <if-compare field-name="testShipment.statusId" operator="equals" value="SHIPMENT_PACKED"/>
                     </and>
                     <and>
                         <or>
                             <if-compare field-name="fromStatusId" operator="equals" value="SHIPMENT_PACKED"/>
                             <if-compare field-name="fromStatusId" operator="equals" value="SHIPMENT_SHIPPED"/>
                         </or>
-                        <if-compare field-name="shipment.statusId" operator="equals" value="SHIPMENT_SHIPPED"/>
+                        <if-compare field-name="testShipment.statusId" operator="equals" value="SHIPMENT_SHIPPED"/>
                     </and>
                     <and>
                         <or>
@@ -1165,9 +1168,9 @@
                             <if-compare field-name="fromStatusId" operator="equals" value="SHIPMENT_SHIPPED"/>
                             <if-compare field-name="fromStatusId" operator="equals" value="SHIPMENT_DELIVERED"/>
                         </or>
-                        <if-compare field-name="shipment.statusId" operator="equals" value="SHIPMENT_DELIVERED"/>
+                        <if-compare field-name="testShipment.statusId" operator="equals" value="SHIPMENT_DELIVERED"/>
                     </and>
-                    <if-compare field-name="shipment.statusId" operator="equals" value="SHIPMENT_CANCELLED"/>
+                    <if-compare field-name="testShipment.statusId" operator="equals" value="SHIPMENT_CANCELLED"/>
                 </or>
             </condition>
             <then>