svn commit: r1351866 [1/48] - in /ofbiz/branches/20120329_portl
Locked
svn commit: r1351866 [1/48] - in /ofbiz/branches/20120329_portl
 
|
Author: erwan
Date: Tue Jun 19 21:36:11 2012 New Revision: 1351866 URL: http://svn.apache.org/viewvc?rev=1351866&view=rev Log: merging from 1340641 to 1346323 Added: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/SplitShip.ftl (with props) ofbiz/branches/20120329_portletWidget/applications/party/templates/email/AccountActivatedNotification.ftl - copied unchanged from r1346323, ofbiz/trunk/applications/party/templates/email/AccountActivatedNotification.ftl ofbiz/branches/20120329_portletWidget/framework/base/lib/ant-1.8.4.jar - copied unchanged from r1346323, ofbiz/trunk/framework/base/lib/ant-1.8.4.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/ant-junit-1.8.4.jar - copied unchanged from r1346323, ofbiz/trunk/framework/base/lib/ant-junit-1.8.4.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/ant-launcher-1.8.4.jar - copied unchanged from r1346323, ofbiz/trunk/framework/base/lib/ant-launcher-1.8.4.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/ant/ant-apache-bsf-1.8.4.jar - copied unchanged from r1346323, ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.8.4.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/commons/commons-compress-1.4.1.jar - copied unchanged from r1346323, ofbiz/trunk/framework/base/lib/commons/commons-compress-1.4.1.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/freemarker-2.3.19-null-wildcards.jar - copied unchanged from r1346323, ofbiz/trunk/framework/base/lib/freemarker-2.3.19-null-wildcards.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/icu4j-49_1.jar - copied unchanged from r1346323, ofbiz/trunk/framework/base/lib/icu4j-49_1.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/nekohtml-1.9.7.jar - copied unchanged from r1346323, ofbiz/trunk/framework/base/lib/nekohtml-1.9.7.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-core.jar - copied unchanged from r1346323, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-core.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-jasper.jar - copied unchanged from r1346323, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-jasper.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-logging-log4j.jar - copied unchanged from r1346323, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-logging-log4j.jar ofbiz/branches/20120329_portletWidget/framework/common/data/GeoData_CH.xml - copied unchanged from r1346323, ofbiz/trunk/framework/common/data/GeoData_CH.xml ofbiz/branches/20120329_portletWidget/framework/common/data/GeoData_IE.xml - copied unchanged from r1346323, ofbiz/trunk/framework/common/data/GeoData_IE.xml ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/data/MyPortalPageDemoData.xml - copied unchanged from r1346323, ofbiz/trunk/specialpurpose/myportal/data/MyPortalPageDemoData.xml Removed: ofbiz/branches/20120329_portletWidget/framework/base/lib/ant-1.8.3.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/ant-junit-1.8.3.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/ant-launcher-1.8.3.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/ant/ant-apache-bsf-1.8.3.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/commons/commons-compress-1.4.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/freemarker-2.3.19.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/icu4j-4_4.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/log4j-over-slf4j-1.6.4.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/nekohtml.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.catalina-ant.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.catalina.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.jasper-el.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.jasper.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-api.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-coyote.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-dbcp.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-es.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-fr.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-ja.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-jdbc.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-juli-adapters.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-juli.jar ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-util.jar ofbiz/branches/20120329_portletWidget/framework/common/data/GeoData_CHE.xml ofbiz/branches/20120329_portletWidget/framework/common/data/GeoData_IRL.xml ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/data/MyPortalTypeData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/shark/ ofbiz/branches/20120329_portletWidget/startofbiz.sh ofbiz/branches/20120329_portletWidget/stopofbiz.sh Modified: ofbiz/branches/20120329_portletWidget/ (props changed) ofbiz/branches/20120329_portletWidget/.classpath ofbiz/branches/20120329_portletWidget/.gitignore ofbiz/branches/20120329_portletWidget/LICENSE ofbiz/branches/20120329_portletWidget/OPTIONAL_LIBRARIES ofbiz/branches/20120329_portletWidget/ant.bat ofbiz/branches/20120329_portletWidget/applications/accounting/config/AccountingEntityLabels.xml ofbiz/branches/20120329_portletWidget/applications/accounting/config/AccountingUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/accounting/data/AccountingTypeData.xml ofbiz/branches/20120329_portletWidget/applications/accounting/entitydef/entitymodel.xml ofbiz/branches/20120329_portletWidget/applications/accounting/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml ofbiz/branches/20120329_portletWidget/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml ofbiz/branches/20120329_portletWidget/applications/accounting/servicedef/services_invoice.xml ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/thirdparty/eway/EwayServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/actions/admin/ListInvoiceItemTypesGlAccount.groovy ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/PrintInvoices.groovy ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlForms.xml ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlobalGlAccountsForms.xml ofbiz/branches/20120329_portletWidget/applications/commonext/config/CommonExtUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/commonext/config/SetupUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/commonext/data/helpdata/HELP_SETUP.xml ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl ofbiz/branches/20120329_portletWidget/applications/commonext/widget/ofbizsetup/ProfileScreens.xml ofbiz/branches/20120329_portletWidget/applications/commonext/widget/ofbizsetup/SetupScreens.xml ofbiz/branches/20120329_portletWidget/applications/content/config/ContentEntityLabels.xml ofbiz/branches/20120329_portletWidget/applications/content/config/ContentUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementServices.java ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementWorker.java ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentWorker.java ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/search/ContentDocument.java ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java ofbiz/branches/20120329_portletWidget/applications/content/template/survey/genericsurvey.ftl ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/content/nav.ftl ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/EditSurveyQuestions.ftl ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/ViewSurveyResponses.ftl ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/website/WebSiteCMSContent.ftl ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/website/WebSiteCMSNav.ftl ofbiz/branches/20120329_portletWidget/applications/content/widget/cms/CMSForms.xml ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml ofbiz/branches/20120329_portletWidget/applications/content/widget/datasetup/DataSetupForms.xml ofbiz/branches/20120329_portletWidget/applications/humanres/config/HumanResEntityLabels.xml ofbiz/branches/20120329_portletWidget/applications/humanres/config/HumanResUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/humanres/findEmployee.ftl ofbiz/branches/20120329_portletWidget/applications/humanres/widget/forms/EmplPositionForms.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/config/ManufacturingEntityLabels.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/config/ManufacturingUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditCalendarWeek.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditProductBom.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditProductManufacturingRules.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRouting.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingProductLink.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTask.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskAssoc.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskCost.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskFixedAsset.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskProduct.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_FindInventoryEventPlan.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_ListRoutingTaskProducts.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_ManufacturingReports.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_RunMRP.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/bom/EditProductBom.groovy ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl ofbiz/branches/20120329_portletWidget/applications/marketing/config/MarketingEntityLabels.xml ofbiz/branches/20120329_portletWidget/applications/marketing/config/MarketingUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/marketing/WEB-INF/actions/contact/GetContactListMarketingEmail.groovy ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/sfa/WEB-INF/action/CloneLead.groovy ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/sfa/WEB-INF/action/MergeContacts.groovy ofbiz/branches/20120329_portletWidget/applications/marketing/widget/MarketingCampaignForms.xml ofbiz/branches/20120329_portletWidget/applications/order/config/OrderEntityLabels.xml ofbiz/branches/20120329_portletWidget/applications/order/config/OrderErrorUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/order/config/OrderUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/order/OrderEvents.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/order/OrderListState.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AdditionalPartyListing.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/BillSettings.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutReview.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutShippingAddress.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/StorePaymentOptions.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CompareProducts.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/FilterOrderList.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderViewWebSecure.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/quote/GetPartyAddress.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/request/GetNextSequenceNum.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/addrsettings.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/billsettings.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/orderitems.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/orderterms.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/shipsettings.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/OrderListByDate.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/OrderSalesReps.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/editorderitems.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/findOrders.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderinfo.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderitems.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderlist.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderterms.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/quote/quoteRoles.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/request/requestContactMech.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/return/quickReturn.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/return/returnHeader.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/return/returnItemInc.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/return/returnItems.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/return/returnList.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/task/ordertasklist.ftl ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/ReportForms.xml ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/RequirementForms.xml ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/ReturnForms.xml ofbiz/branches/20120329_portletWidget/applications/party/config/PartyEntityLabels.xml ofbiz/branches/20120329_portletWidget/applications/party/config/PartyUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/party/data/PartyTypeData.xml ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/party/script/org/ofbiz/party/party/PartyServices.xml ofbiz/branches/20120329_portletWidget/applications/party/servicedef/services.xml ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/contact/ContactHelper.java ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommunicationEventForms.xml ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/EmailPartyScreens.xml ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyClassificationForms.xml ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyScreens.xml ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml ofbiz/branches/20120329_portletWidget/applications/product/config/ProductErrorUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/product/config/ProductUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/product/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/category/CategoryServices.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/category/CategoryWorker.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/imagemanagement/ImageUrlServlet.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/price/PriceServices.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/product/KeywordIndex.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/product/ProductEvents.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/product/ProductSearch.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/product/ProductServices.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/product/ProductWorker.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/promo/PromoServices.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoCode.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/category/EditCategoryParties.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/category/EditCategoryProducts.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/category/EditCategoryRollup.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/find/FindProductById.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/find/miniproductlist.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/find/sidecatalogs.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/price/EditProductPriceRules.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/product/EditProductAssoc.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/product/EditProductFeatures.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/product/EditProductParties.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/product/ViewProductOrders.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/reviews/pendingReviews.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacilityLocation.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/inventory/PhysicalInventoryVariance.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/returns/ReceiveReturn.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/EditContactMech.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/EditFacilityLocation.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/FindFacilityLocation.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PickMoveStock.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/Picklist.fo.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PicklistManage.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PicklistOptions.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/ViewContactMechs.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/inventory/receiveInventory.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/returns/receiveReturn.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/PackOrder.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/QuickShipOrder.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/shipment/VerifyPick.ftl ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CategoryForms.xml ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/PriceForms.xml ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ProductStoreForms.xml ofbiz/branches/20120329_portletWidget/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java ofbiz/branches/20120329_portletWidget/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java ofbiz/branches/20120329_portletWidget/applications/workeffort/config/WorkEffortEntityLabels.xml ofbiz/branches/20120329_portletWidget/applications/workeffort/config/WorkEffortUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/workeffort/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java ofbiz/branches/20120329_portletWidget/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java ofbiz/branches/20120329_portletWidget/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java ofbiz/branches/20120329_portletWidget/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java ofbiz/branches/20120329_portletWidget/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java ofbiz/branches/20120329_portletWidget/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl ofbiz/branches/20120329_portletWidget/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl ofbiz/branches/20120329_portletWidget/build.xml ofbiz/branches/20120329_portletWidget/common.xml ofbiz/branches/20120329_portletWidget/debian/move-files.pl ofbiz/branches/20120329_portletWidget/framework/base/config/both-containers.xml ofbiz/branches/20120329_portletWidget/framework/base/config/log4j.xml ofbiz/branches/20120329_portletWidget/framework/base/config/ofbiz-containers.xml ofbiz/branches/20120329_portletWidget/framework/base/config/rmi-containers.xml ofbiz/branches/20120329_portletWidget/framework/base/config/test-containers.xml ofbiz/branches/20120329_portletWidget/framework/base/lib/ (props changed) ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/config/ResourceLoader.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/BshUtil.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/CompilerMatcher.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/GroovyUtil.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/JNDIContextFactory.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/ScriptUtil.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/UtilProperties.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/cache/test/UtilCacheTests.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/template/XslTransform.java ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/birt/src/org/ofbiz/birt/BirtWorker.java ofbiz/branches/20120329_portletWidget/framework/common/config/CommonEntityLabels.xml ofbiz/branches/20120329_portletWidget/framework/common/config/CommonErrorUiLabels.xml ofbiz/branches/20120329_portletWidget/framework/common/config/CommonHelpUiLabels.xml ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml ofbiz/branches/20120329_portletWidget/framework/common/config/CommonUiLabels.xml ofbiz/branches/20120329_portletWidget/framework/common/config/PrefErrorUiLabels.xml ofbiz/branches/20120329_portletWidget/framework/common/data/GeoData.xml ofbiz/branches/20120329_portletWidget/framework/common/data/GeoData_UK.xml ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/CommonEvents.java ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/geo/GeoWorker.java ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/states.ftl ofbiz/branches/20120329_portletWidget/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml ofbiz/branches/20120329_portletWidget/framework/datafile/src/org/ofbiz/datafile/ModelDataFileReader.java ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml ofbiz/branches/20120329_portletWidget/framework/entity/dtd/entity-config.xsd ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/Delegator.java ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/GenericDelegator.java ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/GenericValue.java ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/jdbc/ConnectionFactory.java ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/model/ModelFieldTypeReader.java ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/model/ModelGroupReader.java ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/model/ModelReader.java ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/util/EntityTypeUtil.java ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java ofbiz/branches/20120329_portletWidget/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java ofbiz/branches/20120329_portletWidget/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java ofbiz/branches/20120329_portletWidget/framework/minilang/config/minilang.properties ofbiz/branches/20120329_portletWidget/framework/minilang/dtd/simple-methods-v2.xsd ofbiz/branches/20120329_portletWidget/framework/minilang/src/META-INF/services/org.ofbiz.minilang.method.MethodOperation$Factory ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/MiniLangElement.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/SimpleMapProcessor.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/MethodOperation.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/SequencedIdToEnv.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/Now.java ofbiz/branches/20120329_portletWidget/framework/resources/templates/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/security/data/PasswordSecurityData.xml (props changed) ofbiz/branches/20120329_portletWidget/framework/security/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessFactory.java ofbiz/branches/20120329_portletWidget/framework/security/src/org/ofbiz/security/authz/da/ObjectDaHandler.java ofbiz/branches/20120329_portletWidget/framework/service/config/serviceengine.xml ofbiz/branches/20120329_portletWidget/framework/service/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/DispatchContext.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/ServiceDispatcher.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/ServiceUtil.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/engine/BSFEngine.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/job/JobManager.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java ofbiz/branches/20120329_portletWidget/framework/testtools/data/helpdata/HELP_WEBTOOLS_selenium.xml ofbiz/branches/20120329_portletWidget/framework/webapp/config/url.properties ofbiz/branches/20120329_portletWidget/framework/webapp/dtd/site-conf.xsd ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/region/RegionManager.java ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java ofbiz/branches/20120329_portletWidget/framework/webtools/config/WebtoolsUiLabels.xml ofbiz/branches/20120329_portletWidget/framework/webtools/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java ofbiz/branches/20120329_portletWidget/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/controller.xml ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl ofbiz/branches/20120329_portletWidget/framework/webtools/widget/GeoManagementForms.xml ofbiz/branches/20120329_portletWidget/framework/webtools/widget/StatsForms.xml ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java ofbiz/branches/20120329_portletWidget/ivy.xml ofbiz/branches/20120329_portletWidget/macros.xml ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/config/IsMgrUiLabels.xml ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/build.xml ofbiz/branches/20120329_portletWidget/specialpurpose/component-load.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/config/EcommerceUiLabels.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoProduct.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/returnaccept.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/genericresult.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/miniresult.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/minisurvey.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/OnePageCheckoutOptions.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutShippingOptions.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderHistory.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/SerializedInventorySummary.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/SubscriptionSummary.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewreviews.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ContentForms.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ForumForms.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogForms.xml ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/FormWidgetExampleForms.xml ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/data/GoogleBaseTypeData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/data/GoogleCheckoutTypeData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/config/MyPortalUiLabels.xml ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogOptions.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/widget/scrumForms.xml ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/CustomerAddress.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivitySubFlowImplementation.java ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.bat (props changed) ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.sh (props changed) Propchange: ofbiz/branches/20120329_portletWidget/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1340642-1346323 Modified: ofbiz/branches/20120329_portletWidget/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/.classpath?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/.classpath (original) +++ ofbiz/branches/20120329_portletWidget/.classpath Tue Jun 19 21:36:11 2012 @@ -15,11 +15,10 @@ <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.0.jar"/> <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/> <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant-1.8.3.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant-junit-1.8.3.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant-launcher-1.8.3.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant-trax-1.8.0.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant/ant-apache-bsf-1.8.3.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant-1.8.4.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant-junit-1.8.4.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant-launcher-1.8.4.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-apache-bsf-1.8.4.jar"/> <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.8.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/> @@ -29,14 +28,14 @@ <classpathentry kind="lib" path="framework/base/lib/clhm-release-1.0-lru.jar"/> <classpathentry kind="lib" path="framework/base/lib/hamcrest-all-1.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/fop-1.0.jar"/> - <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.19.jar"/> + <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.19-null-wildcards.jar"/> <classpathentry kind="lib" path="framework/base/lib/httpclient-4.1.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/httpclient-cache-4.1.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/httpcore-4.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/httpmime-4.1.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/httpunit-1.7.jar"/> <classpathentry kind="lib" path="framework/base/lib/ical4j-1.0-rc2.jar"/> - <classpathentry kind="lib" path="framework/base/lib/icu4j-4_4.jar"/> + <classpathentry kind="lib" path="framework/base/lib/icu4j-49_1.jar"/> <classpathentry kind="lib" path="framework/base/lib/ivy-2.2.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/javolution-5.4.3.jar"/> <classpathentry kind="lib" path="framework/base/lib/jcip-annotations-1.0.jar"/> @@ -50,7 +49,7 @@ <classpathentry kind="lib" path="framework/base/lib/mail-1.4.jar"/> <classpathentry kind="lib" path="framework/base/lib/mx4j-3.0.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/mx4j-remote-3.0.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/nekohtml.jar"/> + <classpathentry kind="lib" path="framework/base/lib/nekohtml-1.9.7.jar"/> <classpathentry kind="lib" path="framework/base/lib/owasp-esapi-full-java-1.4.jar"/> <classpathentry kind="lib" path="framework/base/lib/resolver-2.9.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/serializer-2.9.1.jar"/> @@ -72,7 +71,7 @@ <classpathentry kind="lib" path="framework/base/lib/commons/commons-cli-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-codec-1.4.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-collections-3.2.jar"/> - <classpathentry kind="lib" path="framework/base/lib/commons/commons-compress-1.4.jar"/> + <classpathentry kind="lib" path="framework/base/lib/commons/commons-compress-1.4.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-digester-1.8.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-discovery-0.4.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-el-1.0.jar"/> @@ -113,18 +112,11 @@ <classpathentry kind="lib" path="framework/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/> <classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/> <classpathentry kind="lib" path="framework/catalina/lib/ecj-3.7.2.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-juli-adapters.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-juli.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.catalina-ant.jar"/> <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.catalina-ha.jar"/> <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.catalina-tribes.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.catalina.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.jasper-el.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.jasper.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-coyote.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-dbcp.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-api.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-util.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-embed-core.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-embed-jasper.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-embed-logging-log4j.jar"/> <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/> <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/> @@ -220,7 +212,6 @@ <classpathentry kind="src" path="specialpurpose/oagis/src"/> <classpathentry kind="src" path="specialpurpose/pos/src"/> <classpathentry kind="src" path="specialpurpose/projectmgr/src"/> - <classpathentry excluding="org/enhydra/|org/ofbiz/" kind="src" path="specialpurpose/shark/src"/> <classpathentry kind="src" path="specialpurpose/webpos/src"/> <classpathentry kind="src" path="specialpurpose/workflow/src"/> <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/> Modified: ofbiz/branches/20120329_portletWidget/.gitignore URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/.gitignore?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/.gitignore (original) +++ ofbiz/branches/20120329_portletWidget/.gitignore Tue Jun 19 21:36:11 2012 @@ -1,6 +1,8 @@ applications/*/build framework/*/build framework/base/lib/cobertura-*.jar +framework/base/lib/asm*.jar +framework/base/lib/oro*.jar framework/entity/lib/jdbc/postgresql-*.jar hot-deploy/*/build specialpurpose/*/build @@ -48,3 +50,5 @@ debian/orig-work *.iml *~ *# +.*.swp +.*.swo |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |