svn commit: r731851 [16/22] - in /ofbiz/trunk: applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/accounting/script/org/ofbiz/accounting/fixedasset/ applications/accounting/script/org/ofbiz/a...

[jonesde]

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=731851&r1=731850&r2=731851&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 Mon Jan  5 23:13:36 2009
@@ -31,7 +31,7 @@
 
         <make-value value-field="newEntity" entity-name="ItemIssuance"/>
         <sequenced-id sequence-name="ItemIssuance" field="newEntity.itemIssuanceId"/>
-        <field-to-result field="itemIssuanceId" map-name="newEntity"/>
+        <field-to-result field="newEntity.itemIssuanceId" result-name="itemIssuanceId"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <now-timestamp field="newEntity.issuedDateTime"/>
 
@@ -165,11 +165,11 @@
         </if-empty>
 
         <!-- make sure specified quantity is not less than or equal to 0 -->
-        <if-compare field="parameters.quantity" operator="less-equals" value="0" type="Double">
+        <if-compare field="parameters.quantity" operator="less-equals" value="0" type="BigDecimal">
             <add-error><fail-message message="Not issuing Order Item Ship Group Inventory Reservation to shipment [${parameters.shipmentId}] because the quantity to issue [${parameters.quantity}] is less than or equal to 0 for order [${orderItemShipGrpInvRes.orderId}] order item [${orderItemShipGrpInvRes.orderItemSeqId}] inventoryItem [${orderItemShipGrpInvRes.inventoryItemId}]"/></add-error>
         </if-compare>
         <!-- make sure specified quantity is not greater than reserved quantity left to be issued, ie orderItemShipGrpInvRes.quantity -->
-        <if-compare-field field="parameters.quantity" to-field="orderItemShipGrpInvRes.quantity" operator="greater" type="Double">
+        <if-compare-field field="parameters.quantity" to-field="orderItemShipGrpInvRes.quantity" operator="greater" type="BigDecimal">
             <add-error><fail-message message="Not issuing Order Item Ship Group Inventory Reservation to shipment [${parameters.shipmentId}] because the quantity to issue [${parameters.quantity}] is greater than the quantity left to issue [${orderItemShipGrpInvRes.quantity}] for order [${orderItemShipGrpInvRes.orderId}] order item [${orderItemShipGrpInvRes.orderItemSeqId}] inventoryItem [${orderItemShipGrpInvRes.inventoryItemId}]"/></add-error>
         </if-compare-field>
 
@@ -194,7 +194,7 @@
             </calcop>
         </calculate>
 
-        <if-compare value="0" operator="greater-equals" field="qtyForShipmentItem" type="Double">
+        <if-compare value="0" operator="greater-equals" field="qtyForShipmentItem" type="BigDecimal">
             <!-- remove the orderShipment.quantity -->
             <if-not-empty field="orderShipment">
                 <field-to-result field="orderShipment.shipmentItemSeqId" result-name="shipmentItemSeqId"/>
@@ -204,7 +204,7 @@
                 <find-by-primary-key map="shipmentItemLookupPk" value-field="shipmentItem"/>
                 <remove-value value-field="orderShipment"/>
             </if-not-empty>
-            <if-compare value="0" operator="not-equals" field="qtyForShipmentItem" type="Double">
+            <if-compare value="0" operator="not-equals" field="qtyForShipmentItem" type="BigDecimal">
                 <!-- add the qtyForShipmentItem to the shipmentItem -->
                 <set from-field="paremeters.quantity" field="originalQuantity"/>
                 <set from-field="qtyForShipmentItem" field="paremeters.quantity"/>
@@ -238,7 +238,7 @@
                 <calcop operator="get" field="parameters.quantity"/>
             </calcop>
         </calculate>
-        <if-compare value="0" operator="equals" field="orderItemShipGrpInvRes.quantity" type="Double">
+        <if-compare value="0" operator="equals" field="orderItemShipGrpInvRes.quantity" type="BigDecimal">
             <!-- if none left reserved, remove OIIR -->
             <remove-value value-field="orderItemShipGrpInvRes"/>
             <!-- if there are no more OIIRs for the orderItem, set the orderItem.statusId to ITEM_COMPLETED -->
@@ -263,7 +263,7 @@
         <set from-field="shipmentItem.shipmentId" field="createDetailMap.shipmentId"/>
         <set from-field="shipmentItem.shipmentItemSeqId" field="createDetailMap.shipmentItemSeqId"/>
         <set from-field="itemIssuanceId" field="createDetailMap.itemIssuanceId"/>
-        <calculate field="createDetailMap.quantityOnHandDiff" type="Double">
+        <calculate field="createDetailMap.quantityOnHandDiff">
             <calcop field="parameters.quantity" operator="negative"/>
         </calculate>
         <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
@@ -291,15 +291,14 @@
             <set from-field="parameters.shipmentId" field="shipmentItemCreate.shipmentId"/>
             <set from-field="parameters.quantity" field="shipmentItemCreate.quantity"/>
             <call-service service-name="createShipmentItem" in-map-name="shipmentItemCreate">
-                <result-to-field result-name="shipmentItemSeqId" map-name="shipmentItemLookupPk"/>
+                <result-to-field result-name="shipmentItemSeqId" field="shipmentItemLookupPk.shipmentItemSeqId"/>
             </call-service>
             <set from-field="parameters.shipmentId" field="shipmentItemLookupPk.shipmentId"/>
             <find-by-primary-key entity-name="ShipmentItem" map="shipmentItemLookupPk" value-field="shipmentItem"/>
         <else>
-            <calculate field="quantity" map-name="shipmentItem">
-                <calcop operator="add" field="quantity" map-name="shipmentItem">
-                    <calcop operator="get" field="quantity" map-name="parameters"/>
-                </calcop>
+            <calculate field="shipmentItem.quantity">
+                <calcop operator="get" field="shipmentItem.quantity"/>
+                <calcop operator="get" field="parameters.quantity"/>
             </calculate>
             <store-value value-field="shipmentItem"/>
         </else>
@@ -352,11 +351,11 @@
         <entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/>
 
         <!-- make sure specified quantity is not less than or equal to 0 -->
-        <if-compare field="parameters.quantity" operator="less-equals" value="0" type="Double">
+        <if-compare field="parameters.quantity" operator="less-equals" value="0" type="BigDecimal">
             <add-error><fail-message message="Not issuing InventoryItem to FixedAssetMaint [${fixedAssetMaint.fixedAssetId:fixedAssetMaint.maintHistSeqId}] because the quantity to issue [${parameters.quantity}] is less than or equal to 0 for inventoryItem [${inventoryItem.inventoryItemId}]"/></add-error>
         </if-compare>
         <!-- make sure specified quantity is not greater than available quantity left to be issued, ie intentoryItem.availableToPromiseTotal -->
-        <if-compare-field field="parameters.quantity" to-field="inventoryItem.availableToPromiseTotal" operator="greater" type="Double">
+        <if-compare-field field="parameters.quantity" to-field="inventoryItem.availableToPromiseTotal" operator="greater" type="BigDecimal">
             <add-error><fail-message message="Not issuing InventoryItem to FixedAssetMaint [${fixedAssetMaint.fixedAssetId:fixedAssetMaint.maintHistSeqId}] because the quantity to issue [${parameters.quantity}] is greater than the quantity left to issue (ie the ATP or Available To Promise) [${intentoryItem.availableToPromiseTotal}] for inventoryItem [${orderItemShipGrpInvRes.inventoryItemId}]"/></add-error>
         </if-compare-field>
         
@@ -379,10 +378,10 @@
         <set from-field="fixedAssetMaint.fixedAssetId" field="createDetailMap.fixedAssetId"/>
         <set from-field="fixedAssetMaint.maintHistSeqId" field="createDetailMap.maintHistSeqId"/>
         <set from-field="itemIssuanceId" field="createDetailMap.itemIssuanceId"/>
-        <calculate field="createDetailMap.quantityOnHandDiff" type="Double">
+        <calculate field="createDetailMap.quantityOnHandDiff">
             <calcop field="parameters.quantity" operator="negative"/>
         </calculate>
-        <calculate field="createDetailMap.availableToPromiseDiff" type="Double">
+        <calculate field="createDetailMap.availableToPromiseDiff">
             <calcop field="parameters.quantity" operator="negative"/>
         </calculate>
         <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
@@ -392,7 +391,7 @@
         <entity-one entity-name="ItemIssuance" value-field="itemIssuance"/>
         <set field="oldQuantity" from-field="itemIssuance.quantity"/>
         <!-- Update the ItemIssuance -->
-        <set value="0" field="itemIssuanceUpdate.quantity" type="Double" />
+        <set value="0" field="itemIssuanceUpdate.quantity" type="BigDecimal" />
         <set from-field="parameters.itemIssuanceId" field="itemIssuanceUpdate.itemIssuanceId"/>
         <call-service service-name="updateItemIssuance" in-map-name="itemIssuanceUpdate"/>
         <!-- Increment InventoryItem quantityOnHand AND availableToPromise since there was no reservation -->
@@ -401,10 +400,10 @@
         <set from-field="itemIssuance.fixedAssetId" field="createDetailMap.fixedAssetId"/>
         <set from-field="itemIssuance.maintHistSeqId" field="createDetailMap.maintHistSeqId"/>
         <set from-field="itemIssuance.itemIssuanceId" field="createDetailMap.itemIssuanceId"/>
-        <calculate field="createDetailMap.quantityOnHandDiff" type="Double">
+        <calculate field="createDetailMap.quantityOnHandDiff">
             <calcop field="oldQuantity" operator="add"/>
         </calculate>
-        <calculate field="createDetailMap.availableToPromiseDiff" type="Double">
+        <calculate field="createDetailMap.availableToPromiseDiff">
             <calcop field="oldQuantity" operator="add"/>
         </calculate>
         <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
@@ -449,16 +448,16 @@
          </if-empty>
 
         <!-- make sure specified cancel Quantity is not less than or equal to 0 -->
-        <if-compare field="toCancelQuantity" operator="less" value="0" type="Double">
+        <if-compare field="toCancelQuantity" operator="less" value="0" type="BigDecimal">
             <add-error><fail-message message="Not cancelling ItemIssuance [${parameters.itemIssuanceId}] because the quantity to cancel [${toCancelQuantity}] is less than 0 "/></add-error>
         </if-compare>
 
-        <if-compare field="toCancelQuantity" operator="equals" value="0" type="Double">
+        <if-compare field="toCancelQuantity" operator="equals" value="0" type="BigDecimal">
             <return response-code="success"/>
         </if-compare>
 
         <!-- make sure specified quantity is not greater than issued quantity left -->      
-        <if-compare-field field="toCancelQuantity" to-field="qtyIssuedLeft" operator="greater" type="Double">
+        <if-compare-field field="toCancelQuantity" to-field="qtyIssuedLeft" operator="greater" type="BigDecimal">
             <add-error><fail-message message="Not cancelling ItemIssuance because the quantity to cancel [${toCancelQuantity}] is greater than the quantity left [${qtyIssuedLeft}] for ItemIssuance [${parameters.itemIssuanceId}]"/></add-error>
         </if-compare-field>
         <check-errors/>
@@ -520,15 +519,15 @@
           </calcop>
         </calculate>
         <!-- make sure specified quantity is not less than or equal to 0 -->
-        <if-compare field="parameters.quantity" operator="less-equals" value="0" type="Double">
+        <if-compare field="parameters.quantity" operator="less-equals" value="0" type="BigDecimal">
             <add-error><fail-message message="Not issuing InventoryItem to Shipment [${parameters.shipmentId}:$${parameters.shipmentItemSeqId}] because the quantity to issue [${parameters.quantity}] is less than or equal to 0 for inventoryItem [${inventoryItem.inventoryItemId}]"/></add-error>
         </if-compare>
         <!-- make sure specified quantity is not greater than available quantity left to be issued, i.e. intentoryItem.availableToPromiseTotal -->
-        <if-compare-field field="parameters.quantity" to-field="inventoryItem.availableToPromiseTotal" operator="greater" type="Double">
+        <if-compare-field field="parameters.quantity" to-field="inventoryItem.availableToPromiseTotal" operator="greater" type="BigDecimal">
             <add-error><fail-message message="Not issuing InventoryItem to Shipment [${parameters.shipmentId}:${parameters.shipmentItemSeqId}] because the quantity to issue [${parameters.quantity}] is greater than the quantity left to issue (ie the ATP or Available To Promise) [${intentoryItem.availableToPromiseTotal}] for inventoryItem [${parameters.inventoryItemId}]"/></add-error>
         </if-compare-field>
         <!-- make sure specified quantity is not greater than total return quantity -->
-        <if-compare-field field="parameters.quantity" to-field="quantityNotIssued" operator="greater" type="Double">
+        <if-compare-field field="parameters.quantity" to-field="quantityNotIssued" operator="greater" type="BigDecimal">
             <add-error><fail-message message="Not issuing InventoryItem to Shipment [${parameters.shipmentId}:${parameters.shipmentItemSeqId}] because the quantity to issue [${parameters.quantity}] is greater than the quantity left to return for inventoryItem [${parameters.inventoryItemId}]"/></add-error>
         </if-compare-field>        
         <check-errors/>
@@ -548,10 +547,10 @@
         <set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId"/>
         <set field="createDetailMap.shipmentId" from-field="shipmentId"/>
         <set field="createDetailMap.shipmentItemSeqId" from-field="shipmentItemSeqId"/>
-        <calculate field="createDetailMap.quantityOnHandDiff" type="Double">
+        <calculate field="createDetailMap.quantityOnHandDiff">
             <calcop field="parameters.quantity" operator="negative"/>
         </calculate>
-        <calculate field="createDetailMap.availableToPromiseDiff" type="Double">
+        <calculate field="createDetailMap.availableToPromiseDiff">
             <calcop field="parameters.quantity" operator="negative"/>
         </calculate>
         <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=731851&r1=731850&r2=731851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Mon Jan  5 23:13:36 2009
@@ -166,7 +166,7 @@
                                                 <and>
                                                     <if-compare field="orderItemShipGroup.maySplit" operator="equals" value="N"/>
                                                     <not><if-empty field="orderItemShipGrpInvRes.quantityNotAvailable"/></not>
-                                                    <if-compare field="orderItemShipGrpInvRes.quantityNotAvailable" operator="greater" value="0" type="Double"/>
+                                                    <if-compare field="orderItemShipGrpInvRes.quantityNotAvailable" operator="greater" value="0" type="BigDecimal"/>
                                                 </and>
                                                 <!-- make sure the inventoryItem is in the specified facility -->
                                                 <if-compare-field field="parameters.facilityId" to-field="inventoryItem.facilityId" operator="not-equals"/>
@@ -182,9 +182,9 @@
                                                 <condition>
                                                     <or>
                                                         <if-empty field="orderItemShipGrpInvRes.quantityNotAvailable"/>
-                                                        <if-compare field="orderItemShipGrpInvRes.quantityNotAvailable" operator="equals" value="0" type="Double"/>
+                                                        <if-compare field="orderItemShipGrpInvRes.quantityNotAvailable" operator="equals" value="0" type="BigDecimal"/>
                                                         <and>
-                                                            <if-compare-field field="orderItemShipGrpInvRes.quantity" to-field="orderItemShipGrpInvRes.quantityNotAvailable" operator="greater" type="Double"/>
+                                                            <if-compare-field field="orderItemShipGrpInvRes.quantity" to-field="orderItemShipGrpInvRes.quantityNotAvailable" operator="greater" type="BigDecimal"/>
                                                             <if-compare field="orderItemShipGroup.maySplit" operator="equals" value="Y"/>
                                                         </and>
                                                     </or>
@@ -342,7 +342,7 @@
             <iterate entry="orderReadyToPickInfo" list="pickMoveByShipmentMethodInfo.orderReadyToPickInfoList">
                 <iterate entry="orderItemAndShipGroupAssoc" list="orderReadyToPickInfo.orderItemAndShipGroupAssocList">
                     <if-compare value="ITEM_APPROVED" operator="equals" field="orderItemAndShipGroupAssoc.statusId">
-                        <calculate field="reservedQuantity" type="Double"><number value="0"/></calculate>
+                        <calculate field="reservedQuantity"><number value="0"/></calculate>
 
                         <set from-field="orderItemAndShipGroupAssoc.orderItemSeqId" field="itemFilterMap.orderItemSeqId"/>
                         <filter-list-by-and map="itemFilterMap" list="orderReadyToPickInfo.orderItemShipGrpInvResList" to-list="perItemResList"/>
@@ -363,7 +363,7 @@
                                 <set field="inventoryItemOrderItems.${orderItemShipGrpInvRes.inventoryItemId}" from-field="inventoryItemOrderItemList"/>
                                 <clear-field field="inventoryItemOrderItemList"/>
                                 <if-not-empty field="inventoryItemQuantities.${inventoryItemId}">
-                                    <calculate field="inventoryItemQuantities.${inventoryItemId}" type="Double">
+                                    <calculate field="inventoryItemQuantities.${inventoryItemId}">
                                         <calcop field="inventoryItemQuantities.${inventoryItemId}" operator="add">
                                             <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/>
                                         </calcop>
@@ -375,7 +375,7 @@
                             </if-compare-field>
                             <clear-field field="inventoryItem"/>
                             <!-- update total quantity reserved, picked, etc per line item to check to see if all and not more is reserved -->
-                            <calculate field="reservedQuantity" type="Double">
+                            <calculate field="reservedQuantity">
                                 <calcop field="reservedQuantity" operator="add">
                                     <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/>
                                 </calcop>
@@ -394,21 +394,18 @@
                         <!-- warn if wrong inventory has been reserved+issued -->
                         <!-- must include issued items as well, otherwise can't really do an effective check... -->
                         <get-related value-field="orderItemAndShipGroupAssoc" relation-name="ItemIssuance" list="itemIssuances"/>
-                        <calculate field="issuedQuantity" type="Double"><number value="0"/></calculate>
+                        <calculate field="issuedQuantity"><number value="0"/></calculate>
                         <iterate entry="itemIssuance" list="itemIssuances">
-                            <calculate field="issuedQuantity" type="Double">
-                                <calcop field="issuedQuantity" operator="add">
-                                    <calcop field="itemIssuance.quantity" operator="get"/>
-                                </calcop>
+                            <calculate field="issuedQuantity">
+                                <calcop field="issuedQuantity" operator="get"/>
+                                <calcop field="itemIssuance.quantity" operator="get"/>
                             </calculate>
                         </iterate>
                         <calculate field="reservedIssuedQuantity">
-                            <calcop operator="add">
-                                <calcop operator="get" field="reservedQuantity"/>
-                                <calcop operator="get" field="issuedQuantity"/>
-                            </calcop>
+                            <calcop operator="get" field="reservedQuantity"/>
+                            <calcop operator="get" field="issuedQuantity"/>
                         </calculate>
-                        <if-compare-field field="reservedIssuedQuantity" to-field="orderItemAndShipGroupAssoc.quantity" operator="not-equals" type="Double">
+                        <if-compare-field field="reservedIssuedQuantity" to-field="orderItemAndShipGroupAssoc.quantity" operator="not-equals" type="BigDecimal">
                             <set field="wrongQuantityReserved.orderItemAndShipGroupAssoc" from-field="orderItemAndShipGroupAssoc"/>
                             <set field="wrongQuantityReserved.reservedQuantity" from-field="reservedQuantity"/>
                             <set field="wrongQuantityReserved.issuedQuantity" from-field="issuedQuantity"/>
@@ -439,17 +436,17 @@
             <if>
                 <condition>
                     <and>
-                        <if-compare value="1" operator="less-equals" field="quantityNeeded" type="Double"/>
+                        <if-compare value="1" operator="less-equals" field="quantityNeeded" type="BigDecimal"/>
                         <or>
                             <and>
                                 <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId"/>
-                                <if-compare value="1" operator="less" field="quantityNeeded" type="Double"/>
+                                <if-compare value="1" operator="less" field="quantityNeeded" type="BigDecimal"/>
                             </and>
                             <and>
                                 <if-compare value="NON_SERIAL_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId"/>
                                 <or>
                                     <if-empty field="inventoryItem.quantityOnHandTotal"/>
-                                    <if-compare-field field="quantityNeeded" to-field="inventoryItem.quantityOnHandTotal" operator="greater" type="Double"/>
+                                    <if-compare-field field="quantityNeeded" to-field="inventoryItem.quantityOnHandTotal" operator="greater" type="BigDecimal"/>
                                 </or>
                             </and>
                         </or>
@@ -529,7 +526,7 @@
                             <then>
                                 <set field="quantityToSubtract" from-field="orderItemShipGrpInvRes.quantityNotAvailable"/>
                                 <log level="info" message="Subtracting ${quantityToSubtract} from ${quantityToPick}"/>
-                                <calculate field="quantityToPick" type="Double">
+                                <calculate field="quantityToPick">
                                     <calcop field="quantityToPick" operator="subtract">
                                         <calcop field="quantityToSubtract" operator="get"/>
                                     </calcop>
@@ -538,7 +535,7 @@
                         </if>
 
                         <log level="info" message="Order #${orderItemShipGrpInvRes.orderId} / ${orderItemShipGrpInvRes.orderItemSeqId} - ${quantityToPick}"/>
-                        <if-compare field="quantityToPick" value="0" operator="greater" type="Double">
+                        <if-compare field="quantityToPick" value="0" operator="greater" type="BigDecimal">
                             <clear-field field="createPicklistItemMap"/>
                             <set from-field="picklistBinId" field="createPicklistItemMap.picklistBinId"/>
                             <set field="createPicklistItemMap.itemStatusId" value="PICKITEM_PENDING"/>
@@ -862,7 +859,7 @@
                          A Map with a List of PicklistItemInfo records keyed by the productId
                 -->
                 <if-not-empty field="picklistItemInfo.inventoryItemAndLocation.locationSeqId">
-                    <make-value value-field="facilityLocation" entity-name="FacilityLocation" map-name="picklistItemInfo.inventoryItemAndLocation"/>
+                    <make-value value-field="facilityLocation" entity-name="FacilityLocation" map="picklistItemInfo.inventoryItemAndLocation"/>
                     <set from-field="facilityLocation" field="facilityLocationByLocationSeqIdMap.${facilityLocation.locationSeqId}"/>
 
                     <clear-field field="picklistItemInfoTempList"/>
@@ -915,7 +912,7 @@
         <set value="+sectionId" field="facilityLocsOrdLst[]"/>
         <set value="+levelId" field="facilityLocsOrdLst[]"/>
         <set value="+positionId" field="facilityLocsOrdLst[]"/>
-        <order-value-list list-name="facilityLocationList" order-by-list-name="facilityLocsOrdLst"/>
+        <order-value-list list="facilityLocationList" order-by-list="facilityLocsOrdLst"/>
 
         <!-- Now we have an ordered list of FacilityLocations, create a facilityLocationInfoList -->
         <iterate entry="facilityLocation" list="facilityLocationList">
@@ -925,13 +922,13 @@
 
             <!-- make the pickQuantity and quantityByPicklistBinIdMap -->
             <iterate entry="picklistItemInfo" list="facilityLocationInfo.picklistItemInfoList">
-                <calculate field="facilityLocationInfo.pickQuantity" type="Double">
+                <calculate field="facilityLocationInfo.pickQuantity">
                     <calcop field="facilityLocationInfo.pickQuantity" operator="add">
                         <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
                     </calcop>
                 </calculate>
 
-                <calculate field="facilityLocationInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}" type="Double">
+                <calculate field="facilityLocationInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}">
                     <calcop field="facilityLocationInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}" operator="add">
                         <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
                     </calcop>
@@ -957,7 +954,7 @@
                 <set from-field="quantity" field="picklistBinInfo.quantity"/>
                 <set from-field="picklistBinInfo" field="facilityLocationInfo.picklistBinInfoList[]"/>
             </iterate-map>
-            <order-map-list list-name="facilityLocationInfo.picklistBinInfoList"><order-by field-name="picklistBin.binLocationNumber"/></order-map-list>
+            <order-map-list list="facilityLocationInfo.picklistBinInfoList"><order-by field-name="picklistBin.binLocationNumber"/></order-map-list>
 
             <set from-field="facilityLocationInfo" field="facilityLocationInfoList[]"/>
         </iterate>
@@ -968,7 +965,7 @@
 
         <!-- order/sort the products -->
         <set value="+productId" field="productsOrdLst[]"/>
-        <order-value-list list-name="productList" order-by-list-name="productsOrdLst"/>
+        <order-value-list list="productList" order-by-list="productsOrdLst"/>
 
         <!-- Now we have an ordered list of Products, create a noLocationProductInfoList -->
         <iterate entry="product" list="productList">
@@ -978,13 +975,12 @@
 
             <!-- make the pickQuantity and quantityByPicklistBinIdMap -->
             <iterate entry="picklistItemInfo" list="productInfo.picklistItemInfoList">
-                <calculate field="productInfo.pickQuantity" type="Double">
-                    <calcop field="productInfo.pickQuantity" operator="add">
-                        <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
-                    </calcop>
+                <calculate field="productInfo.pickQuantity">
+                    <calcop field="productInfo.pickQuantity" operator="add"/>
+                    <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
                 </calculate>
 
-                <calculate field="productInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}" type="Double">
+                <calculate field="productInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}">
                     <calcop field="productInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}" operator="add">
                         <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
                     </calcop>
@@ -998,7 +994,7 @@
                 <set from-field="quantity" field="picklistBinInfo.quantity"/>
                 <set from-field="picklistBinInfo" field="productInfo.picklistBinInfoList[]"/>
             </iterate-map>
-            <order-map-list list-name="productInfo.picklistBinInfoList"><order-by field-name="picklistBin.binLocationNumber"/></order-map-list>
+            <order-map-list list="productInfo.picklistBinInfoList"><order-by field-name="picklistBin.binLocationNumber"/></order-map-list>
 
             <set from-field="productInfo" field="noLocationProductInfoList[]"/>
         </iterate>
@@ -1168,7 +1164,7 @@
         <set value="+sectionId" field="facilityLocsOrdLst[]"/>
         <set value="+levelId" field="facilityLocsOrdLst[]"/>
         <set value="+positionId" field="facilityLocsOrdLst[]"/>
-        <order-value-list list-name="facilityLocations" order-by-list-name="facilityLocsOrdLst"/>
+        <order-value-list list="facilityLocations" order-by-list="facilityLocsOrdLst"/>
 
         <!-- for each facility location add an entry to the inventoryItemInfoList -->
         <iterate entry="facilityLocation" list="facilityLocations">
@@ -1191,7 +1187,7 @@
 
                 <!-- before destroying inventoryItemInfo, add info to the productInfoMap -->
                 <set from-field="inventoryItemInfo.product" field="productInfoMap.${inventoryItemInfo.product.productId}.product"/>
-                <calculate field="productInfoMap.${inventoryItemInfo.product.productId}.quantity" type="Double">
+                <calculate field="productInfoMap.${inventoryItemInfo.product.productId}.quantity">
                     <calcop field="productInfoMap.${inventoryItemInfo.product.productId}.quantity" operator="get"/>
                     <calcop field="inventoryItemInfo.quantity" operator="get"/>
                 </calculate>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=731851&r1=731850&r2=731851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Mon Jan  5 23:13:36 2009
@@ -90,7 +90,7 @@
                             <not><if-empty field="parameters.serialNumber"/></not>
                             <not><if-empty field="parameters.currentInventoryItemId"/></not>
                         </or>
-                        <if-compare field="parameters.quantityAccepted" operator="greater" value="1" type="Double"/>        
+                        <if-compare field="parameters.quantityAccepted" operator="greater" value="1" type="BigDecimal"/>        
                     </and>
                 </condition>
                 <then>
@@ -99,7 +99,7 @@
             </if>
             
             <set field="loops" from-field="parameters.quantityAccepted"/>
-            <set field="parameters.quantityAccepted" value="1" type="Double"/>
+            <set field="parameters.quantityAccepted" value="1" type="BigDecimal"/>
         </if-compare>
 
         <set field="parameters.quantityOnHandDiff" from-field="parameters.quantityAccepted"/>
@@ -201,7 +201,7 @@
                 <condition-expr field-name="facilityId" operator="equals" from-field="returnHeader.destinationFacilityId"/>
             </entity-count>
 
-            <if-compare field="iiCount" operator="greater" value="0" type="Double">
+            <if-compare field="iiCount" operator="greater" value="0" type="Integer">
                 <!-- create a return shipment for this return -->
                 <set field="shipmentCtx.returnId" from-field="parameters.returnId"/>
                 <call-service service-name="createShipmentForReturn" in-map-name="shipmentCtx">
@@ -268,7 +268,7 @@
                         </if-compare>                                              
                         <if-compare field="setNonSerial" value="false" operator="equals">
                             <set field="parameters.inventoryItemTypeId" value="SERIALIZED_INV_ITEM"/>
-                            <set field="returnItem.returnQuantity" value="1" type="Double"/>
+                            <set field="returnItem.returnQuantity" value="1" type="BigDecimal"/>
                         </if-compare>
                                                 
                         <set from-field="parameters.inventoryItemTypeId" field="receiveCtx.inventoryItemTypeId"/>
@@ -283,7 +283,7 @@
 
                         <set field="receiveCtx.comments" value="Returned Item RA# ${returnItem.returnId}"/>
                         <set field="receiveCtx.datetimeReceived" from-field="nowTimestamp"/>
-                        <set field="receiveCtx.quantityRejected" value="0" type="Double"/>
+                        <set field="receiveCtx.quantityRejected" value="0" type="BigDecimal"/>
 
                         <call-service service-name="receiveInventoryProduct" in-map-name="receiveCtx"/>
                     <else>

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=731851&r1=731850&r2=731851&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 Mon Jan  5 23:13:36 2009
@@ -442,7 +442,7 @@
             <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdFrom"/>
             </if-not-empty>
-            <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field="limitOrderRole"/>
+            <clear-field field="limitRoleMap"/><clear-field field="limitOrderRoles"/><clear-field field="limitOrderRole"/>
         </if-empty>
         <!-- From: VENDOR -->
         <if-empty field="shipment.partyIdFrom">
@@ -452,7 +452,7 @@
             <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdFrom"/>
             </if-not-empty>
-            <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field="limitOrderRole"/>
+            <clear-field field="limitRoleMap"/><clear-field field="limitOrderRoles"/><clear-field field="limitOrderRole"/>
         </if-empty>
 
         <!-- To: SHIP_TO_CUSTOMER -->
@@ -463,7 +463,7 @@
             <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdTo"/>
             </if-not-empty>
-            <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field="limitOrderRole"/>
+            <clear-field field="limitRoleMap"/><clear-field field="limitOrderRoles"/><clear-field field="limitOrderRole"/>
         </if-empty>
         <!-- To: CUSTOMER -->
         <if-empty field="shipment.partyIdTo">
@@ -473,7 +473,7 @@
             <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdTo"/>
             </if-not-empty>
-            <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field="limitOrderRole"/>
+            <clear-field field="limitRoleMap"/><clear-field field="limitOrderRoles"/><clear-field field="limitOrderRole"/>
         </if-empty>
 
         <entity-and entity-name="OrderContactMech" list="orderContactMechs">
@@ -764,11 +764,10 @@
                 <field-map field-name="orderItemSeqId" from-field="issuance.orderItemSeqId"/>
             </entity-and>
             <iterate list="receipts" entry="receipt">
-                <calculate field="issuanceQuantity" type="Double">
-                    <calcop field="receipt.quantityAccepted" operator="add">
-                        <calcop field="receipt.quantityRejected" operator="get"/>
-                        <calcop field="issuanceQuantity" operator="get"/>
-                    </calcop>
+                <calculate field="issuanceQuantity">
+                    <calcop field="receipt.quantityAccepted" operator="get"/>
+                    <calcop field="receipt.quantityRejected" operator="get"/>
+                    <calcop field="issuanceQuantity" operator="get"/>
                 </calculate>
             </iterate>
             <set field="issuance.quantity" from-field="issuanceQuantity"/>
@@ -835,7 +834,7 @@
         </call-service>
         
         <!-- reduce the originalShipmentItem.quantity  -->
-        <calculate field="originalShipmentItem.quantity" type="Double">
+        <calculate field="originalShipmentItem.quantity">
             <calcop operator="add" field="originalShipmentItem.quantity">
                 <calcop operator="negative" field="parameters.newItemQuantity"/>
             </calcop>
@@ -853,12 +852,12 @@
         
         <set field="orderShipmentQuantityLeft" from-field="parameters.newItemQuantity"/>
         <iterate entry="itemOrderShipment" list="itemOrderShipmentList">
-            <if-compare field="orderShipmentQuantityLeft" operator="greater" value="0" type="Double">
-                <if-compare-field field="itemOrderShipment.quantity" to-field="orderShipmentQuantityLeft" operator="greater" type="Double">
+            <if-compare field="orderShipmentQuantityLeft" operator="greater" value="0" type="BigDecimal">
+                <if-compare-field field="itemOrderShipment.quantity" to-field="orderShipmentQuantityLeft" operator="greater" type="BigDecimal">
                     <!-- there is enough in this OrderShipment record, so just adjust it and move on -->
                     <clear-field field="updateOrderShipmentMap"/>
                     <set-service-fields service-name="updateOrderShipment" map="itemOrderShipment" to-map="updateOrderShipmentMap"/>
-                    <calculate field="updateOrderShipmentMap.quantity" type="Double">
+                    <calculate field="updateOrderShipmentMap.quantity">
                         <calcop operator="add" field="itemOrderShipment.quantity">
                             <calcop operator="negative" field="orderShipmentQuantityLeft"/>
                         </calcop>
@@ -873,7 +872,7 @@
                     <set field="createOrderShipmentMap.quantity" from-field="orderShipmentQuantityLeft"/>
                     <call-service service-name="createOrderShipment" in-map-name="createOrderShipmentMap"/>
                     
-                    <set field="orderShipmentQuantityLeft" value="0" type="Double"/>
+                    <set field="orderShipmentQuantityLeft" value="0" type="BigDecimal"/>
                     
                     <else>
                         <!-- not enough on this one, create a new one for the new item and delete this one -->
@@ -889,10 +888,9 @@
                         <set field="createOrderShipmentMap.quantity" from-field="itemOrderShipment.quantity"/>
                         <call-service service-name="createOrderShipment" in-map-name="createOrderShipmentMap"/>
                         
-                        <calculate field="orderShipmentQuantityLeft" type="Double">
-                            <calcop operator="add" field="orderShipmentQuantityLeft">
-                                <calcop operator="negative" field="itemOrderShipment.quantity"></calcop>
-                            </calcop>
+                        <calculate field="orderShipmentQuantityLeft">
+                            <calcop operator="get" field="orderShipmentQuantityLeft"/>
+                            <calcop operator="negative" field="itemOrderShipment.quantity"/>
                         </calculate>
                     </else>
                 </if-compare-field>
@@ -1043,8 +1041,9 @@
             </call-service>
         <else>
             <!-- add the quantities and store it -->            
-            <calculate field="shipmentPackageContent.quantity" type="Double">
-                <calcop field="shipmentPackageContent.quantity" operator="add"><calcop field="parameters.quantity" operator="get"/></calcop>
+            <calculate field="shipmentPackageContent.quantity">
+                <calcop field="shipmentPackageContent.quantity" operator="add"/>
+                <calcop field="parameters.quantity" operator="get"/>
             </calculate>
             <set-service-fields service-name="updateShipmentPackageContent" map="shipmentPackageContent" to-map="updateSPCMap"/>
             <call-service service-name="updateShipmentPackageContent" in-map-name="updateSPCMap"/>
@@ -1606,7 +1605,7 @@
                     </if-compare>
                 </if-not-empty>
             </iterate>
-            <field-to-result field="shipmentId" map-name="parameters"/>
+            <field-to-result field="parameters.shipmentId" result-name="shipmentId"/>
         </iterate>
     </simple-method>
     
@@ -1666,7 +1665,7 @@
         <set from-field="itemIssuance.quantity" field="shipItemContext.quantity"/>
         <call-service service-name="addShipmentContentToPackage" in-map-name="shipItemContext">
             <result-to-field result-name="shipmentPackageSeqId" field="packageMap.${parameters.trackingNum}"/>
-            <result-to-field result-name="shipmentPackageSeqId" map-name="routeSegLookup"/>
+            <result-to-field result-name="shipmentPackageSeqId" field="routeSegLookup.shipmentPackageSeqId"/>
         </call-service>
         
         <if-not-empty field="routeSegLookup.shipmentPackageSeqId">
@@ -1795,7 +1794,7 @@
             <set from-field="itemIssuance.quantity" field="shipItemContext.quantity"/>
             <call-service service-name="addShipmentContentToPackage" in-map-name="shipItemContext">
                 <result-to-field result-name="shipmentPackageSeqId" field="packageMap.${itemMap.trackingNum}"/>
-                <result-to-field result-name="shipmentPackageSeqId" map-name="routeSegLookup"/>
+                <result-to-field result-name="shipmentPackageSeqId" field="routeSegLookup.shipmentPackageSeqId"/>
             </call-service>
 
             <if-not-empty field="routeSegLookup.shipmentPackageSeqId">
@@ -1855,13 +1854,13 @@
         <set from-field="parameters.orderItemSeqId" field="inMap.orderItemSeqId"/>
         <call-service service-name="deleteOrderShipment" in-map-name="inMap"/>
 
-        <calculate field="shipmentItem.quantity" type="Double">
+        <calculate field="shipmentItem.quantity">
             <calcop field="shipmentItem.quantity" operator="subtract">
                 <calcop field="orderShipment.quantity" operator="get"/>
             </calcop>
         </calculate>
         <clear-field field="inMap"/>
-        <if-compare field="shipmentItem.quantity" operator="greater" value="0.0" type="Double">
+        <if-compare field="shipmentItem.quantity" operator="greater" value="0.0" type="BigDecimal">
             <set from-field="parameters.userLogin" field="inMap.userLogin"/>
             <set from-field="parameters.shipmentId" field="inMap.shipmentId"/>
             <set from-field="parameters.shipmentItemSeqId" field="inMap.shipmentItemSeqId"/>
@@ -1888,7 +1887,7 @@
         </check-permission>
 
         <!-- if quantity is greater than 0 we add or update the ShipmentPlan -->
-        <if-compare field="parameters.quantity" operator="greater" value="0" type="Double">
+        <if-compare field="parameters.quantity" operator="greater" value="0" type="BigDecimal">
 
             <!-- get orderHeader -->
             <make-value entity-name="OrderHeader" value-field="orderHeaderLookupPk"/>
@@ -1919,7 +1918,7 @@
                 <result-to-field result-name="remainingQuantity" field="remainingQuantity"/>
             </call-service>
 
-            <if-compare-field field="parameters.quantity" to-field="remainingQuantity" operator="greater" type="Double">
+            <if-compare-field field="parameters.quantity" to-field="remainingQuantity" operator="greater" type="BigDecimal">
                 <string-to-list string="Not adding Order Item to plan for shipment [${parameters.shipmentId}] because the quantity is greater than the remaining quantity (order [${parameters.orderId}], order item [${parameters.orderItemSeqId}])" list="error_list"/>
             </if-compare-field>
             <check-errors/>
@@ -1951,7 +1950,7 @@
         <set from-field="parameters.orderItemSeqId" field="orderShipmentLookup.orderItemSeqId"/>
         <find-by-and entity-name="OrderShipment" map="orderShipmentLookup" list="existingOrderShipments"/>
         <iterate list="existingOrderShipments" entry="orderShipment">
-            <calculate field="plannedQuantity" type="Double">
+            <calculate field="plannedQuantity">
                 <calcop field="plannedQuantity" operator="add">
                     <calcop field="orderShipment.quantity" operator="get"/>
                 </calcop>
@@ -1960,20 +1959,18 @@
         <clear-field field="existingOrderShipments"/>
         <find-by-and entity-name="ItemIssuance" map="orderShipmentLookup" list="existingOrderShipments"/>
         <iterate list="existingOrderShipments" entry="itemIssuance">
-            <calculate field="issuedQuantity" type="Double">
-                <calcop field="issuedQuantity" operator="add">
-                    <calcop field="itemIssuance.quantity" operator="get"/>
-                    <calcop field="itemIssuance.cancelQuantity" operator="negative"/>                    
-                </calcop>
+            <calculate field="issuedQuantity">
+                <calcop field="issuedQuantity" operator="get"/>
+                <calcop field="itemIssuance.quantity" operator="get"/>
+                <calcop field="itemIssuance.cancelQuantity" operator="negative"/>                    
             </calculate>
         </iterate>
 
-        <calculate field="totPlannedOrIssuedQuantity" type="Double">
-            <calcop field="issuedQuantity" operator="add">
-                <calcop field="plannedQuantity" operator="get"/>
-            </calcop>
+        <calculate field="totPlannedOrIssuedQuantity">
+            <calcop field="issuedQuantity" operator="get"/>
+            <calcop field="plannedQuantity" operator="get"/>
         </calculate>
-        <calculate field="remainingQuantity" type="Double">
+        <calculate field="remainingQuantity">
             <calcop field="orderItem.quantity" operator="subtract">
                 <calcop field="orderItem.cancelQuantity" operator="get"/>
                 <calcop field="totPlannedOrIssuedQuantity" operator="get"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml?rev=731851&r1=731850&r2=731851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml Mon Jan  5 23:13:36 2009
@@ -25,7 +25,7 @@
         <set field="packSingleItemInMap.productId" value="GZ-2644"/>
         <set field="packSingleItemInMap.orderId" value="DEMO10090"/>
         <set field="packSingleItemInMap.shipGroupSeqId" value="00001"/>
-        <set field="packSingleItemInMap.quantity" value="1" type="Double"/>
+        <set field="packSingleItemInMap.quantity" value="1" type="BigDecimal"/>
         <set field="packSingleItemInMap.packageSeq" value="1" type="Integer"/>
         <set field="packSingleItemInMap.pickerPartyId" value="DemoCustomer"/>
         <set field="packSingleItemInMap.handlingInstructions" value="Handle with care"/>
@@ -62,7 +62,7 @@
         <set field="completePackInMap.packingSession" from-field="packingSession"/>
         <set field="completePackInMap.handlingInstructions" value="Handle with care"/>
         <set field="completePackInMap.pickerPartyId" value="DemoCustomer"/>
-        <set field="completePackInMap.additionalShippingCharge" value="10.0" type="Double"/>
+        <set field="completePackInMap.additionalShippingCharge" value="10.0" type="BigDecimal"/>
         <set field="completePackInMap.forceComplete" value="Y" type="Boolean"/>
         <set field="completePackInMap.userLogin" from-field="userLogin"/>
         
@@ -161,9 +161,9 @@
         <set field="serviceCtx.userLogin" from-field="userLogin"/>
         <set field="serviceCtx.facilityId" value="WebStoreWarehouse"/>
         <set field="serviceCtx.productId" value="GZ-2644"/>
-        <set field="serviceCtx.quantityAccepted" value="5" type="Double"/>
-        <set field="serviceCtx.quantityRejected" value="0" type="Double"/>
-        <set field="serviceCtx.unitCost" value="24" type="Double"/>
+        <set field="serviceCtx.quantityAccepted" value="5" type="BigDecimal"/>
+        <set field="serviceCtx.quantityRejected" value="0" type="BigDecimal"/>
+        <set field="serviceCtx.unitCost" value="24" type="BigDecimal"/>
         <set field="serviceCtx.inventoryItemTypeId" value="NON_SERIAL_INV_ITEM"/>
         <set field="serviceCtx.datetimeReceived" from-field="nowTimeStamp"/>
         <call-service service-name="receiveInventoryProduct" in-map-name="serviceCtx">

Modified: ofbiz/trunk/applications/product/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/secas.xml?rev=731851&r1=731850&r2=731851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/secas.xml Mon Jan  5 23:13:36 2009
@@ -80,7 +80,7 @@
         <action service="saveProductPriceChange" mode="sync"/>
     </eca>
     <eca service="updateProductPrice" event="commit">
-        <condition-field field-name="price" operator="not-equals" to-field-name="oldPrice" type="Double"/>
+        <condition-field field-name="price" operator="not-equals" to-field-name="oldPrice" type="BigDecimal"/>
         <action service="saveProductPriceChange" mode="sync"/>
     </eca>
     <eca service="deleteProductPrice" event="commit">

Modified: ofbiz/trunk/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=731851&r1=731850&r2=731851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services.xml Mon Jan  5 23:13:36 2009
@@ -180,7 +180,7 @@
                 location="org/ofbiz/product/product/ProductServices.xml" invoke="countProductQuantityOrdered" auth="true">
         <description>count Product Quantity Ordered</description>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
-        <attribute name="quantity" type="Double" mode="IN" optional="false"/>
+        <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/>
     </service>
 
     <service name="createProductReview" engine="simple"
@@ -189,7 +189,7 @@
         <attribute name="productStoreId" type="String" mode="IN" optional="false"/>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
         <attribute name="postedAnonymous" type="Boolean" mode="IN" optional="true"/>
-        <attribute name="productRating" type="Double" mode="IN" optional="false"/>
+        <attribute name="productRating" type="BigDecimal" mode="IN" optional="false"/>
         <attribute name="productReview" type="String" mode="IN" optional="true"/>
         <attribute name="productReviewId" type="String" mode="OUT" optional="false"/>
     </service>
@@ -259,14 +259,14 @@
             <exclude field-name="lastModifiedDate"/>
             <exclude field-name="lastModifiedByUserLogin"/>
         </auto-attributes>
-        <attribute name="oldPrice" type="Double" mode="OUT" optional="false"/>
+        <attribute name="oldPrice" type="BigDecimal" mode="OUT" optional="false"/>
         <override name="price" optional="false"/>
     </service>
     <service name="deleteProductPrice" default-entity-name="ProductPrice" engine="simple"
                 location="org/ofbiz/product/price/PriceServices.xml" invoke="deleteProductPrice" auth="true">
         <description>Delete an ProductPrice</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
-        <attribute name="oldPrice" type="Double" mode="OUT" optional="false"/>
+        <attribute name="oldPrice" type="BigDecimal" mode="OUT" optional="false"/>
     </service>
 
     <!-- called by ECAs on ProductPrice service call events -->
@@ -275,7 +275,7 @@
         <description>Save History of a ProductPrice Change</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
-        <attribute name="oldPrice" type="Double" mode="IN" optional="true"/>
+        <attribute name="oldPrice" type="BigDecimal" mode="IN" optional="true"/>
     </service>
 
     <!-- Product PaymentMethodType Services -->
@@ -718,8 +718,8 @@
         <auto-attributes entity-name="Product" include="nonpk" mode="IN" optional="true"/>
         <attribute name="productFeatureIdByType" type="java.util.Map" mode="IN" optional="false" string-map-prefix="pft_"/>
         <attribute name="productFeatureSelectableByType" type="java.util.Map" mode="IN" optional="false" string-map-prefix="pftsel_"/>
-        <attribute name="defaultPrice" type="Double" mode="IN" optional="true"/>
-        <attribute name="averageCost" type="Double" mode="IN" optional="true"/>
+        <attribute name="defaultPrice" type="BigDecimal" mode="IN" optional="true"/>
+        <attribute name="averageCost" type="BigDecimal" mode="IN" optional="true"/>
         <attribute name="currencyUomId" type="String" mode="IN" optional="true"/>
     </service>
 
@@ -942,12 +942,12 @@
         <description></description>
         <attribute name="productName" type="String" mode="IN" optional="false"/>
         <attribute name="productStoreId" type="String" mode="IN" optional="false"/>
-        <attribute name="price" type="Double" mode="IN" optional="false"/>
+        <attribute name="price" type="BigDecimal" mode="IN" optional="false"/>
         <attribute name="description" type="String" mode="IN" optional="true"/>
         <attribute name="currencyUomId" type="String" mode="IN" optional="true"/>
         <attribute name="productId" type="String" mode="OUT" optional="false"/>
         <attribute name="currencyUomId" type="String" mode="OUT" optional="false"/>
-        <attribute name="minimumOrderQuantity" type="Double" mode="OUT" optional="false"/>
+        <attribute name="minimumOrderQuantity" type="BigDecimal" mode="OUT" optional="false"/>
         <attribute name="availableFromDate" type="Timestamp" mode="OUT" optional="false"/>
     </service>
     <service name="updateCustomerDigitalDownloadProduct" auth="true" engine="simple"
@@ -955,11 +955,11 @@
         <description></description>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
         <attribute name="currencyUomId" type="String" mode="IN" optional="false"/>
-        <attribute name="minimumOrderQuantity" type="Double" mode="IN" optional="false"/>
+        <attribute name="minimumOrderQuantity" type="BigDecimal" mode="IN" optional="false"/>
         <attribute name="availableFromDate" type="Timestamp" mode="IN" optional="false"/>
         <attribute name="productName" type="String" mode="IN" optional="true"/>
         <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="price" type="Double" mode="IN" optional="true"/>
+        <attribute name="price" type="BigDecimal" mode="IN" optional="true"/>
     </service>
     <service name="deleteCustomerDigitalDownloadProduct" auth="true" engine="simple"
         location="org/ofbiz/product/product/CustomerDigitalDownloadServices.xml" invoke="deleteCustomerDigitalDownloadProduct">

Modified: ofbiz/trunk/applications/product/servicedef/services_cost.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_cost.xml?rev=731851&r1=731850&r2=731851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_cost.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_cost.xml Mon Jan  5 23:13:36 2009
@@ -62,7 +62,7 @@
         <attribute mode="IN" name="productId" optional="false" type="String"/>
         <attribute mode="IN" name="currencyUomId" optional="false" type="String"/>
         <attribute mode="IN" name="costComponentTypePrefix" optional="false" type="String"/>
-        <attribute mode="OUT" name="productCost" type="Double" optional="false"/>
+        <attribute mode="OUT" name="productCost" type="BigDecimal" optional="false"/>
     </service>
     <service name="getTaskCost" engine="simple" auth="true"
                 location="org/ofbiz/product/cost/CostServices.xml" invoke="getTaskCost">
@@ -71,7 +71,7 @@
         <attribute mode="IN" name="currencyUomId" optional="false" type="String"/>
         <attribute mode="IN" name="productId" optional="true" type="String"/>
         <attribute mode="IN" name="routingId" optional="true" type="String"/>
-        <attribute mode="OUT" name="taskCost" type="Double" optional="false"/>
+        <attribute mode="OUT" name="taskCost" type="BigDecimal" optional="false"/>
     </service>
     <service name="calculateProductCosts" engine="simple" auth="true"
                 location="org/ofbiz/product/cost/CostServices.xml" invoke="calculateProductCosts">
@@ -79,7 +79,7 @@
         <attribute mode="IN" name="productId" optional="false" type="String"/>
         <attribute mode="IN" name="currencyUomId" optional="false" type="String"/>
         <attribute mode="IN" name="costComponentTypePrefix" optional="false" type="String"/>
-        <attribute mode="OUT" name="totalCost" type="Double"/>
+        <attribute mode="OUT" name="totalCost" type="BigDecimal"/>
     </service>
     <service name="calculateAllProductsCosts" engine="simple" auth="true" transaction-timeout="7200"
                 location="org/ofbiz/product/cost/CostServices.xml" invoke="calculateAllProductsCosts">

Modified: ofbiz/trunk/applications/product/servicedef/services_facility.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_facility.xml?rev=731851&r1=731850&r2=731851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_facility.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_facility.xml Mon Jan  5 23:13:36 2009
@@ -53,8 +53,8 @@
         <description>
         </description>
         <attribute name="inventoryItemId" type="String" mode="IN" optional="false"/>
-        <attribute name="availableToPromiseTotal" type="Double" mode="IN" optional="true"/>
-        <attribute name="quantityOnHandTotal" type="Double" mode="IN" optional="true"/>
+        <attribute name="availableToPromiseTotal" type="BigDecimal" mode="IN" optional="true"/>
+        <attribute name="quantityOnHandTotal" type="BigDecimal" mode="IN" optional="true"/>
     </service>
 
     <service name="updateInventoryItem" default-entity-name="InventoryItem" engine="simple"
@@ -146,16 +146,16 @@
         <attribute name="productId" type="String" mode="IN" optional="false"/>
         <attribute name="facilityId" type="String" mode="IN" optional="true"/>
         <attribute name="statusId" type="String" mode="IN" optional="true"/>
-        <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/>
-        <attribute name="availableToPromiseTotal" type="Double" mode="OUT" optional="false"/>
+        <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/>
+        <attribute name="availableToPromiseTotal" type="BigDecimal" mode="OUT" optional="false"/>
     </service>
     <service name="getProductInventoryAvailable" engine="simple"
                 location="org/ofbiz/product/inventory/InventoryServices.xml" invoke="getProductInventoryAvailable" auth="false" use-transaction="false">
         <description>Get Inventory Availability for a Product</description>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
         <attribute name="statusId" type="String" mode="IN" optional="true"/>
-        <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/>
-        <attribute name="availableToPromiseTotal" type="Double" mode="OUT" optional="false"/>
+        <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/>
+        <attribute name="availableToPromiseTotal" type="BigDecimal" mode="OUT" optional="false"/>
         <attribute name="useCache" type="Boolean" mode="IN" optional="true"/>
     </service>
     <service name="getInventoryAvailableByFacility" engine="simple"
@@ -164,8 +164,8 @@
         <attribute name="productId" type="String" mode="IN" optional="false"/>
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="statusId" type="String" mode="IN" optional="true"/>
-        <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/>
-        <attribute name="availableToPromiseTotal" type="Double" mode="OUT" optional="false"/>
+        <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/>
+        <attribute name="availableToPromiseTotal" type="BigDecimal" mode="OUT" optional="false"/>
         <attribute name="useCache" type="Boolean" mode="IN" optional="true"/>
     </service>
     <service name="getInventoryAvailableByLocation" engine="simple"
@@ -175,8 +175,8 @@
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="locationSeqId" type="String" mode="IN" optional="false"/>
         <attribute name="statusId" type="String" mode="IN" optional="true"/>
-        <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/>
-        <attribute name="availableToPromiseTotal" type="Double" mode="OUT" optional="false"/>
+        <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/>
+        <attribute name="availableToPromiseTotal" type="BigDecimal" mode="OUT" optional="false"/>
         <attribute name="useCache" type="Boolean" mode="IN" optional="true"/>
     </service>
     <service name="getInventoryAvailableByContainer" engine="simple"
@@ -185,15 +185,15 @@
         <attribute name="productId" type="String" mode="IN" optional="false"/>
         <attribute name="containerId" type="String" mode="IN" optional="false"/>
         <attribute name="statusId" type="String" mode="IN" optional="true"/>
-        <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/>
-        <attribute name="availableToPromiseTotal" type="Double" mode="OUT" optional="false"/>
+        <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/>
+        <attribute name="availableToPromiseTotal" type="BigDecimal" mode="OUT" optional="false"/>
     </service>
     <service name="getInventoryAvailableByItem" engine="simple"
              location="org/ofbiz/product/inventory/InventoryServices.xml" invoke="getProductInventoryAvailable" auth="false" use-transaction="false">
         <description>Get Inventory Availability for an InventoryItem</description>
         <attribute name="inventoryItemId" type="String" mode="IN" optional="false"/>
-        <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/>
-        <attribute name="availableToPromiseTotal" type="Double" mode="OUT" optional="false"/>
+        <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/>
+        <attribute name="availableToPromiseTotal" type="BigDecimal" mode="OUT" optional="false"/>
         <attribute name="useCache" type="Boolean" mode="IN" optional="true"/>
     </service>
     <service name="getProductInventoryAvailableFromAssocProducts" engine="java"
@@ -205,8 +205,8 @@
         <attribute name="facilityId" type="String" mode="IN" optional="true"/>
         <attribute name="assocProducts" type="List" mode="IN" optional="false"/>
         <attribute name="statusId" type="String" mode="IN" optional="true"/>
-        <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/>
-        <attribute name="availableToPromiseTotal" type="Double" mode="OUT" optional="false"/>
+        <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/>
+        <attribute name="availableToPromiseTotal" type="BigDecimal" mode="OUT" optional="false"/>
     </service>
     <service name="getProductInventorySummaryForItems" engine="java"
                 location="org.ofbiz.product.inventory.InventoryServices" invoke="getProductInventorySummaryForItems" auth="false" use-transaction="false">
@@ -230,13 +230,13 @@
         <attribute name="statusId" type="String" mode="IN" optional="true"/>
         <attribute name="totalQuantityOnHand" mode="OUT" type="String" optional="true"/>
         <attribute name="totalAvailableToPromise" mode="OUT" type="String" optional="true"/>
-        <attribute name="quantityOnOrder" mode="OUT" type="Double" optional="true"/>
-        <attribute name="offsetQOHQtyAvailable" mode="OUT" type="Integer" optional="true"/>
-        <attribute name="offsetATPQtyAvailable" mode="OUT" type="Integer" optional="true"/>
-        <attribute name="defultPrice" mode="OUT" type="Double" optional="true"/>
-        <attribute name="listPrice" mode="OUT" type="Double" optional="true"/>
-        <attribute name="wholeSalePrice" mode="OUT" type="Double" optional="true"/>
-        <attribute name="usageQuantity" mode="OUT" type="Double" optional="true"/>
+        <attribute name="quantityOnOrder" mode="OUT" type="BigDecimal" optional="true"/>
+        <attribute name="offsetQOHQtyAvailable" mode="OUT" type="BigDecimal" optional="true"/>
+        <attribute name="offsetATPQtyAvailable" mode="OUT" type="BigDecimal" optional="true"/>
+        <attribute name="defultPrice" mode="OUT" type="BigDecimal" optional="true"/>
+        <attribute name="listPrice" mode="OUT" type="BigDecimal" optional="true"/>
+        <attribute name="wholeSalePrice" mode="OUT" type="BigDecimal" optional="true"/>
+        <attribute name="usageQuantity" mode="OUT" type="BigDecimal" optional="true"/>
     </service>
     
     <service name="checkInventoryAvailability" engine="java"
@@ -277,7 +277,7 @@
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="orderItemSeqId" type="String" mode="IN" optional="false"/>
         <attribute name="shipGroupSeqId" type="String" mode="IN" optional="false"/>
-        <attribute name="quantity" type="Double" mode="IN" optional="false"/>
+        <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/>
         <attribute name="reservedDatetime" type="Timestamp" mode="IN" optional="true"/>
         <attribute name="requireInventory" type="String" mode="IN" optional="false"/>
         <attribute name="serialNumber" type="String" mode="IN" optional="true"/>        
@@ -295,12 +295,12 @@
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="orderItemSeqId" type="String" mode="IN" optional="false"/>
         <attribute name="shipGroupSeqId" type="String" mode="IN" optional="false"/>
-        <attribute name="quantity" type="Double" mode="IN" optional="false"/>
+        <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/>
         <attribute name="reservedDatetime" type="Timestamp" mode="IN" optional="true"/>
         <attribute name="requireInventory" type="String" mode="IN" optional="false"/>
         <attribute name="reserveOrderEnumId" type="String" mode="IN" optional="false"/>
         <attribute name="sequenceId" type="Long" mode="IN" optional="true"/>
-        <attribute name="quantityNotReserved" type="Double" mode="OUT" optional="false"/>
+        <attribute name="quantityNotReserved" type="BigDecimal" mode="OUT" optional="false"/>
     </service>
     <service name="reserveProductInventoryByFacility" engine="simple"
                 location="org/ofbiz/product/inventory/InventoryReserveServices.xml" invoke="reserveProductInventory" auth="true">
@@ -313,12 +313,12 @@
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="orderItemSeqId" type="String" mode="IN" optional="false"/>
         <attribute name="shipGroupSeqId" type="String" mode="IN" optional="false"/>
-        <attribute name="quantity" type="Double" mode="IN" optional="false"/>
+        <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/>
         <attribute name="reservedDatetime" type="Timestamp" mode="IN" optional="true"/>
         <attribute name="requireInventory" type="String" mode="IN" optional="false"/>
         <attribute name="reserveOrderEnumId" type="String" mode="IN" optional="true"/>
         <attribute name="sequenceId" type="Long" mode="IN" optional="true"/>
-        <attribute name="quantityNotReserved" type="Double" mode="OUT" optional="false"/>
+        <attribute name="quantityNotReserved" type="BigDecimal" mode="OUT" optional="false"/>
     </service>
     <service name="reserveProductInventoryByContainer" engine="simple"
                 location="org/ofbiz/product/inventory/InventoryReserveServices.xml" invoke="reserveProductInventory" auth="true">
@@ -331,12 +331,12 @@
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="orderItemSeqId" type="String" mode="IN" optional="false"/>
         <attribute name="shipGroupSeqId" type="String" mode="IN" optional="false"/>
-        <attribute name="quantity" type="Double" mode="IN" optional="false"/>
+        <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/>
         <attribute name="reservedDatetime" type="Timestamp" mode="IN" optional="true"/>
         <attribute name="requireInventory" type="String" mode="IN" optional="false"/>
         <attribute name="reserveOrderEnumId" type="String" mode="IN" optional="true"/>
         <attribute name="sequenceId" type="Long" mode="IN" optional="true"/>
-        <attribute name="quantityNotReserved" type="Double" mode="OUT" optional="false"/>
+        <attribute name="quantityNotReserved" type="BigDecimal" mode="OUT" optional="false"/>
     </service>
     <service name="reserveOrderItemInventory" engine="simple"
                 location="org/ofbiz/product/inventory/InventoryReserveServices.xml" invoke="reserveOrderItemInventory" auth="true">
@@ -366,13 +366,13 @@
         <attribute name="orderId" type="String" mode="IN" optional="false"/>
         <attribute name="orderItemSeqId" type="String" mode="IN" optional="false"/>
         <attribute name="shipGroupSeqId" type="String" mode="IN" optional="true"/>
-        <attribute name="cancelQuantity" type="Double" mode="IN" optional="true"/>
+        <attribute name="cancelQuantity" type="BigDecimal" mode="IN" optional="true"/>
     </service>
     <service name="cancelOrderItemShipGrpInvRes" engine="simple"
                 location="org/ofbiz/product/inventory/InventoryReserveServices.xml" invoke="cancelOrderItemShipGrpInvRes" auth="true">
         <description>Cancels an inventory reservation</description>
         <auto-attributes entity-name="OrderItemShipGrpInvRes" include="pk" mode="IN" optional="false"/>
-        <attribute name="cancelQuantity" type="Double" mode="IN" optional="true"/>
+        <attribute name="cancelQuantity" type="BigDecimal" mode="IN" optional="true"/>
     </service>
 
     <service name="interfaceInventoryTransfer" engine="interface" location="" invoke="">
@@ -395,7 +395,7 @@
         <description>Create an inventory transfer.  Uses the prepareInventoryTransfer service; see comments there about transfer quantities and inventory items.</description>
         <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
         <implements service="interfaceInventoryTransfer"/>
-        <attribute name="xferQty" type="Double" mode="IN" optional="false"/>
+        <attribute name="xferQty" type="BigDecimal" mode="IN" optional="false"/>
         <attribute name="inventoryTransferId" type="String" mode="OUT" optional="false"/>
     </service>
     <service name="updateInventoryTransfer" engine="simple"
@@ -409,7 +409,7 @@
             location="org.ofbiz.product.inventory.InventoryServices" invoke="prepareInventoryTransfer">
         <description>Prepares inventory item for transfer.  If the xferQty is less than quantityOnHandTotal of the inventory item, then the inventory
                 item is "split," and an new inventory item will be created with xferQty and used for the inventory transfer.</description> <attribute name="inventoryItemId" type="String" mode="INOUT" optional="false"/>
-        <attribute name="xferQty" type="Double" mode="IN" optional="false"/>
+        <attribute name="xferQty" type="BigDecimal" mode="IN" optional="false"/>
     </service>
     <service name="completeInventoryTransfer" engine="java"
             location="org.ofbiz.product.inventory.InventoryServices" invoke="completeInventoryTransfer">
@@ -431,9 +431,9 @@
         <attribute name="facilityIdTo" type="String" mode="IN" optional="false"/>
         <attribute name="sendDate" type="Timestamp" mode="IN" optional="true"/>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
-        <attribute name="quantity" type="Double" mode="IN" optional="false"/>
+        <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/>
         <attribute name="reserveOrderEnumId" type="String" mode="IN" optional="true"/>
-        <attribute name="quantityNotTransferred" type="Double" mode="OUT" optional="false"/>
+        <attribute name="quantityNotTransferred" type="BigDecimal" mode="OUT" optional="false"/>
     </service>
 
     <service name="issueImmediatelyFulfilledOrder" engine="simple"
@@ -801,7 +801,7 @@
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="locationSeqId" type="String" mode="IN" optional="false"/>
         <attribute name="targetLocationSeqId" type="String" mode="IN" optional="false"/>
-        <attribute name="quantityMoved" type="Double" mode="IN" optional="false"/>
+        <attribute name="quantityMoved" type="BigDecimal" mode="IN" optional="false"/>
         <attribute name="warningMessageList" type="List" mode="INOUT" optional="true"/>
     </service>
     <!-- Inventory Label Services -->

Modified: ofbiz/trunk/applications/product/servicedef/services_feature.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_feature.xml?rev=731851&r1=731850&r2=731851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_feature.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_feature.xml Mon Jan  5 23:13:36 2009
@@ -47,8 +47,8 @@
         <attribute name="productFeatureCategoryId" type="String" mode="IN" optional="true"/>
         <attribute name="description" type="String" mode="IN" optional="false"/>
         <attribute name="uomId" type="String" mode="IN" optional="true"/>
-        <attribute name="numberSpecified" type="Double" mode="IN" optional="true"/>
-        <attribute name="defaultAmount" type="Double" mode="IN" optional="true"/>
+        <attribute name="numberSpecified" type="BigDecimal" mode="IN" optional="true"/>
+        <attribute name="defaultAmount" type="BigDecimal" mode="IN" optional="true"/>
         <attribute name="productFeatureId" type="String" mode="IN" optional="true"/>
         <attribute name="productFeatureId" type="String" mode="OUT" optional="false"/>
         <attribute name="defaultSequenceNum" type="Long" mode="IN" optional="true"/>
@@ -63,8 +63,8 @@
         <attribute name="productFeatureCategoryId" type="String" mode="IN" optional="true"/>
         <attribute name="description" type="String" mode="IN" optional="false"/>
         <attribute name="uomId" type="String" mode="IN" optional="true"/>
-        <attribute name="numberSpecified" type="Double" mode="IN" optional="true"/>
-        <attribute name="defaultAmount" type="Double" mode="IN" optional="true"/>
+        <attribute name="numberSpecified" type="BigDecimal" mode="IN" optional="true"/>
+        <attribute name="defaultAmount" type="BigDecimal" mode="IN" optional="true"/>
         <attribute name="defaultSequenceNum" type="Long" mode="IN" optional="true"/>
         <attribute name="idCode" type="String" mode="IN" optional="true"/>
         <attribute name="abbrev" type="String" mode="IN" optional="true"/>
@@ -81,7 +81,7 @@
         <attribute name="fromDate" type="java.sql.Timestamp" mode="IN" optional="true"/>
         <attribute name="thruDate" type="java.sql.Timestamp" mode="IN" optional="true"/>
         <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/>
-        <attribute name="amount" type="Double" mode="IN" optional="true"/>
+        <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/>
     </service>
     <service name="updateFeatureToProductApplication" engine="simple"
                 location="org/ofbiz/product/feature/ProductFeatureServices.xml" invoke="updateFeatureToProductApplication" auth="true">
@@ -92,7 +92,7 @@
         <attribute name="fromDate" type="java.sql.Timestamp" mode="IN" optional="false"/>
         <attribute name="thruDate" type="java.sql.Timestamp" mode="IN" optional="true"/>
         <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/>
-        <attribute name="amount" type="Double" mode="IN" optional="true"/>
+        <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/>
     </service>
     <service name="removeFeatureFromProduct" engine="simple"
                 location="org/ofbiz/product/feature/ProductFeatureServices.xml" invoke="removeFeatureFromProduct" auth="true">

Modified: ofbiz/trunk/applications/product/servicedef/services_pricepromo.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_pricepromo.xml?rev=731851&r1=731850&r2=731851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_pricepromo.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_pricepromo.xml Mon Jan  5 23:13:36 2009
@@ -35,8 +35,8 @@
         <attribute name="productStoreId" type="String" mode="IN" optional="true"/>
         <attribute name="productStoreGroupId" type="String" mode="IN" optional="true"/>
         <attribute name="agreementId" type="String" mode="IN" optional="true"/>
-        <attribute name="quantity" type="Double" mode="IN" optional="true"/>
-        <attribute name="amount" type="Double" mode="IN" optional="true"/>
+        <attribute name="quantity" type="BigDecimal" mode="IN" optional="true"/>
+        <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/>
         <attribute name="currencyUomId" type="String" mode="IN" optional="true"/>
         <attribute name="productPricePurposeId" type="String" mode="IN" optional="true"><!-- defaults to PURCHASE --></attribute>
         <attribute name="termUomId" type="String" mode="IN" optional="true"><!-- if specified ProductPrice records will be filtered by this, ensures for purposes like recurring prices that only the recurring term desired is taken into consideration --></attribute>
@@ -45,14 +45,14 @@
         <attribute name="findAllQuantityPrices" type="String" mode="IN" optional="true"><!-- can be Y or N, defaults to N; see the allQuantityPrices attribute for more details --></attribute>
         <attribute name="surveyResponseId" type="String" mode="IN" optional="true"/>
         <attribute name="customAttributes" type="Map" mode="IN" optional="true"/>
-        <attribute name="basePrice" type="Double" mode="OUT" optional="false"><!-- will only be different from price if there is a display price adjustment, for example: checkIncludeVat=Y and a VAT amount was found --></attribute>
-        <attribute name="price" type="Double" mode="OUT" optional="false"/>
-        <attribute name="listPrice" type="Double" mode="OUT" optional="true"/>
-        <attribute name="defaultPrice" type="Double" mode="OUT" optional="true"/>
-        <attribute name="competitivePrice" type="Double" mode="OUT" optional="true"/>
-        <attribute name="averageCost" type="Double" mode="OUT" optional="true"/>
-        <attribute name="promoPrice" type="Double" mode="OUT" optional="true"/>      
-        <attribute name="specialPromoPrice" type="Double" mode="OUT" optional="true"><!-- used for the Product [Special Promo] Type ProductPromo Action --></attribute>
+        <attribute name="basePrice" type="BigDecimal" mode="OUT" optional="false"><!-- will only be different from price if there is a display price adjustment, for example: checkIncludeVat=Y and a VAT amount was found --></attribute>
+        <attribute name="price" type="BigDecimal" mode="OUT" optional="false"/>
+        <attribute name="listPrice" type="BigDecimal" mode="OUT" optional="true"/>
+        <attribute name="defaultPrice" type="BigDecimal" mode="OUT" optional="true"/>
+        <attribute name="competitivePrice" type="BigDecimal" mode="OUT" optional="true"/>
+        <attribute name="averageCost" type="BigDecimal" mode="OUT" optional="true"/>
+        <attribute name="promoPrice" type="BigDecimal" mode="OUT" optional="true"/>      
+        <attribute name="specialPromoPrice" type="BigDecimal" mode="OUT" optional="true"><!-- used for the Product [Special Promo] Type ProductPromo Action --></attribute>
         <attribute name="isSale" type="Boolean" mode="OUT" optional="false"/>
         <attribute name="validPriceFound" type="Boolean" mode="OUT" optional="false"/>
         <attribute name="currencyUsed" type="String" mode="OUT" optional="false"/>
@@ -327,10 +327,10 @@
         <attribute name="product" type="org.ofbiz.entity.GenericValue" mode="IN" optional="false"/>
         <attribute name="currencyUomId" type="String" mode="IN" optional="false"/>
         <attribute name="partyId" type="String" mode="IN" optional="true"/>
-        <attribute name="quantity" type="Double" mode="IN" optional="true"/>
-        <attribute name="amount" type="Double" mode="IN" optional="true"/>
+        <attribute name="quantity" type="BigDecimal" mode="IN" optional="true"/>
+        <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/>
         
-        <attribute name="price" type="Double" mode="OUT" optional="false"/>
+        <attribute name="price" type="BigDecimal" mode="OUT" optional="false"/>
         <attribute name="validPriceFound" type="Boolean" mode="OUT" optional="false"/>
         <attribute name="orderItemPriceInfos" type="java.util.List" mode="OUT" optional="false"/>
     </service>