svn commit: r731851 [1/22] - in /ofbiz/trunk: applications/accounting/entity
Locked
svn commit: r731851 [1/22] - in /ofbiz/trunk: applications/accounting/entity
 
|
Author: jonesde
Date: Mon Jan 5 23:13:36 2009 New Revision: 731851 URL: http://svn.apache.org/viewvc?rev=731851&view=rev Log: Manual merge of typecheckcleanup200810 branch as of rev 731346 in that branch, resolved all conflicts; with this BigDecimal is not the native type for many entity fields and is used for many calculations; some work is still needed in certain areas of the project but this covers the most critical ones; thanks especially to Scott for his work on this Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml ofbiz/trunk/applications/accounting/entitydef/entitymodel_olap.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml ofbiz/trunk/applications/accounting/servicedef/secas_ledger.xml ofbiz/trunk/applications/accounting/servicedef/services_admin.xml ofbiz/trunk/applications/accounting/servicedef/services_billing.xml ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml ofbiz/trunk/applications/accounting/servicedef/services_payment.xml ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml ofbiz/trunk/applications/accounting/servicedef/services_valuelink.xml ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/GlEvents.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/test/FinAccountTests.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/SelectRespServlet.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedPayments.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/forumPaging.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/makebogodata.jsp ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomMapProcs.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml ofbiz/trunk/applications/manufacturing/servicedef/services_bom.xml ofbiz/trunk/applications/manufacturing/servicedef/services_calendar.xml ofbiz/trunk/applications/manufacturing/servicedef/services_formula.xml ofbiz/trunk/applications/manufacturing/servicedef/services_mrp.xml ofbiz/trunk/applications/manufacturing/servicedef/services_production_run.xml ofbiz/trunk/applications/manufacturing/servicedef/services_routing.xml ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/bom/BomSimulation.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl ofbiz/trunk/applications/manufacturing/widget/manufacturing/CuttingListReport.groovy ofbiz/trunk/applications/order/entitydef/entitymodel.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml ofbiz/trunk/applications/order/servicedef/secas.xml ofbiz/trunk/applications/order/servicedef/services.xml ofbiz/trunk/applications/order/servicedef/services_cart.xml ofbiz/trunk/applications/order/servicedef/services_quote.xml ofbiz/trunk/applications/order/servicedef/services_requirement.xml ofbiz/trunk/applications/order/servicedef/services_return.xml ofbiz/trunk/applications/order/servicedef/services_shoppinglist.xml ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java ofbiz/trunk/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/test/PurchaseOrderTest.java ofbiz/trunk/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java ofbiz/trunk/applications/party/data/ScheduledJobs.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml ofbiz/trunk/applications/party/servicedef/services.xml ofbiz/trunk/applications/product/entitydef/eecas.xml ofbiz/trunk/applications/product/entitydef/entitymodel.xml ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml ofbiz/trunk/applications/product/servicedef/secas.xml ofbiz/trunk/applications/product/servicedef/services.xml ofbiz/trunk/applications/product/servicedef/services_cost.xml ofbiz/trunk/applications/product/servicedef/services_facility.xml ofbiz/trunk/applications/product/servicedef/services_feature.xml ofbiz/trunk/applications/product/servicedef/services_pricepromo.xml ofbiz/trunk/applications/product/servicedef/services_shipment.xml ofbiz/trunk/applications/product/servicedef/services_shipment_ups.xml ofbiz/trunk/applications/product/servicedef/services_store.xml ofbiz/trunk/applications/product/servicedef/services_uom.xml ofbiz/trunk/applications/product/servicedef/services_view.xml ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java ofbiz/trunk/applications/product/src/org/ofbiz/product/test/StockMovesTest.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilParse.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java ofbiz/trunk/framework/entity/fieldtype/fieldtypeadvantage.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypeaxion.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypecloudscape.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypedaffodil.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypederby.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypefirebird.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypehsql.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypemssql.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypemysql.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypeoracle.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypepostgres.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypepostnew.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypesapdb.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypesybase.xml ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/ConvertInvoiceCurrency.groovy ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Mon Jan 5 23:13:36 2009 @@ -249,7 +249,7 @@ <field name="budgetId" type="id"></field> <field name="budgetItemSeqId" type="id"></field> <field name="amountChange" type="currency-amount"></field> - <field name="percentageChange" type="floating-point"></field> + <field name="percentageChange" type="fixed-point"></field> <prim-key field="budgetScenarioApplicId"/> <prim-key field="budgetScenarioId"/> <relation type="one" fk-name="BUDGET_SAPL_BSCN" rel-entity-name="BudgetScenario"> @@ -269,7 +269,7 @@ <field name="budgetScenarioId" type="id-ne"></field> <field name="budgetItemTypeId" type="id-ne"></field> <field name="amountChange" type="currency-amount"></field> - <field name="percentageChange" type="floating-point"></field> + <field name="percentageChange" type="fixed-point"></field> <prim-key field="budgetScenarioId"/> <prim-key field="budgetItemTypeId"/> <relation type="one" fk-name="BUDGET_SRLE_BSCN" rel-entity-name="BudgetScenario"> @@ -629,7 +629,7 @@ <field name="dateNextService" type="date-time"></field> <field name="expectedEndOfLife" type="date"></field> <field name="actualEndOfLife" type="date"></field> - <field name="productionCapacity" type="floating-point"></field> + <field name="productionCapacity" type="fixed-point"></field> <field name="uomId" type="id"></field> <field name="calendarId" type="id-ne"></field> <field name="serialNumber" type="long-varchar"></field> @@ -749,7 +749,7 @@ <field name="productMaintTypeId" type="id-ne"><description>If productMaintSeqId is known can lookup using that and the FixedAsset.productId; for un-scheduled maintenance is filled in directly</description></field> <field name="productMaintSeqId" type="id"><description>Optional, though should be filled in to determine upcoming maintenance for all scheduled maintenance</description></field> <field name="scheduleWorkEffortId" type="id"><description>Has field for estimated/actual start and finish dates, etc</description></field> - <field name="intervalQuantity" type="floating-point"></field> + <field name="intervalQuantity" type="fixed-point"></field> <field name="intervalUomId" type="id"><description>UOM for intervalQuantity; if used intervalMeterTypeId is generally not used (ie one or the other); if a meter reading is done as well that is not tied to the interval it should be tracked in a FixedAssetMaintMeter record</description></field> <field name="intervalMeterTypeId" type="id"><description>Meter Type for intervalQuantity; if used intervalUomId is generally not used (ie one or the other)</description></field> <field name="purchaseOrderId" type="id"></field> @@ -784,7 +784,7 @@ <field name="fixedAssetId" type="id-ne"></field> <field name="maintHistSeqId" type="id-ne"></field> <field name="productMeterTypeId" type="id-ne"></field> - <field name="meterValue" type="floating-point"></field> + <field name="meterValue" type="fixed-point"></field> <prim-key field="fixedAssetId"/> <prim-key field="maintHistSeqId"/> <prim-key field="productMeterTypeId"/> @@ -802,7 +802,7 @@ <field name="fixedAssetId" type="id-ne"></field> <field name="productMeterTypeId" type="id-ne"></field> <field name="readingDate" type="date-time"></field> - <field name="meterValue" type="floating-point"></field> + <field name="meterValue" type="fixed-point"></field> <field name="readingReasonEnumId" type="id"></field> <field name="maintHistSeqId" type="id"></field> <field name="workEffortId" type="id"></field> @@ -827,7 +827,7 @@ <field name="thruDate" type="date-time"></field> <field name="comments" type="comment"></field> <field name="sequenceNum" type="numeric"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <field name="quantityUomId" type="id"></field> <prim-key field="fixedAssetId"/> <prim-key field="productId"/> @@ -1164,7 +1164,7 @@ <field name="parentInvoiceItemSeqId" type="id"></field> <field name="uomId" type="id"></field> <field name="taxableFlag" type="indicator"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <field name="amount" type="currency-precise"></field> <field name="description" type="description"></field> <field name="taxAuthPartyId" type="id-ne"/> @@ -1315,7 +1315,7 @@ <field name="partyId" type="id-ne"></field> <field name="roleTypeId" type="id-ne"></field> <field name="datetimePerformed" type="date-time"></field> - <field name="percentage" type="floating-point"></field> + <field name="percentage" type="fixed-point"></field> <prim-key field="invoiceId"/> <prim-key field="partyId"/> <prim-key field="roleTypeId"/> @@ -2008,7 +2008,7 @@ <field name="budgetItemTypeId" type="id-ne"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> - <field name="allocationPercentage" type="floating-point"></field> + <field name="allocationPercentage" type="fixed-point"></field> <prim-key field="glAccountId"/> <prim-key field="budgetItemTypeId"/> <prim-key field="fromDate"/> @@ -2158,7 +2158,7 @@ <description>Running tally of a product's average cost in a particular company</description> <field name="organizationPartyId" type="id-ne"/> <field name="productId" type="id-ne"/> - <field name="averageCost" type="floating-point"/> + <field name="averageCost" type="fixed-point"/> <field name="fromDate" type="date-time"/> <field name="thruDate" type="date-time"/> <prim-key field="organizationPartyId"/> @@ -3146,7 +3146,7 @@ <field name="minItemPrice" type="currency-amount"></field> <field name="minPurchase" type="currency-amount"></field> <field name="taxShipping" type="indicator"></field> - <field name="taxPercentage" type="floating-point"></field> + <field name="taxPercentage" type="fixed-point"></field> <field name="taxPromotions" type="indicator"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> @@ -3198,18 +3198,18 @@ <field name="generalDefault" type="indicator"></field> <field name="insideCity" type="indicator"></field> <field name="geoCode" type="short-varchar"></field> - <field name="stateSalesTax" type="floating-point"></field> - <field name="citySalesTax" type="floating-point"></field> - <field name="cityLocalSalesTax" type="floating-point"></field> - <field name="countySalesTax" type="floating-point"></field> - <field name="countyLocalSalesTax" type="floating-point"></field> - <field name="comboSalesTax" type="floating-point"></field> - <field name="stateUseTax" type="floating-point"></field> - <field name="cityUseTax" type="floating-point"></field> - <field name="cityLocalUseTax" type="floating-point"></field> - <field name="countyUseTax" type="floating-point"></field> - <field name="countyLocalUseTax" type="floating-point"></field> - <field name="comboUseTax" type="floating-point"></field> + <field name="stateSalesTax" type="fixed-point"></field> + <field name="citySalesTax" type="fixed-point"></field> + <field name="cityLocalSalesTax" type="fixed-point"></field> + <field name="countySalesTax" type="fixed-point"></field> + <field name="countyLocalSalesTax" type="fixed-point"></field> + <field name="comboSalesTax" type="fixed-point"></field> + <field name="stateUseTax" type="fixed-point"></field> + <field name="cityUseTax" type="fixed-point"></field> + <field name="cityLocalUseTax" type="fixed-point"></field> + <field name="countyUseTax" type="fixed-point"></field> + <field name="countyLocalUseTax" type="fixed-point"></field> + <field name="comboUseTax" type="fixed-point"></field> <prim-key field="zipCode"/> <prim-key field="stateCode"/> <prim-key field="city"/> Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel_olap.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel_olap.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/entitydef/entitymodel_olap.xml (original) +++ ofbiz/trunk/applications/accounting/entitydef/entitymodel_olap.xml Mon Jan 5 23:13:36 2009 @@ -40,7 +40,7 @@ <field name="billToCustomerDimId" type="id-ne"></field> <!-- TODO: implement the dimension --> <field name="origCurrencyDimId" type="id-ne"></field> - <field name="quantity" type="floating-point"> + <field name="quantity" type="fixed-point"> <description>Quantity invoiced. From InvoiceItem.quantity</description> </field> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Mon Jan 5 23:13:36 2009 @@ -41,7 +41,7 @@ <if-empty field="newEntity.finAccountId"> <sequenced-id sequence-name="FinAccount" field="finAccountId"/> - <to-string field-name="finAccountId"/> + <to-string field="finAccountId"/> <set from-field="finAccountId" field="newEntity.finAccountId"/> </if-empty> @@ -297,7 +297,7 @@ <then><set field="amountForCalc" from-field="finAccountTrans.amount"/></then> </else-if> </if> - <calculate field="actualBalanceSum" type="BigDecimal" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}"> + <calculate field="actualBalanceSum" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}"> <calcop operator="add" field="actualBalanceSum"> <calcop operator="get" field="amountForCalc"/> </calcop> @@ -320,8 +320,8 @@ <!-- Okay, now just store the results --> <entity-one entity-name="FinAccount" value-field="finAccount"/> <log level="info" message="In updateFinAccountBalancesFromTrans/Auth updating FinAccount with ID [${finAccountId}] with actualBalance: ${finAccount.actualBalance} -> ${actualBalanceSum}, and availableBalance: ${finAccount.availableBalance} -> ${availableBalanceSum}"/> - <set field="finAccount.actualBalance" from-field="actualBalanceSum" type="Double"/> - <set field="finAccount.availableBalance" from-field="availableBalanceSum" type="Double"/> + <set field="finAccount.actualBalance" from-field="actualBalanceSum"/> + <set field="finAccount.availableBalance" from-field="availableBalanceSum"/> <store-value value-field="finAccount"/> </simple-method> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Mon Jan 5 23:13:36 2009 @@ -351,14 +351,14 @@ <if-not-empty field="maintList"> <set field="listSize" value="${util:size(maintList)}" type="Long"/> </if-not-empty> - <set field="maxIntervalQty" value="0" type="Double"/> + <set field="maxIntervalQty" value="0" type="BigDecimal"/> <iterate list="maintList" entry="maintValue"> <if-compare-field field="maintValue.intervalQuantity" operator="greater" to-field="maxIntervalQty" type="BigDecimal"> - <set field="maxIntervalQty" from-field="maintValue.intervalQuantity" type="Double"/> + <set field="maxIntervalQty" from-field="maintValue.intervalQuantity" type="BigDecimal"/> </if-compare-field> </iterate> - <set field="nextIntervalQty" value="${bsh:maxIntervalQty + productMaintValue.getDouble("intervalQuantity")}" type="BigDecimal"/> - <if-compare-field field="nextIntervalQty" operator="less-equals" to-field="meterValue.meterValue" type="Double"> + <set field="nextIntervalQty" value="${bsh:maxIntervalQty.add(productMaintValue.getBigDecimal("intervalQuantity"));}" type="BigDecimal"/> + <if-compare-field field="nextIntervalQty" operator="less-equals" to-field="meterValue.meterValue" type="BigDecimal"> <set field="maintDue" value="false"/> <if-compare field="repeatCount" operator="greater" value="0" type="Long"> <if-compare-field field="listSize" operator="less" to-field="repeatCount" type="Long"> @@ -568,13 +568,13 @@ <simple-method method-name="straightLineDepreciation" short-description="Calculate straight line depreciation to Fixed Asset[ (PC-SV)/expLife ]"> <set field="expEndOfLifeYear" from-field="parameters.expEndOfLifeYear" type="Integer"/> <set field="assetAcquiredYear" from-field="parameters.assetAcquiredYear" type="Integer"/> - <set field="purchaseCost" from-field="parameters.purchaseCost" type="Double"/> - <set field="salvageValue" from-field="parameters.salvageValue" type="Double"/> + <set field="purchaseCost" from-field="parameters.purchaseCost"/> + <set field="salvageValue" from-field="parameters.salvageValue"/> <call-object-method obj-field="parameters.usageYears" method-name="intValue" ret-field="intUsageYears"/> <if-not-empty field="parameters.fixedAssetId"> - <set field="depreciation" value="0.0" type="Double"/> + <set field="depreciation" value="0.0" type="BigDecimal"/> <!--FORMULA : depreciation = (purchaseCost - salvageValue) / (expectedEndOfLife - dateAcquired) --> - <calculate field="depreciation" decimal-scale="2" type="Double"> + <calculate field="depreciation" decimal-scale="2"> <calcop operator="divide"> <calcop operator="subtract"> <calcop operator="get" field="purchaseCost"/> @@ -587,7 +587,7 @@ </calcop> </calculate> <loop count="${intUsageYears}"> - <calculate field="purchaseCost" type="Double"> + <calculate field="purchaseCost"> <calcop operator="subtract"> <calcop operator="get" field="purchaseCost"/> <calcop operator="get" field="depreciation"/> @@ -605,14 +605,14 @@ <simple-method method-name="doubleDecliningBalanceDepreciation" short-description="Calculate double declining balance depreciation to Fixed Asset"> <set field="expEndOfLifeYear" from-field="parameters.expEndOfLifeYear" type="Integer"/> <set field="assetAcquiredYear" from-field="parameters.assetAcquiredYear" type="Integer"/> - <set field="purchaseCost" from-field="parameters.purchaseCost" type="Double"/> - <set field="salvageValue" from-field="parameters.salvageValue" type="Double"/> + <set field="purchaseCost" from-field="parameters.purchaseCost"/> + <set field="salvageValue" from-field="parameters.salvageValue"/> <call-object-method obj-field="parameters.usageYears" method-name="intValue" ret-field="intUsageYears"/> <if-not-empty field="parameters.fixedAssetId"> <loop count="${intUsageYears}"> - <set field="depreciation" value="0.0" type="Double"/> + <set field="depreciation" value="0.0" type="BigDecimal"/> <!--FORMULA : depreciation = (NBV - salvageValue) * 2 / (expectedEndOfLife - dateAcquired) --> - <calculate field="depreciation" decimal-scale="2" type="Double"> + <calculate field="depreciation" decimal-scale="2"> <calcop operator="multiply"> <calcop operator="divide"> <calcop operator="subtract"> @@ -687,7 +687,7 @@ <!-- if any asset's salvage value is empty then set it by 0 --> <if-empty field="fixedAsset.salvageValue"> - <set field="salvageValue" value="0.0" type="Double"/> + <set field="salvageValue" value="0.0" type="BigDecimal"/> <else> <set field="salvageValue" from-field="fixedAsset.salvageValue"/> </else> @@ -720,8 +720,8 @@ <set field="serviceInMap.fixedAssetId" from-field="parameters.fixedAssetId"/> <set field="serviceInMap.expEndOfLifeYear" from-field="expEndOfLifeYear" type="Integer"/> <set field="serviceInMap.assetAcquiredYear" from-field="assetAcquiredYear" type="Integer"/> - <set field="serviceInMap.purchaseCost" from-field="fixedAsset.purchaseCost" type="Double"/> - <set field="serviceInMap.salvageValue" from-field="salvageValue" type="Double"/> + <set field="serviceInMap.purchaseCost" from-field="fixedAsset.purchaseCost"/> + <set field="serviceInMap.salvageValue" from-field="salvageValue"/> <set field="serviceInMap.usageYears" from-field="usageYears" type="Integer"/> <call-service service-name="${customMethod.customMethodName}" in-map-name="serviceInMap"> <result-to-field result-name="assetDepreciationTillDate"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Mon Jan 5 23:13:36 2009 @@ -269,7 +269,7 @@ </if-empty> <if-not-empty field="parameters.productId"> <if-empty field="parameters.quantity"> - <set field="newEntity.quantity" value="1.0" type="Double"/> + <set field="newEntity.quantity" value="1.0" type="BigDecimal"/> </if-empty> </if-not-empty> <if-empty field="newEntity.amount"> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml Mon Jan 5 23:13:36 2009 @@ -37,7 +37,7 @@ <condition><if-compare field="affiliatePartyRelationship.roleTypeIdTo" operator="equals" value="AFFILIATE"/></condition> <then> <!-- calculate a simple commission with a base amount + a percentage of the payment --> - <calculate field="commissionAmount" type="Double"> + <calculate field="commissionAmount"> <calcop operator="add"> <number value="10.0"/><!-- base amount --> <calcop operator="multiply"> @@ -74,7 +74,7 @@ <set field="createInvoiceItemMap.invoiceId" from-field="createdInvoiceId"/> <set field="createInvoiceItemMap.invoiceItemTypeId" value="COMM_INV_ITEM"/> <set field="createInvoiceItemMap.amount" from-field="commissionAmount"/> - <set field="createInvoiceItemMap.quantity" value="1" type="Double"/> + <set field="createInvoiceItemMap.quantity" value="1" type="BigDecimal"/> <set field="createInvoiceItemMap.description" value="Commission for Received Customer Payment [${payment.paymentId}]"/> <call-service service-name="createInvoiceItem" in-map-name="createInvoiceItemMap"/> </simple-method> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml Mon Jan 5 23:13:36 2009 @@ -93,7 +93,7 @@ </if-empty> <if-compare-field field="newEntity.origCurrencyUomId" to-field="newEntity.currencyUomId" operator="not-equals"> <clear-field field="convertUomInMap"/> - <set field="convertUomInMap.originalValue" from-field="newEntity.origAmount" type="Double"/> + <set field="convertUomInMap.originalValue" from-field="newEntity.origAmount" type="BigDecimal"/> <set field="convertUomInMap.uomId" from-field="newEntity.origCurrencyUomId"/> <set field="convertUomInMap.uomIdTo" from-field="newEntity.currencyUomId"/> <!-- TODO: set the optional asOfDate input parameter --> @@ -211,10 +211,10 @@ <call-service service-name="calculateAcctgTransTrialBalance" in-map-name="trialBalanceCallMap"> <results-to-map map-name="trialBalanceResultMap"/> </call-service> - <if-compare field="trialBalanceResultMap.debitCreditDifference" operator="greater-equals" value="0.01" type="Double"> + <if-compare field="trialBalanceResultMap.debitCreditDifference" operator="greater-equals" value="0.01" type="BigDecimal"> <add-error><fail-message message="Not posting GL Accounting Transaction with ID [${parameters.acctgTransId}] because the trial balance failed: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}"/></add-error> </if-compare> - <if-compare field="trialBalanceResultMap.debitCreditDifference" operator="less-equals" value="-0.01" type="Double"> + <if-compare field="trialBalanceResultMap.debitCreditDifference" operator="less-equals" value="-0.01" type="BigDecimal"> <add-error><fail-message message="Not posting GL Accounting Transaction with ID [${parameters.acctgTransId}] because the trial balance failed: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}"/></add-error> </if-compare> @@ -377,7 +377,7 @@ <!-- update the gl account's posted balance for this organization --> <set from-field="glAccount.glAccountId" field="updateGlAccountParams.glAccountId"/> - <set from-field="postedBalance" field="updateGlAccountParams.postedBalance" type="Double"/> + <set from-field="postedBalance" field="updateGlAccountParams.postedBalance" type="BigDecimal"/> <set from-field="acctgTransEntry.organizationPartyId" field="updateGlAccountParams.organizationPartyId"/> <call-service service-name="updateGlAccountOrganization" in-map-name="updateGlAccountParams"/> @@ -395,8 +395,8 @@ <set from-field="acctgTransEntry.glAccountId" field="glAccountHistory.glAccountId"/> <set from-field="acctgTransEntry.organizationPartyId" field="glAccountHistory.organizationPartyId"/> <set from-field="customTimePeriod.customTimePeriodId" field="glAccountHistory.customTimePeriodId"/> - <set field="glAccountHistory.postedDebits" value="0.0" type="Double"/> - <set field="glAccountHistory.postedCredits" value="0.0" type="Double"/> + <set field="glAccountHistory.postedDebits" value="0.0" type="BigDecimal"/> + <set field="glAccountHistory.postedCredits" value="0.0" type="BigDecimal"/> <create-value value-field="glAccountHistory"/> </if-empty> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Mon Jan 5 23:13:36 2009 @@ -143,15 +143,15 @@ <call-service service-name="calculateAcctgTransTrialBalance" in-map-name="callServiceMap"> <results-to-map map-name="serviceResults"/> </call-service> - <calculate field="debitTotal" type="Double"> + <calculate field="debitTotal"> <calcop operator="get" field="debitTotal"/> <calcop operator="get" field="serviceResults.debitTotal"/> </calculate> - <calculate field="creditTotal" type="Double"> + <calculate field="creditTotal"> <calcop operator="get" field="creditTotal"/> <calcop operator="get" field="serviceResults.creditTotal"/> </calculate> - <calculate field="debitCreditDifference" type="Double"> + <calculate field="debitCreditDifference"> <calcop operator="get" field="debitCreditDifference"/> <calcop operator="get" field="serviceResults.debitCreditDifference"/> </calculate> @@ -171,7 +171,7 @@ <results-to-map map-name="trialBalanceResultMap"/> </call-service> - <if-compare field="trialBalanceResultMap.debitCreditDifference" operator="not-equals" value="0" type="Double"> + <if-compare field="trialBalanceResultMap.debitCreditDifference" operator="not-equals" value="0" type="BigDecimal"> <add-error><fail-message message="Not posting GL Journal with ID [${parameters.glJournalId}] because the trial balance failed: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}"/></add-error> <check-errors/> </if-compare> @@ -333,7 +333,7 @@ <set field="acctgTransEntry.currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/> <if-compare-field field="acctgTransEntry.origCurrencyUomId" to-field="acctgTransEntry.currencyUomId" operator="not-equals"> <clear-field field="convertUomInMap"/> - <set field="convertUomInMap.originalValue" from-field="acctgTransEntry.origAmount" type="Double"/> + <set field="convertUomInMap.originalValue" from-field="acctgTransEntry.origAmount"/> <set field="convertUomInMap.uomId" from-field="acctgTransEntry.origCurrencyUomId"/> <set field="convertUomInMap.uomIdTo" from-field="acctgTransEntry.currencyUomId"/> <!-- TODO: set the optional asOfDate input parameter --> @@ -655,7 +655,7 @@ <order-by field-name="acctgTransId"/> <order-by field-name="acctgTransEntrySeqId"/> </entity-condition> - <set field="totalAmount" value="0.0" type="Double"/> + <set field="totalAmount" value="0.0" type="BigDecimal"/> <iterate list="acctgTransAndEntries" entry="acctgTransAndEntry"> <get-related-one value-field="acctgTransAndEntry" relation-name="GlAccount" to-value-field="glAccount"/> <call-class-method class-name="org.ofbiz.accounting.util.UtilAccounting" method-name="isCreditAccount" ret-field="isCreditAccount"> @@ -667,7 +667,7 @@ <call-class-method class-name="org.ofbiz.accounting.util.UtilAccounting" method-name="isExpenseAccount" ret-field="isExpenseAccount"> <field field="glAccount" type="GenericValue"/> </call-class-method> - <set field="amount" from-field="acctgTransAndEntry.amount" type="Double"/> + <set field="amount" from-field="acctgTransAndEntry.amount"/> <if> <condition> <or> @@ -692,7 +692,7 @@ <calcop field="amount" operator="negative"/> </calculate> </if-compare> - <calculate field="totalAmount" type="Double"> + <calculate field="totalAmount"> <calcop field="totalAmount" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </iterate> @@ -715,7 +715,7 @@ <call-class-method class-name="org.ofbiz.accounting.util.UtilAccounting" method-name="getNetBalance" ret-field="postedBalance"> <field field="profitLossAccountHistory" type="GenericValue"/> </call-class-method> - <if-compare-field field="postedBalance" to-field="totalAmount" operator="not-equals" type="Double"> + <if-compare-field field="postedBalance" to-field="totalAmount" operator="not-equals" type="BigDecimal"> <add-error><fail-message message="There is already a posted balance [${postedBalance}] that doesn't match with the current one [${totalAmount}]."/></add-error> </if-compare-field> <check-errors/> @@ -753,7 +753,7 @@ <call-class-method class-name="org.ofbiz.accounting.util.UtilAccounting" method-name="getNetBalance" ret-field="endingBalance"> <field field="glAccountHistory" type="GenericValue"/> </call-class-method> - <set field="glAccountHistory.endingBalance" from-field="endingBalance" type="Double"/> + <set field="glAccountHistory.endingBalance" from-field="endingBalance"/> <store-value value-field="glAccountHistory"/> </iterate> <if-not-empty field="lastClosedTimePeriod"> @@ -781,12 +781,12 @@ <set field="thisPeriodGlAccountHistory.customTimePeriodId" from-field="customTimePeriod.customTimePeriodId"/> <set field="thisPeriodGlAccountHistory.organizationPartyId" from-field="customTimePeriod.organizationPartyId"/> <set field="thisPeriodGlAccountHistory.glAccountId" from-field="lastPeriodGlAccountHistory.glAccountId"/> - <set field="thisPeriodGlAccountHistory.postedDebits" value="0.0" type="Double"/> - <set field="thisPeriodGlAccountHistory.postedCredits" value="0.0" type="Double"/> - <set field="thisPeriodGlAccountHistory.endingBalance" from-field="lastPeriodGlAccountHistory.endingBalance" type="Double"/> + <set field="thisPeriodGlAccountHistory.postedDebits" value="0.0" type="BigDecimal"/> + <set field="thisPeriodGlAccountHistory.postedCredits" value="0.0" type="BigDecimal"/> + <set field="thisPeriodGlAccountHistory.endingBalance" from-field="lastPeriodGlAccountHistory.endingBalance"/> <create-value value-field="thisPeriodGlAccountHistory"/> <else> - <calculate field="thisPeriodGlAccountHistory.endingBalance" type="Double"> + <calculate field="thisPeriodGlAccountHistory.endingBalance"> <calcop field="thisPeriodGlAccountHistory.endingBalance" operator="add"><calcop field="lastPeriodGlAccountHistory.endingBalance" operator="get"/></calcop> </calculate> <store-value value-field="thisPeriodGlAccountHistory"/> @@ -823,7 +823,7 @@ <order-by field-name="acctgTransEntrySeqId"/> </entity-condition> - <set field="newPostedBalance" value="0.0" type="Double"/> + <set field="newPostedBalance" value="0.0" type="BigDecimal"/> <iterate list="acctgTransAndEntries" entry="acctgTransAndEntry"> <get-related-one value-field="acctgTransAndEntry" relation-name="GlAccount" to-value-field="glAccount"/> <call-class-method class-name="org.ofbiz.accounting.util.UtilAccounting" method-name="isCreditAccount" ret-field="isCreditAccount"> @@ -835,7 +835,7 @@ <call-class-method class-name="org.ofbiz.accounting.util.UtilAccounting" method-name="isExpenseAccount" ret-field="isExpenseAccount"> <field field="glAccount" type="GenericValue"/> </call-class-method> - <set field="amount" from-field="acctgTransAndEntry.amount" type="Double"/> + <set field="amount" from-field="acctgTransAndEntry.amount"/> <if> <condition> <or> @@ -860,14 +860,14 @@ <calcop field="amount" operator="negative"/> </calculate> </if-compare> - <calculate field="newPostedBalance" type="Double"> + <calculate field="newPostedBalance"> <calcop field="newPostedBalance" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </iterate> <set field="updateGlAccountOrganizationInMap.organizationPartyId" from-field="customTimePeriod.organizationPartyId"/> <set field="updateGlAccountOrganizationInMap.glAccountId" from-field="glAccountOrganizationAndClass.glAccountId"/> - <set field="updateGlAccountOrganizationInMap.postedBalance" from-field="newPostedBalance" type="Double"/> + <set field="updateGlAccountOrganizationInMap.postedBalance" from-field="newPostedBalance"/> <call-service service-name="updateGlAccountOrganization" in-map-name="updateGlAccountOrganizationInMap"/> </iterate> @@ -913,7 +913,7 @@ <order-by field-name="acctgTransId"/> <order-by field-name="acctgTransEntrySeqId"/> </entity-condition> - <set field="totalNetIncome" value="0.0" type="Double"/> + <set field="totalNetIncome" value="0.0" type="BigDecimal"/> <iterate list="acctgTransAndEntries" entry="acctgTransAndEntry"> <get-related-one value-field="acctgTransAndEntry" relation-name="GlAccount" to-value-field="glAccount"/> <call-class-method class-name="org.ofbiz.accounting.util.UtilAccounting" method-name="isCreditAccount" ret-field="isCreditAccount"> @@ -925,7 +925,7 @@ <call-class-method class-name="org.ofbiz.accounting.util.UtilAccounting" method-name="isExpenseAccount" ret-field="isExpenseAccount"> <field field="glAccount" type="GenericValue"/> </call-class-method> - <set field="amount" from-field="acctgTransAndEntry.amount" type="Double"/> + <set field="amount" from-field="acctgTransAndEntry.amount"/> <if> <condition> <or> @@ -950,21 +950,21 @@ <calcop field="amount" operator="negative"/> </calculate> </if-compare> - <calculate field="totalNetIncome" type="Double"> + <calculate field="totalNetIncome"> <calcop field="totalNetIncome" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> <if-compare field="isExpenseAccount" operator="equals" value="true" type="Boolean"> <if-empty field="glAccountTotalsExpenseMap.${glAccount.glAccountId}"> - <set field="glAccountTotalsExpenseMap.${glAccount.glAccountId}" value="0.0" type="Double"/> + <set field="glAccountTotalsExpenseMap.${glAccount.glAccountId}" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="glAccountTotalsExpenseMap.${glAccount.glAccountId}" type="Double"> + <calculate field="glAccountTotalsExpenseMap.${glAccount.glAccountId}"> <calcop field="glAccountTotalsExpenseMap.${glAccount.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> <else> <if-empty field="glAccountTotalsProfitMap.${glAccount.glAccountId}"> - <set field="glAccountTotalsProfitMap.${glAccount.glAccountId}" value="0.0" type="Double"/> + <set field="glAccountTotalsProfitMap.${glAccount.glAccountId}" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="glAccountTotalsProfitMap.${glAccount.glAccountId}" type="Double"> + <calculate field="glAccountTotalsProfitMap.${glAccount.glAccountId}"> <calcop field="glAccountTotalsProfitMap.${glAccount.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </else> @@ -1030,7 +1030,7 @@ <order-by field-name="glAccountId"/> </entity-condition> <iterate list="glAccountAndHistories" entry="glAccountAndHistory"> - <set field="glAccountTotalsAssetMap.${glAccountAndHistory.glAccountId}" from-field="glAccountAndHistory.endingBalance" type="Double"/> + <set field="glAccountTotalsAssetMap.${glAccountAndHistory.glAccountId}" from-field="glAccountAndHistory.endingBalance"/> </iterate> <entity-condition entity-name="GlAccountAndHistory" list="glAccountAndHistories"> <condition-list combine="and"> @@ -1041,7 +1041,7 @@ <order-by field-name="glAccountId"/> </entity-condition> <iterate list="glAccountAndHistories" entry="glAccountAndHistory"> - <set field="glAccountTotalsLiabilityMap.${glAccountAndHistory.glAccountId}" from-field="glAccountAndHistory.endingBalance" type="Double"/> + <set field="glAccountTotalsLiabilityMap.${glAccountAndHistory.glAccountId}" from-field="glAccountAndHistory.endingBalance"/> </iterate> <entity-condition entity-name="GlAccountAndHistory" list="glAccountAndHistories"> <condition-list combine="and"> @@ -1052,7 +1052,7 @@ <order-by field-name="glAccountId"/> </entity-condition> <iterate list="glAccountAndHistories" entry="glAccountAndHistory"> - <set field="glAccountTotalsEquityMap.${glAccountAndHistory.glAccountId}" from-field="glAccountAndHistory.endingBalance" type="Double"/> + <set field="glAccountTotalsEquityMap.${glAccountAndHistory.glAccountId}" from-field="glAccountAndHistory.endingBalance"/> </iterate> </if-not-empty> @@ -1070,16 +1070,16 @@ <order-by field-name="acctgTransEntrySeqId"/> </entity-condition> <iterate list="acctgTransAndEntries" entry="acctgTransAndEntry"> - <set field="amount" from-field="acctgTransAndEntry.amount" type="Double"/> + <set field="amount" from-field="acctgTransAndEntry.amount"/> <if-compare field="acctgTransAndEntry.debitCreditFlag" operator="equals" value="C"> <calculate field="amount"> <calcop field="amount" operator="negative"/> </calculate> </if-compare> <if-empty field="glAccountTotalsAssetMap.${acctgTransAndEntry.glAccountId}"> - <set field="glAccountTotalsAssetMap.${acctgTransAndEntry.glAccountId}" value="0.0" type="Double"/> + <set field="glAccountTotalsAssetMap.${acctgTransAndEntry.glAccountId}" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="glAccountTotalsAssetMap.${acctgTransAndEntry.glAccountId}" type="Double"> + <calculate field="glAccountTotalsAssetMap.${acctgTransAndEntry.glAccountId}"> <calcop field="glAccountTotalsAssetMap.${acctgTransAndEntry.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </iterate> @@ -1097,16 +1097,16 @@ <order-by field-name="acctgTransEntrySeqId"/> </entity-condition> <iterate list="acctgTransAndEntries" entry="acctgTransAndEntry"> - <set field="amount" from-field="acctgTransAndEntry.amount" type="Double"/> + <set field="amount" from-field="acctgTransAndEntry.amount"/> <if-compare field="acctgTransAndEntry.debitCreditFlag" operator="equals" value="D"> <calculate field="amount"> <calcop field="amount" operator="negative"/> </calculate> </if-compare> <if-empty field="glAccountTotalsLiabilityMap.${acctgTransAndEntry.glAccountId}"> - <set field="glAccountTotalsLiabilityMap.${acctgTransAndEntry.glAccountId}" value="0.0" type="Double"/> + <set field="glAccountTotalsLiabilityMap.${acctgTransAndEntry.glAccountId}" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="glAccountTotalsLiabilityMap.${acctgTransAndEntry.glAccountId}" type="Double"> + <calculate field="glAccountTotalsLiabilityMap.${acctgTransAndEntry.glAccountId}"> <calcop field="glAccountTotalsLiabilityMap.${acctgTransAndEntry.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </iterate> @@ -1124,16 +1124,16 @@ <order-by field-name="acctgTransEntrySeqId"/> </entity-condition> <iterate list="acctgTransAndEntries" entry="acctgTransAndEntry"> - <set field="amount" from-field="acctgTransAndEntry.amount" type="Double"/> + <set field="amount" from-field="acctgTransAndEntry.amount"/> <if-compare field="acctgTransAndEntry.debitCreditFlag" operator="equals" value="D"> <calculate field="amount"> <calcop field="amount" operator="negative"/> </calculate> </if-compare> <if-empty field="glAccountTotalsEquityMap.${acctgTransAndEntry.glAccountId}"> - <set field="glAccountTotalsEquityMap.${acctgTransAndEntry.glAccountId}" value="0.0" type="Double"/> + <set field="glAccountTotalsEquityMap.${acctgTransAndEntry.glAccountId}" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="glAccountTotalsEquityMap.${acctgTransAndEntry.glAccountId}" type="Double"> + <calculate field="glAccountTotalsEquityMap.${acctgTransAndEntry.glAccountId}"> <calcop field="glAccountTotalsEquityMap.${acctgTransAndEntry.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </iterate> @@ -1153,9 +1153,9 @@ </entity-one> <if-not-empty field="retainedEarningsAccount"> <if-empty field="glAccountTotalsEquityMap.${retainedEarningsAccount.glAccountId}"> - <set field="glAccountTotalsEquityMap.${retainedEarningsAccount.glAccountId}" value="0.0" type="Double"/> + <set field="glAccountTotalsEquityMap.${retainedEarningsAccount.glAccountId}" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="glAccountTotalsEquityMap.${retainedEarningsAccount.glAccountId}" type="Double"> + <calculate field="glAccountTotalsEquityMap.${retainedEarningsAccount.glAccountId}"> <calcop field="glAccountTotalsEquityMap.${retainedEarningsAccount.glAccountId}" operator="add"><calcop field="totalNetIncome" operator="get"/></calcop> </calculate> </if-not-empty> @@ -1202,49 +1202,49 @@ </call-service> <iterate list="period2AssetBalancesList" entry="period2AssetBalance"> - <set field="assetBalancesMap.${period2AssetBalance.glAccountId}" from-field="period2AssetBalance.totalAmount" type="Double"/> + <set field="assetBalancesMap.${period2AssetBalance.glAccountId}" from-field="period2AssetBalance.totalAmount"/> </iterate> <iterate list="period1AssetBalancesList" entry="period1AssetBalance"> - <set field="amount" from-field="period1AssetBalance.totalAmount" type="Double"/> + <set field="amount" from-field="period1AssetBalance.totalAmount"/> <calculate field="amount"> <calcop field="amount" operator="negative"/> </calculate> <if-empty field="assetBalancesMap.${period1AssetBalance.glAccountId}"> - <set field="assetBalancesMap.${period1AssetBalance.glAccountId}" value="0.0" type="Double"/> + <set field="assetBalancesMap.${period1AssetBalance.glAccountId}" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="assetBalancesMap.${period1AssetBalance.glAccountId}" type="Double"> + <calculate field="assetBalancesMap.${period1AssetBalance.glAccountId}"> <calcop field="assetBalancesMap.${period1AssetBalance.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </iterate> <iterate list="period2LiabilityBalancesList" entry="period2LiabilityBalance"> - <set field="liabilityBalancesMap.${period2LiabilityBalance.glAccountId}" from-field="period2LiabilityBalance.totalAmount" type="Double"/> + <set field="liabilityBalancesMap.${period2LiabilityBalance.glAccountId}" from-field="period2LiabilityBalance.totalAmount"/> </iterate> <iterate list="period1LiabilityBalancesList" entry="period1LiabilityBalance"> - <set field="amount" from-field="period1LiabilityBalance.totalAmount" type="Double"/> + <set field="amount" from-field="period1LiabilityBalance.totalAmount"/> <calculate field="amount"> <calcop field="amount" operator="negative"/> </calculate> <if-empty field="liabilityBalancesMap.${period1LiabilityBalance.glAccountId}"> - <set field="liabilityBalancesMap.${period1LiabilityBalance.glAccountId}" value="0.0" type="Double"/> + <set field="liabilityBalancesMap.${period1LiabilityBalance.glAccountId}" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="liabilityBalancesMap.${period1LiabilityBalance.glAccountId}" type="Double"> + <calculate field="liabilityBalancesMap.${period1LiabilityBalance.glAccountId}"> <calcop field="liabilityBalancesMap.${period1LiabilityBalance.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </iterate> <iterate list="period2EquityBalancesList" entry="period2EquityBalance"> - <set field="equityBalancesMap.${period2EquityBalance.glAccountId}" from-field="period2EquityBalance.totalAmount" type="Double"/> + <set field="equityBalancesMap.${period2EquityBalance.glAccountId}" from-field="period2EquityBalance.totalAmount"/> </iterate> <iterate list="period1EquityBalancesList" entry="period1EquityBalance"> - <set field="amount" from-field="period1EquityBalance.totalAmount" type="Double"/> + <set field="amount" from-field="period1EquityBalance.totalAmount"/> <calculate field="amount"> <calcop field="amount" operator="negative"/> </calculate> <if-empty field="equityBalancesMap.${period1EquityBalance.glAccountId}"> - <set field="equityBalancesMap.${period1EquityBalance.glAccountId}" value="0.0" type="Double"/> + <set field="equityBalancesMap.${period1EquityBalance.glAccountId}" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="equityBalancesMap.${period1EquityBalance.glAccountId}" type="Double"> + <calculate field="equityBalancesMap.${period1EquityBalance.glAccountId}"> <calcop field="equityBalancesMap.${period1EquityBalance.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </iterate> @@ -1290,7 +1290,7 @@ </entity-and> <first-from-list list="billToCustomers" entry="billToCustomer"/> <!-- TODO: handle serialized inventory --> - <calculate field="origAmount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="origAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="multiply"> <calcop operator="get" field="itemIssuance.quantity"/> <calcop operator="get" field="inventoryItem.unitCost"/> @@ -1348,7 +1348,7 @@ </entity-and> <first-from-list list="billToCustomers" entry="billToCustomer"/> <!-- TODO: handle serialized inventory --> - <calculate field="origAmount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="origAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="multiply"> <calcop operator="get" field="parameters.canceledQuantity"/> <calcop operator="get" field="inventoryItem.unitCost"/> @@ -1408,7 +1408,7 @@ </else> </if-not-empty> <!-- TODO: handle serialized inventory --> - <calculate field="origAmount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="origAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="multiply"> <calcop operator="get" field="shipmentReceipt.quantityAccepted"/> <calcop operator="get" field="inventoryItem.unitCost"/> @@ -1464,7 +1464,7 @@ </entity-condition> <first-from-list list="inventoryItemDetails" entry="oldInventoryItemDetail"/> <if-not-empty field="oldInventoryItemDetail"> - <calculate field="origAmount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="origAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="multiply" field="newinventoryItem.quantityOnHandTotal"> <calcop operator="subtract"> <calcop operator="get" field="oldInventoryItemDetail.unitCost"/> @@ -1514,7 +1514,7 @@ </entity-and> <iterate list="inventoryItemDetails" entry="inventoryItemDetail"> <get-related-one value-field="inventoryItemDetail" relation-name="InventoryItem" to-value-field="inventoryItem"/> - <calculate field="origAmount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="origAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="multiply"> <calcop operator="get" field="inventoryItemDetail.quantityOnHandDiff"/> <calcop operator="get" field="inventoryItem.unitCost"/> @@ -1560,7 +1560,7 @@ </entity-one> <get-related-one value-field="workEffortInventoryProduced" relation-name="InventoryItem" to-value-field="inventoryItem"/> <!-- TODO: handle serialized inventory --> - <calculate field="origAmount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="origAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="multiply"> <calcop operator="get" field="inventoryItem.quantityOnHandTotal"/> <calcop operator="get" field="inventoryItem.unitCost"/> @@ -1660,7 +1660,7 @@ <!-- TODO: handle serialized inventory --> <if-not-empty field="inventoryItem.quantityOnHandTotal"> - <calculate field="origAmount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="origAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="multiply"> <calcop operator="get" field="inventoryItem.quantityOnHandTotal"/> <calcop operator="get" field="inventoryItem.unitCost"/> @@ -1746,7 +1746,7 @@ </entity-one> <get-related-one value-field="workEffortInventoryAssign" relation-name="InventoryItem" to-value-field="inventoryItem"/> <!-- TODO: handle serialized inventory --> - <calculate field="origAmount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="origAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="multiply"> <calcop operator="get" field="workEffortInventoryAssign.quantity"/> <calcop operator="get" field="inventoryItem.unitCost"/> @@ -1789,7 +1789,7 @@ <entity-one entity-name="ItemIssuance" value-field="itemIssuance"/> <get-related-one value-field="itemIssuance" relation-name="InventoryItem" to-value-field="inventoryItem"/> - <calculate field="origAmount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="origAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="multiply"> <calcop operator="get" field="itemIssuance.quantity"/> <calcop operator="get" field="inventoryItem.unitCost"/> @@ -1830,8 +1830,8 @@ <property-to-field resource="arithmetic" property="ledger.rounding" field="roundingMode"/> <log level="info" message="Using ledger decimals [${ledgerDecimals}] and rounding [${roundingMode}]"/> - <calculate field="amountAppliedTotal" type="BigDecimal"><number value="0"/></calculate> - <calculate field="diffAmount" type="BigDecimal"><number value="0"/></calculate> + <calculate field="amountAppliedTotal"><number value="0"/></calculate> + <calculate field="diffAmount"><number value="0"/></calculate> <entity-one entity-name="Payment" value-field="payment"/> <call-class-method class-name="org.ofbiz.accounting.util.UtilAccounting" method-name="isReceipt" ret-field="isReceiptValue"> @@ -1876,7 +1876,7 @@ </if-not-empty> <set field="creditEntry.organizationPartyId" from-field="organizationPartyId"/> <set field="creditEntry.glAccountTypeId" from-field="creditGlAccountTypeId"/> - <calculate field="amountAppliedTotal" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="amountAppliedTotal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="add"> <calcop operator="get" field="amountAppliedTotal"/> <calcop operator="get" field="paymentApplication.amountApplied"/> @@ -1885,7 +1885,7 @@ <set field="acctgTransEntries[]" from-field="creditEntry" type="Object"/> </iterate> - <calculate field="diffAmount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="diffAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="subtract"> <calcop operator="get" field="payment.amount"/> <calcop operator="get" field="amountAppliedTotal"/> @@ -1941,13 +1941,13 @@ <if-empty field="invoiceItem.quantity"> <set field="invoiceItem.quantity" value="1"/> </if-empty> - <calculate field="amountFromInvoice" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="amountFromInvoice" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="multiply"> <calcop operator="get" field="invoiceItem.quantity"/> <calcop operator="get" field="invoiceItem.amount"/> </calcop> </calculate> - <calculate field="totalAmountFromInvoice" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="totalAmountFromInvoice" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="add"> <calcop operator="get" field="totalAmountFromInvoice"/> <calcop operator="get" field="amountFromInvoice"/> @@ -1956,7 +1956,7 @@ <get-related value-field="invoiceItem" relation-name="OrderItemBilling" list="orderItemBillings"/> <iterate list="orderItemBillings" entry="orderItemBilling"> <get-related-one value-field="orderItemBilling" relation-name="OrderItem" to-value-field="orderItem"/> - <calculate field="amountFromOrder" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="amountFromOrder" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop field="amountFromOrder" operator="add"> <calcop operator="multiply"> <calcop operator="get" field="orderItemBilling.quantity"/> @@ -1981,7 +1981,7 @@ <set field="debitEntry.roleTypeId" value="BILL_FROM_VENDOR"/> <set field="debitEntry.productId" from-field="invoiceItem.productId"/> <set field="debitEntry.glAccountTypeId" value="PURCHASE_PRICE_VAR"/> - <calculate field="origAmount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="origAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="subtract"> <calcop operator="get" field="amountFromInvoice"/> <calcop operator="get" field="amountFromOrder"/> @@ -2058,13 +2058,13 @@ <if-empty field="invoiceItem.quantity"> <set field="invoiceItem.quantity" value="1"/> </if-empty> - <calculate field="origAmount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="origAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="multiply"> <calcop operator="get" field="invoiceItem.quantity"/> <calcop operator="get" field="invoiceItem.amount"/> </calcop> </calculate> - <calculate field="totalOrigAmount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="totalOrigAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="add"> <calcop operator="get" field="totalOrigAmount"/> <calcop operator="get" field="origAmount"/> @@ -2166,7 +2166,7 @@ </if-not-empty> </else> </if-not-empty> - <calculate field="amountAppliedTotal" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="amountAppliedTotal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="add"> <calcop operator="get" field="amountAppliedTotal"/> <calcop operator="get" field="paymentApplication.amountApplied"/> @@ -2174,7 +2174,7 @@ </calculate> <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/> </iterate> - <calculate field="amount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> + <calculate field="amount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="subtract"> <calcop operator="get" field="payment.amount"/> <calcop operator="get" field="amountAppliedTotal"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml?rev=731851&r1=731850&r2=731851&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml Mon Jan 5 23:13:36 2009 @@ -69,7 +69,7 @@ <if-not-empty field="invoice.invoiceDate"> <clear-field field="inMap"/> <set field="inMap.dimensionEntityName" value="DateDimension"/> - <set field="inMap.naturalKeyFields.dateValue" from-field="invoice.invoiceDate"/> + <set field="inMap.naturalKeyFields.dateValue" from-field="invoice.invoiceDate" type="Date"/> <call-service service-name="getDimensionIdFromNaturalKey" in-map-name="inMap"> <result-to-field result-name="dimensionId" field="fact.invoiceDateDimId"/> </call-service> @@ -123,7 +123,7 @@ <set field="fact.extDiscountAmount" value="0.0" type="BigDecimal"/> <set field="fact.extTaxAmount" value="0.0" type="BigDecimal"/> <set field="fact.extNetAmount" value="0.0" type="BigDecimal"/> - <calculate field="fact.extGrossAmount" type="BigDecimal"> + <calculate field="fact.extGrossAmount"> <calcop field="invoiceItem.quantity" operator="multiply"> <calcop field="invoiceItem.amount" operator="get"/> </calcop> @@ -133,7 +133,7 @@ <set field="andConditions.invoiceItemTypeId" value="ITM_SALES_TAX"/> <get-related relation-name="ChildrenInvoiceItem" value-field="invoiceItem" list="taxes" map="andConditions"/> <iterate list="taxes" entry="tax"> - <calculate field="fact.extTaxAmount" type="BigDecimal"> + <calculate field="fact.extTaxAmount"> <calcop field="fact.extTaxAmount" operator="add"> <calcop field="tax.amount" operator="get"/> </calcop> @@ -151,7 +151,7 @@ </calculate> </iterate> - <calculate field="fact.extNetAmount" type="BigDecimal"> + <calculate field="fact.extNetAmount"> <calcop field="fact.extGrossAmount" operator="subtract"> <calcop field="fact.extDiscountAmount" operator="get"/> </calcop> @@ -163,7 +163,7 @@ <set field="fact.extStorageCost" value="0.0" type="BigDecimal"/> <set field="fact.extDistributionCost" value="0.0" type="BigDecimal"/> - <calculate field="fact.contributionAmount" type="BigDecimal"> + <calculate field="fact.contributionAmount"> <calcop field="fact.extNetAmount" operator="subtract"> <calcop field="fact.extManFixedCost" operator="get"/> <calcop field="fact.extManVarCost" operator="get"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |