svn commit: r731851 [8/22] - in /ofbiz/trunk: applications/accounting/entity
Locked
svn commit: r731851 [8/22] - in /ofbiz/trunk: applications/accounting/entity
 
|
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy Mon Jan 5 23:13:36 2009 @@ -43,10 +43,10 @@ // oneRow.putAll(shipmentPlan.getRelatedOne("OrderItemInventoryRes")); orderItem = shipmentPlan.getRelatedOne("OrderItem"); oneRow.productId = orderItem.productId; - orderedQuantity = orderItem.getDouble("quantity"); - canceledQuantity = orderItem.getDouble("cancelQuantity"); + orderedQuantity = orderItem.quantity; + canceledQuantity = orderItem.cancelQuantity; if (canceledQuantity) { - orderedQuantity = Double.valueOf(orderedQuantity.doubleValue() - canceledQuantity.doubleValue()); + orderedQuantity = orderedQuantity - canceledQuantity; } oneRow.totOrderedQuantity = orderedQuantity.intValue(); // Total quantity issued @@ -55,18 +55,18 @@ issuances = orderItem.getRelated("ItemIssuance"); issuances.each { issuance -> if (issuance.quantity) { - issuedQuantity += issuance.getDouble("quantity"); + issuedQuantity += issuance.quantity; if (issuance.cancelQuantity) { - issuedQuantity -= issuance.getDouble("cancelQuantity"); - } + issuedQuantity -= issuance.cancelQuantity; + } if (qtyIssuedInShipment.containsKey(issuance.shipmentId)) { - qtyInShipment = ((Double)qtyIssuedInShipment.get(issuance.shipmentId)).doubleValue(); - qtyInShipment += issuance.getDouble("quantity"); + qtyInShipment = qtyIssuedInShipment[issuance.shipmentId]; + qtyInShipment += issuance.quantity; qtyIssuedInShipment.issuance.shipmentId = qtyInShipment; } else { - qtyInShipment = issuance.getDouble("quantity"); + qtyInShipment = issuance.quantity; if (issuance.cancelQuantity) { - qtyInShipment -= issuance.getDouble("cancelQuantity"); + qtyInShipment -= issuance.cancelQuantity; } qtyIssuedInShipment.issuance.shipmentId = qtyInShipment; } @@ -79,18 +79,18 @@ plans = delegator.findByAnd("OrderShipment", [orderId : orderItem.orderId ,orderItemSeqId : orderItem.orderItemSeqId]); plans.each { plan -> if (plan.quantity) { - netPlanQty = plan.getDouble("quantity"); + netPlanQty = plan.quantity; if (qtyIssuedInShipment.containsKey(plan.shipmentId)) { - qtyInShipment = ((Double)qtyIssuedInShipment.get(plan.shipmentId)).doubleValue(); + qtyInShipment = qtyIssuedInShipment[plan.shipmentId]; if (netPlanQty > qtyInShipment) { netPlanQty -= qtyInShipment; } else { - netPlanQty = 0; + netPlanQty = 0.0; } } plannedQuantity += netPlanQty; if (qtyPlannedInShipment.containsKey(plan.shipmentId)) { - qtyInShipment = ((Double)qtyPlannedInShipment.get(plan.shipmentId)).doubleValue(); + qtyInShipment = qtyPlannedInShipment[plan.shipmentId]; qtyInShipment += netPlanQty; qtyPlannedInShipment.plan.shipmentId = qtyInShipment; } else { @@ -110,10 +110,10 @@ reservations = orderItem.getRelated("OrderItemShipGrpInvRes"); reservations.each { reservation -> if (reservation.quantity) { - reservedQuantity += reservation.getDouble("quantity"); + reservedQuantity += reservation.quantity; } if (reservation.quantityNotAvailable) { - reservedNotAvailable += reservation.getDouble("quantityNotAvailable"); + reservedNotAvailable += reservation.quantityNotAvailable; } } oneRow.notAvailableQuantity = reservedNotAvailable; @@ -121,11 +121,11 @@ product = orderItem.getRelatedOne("Product"); weight = 0.0; quantity = 0.0; - if (shipmentPlan.getDouble("quantity")) { - quantity = shipmentPlan.getDouble("quantity"); + if (shipmentPlan.quantity) { + quantity = shipmentPlan.quantity; } - if (product.getDouble("weight")) { - weight = product.getDouble("weight") * quantity; + if (product.weight) { + weight = product.weight * quantity; } oneRow.weight = weight; if (product.weightUomId) { @@ -133,19 +133,19 @@ oneRow.weightUom = weightUom.abbreviation; } volume = 0.0; - if (product.getDouble("productHeight") && - product.getDouble("productWidth") && - product.getDouble("productDepth")) { + if (product.productHeight && + product.productWidth && + product.productDepth) { // TODO: check if uom conversion is needed - volume = product.getDouble("productHeight") * - product.getDouble("productWidth") * - product.getDouble("productDepth") * + volume = product.productHeight * + product.productWidth * + product.productDepth * quantity; } oneRow.volume = volume; - if (product.get("heightUomId") && - product.get("widthUomId") && - product.get("depthUomId")) { + if (product.heightUomId && + product.widthUomId && + product.depthUomId) { heightUom = delegator.findByPrimaryKeyCache("Uom", [uomId : product.heightUomId]); widthUom = delegator.findByPrimaryKeyCache("Uom", [uomId : product.widthUomId]); Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy Mon Jan 5 23:13:36 2009 @@ -91,9 +91,9 @@ products.put(productionRunComponent.productId, [product : productionRunProduct, quantity : new Double(0), location : location]); } Map productMap = (Map)products.get(productionRunComponent.productId); - Double productMapQty = (Double)productMap.quantity; - Double currentProductQty = productionRunComponent.getDouble("estimatedQuantity"); - productMap.quantity = new Double(productMapQty.doubleValue() + currentProductQty.doubleValue()); + productMapQty = productMap.quantity; + currentProductQty = productionRunComponent.estimatedQuantity; + productMap.quantity = productMapQty + currentProductQty; } } // now create lists of products for each feature group @@ -105,14 +105,14 @@ while (productsMapIt.hasNext()) { productMap = productsMapIt.next(); if (productMap.product.productWidth && productMap.product.productHeight) { - Double productMapQty = (Double)productMap.get("quantity"); - Double productHeight = (Double)productMap.get("product").get("productHeight"); - Double productWidth = (Double)productMap.get("product").get("productWidth"); - double productArea = (productHeight.doubleValue() * productWidth.doubleValue()) / (1000 * 1000); - double panelQty = 0.0; + productMapQty = productMap.quantity; + productHeight = productMap.product.productHeight; + productWidth = productMap.product.productWidth; + productArea = (productHeight * productWidth) / (1000 * 1000); + panelQty = 0.0; int panelQtyInt = 0; - if (productArea > 0) panelQty = productMapQty.doubleValue() / productArea; - panelQtyInt = (int)panelQty; + if (productArea > 0) panelQty = productMapQty / productArea; + panelQtyInt = panelQty; if (panelQtyInt < panelQty) panelQtyInt++; productMap.panelQuantity = new Integer(panelQtyInt); } Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy Mon Jan 5 23:13:36 2009 @@ -63,7 +63,7 @@ // Stack information stackInfos = []; - productionRunQty = productionRun.getDouble("quantityToProduce"); + productionRunQty = productionRun.quantityToProduce; //numOfStacks = (int)productionRunQty / stackQty; // number of stacks numOfStacks = productionRunQty / stackQty; // number of stacks numOfStacks = numOfStacks.intValue(); Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy Mon Jan 5 23:13:36 2009 @@ -46,10 +46,10 @@ record = [:]; if (shipmentPackageComponent.subProductId) { record.productId = shipmentPackageComponent.subProductId; - record.quantity = shipmentPackageComponent.getDouble("subQuantity"); + record.quantity = shipmentPackageComponent.subQuantity; } else { record.productId = shipmentItem.productId; - record.quantity = shipmentPackageComponent.getDouble("quantity"); + record.quantity = shipmentPackageComponent.quantity; } record.shipmentPackageSeqId = shipmentPackageComponent.shipmentPackageSeqId; record.orderId = orderId; Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.groovy?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.groovy Mon Jan 5 23:13:36 2009 @@ -39,12 +39,12 @@ recordGroup.SHIPMENT_ITEM_SEQ_ID = shipmentPlan.shipmentItemSeqId; recordGroup.PRODUCT_ID = orderLine.productId; - recordGroup.QUANTITY = shipmentPlan.getDouble("quantity"); + recordGroup.QUANTITY = shipmentPlan.quantity; product = delegator.findByPrimaryKey("Product", [productId : orderLine.productId]); recordGroup.PRODUCT_NAME = product.internalName; inputPar = [productId : orderLine.productId, - quantity : shipmentPlan.getDouble("quantity"), + quantity : shipmentPlan.quantity, fromDate : "" + new Date(), userLogin: userLogin]; @@ -65,14 +65,14 @@ if (!inventoryStock.containsKey(oneComponent.getProduct().productId)) { serviceInput = [productId : oneComponent.getProduct().productId , facilityId : facilityId]; serviceOutput = dispatcher.runSync("getInventoryAvailableByFacility",serviceInput); - qha = serviceOutput.quantityOnHandTotal ?: new Double(0); + qha = serviceOutput.quantityOnHandTotal ?: 0.0; inventoryStock.oneComponent.getProduct().productId = qha; } - qty = ((Double)inventoryStock.get(oneComponent.getProduct().productId)).floatValue(); - qty = (float)(qty - oneComponent.getQuantity()); - inventoryStock.oneComponent.getProduct().productId = new Double(qty); + qty = inventoryStock[oneComponent.getProduct().productId]; + qty = qty - oneComponent.getQuantity(); + inventoryStock.oneComponent.getProduct().productId = qty; } - record.componentOnHand = new Float(qty); + record.componentOnHand = qty; // Now we get the products qty already reserved by production runs serviceInput = [productId : oneComponent.getProduct().productId, userLogin : userLogin]; Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Mon Jan 5 23:13:36 2009 @@ -211,7 +211,7 @@ </tr> </#list> </#if> - <#assign quantityAvailableAtDate = quantityAvailableAtDate?default(0) + inven.getDouble("quantity")> + <#assign quantityAvailableAtDate = quantityAvailableAtDate?default(0) + inven.getBigDecimal("quantity")> <#assign productTmp = product> <#assign MrpEventType = inven.getRelatedOne("MrpEventType")> <tr class="${rowClass}"> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CuttingListReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CuttingListReport.groovy?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CuttingListReport.groovy (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CuttingListReport.groovy Mon Jan 5 23:13:36 2009 @@ -72,26 +72,26 @@ productId = product.productId; productIdToProduct.put(productId, product); if (!productIdToQuantity.containsKey(productId)) { - productIdToQuantity.put(productId, new Double(0)); + productIdToQuantity.put(productId, 0.0); } - qty = (Double)productIdToQuantity.get(productId); - productIdToQuantity.put(productId, new Double(oneProductionRun.getGenericValue().getDouble("quantityToProduce").doubleValue() + qty.doubleValue())); + qty = productIdToQuantity.get(productId); + productIdToQuantity.put(productId, oneProductionRun.getGenericValue().quantityToProduce + qty); } } } } } productIdToProduct.values().each { product -> - heightD = product.getDouble("productHeight"); + heightD = product.productHeight; height = 0; if (heightD) { - height = (heightD.doubleValue() * 1000) as int; + height = (heightD * 1000) as int; } - widthD = product.getDouble("productWidth"); + widthD = product.productWidth; width = 0; if (widthD) { - width = (widthD.doubleValue() * 1000) as int; + width = (widthD * 1000) as int; } Dimension dim = new Dimension(width, height); if (!dimensionToProducts.containsKey(dim)) { @@ -101,10 +101,10 @@ prodList.add(product); // tot qty per dimension if (!dimensionToQuantity.containsKey(dim)) { - dimensionToQuantity.put(dim, new Double(0)); + dimensionToQuantity.put(dim, 0.0); } - Double qty = (Double)dimensionToQuantity.get(dim); - dimensionToQuantity.put(dim, new Double(((Double)productIdToQuantity.get(product.productId)).doubleValue() + qty.doubleValue())); + qty = dimensionToQuantity[dim]; + dimensionToQuantity.put(dim, productIdToQuantity[product.productId] + qty); } // // @@ -113,8 +113,8 @@ dimensionToProducts.keySet().each { dim -> map1 = [:]; list1.add(map1); - map1.width = (dim.getWidth() / 1000) as Double; - map1.height = (dim.getHeight() / 1000) as Double; + map1.width = (dim.getWidth() / 1000); + map1.height = (dim.getHeight() / 1000); map1.quantity = dimensionToQuantity.get(dim); list2 = [] as ArrayList; map1.products = list2; Modified: ofbiz/trunk/applications/order/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/order/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/order/entitydef/entitymodel.xml Mon Jan 5 23:13:36 2009 @@ -68,7 +68,7 @@ <field name="correspondingProductId" type="id"></field> <field name="taxAuthorityRateSeqId" type="id-ne"></field> <field name="sourceReferenceId" type="id-long"></field> - <field name="sourcePercentage" type="floating-point"> + <field name="sourcePercentage" type="fixed-point"> <description>for tax entries this is the tax percentage</description> </field> <field name="customerReferenceId" type="id-long"> @@ -301,10 +301,10 @@ <field name="estimatedReadyDate" type="date-time"></field> <field name="cartons" type="numeric"></field> <field name="skidsPallets" type="numeric"></field> - <field name="unitsPieces" type="floating-point"></field> - <field name="totalCubicSize" type="floating-point"></field> + <field name="unitsPieces" type="fixed-point"></field> + <field name="totalCubicSize" type="fixed-point"></field> <field name="totalCubicUomId" type="id"></field> - <field name="totalWeight" type="floating-point"></field> + <field name="totalWeight" type="fixed-point"></field> <field name="totalWeightUomId" type="id"></field> <field name="statusId" type="id"></field> <prim-key field="orderId"/> @@ -453,9 +453,9 @@ <field name="shoppingListItemSeqId" type="id"></field> <field name="subscriptionId" type="id"></field> <field name="deploymentId" type="id"></field> - <field name="quantity" type="floating-point"></field> - <field name="cancelQuantity" type="floating-point"></field> - <field name="selectedAmount" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> + <field name="cancelQuantity" type="fixed-point"></field> + <field name="selectedAmount" type="fixed-point"></field> <field name="unitPrice" type="currency-amount"></field> <field name="unitListPrice" type="currency-amount"></field> <field name="unitAverageCost" type="currency-amount"></field> @@ -540,7 +540,7 @@ <field name="toOrderItemSeqId" type="id-ne"></field> <field name="toShipGroupSeqId" type="id-ne"></field> <field name="orderItemAssocTypeId" type="id-ne"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <prim-key field="orderId"/> <prim-key field="orderItemSeqId"/> <prim-key field="shipGroupSeqId"/> @@ -625,7 +625,7 @@ <field name="invoiceItemSeqId" type="id-ne"></field> <field name="itemIssuanceId" type="id"></field> <field name="shipmentReceiptId" type="id"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <field name="amount" type="currency-amount"></field> <prim-key field="orderId"/> <prim-key field="orderItemSeqId"/> @@ -662,8 +662,8 @@ <field name="changeTypeEnumId" type="id"></field> <field name="changeDatetime" type="date-time"></field> <field name="changeUserLogin" type="id-vlong"></field> - <field name="quantity" type="floating-point"></field> - <field name="cancelQuantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> + <field name="cancelQuantity" type="fixed-point"></field> <field name="unitPrice" type="currency-amount"></field> <field name="itemDescription" type="description"></field> <field name="reasonEnumId" type="id"></field> @@ -735,7 +735,7 @@ <field name="orderItemSeqId" type="id-ne"></field> <field name="productPriceRuleId" type="id"></field> <field name="productPriceActionSeqId" type="id"></field> - <field name="modifyAmount" type="floating-point"></field> + <field name="modifyAmount" type="currency-precise"></field> <field name="description" type="description"></field> <field name="rateCode" type="short-varchar"></field> <prim-key field="orderItemPriceInfoId"/> @@ -852,8 +852,8 @@ <field name="orderId" type="id-ne"></field> <field name="orderItemSeqId" type="id-ne"></field> <field name="shipGroupSeqId" type="id-ne"></field> - <field name="quantity" type="floating-point"></field> - <field name="cancelQuantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> + <field name="cancelQuantity" type="fixed-point"></field> <prim-key field="orderId"/> <prim-key field="orderItemSeqId"/> <prim-key field="shipGroupSeqId"/> @@ -878,8 +878,8 @@ <field name="orderItemSeqId" type="id-ne"></field> <field name="inventoryItemId" type="id-ne"></field> <field name="reserveOrderEnumId" type="id-ne"></field> - <field name="quantity" type="floating-point"></field> - <field name="quantityNotAvailable" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> + <field name="quantityNotAvailable" type="fixed-point"></field> <field name="reservedDatetime" type="date-time"></field> <field name="createdDatetime" type="date-time"></field> <field name="promisedDatetime" type="date-time"></field> @@ -1075,7 +1075,7 @@ <field name="orderItemSeqId" type="id-ne"></field> <field name="shipmentId" type="id-ne"></field> <field name="shipmentItemSeqId" type="id-ne"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <prim-key field="orderId"/> <prim-key field="orderItemSeqId"/> <prim-key field="shipmentId"/> @@ -1131,7 +1131,7 @@ <field name="entryDate" type="date"></field> <field name="productId" type="id-ne"></field> <field name="facilityId" type="id-ne"></field> - <field name="totalQuantity" type="floating-point"></field> + <field name="totalQuantity" type="fixed-point"></field> <field name="grossSales" type="currency-amount"></field> <field name="productCost" type="currency-amount"></field> <prim-key field="entryDate"/> @@ -1369,7 +1369,7 @@ title="Quote Coefficient Entity"> <field name="quoteId" type="id-ne"></field> <field name="coeffName" type="id-long-ne"></field> - <field name="coeffValue" type="floating-point"></field> + <field name="coeffValue" type="fixed-point"></field> <prim-key field="quoteId"/> <prim-key field="coeffName"/> <relation type="one" fk-name="QUOTE_COEFF" rel-entity-name="Quote"> @@ -1389,12 +1389,12 @@ <field name="workEffortId" type="id"></field> <field name="custRequestId" type="id"></field> <field name="custRequestItemSeqId" type="id"></field> - <field name="quantity" type="floating-point"></field> - <field name="selectedAmount" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> + <field name="selectedAmount" type="fixed-point"></field> <field name="quoteUnitPrice" type="currency-amount"></field> <field name="reservStart" type="date-time"></field> - <field name="reservLength" type="floating-point"></field> - <field name="reservPersons" type="floating-point"></field> + <field name="reservLength" type="fixed-point"></field> + <field name="reservPersons" type="fixed-point"></field> <field name="configId" type="id"></field> <field name="estimatedDeliveryDate" type="date-time"></field> <field name="comments" type="comment"></field> @@ -1555,7 +1555,7 @@ <field name="productFeatureId" type="id"></field> <field name="correspondingProductId" type="id"></field> <field name="sourceReferenceId" type="id-long"></field> - <field name="sourcePercentage" type="floating-point"><!-- for tax entries this is the tax percentage --></field> + <field name="sourcePercentage" type="fixed-point"><!-- for tax entries this is the tax percentage --></field> <field name="customerReferenceId" type="id-long"><!-- for tax entries this is partyTaxId --></field> <field name="primaryGeoId" type="id"><!-- for tax entries this is the primary jurisdiction Geo (the smallest or most local Geo that this tax is for, usually a state/province, perhaps a county or a city) --></field> <field name="secondaryGeoId" type="id"><!-- for tax entries this is the secondary jurisdiction Geo (usually a country, or other Geo that the primary is within) --></field> @@ -1767,12 +1767,12 @@ <field name="sequenceNum" type="numeric"></field> <field name="requiredByDate" type="date-time"></field> <field name="productId" type="id"></field> - <field name="quantity" type="floating-point"></field> - <field name="selectedAmount" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> + <field name="selectedAmount" type="fixed-point"></field> <field name="maximumAmount" type="currency-amount"></field> <field name="reservStart" type="date-time"></field> - <field name="reservLength" type="floating-point"></field> - <field name="reservPersons" type="floating-point"></field> + <field name="reservLength" type="fixed-point"></field> + <field name="reservPersons" type="fixed-point"></field> <field name="configId" type="id"></field> <field name="description" type="description"></field> <field name="story" type="very-long"></field> @@ -1996,7 +1996,7 @@ <field name="orderId" type="id-ne"></field> <field name="orderItemSeqId" type="id-ne"></field> <field name="requirementId" type="id-ne"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <prim-key field="orderId"/> <prim-key field="orderItemSeqId"/> <prim-key field="requirementId"/> @@ -2025,7 +2025,7 @@ <field name="requirementStartDate" type="date-time"></field> <field name="requiredByDate" type="date-time"></field> <field name="estimatedBudget" type="currency-amount"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <field name="useCase" type="very-long"></field> <field name="reason" type="long-varchar"></field> <field name="createdDate" type="date-time"></field> @@ -2235,7 +2235,7 @@ <field name="correspondingProductId" type="id"></field> <field name="taxAuthorityRateSeqId" type="id-ne"></field> <field name="sourceReferenceId" type="id-long"></field> - <field name="sourcePercentage" type="floating-point"> + <field name="sourcePercentage" type="fixed-point"> <description>for tax entries this is the tax percentage</description> </field> <field name="customerReferenceId" type="id-long"> @@ -2410,8 +2410,8 @@ <field name="orderItemSeqId" type="id"></field> <field name="statusId" type="id"></field> <field name="expectedItemStatus" type="id"></field> - <field name="returnQuantity" type="floating-point"><description>promised by the customer</description></field> - <field name="receivedQuantity" type="floating-point"><description>actually received from the customer</description></field> + <field name="returnQuantity" type="fixed-point"><description>promised by the customer</description></field> + <field name="receivedQuantity" type="fixed-point"><description>actually received from the customer</description></field> <field name="returnPrice" type="currency-amount"></field> <field name="returnItemResponseId" type="id"></field> <prim-key field="returnId"/> @@ -2561,7 +2561,7 @@ <field name="invoiceId" type="id-ne"></field> <field name="invoiceItemSeqId" type="id-ne"></field> <field name="shipmentReceiptId" type="id"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <field name="amount" type="currency-amount"></field> <prim-key field="returnId"/> <prim-key field="returnItemSeqId"/> @@ -2592,7 +2592,7 @@ <field name="returnItemSeqId" type="id-ne"></field> <field name="shipmentId" type="id-ne"></field> <field name="shipmentItemSeqId" type="id-ne"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <prim-key field="returnId"/> <prim-key field="returnItemSeqId"/> <prim-key field="shipmentId"/> @@ -2625,13 +2625,13 @@ <field name="cartAbandonedLineSeqId" type="id-ne"></field> <field name="productId" type="id-ne"></field> <field name="prodCatalogId" type="id-ne"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <field name="reservStart" type="date-time"></field> - <field name="reservLength" type="floating-point"></field> - <field name="reservPersons" type="floating-point"></field> + <field name="reservLength" type="fixed-point"></field> + <field name="reservPersons" type="fixed-point"></field> <field name="unitPrice" type="currency-amount"></field> - <field name="reserv2ndPPPerc" type="floating-point"/> - <field name="reservNthPPPerc" type="floating-point"/> + <field name="reserv2ndPPPerc" type="fixed-point"/> + <field name="reservNthPPPerc" type="fixed-point"/> <field name="configId" type="id"></field> <field name="totalWithAdjustments" type="currency-amount"></field> <field name="wasReserved" type="indicator"></field> @@ -2727,11 +2727,11 @@ <field name="shoppingListId" type="id-ne"></field> <field name="shoppingListItemSeqId" type="id-ne"></field> <field name="productId" type="id"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <field name="reservStart" type="date-time"></field> - <field name="reservLength" type="floating-point"></field> - <field name="reservPersons" type="floating-point"></field> - <field name="quantityPurchased" type="floating-point"></field> + <field name="reservLength" type="fixed-point"></field> + <field name="reservPersons" type="fixed-point"></field> + <field name="quantityPurchased" type="fixed-point"></field> <field name="configId" type="id"></field> <prim-key field="shoppingListId"/> <prim-key field="shoppingListItemSeqId"/> @@ -2797,7 +2797,7 @@ <field name="description" type="very-long"/> <field name="nextStep" type="very-long"/> <field name="estimatedAmount" type="currency-amount"/> - <field name="estimatedProbability" type="floating-point"/> + <field name="estimatedProbability" type="fixed-point"/> <field name="currencyUomId" type="id-ne"/> <field name="marketingCampaignId" type="id-ne"/> <field name="dataSourceId" type="id-ne"/> @@ -2831,7 +2831,7 @@ <field name="description" type="very-long"/> <field name="nextStep" type="very-long"/> <field name="estimatedAmount" type="currency-amount"/> - <field name="estimatedProbability" type="floating-point"/> + <field name="estimatedProbability" type="fixed-point"/> <field name="currencyUomId" type="id-ne"/> <field name="estimatedCloseDate" type="date-time"/> <field name="opportunityStageId" type="id-ne"/> @@ -2885,7 +2885,7 @@ title="Describes stages of a sales opportunity with associated probability factors."> <field name="opportunityStageId" type="id-ne"></field> <field name="description" type="description"/> - <field name="defaultProbability" type="floating-point"/> + <field name="defaultProbability" type="fixed-point"/> <field name="sequenceNum" type="numeric"/> <prim-key field="opportunityStageId"/> </entity> @@ -2933,8 +2933,8 @@ <field name="forecastAmount" type="currency-amount"></field> <field name="bestCaseAmount" type="currency-amount"></field> <field name="closedAmount" type="currency-amount"/> - <field name="percentOfQuotaForecast" type="floating-point"/> - <field name="percentOfQuotaClosed" type="floating-point"/> + <field name="percentOfQuotaForecast" type="fixed-point"/> + <field name="percentOfQuotaClosed" type="fixed-point"/> <field name="pipelineAmount" type="currency-amount"></field> <field name="createdByUserLoginId" type="id-vlong"></field> <field name="modifiedByUserLoginId" type="id-vlong"></field> @@ -2969,7 +2969,7 @@ <field name="salesForecastDetailId" type="id-ne"/> <field name="amount" type="currency-amount"/> <field name="quantityUomId" type="id"/> - <field name="quantity" type="floating-point"/> + <field name="quantity" type="fixed-point"/> <field name="productId" type="id"/> <field name="productCategoryId" type="id"/> <prim-key field="salesForecastId"/> @@ -3002,8 +3002,8 @@ <field name="forecastAmount" type="currency-amount"></field> <field name="bestCaseAmount" type="currency-amount"></field> <field name="closedAmount" type="currency-amount"/> - <field name="percentOfQuotaForecast" type="floating-point"/> - <field name="percentOfQuotaClosed" type="floating-point"/> + <field name="percentOfQuotaForecast" type="fixed-point"/> + <field name="percentOfQuotaClosed" type="fixed-point"/> <field name="changeNote" type="very-long"> <description>Used to track a reason for this change</description> <!-- maybe one day this should be a link to NoteData --> </field> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Mon Jan 5 23:13:36 2009 @@ -184,8 +184,8 @@ <calculate field="returnTotalAmount"> <calcop field="returnTotalAmount" operator="add"> <calcop operator="multiply"> - <calcop operator="get" field="returnPrice" map-name="returnItem"/> - <calcop operator="get" field="returnQuantity" map-name="returnItem"/> + <calcop operator="get" field="returnItem.returnPrice"/> + <calcop operator="get" field="returnItem.returnQuantity"/> </calcop> </calcop> </calculate> @@ -234,12 +234,12 @@ </entity-and> <iterate entry="returnAdjustment" list="returnAdjustments"> <calculate field="returnTotalAmount"> - <calcop field="returnTotalAmount" operator="add"> - <calcop operator="get" field="amount" map-name="returnAdjustment"/> - </calcop> - </calculate> + <calcop field="returnTotalAmount" operator="add"> + <calcop operator="get" field="returnAdjustment.amount"/> + </calcop> + </calculate> </iterate> - <if-compare field="returnTotalAmount" operator="less" value="0" type="Double"> + <if-compare field="returnTotalAmount" operator="less" value="0" type="BigDecimal"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnTotalCannotLessThanZero"/></add-error> </if-compare> <check-errors/> @@ -295,14 +295,14 @@ </if> <check-errors/> - <if-compare field="parameters.returnQuantity" operator="equals" value="0" type="Double"> + <if-compare field="parameters.returnQuantity" operator="equals" value="0" type="BigDecimal"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderNoReturnQuantityAvailablePreviousReturnsMayExist"/></add-error> <check-errors/> </if-compare> <!-- setup some default values for protection --> - <set field="returnableQuantity" value="0" type="Double"/> - <set field="returnablePrice" value="0" type="Double"/> + <set field="returnableQuantity" value="0" type="BigDecimal"/> + <set field="returnablePrice" value="0" type="BigDecimal"/> <!-- if an orderItemSeqId is provided, then find the corresponding orderItem --> <if-not-empty field="parameters.orderItemSeqId"> @@ -325,7 +325,7 @@ </if-not-empty> - <if-compare field="returnableQuantity" value="0" operator="greater" type="Double"> + <if-compare field="returnableQuantity" value="0" operator="greater" type="BigDecimal"> <!-- the user is only allowed to set a returnPrice if he has ORDERMGR_CREATE privilege, otherwise only the returnablePrice calculated by service is used --> <if> @@ -338,30 +338,30 @@ </if> <!-- make sure the returnQuantity is not greater than the returnableQuantity from service or the quantity on the original orderItem --> - <if-compare-field field="parameters.returnQuantity" to-field="returnableQuantity" operator="greater" type="Double"> + <if-compare-field field="parameters.returnQuantity" to-field="returnableQuantity" operator="greater" type="BigDecimal"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderRequestedReturnQuantityNotAvailablePreviousReturnsMayExist"/></add-error> </if-compare-field> <!-- SC 20060202: Is this really needed? Or does the above duplicate it. If not, we should remove it --> <if-not-empty field="orderItem"> - <if-compare-field field="parameters.returnQuantity" to-field="orderItem.quantity" operator="greater" type="Double"> + <if-compare-field field="parameters.returnQuantity" to-field="orderItem.quantity" operator="greater" type="BigDecimal"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnQuantityCannotExceedTheOrderedQuantity"/></add-error> </if-compare-field> </if-not-empty> <!-- Workaround for bug: returnPrice=16.99, returnablePrice=16.9894 => OrderReturnPriceCannotExceedThePurchasePrice --> - <set field="epsilon" value="0.01" type="Double"/> - <set field="zero" value="0.0" type="Double"/> - <calculate field="returnPriceDelta" type="Double"> + <set field="epsilon" value="0.01" type="BigDecimal"/> + <set field="zero" value="0.0" type="BigDecimal"/> + <calculate field="returnPriceDelta"> <calcop operator="subtract"> - <calcop operator="get" field="returnPrice" map-name="parameters"/> + <calcop operator="get" field="parameters.returnPrice"/> <calcop operator="get" field="returnablePrice"/> </calcop> </calculate> <!-- just checking greater-equals sometimes returns an error if the difference is actually zero --> - <if-compare-field field="returnPriceDelta" to-field="zero" operator="not-equals" type="Double"> - <if-compare-field field="returnPriceDelta" to-field="epsilon" operator="greater-equals" type="Double"> + <if-compare-field field="returnPriceDelta" to-field="zero" operator="not-equals" type="BigDecimal"> + <if-compare-field field="returnPriceDelta" to-field="epsilon" operator="greater-equals" type="BigDecimal"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnPriceCannotExceedThePurchasePrice"/></add-error> </if-compare-field > </if-compare-field> @@ -387,15 +387,16 @@ <if-empty field="currentItems"> <set value="1" field="newEntity.returnItemSeqId"/> <else> - <first-from-list entry="newestItem" list="currentItems"/> - <calculate field="returnItemSeqId" map-name="newEntity" type="Integer"> - <calcop field="returnItemSeqId" map-name="newestItem" operator="add"> + <first-from-list entry="newestItem" list="currentItems"/> + <calculate field="newEntity.returnItemSeqId" type="Integer"> + <calcop field="newestItem.returnItemSeqId" operator="add"> <number value="1"/> </calcop> </calculate> </else> </if-empty> - <to-string field-name="returnItemSeqId" map-name="newEntity" numeric-padding="5"/> + <to-string field="returnItemSeqId" numeric-padding="5"/> + <set field="newEntity.returnItemSeqId" from-field="returnItemSeqId" type="PlainString"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set field="newEntity.statusId" value="RETURN_REQUESTED"/> <!-- default status for new return items --> @@ -539,14 +540,12 @@ <find-by-and entity-name="ShipmentReceipt" map="lookupPKMap" list="shipmentReceipts"/> <iterate list="shipmentReceipts" entry="receipt"> <if-empty field="totalsMap.${receipt.returnItemSeqId}"> - <calculate field="${receipt.returnItemSeqId}" map-name="totalsMap"> - <number value="0"/> - </calculate> + <calculate field="totalsMap[receipt.returnItemSeqId]"><number value="0"/></calculate> </if-empty> - <calculate field="${receipt.returnItemSeqId}" map-name="totalsMap" type="Double"> - <calcop field="${receipt.returnItemSeqId}" map-name="totalsMap" operator="add"> - <calcop field="quantityAccepted" map-name="receipt" operator="get"/> - <calcop field="quantityRejected" map-name="receipt" operator="get"/> + <calculate field="totalsMap[receipt.returnItemSeqId]"> + <calcop field="totalsMap[receipt.returnItemSeqId]" operator="add"> + <calcop field="receipt.quantityAccepted" operator="get"/> + <calcop field="receipt.quantityRejected" operator="get"/> </calcop> </calculate> @@ -556,7 +555,7 @@ </entity-one> <set field="returnItem.receivedQuantity" from-field="totalsMap.${receipt.returnItemSeqId}"/> - <if-compare-field field="totalsMap.${receipt.returnItemSeqId}" to-field="returnItem.returnQuantity" operator="greater-equals" type="Double"> + <if-compare-field field="totalsMap.${receipt.returnItemSeqId}" to-field="returnItem.returnQuantity" operator="greater-equals" type="BigDecimal"> <!-- update the status for the item --> <set field="returnItem.statusId" value="RETURN_RECEIVED"/> <store-value value-field="returnItem"/> @@ -766,7 +765,7 @@ <log level="info" message="Found unexpected orderAdjustment:${newItemCtx.orderAdjustmentId}"/> <clear-field field="newItemCtx.orderAdjustmentId"/> </if-not-empty> - <if-compare field="newItemCtx.returnQuantity" value="0" operator="greater" type="Double"> + <if-compare field="newItemCtx.returnQuantity" value="0" operator="greater" type="BigDecimal"> <!-- otherwise, items which have been fully returned would still get passed in and then come back with an error --> <call-service service-name="createReturnItem" in-map-name="newItemCtx" include-user-login="true"/> <else> @@ -787,7 +786,7 @@ <set from-field="orderAdjustment.orderAdjustmentId" field="returnAdjCtx.orderAdjustmentId"/> <set from-field="returnId" field="returnAdjCtx.returnId"/> <!--filter out orderAdjustment that have been returned--> - <entity-count entity-name="ReturnAdjustment" count-name="returnCount"> + <entity-count entity-name="ReturnAdjustment" count-field="returnCount"> <condition-expr field-name="orderAdjustmentId" operator="equals" from-field="orderAdjustment.orderAdjustmentId"/> </entity-count> <if-compare field="returnCount" value="0" operator="equals"> @@ -811,7 +810,7 @@ <set from-field="returnId" field="balanceItemCtx.returnId"/> <set field="balanceItemCtx.returnItemSeqId" value="_NA_"/> - <set from-field="availableReturnTotal" field="balanceItemCtx.amount" type="Double"/> + <set from-field="availableReturnTotal" field="balanceItemCtx.amount" type="BigDecimal"/> <log level="warning" message="Creating a balance adjustment of [${availableReturnTotal}] for return [${returnId}]"/> <!-- create the balance adjustment return item --> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Mon Jan 5 23:13:36 2009 @@ -72,7 +72,7 @@ </entity-condition> <!-- first set the required OUT fields to zero --> - <calculate field="plainDoubleZero" type="Double"><number value="0.0"/></calculate> + <calculate field="plainDoubleZero"><number value="0.0"/></calculate> <calculate field="plainLongZero" type="Long"><number value="0"/></calculate> <field-to-result field="plainDoubleZero" result-name="totalGrandAmount"/> <field-to-result field="plainDoubleZero" result-name="totalSubRemainingAmount"/> @@ -242,14 +242,14 @@ <if-not-empty field="productFacility.minimumStock"> <!-- No requirements are created if we are already under stock --> - <if-compare-field field="quantityOnHandTotal" to-field="productFacility.minimumStock" operator="greater-equals" type="Double"> + <if-compare-field field="quantityOnHandTotal" to-field="productFacility.minimumStock" operator="greater-equals" type="BigDecimal"> <calculate field="newQuantityOnHand"> <calcop field="quantityOnHandTotal" operator="subtract"> <calcop operator="get" field="parameters.quantity"/> </calcop> </calculate> <!-- If this new issuance will cause the quantityOnHandTotal to go below the minimumStock, create a new requirement --> - <if-compare-field field="newQuantityOnHand" to-field="productFacility.minimumStock" operator="less" type="Double"> + <if-compare-field field="newQuantityOnHand" to-field="productFacility.minimumStock" operator="less" type="BigDecimal"> <set from-field="inventoryItem.productId" field="inputMap.productId"/> <set from-field="productFacility.facilityId" field="inputMap.facilityId"/> <if-not-empty field="productFacility.reorderQuantity"> @@ -289,14 +289,14 @@ <if-not-empty field="productFacility.minimumStock"> <!-- No requirements are created if we are not under stock --> <!-- this service is supposed to be called after inventory is reserved, so inventory should have been updated already --> - <if-compare-field field="availableToPromiseTotal" to-field="productFacility.minimumStock" operator="less" type="Double"> + <if-compare-field field="availableToPromiseTotal" to-field="productFacility.minimumStock" operator="less" type="BigDecimal"> <calculate field="oldAvailableToPromise"> <calcop field="availableToPromiseTotal" operator="add"> <calcop operator="get" field="parameters.quantity"/> </calcop> </calculate> <!-- If before this reservation the availableToPromiseTotal was over minimumStock, create a new requirement --> - <if-compare-field field="oldAvailableToPromise" to-field="productFacility.minimumStock" operator="greater-equals" type="Double"> + <if-compare-field field="oldAvailableToPromise" to-field="productFacility.minimumStock" operator="greater-equals" type="BigDecimal"> <set from-field="inventoryItem.productId" field="inputMap.productId"/> <set from-field="productFacility.facilityId" field="inputMap.facilityId"/> <if-not-empty field="productFacility.reorderQuantity"> @@ -335,14 +335,14 @@ <if-not-empty field="productFacility"> <!-- are we below minimum stock? this service is supposed to be called after inventory is reserved, so inventory should have been updated already --> - <if-compare-field field="availableToPromiseTotal" to-field="productFacility.minimumStock" operator="less" type="Double"> + <if-compare-field field="availableToPromiseTotal" to-field="productFacility.minimumStock" operator="less" type="BigDecimal"> <!-- what is the right quantity? It is the lesser of the actual quantity and the quantity required to bring us back up to minimum stock --> <calculate field="quantityShortfall"> <calcop field="productFacility.minimumStock" operator="subtract"> <calcop operator="get" field="availableToPromiseTotal"/> </calcop> </calculate> - <if-compare-field field="quantityShortfall" operator="less" to-field="parameters.quantity" type="Double"> + <if-compare-field field="quantityShortfall" operator="less" to-field="parameters.quantity" type="BigDecimal"> <set from-field="quantityShortfall" field="inputMap.quantity"/> <else> <set from-field="parameters.quantity" field="inputMap.quantity"/> @@ -366,15 +366,14 @@ </condition-list> </entity-condition> <iterate entry="requirement" list="requirements"> - <calculate field="existingRequirementTotal" type="Double"> - <calcop operator="add" field="existingRequirementTotal"> - <calcop operator="get" field="requirement.quantity"/> - </calcop> + <calculate field="existingRequirementTotal"> + <calcop operator="get" field="existingRequirementTotal"/> + <calcop operator="get" field="requirement.quantity"/> </calculate> </iterate> <!-- Subtract the total quantity of existing requirements from the required quantity to determine if a new requirement needs to be created --> - <calculate field="newRequirementTotal" type="Double"> + <calculate field="newRequirementTotal"> <calcop operator="subtract" field="inputMap.quantity"> <calcop operator="get" field="existingRequirementTotal"/> </calcop> @@ -437,13 +436,13 @@ </if-compare> <!-- No requirements are created if we are already under stock --> - <if-compare-field field="currentQuantity" to-field="productFacility.minimumStock" operator="less" type="Double"> + <if-compare-field field="currentQuantity" to-field="productFacility.minimumStock" operator="less" type="BigDecimal"> <clear-field field="inputMap"/> <set from-field="productFacility.productId" field="inputMap.productId"/> <if-not-empty field="productFacility.reorderQuantity"> - <set from-field="productFacility.reorderQuantity" field="inputMap.quantity" type="Double"/> + <set from-field="productFacility.reorderQuantity" field="inputMap.quantity" type="BigDecimal"/> <else> - <set value="0" field="inputMap.quantity" type="Double"/> + <set value="0" field="inputMap.quantity" type="BigDecimal"/> </else> </if-not-empty> @@ -452,8 +451,8 @@ <calcop operator="get" field="currentQuantity"/> </calcop> </calculate> - <if-compare-field field="inputMap.quantity" to-field="quantityShortfall" operator="less" type="Double"> - <set from-field="quantityShortfall" field="inputMap.quantity" type="Double"/> + <if-compare-field field="inputMap.quantity" to-field="quantityShortfall" operator="less" type="BigDecimal"> + <set from-field="quantityShortfall" field="inputMap.quantity" type="BigDecimal"/> </if-compare-field> <set value="PRODUCT_REQUIREMENT" field="inputMap.requirementTypeId"/> @@ -667,7 +666,7 @@ <set field="createOrderAdjContext.orderItemSeqId" value="_NA_"/> <set field="createOrderAdjContext.shipGroupSeqId" value="_NA_"/> <set field="createOrderAdjContext.description" value="Adjustment due to order change"/> - <set field="createOrderAdjContext.amount" from-field="orderAdjustmentTotalDifference" type="Double"/> + <set field="createOrderAdjContext.amount" from-field="orderAdjustmentTotalDifference" type="BigDecimal"/> <call-service service-name="createOrderAdjustment" in-map-name="createOrderAdjContext" include-user-login="true"/> <check-errors/> </if-compare> @@ -866,7 +865,7 @@ </simple-method> <simple-method method-name="checkOrderIsOnBackOrder" short-description="Check if an Order is on Back Order" login-required="false"> - <set field="zeroEnv" value="0" type="Double"/> + <set field="zeroEnv" value="0" type="BigDecimal"/> <entity-condition entity-name="OrderItemShipGrpInvRes" list="orderItemShipGrpInvResList"> <condition-list combine="and"> <condition-expr field-name="orderId" from-field="parameters.orderId"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml Mon Jan 5 23:13:36 2009 @@ -27,83 +27,83 @@ </check-permission> <check-errors/> - <make-value entity-name="OrderAdjustment" value-name="newEntity"/> - <set-nonpk-fields map-name="parameters" value-name="newEntity"/> + <make-value entity-name="OrderAdjustment" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="OrderAdjustment" field="newEntity.orderAdjustmentId"/> - <field-to-result field-name="newEntity.orderAdjustmentId" result-name="orderAdjustmentId"/> + <field-to-result field="newEntity.orderAdjustmentId" result-name="orderAdjustmentId"/> <now-timestamp field="newEntity.createdDate"/> <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/> - <create-value value-name="newEntity"/> + <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateOrderAdjustment" short-description="Update an OrderAdjustment"> <check-permission permission="ORDERMGR" action="_UPDATE"><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateOrderAdjustement"/></check-permission> <check-errors/> - <entity-one entity-name="OrderAdjustment" value-name="lookedUpValue"/> - <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <entity-one entity-name="OrderAdjustment" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteOrderAdjustment" short-description="Delete an OrderAdjustment"> <check-permission permission="ORDERMGR" action="_DELETE"><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunDeleteOrderAdjustement"/></check-permission> <check-errors/> - <entity-one entity-name="OrderAdjustment" value-name="lookedUpValue"/> - <remove-value value-name="lookedUpValue"/> + <entity-one entity-name="OrderAdjustment" value-field="lookedUpValue"/> + <remove-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="createOrderAdjustmentBilling" short-description="Create an OrderAdjustmentBilling"> - <make-value entity-name="OrderAdjustmentBilling" value-name="newEntity"/> - <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> - <create-value value-name="newEntity"/> + <make-value entity-name="OrderAdjustmentBilling" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> + <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="createOrderItemBilling" short-description="Create an OrderItemBilling"> - <make-value entity-name="OrderItemBilling" value-name="newEntity"/> - <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> - <create-value value-name="newEntity"/> + <make-value entity-name="OrderItemBilling" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> + <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="createNotificationLog" short-description="Log an order notification" login-required="false"> - <make-value entity-name="OrderNotification" value-name="orderNotification"/> + <make-value entity-name="OrderNotification" value-field="orderNotification"/> <sequenced-id sequence-name="OrderNotification" field="orderNotification.orderNotificationId"/> <set from-field="parameters.orderId" field="orderNotification.orderId"/> <set from-field="parameters.emailType" field="orderNotification.emailType"/> <set from-field="parameters.comments" field="orderNotification.comments"/> <now-timestamp field="orderNotification.notificationDate"/> - <create-value value-name="orderNotification"/> + <create-value value-field="orderNotification"/> </simple-method> <simple-method method-name="updateOrderStatusFromReceipt" short-description="Update Order Status From ShipmentReceipt"> <check-permission permission="ORDERMGR" action="_UPDATE"><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateOrderStatusFromReceipt"/></check-permission> <check-errors/> - <entity-one entity-name="OrderHeader" value-name="orderHeader"/> - <entity-and entity-name="ShipmentReceipt" list-name="shipmentReceipts"> - <field-map field-name="orderId" env-name="parameters.orderId"/> + <entity-one entity-name="OrderHeader" value-field="orderHeader"/> + <entity-and entity-name="ShipmentReceipt" list="shipmentReceipts"> + <field-map field-name="orderId" from-field="parameters.orderId"/> </entity-and> - <iterate list-name="shipmentReceipts" entry-name="receipt"> + <iterate list="shipmentReceipts" entry="receipt"> <if-empty field="totalsMap.${receipt.orderItemSeqId}"> - <set field="totalsMap.${receipt.orderItemSeqId}" value="0" type="Double"/> + <set field="totalsMap.${receipt.orderItemSeqId}" value="0" type="BigDecimal"/> </if-empty> - <calculate field="${receipt.orderItemSeqId}" map-name="totalsMap" type="Double"> - <calcop field="${receipt.orderItemSeqId}" map-name="totalsMap" operator="add"> - <calcop field="quantityAccepted" map-name="receipt" operator="get"/> - <calcop field="quantityRejected" map-name="receipt" operator="get"/> + <calculate field="totalsMap.${receipt.orderItemSeqId}"> + <calcop field="totalsMap.${receipt.orderItemSeqId}" operator="add"> + <calcop field="receipt.quantityAccepted" operator="get"/> + <calcop field="receipt.quantityRejected" operator="get"/> </calcop> </calculate> <set from-field="receipt.orderId" field="newLookupMap.orderId"/> <set from-field="receipt.orderItemSeqId" field="newLookupMap.orderItemSeqId"/> - <find-by-primary-key entity-name="OrderItem" map-name="newLookupMap" value-name="orderItem"/> + <find-by-primary-key entity-name="OrderItem" map="newLookupMap" value-field="orderItem"/> <if-compare field="orderItem.statusId" operator="not-equals" value="ITEM_COMPLETED"> - <if-compare-field field="orderItem.quantity" to-field="totalsMap.${receipt.orderItemSeqId}" operator="less-equals" type="Double"> + <if-compare-field field="orderItem.quantity" to-field="totalsMap.${receipt.orderItemSeqId}" operator="less-equals" type="BigDecimal"> <!-- update the status for the item --> <set field="orderItem.statusId" value="ITEM_COMPLETED"/> - <store-value value-name="orderItem"/> + <store-value value-field="orderItem"/> <!-- create status change history --> - <make-value entity-name="OrderStatus" value-name="newValue"/> + <make-value entity-name="OrderStatus" value-field="newValue"/> <sequenced-id sequence-name="OrderStatus" field="newValue.orderStatusId"/> <set from-field="orderItem.orderItemSeqId" field="newValue.orderItemSeqId"/> <set from-field="orderItem.orderId" field="newValue.orderId"/> @@ -111,17 +111,17 @@ <set from-field="parameters.userLogin.userLoginId" field="newValue.statusUserLogin"/> <now-timestamp field="newValue.statusDatetime"/> - <create-value value-name="newValue"/> + <create-value value-field="newValue"/> </if-compare-field> </if-compare> </iterate> <!-- check to see if all items have been completed --> - <entity-and entity-name="OrderItem" list-name="allOrderItems"> - <field-map field-name="orderId" env-name="parameters.orderId"/> + <entity-and entity-name="OrderItem" list="allOrderItems"> + <field-map field-name="orderId" from-field="parameters.orderId"/> </entity-and> <set value="true" field="allCompleted"/> - <iterate list-name="allOrderItems" entry-name="item"> + <iterate list="allOrderItems" entry="item"> <if-compare field="item.statusId" operator="not-equals" value="ITEM_COMPLETED"> <set value="false" field="allCompleted"/> </if-compare> @@ -130,9 +130,9 @@ <if-compare field="allCompleted" operator="equals" value="true"> <!-- update the order header --> <set field="orderHeader.statusId" value="ORDER_COMPLETED"/> - <store-value value-name="orderHeader"/> + <store-value value-field="orderHeader"/> <!-- create the status history --> - <make-value entity-name="OrderStatus" value-name="newValue"/> + <make-value entity-name="OrderStatus" value-field="newValue"/> <sequenced-id sequence-name="OrderStatus" field="newValue.orderStatusId"/> <set from-field="orderHeader.orderId" field="newValue.orderId"/> @@ -140,7 +140,7 @@ <set from-field="parameters.userLogin.userLoginId" field="newValue.statusUserLogin"/> <now-timestamp field="newValue.statusDatetime"/> - <create-value value-name="newValue"/> + <create-value value-field="newValue"/> </if-compare> <!-- return the current return header status --> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Mon Jan 5 23:13:36 2009 @@ -554,7 +554,7 @@ <set from-field="parameters.defaultQuoteUnitPrice" field="quoteItem.quoteUnitPrice"/> </if-not-empty> <!-- - <calculate field="quoteItem.quoteUnitPrice" type="Double"> + <calculate field="quoteItem.quoteUnitPrice"> <calcop operator="multiply"> <calcop operator="get" field="parameters.averageCost"/> <calcop operator="get" field="parameters.costToPriceMult"/> @@ -627,7 +627,7 @@ <condition> <or> <if-empty field="quoteItem.quoteUnitPrice"/> - <if-compare field="quoteItem.quoteUnitPrice" value="0" operator="equals" type="Double"/> + <if-compare field="quoteItem.quoteUnitPrice" value="0" operator="equals" type="BigDecimal"/> </or> </condition> <then> @@ -875,8 +875,8 @@ <if-empty field="quoteWorkEffort.quoteId"> <set-nonpk-fields map="parameters" value-field="lookupMap"/> <create-value value-field="lookupMap"/> - <field-to-result field="quoteId" map-name="lookupMap"/> - <field-to-result field="workEffortId" map-name="lookupMap"/> + <field-to-result field="lookupMap.quoteId"/> + <field-to-result field="lookupMap.workEffortId"/> </if-empty> </simple-method> <simple-method method-name="deleteQuoteWorkEffort" short-description="Delete a QuoteWorkEffort"> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Mon Jan 5 23:13:36 2009 @@ -158,7 +158,7 @@ <result-to-field field="quantityNotTransferred" result-name="quantityNotTransferred"/> </call-service> <check-errors/> - <if-compare field="quantityNotTransferred" value="0.0" operator="greater" type="Double"> + <if-compare field="quantityNotTransferred" value="0.0" operator="greater" type="BigDecimal"> <!-- we create a new requirement for the quantity not trasferred (because not available) --> <clear-field field="inputMap"/> <set-service-fields service-name="createRequirement" map="requirement" to-map="inputMap"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Mon Jan 5 23:13:36 2009 @@ -147,7 +147,7 @@ <entity-one entity-name="ShoppingList" value-field="shoppingList"/> <entity-one entity-name="ShoppingListItem" value-field="shoppingListItem"/> - <if-compare field="parameters.quantity" operator="equals" value="0" type="Double"> + <if-compare field="parameters.quantity" operator="equals" value="0" type="BigDecimal"> <!-- if we're setting quantity to 0.0 then remove the item --> <set-service-fields service-name="removeShoppingListItem" map="parameters" to-map="removeParams"/> <call-service service-name="removeShoppingListItem" in-map-name="removeParams"/> @@ -215,7 +215,7 @@ <field-map field-name="shoppingListId" from-field="parameters.shoppingListId"/> </entity-and> - <set field="totalPrice" type="Double" value="0.0"/> + <set field="totalPrice" type="BigDecimal" value="0.0"/> <iterate entry="shoppingListItem" list="shoppingListItems"> <entity-one entity-name="Product" value-field="product" use-cache="true" auto-field-map="false"> <field-map field-name="productId" from-field="shoppingListItem.productId"/> @@ -337,7 +337,7 @@ <clear-field field="shoppingListParameters" /> <set field="shoppingListParameters.productId" from-field="compProductAssoc.productIdTo" /> <set field="shoppingListParameters.shoppingListId" from-field="shoppingListId" /> - <set field="shoppingListParameters.quantity" value="1" type="Double" /> + <set field="shoppingListParameters.quantity" value="1" type="BigDecimal" /> <call-service service-name="addDistinctShoppingListItem" in-map-name="shoppingListParameters" /> </iterate> <entity-one entity-name="Product" value-field="product" auto-field-map="false" > @@ -362,7 +362,7 @@ <clear-field field="shoppingListParameters" /> <set field="shoppingListParameters.productId" from-field="compProductAssoc.productIdTo" /> <set field="shoppingListParameters.shoppingListId" from-field="shoppingListId" /> - <set field="shoppingListParameters.quantity" value="1" type="Double" /> + <set field="shoppingListParameters.quantity" value="1" type="BigDecimal" /> <call-service service-name="addDistinctShoppingListItem" in-map-name="shoppingListParameters" /> </iterate> </if-not-empty> Modified: ofbiz/trunk/applications/order/servicedef/secas.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/secas.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/order/servicedef/secas.xml (original) +++ ofbiz/trunk/applications/order/servicedef/secas.xml Mon Jan 5 23:13:36 2009 @@ -276,15 +276,15 @@ <!-- Requirement / stock level --> <eca service="createItemIssuance" event="invoke"> - <condition field-name="quantity" value="0" operator="greater" type="Double"/> + <condition field-name="quantity" value="0" operator="greater" type="BigDecimal"/> <action service="checkCreateStockRequirementQoh" mode="sync" run-as-user="system"/> </eca> <eca service="updateItemIssuance" event="invoke"> - <condition field-name="quantity" value="0" operator="greater" type="Double"/> + <condition field-name="quantity" value="0" operator="greater" type="BigDecimal"/> <action service="checkCreateStockRequirementQoh" mode="sync" run-as-user="system"/> </eca> <eca service="reserveOrderItemInventory" event="commit"> - <condition field-name="quantity" value="0" operator="greater" type="Double"/> + <condition field-name="quantity" value="0" operator="greater" type="BigDecimal"/> <action service="checkCreateStockRequirementAtp" mode="sync" run-as-user="system"/> </eca> <!-- create the automatic and ATP requirements for sales orders but only if the status changes from created to approved --> Modified: ofbiz/trunk/applications/order/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/order/servicedef/services.xml (original) +++ ofbiz/trunk/applications/order/servicedef/services.xml Mon Jan 5 23:13:36 2009 @@ -118,11 +118,11 @@ <attribute name="workEfforts" type="List" mode="IN" optional="true"/> <attribute name="orderAdjustments" type="List" mode="IN" optional="false"/> <attribute name="billingAccountId" type="String" mode="IN" optional="true"/> - <attribute name="shippingAmount" type="Double" mode="IN" optional="true"/> + <attribute name="shippingAmount" type="BigDecimal" mode="IN" optional="true"/> <attribute name="firstAttemptOrderId" type="String" mode="IN" optional="true"/> <attribute name="currencyUom" type="String" mode="IN" optional="false"/> - <attribute name="grandTotal" type="Double" mode="IN" optional="true"/> - <attribute name="taxAmount" type="Double" mode="IN" optional="true"/> + <attribute name="grandTotal" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="taxAmount" type="BigDecimal" mode="IN" optional="true"/> <attribute name="orderDate" type="Timestamp" mode="IN" optional="true"/> <attribute name="orderItemShipGroupInfo" type="List" mode="IN" optional="true"/> <attribute name="orderItemAttributes" type="List" mode="IN" optional="true"/> @@ -169,8 +169,8 @@ <attribute name="orderItemSeqId" type="String" mode="IN" optional="false"/> <attribute name="invoiceId" type="String" mode="IN" optional="false"/> <attribute name="invoiceItemSeqId" type="String" mode="IN" optional="false"/> - <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="itemIssuanceId" type="String" mode="IN" optional="true"/> <attribute name="shipmentReceiptId" type="String" mode="IN" optional="true"/> </service> @@ -203,7 +203,7 @@ <attribute name="orderAdjustmentId" type="String" mode="IN" optional="false"/> <attribute name="invoiceId" type="String" mode="IN" optional="false"/> <attribute name="invoiceItemSeqId" type="String" mode="IN" optional="false"/> - <attribute name="amount" type="Double" mode="IN" optional="true"/> + <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/> </service> <service name="createPaymentFromPreference" engine="java" @@ -257,7 +257,7 @@ <attribute name="orderStatusId" type="String" mode="OUT" optional="true"/> <attribute name="orderTypeId" type="String" mode="OUT" optional="true"/> <attribute name="needsInventoryIssuance" type="String" mode="OUT" optional="true"/> - <attribute name="grandTotal" type="Double" mode="OUT" optional="true"/> + <attribute name="grandTotal" type="BigDecimal" mode="OUT" optional="true"/> <attribute name="changeReason" type="String" mode="IN" optional="true"/> </service> @@ -278,7 +278,7 @@ <attribute name="orderId" type="String" mode="IN" optional="false"/> <attribute name="orderItemSeqId" type="String" mode="IN" optional="true"/> <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"/> <attribute name="itemReasonMap" type="Map" mode="IN" string-map-prefix="irm_" optional="true"/> <attribute name="itemCommentMap" type="Map" mode="IN" string-map-prefix="icm_" optional="true"/> </service> @@ -288,7 +288,7 @@ <attribute name="orderId" type="String" mode="IN" optional="false"/> <attribute name="orderItemSeqId" type="String" mode="IN" optional="true"/> <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="updateOrderItems" engine="java" auth="true" @@ -312,8 +312,8 @@ <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="prodCatalogId" type="String" mode="IN" optional="true"/> <attribute name="basePrice" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="quantity" type="Double" mode="IN" optional="false"/> - <attribute name="amount" type="Double" mode="IN" optional="true"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/> + <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/> <attribute name="overridePrice" type="String" mode="IN" optional="true"/> <attribute name="reasonEnumId" type="String" mode="IN" optional="true"/> <attribute name="changeComments" type="String" mode="IN" optional="true"/> @@ -457,8 +457,8 @@ <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/> <attribute name="monthsToInclude" type="Integer" mode="IN" optional="true"/> <!-- if monthsToInclude specified along with fromDate/thruDate, will override fromDate/thruDate --> <attribute name="totalOrders" type="Long" mode="OUT" optional="false"/> - <attribute name="totalGrandAmount" type="Double" mode="OUT" optional="false"/> - <attribute name="totalSubRemainingAmount" type="Double" mode="OUT" optional="false"/> + <attribute name="totalGrandAmount" type="BigDecimal" mode="OUT" optional="false"/> + <attribute name="totalSubRemainingAmount" type="BigDecimal" mode="OUT" optional="false"/> </service> <service name="getOrderHeaderInformation" engine="java" validate="false" Modified: ofbiz/trunk/applications/order/servicedef/services_cart.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_cart.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/order/servicedef/services_cart.xml (original) +++ ofbiz/trunk/applications/order/servicedef/services_cart.xml Mon Jan 5 23:13:36 2009 @@ -31,7 +31,7 @@ <attribute name="fromGroupIndex" type="Integer" mode="IN" optional="false"/> <attribute name="toGroupIndex" type="Integer" mode="IN" optional="false"/> <attribute name="itemIndex" type="Integer" mode="IN" optional="false"/> - <attribute name="quantity" type="Double" mode="IN" optional="false"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/> <attribute name="clearEmptyGroups" type="Boolean" mode="IN" optional="true"/> </service> @@ -81,7 +81,7 @@ <description>Sets the ShoppingCart Payment Options</description> <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/> <attribute name="paymentInfoId" type="String" mode="IN" optional="false"/> - <attribute name="amount" type="Double" mode="IN" optional="true"/> + <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/> <attribute name="refNum" type="String" mode="IN" optional="true"/> </service> @@ -121,15 +121,15 @@ location="org.ofbiz.order.shoppingcart.ShoppingCartServices" invoke="getShoppingCartData"> <description>Get the ShoppingCart data</description> <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/> - <attribute name="totalQuantity" type="Double" mode="OUT" optional="true"/> + <attribute name="totalQuantity" type="BigDecimal" mode="OUT" optional="true"/> <attribute name="currencyIsoCode" type="String" mode="OUT" optional="true"/> - <attribute name="subTotal" type="Double" mode="OUT" optional="true"/> + <attribute name="subTotal" type="BigDecimal" mode="OUT" optional="true"/> <attribute name="subTotalCurrencyFormatted" type="String" mode="OUT" optional="true"/> - <attribute name="totalShipping" type="Double" mode="OUT" optional="true"/> + <attribute name="totalShipping" type="BigDecimal" mode="OUT" optional="true"/> <attribute name="totalShippingCurrencyFormatted" type="String" mode="OUT" optional="true"/> - <attribute name="totalSalesTax" type="Double" mode="OUT" optional="true"/> + <attribute name="totalSalesTax" type="BigDecimal" mode="OUT" optional="true"/> <attribute name="totalSalesTaxCurrencyFormatted" type="String" mode="OUT" optional="true"/> - <attribute name="displayGrandTotal" type="Double" mode="OUT" optional="true"/> + <attribute name="displayGrandTotal" type="BigDecimal" mode="OUT" optional="true"/> <attribute name="displayGrandTotalCurrencyFormatted" type="String" mode="OUT" optional="true"/> <attribute name="cartItemData" type="Map" mode="OUT"/> <attribute name="displayOrderAdjustmentsTotalCurrencyFormatted" type="String" mode="OUT" optional="true"/> Modified: ofbiz/trunk/applications/order/servicedef/services_quote.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_quote.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/order/servicedef/services_quote.xml (original) +++ ofbiz/trunk/applications/order/servicedef/services_quote.xml Mon Jan 5 23:13:36 2009 @@ -149,10 +149,10 @@ location="org/ofbiz/order/quote/QuoteServices.xml" invoke="autoUpdateQuotePrice" auth="true"> <description>Update the QuoteItem price with the passed value (if present) or automatically from the averageCost</description> <auto-attributes include="pk" mode="IN" optional="false"/> - <attribute name="manualQuoteUnitPrice" type="Double" mode="IN" optional="true"/> - <attribute name="defaultQuoteUnitPrice" type="Double" mode="IN" optional="true"/> - <!--<attribute name="averageCost" type="Double" mode="IN" optional="true"/> - <attribute name="costToPriceMult" type="Double" mode="IN" optional="true"/>--> + <attribute name="manualQuoteUnitPrice" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="defaultQuoteUnitPrice" type="BigDecimal" mode="IN" optional="true"/> + <!--<attribute name="averageCost" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="costToPriceMult" type="BigDecimal" mode="IN" optional="true"/>--> </service> <service name="autoCreateQuoteAdjustments" engine="simple" auth="true" location="org/ofbiz/order/quote/QuoteServices.xml" invoke="autoCreateQuoteAdjustments"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |