svn commit: r482685 - in /incubator/ofbiz/trunk/applications/product: script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml servicedef/services_shipment.xml

[jacopoc]

Author: jacopoc
Date: Tue Dec  5 07:04:40 2006
New Revision: 482685

URL: http://svn.apache.org/viewvc?view=rev&rev=482685
Log:
Cleaned up and simplified the "receiveProductInventory" service (there was still some old code used when the service was implemented as a service group): now it will work well also with serialized items.
Thanks to Scott Gray, for providing suggestions to fix it in OFBIZ-496

Modified:
    incubator/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
    incubator/ofbiz/trunk/applications/product/servicedef/services_shipment.xml

Modified: incubator/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?view=diff&rev=482685&r1=482684&r2=482685
==============================================================================
--- incubator/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ incubator/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Tue Dec  5 07:04:40 2006
@@ -77,16 +77,12 @@
             <set field="loops" from-field="parameters.quantityAccepted"/>
             <set field="parameters.quantityAccepted" value="1" type="Double"/>
         </if-compare>
+        <set from-field="parameters.quantityAccepted" field="parameters.quantityOnHandDiff"/>
+        <set from-field="parameters.quantityAccepted" field="parameters.availableToPromiseDiff"/>
+  
         <loop count="${loops}" field="currentLoop">
             <log level="info" message="Looping and creating inventory info - ${currentLoop}"/>
             <clear-field field-name="serviceInMap"/>
-            <set-service-fields service-name="prepareInventoryReceipt" map-name="parameters" to-map-name="serviceInMap"/>
-            <call-service service-name="prepareInventoryReceipt" in-map-name="serviceInMap">
-                <result-to-field result-name="quantityOnHandDiff" field-name="parameters.quantityOnHandDiff"/>
-                <result-to-field result-name="availableToPromiseDiff" field-name="parameters.availableToPromiseDiff"/>
-            </call-service>
-            <check-errors/>
-            <clear-field field-name="serviceInMap"/>
             <set-service-fields service-name="createInventoryItem" map-name="parameters" to-map-name="serviceInMap"/>
             <call-service service-name="createInventoryItem" in-map-name="serviceInMap">
                 <result-to-field result-name="inventoryItemId" field-name="parameters.inventoryItemId"/>
@@ -110,16 +106,6 @@
         </loop>
     </simple-method>
 
-    <simple-method method-name="prepareInventoryReceipt" short-description="Prepare Inventory Receipt">
-        <check-permission permission="FACILITY" action="_CREATE"><fail-message message="Security Error: to run prepareInventoryReceipt you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-        
-        <if-compare value="NON_SERIAL_INV_ITEM" operator="equals" field-name="inventoryItemTypeId" map-name="parameters">
-            <field-to-result field-name="quantityAccepted" map-name="parameters" result-name="quantityOnHandDiff"/>
-            <field-to-result field-name="quantityAccepted" map-name="parameters" result-name="availableToPromiseDiff"/>
-        </if-compare>
-    </simple-method>
-    
     <simple-method method-name="quickReceiveReturn" short-description="Quick Receive Entire Return">
         <check-permission permission="FACILITY" action="_CREATE"><fail-message message="Security Error: to run quickReceiveReturn you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/></check-permission>
         <check-errors/>

Modified: incubator/ofbiz/trunk/applications/product/servicedef/services_shipment.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/servicedef/services_shipment.xml?view=diff&rev=482685&r1=482684&r2=482685
==============================================================================
--- incubator/ofbiz/trunk/applications/product/servicedef/services_shipment.xml (original)
+++ incubator/ofbiz/trunk/applications/product/servicedef/services_shipment.xml Tue Dec  5 07:04:40 2006
@@ -493,14 +493,6 @@
         <override name="facilityId" optional="false"/>
     </service>
 
-    <service name="prepareInventoryReceipt" engine="simple"
-            location="org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml" invoke="prepareInventoryReceipt" auth="true">
-        <description>Prepare Receipt Form for Inventory Item</description>
-        <attribute name="quantityAccepted" type="Double" mode="IN" optional="false"/>
-        <attribute name="inventoryItemTypeId" type="String" mode="IN" optional="false"/>
-        <attribute name="quantityOnHandDiff" type="Double" mode="OUT" optional="true"/>
-        <attribute name="availableToPromiseDiff" type="Double" mode="OUT" optional="true"/>
-    </service>
     <service name="quickReceiveReturn" engine="simple"
             location="org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml" invoke="quickReceiveReturn" auth="true">
         <attribute name="returnId" type="String" mode="IN" optional="false"/>