You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2009/08/17 17:43:04 UTC
svn commit: r805012 [1/11] - in /ofbiz/branches/executioncontext20090812: ./
applications/accounting/ applications/accounting/config/
applications/accounting/data/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/scr...
Author: adrianc
Date: Mon Aug 17 15:42:56 2009
New Revision: 805012
URL: http://svn.apache.org/viewvc?rev=805012&view=rev
Log:
Synchronized branch with trunk.
Added:
ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingHelpData.xml
- copied unchanged from r805009, ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml
ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeIncomeStatement.groovy
- copied unchanged from r805009, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeIncomeStatement.groovy
ofbiz/branches/executioncontext20090812/applications/commonext/data/CommonExtHelpData.xml
- copied unchanged from r805009, ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml
ofbiz/branches/executioncontext20090812/applications/content/data/ContentHelpData.xml
- copied unchanged from r805009, ofbiz/trunk/applications/content/data/ContentHelpData.xml
ofbiz/branches/executioncontext20090812/applications/content/webapp/content/content/DisplayContentNav.ftl
- copied unchanged from r805009, ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl
ofbiz/branches/executioncontext20090812/applications/product/data/ProductHelpData.xml
- copied unchanged from r805009, ofbiz/trunk/applications/product/data/ProductHelpData.xml
Modified:
ofbiz/branches/executioncontext20090812/ (props changed)
ofbiz/branches/executioncontext20090812/applications/accounting/build.xml
ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml
ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingTypeData.xml
ofbiz/branches/executioncontext20090812/applications/accounting/data/DemoGlSetupData.xml
ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml
ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas.xml
ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas_ledger.xml
ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_invoice.xml
ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java
ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java
ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java
ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java
ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java
ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl
ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl
ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl
ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml
ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountScreens.xml
ofbiz/branches/executioncontext20090812/applications/accounting/widget/Menus.xml
ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGroupForms.xml
ofbiz/branches/executioncontext20090812/applications/accounting/widget/ReportFinancialSummaryForms.xml
ofbiz/branches/executioncontext20090812/applications/accounting/widget/ReportFinancialSummaryScreens.xml
ofbiz/branches/executioncontext20090812/applications/commonext/config/CommonExtUiLabels.xml
ofbiz/branches/executioncontext20090812/applications/commonext/ofbiz-component.xml
ofbiz/branches/executioncontext20090812/applications/commonext/webapp/WEB-INF/controller.xml
ofbiz/branches/executioncontext20090812/applications/commonext/widget/HelpScreens.xml
ofbiz/branches/executioncontext20090812/applications/content/data/TemplateData.xml
ofbiz/branches/executioncontext20090812/applications/content/ofbiz-component.xml
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ContentManagementEvents.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ContentManagementServices.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/ConvertTree.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentServices.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentWorker.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/data/DataEvents.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/data/DataServices.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayInputStream.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayOutputStream.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeWorker.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/search/SearchWorker.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/flash-flv.ftl
ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/flash-swf.ftl
ofbiz/branches/executioncontext20090812/applications/content/template/mime-type/quicktime.ftl
ofbiz/branches/executioncontext20090812/applications/content/template/survey/genericsurvey.ftl
ofbiz/branches/executioncontext20090812/applications/content/webapp/content/WEB-INF/controller.xml
ofbiz/branches/executioncontext20090812/applications/content/webapp/content/cms/CMSSites.ftl
ofbiz/branches/executioncontext20090812/applications/content/webapp/content/content/nav.ftl
ofbiz/branches/executioncontext20090812/applications/content/webapp/content/contentsetup/UserPermissions.ftl
ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentForms.xml
ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentMenus.xml
ofbiz/branches/executioncontext20090812/applications/content/widget/content/DataResourceForms.xml
ofbiz/branches/executioncontext20090812/applications/humanres/config/HumanResUiLabels.xml
ofbiz/branches/executioncontext20090812/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java
ofbiz/branches/executioncontext20090812/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java
ofbiz/branches/executioncontext20090812/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
ofbiz/branches/executioncontext20090812/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java
ofbiz/branches/executioncontext20090812/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
ofbiz/branches/executioncontext20090812/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java
ofbiz/branches/executioncontext20090812/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java
ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/WEB-INF/controller.xml
ofbiz/branches/executioncontext20090812/applications/order/email/default/emailprocessnotify.ftl
ofbiz/branches/executioncontext20090812/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
ofbiz/branches/executioncontext20090812/applications/order/script/org/ofbiz/order/order/OrderServices.xml
ofbiz/branches/executioncontext20090812/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml
ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderEvents.java
ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderListState.java
ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java
ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java
ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl
ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl
ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/appendorderitem.ftl
ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/editorderitems.ftl
ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/reports/reportlist.ftl
ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/party/PartyServices.java
ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/party/PartyWorker.java
ofbiz/branches/executioncontext20090812/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/branches/executioncontext20090812/applications/product/config/ProductUiLabels.xml
ofbiz/branches/executioncontext20090812/applications/product/entitydef/entitymodel.xml
ofbiz/branches/executioncontext20090812/applications/product/ofbiz-component.xml
ofbiz/branches/executioncontext20090812/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
ofbiz/branches/executioncontext20090812/applications/product/servicedef/services_shipment.xml
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/category/CategoryWorker.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/price/PriceServices.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductEvents.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductServices.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductWorker.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/test/StockMovesTest.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java
ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java
ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/find/exportproducts.ftl
ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/reviews/pendingReviews.ftl
ofbiz/branches/executioncontext20090812/applications/product/webapp/facility/WEB-INF/controller.xml
ofbiz/branches/executioncontext20090812/applications/securityext/build.xml
ofbiz/branches/executioncontext20090812/applications/workeffort/config/WorkEffortUiLabels.xml
ofbiz/branches/executioncontext20090812/applications/workeffort/data/WorkEffortPortletData.xml
ofbiz/branches/executioncontext20090812/applications/workeffort/script/isCalOwner.groovy
ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java
ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java
ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy
ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy
ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy
ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl
ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/component/ComponentConfig.java
ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/StringUtil.java
ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilDateTime.java
ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilGenerics.java
ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilHttp.java
ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java
ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilMisc.java
ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilValidate.java
ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilXml.java
ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/template/XslTransform.java
ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/WEB-INF/controller.xml
ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/main.ftl
ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl
ofbiz/branches/executioncontext20090812/framework/bi/widget/BiScreens.xml
ofbiz/branches/executioncontext20090812/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
ofbiz/branches/executioncontext20090812/framework/common/config/CommonEntityLabels.xml
ofbiz/branches/executioncontext20090812/framework/common/data/CommonTypeData.xml
ofbiz/branches/executioncontext20090812/framework/common/src/org/ofbiz/common/Captcha.java
ofbiz/branches/executioncontext20090812/framework/common/src/org/ofbiz/common/CommonServices.java
ofbiz/branches/executioncontext20090812/framework/common/src/org/ofbiz/common/FindServices.java
ofbiz/branches/executioncontext20090812/framework/common/src/org/ofbiz/common/image/ImageTransform.java
ofbiz/branches/executioncontext20090812/framework/common/src/org/ofbiz/common/login/LoginServices.java
ofbiz/branches/executioncontext20090812/framework/common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy
ofbiz/branches/executioncontext20090812/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
ofbiz/branches/executioncontext20090812/framework/common/webcommon/includes/helplink.ftl
ofbiz/branches/executioncontext20090812/framework/common/webcommon/includes/insertDropDown.ftl
ofbiz/branches/executioncontext20090812/framework/common/webcommon/includes/lookup.ftl
ofbiz/branches/executioncontext20090812/framework/common/webcommon/portal/editPortalPage.ftl
ofbiz/branches/executioncontext20090812/framework/common/widget/CommonScreens.xml
ofbiz/branches/executioncontext20090812/framework/common/widget/PortalPageForms.xml
ofbiz/branches/executioncontext20090812/framework/entity/config/entityengine.xml
ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java
ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java
ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java
ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java
ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java
ofbiz/branches/executioncontext20090812/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java
ofbiz/branches/executioncontext20090812/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
ofbiz/branches/executioncontext20090812/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java
ofbiz/branches/executioncontext20090812/framework/example/webapp/appheader.ftl
ofbiz/branches/executioncontext20090812/framework/example/webapp/example/reports/fonts.fo.ftl
ofbiz/branches/executioncontext20090812/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java
ofbiz/branches/executioncontext20090812/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java
ofbiz/branches/executioncontext20090812/framework/resources/templates/build.xml
ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/authz/AbstractAuthorization.java
ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/authz/Authorization.java
ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java
ofbiz/branches/executioncontext20090812/framework/security/src/org/ofbiz/security/authz/da/DynamicAccess.java
ofbiz/branches/executioncontext20090812/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java
ofbiz/branches/executioncontext20090812/framework/testtools/build.xml
ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java
ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/event/DojoJSONServiceEventHandler.java
ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java
ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java
ofbiz/branches/executioncontext20090812/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java
ofbiz/branches/executioncontext20090812/framework/webtools/config/WebtoolsUiLabels.xml
ofbiz/branches/executioncontext20090812/framework/webtools/webapp/webtools/WEB-INF/controller.xml
ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java
ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java
ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java
ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/tree/TreeStringRenderer.java
ofbiz/branches/executioncontext20090812/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/branches/executioncontext20090812/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java
ofbiz/branches/executioncontext20090812/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerHttpBindingStub.java
ofbiz/branches/executioncontext20090812/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java
ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoOrderTestData.xml
ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoTreeContent.xml
ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/templates/email/emailpayretry.ftl
ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl
ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl
ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl
ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java
ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java
ofbiz/branches/executioncontext20090812/specialpurpose/myportal/data/MyPortalTypeData.xml
ofbiz/branches/executioncontext20090812/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
ofbiz/branches/executioncontext20090812/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
ofbiz/branches/executioncontext20090812/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl
ofbiz/branches/executioncontext20090812/specialpurpose/pos/config/PosUiLabels.xml
ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java
ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java
ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java
ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java
ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java
ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java
ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java
ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java
ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java
ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/XFocusDialog.java
ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java
ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy
ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy
ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy
ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl
ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl
ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java
ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java
ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java
ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java
ofbiz/branches/executioncontext20090812/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl
ofbiz/branches/executioncontext20090812/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java
ofbiz/branches/executioncontext20090812/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl
ofbiz/branches/executioncontext20090812/themes/bizznesstime/data/BizznessTimeThemeData.xml
ofbiz/branches/executioncontext20090812/themes/bizznesstime/includes/header.ftl
ofbiz/branches/executioncontext20090812/themes/flatgrey/data/FlatGreyThemeData.xml
ofbiz/branches/executioncontext20090812/themes/flatgrey/includes/header.ftl
ofbiz/branches/executioncontext20090812/themes/multiflex/includes/header.ftl
Propchange: ofbiz/branches/executioncontext20090812/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 15:42:56 2009
@@ -1 +1 @@
-/ofbiz/trunk:803908-804271
+/ofbiz/trunk:803908-805009
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/build.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/build.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/build.xml Mon Aug 17 15:42:56 2009
@@ -61,7 +61,7 @@
<!-- exclude the payment processor packages; comment this out to not exclude if you have libs -->
<exclude name="org/ofbiz/accounting/thirdparty/verisign/**"/>
<exclude name="org/ofbiz/accounting/thirdparty/cybersource/**"/>
- <exclude name="org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java"/>
+ <exclude name="org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java"/>
</javac15>
</target>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml Mon Aug 17 15:42:56 2009
@@ -2003,6 +2003,10 @@
<value xml:lang="th">à¹à¸à¸£à¸µà¸¢à¸à¹à¸à¸µà¸¢à¸à¸à¸à¸à¸¸à¸¥</value>
<value xml:lang="zh">æ¯è¾èµäº§è´åºè¡¨</value>
</property>
+ <property key="AccountingComparativeIncomeStatement">
+ <value xml:lang="en">Comparative Income Statement</value>
+ <value xml:lang="hi_IN">तà¥à¤²à¤¨à¤¾à¤¤à¥à¤®à¤ à¤à¤¯ विवरण</value>
+ </property>
<property key="AccountingCompleteAcctgTransFields">
<value xml:lang="en">Complete transaction fields</value>
<value xml:lang="fr">Remplissez les champs de la transaction</value>
@@ -3111,8 +3115,8 @@
<value xml:lang="th">Error: à¸à¸§à¸²à¸¡à¸à¸´à¸à¸à¸¥à¸²à¸! à¹à¸à¸à¸²à¸£à¸ªà¸£à¹à¸²à¸à¹à¸à¹à¸ªà¸£à¹à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸²à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸</value>
<value xml:lang="zh">ä»å®åå建å®åæç»è´¦åæ¶åºé</value>
</property>
- <property key="AccountingExpences">
- <value xml:lagn="en">Expences</value>
+ <property key="AccountingExpenses">
+ <value xml:lagn="en">Expenses</value>
<value xml:lagn="hi_IN">वà¥à¤¯à¤¯</value>
</property>
<property key="AccountingExpEndOfLifeIsEmpty">
@@ -7575,6 +7579,22 @@
<value xml:lang="th">à¸à¹à¸§à¸à¹à¸§à¸¥à¸²à¸ªà¸±à¹à¸ à¹</value>
<value xml:lang="zh">åæ¶é´æ®µ</value>
</property>
+ <property key="AccountingPeriod1NetIncome">
+ <value xml:lang="en">Period1 Net Income</value>
+ <value xml:lang="hi_IN">à¤
वधि 1 शà¥à¤¦à¥à¤§ à¤à¤¯</value>
+ </property>
+ <property key="AccountingPeriod2NetIncome">
+ <value xml:lang="en">Period2 Net Income</value>
+ <value xml:lang="hi_IN">à¤
वधि 2 शà¥à¤¦à¥à¤§ à¤à¤¯</value>
+ </property>
+ <property key="AccountingPeriod1TotalAmount">
+ <value xml:lang="en">Period1 Total Amount</value>
+ <value xml:lang="hi_IN">à¤
वधि 1 à¤à¥à¤² राशि</value>
+ </property>
+ <property key="AccountingPeriod2TotalAmount">
+ <value xml:lang="en">Period2 Total Amount</value>
+ <value xml:lang="hi_IN">à¤
वधि 2 à¤à¥à¤² राशि</value>
+ </property>
<property key="AccountingPeriodName">
<value xml:lang="en">Period Name</value>
<value xml:lang="fr">Nom de période</value>
@@ -11278,6 +11298,14 @@
<value xml:lang="th">à¹à¸ªà¸à¸à¹à¸à¸¢à¸£à¸«à¸±à¸ªà¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value>
<value xml:lang="zh">æ§è¡è
çä¼åæ è¯</value>
</property>
+ <property key="FormFieldTitle_period1FromDate">
+ <value xml:lang="en">Period1 From Date</value>
+ <value xml:lang="hi_IN">à¤
वधि 1 दिनाà¤à¤ सà¥</value>
+ </property>
+ <property key="FormFieldTitle_period2FromDate">
+ <value xml:lang="en">Period2 From Date</value>
+ <value xml:lang="hi_IN">à¤
वधि 2 दिनाà¤à¤ सà¥</value>
+ </property>
<property key="FormFieldTitle_period1GlFiscalTypeId">
<value xml:lang="en">Period1 Gl Fiscal Type Id</value>
<value xml:lang="fr">Réf. de type d'exercice 1</value>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingTypeData.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingTypeData.xml Mon Aug 17 15:42:56 2009
@@ -897,6 +897,8 @@
<StatusValidChange condition="" statusId="PMNT_NOT_PAID" statusIdTo="PMNT_VOID" transitionName="Payment Voided"/>
<StatusValidChange condition="" statusId="PMNT_SENT" statusIdTo="PMNT_NOT_PAID" transitionName="Payment Not Paid"/>
<StatusValidChange condition="" statusId="PMNT_RECEIVED" statusIdTo="PMNT_NOT_PAID" transitionName="Payment Not Paid"/>
+ <StatusValidChange condition="" statusId="PMNT_CONFIRMED" statusIdTo="PMNT_SENT" transitionName="Payment Confirmed to Sent"/>
+ <StatusValidChange condition="" statusId="PMNT_CONFIRMED" statusIdTo="PMNT_RECEIVED" transitionName="Payment Confirmed to Received"/>
<SettlementTerm settlementTermId="COD" termName="Cash Due on Delivery" termValue="0" uomId="TF_day"/>
<SettlementTerm settlementTermId="NET_15" termName="Net Due in 15 Days" termValue="15" uomId="TF_day"/>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/data/DemoGlSetupData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/data/DemoGlSetupData.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/data/DemoGlSetupData.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/data/DemoGlSetupData.xml Mon Aug 17 15:42:56 2009
@@ -400,8 +400,8 @@
<UomConversionDated uomId="USD" uomIdTo="EUR" fromDate="2001-01-01 00:00:00.0" conversionFactor="0.7"/><!-- to convert demo invoice -->
<!-- Gl Reconciliation -->
- <GlReconciliation glReconciliationId="9000" glReconciliationName="demoGlReconciliation" glAccountId="111000" organizationPartyId="Company" reconciledBalance="75000.00" reconciledDate="2009-08-08 20:03:14.000"/>
- <GlReconciliation glReconciliationId="9001" glReconciliationName="testGlReconciliation" glAccountId="111000" organizationPartyId="Company" reconciledDate="2009-08-12 20:03:14.000"/>
+ <GlReconciliation glReconciliationId="9000" glReconciliationName="demoGlReconciliation" glAccountId="111100" organizationPartyId="Company" reconciledBalance="75000.00" reconciledDate="2009-08-08 20:03:14.000"/>
+ <GlReconciliation glReconciliationId="9001" glReconciliationName="testGlReconciliation" glAccountId="111100" organizationPartyId="Company" reconciledDate="2009-08-12 20:03:14.000"/>
<GlAccountCategoryMember glAccountId="112000" glAccountCategoryId="9301" fromDate="2009-07-08 11:54:03.8" amountPercentage="50"/>
<GlAccountCategoryMember glAccountId="112000" glAccountCategoryId="9302" fromDate="2009-07-08 11:54:03.8" amountPercentage="20"/>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml Mon Aug 17 15:42:56 2009
@@ -36,6 +36,7 @@
<entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup_olap.xml"/>
<entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingTypeData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/UsTaxAccountGroups.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingPortletData.xml"/>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Mon Aug 17 15:42:56 2009
@@ -603,6 +603,20 @@
<get-related relation-name="PaymentApplication" value-field="invoice" list="paymentApplications"/>
<iterate list="paymentApplications" entry="paymentApplication">
<get-related-one relation-name="Payment" value-field="paymentApplication" to-value-field="payment"/>
+ <if-compare field="payment.statusId" operator="equals" value="PMNT_CONFIRMED">
+ <set field="paymentStatusMap.paymentId" from-field="payment.paymentId"/>
+ <set field="isReceipt" value="${groovy:org.ofbiz.accounting.util.UtilAccounting.isReceipt(payment)}" type="Boolean"/>
+ <set field="isDisbursement" value="${groovy:org.ofbiz.accounting.util.UtilAccounting.isDisbursement(payment)}" type="Boolean"/>
+ <if-compare field="isReceipt" operator="equals" value="true" type="Boolean">
+ <set field="paymentStatusMap.statusId" value="PMNT_RECEIVED"/>
+ <else>
+ <if-compare field="isDisbursement" operator="equals" value="true" type="Boolean">
+ <set field="paymentStatusMap.statusId" value="PMNT_SENT"/>
+ </if-compare>
+ </else>
+ </if-compare>
+ <call-service service-name="setPaymentStatus" in-map-name="paymentStatusMap"/>
+ </if-compare>
<set field="removePaymentApplicationCtx.paymentApplicationId" from-field="paymentApplication.paymentApplicationId"/>
<call-service service-name="removePaymentApplication" in-map-name="removePaymentApplicationCtx"/>
</iterate>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Mon Aug 17 15:42:56 2009
@@ -2117,6 +2117,7 @@
<set field="createAcctgTransAndEntriesInMap.acctgTransTypeId" value="SALES_INVOICE"/>
<set field="createAcctgTransAndEntriesInMap.invoiceId" from-field="parameters.invoiceId"/>
<set field="createAcctgTransAndEntriesInMap.acctgTransEntries" from-field="acctgTransEntries"/>
+ <set field="createAcctgTransAndEntriesInMap.transactionDate" from-field="invoice.invoiceDate"/>
<call-service service-name="createAcctgTransAndEntries" in-map-name="createAcctgTransAndEntriesInMap">
<result-to-field result-name="acctgTransId"/>
</call-service>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Mon Aug 17 15:42:56 2009
@@ -648,12 +648,14 @@
<entity-and entity-name="PaymentGroupMember" list="paymentGroupMembers">
<field-map field-name="paymentGroupId"/>
</entity-and>
- <first-from-list list="paymentGroupMembers" entry="paymentGroupMember" />
- <get-related-one relation-name="Payment" value-field="paymentGroupMember" to-value-field="payment"/>
- <get-related-one relation-name="FinAccountTrans" value-field="payment" to-value-field="finAccountTrans"/>
- <if-not-empty field="finAccountTrans">
- <if-not-empty field="finAccountTrans.glReconciliationId">
- <set field="glReconciliationId" from-field="finAccountTrans.glReconciliationId"/>
+ <if-not-empty field="paymentGroupMembers">
+ <first-from-list list="paymentGroupMembers" entry="paymentGroupMember"/>
+ <get-related-one relation-name="Payment" value-field="paymentGroupMember" to-value-field="payment"/>
+ <get-related-one relation-name="FinAccountTrans" value-field="payment" to-value-field="finAccountTrans"/>
+ <if-not-empty field="finAccountTrans">
+ <if-not-empty field="finAccountTrans.glReconciliationId">
+ <set field="glReconciliationId" from-field="finAccountTrans.glReconciliationId"/>
+ </if-not-empty>
</if-not-empty>
</if-not-empty>
<field-to-result field="glReconciliationId"/>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas.xml Mon Aug 17 15:42:56 2009
@@ -144,6 +144,7 @@
<eca service="setPaymentStatus" event="commit">
<condition field-name="statusId" operator="equals" value="PMNT_RECEIVED"/>
<condition-field field-name="statusId" operator="not-equals" to-field-name="oldStatusId"/>
+ <condition field-name="oldStatusId" operator="not-equals" value="PMNT_CONFIRMED"/>
<action service="sampleInvoiceAffiliateCommission" mode="sync"/>
</eca>
-->
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas_ledger.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas_ledger.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas_ledger.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas_ledger.xml Mon Aug 17 15:42:56 2009
@@ -92,10 +92,11 @@
<eca service="setPaymentStatus" event="commit">
<condition field-name="statusId" operator="equals" value="PMNT_RECEIVED"/>
<condition field-name="oldStatusId" operator="not-equals" value="PMNT_RECEIVED"/>
+ <condition field-name="oldStatusId" operator="not-equals" value="PMNT_CONFIRMED"/>
<action service="createAcctgTransAndEntriesForIncomingPayment" mode="sync"/>
</eca>
- <!-- attemp to create AcctgTrans for Purchase Invoice -->
+ <!-- attempt to create AcctgTrans for Purchase Invoice -->
<eca service="setInvoiceStatus" event="commit">
<condition field-name="invoiceId" operator="is-not-empty"/>
<condition field-name="statusId" operator="equals" value="INVOICE_READY"/>
@@ -104,7 +105,7 @@
<action service="createAcctgTransForPurchaseInvoice" mode="sync"/>
</eca>
- <!-- attemp to create AcctgTrans for Sales Invoice -->
+ <!-- attempt to create AcctgTrans for Sales Invoice -->
<eca service="setInvoiceStatus" event="commit">
<condition field-name="invoiceId" operator="is-not-empty"/>
<condition field-name="statusId" operator="equals" value="INVOICE_READY"/>
@@ -123,6 +124,7 @@
<eca service="setPaymentStatus" event="commit">
<condition field-name="statusId" operator="equals" value="PMNT_SENT"/>
<condition field-name="oldStatusId" operator="not-equals" value="PMNT_SENT"/>
+ <condition field-name="oldStatusId" operator="not-equals" value="PMNT_CONFIRMED"/>
<action service="createAcctgTransAndEntriesForOutgoingPayment" mode="sync"/>
</eca>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_invoice.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_invoice.xml?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_invoice.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_invoice.xml Mon Aug 17 15:42:56 2009
@@ -152,6 +152,7 @@
</description>
<attribute name="orderId" type="String" mode="IN" optional="false"/>
<attribute name="billItems" type="List" mode="IN" optional="false"/>
+ <attribute name="eventDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="invoiceId" type="String" mode="INOUT" optional="true"/>
<attribute name="invoiceTypeId" type="String" mode="OUT" optional="true"/>
</service>
@@ -199,6 +200,7 @@
invoicesCreated = List of invoiceIds which were created by this service
</description>
<attribute name="shipmentId" type="String" mode="IN" optional="false"/>
+ <attribute name="eventDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="invoicesCreated" type="List" mode="OUT" optional="true"/>
</service>
<service name="setInvoicesToReadyFromShipment" engine="java"
@@ -229,6 +231,7 @@
</description>
<attribute name="shipmentIds" type="List" mode="IN" optional="false"/>
<attribute name="createSalesInvoicesForDropShipments" type="Boolean" mode="IN" optional="true"/>
+ <attribute name="eventDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="invoicesCreated" type="List" mode="OUT" optional="true"/>
</service>
<service name="createInvoicesFromReturnShipment" engine="java"
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java Mon Aug 17 15:42:56 2009
@@ -176,7 +176,7 @@
if (days >= 0) {
partyCommissionResult.put("days", Long.valueOf(days));
}
- if(!commissions.contains(partyCommissionResult)) {
+ if (!commissions.contains(partyCommissionResult)) {
commissions.add(partyCommissionResult);
}
}
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Mon Aug 17 15:42:56 2009
@@ -234,8 +234,11 @@
GenericValue billingAccount = orderHeader.getRelatedOne("BillingAccount");
String billingAccountId = billingAccount != null ? billingAccount.getString("billingAccountId") : null;
- // TODO: ideally this should be the same time as when a shipment is sent and be passed in as a parameter
- Timestamp invoiceDate = UtilDateTime.nowTimestamp();
+ Timestamp invoiceDate = (Timestamp)context.get("eventDate");
+ if (UtilValidate.isEmpty(invoiceDate)) {
+ // TODO: ideally this should be the same time as when a shipment is sent and be passed in as a parameter
+ invoiceDate = UtilDateTime.nowTimestamp();
+ }
// TODO: perhaps consider billing account net days term as well?
Long orderTermNetDays = orh.getOrderTermNetDays();
Timestamp dueDate = null;
@@ -894,7 +897,7 @@
// Determine commission parties for this invoiceItem
if (productId != null && productId.length() > 0) {
Map resultMap = null;
- try{
+ try {
resultMap = dispatcher.runSync("getCommissionForProduct", UtilMisc.<String, Object>toMap(
"productId", productId,
"invoiceId", invoiceId,
@@ -960,7 +963,7 @@
createInvoiceMap.put("userLogin", userLogin);
// store the invoice first
Map createInvoiceResult = null;
- try{
+ try {
createInvoiceResult = dispatcher.runSync("createInvoice", createInvoiceMap);
} catch (GenericServiceException e) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,"AccountingInvoiceCommissionError",locale), null, null, createInvoiceResult);
@@ -1085,7 +1088,7 @@
Locale locale = (Locale) context.get("locale");
List invoicesCreated = new ArrayList();
- Map serviceContext = UtilMisc.toMap("shipmentIds", UtilMisc.toList(shipmentId), "userLogin", context.get("userLogin"));
+ Map serviceContext = UtilMisc.toMap("shipmentIds", UtilMisc.toList(shipmentId), "eventDate", context.get("eventDate"), "userLogin", context.get("userLogin"));
try {
Map result = dispatcher.runSync("createInvoicesFromShipments", serviceContext);
invoicesCreated = (List) result.get("invoicesCreated");
@@ -1490,7 +1493,7 @@
invoiceableShipments = delegator.findList("Shipment", EntityCondition.makeCondition("shipmentId", EntityOperator.IN, invoiceableShipmentIds), null, null, null, false);
}
}
- } catch ( GenericEntityException e ) {
+ } catch (GenericEntityException e) {
String errMsg = UtilProperties.getMessage(resource, "AccountingTroubleCallingCreateInvoicesFromShipmentsService", locale);
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -1546,7 +1549,7 @@
GenericValue destinationContactMech = null;
try {
destinationContactMech = shipment.getRelatedOne("DestinationPostalAddress");
- } catch ( GenericEntityException e ) {
+ } catch (GenericEntityException e) {
String errMsg = UtilProperties.getMessage(resource, "AccountingTroubleCallingCreateInvoicesFromShipmentService", locale);
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -1591,7 +1594,7 @@
}
try {
delegator.storeAll(orderAdjustments);
- } catch ( GenericEntityException e ) {
+ } catch (GenericEntityException e) {
String errMsg = UtilProperties.getMessage(resource, "AccountingProblemStoringOrderAdjustments", UtilMisc.toMap("orderAdjustments", orderAdjustments), locale);
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -1602,7 +1605,7 @@
List orderPaymentPreferences = null;
try {
orderPaymentPreferences = delegator.findByAnd("OrderPaymentPreference", UtilMisc.toMap("orderId", orderId, "paymentMethodTypeId", "CREDIT_CARD"));
- } catch ( GenericEntityException e ) {
+ } catch (GenericEntityException e) {
String errMsg = UtilProperties.getMessage(resource, "AccountingProblemGettingOrderPaymentPreferences", locale);
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -1615,7 +1618,7 @@
paymentMethodId = cardOrderPaymentPref.getString("paymentMethodId");
}
- if (paymentMethodId != null ) {
+ if (paymentMethodId != null) {
// Release all outstanding (not settled or cancelled) authorizations, while keeping a running
// total of their amounts so that the total plus the additional shipping charges can be authorized again
@@ -1635,7 +1638,7 @@
Map prefReleaseResult = null;
try {
prefReleaseResult = dispatcher.runSync("releaseOrderPaymentPreference", UtilMisc.toMap("orderPaymentPreferenceId", orderPaymentPreference.getString("orderPaymentPreferenceId"), "userLogin", context.get("userLogin")));
- } catch ( GenericServiceException e ) {
+ } catch (GenericServiceException e) {
String errMsg = UtilProperties.getMessage(resource, "AccountingTroubleCallingReleaseOrderPaymentPreferenceService", locale);
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -1675,8 +1678,8 @@
}
// If the authorization fails, create the invoice anyway, but make a note of it
- boolean authFinished = ( (Boolean) authResult.get("finished") ).booleanValue();
- boolean authErrors = ( (Boolean) authResult.get("errors") ).booleanValue();
+ boolean authFinished = ((Boolean) authResult.get("finished")).booleanValue();
+ boolean authErrors = ((Boolean) authResult.get("errors")).booleanValue();
if (authErrors || ! authFinished) {
String errMsg = UtilProperties.getMessage(resource, "AccountingUnableToAuthAdditionalShipCharges", UtilMisc.toMap("shipmentId", shipmentId, "paymentMethodId", paymentMethodId, "orderPaymentPreferenceId", orderPaymentPreferenceId), locale);
Debug.logError(errMsg, module);
@@ -1694,7 +1697,7 @@
String shipmentId = (String) shipmentIds.get(0);
try {
shipmentItemBillings = delegator.findByAnd("ShipmentItemBilling", UtilMisc.toMap("shipmentId", shipmentId));
- } catch ( GenericEntityException e ) {
+ } catch (GenericEntityException e) {
String errMsg = UtilProperties.getMessage(resource, "AccountingProblemGettingShipmentItemBilling", locale);
return ServiceUtil.returnError(errMsg);
}
@@ -1704,7 +1707,7 @@
}
// call the createInvoiceForOrder service for each order
- Map serviceContext = UtilMisc.toMap("orderId", orderId, "billItems", toBillItems, "invoiceId", invoiceId, "userLogin", context.get("userLogin"));
+ Map serviceContext = UtilMisc.toMap("orderId", orderId, "billItems", toBillItems, "invoiceId", invoiceId, "eventDate", context.get("eventDate"), "userLogin", context.get("userLogin"));
try {
Map result = dispatcher.runSync("createInvoiceForOrder", serviceContext);
invoicesCreated.add(result.get("invoiceId"));
@@ -1781,7 +1784,7 @@
// group the shipments by returnId (because we want a seperate itemized invoice for each return)
Map itemsShippedGroupedByReturn = FastMap.newInstance();
- for (Iterator iter = shippedItems.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = shippedItems.iterator(); iter.hasNext();) {
GenericValue item = (GenericValue) iter.next();
String returnId = null;
String returnItemSeqId = null;
@@ -1816,7 +1819,7 @@
}
// loop through the returnId keys in the map and invoke the createInvoiceFromReturn service for each
- for (Iterator iter = itemsShippedGroupedByReturn.keySet().iterator(); iter.hasNext(); ) {
+ for (Iterator iter = itemsShippedGroupedByReturn.keySet().iterator(); iter.hasNext();) {
String returnId = (String) iter.next();
List billItems = (List) itemsShippedGroupedByReturn.get(returnId);
if (Debug.verboseOn()) {
@@ -1891,7 +1894,7 @@
int invoiceItemSeqNum = 1;
String invoiceItemSeqId = UtilFormatOut.formatPaddedNumber(invoiceItemSeqNum, INVOICE_ITEM_SEQUENCE_ID_DIGITS);
- for (Iterator iter = billItems.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = billItems.iterator(); iter.hasNext();) {
GenericValue item = (GenericValue) iter.next();
boolean shipmentReceiptFound = false;
boolean itemIssuanceFound = false;
@@ -1982,7 +1985,7 @@
// for each adjustment related to this ReturnItem, create a separate invoice item
List adjustments = returnItem.getRelatedCache("ReturnAdjustment");
- for (Iterator adjIter = adjustments.iterator(); adjIter.hasNext(); ) {
+ for (Iterator adjIter = adjustments.iterator(); adjIter.hasNext();) {
GenericValue adjustment = (GenericValue) adjIter.next();
if (adjustment.get("amount") == null) {
@@ -2049,7 +2052,7 @@
// loop through return-wide adjustments and create invoice items for each
List adjustments = returnHeader.getRelatedByAndCache("ReturnAdjustment", UtilMisc.toMap("returnItemSeqId", "_NA_"));
- for (Iterator iter = adjustments.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = adjustments.iterator(); iter.hasNext();) {
GenericValue adjustment = (GenericValue) iter.next();
// determine invoice item type from the return item type
@@ -2123,7 +2126,7 @@
GenericValue invoice = null ;
try {
invoice = delegator.findByPrimaryKey("Invoice", UtilMisc.toMap("invoiceId", invoiceId));
- } catch ( GenericEntityException e ) {
+ } catch (GenericEntityException e) {
Debug.logError(e, "Problem getting Invoice for Invoice ID" + invoiceId, module);
return ServiceUtil.returnError("Problem getting Invoice for Invoice ID" + invoiceId);
}
@@ -2138,7 +2141,7 @@
try {
paymentAppl = delegator.findByAnd("PaymentAndApplication", UtilMisc.toMap("invoiceId", invoiceId));
// For each payment application, select only those that are RECEIVED or SENT based on whether the payment is a RECEIPT or DISBURSEMENT respectively
- for (Iterator iter = paymentAppl.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = paymentAppl.iterator(); iter.hasNext();) {
GenericValue payment = (GenericValue) iter.next();
if ("PMNT_RECEIVED".equals(payment.get("statusId")) && UtilAccounting.isReceipt(payment)) {
continue; // keep
@@ -2240,7 +2243,7 @@
Map createInvoiceItemResult = null;
try {
createInvoiceItemResult = dispatcher.runSync("createInvoiceItem", createInvoiceItemContext);
- } catch ( GenericServiceException e ) {
+ } catch (GenericServiceException e) {
String errMsg = UtilProperties.getMessage(resource,"AccountingServiceErrorCreatingInvoiceItemFromOrder",locale) + ": " + e.toString();
Debug.logError(e, errMsg, module);
ServiceUtil.returnError(errMsg);
@@ -2259,7 +2262,7 @@
try {
Map createOrderAdjustmentBillingResult = dispatcher.runSync("createOrderAdjustmentBilling", createOrderAdjustmentBillingContext);
- } catch ( GenericServiceException e ) {
+ } catch (GenericServiceException e) {
ServiceUtil.returnError(UtilProperties.getMessage(resource,"AccountingErrorCreatingOrderAdjustmentBillingFromOrder",locale), null, null, createOrderAdjustmentBillingContext);
}
@@ -2298,7 +2301,7 @@
Map createInvoiceItemResult = null;
try {
createInvoiceItemResult = dispatcher.runSync("createInvoiceItem", createInvoiceItemContext);
- } catch ( GenericServiceException e ) {
+ } catch (GenericServiceException e) {
String errMsg = UtilProperties.getMessage(resource,"AccountingServiceErrorCreatingInvoiceItemFromOrder",locale) + ": " + e.toString();
Debug.logError(e, errMsg, module);
ServiceUtil.returnError(errMsg);
@@ -2317,7 +2320,7 @@
try {
Map createOrderAdjustmentBillingResult = dispatcher.runSync("createOrderAdjustmentBilling", createOrderAdjustmentBillingContext);
- } catch ( GenericServiceException e ) {
+ } catch (GenericServiceException e) {
ServiceUtil.returnError(UtilProperties.getMessage(resource,"AccountingErrorCreatingOrderAdjustmentBillingFromOrder",locale), null, null, createOrderAdjustmentBillingContext);
}
@@ -2336,7 +2339,7 @@
private static void createInvoiceTerms(GenericDelegator delegator, LocalDispatcher dispatcher, String invoiceId, List terms, GenericValue userLogin, Locale locale) {
List invoiceTerms = new LinkedList();
if ((terms != null) && (terms.size() > 0)) {
- for (Iterator termsIter = terms.iterator(); termsIter.hasNext(); ) {
+ for (Iterator termsIter = terms.iterator(); termsIter.hasNext();) {
GenericValue term = (GenericValue) termsIter.next();
Map createInvoiceTermContext = FastMap.newInstance();
@@ -2355,7 +2358,7 @@
Map createInvoiceTermResult = null;
try {
createInvoiceTermResult = dispatcher.runSync("createInvoiceTerm", createInvoiceTermContext);
- } catch ( GenericServiceException e ) {
+ } catch (GenericServiceException e) {
String errMsg = UtilProperties.getMessage(resource,"AccountingServiceErrorCreatingInvoiceTermFromOrder",locale) + ": " + e.toString();
Debug.logError(e, errMsg, module);
ServiceUtil.returnError(errMsg);
@@ -3119,7 +3122,7 @@
List invoicedAdjustments = null;
try {
invoicedAdjustments = delegator.findByAnd("OrderAdjustmentBilling", UtilMisc.toMap("orderAdjustmentId", orderAdjustment.getString("orderAdjustmentId")));
- } catch ( GenericEntityException e ) {
+ } catch (GenericEntityException e) {
String errMsg = UtilProperties.getMessage(resource, "AccountingTroubleCallingCalculateInvoicedAdjustmentTotalService" + ": " + e.getMessage(), locale);
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -3168,7 +3171,7 @@
// 1 record exists just update and if diffrent ID delete other record and add together.
GenericValue checkAppl = (GenericValue) checkAppls.get(0);
// if new record add to the already existing one.
- if ( paymentApplication.get("paymentApplicationId") == null) {
+ if (paymentApplication.get("paymentApplicationId") == null) {
// add 2 amounts together
checkAppl.set("amountApplied", paymentApplication.getBigDecimal("amountApplied").
add(checkAppl.getBigDecimal("amountApplied")).setScale(decimals,rounding));
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java Mon Aug 17 15:42:56 2009
@@ -98,7 +98,7 @@
public static List getTaxableInvoiceItemTypeIds(GenericDelegator delegator) throws GenericEntityException {
List typeIds = FastList.newInstance();
List invoiceItemTaxTypes = delegator.findByAndCache("Enumeration", UtilMisc.toMap("enumTypeId", "TAXABLE_INV_ITM_TY"));
- for (Iterator iter = invoiceItemTaxTypes.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = invoiceItemTaxTypes.iterator(); iter.hasNext();) {
GenericValue invoiceItemTaxType = (GenericValue) iter.next();
typeIds.add(invoiceItemTaxType.get("enumId"));
}
@@ -114,10 +114,10 @@
List invoiceTaxItems = null;
try {
GenericDelegator delegator = invoice.getDelegator();
- EntityConditionList condition = EntityCondition.makeCondition( UtilMisc.toList(
+ EntityConditionList condition = EntityCondition.makeCondition(UtilMisc.toList(
EntityCondition.makeCondition("invoiceId", invoice.get("invoiceId")),
EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.IN, getTaxableInvoiceItemTypeIds(delegator))
- ), EntityOperator.AND);
+ ), EntityOperator.AND);
invoiceTaxItems = delegator.findList("InvoiceItem", condition, null, null, null, false);
} catch (GenericEntityException e) {
Debug.logError(e, "Trouble getting InvoiceItem list", module);
@@ -172,9 +172,9 @@
if (quantity == null)
quantity = BigDecimal.ONE;
if ("ITM_SALES_TAX".equals(invoiceItem.get("invoiceItemTypeId"))) {
- invoiceTaxTotal = invoiceTaxTotal.add( amount.multiply(quantity)).setScale(taxDecimals, taxRounding);
+ invoiceTaxTotal = invoiceTaxTotal.add(amount.multiply(quantity)).setScale(taxDecimals, taxRounding);
} else {
- invoiceTotal = invoiceTotal.add( amount.multiply(quantity)).setScale(decimals,rounding);
+ invoiceTotal = invoiceTotal.add(amount.multiply(quantity)).setScale(decimals,rounding);
}
}
}
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java Mon Aug 17 15:42:56 2009
@@ -152,10 +152,10 @@
EntityCondition.makeCondition("paymentMethodTypeId", EntityOperator.EQUALS, "EXT_BILLACT"),
EntityCondition.makeCondition("statusId", EntityOperator.NOT_IN, UtilMisc.toList("ORDER_CANCELLED", "ORDER_REJECTED")),
EntityCondition.makeCondition("preferenceStatusId", EntityOperator.NOT_IN, UtilMisc.toList("PAYMENT_SETTLED", "PAYMENT_RECEIVED", "PAYMENT_DECLINED", "PAYMENT_CANCELLED")) // PAYMENT_NOT_AUTH
- ), EntityOperator.AND);
+ ), EntityOperator.AND);
List orderPaymentPreferenceSums = delegator.findList("OrderPurchasePaymentSummary", whereConditions, UtilMisc.toSet("maxAmount"), null, null, false);
- for (Iterator oppsi = orderPaymentPreferenceSums.iterator(); oppsi.hasNext(); ) {
+ for (Iterator oppsi = orderPaymentPreferenceSums.iterator(); oppsi.hasNext();) {
GenericValue orderPaymentPreferenceSum = (GenericValue) oppsi.next();
BigDecimal maxAmount = orderPaymentPreferenceSum.getBigDecimal("maxAmount");
balance = maxAmount != null ? balance.subtract(maxAmount) : balance;
@@ -163,7 +163,7 @@
List paymentAppls = delegator.findByAnd("PaymentApplication", UtilMisc.toMap("billingAccountId", billingAccountId));
// TODO: cancelled payments?
- for (Iterator pAi = paymentAppls.iterator(); pAi.hasNext(); ) {
+ for (Iterator pAi = paymentAppls.iterator(); pAi.hasNext();) {
GenericValue paymentAppl = (GenericValue) pAi.next();
if (paymentAppl.getString("invoiceId") == null) {
BigDecimal amountApplied = paymentAppl.getBigDecimal("amountApplied");
@@ -254,7 +254,7 @@
// search through all PaymentApplications and add the amount that was applied to invoice and subtract the amount applied from payments
List paymentAppls = delegator.findByAnd("PaymentApplication", UtilMisc.toMap("billingAccountId", billingAccountId));
- for (Iterator pAi = paymentAppls.iterator(); pAi.hasNext(); ) {
+ for (Iterator pAi = paymentAppls.iterator(); pAi.hasNext();) {
GenericValue paymentAppl = (GenericValue) pAi.next();
BigDecimal amountApplied = paymentAppl.getBigDecimal("amountApplied");
GenericValue invoice = paymentAppl.getRelatedOne("Invoice");
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Mon Aug 17 15:42:56 2009
@@ -694,7 +694,7 @@
else {
orderId = (String) context.get("orderId");
}
- } catch ( GenericEntityException e ) {
+ } catch (GenericEntityException e) {
String errMsg = "Problem getting OrderPaymentPreference for orderPaymentPreferenceId " + orderPaymentPreferenceId;
Debug.logWarning(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -739,7 +739,7 @@
Map<String, Object> releaseResult = null;
try {
releaseResult = dispatcher.runSync("releaseOrderPaymentPreference", releaseContext);
- } catch ( GenericServiceException e ) {
+ } catch (GenericServiceException e) {
String errMsg = "Problem calling releaseOrderPaymentPreference service for orderPaymentPreferenceId" + paymentPref.getString("orderPaymentPreferenceId");
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -854,7 +854,7 @@
GenericValue paymentPref = null;
try {
paymentPref = delegator.findByPrimaryKey("OrderPaymentPreference", UtilMisc.toMap("orderPaymentPreferenceId", orderPaymentPreferenceId));
- } catch ( GenericEntityException e ) {
+ } catch (GenericEntityException e) {
String errMsg = "Problem getting OrderPaymentPreference for orderPaymentPreferenceId " + orderPaymentPreferenceId;
Debug.logWarning(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -870,7 +870,7 @@
String orderId = paymentPref.getString("orderId");
try {
orderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", orderId));
- } catch ( GenericEntityException e ) {
+ } catch (GenericEntityException e) {
String errMsg = "Problem getting OrderHeader for orderId " + orderId;
Debug.logWarning(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -2206,7 +2206,7 @@
} catch (GenericEntityException e) {
String message = "Failed to process capture result: Could not find invoice ["+invoiceId+"] due to entity error: " + e.getMessage();
Debug.logError(e, message, module);
- return ServiceUtil.returnError(message );
+ return ServiceUtil.returnError(message);
}
}
@@ -2986,7 +2986,7 @@
GenericValue paymentPref = null;
try {
paymentPref = delegator.findOne("OrderPaymentPreference", UtilMisc.toMap("orderPaymentPreferenceId", orderPaymentPreferenceId), false);
- } catch ( GenericEntityException e ) {
+ } catch (GenericEntityException e) {
String errMsg = "Problem getting OrderPaymentPreference for orderPaymentPreferenceId " + orderPaymentPreferenceId;
Debug.logWarning(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -3002,7 +3002,7 @@
String orderId = paymentPref.getString("orderId");
try {
orderHeader = delegator.findOne("OrderHeader", UtilMisc.toMap("orderId", orderId), false);
- } catch ( GenericEntityException e ) {
+ } catch (GenericEntityException e) {
String errMsg = "Problem getting OrderHeader for orderId " + orderId;
Debug.logWarning(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java Mon Aug 17 15:42:56 2009
@@ -307,7 +307,7 @@
List cond = UtilMisc.toList(
EntityCondition.makeCondition("paymentId", EntityOperator.EQUALS, payment.getString("paymentId")),
EntityCondition.makeCondition("toPaymentId", EntityOperator.EQUALS, payment.getString("paymentId"))
- );
+ );
EntityCondition partyCond = EntityCondition.makeCondition(cond, EntityOperator.OR);
paymentApplications = payment.getDelegator().findList("PaymentApplication", partyCond, null, UtilMisc.toList("invoiceId", "billingAccountId"), null, false);
if (UtilValidate.isNotEmpty(paymentApplications)) {
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Mon Aug 17 15:42:56 2009
@@ -156,32 +156,32 @@
Set taxAuthoritySet = FastSet.newInstance();
GenericValue productStore = null;
// Check value productStore *** New
- if (productStoreId!=null){
- try {
- getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet);
- if (productStoreId != null) {
- productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId));
- }
-
- } catch (GenericEntityException e) {
- String errMsg = "Data error getting tax settings: " + e.toString();
- Debug.logError(e, errMsg, module);
- return ServiceUtil.returnError(errMsg);
- }
-
- if (productStore == null && payToPartyId == null) {
- throw new IllegalArgumentException("Could not find payToPartyId [" + payToPartyId + "] or ProductStore [" + productStoreId + "] for tax calculation");
- }
+ if (productStoreId!=null) {
+ try {
+ getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet);
+ if (productStoreId != null) {
+ productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId));
+ }
+
+ } catch (GenericEntityException e) {
+ String errMsg = "Data error getting tax settings: " + e.toString();
+ Debug.logError(e, errMsg, module);
+ return ServiceUtil.returnError(errMsg);
+ }
+
+ if (productStore == null && payToPartyId == null) {
+ throw new IllegalArgumentException("Could not find payToPartyId [" + payToPartyId + "] or ProductStore [" + productStoreId + "] for tax calculation");
+ }
}
else
{
- try{
- getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet);
- }catch (GenericEntityException e){
- String errMsg = "Data error getting tax settings: " + e.toString();
- Debug.logError(e, errMsg, module);
- return ServiceUtil.returnError(errMsg);
- }
+ try {
+ getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet);
+ } catch (GenericEntityException e) {
+ String errMsg = "Data error getting tax settings: " + e.toString();
+ Debug.logError(e, errMsg, module);
+ return ServiceUtil.returnError(errMsg);
+ }
}
// Setup the return lists.
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java?rev=805012&r1=805011&r2=805012&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java Mon Aug 17 15:42:56 2009
@@ -106,7 +106,7 @@
"billingAddress", billingAddress,
"shippingAddress", shippingAddress,
"orderId", orderId
- );
+ );
serviceInput.put("processAmount", new BigDecimal("200.00"));
// run the service (make sure in payment
@@ -140,7 +140,7 @@
"billToEmail", emailAddr,
"creditCard", creditCard,
"creditAmount", new BigDecimal("200.00")
- );
+ );
// run the service
Map result = dispatcher.runSync("clearCommerceCCCredit",serviceMap);
@@ -172,7 +172,7 @@
"billToEmail", emailAddr,
"creditCard", creditCard,
"pbOrder", pbOrder // if supplied, the crediting is for a subscription and credit by period is managed by ClearCommerce
- );
+ );
serviceMap.put("creditAmount", new BigDecimal("200.00"));
// run the service
@@ -222,7 +222,7 @@
Map serviceMap = UtilMisc.toMap(
"orderId", "4488668f-2db0-3002-002b-0003ba1d84d5",
"paymentConfig", configFile
- );
+ );
// run the service
Map result = dispatcher.runSync("clearCommerceCCReport",serviceMap);