You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2010/03/24 10:23:21 UTC
svn commit: r926987 [1/26] - in /ofbiz/branches/multitenant20100310: ./
applications/accounting/config/ applications/accounting/data/
applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/fixedasset/
applications/accoun...
Author: jonesde
Date: Wed Mar 24 09:23:07 2010
New Revision: 926987
URL: http://svn.apache.org/viewvc?rev=926987&view=rev
Log:
Merged from trunk, last commit included was rev 926940; there were a couple of conflicts resolved manually and then tests done to make sure things are still working
Added:
ofbiz/branches/multitenant20100310/applications/content/data/ContentPortletData.xml
- copied unchanged from r926954, ofbiz/trunk/applications/content/data/ContentPortletData.xml
ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/test/CustRequestTests.xml
- copied unchanged from r926954, ofbiz/trunk/applications/order/script/org/ofbiz/order/test/CustRequestTests.xml
ofbiz/branches/multitenant20100310/applications/order/testdef/CustRequestTests.xml
- copied unchanged from r926954, ofbiz/trunk/applications/order/testdef/CustRequestTests.xml
ofbiz/branches/multitenant20100310/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java
- copied unchanged from r926954, ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java
ofbiz/branches/multitenant20100310/framework/base/lib/hamcrest-all-1.2.jar
- copied unchanged from r926954, ofbiz/trunk/framework/base/lib/hamcrest-all-1.2.jar
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/concurrent/GeneratedResult.java
- copied unchanged from r926954, ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/GeneratedResult.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/concurrent/TTLCachedObject.java
- copied unchanged from r926954, ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/TTLCachedObject.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/concurrent/test/TTLCachedObjectTest.java
- copied unchanged from r926954, ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/TTLCachedObjectTest.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/lang/Factory.java
- copied unchanged from r926954, ofbiz/trunk/framework/base/src/org/ofbiz/base/lang/Factory.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/lang/ObjectWrapper.java
- copied unchanged from r926954, ofbiz/trunk/framework/base/src/org/ofbiz/base/lang/ObjectWrapper.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/lang/SourceMonitor.java
- copied unchanged from r926954, ofbiz/trunk/framework/base/src/org/ofbiz/base/lang/SourceMonitor.java
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java
- copied unchanged from r926954, ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreSiteFacade.java
- copied unchanged from r926954, ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreSiteFacade.java
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy
- copied unchanged from r926954, ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl
- copied unchanged from r926954, ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl
- copied unchanged from r926954, ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl
Removed:
ofbiz/branches/multitenant20100310/applications/workeffort/src/org/ofbiz/workeffort/project/ProjectWorker.java
ofbiz/branches/multitenant20100310/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/Factory.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/ObjectWrapper.java
Modified:
ofbiz/branches/multitenant20100310/ (props changed)
ofbiz/branches/multitenant20100310/.project
ofbiz/branches/multitenant20100310/LICENSE
ofbiz/branches/multitenant20100310/ant
ofbiz/branches/multitenant20100310/applications/accounting/config/AccountingUiLabels.xml
ofbiz/branches/multitenant20100310/applications/accounting/data/AccountingPortletData.xml
ofbiz/branches/multitenant20100310/applications/accounting/data/DemoGlSetupData.xml
ofbiz/branches/multitenant20100310/applications/accounting/entitydef/entitymodel.xml
ofbiz/branches/multitenant20100310/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
ofbiz/branches/multitenant20100310/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/main.ftl
ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/manualCCTx.ftl
ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/manualTx.ftl
ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign
ofbiz/branches/multitenant20100310/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl
ofbiz/branches/multitenant20100310/applications/accounting/widget/AccountingMenus.xml
ofbiz/branches/multitenant20100310/applications/accounting/widget/CommonScreens.xml
ofbiz/branches/multitenant20100310/applications/accounting/widget/FixedAssetScreens.xml
ofbiz/branches/multitenant20100310/applications/accounting/widget/GlSetupForms.xml
ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentForms.xml
ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentGatewayConfigScreens.xml
ofbiz/branches/multitenant20100310/applications/accounting/widget/PaymentScreens.xml
ofbiz/branches/multitenant20100310/applications/accounting/widget/ar/CommonScreens.xml
ofbiz/branches/multitenant20100310/applications/commonext/data/helpdata/HELP_SystemInfoNotes.xml
ofbiz/branches/multitenant20100310/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy
ofbiz/branches/multitenant20100310/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
ofbiz/branches/multitenant20100310/applications/commonext/widget/CommonScreens.xml
ofbiz/branches/multitenant20100310/applications/commonext/widget/SystemInfoForms.xml
ofbiz/branches/multitenant20100310/applications/content/ofbiz-component.xml
ofbiz/branches/multitenant20100310/applications/content/src/org/ofbiz/content/ContentManagementServices.java
ofbiz/branches/multitenant20100310/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
ofbiz/branches/multitenant20100310/applications/content/template/HelpTemplate.ftl
ofbiz/branches/multitenant20100310/applications/content/template/survey/genericsurvey.ftl
ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/AdminSearch.ftl
ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/CMSContentEdit.ftl
ofbiz/branches/multitenant20100310/applications/content/webapp/content/cms/CMSSites.ftl
ofbiz/branches/multitenant20100310/applications/content/webapp/content/content/EditContentTree.ftl
ofbiz/branches/multitenant20100310/applications/content/webapp/content/contentsetup/UserPermissions.ftl
ofbiz/branches/multitenant20100310/applications/content/webapp/content/layout/renderSubContent.ftl
ofbiz/branches/multitenant20100310/applications/content/webapp/content/lookup/ContentTreeLookupList.ftl
ofbiz/branches/multitenant20100310/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
ofbiz/branches/multitenant20100310/applications/content/widget/content/ContentForms.xml
ofbiz/branches/multitenant20100310/applications/content/widget/content/ContentScreens.xml
ofbiz/branches/multitenant20100310/applications/humanres/entitydef/entitymodel.xml
ofbiz/branches/multitenant20100310/applications/humanres/webapp/humanres/humanres/findEmployee.ftl
ofbiz/branches/multitenant20100310/applications/humanres/widget/GlobalHRSettingScreens.xml
ofbiz/branches/multitenant20100310/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml
ofbiz/branches/multitenant20100310/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java
ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl
ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
ofbiz/branches/multitenant20100310/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
ofbiz/branches/multitenant20100310/applications/marketing/config/MarketingUiLabels.xml
ofbiz/branches/multitenant20100310/applications/marketing/webapp/marketing/contact/ContactCommunicationPreview.ftl
ofbiz/branches/multitenant20100310/applications/marketing/webapp/sfa/contact/mergeContacts.ftl
ofbiz/branches/multitenant20100310/applications/marketing/webapp/sfa/lead/mergeLeads.ftl
ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListForms.xml
ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListMenus.xml
ofbiz/branches/multitenant20100310/applications/marketing/widget/ContactListScreens.xml
ofbiz/branches/multitenant20100310/applications/marketing/widget/DataSourceMenus.xml
ofbiz/branches/multitenant20100310/applications/marketing/widget/DataSourceScreens.xml
ofbiz/branches/multitenant20100310/applications/marketing/widget/MarketingCampaignMenus.xml
ofbiz/branches/multitenant20100310/applications/marketing/widget/MarketingCampaignScreens.xml
ofbiz/branches/multitenant20100310/applications/marketing/widget/SegmentScreens.xml
ofbiz/branches/multitenant20100310/applications/marketing/widget/TrackingCodeMenus.xml
ofbiz/branches/multitenant20100310/applications/marketing/widget/TrackingCodeScreens.xml
ofbiz/branches/multitenant20100310/applications/order/config/OrderEntityLabels.xml
ofbiz/branches/multitenant20100310/applications/order/config/OrderErrorUiLabels.xml
ofbiz/branches/multitenant20100310/applications/order/config/OrderUiLabels.xml
ofbiz/branches/multitenant20100310/applications/order/data/OrderTypeData.xml
ofbiz/branches/multitenant20100310/applications/order/data/SalesOrderDemoData.xml
ofbiz/branches/multitenant20100310/applications/order/data/helpdata/HELP_ORDER_Report.xml
ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel.xml
ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel_olap.xml
ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel_view.xml
ofbiz/branches/multitenant20100310/applications/order/ofbiz-component.xml
ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/UpgradeServices.xml
ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/olap/FactServices.xml
ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadMonthlyEvent.xml
ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
ofbiz/branches/multitenant20100310/applications/order/servicedef/services_quote.xml
ofbiz/branches/multitenant20100310/applications/order/servicedef/services_request.xml
ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java
ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
ofbiz/branches/multitenant20100310/applications/order/testdef/OrderTest.xml
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/addrsettings.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/billsettings.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/promoText.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/promotionsApplied.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkinits.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/custsettings.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/optionsettings.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderitems.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/shipsettings.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/OrderListByDate.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/editorderitems.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/findOrders.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderinfo.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderitems.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderlist.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderstats.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/receivepayment.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/transitions.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteDate.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteInfo.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteRoles.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/reportlist.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/requestContactMech.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/requestDate.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/quickReturn.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnHeader.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnItemInc.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnItems.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnLinks.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnList.ftl
ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/setup/paymentsetup.ftl
ofbiz/branches/multitenant20100310/applications/order/widget/ordermgr/OrderMenus.xml
ofbiz/branches/multitenant20100310/applications/order/widget/ordermgr/ReportScreens.xml
ofbiz/branches/multitenant20100310/applications/party/config/PartyErrorUiLabels.xml
ofbiz/branches/multitenant20100310/applications/party/data/PartyPortletData.xml
ofbiz/branches/multitenant20100310/applications/party/data/PartyTypeData.xml
ofbiz/branches/multitenant20100310/applications/party/entitydef/entitymodel.xml
ofbiz/branches/multitenant20100310/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
ofbiz/branches/multitenant20100310/applications/party/script/org/ofbiz/party/test/PartyTests.xml
ofbiz/branches/multitenant20100310/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
ofbiz/branches/multitenant20100310/applications/party/src/org/ofbiz/party/party/PartyServices.java
ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl
ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/party/editShoppingList.ftl
ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/party/findparty.ftl
ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/party/linkparty.ftl
ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/party/profileblocks/Content.ftl
ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/visit/showvisits.ftl
ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/visit/visitdetail.ftl
ofbiz/branches/multitenant20100310/applications/party/widget/partymgr/PartyMenus.xml
ofbiz/branches/multitenant20100310/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/branches/multitenant20100310/applications/product/config/ProductUiLabels.xml
ofbiz/branches/multitenant20100310/applications/product/entitydef/entitymodel.xml
ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/storage/FacilityEvents.xml
ofbiz/branches/multitenant20100310/applications/product/servicedef/services.xml
ofbiz/branches/multitenant20100310/applications/product/servicedef/services_view.xml
ofbiz/branches/multitenant20100310/applications/product/src/org/ofbiz/product/category/CategoryServices.java
ofbiz/branches/multitenant20100310/applications/product/src/org/ofbiz/product/category/CategoryWorker.java
ofbiz/branches/multitenant20100310/applications/product/src/org/ofbiz/product/price/PriceServices.java
ofbiz/branches/multitenant20100310/applications/product/src/org/ofbiz/product/product/ProductServices.java
ofbiz/branches/multitenant20100310/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/category/EditCategory.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/category/EditCategoryContent.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/config/EditProductConfigItemContentContent.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/find/FindProductById.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/find/advancedsearch.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/find/keywordsearch.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/find/keywordsearchactions.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/main.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductAssoc.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductContent.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductFeatures.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductParties.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/QuickAddVariants.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/reviews/pendingReviews.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/EditFacilityLocation.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/FacilityScheduleTabBar.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/PicklistManage.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/ViewContactMechs.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/group/FacilityGroupTabBar.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/receiveInventory.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/returns/receiveReturn.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/PackOrder.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/QuickShipOrder.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/VerifyPick.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl
ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/WeightPackage.ftl
ofbiz/branches/multitenant20100310/applications/product/widget/catalog/CatalogMenus.xml
ofbiz/branches/multitenant20100310/applications/product/widget/catalog/PromoForms.xml
ofbiz/branches/multitenant20100310/applications/product/widget/catalog/PromoScreens.xml
ofbiz/branches/multitenant20100310/applications/securityext/email/default/passwordemail.ftl
ofbiz/branches/multitenant20100310/applications/workeffort/data/WorkEffortTypeData.xml
ofbiz/branches/multitenant20100310/applications/workeffort/servicedef/services.xml
ofbiz/branches/multitenant20100310/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
ofbiz/branches/multitenant20100310/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy
ofbiz/branches/multitenant20100310/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy
ofbiz/branches/multitenant20100310/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy
ofbiz/branches/multitenant20100310/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Upcoming.groovy
ofbiz/branches/multitenant20100310/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy
ofbiz/branches/multitenant20100310/applications/workeffort/webapp/workeffort/calendar/day.ftl
ofbiz/branches/multitenant20100310/applications/workeffort/webapp/workeffort/calendar/month.ftl
ofbiz/branches/multitenant20100310/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl
ofbiz/branches/multitenant20100310/applications/workeffort/webapp/workeffort/calendar/week.ftl
ofbiz/branches/multitenant20100310/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl
ofbiz/branches/multitenant20100310/applications/workeffort/webapp/workeffort/main.ftl
ofbiz/branches/multitenant20100310/applications/workeffort/webapp/workeffort/task/mytasks.ftl
ofbiz/branches/multitenant20100310/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl
ofbiz/branches/multitenant20100310/applications/workeffort/widget/CalendarForms.xml
ofbiz/branches/multitenant20100310/applications/workeffort/widget/CommonScreens.xml
ofbiz/branches/multitenant20100310/build.xml
ofbiz/branches/multitenant20100310/framework/base/build.xml
ofbiz/branches/multitenant20100310/framework/base/config/log4j.xml
ofbiz/branches/multitenant20100310/framework/base/dtd/ofbiz-component.xsd
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/concurrent/test/AsyncTTLObjectTest.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/concurrent/test/SyncTTLObjectTest.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/conversion/Converters.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/conversion/test/DateTimeTests.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/conversion/test/MiscTests.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/json/JSON.jj
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/json/JSONWriter.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/json/test/JSONTests.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/lang/ComparableRange.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/lang/test/ComparableRangeTests.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/GroovyUtil.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/IndentingWriter.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/ObjectType.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/TimeDuration.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/UtilObject.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/collections/IteratorWrapper.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/test/IndentingWriterTests.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/test/TimeDurationTests.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/test/UtilIOTests.java
ofbiz/branches/multitenant20100310/framework/base/src/org/ofbiz/base/util/test/UtilObjectTests.java
ofbiz/branches/multitenant20100310/framework/bi/script/org/ofbiz/bi/DimensionServices.xml
ofbiz/branches/multitenant20100310/framework/birt/build.xml
ofbiz/branches/multitenant20100310/framework/birt/data/helpdata/HELP_BIRT.xml
ofbiz/branches/multitenant20100310/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java
ofbiz/branches/multitenant20100310/framework/build.xml
ofbiz/branches/multitenant20100310/framework/common/config/CommonUiLabels.xml
ofbiz/branches/multitenant20100310/framework/common/data/GeoData_CN.xml
ofbiz/branches/multitenant20100310/framework/common/webcommon/WEB-INF/portal-controller.xml
ofbiz/branches/multitenant20100310/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
ofbiz/branches/multitenant20100310/framework/common/webcommon/includes/simple.ftl
ofbiz/branches/multitenant20100310/framework/common/webcommon/login.ftl
ofbiz/branches/multitenant20100310/framework/common/webcommon/portal/editPortalPage.ftl
ofbiz/branches/multitenant20100310/framework/common/webcommon/viewBlocked.ftl
ofbiz/branches/multitenant20100310/framework/common/widget/CommonMenus.xml
ofbiz/branches/multitenant20100310/framework/common/widget/PortalPageScreens.xml
ofbiz/branches/multitenant20100310/framework/datafile/src/org/ofbiz/datafile/Record.java
ofbiz/branches/multitenant20100310/framework/datafile/src/org/ofbiz/datafile/RecordIterator.java
ofbiz/branches/multitenant20100310/framework/documents/Framework.xml
ofbiz/branches/multitenant20100310/framework/entity/documents/EntityEngine.xml
ofbiz/branches/multitenant20100310/framework/entity/src/org/ofbiz/entity/DelegatorFactory.java
ofbiz/branches/multitenant20100310/framework/entity/src/org/ofbiz/entity/DelegatorFactoryImpl.java
ofbiz/branches/multitenant20100310/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
ofbiz/branches/multitenant20100310/framework/entity/src/org/ofbiz/entity/GenericEntity.java
ofbiz/branches/multitenant20100310/framework/entity/src/org/ofbiz/entity/GenericPK.java
ofbiz/branches/multitenant20100310/framework/entity/src/org/ofbiz/entity/GenericValue.java
ofbiz/branches/multitenant20100310/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java
ofbiz/branches/multitenant20100310/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java
ofbiz/branches/multitenant20100310/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java
ofbiz/branches/multitenant20100310/framework/entity/src/org/ofbiz/entity/util/SequenceUtil.java
ofbiz/branches/multitenant20100310/framework/example/config/ExampleUiLabels.xml
ofbiz/branches/multitenant20100310/framework/example/webapp/birt/WEB-INF/birt.tld
ofbiz/branches/multitenant20100310/framework/example/webapp/birt/WEB-INF/server-config.wsdd
ofbiz/branches/multitenant20100310/framework/example/webapp/example/WEB-INF/birt.tld
ofbiz/branches/multitenant20100310/framework/example/widget/example/FormWidgetExampleForms.xml
ofbiz/branches/multitenant20100310/framework/images/webapp/images/calendarDateSelect/format/format_iso_date.js
ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/createlink.html
ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/insertimage.html
ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Wizard.html
ofbiz/branches/multitenant20100310/framework/images/webapp/images/fieldlookup.js
ofbiz/branches/multitenant20100310/framework/images/webapp/images/selectall.js
ofbiz/branches/multitenant20100310/framework/minilang/documents/MiniLang.xml
ofbiz/branches/multitenant20100310/framework/service/documents/ServiceEngine.xml
ofbiz/branches/multitenant20100310/framework/service/dtd/service-group.xsd
ofbiz/branches/multitenant20100310/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java
ofbiz/branches/multitenant20100310/framework/sql/src/org/ofbiz/sql/Parser.jj
ofbiz/branches/multitenant20100310/framework/sql/src/org/ofbiz/sql/test/GoodParseAll.sql
ofbiz/branches/multitenant20100310/framework/sql/src/org/ofbiz/sql/test/TestSelect.sql
ofbiz/branches/multitenant20100310/framework/testtools/documents/TestTools.xml
ofbiz/branches/multitenant20100310/framework/testtools/dtd/SeleniumXml.xsd
ofbiz/branches/multitenant20100310/framework/testtools/dtd/test-suite.xsd
ofbiz/branches/multitenant20100310/framework/testtools/testdef/seleniumxml/example/recorded/AjaxExample.html
ofbiz/branches/multitenant20100310/framework/testtools/testdef/seleniumxml/example/recorded/NewExample.html
ofbiz/branches/multitenant20100310/framework/testtools/testdef/seleniumxml/example/recorded/NewFeature.html
ofbiz/branches/multitenant20100310/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
ofbiz/branches/multitenant20100310/framework/webtools/data/helpdata/HELP_WEBTOOLS.xml
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/cache/editUtilCache.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/CheckDb.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/EditEntity.jsp
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/EntityImport.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/EntityMaint.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/EntityRef.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/EntityRefList.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/FindGeneric.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/ViewRelations.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/minervaObjects.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/entity/xmldsdump.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/service/availableservices.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl
ofbiz/branches/multitenant20100310/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
ofbiz/branches/multitenant20100310/framework/widget/dtd/widget-form.xsd
ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java
ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
ofbiz/branches/multitenant20100310/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java
ofbiz/branches/multitenant20100310/framework/widget/templates/csvFormMacroLibrary.ftl
ofbiz/branches/multitenant20100310/framework/widget/templates/foFormMacroLibrary.ftl
ofbiz/branches/multitenant20100310/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/branches/multitenant20100310/framework/widget/templates/textFormMacroLibrary.ftl
ofbiz/branches/multitenant20100310/framework/widget/templates/xmlFormMacroLibrary.ftl
ofbiz/branches/multitenant20100310/specialpurpose/build.xml
ofbiz/branches/multitenant20100310/specialpurpose/cmssite/template/cms/BlogList.ftl
ofbiz/branches/multitenant20100310/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_AdvanceSearch.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_EditEbayConfiguration.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_Features.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_FindConfigurations.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ManageOrdersFromEbay.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ProductsExportToEbay.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_ShippingMethods.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_eBayOrders.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebay/data/helpdata/HELP_EBAY_main.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
ofbiz/branches/multitenant20100310/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ebay/webapp/ebay/find/EbayKeywordSearch.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ebay/widget/EbayScreens.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/build.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/data/DemoEbayStoreData.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/data/EbayStoreTypeData.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/data/helpdata/HELP_EBAY_LeaveFeedback.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/entitydef/entitymodel.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/servicedef/services.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/email/GetProductStoreEmailTemplate.groovy
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/webapp/ebaystore/feedback/LeaveFeedback.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/widget/EbayAccountForms.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/widget/EbayStoreMenus.xml
ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/widget/EbayStoreScreens.xml
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoOrderTestData.xml
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoProduct.xml
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoStandardCosting.xml
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/survey/genericresult.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/survey/miniresult.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/SubscriptionSummary.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/login.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/ccinfo.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/request/requestInfo.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
ofbiz/branches/multitenant20100310/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl
ofbiz/branches/multitenant20100310/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl
ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl
ofbiz/branches/multitenant20100310/specialpurpose/myportal/widget/login.ftl
ofbiz/branches/multitenant20100310/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl
ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/images/global.css
ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/images/rsscss.css
ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/script/slides.js
ofbiz/branches/multitenant20100310/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/entitydef/entitymodel.xml
ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/main.ftl
ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl
ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/CustRequestScreens.xml
ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/TaskScreens.xml
ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml
ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/TaskForms.xml
ofbiz/branches/multitenant20100310/specialpurpose/shark/webapp/shark/repository/showRepository.ftl
ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl
ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/includes/Footer.ftl
ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl
ofbiz/branches/multitenant20100310/specialpurpose/workflow/webapp/workflow/workflow/readxpdl.ftl
ofbiz/branches/multitenant20100310/themes/bizznesstime/webapp/bizznesstime/css/legacy.css
ofbiz/branches/multitenant20100310/themes/bizznesstime/webapp/bizznesstime/css/login.css
ofbiz/branches/multitenant20100310/themes/bizznesstime/webapp/bizznesstime/js/application.js
ofbiz/branches/multitenant20100310/themes/droppingcrumbs/webapp/droppingcrumbs/js/application.js
ofbiz/branches/multitenant20100310/themes/flatgrey/webapp/flatgrey/maincss.css
ofbiz/branches/multitenant20100310/themes/tomahawk/data/TomahawkThemeData.xml
ofbiz/branches/multitenant20100310/themes/tomahawk/includes/appbarClose.ftl
ofbiz/branches/multitenant20100310/themes/tomahawk/includes/appbarOpen.ftl
ofbiz/branches/multitenant20100310/themes/tomahawk/includes/header.ftl
ofbiz/branches/multitenant20100310/themes/tomahawk/webapp/tomahawk/css/help.css
ofbiz/branches/multitenant20100310/themes/tomahawk/webapp/tomahawk/css/style.css
Propchange: ofbiz/branches/multitenant20100310/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 24 09:23:07 2010
@@ -1 +1,2 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
+/ofbiz/trunk:921280-926954
Modified: ofbiz/branches/multitenant20100310/.project
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/.project?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/.project (original)
+++ ofbiz/branches/multitenant20100310/.project Wed Mar 24 09:23:07 2010
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>ofbiz</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
+ <name>ofbiz</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
</projectDescription>
Modified: ofbiz/branches/multitenant20100310/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/LICENSE?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/LICENSE (original)
+++ ofbiz/branches/multitenant20100310/LICENSE Wed Mar 24 09:23:07 2010
@@ -478,6 +478,7 @@ The following libraries distributed with
BSD License:
ofbiz/trunk/framework/base/lib/antisamy-bin.1.2.jar
ofbiz/trunk/framework/base/lib/freemarker-2.3.15.jar
+ofbiz/trunk/framework/base/lib/hamcrest-all-1.2.jar
ofbiz/trunk/framework/base/lib/httpunit.jar
ofbiz/trunk/framework/base/lib/ical4j-1.0-rc2.jar
ofbiz/trunk/framework/base/lib/javacc/javacc-4.1.jar
Modified: ofbiz/branches/multitenant20100310/ant
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/ant?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/ant (original)
+++ ofbiz/branches/multitenant20100310/ant Wed Mar 24 09:23:07 2010
@@ -26,14 +26,14 @@ else
fi
find_jar() {
- top="$(cd "$(dirname "$0")"; echo "$PWD")"
- set -- "$top"/framework/base/lib/ant-launcher-*.jar
- if [ $# = 1 ] && [ -e "$1" ]; then
- echo "$1"
- else
- echo "Couldn't find ant-launcher.jar" 1>&2
- exit 1
- fi
+ top="$(cd "$(dirname "$0")"; echo "$PWD")"
+ set -- "$top"/framework/base/lib/ant-launcher-*.jar
+ if [ $# = 1 ] && [ -e "$1" ]; then
+ echo "$1"
+ else
+ echo "Couldn't find ant-launcher.jar" 1>&2
+ exit 1
+ fi
}
"$JAVA" -jar "$(find_jar)" "$@"
Modified: ofbiz/branches/multitenant20100310/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/config/AccountingUiLabels.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/config/AccountingUiLabels.xml Wed Mar 24 09:23:07 2010
@@ -6690,7 +6690,7 @@
<value xml:lang="en">Organization GL Settings</value>
<value xml:lang="fr">Configurations internes du GL</value>
<value xml:lang="hi_IN">सà¤à¤à¤ न à¤à¥à¤à¤²(Gl) सà¥à¤à¤¿à¤à¤à¥à¤¸</value>
- <value xml:lang="nl">Organisatie grootboek instellingen</value>
+ <value xml:lang="nl">Organisatie grootboek instellingen</value>
<value xml:lang="zh">ç»ç»æºææ»è´¦è®¾ç½®</value>
</property>
<property key="AccountingOrganizationPartyId">
Modified: ofbiz/branches/multitenant20100310/applications/accounting/data/AccountingPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/data/AccountingPortletData.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/data/AccountingPortletData.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/data/AccountingPortletData.xml Wed Mar 24 09:23:07 2010
@@ -46,7 +46,7 @@
<PortletPortletCategory portalPortletId="ArPastDueInvoices" portletCategoryId="ACCOUNTING"/>
<PortletPortletCategory portalPortletId="ArInvoicesDueSoon" portletCategoryId="ACCOUNTING"/>
- <PortalPage portalPageId="ArPortalPage" sequenceNum="0" portalPageName="Portal Page in AR" description="Portal page for Past Due Invoices and Invoices Due Soon in AR" ownerUserLoginId="_NA_"/>
+ <PortalPage portalPageId="ArPortalPage" sequenceNum="0" portalPageName="Main" description="Portal page for Past Due Invoices and Invoices Due Soon in AR" ownerUserLoginId="_NA_"/>
<PortalPageColumn portalPageId="ArPortalPage" columnSeqId="00001"/>
@@ -62,7 +62,7 @@
<PortletPortletCategory portalPortletId="ApPastDueInvoices" portletCategoryId="ACCOUNTING"/>
<PortletPortletCategory portalPortletId="ApInvoicesDueSoon" portletCategoryId="ACCOUNTING"/>
- <PortalPage portalPageId="ApPortalPage" sequenceNum="0" portalPageName="Portal Page in AP" description="Portal page for Past Due Invoices and Invoices Due Soon in AP" ownerUserLoginId="_NA_"/>
+ <PortalPage portalPageId="ApPortalPage" sequenceNum="0" portalPageName="Main" description="Portal page for Past Due Invoices and Invoices Due Soon in AP" ownerUserLoginId="_NA_"/>
<PortalPageColumn portalPageId="ApPortalPage" columnSeqId="00001"/>
Modified: ofbiz/branches/multitenant20100310/applications/accounting/data/DemoGlSetupData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/data/DemoGlSetupData.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/data/DemoGlSetupData.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/data/DemoGlSetupData.xml Wed Mar 24 09:23:07 2010
@@ -208,7 +208,7 @@ under the License.
<!-- GL journal for suspended transactions (failed post) -->
<GlJournal organizationPartyId="Company" glJournalId="ERROR_JOURNAL" glJournalName="Suspense transactions"/>
- <PartyAcctgPreference partyId="Company" taxFormId="US_IRS_1120" cogsMethodId="COGS_AVG_COST" baseCurrencyUomId="USD"
+ <PartyAcctgPreference partyId="Company" taxFormId="US_IRS_1120" cogsMethodId="COGS_LIFO" baseCurrencyUomId="USD"
invoiceSequenceEnumId="INVSQ_ENF_SEQ" invoiceIdPrefix="CI"
quoteSequenceEnumId="INVSQ_ENF_SEQ" quoteIdPrefix="CQ"
orderSequenceEnumId="INVSQ_ENF_SEQ" orderIdPrefix="CO"
Modified: ofbiz/branches/multitenant20100310/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/entitydef/entitymodel.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/entitydef/entitymodel.xml Wed Mar 24 09:23:07 2010
@@ -1742,6 +1742,7 @@ under the License.
<field name="theirPartyId" type="id"></field>
<field name="productId" type="id"></field>
<field name="theirProductId" type="id"></field>
+ <field name="inventoryItemId" type="id"></field>
<field name="glAccountTypeId" type="id"></field>
<field name="glAccountId" type="id-ne"></field>
<field name="organizationPartyId" type="id-ne"></field>
@@ -1770,6 +1771,9 @@ under the License.
<relation type="one" fk-name="ACCTTXENT_ACTX" rel-entity-name="AcctgTrans">
<key-map field-name="acctgTransId"/>
</relation>
+ <relation type="one" fk-name="ACCTTXENT_INVITEM" rel-entity-name="InventoryItem">
+ <key-map field-name="inventoryItemId"/>
+ </relation>
<relation type="one" fk-name="ACCTTXENT_PARTY" rel-entity-name="Party">
<key-map field-name="partyId"/>
</relation>
Modified: ofbiz/branches/multitenant20100310/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Wed Mar 24 09:23:07 2010
@@ -573,18 +573,23 @@ under the License.
<then>
<set field="depreciation" value="0.0" type="BigDecimal"/>
<!--FORMULA : depreciation = (purchaseCost - salvageValue) / (expectedEndOfLife - dateAcquired) -->
- <calculate field="depreciation" decimal-scale="2">
- <calcop operator="divide">
- <calcop operator="subtract">
- <calcop operator="get" field="purchaseCost"/>
- <calcop operator="get" field="salvageValue"/>
- </calcop>
- <calcop operator="subtract">
- <calcop operator="get" field="expEndOfLifeYear"/>
- <calcop operator="get" field="assetAcquiredYear"/>
- </calcop>
+ <calculate field="numberOfYears">
+ <calcop operator="subtract">
+ <calcop operator="get" field="expEndOfLifeYear"/>
+ <calcop operator="get" field="assetAcquiredYear"/>
</calcop>
</calculate>
+ <if-compare field="numberOfYears" operator="greater" value="0.0" type="BigDecimal">
+ <calculate field="depreciation" decimal-scale="2">
+ <calcop operator="divide">
+ <calcop operator="subtract">
+ <calcop operator="get" field="purchaseCost"/>
+ <calcop operator="get" field="salvageValue"/>
+ </calcop>
+ <calcop operator="get" field="numberOfYears"/>
+ </calcop>
+ </calculate>
+ </if-compare>
<set field="depreciationYear" from-field="assetAcquiredYear" type="BigDecimal"/>
<loop count="${intUsageYears}">
<calculate field="purchaseCost">
@@ -640,21 +645,25 @@ under the License.
<then>
<entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
<!--FORMULA : depreciation = (purchaseCost - salvageValue - pastDepreciations) / remainingYears -->
- <calculate field="nextDepreciationAmount" decimal-scale="2">
- <calcop operator="divide">
- <calcop operator="subtract">
- <calcop operator="get" field="fixedAsset.purchaseCost"/>
- <calcop operator="get" field="salvageValue"/>
- <calcop operator="get" field="fixedAsset.depreciation"/>
- </calcop>
- <!-- Remaining years -->
- <calcop operator="subtract">
- <calcop operator="get" field="expEndOfLifeYear"/>
- <calcop operator="get" field="assetAcquiredYear"/>
- <calcop operator="get" field="intUsageYears"/>
- </calcop>
+ <calculate field="remainingYears">
+ <calcop operator="subtract">
+ <calcop operator="get" field="expEndOfLifeYear"/>
+ <calcop operator="get" field="assetAcquiredYear"/>
+ <calcop operator="get" field="intUsageYears"/>
</calcop>
</calculate>
+ <if-compare field="remainingYears" operator="greater" value="0.0" type="BigDecimal">
+ <calculate field="nextDepreciationAmount" decimal-scale="2">
+ <calcop operator="divide">
+ <calcop operator="subtract">
+ <calcop operator="get" field="fixedAsset.purchaseCost"/>
+ <calcop operator="get" field="salvageValue"/>
+ <calcop operator="get" field="fixedAsset.depreciation"/>
+ </calcop>
+ <calcop operator="get" field="remainingYears"/>
+ </calcop>
+ </calculate>
+ </if-compare>
</then>
</if>
<field-to-result field="nextDepreciationAmount"/>
@@ -676,24 +685,28 @@ under the License.
<then>
<entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
<!--FORMULA : depreciation = 2 * (purchaseCost - salvageValue - pastDepreciations) / remainingYears -->
- <calculate field="nextDepreciationAmount" decimal-scale="2">
- <calcop operator="multiply">
- <calcop operator="divide">
- <calcop operator="subtract">
- <calcop operator="get" field="fixedAsset.purchaseCost"/>
- <calcop operator="get" field="salvageValue"/>
- <calcop operator="get" field="fixedAsset.depreciation"/>
- </calcop>
- <!-- Remaining years -->
- <calcop operator="subtract">
- <calcop operator="get" field="expEndOfLifeYear"/>
- <calcop operator="get" field="assetAcquiredYear"/>
- <calcop operator="get" field="intUsageYears"/>
- </calcop>
- </calcop>
- <number value="2"/>
+ <calculate field="remainingYears">
+ <calcop operator="subtract">
+ <calcop operator="get" field="expEndOfLifeYear"/>
+ <calcop operator="get" field="assetAcquiredYear"/>
+ <calcop operator="get" field="intUsageYears"/>
</calcop>
</calculate>
+ <if-compare field="remainingYears" operator="greater" value="0.0" type="BigDecimal">
+ <calculate field="nextDepreciationAmount" decimal-scale="2">
+ <calcop operator="multiply">
+ <calcop operator="divide">
+ <calcop operator="subtract">
+ <calcop operator="get" field="fixedAsset.purchaseCost"/>
+ <calcop operator="get" field="salvageValue"/>
+ <calcop operator="get" field="fixedAsset.depreciation"/>
+ </calcop>
+ <calcop operator="get" field="remainingYears"/>
+ </calcop>
+ <number value="2"/>
+ </calcop>
+ </calculate>
+ </if-compare>
</then>
</if>
<field-to-result field="nextDepreciationAmount"/>
@@ -712,21 +725,26 @@ under the License.
<loop count="${intUsageYears}">
<set field="depreciation" value="0.0" type="BigDecimal"/>
<!--FORMULA : depreciation = (NBV - salvageValue) * 2 / (expectedEndOfLife - dateAcquired) -->
- <calculate field="depreciation" decimal-scale="2">
- <calcop operator="multiply">
- <calcop operator="divide">
- <calcop operator="subtract">
- <calcop operator="get" field="purchaseCost"/>
- <calcop operator="get" field="salvageValue"/>
- </calcop>
- <calcop operator="subtract">
- <calcop operator="get" field="expEndOfLifeYear"/>
- <calcop operator="get" field="assetAcquiredYear"/>
- </calcop>
- </calcop>
- <number value="2"/>
+ <calculate field="numberOfYears">
+ <calcop operator="subtract">
+ <calcop operator="get" field="expEndOfLifeYear"/>
+ <calcop operator="get" field="assetAcquiredYear"/>
</calcop>
</calculate>
+ <if-compare field="numberOfYears" operator="greater" value="0.0" type="BigDecimal">
+ <calculate field="depreciation" decimal-scale="2">
+ <calcop operator="multiply">
+ <calcop operator="divide">
+ <calcop operator="subtract">
+ <calcop operator="get" field="purchaseCost"/>
+ <calcop operator="get" field="salvageValue"/>
+ </calcop>
+ <calcop operator="get" field="numberOfYears"/>
+ </calcop>
+ <number value="2"/>
+ </calcop>
+ </calculate>
+ </if-compare>
<calculate field="assetAcquiredYear">
<calcop operator="add">
<calcop operator="get" field="assetAcquiredYear"/>
Modified: ofbiz/branches/multitenant20100310/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original)
+++ ofbiz/branches/multitenant20100310/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Wed Mar 24 09:23:07 2010
@@ -1098,6 +1098,7 @@ under the License.
</entity-and>
<first-from-list list="billToCustomers" entry="billToCustomer"/>
<!-- TODO: handle serialized inventory -->
+ <!--
<set field="getProdAvgCostMap.inventoryItem" from-field="inventoryItem"/>
<call-service service-name="getProductAverageCost" in-map-name="getProdAvgCostMap">
<result-to-field result-name="unitCost"/>
@@ -1108,27 +1109,88 @@ under the License.
<calcop operator="get" field="unitCost"/>
</calcop>
</calculate>
- <!-- prepare the doble posting (D/C) entries (AcctgTransEntry) -->
+ -->
+ <!-- prepare the double posting (D/C) entries (AcctgTransEntry) -->
<!-- Credit -->
- <make-value entity-name="AcctgTransEntry" value-field="creditEntry"/>
- <set field="creditEntry.debitCreditFlag" value="C"/>
- <set field="creditEntry.glAccountTypeId" value="INVENTORY_ACCOUNT"/>
- <set field="creditEntry.organizationPartyId" from-field="inventoryItem.ownerPartyId"/>
- <set field="creditEntry.productId" from-field="inventoryItem.productId"/>
- <set field="creditEntry.origAmount" from-field="origAmount"/>
- <set field="creditEntry.origCurrencyUomId" from-field="inventoryItem.currencyUomId"/>
- <if-not-empty field="billToCustomer">
- <set field="creditEntry.partyId" from-field="billToCustomer.partyId"/>
- <set field="creditEntry.roleTypeId" from-field="billToCustomer.roleTypeId"/>
- </if-not-empty>
- <set field="acctgTransEntries[]" from-field="creditEntry" type="Object"/>
+ <set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="inventoryItem.ownerPartyId"/>
+ <call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap">
+ <result-to-field result-name="partyAccountingPreference" field="partyAcctgPreference"/>
+ </call-service>
+ <if-compare field="partyAcctgPreference.cogsMethodId" operator="equals" value="COGS_FIFO" type="String">
+ <set value="+datetimeReceived" field="orderByString"/>
+ </if-compare>
+ <if-compare field="partyAcctgPreference.cogsMethodId" operator="equals" value="COGS_LIFO" type="String">
+ <set value="-datetimeReceived" field="orderByString"/>
+ </if-compare>
+ <if-empty field="orderByString">
+ <add-error><fail-message message="COGS costing method is not supported: ${partyAcctgPreference.cogsMethodId}"/></add-error>
+ <check-errors/>
+ </if-empty>
+ <entity-condition entity-name="InventoryItem" list="costInventoryItems">
+ <condition-list combine="and">
+ <condition-expr field-name="ownerPartyId" operator="equals" from-field="inventoryItem.ownerPartyId"/>
+ <condition-expr field-name="facilityId" operator="equals" from-field="inventoryItem.facilityId"/>
+ <condition-expr field-name="productId" operator="equals" from-field="inventoryItem.productId"/>
+ <condition-expr field-name="accountingQuantityTotal" operator="greater" value="0.0"/>
+ </condition-list>
+ <order-by field-name="${orderByString}"/>
+ </entity-condition>
+ <set field="remainingQuantity" from-field="itemIssuance.quantity"/>
+ <set field="totalAmount" value="0.0" type="BigDecimal"/>
+ <iterate list="costInventoryItems" entry="costInventoryItem">
+ <if-compare field="remainingQuantity" operator="greater" value="0.0" type="BigDecimal">
+ <if-compare-field field="remainingQuantity" operator="less-equals" to-field="costInventoryItem.accountingQuantityTotal" type="BigDecimal">
+ <set field="costInventoryItemQuantity" from-field="remainingQuantity"/>
+ <set field="remainingQuantity" value="0.0" type="BigDecimal"/>
+ <else>
+ <set field="costInventoryItemQuantity" from-field="costInventoryItem.accountingQuantityTotal"/>
+ <set field="remainingQuantity" value="${remainingQuantity - costInventoryItem.accountingQuantityTotal}" type="BigDecimal"/>
+ </else>
+ </if-compare-field>
+ <!-- An inventory item detail record is created to keep track of the units (value) that we are going to add to the inventory account -->
+ <set from-field="costInventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/>
+ <set value="${-1 * costInventoryItemQuantity}" field="createDetailMap.accountingQuantityDiff" type="BigDecimal"/>
+ <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
+
+ <calculate field="costInventoryItemAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
+ <calcop operator="multiply">
+ <calcop operator="get" field="costInventoryItemQuantity"/>
+ <calcop operator="get" field="costInventoryItem.unitCost"/>
+ </calcop>
+ </calculate>
+ <calculate field="totalAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
+ <calcop operator="sum">
+ <calcop operator="get" field="costInventoryItemAmount"/>
+ <calcop operator="get" field="totalAmount"/>
+ </calcop>
+ </calculate>
+ <make-value entity-name="AcctgTransEntry" value-field="creditEntry"/>
+ <set field="creditEntry.debitCreditFlag" value="C"/>
+ <set field="creditEntry.glAccountTypeId" value="INVENTORY_ACCOUNT"/>
+ <set field="creditEntry.organizationPartyId" from-field="inventoryItem.ownerPartyId"/>
+ <set field="creditEntry.productId" from-field="inventoryItem.productId"/>
+ <set field="creditEntry.inventoryItemId" from-field="costInventoryItem.inventoryItemId"/>
+ <set field="creditEntry.origAmount" from-field="costInventoryItemAmount"/>
+ <set field="creditEntry.origCurrencyUomId" from-field="inventoryItem.currencyUomId"/>
+ <if-not-empty field="billToCustomer">
+ <set field="creditEntry.partyId" from-field="billToCustomer.partyId"/>
+ <set field="creditEntry.roleTypeId" from-field="billToCustomer.roleTypeId"/>
+ </if-not-empty>
+ <set field="acctgTransEntries[]" from-field="creditEntry" type="Object"/>
+ <clear-field field="creditEntry"/>
+ </if-compare>
+ </iterate>
+ <if-compare field="remainingQuantity" operator="greater" value="0.0" type="BigDecimal">
+ <add-error><fail-message message="Could not find enough accounting inventory for product [${inventoryItem.productId}]; remaining quantity: ${remainingQuantity}"/></add-error>
+ <check-errors/>
+ </if-compare>
<!-- Debit -->
<make-value entity-name="AcctgTransEntry" value-field="debitEntry"/>
<set field="debitEntry.debitCreditFlag" value="D"/>
<set field="debitEntry.glAccountTypeId" value="COGS_ACCOUNT"/>
<set field="debitEntry.organizationPartyId" from-field="inventoryItem.ownerPartyId"/>
<set field="debitEntry.productId" from-field="inventoryItem.productId"/>
- <set field="debitEntry.origAmount" from-field="origAmount"/>
+ <set field="debitEntry.origAmount" from-field="totalAmount"/>
<set field="debitEntry.origCurrencyUomId" from-field="inventoryItem.currencyUomId"/>
<if-not-empty field="billToCustomer">
<set field="debitEntry.partyId" from-field="billToCustomer.partyId"/>
@@ -1139,6 +1201,7 @@ under the License.
<set field="createAcctgTransAndEntriesInMap.glFiscalTypeId" value="ACTUAL"/>
<set field="createAcctgTransAndEntriesInMap.acctgTransTypeId" value="SALES_SHIPMENT"/>
<set field="createAcctgTransAndEntriesInMap.shipmentId" from-field="itemIssuance.shipmentId"/>
+ <set field="createAcctgTransAndEntriesInMap.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
<set field="createAcctgTransAndEntriesInMap.transactionDate" from-field="itemIssuance.issuedDateTime"/>
<set field="createAcctgTransAndEntriesInMap.acctgTransEntries" from-field="acctgTransEntries"/>
<call-service service-name="createAcctgTransAndEntries" in-map-name="createAcctgTransAndEntriesInMap">
@@ -1169,7 +1232,7 @@ under the License.
<calcop operator="get" field="unitCost"/>
</calcop>
</calculate>
- <!-- prepare the doble posting (D/C) entries (AcctgTransEntry) -->
+ <!-- prepare the double posting (D/C) entries (AcctgTransEntry) -->
<!-- Credit -->
<make-value entity-name="AcctgTransEntry" value-field="creditEntry"/>
<set field="creditEntry.debitCreditFlag" value="C"/>
@@ -1236,7 +1299,11 @@ under the License.
<calcop operator="get" field="unitCost"/>
</calcop>
</calculate>
- <!-- prepare the doble posting (D/C) entries (AcctgTransEntry) -->
+ <!-- An inventory item detail record is created to keep track of the units (value) that we are going to add to the inventory account -->
+ <set from-field="inventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/>
+ <set from-field="shipmentReceipt.quantityAccepted" field="createDetailMap.accountingQuantityDiff"/>
+ <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
+ <!-- prepare the double posting (D/C) entries (AcctgTransEntry) -->
<!-- Credit -->
<make-value entity-name="AcctgTransEntry" value-field="creditEntry"/>
<set field="creditEntry.debitCreditFlag" value="C"/>
@@ -1384,7 +1451,7 @@ under the License.
<calcop operator="get" field="inventoryItem.unitCost"/>
</calcop>
</calculate>
- <!-- prepare the doble posting (D/C) entries (AcctgTransEntry) -->
+ <!-- prepare the double posting (D/C) entries (AcctgTransEntry) -->
<!-- Credit -->
<make-value entity-name="AcctgTransEntry" value-field="creditEntry"/>
<set field="creditEntry.debitCreditFlag" value="C"/>
@@ -1502,7 +1569,7 @@ under the License.
</calcop>
</calculate>
</if-not-empty>
- <!-- prepare the doble posting (D/C) entries (AcctgTransEntry) for old OwnerPartyId -->
+ <!-- prepare the double posting (D/C) entries (AcctgTransEntry) for old OwnerPartyId -->
<!-- Credit -->
<make-value entity-name="AcctgTransEntry" value-field="oldPartyCreditEntry"/>
<set field="oldPartyCreditEntry.debitCreditFlag" value="C"/>
@@ -1520,7 +1587,7 @@ under the License.
<set field="oldPartyDebitEntry.origCurrencyUomId" from-field="inventoryItem.currencyUomId"/>
<set field="oldPartyDebitEntry.organizationPartyId" from-field="parameters.oldOwnerPartyId"/>
<set field="oldPartyDebitEntry.glAccountTypeId" value="INVENTORY_ACCOUNT"/>
- <!-- prepare the doble posting (D/C) entries (AcctgTransEntry) for New ownerPartyId -->
+ <!-- prepare the double posting (D/C) entries (AcctgTransEntry) for New ownerPartyId -->
<!-- Credit -->
<make-value entity-name="AcctgTransEntry" value-field="newPartyCreditEntry"/>
<set field="newPartyCreditEntry.debitCreditFlag" value="C"/>