From b9c3ddef089929fce178a49fa12434ee2adbdb48 Mon Sep 17 00:00:00 2001 From: Jacques Le Roux Date: Wed, 8 Apr 2009 10:54:51 +0000 Subject: [PATCH] 2d part and end of an effort to remove trailing spaces [ \t]+$ => "" (empty) Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg) Of course this effort to remove trailing spaces has no functional implications. Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135 In the meantime I did some refactoring also in *.java and *.groovy files : ){ => ) { if( => if ( while( => while ( }else => } else else{ => else { switch( => switch ( try{ => try { }catch => } catch catch( => catch ( }finally{ => } finally { So these changes are also in this commit, should not be a problem anyway. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68 --- APACHE2_HEADER | 12 +- LICENSE | 540 ++--- NOTICE | 84 +- OPTIONAL_LIBRARIES | 30 +- README | 26 +- ant | 4 +- ant.bat | 4 +- .../config/AccountingConfig.properties | 6 +- .../accounting/config/arithmetic.properties | 6 +- .../accounting/config/payment.properties | 6 +- .../accounting/config/paymentTest.properties | 6 +- .../accounting/data/AccountingPortletData.xml | 16 +- .../data/AccountingSecurityData.xml | 12 +- .../accounting/data/AccountingTypeData.xml | 104 +- .../data/DemoGeneralChartOfAccounts.xml | 1886 ++++++++--------- .../accounting/data/DemoGlSetupData.xml | 16 +- .../accounting/data/DemoOrganizationData.xml | 18 +- .../data/InvoiceScheduledServiceData.xml | 2 +- .../accounting/data/PaymentsInvoices.xml | 2 +- applications/accounting/entitydef/eecas.xml | 8 +- .../accounting/entitydef/entitygroup_olap.xml | 2 +- .../accounting/entitydef/entitymodel.xml | 88 +- .../accounting/entitydef/entitymodel_olap.xml | 8 +- applications/accounting/ofbiz-component.xml | 6 +- .../accounting/admin/AcctgAdminServices.xml | 32 +- .../agreement/AgreementServices.xml | 20 +- .../ofbiz/accounting/cost/CostServices.xml | 4 +- .../finaccount/FinAccountGlPostServices.xml | 40 +- .../finaccount/FinAccountServices.xml | 70 +- .../fixedasset/FixedAssetServices.xml | 70 +- .../accounting/invoice/InvoiceEvents.xml | 6 +- .../accounting/invoice/InvoiceServices.xml | 4 +- .../invoice/SampleCommissionServices.xml | 10 +- .../accounting/ledger/AcctgTransServices.xml | 64 +- .../ofbiz/accounting/olap/FactServices.xml | 4 +- .../accounting/payment/BillingServices.xml | 32 +- .../accounting/payment/PaymentMapProcs.xml | 4 +- .../payment/PaymentMethodEvents.xml | 4 +- .../payment/PaymentMethodServices.xml | 18 +- .../accounting/payment/PaymentServices.xml | 42 +- .../accounting/period/PeriodServices.xml | 10 +- .../permissions/PermissionServices.xml | 4 +- .../ofbiz/accounting/rate/RateServices.xml | 52 +- .../accounting/tax/TaxAuthorityServices.xml | 86 +- .../accounting/test/AutoAcctgTransTests.xml | 90 +- applications/accounting/servicedef/groups.xml | 6 +- applications/accounting/servicedef/secas.xml | 20 +- .../accounting/servicedef/secas_ledger.xml | 24 +- .../accounting/servicedef/secas_olap.xml | 2 +- .../accounting/servicedef/secas_payment.xml | 6 +- .../accounting/servicedef/services_admin.xml | 8 +- .../servicedef/services_agreement.xml | 18 +- .../servicedef/services_authorizedotnet.xml | 2 +- .../servicedef/services_billing.xml | 2 +- .../servicedef/services_clearcommerce.xml | 12 +- .../accounting/servicedef/services_cost.xml | 22 +- .../servicedef/services_cybersource.xml | 2 +- .../servicedef/services_finaccount.xml | 18 +- .../servicedef/services_fixedasset.xml | 22 +- .../servicedef/services_invoice.xml | 20 +- .../accounting/servicedef/services_ledger.xml | 66 +- .../servicedef/services_payment.xml | 20 +- .../servicedef/services_paymentmethod.xml | 4 +- .../servicedef/services_pccharge.xml | 2 +- .../accounting/servicedef/services_rate.xml | 4 +- .../accounting/servicedef/services_rita.xml | 2 +- .../accounting/servicedef/services_tax.xml | 18 +- .../servicedef/services_valuelink.xml | 2 +- .../accounting/invoice/InvoiceServices.java | 4 +- .../payment/PaymentGatewayServices.java | 2 +- .../authorizedotnet/AIMPaymentServices.java | 4 +- .../thirdparty/verisign/PayflowPro.java | 24 +- .../thirdparty/worldpay/WorldPayEvents.java | 2 +- .../accounting/testdef/accountingtests.xml | 4 +- .../actions/admin/FilterOutReceipts.groovy | 4 +- .../ListInvoiceItemTypesGlAccount.groovy | 6 +- .../TaxAuthorityGlAccounts.groovy | 4 +- .../fixedasset/FixedAssetGeoLocation.groovy | 9 +- .../actions/fixedasset/ViewCalendar.groovy | 6 +- .../invoice/CreateApplicationList.groovy | 4 +- .../actions/invoice/EditInvoice.groovy | 40 +- .../invoice/GetInvoiceItemTypes.groovy | 8 +- .../invoice/ListNotAppliedPayments.groovy | 6 +- .../invoice/OrderListInvoiceItem.groovy | 8 +- .../actions/order/BillingAccountOrders.groovy | 18 +- .../payment/ListNotAppliedInvoices.groovy | 8 +- .../payment/ListNotAppliedPayments.groovy | 18 +- .../WEB-INF/actions/payment/ManualTx.groovy | 4 +- .../actions/payment/PrintChecks.groovy | 4 +- .../period/EditCustomTimePeriod.groovy | 4 +- ...alesInvoiceByProductCategorySummary.groovy | 17 +- .../actions/reports/TransactionTotals.groovy | 4 +- .../transaction/AuthorizeTransaction.groovy | 12 +- .../transaction/CaptureTransaction.groovy | 6 +- .../transaction/ViewGatewayResponse.groovy | 6 +- .../webapp/accounting/WEB-INF/controller.xml | 364 ++-- .../webapp/accounting/WEB-INF/web.xml | 12 +- .../accounting/agreement/AgreementForms.xml | 26 +- .../webapp/accounting/error/error.jsp | 6 +- .../fixedasset/FixedAssetGeoLocation.ftl | 24 +- .../accounting/invoice/InvoiceForms.xml | 2 +- .../invoice/invoiceReportContactMechs.fo.ftl | 2 +- .../invoice/invoiceReportItems.fo.ftl | 24 +- .../accounting/lookup/FieldLookupForms.xml | 42 +- .../accounting/webapp/accounting/main.ftl | 18 +- .../accounting/payment/PrintChecks.fo.ftl | 36 +- .../period/EditCustomTimePeriod.ftl | 2 +- .../SalesInvoiceByProductCategorySummary.ftl | 4 +- .../webapp/ap/WEB-INF/controller.xml | 8 +- .../accounting/webapp/ap/WEB-INF/web.xml | 8 +- .../webapp/ar/WEB-INF/controller.xml | 6 +- .../accounting/webapp/ar/WEB-INF/web.xml | 10 +- applications/accounting/webapp/ar/main.ftl | 6 +- .../widget/AccountingPrintScreens.xml | 6 +- .../accounting/widget/AccountingTrees.xml | 4 +- .../accounting/widget/AgreementScreens.xml | 94 +- .../widget/BillingAccountScreens.xml | 34 +- .../accounting/widget/CommonScreens.xml | 18 +- applications/accounting/widget/CostForms.xml | 8 +- .../accounting/widget/CostScreens.xml | 4 +- .../accounting/widget/FinAccountScreens.xml | 16 +- .../accounting/widget/FixedAssetScreens.xml | 40 +- applications/accounting/widget/GlScreens.xml | 34 +- .../accounting/widget/GlSetupScreens.xml | 54 +- .../widget/GlobalGlAccountsScreens.xml | 78 +- .../widget/InvoiceItemTypeForms.xml | 4 +- .../widget/InvoiceItemTypeScreens.xml | 12 +- .../accounting/widget/InvoiceScreens.xml | 50 +- .../accounting/widget/LookupScreens.xml | 8 +- applications/accounting/widget/Menus.xml | 54 +- .../widget/PaymentMethodTypeForms.xml | 14 +- .../widget/PaymentMethodTypeScreens.xml | 10 +- .../accounting/widget/PaymentScreens.xml | 36 +- .../accounting/widget/PeriodScreens.xml | 2 +- .../widget/ReportFinancialSummaryForms.xml | 12 +- .../widget/ReportFinancialSummaryScreens.xml | 52 +- .../accounting/widget/TaxAuthorityMenus.xml | 2 +- .../accounting/widget/TransactionScreens.xml | 28 +- .../accounting/widget/ap/CommonScreens.xml | 24 +- .../accounting/widget/ap/InvoiceScreens.xml | 2 +- .../widget/ap/forms/InvoiceForms.xml | 4 +- .../widget/ap/forms/VendorForms.xml | 6 +- .../accounting/widget/ar/CommonScreens.xml | 6 +- .../accounting/widget/ar/InvoiceScreens.xml | 4 +- .../widget/ar/forms/InvoiceForms.xml | 6 +- applications/build.xml | 2 +- .../commonext/data/EntityDiagramGroupData.xml | 36 +- .../commonext/script/changeOrgPartyId.groovy | 4 +- .../commonext/widget/CommonScreens.xml | 2 +- applications/component-load.xml | 2 +- .../content/config/content.properties | 4 +- .../config/freemarkerTransforms.properties | 4 +- .../content/config/openoffice-uno.properties | 6 +- applications/content/config/search.properties | 4 +- applications/content/data/CompDocData.xml | 16 +- .../content/data/ContentOperationData.xml | 2 +- .../content/data/ContentSecurityData.xml | 2 +- applications/content/data/ContentTypeData.xml | 16 +- .../content/data/DemoBlogEntryData.xml | 6 +- .../content/data/DemoBlogPubPtData.xml | 74 +- .../content/data/DemoBlogUsersData.xml | 38 +- applications/content/data/ForumDemoData.xml | 14 +- applications/content/data/MimeTypeData.xml | 8 +- .../content/data/MimeTypeTemplate.xml | 2 +- applications/content/data/MiscData.xml | 2 +- applications/content/data/SeedBlogData.xml | 14 +- applications/content/data/TemplateData.xml | 4 +- .../content/entitydef/entitymodel.xml | 16 +- applications/content/index/indexhere.txt | 4 +- applications/content/ofbiz-component.xml | 4 +- .../ContentManagementMapProcessors.xml | 2 +- .../org/ofbiz/content/blog/BlogServices.xml | 32 +- .../ofbiz/content/compdoc/CompDocServices.xml | 2 +- .../ofbiz/content/content/ContentServices.xml | 150 +- .../org/ofbiz/content/data/DataServices.xml | 62 +- .../permission/ContentPermissionServices.xml | 28 +- .../DataResourcePermissionServices.xml | 6 +- .../ofbiz/content/survey/SurveyServices.xml | 30 +- .../ofbiz/content/website/WebSiteServices.xml | 16 +- applications/content/servicedef/mca.xml | 4 +- applications/content/servicedef/secas.xml | 8 +- .../content/servicedef/services_commevent.xml | 10 +- .../servicedef/services_contenttypes.xml | 2 +- .../content/servicedef/services_data.xml | 2 +- .../content/servicedef/services_output.xml | 2 +- .../content/servicedef/services_website.xml | 2 +- .../ofbiz/content/layout/LayoutWorker.java | 2 +- .../template/email/servicenotification.ftl | 2 +- .../content/template/survey/genericsurvey.ftl | 22 +- .../actions/cms/AdvancedSearchPrep.groovy | 4 +- .../WEB-INF/actions/cms/CmsEditAddPrep.groovy | 6 +- .../WEB-INF/actions/cms/FeaturePrep.groovy | 4 +- .../WEB-INF/actions/cms/MostRecentPrep.groovy | 6 +- .../content/WEB-INF/actions/cms/Search.groovy | 26 +- .../WEB-INF/actions/cms/UserPermPrep.groovy | 6 +- .../WEB-INF/actions/content/PrepSeqNo.groovy | 6 +- .../actions/contentsetup/UserPermPrep.groovy | 6 +- .../actions/datasetup/DataCategoryPrep.groovy | 4 +- .../actions/layout/EditSubContent.groovy | 4 +- .../WEB-INF/actions/print/FindPrinters.groovy | 4 +- .../actions/survey/EditSurveyQuestions.groovy | 4 +- .../actions/survey/EditSurveyResponse.groovy | 4 +- .../actions/survey/ViewSurveyResponses.groovy | 4 +- .../actions/website/EditWebSiteParties.groovy | 4 +- .../webapp/content/WEB-INF/controller.xml | 80 +- .../content/webapp/content/WEB-INF/web.xml | 10 +- .../webapp/content/content/ContentNav.ftl | 42 +- .../content/content/EditContentTree.ftl | 2 +- .../content/webapp/content/content/nav.ftl | 10 +- .../contentsetup/ContentSetupForms.xml | 12 +- .../contentsetup/ContentSetupMenus.xml | 4 +- .../datasetup/DataResourceSetupMenus.xml | 2 +- .../content/datasetup/DataSetupForms.xml | 20 +- .../content/webapp/content/error/error.jsp | 6 +- .../content/webapp/content/fonts.fo.ftl | 4 +- .../webapp/content/images/contentForum.css | 56 +- .../webapp/content/images/notextfound.html | 192 +- .../content/webapp/content/images/wrap.css | 4 +- .../webapp/content/layout/LayoutMenus.xml | 2 +- .../webapp/content/lookup/LookupForms.xml | 8 +- .../content/survey/EditSurveyQuestions.ftl | 20 +- .../webapp/content/survey/SurveyForms.xml | 62 +- .../content/survey/ViewSurveyResponses.ftl | 2 +- .../content/website/WebSiteCMSContent.ftl | 20 +- .../webapp/content/website/WebSiteCMSMeta.ftl | 4 +- .../webapp/content/website/WebSiteCMSNav.ftl | 30 +- .../webapp/content/website/WebSiteForms.xml | 24 +- .../content/widget/GetMenuContext.groovy | 4 +- applications/content/widget/LookupScreens.xml | 2 +- applications/content/widget/SurveyScreens.xml | 48 +- .../content/widget/WebSiteScreens.xml | 38 +- .../content/widget/cms/CMSScreens.xml | 42 +- .../content/widget/cms/CMSTemplates.xml | 12 +- .../content/widget/compdoc/CompDocMenus.xml | 18 +- .../widget/compdoc/CompDocTemplateTree.xml | 28 +- .../content/widget/content/ContentMenus.xml | 20 +- .../content/widget/content/ContentScreens.xml | 46 +- .../widget/content/DataResourceForms.xml | 14 +- .../widget/content/DataResourceScreens.xml | 40 +- .../contentsetup/ContentSetupScreens.xml | 18 +- .../datasetup/DataResourceSetupScreens.xml | 4 +- .../content/widget/forum/BlogForms.xml | 12 +- .../content/widget/forum/BlogScreens.xml | 12 +- .../content/widget/forum/ForumScreens.xml | 12 +- .../content/widget/forum/ForumTrees.xml | 6 +- .../content/widget/layout/LayoutScreens.xml | 24 +- applications/humanres/build.xml | 2 +- .../humanres/data/HumanResDemoData.xml | 2 +- .../humanres/data/HumanResSecurityData.xml | 2 +- .../humanres/data/HumanResTypeData.xml | 32 +- .../humanres/entitydef/entitymodel.xml | 6 +- .../humanres/entitydef/entitymodel_old.xml | 2 +- applications/humanres/ofbiz-component.xml | 4 +- .../org/ofbiz/humanres/HumanResServices.xml | 310 +-- .../permission/HumanResPermissionServices.xml | 2 +- applications/humanres/servicedef/services.xml | 192 +- .../webapp/humanres/WEB-INF/controller.xml | 184 +- .../humanres/webapp/humanres/WEB-INF/web.xml | 12 +- .../humanres/webapp/humanres/error/error.jsp | 6 +- .../webapp/humanres/humanres/findEmployee.ftl | 10 +- .../humanres/widget/CommonScreens.xml | 42 +- .../humanres/widget/EmplLeaveScreens.xml | 6 +- .../humanres/widget/EmplPositionScreens.xml | 38 +- .../humanres/widget/EmployeeScreens.xml | 40 +- .../humanres/widget/EmploymentAppScreens.xml | 14 +- .../humanres/widget/EmploymentScreens.xml | 44 +- .../widget/GlobalHRSettingScreens.xml | 44 +- .../humanres/widget/LookupScreens.xml | 10 +- applications/humanres/widget/Menus.xml | 26 +- .../humanres/widget/PartyAbilityScreens.xml | 6 +- .../humanres/widget/PartyQualScreens.xml | 12 +- .../humanres/widget/PartyResumeScreens.xml | 12 +- .../humanres/widget/PartySkillScreens.xml | 22 +- applications/humanres/widget/PartyTrees.xml | 8 +- .../humanres/widget/PayGradeScreens.xml | 10 +- .../humanres/widget/PerfReviewScreens.xml | 16 +- .../humanres/widget/PersonTrainingScreens.xml | 10 +- .../humanres/widget/forms/EmplLeaveForms.xml | 10 +- .../widget/forms/EmplPositionForms.xml | 58 +- .../humanres/widget/forms/EmployeeForms.xml | 26 +- .../widget/forms/EmploymentAppForms.xml | 8 +- .../humanres/widget/forms/EmploymentForms.xml | 104 +- .../widget/forms/GlobalHRSettingForms.xml | 34 +- .../humanres/widget/forms/LookupForms.xml | 92 +- .../widget/forms/PartyAbilityForms.xml | 2 +- .../humanres/widget/forms/PartyQualForms.xml | 6 +- .../widget/forms/PartyResumeForms.xml | 6 +- .../humanres/widget/forms/PayGradeForms.xml | 14 +- .../humanres/widget/forms/PerfReviewForms.xml | 14 +- .../manufacturing/data/ManufacturingData.xml | 4 +- .../data/ManufacturingExampleData.xml | 10 +- .../data/ManufacturingScheduledServices.xml | 2 +- .../manufacturing/entitydef/entitymodel.xml | 2 +- .../ofbiz/manufacturing/bom/BomFormulas.xml | 6 +- .../ofbiz/manufacturing/bom/BomMapProcs.xml | 2 +- .../manufacturing/bom/BomSimpleMethods.xml | 16 +- .../jobshopmgt/ProductionRunServices.xml | 22 +- .../jobshopmgt/ProductionRunSimpleEvents.xml | 2 +- .../manufacturing/routing/RoutingServices.xml | 8 +- .../techdata/RoutingMapProcs.xml | 5 +- .../techdata/RoutingSimpleEvents.xml | 12 +- .../techdata/RoutingSimpleServices.xml | 4 +- .../manufacturing/techdata/TaskFormulae.xml | 4 +- .../manufacturing/servicedef/secas.xml | 2 +- .../manufacturing/servicedef/services.xml | 2 +- .../manufacturing/servicedef/services_bom.xml | 2 +- .../servicedef/services_calendar.xml | 4 +- .../servicedef/services_formula.xml | 2 +- .../manufacturing/servicedef/services_mrp.xml | 2 +- .../servicedef/services_production_run.xml | 4 +- .../servicedef/services_routing.xml | 4 +- .../ofbiz/manufacturing/bom/BOMServices.java | 2 +- .../techdata/TechDataServices.java | 8 +- .../WEB-INF/actions/bom/BomSimulation.groovy | 6 +- .../WEB-INF/actions/bom/EditProductBom.groovy | 8 +- .../WEB-INF/actions/bom/FindProductBom.groovy | 16 +- .../ProductionRunActualComponents.groovy | 6 +- .../jobshopmgt/ProductionRunComponents.groovy | 4 +- .../jobshopmgt/ProductionRunCosts.groovy | 4 +- .../ProductionRunDeclaration.groovy | 14 +- .../ProductionRunFixedAssets.groovy | 4 +- .../jobshopmgt/ProductionRunTasks.groovy | 6 +- .../jobshopmgt/ViewProductionRun.groovy | 10 +- .../jobshopmgt/WorkWithShipmentPlans.groovy | 10 +- .../productionRunAllFixedAssets.groovy | 6 +- .../actions/mrp/FindInventoryEventPlan.groovy | 24 +- .../reports/PRunsComponentsByFeature.groovy | 6 +- .../actions/reports/PRunsInfoAndOrder.groovy | 4 +- .../reports/PRunsProductsAndOrder.groovy | 4 +- .../reports/PRunsProductsByFeature.groovy | 4 +- .../reports/PRunsProductsStacks.groovy | 4 +- .../reports/PackageContentsAndOrder.groovy | 4 +- .../actions/reports/ShipmentLabel.groovy | 18 +- .../reports/ShipmentPlanStockReport.groovy | 12 +- .../reports/ShipmentWorkEffortTasks.groovy | 8 +- .../actions/routing/EditCalendar.groovy | 6 +- .../routing/EditCalendarExceptionDay.groovy | 6 +- .../routing/EditCalendarExceptionWeek.groovy | 6 +- .../manufacturing/WEB-INF/controller.xml | 38 +- .../webapp/manufacturing/WEB-INF/web.xml | 10 +- .../webapp/manufacturing/bom/BomForms.xml | 8 +- .../manufacturing/bom/BomSimulation.ftl | 4 +- .../manufacturing/bom/EditProductBom.ftl | 4 +- .../webapp/manufacturing/error/error.jsp | 6 +- .../jobshopmgt/CuttingListReport.fo.ftl | 2 +- .../jobshopmgt/ProductionRun.fo.ftl | 10 +- .../jobshopmgt/ProductionRunTasksInfo.ftl | 2 +- .../jobshopmgt/ShowProductionRun.groovy | 6 +- .../jobshopmgt/WorkWithShipmentPlans.ftl | 8 +- .../manufacturing/lookup/FieldLookupForms.xml | 8 +- .../webapp/manufacturing/mrp/MrpForms.xml | 4 +- .../mrp/findInventoryEventPlan.ftl | 16 +- .../reports/PRunsComponentsByFeature.fo.ftl | 18 +- .../reports/PRunsInfoAndOrder.fo.ftl | 8 +- .../reports/PRunsProductsAndOrder.fo.ftl | 20 +- .../reports/PRunsProductsByFeature.fo.ftl | 6 +- .../reports/PRunsProductsStacks.fo.ftl | 26 +- .../reports/PackageContentsAndOrder.fo.ftl | 28 +- .../reports/ShipmentLabel.fo.ftl | 94 +- .../reports/ShipmentPlanStockReport.fo.ftl | 76 +- .../reports/ShipmentWorkEffortTasks.fo.ftl | 84 +- .../manufacturing/routing/CalendarForms.xml | 18 +- .../manufacturing/routing/EditCalendar.ftl | 10 +- .../routing/EditCalendarExceptionDay.ftl | 10 +- .../routing/EditCalendarExceptionWeek.ftl | 12 +- .../widget/manufacturing/BomScreens.xml | 8 +- .../widget/manufacturing/CalendarScreens.xml | 12 +- .../widget/manufacturing/CommonScreens.xml | 6 +- .../widget/manufacturing/CostForms.xml | 2 +- .../widget/manufacturing/CostScreens.xml | 2 +- .../manufacturing/CuttingListReport.groovy | 10 +- .../widget/manufacturing/LookupScreens.xml | 2 +- .../widget/manufacturing/Menus.xml | 66 +- .../widget/manufacturing/MrpScreens.xml | 2 +- .../widget/manufacturing/ReportScreens.xml | 22 +- .../widget/manufacturing/RoutingScreens.xml | 32 +- applications/marketing/build.xml | 2 +- applications/marketing/config/sfa.properties | 4 +- .../marketing/data/MarketingTypeData.xml | 12 +- applications/marketing/data/sfaDemoData.xml | 6 +- .../marketing/entitydef/entitymodel.xml | 10 +- .../marketing/campaign/CampaignServices.xml | 26 +- .../marketing/contact/ContactListServices.xml | 40 +- .../marketing/segment/SegmentServices.xml | 34 +- .../org/ofbiz/marketing/test/TestServices.xml | 8 +- .../tracking/TrackingCodeServices.xml | 44 +- .../org/ofbiz/sfa/ContactMechMapProcs.xml | 2 +- .../org/ofbiz/sfa/account/AccountServices.xml | 4 +- .../org/ofbiz/sfa/contact/ContactServices.xml | 18 +- .../org/ofbiz/sfa/lead/LeadServices.xml | 38 +- .../sfa/opportunity/OpportunityServices.xml | 4 +- .../marketing/servicedef/services.xml | 48 +- .../reports/MarketingCampaignReport.groovy | 4 +- .../actions/reports/TrackingCodeReport.groovy | 4 +- .../webapp/marketing/WEB-INF/controller.xml | 52 +- .../webapp/marketing/WEB-INF/web.xml | 8 +- .../marketing/datasource/DataSourceForms.xml | 20 +- .../webapp/marketing/error/error.jsp | 6 +- .../webapp/marketing/lookup/LookupForms.xml | 8 +- .../trackingcode/TrackingCodeForms.xml | 28 +- .../sfa/WEB-INF/action/CloneLead.groovy | 12 +- .../sfa/WEB-INF/action/MergeContacts.groovy | 10 +- .../webapp/sfa/WEB-INF/controller.xml | 26 +- .../marketing/webapp/sfa/WEB-INF/web.xml | 8 +- .../webapp/sfa/contact/mergeContacts.ftl | 10 +- .../marketing/webapp/sfa/error/error.jsp | 6 +- .../marketing/webapp/sfa/lead/mergeLeads.ftl | 10 +- .../webapp/sfa/party/findSfaParty.ftl | 8 +- .../marketing/widget/CommonScreens.xml | 6 +- .../marketing/widget/DataSourceScreens.xml | 10 +- .../marketing/widget/LookupScreens.xml | 2 +- .../widget/MarketingReportScreens.xml | 2 +- .../marketing/widget/SegmentScreens.xml | 18 +- .../marketing/widget/TrackingCodeScreens.xml | 14 +- .../marketing/widget/sfa/CommonScreens.xml | 34 +- .../marketing/widget/sfa/ContactScreens.xml | 18 +- .../marketing/widget/sfa/ForecastScreens.xml | 16 +- .../marketing/widget/sfa/LeadScreens.xml | 24 +- .../widget/sfa/OpportunityScreens.xml | 12 +- .../marketing/widget/sfa/SfaMenus.xml | 20 +- .../widget/sfa/forms/AccountForms.xml | 4 +- .../widget/sfa/forms/ContactForms.xml | 12 +- .../widget/sfa/forms/ForecastForms.xml | 18 +- .../marketing/widget/sfa/forms/LeadForms.xml | 20 +- .../widget/sfa/forms/OpportunityForms.xml | 12 +- .../order/config/OrderErrorUiLabels.xml | 6 +- applications/order/config/taxware.properties | 4 +- applications/order/config/zipsales.properties | 4 +- applications/order/data/OrderDemoData.xml | 14 +- applications/order/data/OrderPortletData.xml | 26 +- .../order/data/OrderScheduledServices.xml | 4 +- applications/order/data/OrderSecurityData.xml | 20 +- applications/order/data/OrderTypeData.xml | 14 +- .../email/default/emailprocessnotify.ftl | 6 +- applications/order/entitydef/eecas.xml | 2 +- applications/order/entitydef/entitymodel.xml | 104 +- .../order/entitydef/entitymodel_old.xml | 6 +- .../order/entitydef/entitymodel_view.xml | 16 +- applications/order/ofbiz-component.xml | 4 +- .../org/ofbiz/order/UpgradeServices.xml | 6 +- .../CommunicationEventServices.xml | 4 +- .../ofbiz/order/customer/CustomerEvents.xml | 52 +- .../order/opportunity/OpportunityServices.xml | 16 +- .../order/order/OrderDeliveryServices.xml | 22 +- .../ofbiz/order/order/OrderReturnServices.xml | 78 +- .../org/ofbiz/order/order/OrderServices.xml | 120 +- .../ofbiz/order/order/OrderSimpleMethods.xml | 12 +- .../org/ofbiz/order/quote/QuoteServices.xml | 48 +- .../ofbiz/order/request/CustRequestEvents.xml | 4 +- .../order/request/CustRequestServices.xml | 42 +- .../order/requirement/RequirementServices.xml | 10 +- .../shoppinglist/ShoppingListServices.xml | 44 +- .../order/thirdparty/taxware/TaxwareFiles.xml | 2 +- .../thirdparty/zipsales/ZipSalesTaxTables.xml | 2 +- .../order/servicedef/orderProcessXPDL.xml | 226 +- applications/order/servicedef/secas.xml | 6 +- applications/order/servicedef/services.xml | 70 +- .../order/servicedef/services_cart.xml | 2 +- .../order/servicedef/services_opportunity.xml | 6 +- .../order/servicedef/services_quote.xml | 6 +- .../order/servicedef/services_request.xml | 4 +- .../order/servicedef/services_return.xml | 20 +- .../servicedef/services_shoppinglist.xml | 2 +- .../order/order/OrderReturnServices.java | 4 +- .../org/ofbiz/order/order/OrderServices.java | 4 +- .../order/shoppingcart/CheckOutHelper.java | 2 +- .../order/shoppingcart/ShoppingCart.java | 2 +- .../shoppingcart/ShoppingCartEvents.java | 2 +- .../product/ProductPromoWorker.java | 8 +- .../entry/AdditionalPartyListing.groovy | 4 +- .../WEB-INF/actions/entry/BillSettings.groovy | 14 +- .../WEB-INF/actions/entry/CheckInits.groovy | 4 +- .../actions/entry/CheckoutOptions.groovy | 4 +- .../actions/entry/CheckoutPayment.groovy | 4 +- .../actions/entry/CheckoutReview.groovy | 10 +- .../entry/CheckoutShippingAddress.groovy | 4 +- .../actions/entry/OptionSettings.groovy | 4 +- .../actions/entry/OrderAgreements.groovy | 6 +- .../WEB-INF/actions/entry/OrderTerms.groovy | 4 +- .../actions/entry/SetAdditionalParty.groovy | 4 +- .../actions/entry/SetCheckOutTabBar.groovy | 4 +- .../actions/entry/SetShoppingCart.groovy | 4 +- .../WEB-INF/actions/entry/ShipSettings.groovy | 8 +- .../WEB-INF/actions/entry/ShoppingList.groovy | 4 +- .../WEB-INF/actions/entry/ShowCart.groovy | 4 +- .../actions/entry/ShowPromoText.groovy | 8 +- .../actions/entry/StorePaymentOptions.groovy | 4 +- .../entry/cart/LookupBulkAddProducts.groovy | 4 +- .../cart/LookupBulkAddSupplierProducts.groovy | 6 +- .../entry/cart/ShowPromotionDetails.groovy | 4 +- .../catalog/AdvancedSearchOptions.groovy | 4 +- .../actions/entry/catalog/Category.groovy | 8 +- .../entry/catalog/CategoryDetail.groovy | 22 +- .../entry/catalog/ChooseCatalog.groovy | 4 +- .../entry/catalog/InlineProductDetail.groovy | 28 +- .../entry/catalog/KeywordSearch.groovy | 4 +- .../entry/catalog/KeywordSearchOptions.groovy | 4 +- .../entry/catalog/PrepareConfigForm.groovy | 4 +- .../actions/entry/catalog/Product.groovy | 10 +- .../entry/catalog/ProductDetail.groovy | 26 +- .../entry/catalog/ProductSummary.groovy | 12 +- .../actions/entry/catalog/QuickAdd.groovy | 8 +- .../entry/catalog/SideDeepCategory.groovy | 8 +- .../actions/order/CompanyHeader.groovy | 14 +- .../actions/order/FilterOrderList.groovy | 8 +- .../WEB-INF/actions/order/FindOrders.groovy | 4 +- .../WEB-INF/actions/order/NewNote.groovy | 10 +- .../order/OrderDeliveryScheduleInfo.groovy | 4 +- .../WEB-INF/actions/order/OrderList.groovy | 6 +- .../WEB-INF/actions/order/OrderStats.groovy | 108 +- .../WEB-INF/actions/order/OrderView.groovy | 22 +- .../actions/order/OrderViewWebSecure.groovy | 4 +- .../actions/order/ReceivePayment.groovy | 12 +- .../order/SendConfirmationEmail.groovy | 8 +- .../WEB-INF/actions/order/ShipGroups.groovy | 4 +- .../WEB-INF/actions/order/ViewImage.groovy | 4 +- .../actions/quote/GetPartyAddress.groovy | 4 +- .../actions/quote/GetPartyEmailAddress.groovy | 4 +- .../actions/quote/ManageQuotePrices.groovy | 6 +- .../actions/quote/ViewQuoteProfit.groovy | 6 +- .../reports/OpenOrderItemsReport.groovy | 52 +- .../WEB-INF/actions/reports/ReportList.groovy | 4 +- .../actions/request/GetNextSequenceNum.groovy | 6 +- .../actions/request/RequestItemNotes.groovy | 6 +- .../actions/request/SetRequestQuote.groovy | 6 +- .../ApprovedProductRequirements.groovy | 6 +- ...ApprovedProductRequirementsByVendor.groovy | 12 +- .../requirement/SelectCreatedProposed.groovy | 6 +- .../WEB-INF/actions/return/QuickReturn.groovy | 8 +- .../actions/return/ReturnHeader.groovy | 12 +- .../WEB-INF/actions/return/ReturnItems.groovy | 6 +- .../WEB-INF/actions/setup/PaymentSetup.groovy | 4 +- .../WEB-INF/actions/task/OrderTaskList.groovy | 12 +- .../webapp/ordermgr/WEB-INF/controller.xml | 80 +- .../order/webapp/ordermgr/WEB-INF/web.xml | 12 +- .../entry/OrderEntryCheckOutTabBar.ftl | 2 +- .../ordermgr/entry/PartySettingsForm.xml | 2 +- .../ordermgr/entry/SetItemShipGroups.ftl | 4 +- .../webapp/ordermgr/entry/addrsettings.ftl | 6 +- .../webapp/ordermgr/entry/billsettings.ftl | 62 +- .../entry/cart/addItemsToShoppingList.ftl | 2 +- .../entry/cart/associatedProducts.ftl | 6 +- .../webapp/ordermgr/entry/cart/javascript.ftl | 12 +- .../webapp/ordermgr/entry/cart/minicart.ftl | 2 +- .../entry/cart/promoUseDetailsInline.ftl | 2 +- .../webapp/ordermgr/entry/cart/showcart.ftl | 6 +- .../ordermgr/entry/cart/showcartitems.ftl | 46 +- .../ordermgr/entry/catalog/advancedsearch.ftl | 6 +- .../ordermgr/entry/catalog/breadcrumbs.ftl | 16 +- .../ordermgr/entry/catalog/category.ftl | 2 +- .../ordermgr/entry/catalog/categorydetail.ftl | 4 +- .../entry/catalog/configproductdetail.ftl | 32 +- .../entry/catalog/inlineProductDetail.ftl | 116 +- .../ordermgr/entry/catalog/productdetail.ftl | 32 +- .../ordermgr/entry/catalog/productsummary.ftl | 12 +- .../ordermgr/entry/catalog/quickadd.ftl | 14 +- .../entry/catalog/quickaddsummary.ftl | 8 +- .../entry/catalog/sidedeepcategory.ftl | 4 +- .../webapp/ordermgr/entry/checkinits.ftl | 6 +- .../webapp/ordermgr/entry/checkoutoptions.ftl | 4 +- .../entry/checkoutshippingaddress.ftl | 18 +- .../webapp/ordermgr/entry/editShipAddress.ftl | 8 +- .../webapp/ordermgr/entry/optionsettings.ftl | 14 +- .../ordermgr/entry/order/orderitems.ftl | 30 +- .../ordermgr/entry/order/orderpaymentinfo.ftl | 16 +- .../entry/order/shipGroupConfirmSummary.ftl | 14 +- .../webapp/ordermgr/entry/orderHeaderInfo.ftl | 4 +- .../webapp/ordermgr/entry/orderagreements.ftl | 16 +- .../webapp/ordermgr/entry/orderparty.ftl | 6 +- .../webapp/ordermgr/entry/shipsettings.ftl | 18 +- .../order/webapp/ordermgr/error/error.jsp | 6 +- .../order/webapp/ordermgr/images/js/return.js | 6 +- .../ordermgr/lookup/FieldLookupForms.xml | 32 +- .../order/OrderDeliveryScheduleForms.xml | 2 +- .../webapp/ordermgr/order/OrderForms.xml | 12 +- .../ordermgr/order/OrderShopListForms.xml | 2 +- .../webapp/ordermgr/order/appendorderitem.ftl | 8 +- .../ordermgr/order/companyHeader.fo.ftl | 4 +- .../webapp/ordermgr/order/editorderitems.ftl | 40 +- .../webapp/ordermgr/order/findOrders.ftl | 40 +- .../order/webapp/ordermgr/order/newnote.ftl | 4 +- .../ordermgr/order/orderReportBody.fo.ftl | 24 +- .../order/orderReportContactMechs.fo.ftl | 16 +- .../order/orderReportHeaderInfo.fo.ftl | 6 +- .../ordermgr/order/ordercontactinfo.ftl | 10 +- .../order/webapp/ordermgr/order/orderinfo.ftl | 14 +- .../webapp/ordermgr/order/orderitems.ftl | 20 +- .../order/webapp/ordermgr/order/orderlist.ftl | 20 +- .../webapp/ordermgr/order/ordernotes.ftl | 8 +- .../ordermgr/order/orderpaymentinfo.ftl | 20 +- .../ordermgr/order/ordershippinginfo.ftl | 22 +- .../webapp/ordermgr/order/orderstats.ftl | 18 +- .../webapp/ordermgr/order/orderterms.ftl | 2 +- .../ordermgr/order/sendconfirmationemail.ftl | 4 +- .../webapp/ordermgr/order/shipGroups.fo.ftl | 2 +- .../webapp/ordermgr/order/transitions.ftl | 24 +- .../webapp/ordermgr/quote/QuoteForms.xml | 10 +- .../ordermgr/quote/ViewQuoteItemInfo.ftl | 4 +- .../ordermgr/quote/quoteReportBody.fo.ftl | 12 +- .../reports/OrderPurchaseReportPayment.fo.ftl | 4 +- .../reports/OrderPurchaseReportProduct.fo.ftl | 4 +- .../reports/OrderReportPrepare.groovy | 4 +- .../PurchasesByOrganizationReport.fo.ftl | 6 +- .../reports/SalesByStoreReport.fo.ftl | 6 +- .../webapp/ordermgr/reports/reportlist.ftl | 10 +- .../CompletedCustRequestNotification.ftl | 2 +- .../request/CreateCustRequestNotification.ftl | 2 +- .../webapp/ordermgr/request/RequestForms.xml | 50 +- .../ordermgr/requirement/RequirementForms.xml | 2 +- .../webapp/ordermgr/return/returnHeader.ftl | 36 +- .../webapp/ordermgr/return/returnItemInc.ftl | 18 +- .../webapp/ordermgr/return/returnItems.ftl | 54 +- .../webapp/ordermgr/return/returnList.ftl | 4 +- .../ordermgr/return/returnReportBody.fo.ftl | 8 +- .../return/returnReportContactMechs.fo.ftl | 4 +- .../return/returnReportHeaderInfo.fo.ftl | 2 +- .../webapp/ordermgr/setup/paymentsetup.ftl | 40 +- .../webapp/ordermgr/task/ordertasklist.ftl | 58 +- .../order/widget/ordermgr/CommonScreens.xml | 16 +- .../order/widget/ordermgr/LookupScreens.xml | 2 +- applications/order/widget/ordermgr/Menus.xml | 10 +- .../widget/ordermgr/OrderEntryCartScreens.xml | 4 +- .../ordermgr/OrderEntryCatalogScreens.xml | 12 +- .../ordermgr/OrderEntryCommonScreens.xml | 4 +- .../order/widget/ordermgr/OrderEntryForms.xml | 4 +- .../ordermgr/OrderEntryOrderScreens.xml | 4 +- .../widget/ordermgr/OrderEntryScreens.xml | 2 +- .../widget/ordermgr/OrderHeaderScreens.xml | 10 +- .../widget/ordermgr/OrderPrintScreens.xml | 4 +- .../widget/ordermgr/OrderReturnScreens.xml | 10 +- .../widget/ordermgr/OrderTaskScreens.xml | 2 +- .../widget/ordermgr/OrderViewScreens.xml | 8 +- .../order/widget/ordermgr/QuoteScreens.xml | 78 +- .../ordermgr/QuoteWorkEffortScreens.xml | 8 +- .../order/widget/ordermgr/ReportForms.xml | 10 +- .../order/widget/ordermgr/ReportScreens.xml | 14 +- .../order/widget/ordermgr/RequestScreens.xml | 30 +- .../widget/ordermgr/RequirementScreens.xml | 22 +- applications/party/config/PartyHelpUrls.xml | 4 +- applications/party/config/PartyUiLabels.xml | 2 +- applications/party/data/PartyGeoPointData.xml | 16 +- applications/party/data/PartyPortletData.xml | 66 +- applications/party/data/PartySecurityData.xml | 4 +- applications/party/data/PartyTypeData.xml | 30 +- applications/party/data/ScheduledJobs.xml | 4 +- applications/party/entitydef/entitymodel.xml | 52 +- applications/party/ofbiz-component.xml | 4 +- .../script/org/ofbiz/party/LookupServices.xml | 10 +- .../CommunicationEventEvents.xml | 30 +- .../CommunicationEventServices.xml | 52 +- .../party/contact/ContactMechMapProcs.xml | 2 +- .../party/contact/ContactMechServices.xml | 78 +- .../contact/PartyContactMechMapProcs.xml | 2 +- .../contact/PartyContactMechServices.xml | 110 +- .../party/content/PartyContentServices.xml | 4 +- .../ofbiz/party/customer/CustomerEvents.xml | 6 +- .../party/party/PartyInvitationServices.xml | 8 +- .../org/ofbiz/party/party/PartyMapProcs.xml | 2 +- .../party/party/PartyPermissionServices.xml | 10 +- .../org/ofbiz/party/party/PartyServices.xml | 176 +- .../ofbiz/party/party/PartySimpleEvents.xml | 38 +- .../ofbiz/party/party/PartySimpleMethods.xml | 44 +- .../ofbiz/party/test/PartyTestServices.xml | 48 +- .../org/ofbiz/party/user/UserEvents.xml | 4 +- applications/party/servicedef/secas.xml | 12 +- applications/party/servicedef/services.xml | 94 +- .../party/servicedef/services_view.xml | 6 +- .../CommunicationEventServices.java | 2 +- .../party/contact/ContactMechServices.java | 2 +- .../email/VerifyEmailAddressNotification.ftl | 4 +- .../actions/HasPartyPermissions.groovy | 4 +- .../FindCommEventContactMechs.groovy | 18 +- .../GetMyCommunicationEventRole.groovy | 14 +- .../communication/ListCommunications.groovy | 8 +- .../communication/PrepCommEventForward.groovy | 12 +- .../communication/PrepCommEventReply.groovy | 4 +- .../getPartyEmailFromCommEventInfo.groovy | 8 +- .../communication/recentVisitor.groovy | 4 +- .../actions/party/EditContactMech.groovy | 4 +- .../actions/party/EditPaymentMethod.groovy | 8 +- .../actions/party/EditShoppingList.groovy | 16 +- .../WEB-INF/actions/party/FindLookUp.groovy | 22 +- .../WEB-INF/actions/party/FindMatches.groovy | 8 +- .../actions/party/GetCurrentCart.groovy | 2 +- .../actions/party/GetLoyaltyPoints.groovy | 2 +- .../WEB-INF/actions/party/GetMyCompany.groovy | 8 +- .../actions/party/GetPaymentMethods.groovy | 4 +- .../party/GetUserLoginPrimaryEmail.groovy | 6 +- .../WEB-INF/actions/party/LinkParty.groovy | 4 +- .../party/PartyFinancialHistory.groovy | 18 +- .../actions/party/PartyGeoLocation.groovy | 7 +- .../WEB-INF/actions/party/SetRoleVars.groovy | 20 +- .../party/UnAppliedInvoicesForParty.groovy | 14 +- .../party/UnAppliedPaymentsForParty.groovy | 10 +- .../WEB-INF/actions/party/ViewProfile.groovy | 6 +- .../WEB-INF/actions/visit/ShowVisits.groovy | 24 +- .../WEB-INF/actions/visit/VisitDetails.groovy | 4 +- .../webapp/partymgr/WEB-INF/controller.xml | 94 +- .../party/webapp/partymgr/WEB-INF/web.xml | 8 +- .../partymgr/communication/addAttachFile.ftl | 8 +- .../partymgr/communication/attachFileList.ftl | 2 +- .../party/webapp/partymgr/error/error.jsp | 6 +- .../webapp/partymgr/js/PartyProfileContent.js | 6 +- .../webapp/partymgr/lookup/LookupForms.xml | 52 +- .../webapp/partymgr/party/addressMatchMap.ftl | 4 +- .../partymgr/party/editShoppingList.ftl | 14 +- .../webapp/partymgr/party/editcreditcard.ftl | 4 +- .../webapp/partymgr/party/editeftaccount.ftl | 4 +- .../party/webapp/partymgr/party/findparty.ftl | 8 +- .../party/webapp/partymgr/party/linkparty.ftl | 4 +- .../partymgr/party/partygeolocation.ftl | 26 +- .../partymgr/party/profileblocks/Contact.ftl | 1 - .../party/profileblocks/ContentList.ftl | 4 +- .../party/profileblocks/PaymentMethods.ftl | 1 - .../profileblocks/SerializedInventory.ftl | 4 +- .../partymgr/security/ViewCertificate.ftl | 4 +- .../party/webapp/partymgr/static/partymgr.css | 4 +- .../webapp/partymgr/visit/showvisits.ftl | 14 +- .../webapp/partymgr/visit/visitdetail.ftl | 16 +- .../party/widget/partymgr/CommonScreens.xml | 12 +- .../widget/partymgr/EmailPartyScreens.xml | 4 +- .../party/widget/partymgr/LookupScreens.xml | 8 +- .../partymgr/PartyInvitationScreens.xml | 10 +- .../party/widget/partymgr/PartyScreens.xml | 44 +- .../widget/partymgr/PaymentMethodForms.xml | 2 +- .../widget/partymgr/PaymentMethodScreens.xml | 18 +- .../party/widget/partymgr/ProfileScreens.xml | 12 +- .../party/widget/partymgr/SecurityForms.xml | 16 +- .../party/widget/partymgr/SecurityScreens.xml | 22 +- .../party/widget/partymgr/VisitScreens.xml | 12 +- .../product/config/ProductUiLabels.xml | 2 +- .../product/config/catalog.properties | 4 +- .../product/config/prodsearch.properties | 4 +- .../product/config/promotext.properties | 4 +- .../product/config/promotext_zh.properties | 6 +- .../product/config/shipment.properties | 14 +- applications/product/data/ApiSchemaDhl.xml | 30 +- .../product/data/ProductScheduledServices.xml | 2 +- .../product/data/ProductSecurityData.xml | 10 +- applications/product/data/ProductTypeData.xml | 14 +- applications/product/entitydef/eecas.xml | 10 +- .../product/entitydef/entitygroup_olap.xml | 2 +- .../product/entitydef/entitymodel.xml | 76 +- .../product/entitydef/entitymodel_olap.xml | 4 +- .../product/entitydef/entitymodel_old.xml | 6 +- .../entitydef/entitymodel_shipment.xml | 10 +- applications/product/ofbiz-component.xml | 2 +- .../org/ofbiz/product/UpgradeServices.xml | 6 +- .../ofbiz/product/catalog/CatalogServices.xml | 204 +- .../category/CategoryContentServices.xml | 2 +- .../product/category/CategoryServices.xml | 60 +- .../CommunicationEventServices.xml | 4 +- .../ofbiz/product/config/ConfigServices.xml | 8 +- .../ProductConfigItemContentServices.xml | 2 +- .../org/ofbiz/product/cost/CostServices.xml | 20 +- .../feature/ProductFeatureServices.xml | 58 +- .../inventory/InventoryIssueServices.xml | 32 +- .../inventory/InventoryReserveServices.xml | 34 +- .../product/inventory/InventoryServices.xml | 82 +- .../product/inventory/StockMoveServices.xml | 34 +- .../product/olap/ProductDimensionServices.xml | 2 +- .../org/ofbiz/product/price/PriceServices.xml | 10 +- .../CustomerDigitalDownloadServices.xml | 30 +- .../product/ProductContentServices.xml | 4 +- .../ofbiz/product/product/ProductServices.xml | 58 +- .../product/product/ProductUomFormulas.xml | 40 +- .../org/ofbiz/product/promo/PromoServices.xml | 4 +- .../ofbiz/product/rental/RentalServices.xml | 8 +- .../storage/FacilityContactMechMapProcs.xml | 8 +- .../storage/FacilityContactMechServices.xml | 4 +- .../ofbiz/product/storage/StorageServices.xml | 58 +- .../product/store/ProductStoreServices.xml | 62 +- .../subscription/SubscriptionServices.xml | 30 +- .../supplier/SupplierProductServices.xml | 14 +- .../shipment/issuance/IssuanceServices.xml | 52 +- .../shipment/picklist/PicklistServices.xml | 4 +- .../receipt/ShipmentReceiptServices.xml | 58 +- .../shipment/shipment/ShipmentServices.xml | 144 +- .../org/ofbiz/shipment/test/TestServices.xml | 52 +- applications/product/servicedef/secas.xml | 10 +- .../product/servicedef/secas_olap.xml | 2 +- .../product/servicedef/secas_shipment.xml | 18 +- applications/product/servicedef/services.xml | 60 +- .../product/servicedef/services_cost.xml | 4 +- .../product/servicedef/services_facility.xml | 32 +- .../product/servicedef/services_feature.xml | 4 +- .../product/servicedef/services_maint.xml | 34 +- .../product/servicedef/services_picklist.xml | 2 +- .../servicedef/services_pricepromo.xml | 10 +- .../product/servicedef/services_shipment.xml | 38 +- .../servicedef/services_shipment_dhl.xml | 2 +- .../servicedef/services_shipment_ups.xml | 4 +- .../servicedef/services_shipment_usps.xml | 6 +- .../product/servicedef/services_store.xml | 2 +- .../servicedef/services_subscription.xml | 10 +- .../product/servicedef/services_uom.xml | 2 +- .../product/servicedef/services_upgrade.xml | 4 +- .../product/servicedef/services_view.xml | 6 +- .../product/config/ProductConfigWorker.java | 2 +- .../product/config/ProductConfigWrapper.java | 2 +- .../feature/ProductFeatureServices.java | 2 +- .../org/ofbiz/product/image/ScaleImage.java | 2 +- .../product/inventory/InventoryServices.java | 10 +- .../product/product/ProductServices.java | 2 +- .../shipment/verify/VerifyPickServices.java | 6 +- .../shipment/verify/VerifyPickSession.java | 6 +- .../shipment/verify/VerifyPickSessionRow.java | 4 +- .../shipment/FedexShipRequestTemplate.xml.ftl | 6 +- .../FedexSubscriptionRequestTemplate.xml.ftl | 10 +- applications/product/testdef/FacilityTest.xml | 8 +- applications/product/testdef/ProductTest.xml | 4 +- .../WEB-INF/actions/ChooseTopCategory.groovy | 4 +- .../WEB-INF/actions/FastLoadCache.groovy | 4 +- ...reateProductInCategoryCheckExisting.groovy | 4 +- .../actions/category/EditCategory.groovy | 10 +- .../category/EditCategoryProducts.groovy | 4 +- .../EditProductConfigItemContent.groovy | 20 +- ...EditProductConfigItemContentContent.groovy | 4 +- .../config/EditProductConfigOptions.groovy | 4 +- .../EditFeatureCategoryFeatures.groovy | 4 +- .../actions/feature/EditFeatureGroups.groovy | 4 +- .../feature/QuickAddProductFeatures.groovy | 4 +- .../actions/find/advancedsearchoptions.groovy | 4 +- .../WEB-INF/actions/find/keywordsearch.groovy | 4 +- .../actions/find/keywordsearchbox.groovy | 4 +- .../actions/find/miniproductlist.groovy | 4 +- .../WEB-INF/actions/find/sidecatalogs.groovy | 4 +- .../actions/find/sidedeepcategory.groovy | 4 +- .../lookup/LookupVariantProduct.groovy | 6 +- .../price/EditProductPriceRules.groovy | 4 +- .../product/ApplyFeaturesFromCategory.groovy | 4 +- .../product/ApplyFeaturesFromGroup.groovy | 6 +- .../actions/product/EditProductAssoc.groovy | 6 +- .../actions/product/EditProductContent.groovy | 48 +- .../product/EditProductContentContent.groovy | 8 +- .../product/EditProductFeatures.groovy | 6 +- .../product/EditProductInventoryItems.groovy | 24 +- .../product/EditProductQuickAdmin.groovy | 6 +- .../actions/product/QuickAddVariants.groovy | 4 +- .../actions/promo/EditProductPromoCode.groovy | 4 +- .../store/EditProductStoreRoles.groovy | 4 +- .../store/EditProductStoreSurveys.groovy | 4 +- .../thesaurus/EditKeywordThesaurus.groovy | 6 +- .../webapp/catalog/WEB-INF/controller.xml | 78 +- .../product/webapp/catalog/WEB-INF/web.xml | 10 +- .../catalog/catalog/FindProdCatalog.ftl | 4 +- .../catalog/catalog/ProdCatalogForms.xml | 18 +- .../webapp/catalog/category/EditCategory.ftl | 16 +- .../catalog/category/EditCategoryContent.ftl | 4 +- .../category/EditCategoryFeatureCats.ftl | 6 +- .../catalog/category/EditCategoryParties.ftl | 2 +- .../category/EditCategoryProdCatalogs.ftl | 2 +- .../catalog/category/EditCategoryProducts.ftl | 26 +- .../catalog/category/EditCategoryRollup.ftl | 10 +- .../createProductInCategoryCheckExisting.ftl | 4 +- .../category/createProductInCategoryStart.ftl | 2 +- .../config/EditProductConfigItemContent.ftl | 8 +- .../product/webapp/catalog/error/error.jsp | 6 +- .../webapp/catalog/feature/BulkAddFeature.ftl | 2 +- .../feature/EditFeatureCategoryFeatures.ftl | 2 +- .../catalog/feature/EditFeatureGroups.ftl | 2 +- .../webapp/catalog/find/FindProductById.ftl | 4 +- .../webapp/catalog/find/advancedsearch.ftl | 8 +- .../webapp/catalog/find/keywordsearch.ftl | 22 +- .../catalog/find/keywordsearchactions.ftl | 32 +- .../webapp/catalog/find/sidedeepcategory.ftl | 10 +- .../catalog/lookup/FieldLookupForms.xml | 26 +- applications/product/webapp/catalog/main.ftl | 2 +- .../catalog/price/EditProductPriceRules.ftl | 6 +- .../webapp/catalog/price/PriceForms.xml | 10 +- .../product/ApplyFeaturesFromCategory.ftl | 2 +- .../catalog/product/EditProductAssoc.ftl | 14 +- .../catalog/product/EditProductContent.ftl | 12 +- .../catalog/product/EditProductFeatures.ftl | 26 +- .../product/EditProductInventoryItems.ftl | 2 +- .../catalog/product/EditProductParties.ftl | 2 +- .../catalog/product/EditProductQuickAdmin.ftl | 4 +- .../product/ProductInventorySummary.ftl | 4 +- .../catalog/product/QuickAddVariants.ftl | 10 +- .../catalog/promo/EditProductPromoCode.ftl | 2 +- .../catalog/promo/EditProductPromoRules.ftl | 2 +- .../catalog/promo/EditProductPromoStores.ftl | 10 +- .../catalog/promo/FindProductPromoCode.ftl | 4 +- .../webapp/catalog/promo/PromoForms.xml | 6 +- .../webapp/catalog/reviews/pendingReviews.ftl | 4 +- .../webapp/catalog/shipping/ShippingForms.xml | 4 +- .../catalog/store/EditProductStoreRoles.ftl | 8 +- .../catalog/store/EditProductStoreSurveys.ftl | 8 +- .../store/EditProductStoreWebSites.ftl | 2 +- .../catalog/store/ProductStoreForms.xml | 58 +- .../store/prepareCreateShipMeth.groovy | 4 +- .../thesaurus/EditKeywordThesaurus.ftl | 2 +- .../CountFacilityInventoryByProduct.groovy | 44 +- .../actions/facility/EditContactMech.groovy | 4 +- .../actions/facility/EditFacility.groovy | 4 +- .../facility/EditFacilityLocation.groovy | 4 +- .../FacilityLocationGeoLocation.groovy | 6 +- .../actions/facility/FindFacility.groovy | 13 +- .../facility/FindFacilityLocation.groovy | 4 +- .../facility/FindFacilityTransfers.groovy | 16 +- .../FindInventoryItemsByLabels.groovy | 6 +- .../actions/facility/ViewContactMechs.groovy | 4 +- .../ViewFacilityInventoryByProduct.groovy | 14 +- .../FindFacilityPhysicalInventory.groovy | 6 +- .../inventory/InventoryAverageCosts.groovy | 12 +- .../inventory/InventoryItemTotals.groovy | 16 +- .../inventory/LookupInventoryItems.groovy | 4 +- .../actions/inventory/ReceiveInventory.groovy | 36 +- .../inventory/TransferInventoryItem.groovy | 10 +- .../actions/returns/ReceiveReturn.groovy | 8 +- .../shipment/AddItemsFromInventory.groovy | 10 +- .../actions/shipment/AddItemsFromOrder.groovy | 26 +- .../actions/shipment/EditShipment.groovy | 14 +- .../actions/shipment/EditShipmentItems.groovy | 10 +- .../shipment/EditShipmentPackages.groovy | 8 +- .../actions/shipment/EditShipmentPlan.groovy | 30 +- .../shipment/EditShipmentRouteSegments.groovy | 10 +- .../actions/shipment/FindShipment.groovy | 6 +- .../WEB-INF/actions/shipment/PackOrder.groovy | 6 +- .../actions/shipment/PackingSlip.groovy | 8 +- .../actions/shipment/QuickShipOrder.groovy | 10 +- ...eceiveInventoryAgainstPurchaseOrder.groovy | 28 +- .../actions/shipment/ShipmentManifest.groovy | 8 +- .../actions/shipment/VerifyPick.groovy | 4 +- .../actions/shipment/ViewShipment.groovy | 4 +- .../webapp/facility/WEB-INF/controller.xml | 30 +- .../product/webapp/facility/WEB-INF/web.xml | 10 +- .../product/webapp/facility/error/error.jsp | 6 +- .../webapp/facility/facility/EditFacility.ftl | 4 +- .../facility/EditFacilityLocation.ftl | 20 +- .../facility/facility/FacilityForms.xml | 40 +- .../facility/FacilityLocationGeoLocation.ftl | 24 +- .../facility/FindFacilityLocation.ftl | 14 +- .../facility/facility/PickMoveStock.ftl | 14 +- .../webapp/facility/facility/Picklist.fo.ftl | 2 +- .../facility/facility/ViewContactMechs.ftl | 2 +- .../facility/batchPrintMarkAsAccepted.ftl | 8 +- .../facility/batchPrintShippingLabels.fo.ftl | 4 +- .../searchInventoryItemsByLabelsForm.ftl | 2 +- .../facility/group/FacilityGroupForms.xml | 2 +- .../facility/inventory/InventoryForms.xml | 28 +- .../facility/inventory/receiveInventory.ftl | 4 +- .../labels/InventoryItemLabelForms.xml | 2 +- .../facility/lookup/FieldLookupForms.xml | 16 +- .../facility/lookup/LookupInventoryItems.ftl | 4 +- .../webapp/facility/returns/receiveReturn.ftl | 74 +- .../shipment/AddItemsFromInventory.ftl | 10 +- .../facility/shipment/AddItemsFromOrder.ftl | 10 +- .../facility/shipment/EditShipmentItems.ftl | 2 +- .../shipment/EditShipmentPackages.ftl | 8 +- .../facility/shipment/EditShipmentPlan.ftl | 6 +- .../webapp/facility/shipment/FindShipment.ftl | 48 +- .../facility/shipment/QuickShipOrder.ftl | 46 +- .../ReceiveInventoryAgainstPurchaseOrder.ftl | 16 +- .../facility/shipment/ShipmentForms.xml | 28 +- .../facility/shipment/ShipmentManifest.fo.ftl | 62 +- .../facility/shipment/ViewShipmentInfo.ftl | 8 +- .../shipment/ViewShipmentRouteInfo.ftl | 2 +- .../product/widget/catalog/CatalogScreens.xml | 14 +- .../widget/catalog/CategoryScreens.xml | 24 +- .../product/widget/catalog/CommonScreens.xml | 14 +- .../product/widget/catalog/ConfigScreens.xml | 26 +- .../product/widget/catalog/FeatureScreens.xml | 28 +- .../product/widget/catalog/FindScreens.xml | 10 +- .../product/widget/catalog/LookupScreens.xml | 2 +- applications/product/widget/catalog/Menus.xml | 2 +- .../product/widget/catalog/PriceScreens.xml | 8 +- .../product/widget/catalog/ProductScreens.xml | 90 +- .../product/widget/catalog/ReviewScreens.xml | 6 +- .../widget/catalog/ShippingScreens.xml | 4 +- .../product/widget/catalog/StoreScreens.xml | 18 +- .../widget/catalog/SubscriptionForms.xml | 70 +- .../widget/catalog/SubscriptionMenus.xml | 8 +- .../widget/catalog/SubscriptionScreens.xml | 4 +- .../widget/catalog/ThesaurusScreens.xml | 4 +- .../product/widget/facility/CommonScreens.xml | 6 +- .../widget/facility/FacilityGroupScreens.xml | 6 +- .../widget/facility/FacilityScreens.xml | 80 +- .../product/widget/facility/FacilityTrees.xml | 4 +- .../facility/InventoryItemLabelScreens.xml | 8 +- .../product/widget/facility/LookupScreens.xml | 8 +- .../product/widget/facility/Menus.xml | 2 +- .../product/widget/facility/ReportScreens.xml | 2 +- .../widget/facility/ShipmentScreens.xml | 2 +- .../securityext/config/truition.properties | 4 +- .../securityext/data/UserDemoData.xml | 6 +- .../email/default/passwordemail.ftl | 2 +- applications/securityext/ofbiz-component.xml | 2 +- .../ofbiz/securityext/login/LoginMapProcs.xml | 12 +- .../securityext/login/LoginSimpleEvents.xml | 2 +- .../securitygroup/SecurityGroupServices.xml | 40 +- .../securityext/servicedef/services.xml | 20 +- .../widget/EmailSecurityScreens.xml | 2 +- .../config/EventReminders.properties | 4 +- .../config/workeffortsearch.properties | 4 +- .../workeffort/data/WorkEffortPortletData.xml | 14 +- .../data/WorkEffortSecurityData.xml | 8 +- .../workeffort/data/WorkEffortTypeData.xml | 40 +- applications/workeffort/entitydef/eecas.xml | 2 +- .../workeffort/entitydef/entitymodel.xml | 14 +- .../workeffort/entitydef/entitymodel_old.xml | 4 +- .../workeffort/entitydef/entitymodel_view.xml | 22 +- applications/workeffort/ofbiz-component.xml | 4 +- .../WorkEffortPermissionServices.xml | 54 +- .../timesheet/TimesheetServices.xml | 50 +- .../workeffort/WorkEffortSimpleServices.xml | 300 +-- .../workeffort/WorkflowMapProcessors.xml | 8 +- .../workeffort/WorkflowSimpleEvents.xml | 2 +- applications/workeffort/servicedef/secas.xml | 6 +- .../workeffort/servicedef/service_groups.xml | 4 +- .../workeffort/servicedef/services.xml | 60 +- .../servicedef/services_timesheet.xml | 12 +- .../workeffort/webapp/ical/WEB-INF/web.xml | 8 +- .../WEB-INF/actions/calendar/Days.groovy | 8 +- .../WEB-INF/actions/calendar/Month.groovy | 10 +- .../WEB-INF/actions/calendar/Upcoming.groovy | 4 +- .../WEB-INF/actions/calendar/Week.groovy | 12 +- .../content/WorkEffortContentWrapper.groovy | 4 +- .../find/WorkEffortSearchOptions.groovy | 4 +- .../find/WorkEffortSearchResults.groovy | 4 +- .../actions/request/RequestList.groovy | 4 +- .../webapp/workeffort/WEB-INF/controller.xml | 116 +- .../webapp/workeffort/WEB-INF/web.xml | 8 +- .../webapp/workeffort/calendar/day.ftl | 12 +- .../workeffort/calendar/eventsByForms.ftl | 4 +- .../webapp/workeffort/calendar/month.ftl | 12 +- .../webapp/workeffort/calendar/upcoming.ftl | 2 +- .../webapp/workeffort/calendar/week.ftl | 10 +- .../webapp/workeffort/error/error.jsp | 6 +- .../find/WorkEffortSearchOptions.ftl | 4 +- .../find/WorkEffortSearchResults.ftl | 2 +- .../workeffort/request/RequestForms.xml | 2 +- .../workeffort/EditWorkEffortDupForm.ftl | 2 +- .../workeffort/widget/CalendarScreens.xml | 2 +- .../workeffort/widget/CommonScreens.xml | 14 +- .../workeffort/widget/LookupForms.xml | 12 +- .../workeffort/widget/LookupScreens.xml | 10 +- .../workeffort/widget/RequestScreens.xml | 4 +- .../workeffort/widget/TimesheetScreens.xml | 36 +- .../workeffort/widget/WorkEffortForms.xml | 4 +- .../workeffort/widget/WorkEffortMenus.xml | 8 +- .../widget/WorkEffortPartyAssignForms.xml | 2 +- .../widget/WorkEffortQuoteForms.xml | 2 +- .../WorkEffortRelatedSummaryScreens.xml | 4 +- .../widget/WorkEffortRequestForms.xml | 4 +- .../workeffort/widget/WorkEffortScreens.xml | 72 +- .../workeffort/widget/WorkEffortTrees.xml | 2 +- build.xml | 28 +- debian/EncryptPassword.java | 4 +- debian/entityengine.xslt | 4 +- debian/move-files.pl | 2 +- debian/ofbiz-framework.config | 2 +- debian/ofbiz-framework.ofbiz.init | 2 +- debian/ofbiz-framework.postinst | 4 +- debian/ofbiz-framework.postrm | 2 +- debian/ofbiz-framework.prerm | 2 +- debian/rules | 2 +- .../appserver/config/appserver.properties | 2 +- .../appserver/config/ofbiz-containers.xml | 2 +- framework/appserver/ofbiz-component.xml | 2 +- .../templates/jboss422/application.xml | 4 +- .../appserver/templates/jboss422/build.xml | 8 +- .../jboss422/patches/jboss-ee-cfg.patch | 8 +- .../appserver/templates/jboss422/run.conf | 2 +- framework/appserver/templates/test/test2 | 2 +- .../appserver/templates/tomcat55/catalina.bat | 4 +- .../templates/tomcat55/catalina.properties | 18 +- .../appserver/templates/tomcat55/catalina.sh | 6 +- .../appserver/templates/tomcat55/server.xml | 60 +- .../appserver/templates/tomcat6/catalina.bat | 4 +- .../templates/tomcat6/catalina.properties | 18 +- .../appserver/templates/tomcat6/catalina.sh | 6 +- .../appserver/templates/tomcat6/server.xml | 36 +- framework/appserver/templates/wasce2/README | 18 +- .../templates/wasce2/application.xml | 4 +- .../templates/wasce2/geronimo-application.xml | 4 +- .../templates/wasce2/geronimo-web.xml | 4 +- .../templates/weblogic81/startOFBizServer.cmd | 26 +- .../templates/weblogic81/startOFBizServer.sh | 26 +- framework/base/build.xml | 14 +- framework/base/cert/demoCA/newcerts/01.pem | 8 +- framework/base/cert/demoCA/newcerts/02.pem | 8 +- framework/base/config/ESAPI.properties | 8 +- framework/base/config/antisamy-esapi.xml | 102 +- framework/base/config/cache.properties | 4 +- framework/base/config/component-load.xml | 6 +- framework/base/config/debug.properties | 4 +- framework/base/config/jetty-containers.xml | 14 +- framework/base/config/jndi.properties | 4 +- framework/base/config/jndiservers.xml | 4 +- framework/base/config/jsse.properties | 4 +- framework/base/config/limited-containers.xml | 2 +- framework/base/config/localdtds.properties | 4 +- framework/base/config/log4j.xml | 4 +- framework/base/config/ofbiz-containers.xml | 24 +- framework/base/config/pos-containers.xml | 8 +- framework/base/config/rmi-containers.xml | 16 +- framework/base/config/test-containers.xml | 2 +- framework/base/dtd/ofbiz-component.xsd | 2 +- framework/base/dtd/ofbiz-containers.xsd | 8 +- .../location/ClasspathLocationResolver.java | 2 +- .../location/ComponentLocationResolver.java | 2 +- .../ofbiz/base/location/FlexibleLocation.java | 2 +- .../ofbiz/base/location/LocationResolver.java | 2 +- .../location/OFBizHomeLocationResolver.java | 2 +- .../location/StandardUrlLocationResolver.java | 2 +- .../org/ofbiz/base/util/AliasKeyManager.java | 2 +- .../src/org/ofbiz/base/util/GroovyUtil.java | 6 +- .../src/org/ofbiz/base/util/UtilHttp.java | 2 +- .../org/ofbiz/base/util/UtilJ2eeCompat.java | 2 +- .../org/ofbiz/base/util/UtilJavaParse.java | 2 +- .../src/org/ofbiz/base/util/UtilValidate.java | 8 +- .../util/string/FlexibleStringExpander.java | 2 +- framework/bi/ofbiz-component.xml | 2 +- .../script/org/ofbiz/bi/DimensionServices.xml | 4 +- .../reportbuilder/GetStarSchemaFields.groovy | 4 +- .../reportbuilder/GetStarSchemas.groovy | 4 +- .../reportbuilder/RunStarSchemaQuery.groovy | 6 +- framework/bi/webapp/bi/WEB-INF/controller.xml | 8 +- framework/bi/webapp/bi/WEB-INF/web.xml | 14 +- framework/bi/widget/BiForms.xml | 2 +- framework/bi/widget/BiScreens.xml | 10 +- framework/build.xml | 4 +- framework/catalina/entitydef/entitymodel.xml | 2 +- framework/catalina/ofbiz-component.xml | 2 +- .../common/config/CommonErrorUiLabels.xml | 6 +- framework/common/config/CommonHelpUrls.xml | 2 +- framework/common/config/CommonUiLabels.xml | 8 +- framework/common/config/cdyne.properties | 4 +- framework/common/config/fo-styles.properties | 4 +- framework/common/config/general.properties | 8 +- .../common/config/keywordsearch.properties | 4 +- framework/common/data/CommonSecurityData.xml | 6 +- framework/common/data/CommonTypeData.xml | 10 +- framework/common/data/GeoData.xml | 6 +- framework/common/data/GeoData_BR.xml | 50 +- framework/common/data/GeoData_CO.xml | 2 +- framework/common/data/GeoData_FR.xml | 2 +- framework/common/data/GeoData_IN.xml | 2 +- framework/common/data/GeoData_NL.xml | 12 +- framework/common/data/GeoData_US.xml | 8 +- framework/common/data/UnitData.xml | 6 +- .../common/entitydef/entitygroup_olap.xml | 2 +- framework/common/entitydef/entitymodel.xml | 14 +- .../common/entitydef/entitymodel_olap.xml | 4 +- framework/common/ofbiz-component.xml | 4 +- .../org/ofbiz/common/BshServiceTest.bsh | 4 +- .../script/org/ofbiz/common/CdyneServices.xml | 4 +- .../org/ofbiz/common/CommonServices.xml | 26 +- .../org/ofbiz/common/EnumerationServices.xml | 8 +- .../org/ofbiz/common/GroovyServiceTest.groovy | 4 +- .../org/ofbiz/common/PortalPageMethods.xml | 20 +- .../org/ofbiz/common/PortalPageServices.xml | 26 +- .../common/datasource/DataSourceServices.xml | 2 +- .../datasource/DataSourceTypeServices.xml | 2 +- .../org/ofbiz/common/email/EmailServices.xml | 10 +- .../common/olap/CommonDimensionServices.xml | 2 +- .../ofbiz/common/period/PeriodServices.xml | 6 +- .../permission/CommonPermissionServices.xml | 2 +- framework/common/servicedef/groups_test.xml | 2 +- framework/common/servicedef/secas_cdyne.xml | 2 +- framework/common/servicedef/secas_test.xml | 2 +- framework/common/servicedef/services.xml | 36 +- .../common/servicedef/services_cdyne.xml | 4 +- .../common/servicedef/services_email.xml | 6 +- framework/common/servicedef/services_test.xml | 16 +- .../src/org/ofbiz/common/JavaScriptTest.js | 4 +- .../includes/FindAutocompleteOptions.groovy | 4 +- .../actions/includes/GeoLocation.groovy | 4 +- .../includes/GetParentPortalPageId.groovy | 4 +- .../actions/includes/ListPortalPages.groovy | 18 +- .../includes/ListPortalPortlets.groovy | 6 +- .../includes/retrievePortletAttributes.groovy | 4 +- .../webcommon/WEB-INF/common-controller.xml | 20 +- .../common/webcommon/WEB-INF/geolocation.ftl | 24 +- .../webcommon/WEB-INF/portal-controller.xml | 2 +- .../webcommon/WEB-INF/tempexpr-controller.xml | 6 +- framework/common/webcommon/error.fo.ftl | 6 +- .../common/webcommon/includes/footer.ftl | 2 +- .../common/webcommon/includes/header.ftl | 6 +- .../webcommon/includes/listVisualThemes.ftl | 2 +- .../common/webcommon/includes/lookup.ftl | 8 +- .../webcommon/includes/reportTemplate.fo.ftl | 2 +- .../common/webcommon/includes/simple.fo.ftl | 6 +- .../common/webcommon/includes/simple.ftl | 2 +- .../webcommon/portal/editPortalPage.ftl | 24 +- .../webcommon/portal/listPortalPortlets.ftl | 8 +- .../webcommon/portal/portalPageHeader.ftl | 4 +- framework/common/widget/CommonMenus.xml | 6 +- framework/common/widget/CommonScreens.xml | 14 +- framework/common/widget/LookupForms.xml | 4 +- framework/common/widget/LookupScreens.xml | 2 +- framework/common/widget/PortalPageForms.xml | 6 +- framework/common/widget/PortalPageScreens.xml | 4 +- framework/common/widget/PortletEditForms.xml | 4 +- framework/component-load.xml | 2 +- framework/datafile/ofbiz-component.xml | 2 +- framework/entity/config/entityengine.xml | 18 +- framework/entity/dtd/entity-catalog.xml | 12 +- framework/entity/dtd/entity-eca.xsd | 4 +- framework/entity/dtd/entitygroup.xsd | 2 +- framework/entity/dtd/entitymodel.xsd | 14 +- framework/entity/entitydef/entitymodel.xml | 2 +- .../entity/entitydef/entitymodel_test.xml | 28 +- .../entity/fieldtype/fieldtypeadvantage.xml | 8 +- framework/entity/fieldtype/fieldtypeaxion.xml | 14 +- .../entity/fieldtype/fieldtypecloudscape.xml | 10 +- .../entity/fieldtype/fieldtypedaffodil.xml | 10 +- framework/entity/fieldtype/fieldtypederby.xml | 14 +- .../entity/fieldtype/fieldtypefirebird.xml | 4 +- framework/entity/fieldtype/fieldtypehsql.xml | 16 +- framework/entity/fieldtype/fieldtypemssql.xml | 2 +- framework/entity/fieldtype/fieldtypemysql.xml | 16 +- .../entity/fieldtype/fieldtypeoracle.xml | 22 +- .../entity/fieldtype/fieldtypepostgres.xml | 14 +- .../entity/fieldtype/fieldtypepostnew.xml | 28 +- framework/entity/fieldtype/fieldtypesapdb.xml | 12 +- .../entity/fieldtype/fieldtypesybase.xml | 40 +- framework/entity/ofbiz-component.xml | 4 +- ...org.ofbiz.base.util.CachedClassLoader$Init | 4 +- .../src/org/ofbiz/entity/GenericValue.java | 2 +- .../ofbiz/entity/GenericValueHtmlWrapper.java | 2 +- .../connection/XaPoolConnectionFactory.java | 2 +- .../org/ofbiz/entity/jdbc/SqlJdbcUtil.java | 2 +- framework/entity/testdef/entitytests.xml | 2 +- framework/entityext/entitydef/entitymodel.xml | 2 +- framework/entityext/ofbiz-component.xml | 2 +- .../synchronization/EntitySyncServices.xml | 6 +- framework/entityext/servicedef/groups.xml | 2 +- framework/entityext/servicedef/secas.xml | 4 +- framework/entityext/servicedef/services.xml | 8 +- .../synchronization/EntitySyncContext.java | 2 +- framework/example/config/config.txt | 4 +- .../example/data/ExamplePortalSeedData.xml | 2 +- framework/example/data/ExamplePortletData.xml | 4 +- framework/example/data/ExampleTypeData.xml | 6 +- framework/example/dtd/dtd.txt | 6 +- framework/example/entitydef/entitydef.txt | 6 +- framework/example/entitydef/entitymodel.xml | 14 +- framework/example/lib/lib.txt | 4 +- framework/example/ofbiz-component.xml | 2 +- .../example/ExamplePermissionServices.xml | 2 +- .../ofbiz/example/example/ExampleServices.xml | 12 +- framework/example/script/script.txt | 4 +- framework/example/servicedef/servicedef.txt | 4 +- framework/example/servicedef/services.xml | 6 +- framework/example/src/src.txt | 6 +- framework/example/webapp/appheader.ftl | 4 +- .../includes/FindExampleFeatures.groovy | 4 +- .../webapp/example/WEB-INF/controller.xml | 16 +- .../example/webapp/example/WEB-INF/web.xml | 12 +- .../example/webapp/example/error/error.jsp | 6 +- .../webapp/example/reports/fonts.fo.ftl | 2 +- framework/example/webapp/webapp.txt | 4 +- .../example/widget/example/CommonScreens.xml | 12 +- .../widget/example/ExampleFeatureForms.xml | 6 +- .../widget/example/ExampleFeatureScreens.xml | 6 +- .../example/widget/example/ExampleForms.xml | 10 +- .../example/widget/example/ExampleMenus.xml | 4 +- .../example/widget/example/ExampleScreens.xml | 6 +- .../widget/example/FormWidgetExampleForms.xml | 6 +- .../example/FormWidgetExampleScreens.xml | 2 +- .../widget/example/PortletEditForms.xml | 2 +- .../example/widget/example/PortletScreens.xml | 2 +- framework/exampleext/ofbiz-component.xml | 2 +- .../webapp/exampleext/WEB-INF/controller.xml | 4 +- .../webapp/exampleext/WEB-INF/web.xml | 18 +- .../widget/example/CommonScreens.xml | 6 +- .../widget/example/ExampleScreens.xml | 4 +- framework/geronimo/ofbiz-component.xml | 2 +- framework/guiapp/config/xui.properties | 4 +- framework/guiapp/ofbiz-component.xml | 4 +- framework/images/ofbiz-component.xml | 2 +- .../images/webapp/images/GooglemapMarkers.js | 12 +- .../images/webapp/images/GooglemapSimple.js | 6 +- .../images/webapp/images/WEB-INF/web.xml | 2 +- .../webapp/images/calendar_date_select.js | 108 +- .../webapp/images/catalog/dirholder.txt | 4 +- framework/images/webapp/images/combobox.js | 12 +- framework/images/webapp/images/dojo/LICENSE | 2 +- framework/images/webapp/images/dojo/build.txt | 1 - .../images/dojo/dojo.js.uncompressed.js | 1492 ++++++------- .../webapp/images/dojo/iframe_history.html | 2 +- .../webapp/images/dojo/src/AdapterRegistry.js | 2 +- .../images/webapp/images/dojo/src/Deferred.js | 8 +- .../webapp/images/dojo/src/DeferredList.js | 12 +- .../images/webapp/images/dojo/src/a11y.js | 40 +- .../images/dojo/src/animation/Animation.js | 4 +- .../dojo/src/animation/AnimationEvent.js | 18 +- .../images/webapp/images/dojo/src/behavior.js | 8 +- .../webapp/images/dojo/src/browser_debug.js | 6 +- .../webapp/images/dojo/src/cal/iCalendar.js | 76 +- .../images/dojo/src/cal/textDirectory.js | 2 +- .../webapp/images/dojo/src/charting/Axis.js | 12 +- .../webapp/images/dojo/src/charting/Chart.js | 14 +- .../webapp/images/dojo/src/charting/Plot.js | 4 +- .../images/dojo/src/charting/PlotArea.js | 22 +- .../images/dojo/src/charting/Plotters.js | 2 +- .../images/dojo/src/charting/README.txt | 4 +- .../webapp/images/dojo/src/charting/Series.js | 22 +- .../images/dojo/src/charting/svg/Axis.js | 20 +- .../images/dojo/src/charting/svg/PlotArea.js | 8 +- .../images/dojo/src/charting/svg/Plotters.js | 50 +- .../images/dojo/src/charting/vml/Axis.js | 20 +- .../images/dojo/src/charting/vml/PlotArea.js | 6 +- .../images/dojo/src/charting/vml/Plotters.js | 52 +- .../images/dojo/src/collections/BinaryTree.js | 2 +- .../dojo/src/collections/Collections.js | 10 +- .../images/dojo/src/collections/Dictionary.js | 8 +- .../images/dojo/src/collections/Graph.js | 2 +- .../images/dojo/src/collections/SkipList.js | 8 +- .../images/dojo/src/collections/SortedList.js | 2 +- .../images/dojo/src/collections/Store.js | 22 +- .../dojo/src/collections/__package__.js | 8 +- .../images/webapp/images/dojo/src/crypto.js | 18 +- .../webapp/images/dojo/src/crypto/Blowfish.js | 114 +- .../webapp/images/dojo/src/crypto/SHA1.js | 6 +- .../webapp/images/dojo/src/data/CsvStore.js | 40 +- .../webapp/images/dojo/src/data/OpmlStore.js | 44 +- .../webapp/images/dojo/src/data/RdfStore.js | 108 +- .../webapp/images/dojo/src/data/YahooStore.js | 16 +- .../webapp/images/dojo/src/data/core/Read.js | 128 +- .../images/dojo/src/data/core/RemoteStore.js | 214 +- .../images/dojo/src/data/core/Result.js | 14 +- .../webapp/images/dojo/src/data/core/Write.js | 42 +- .../images/dojo/src/data/old/Attribute.js | 12 +- .../webapp/images/dojo/src/data/old/Item.js | 40 +- .../webapp/images/dojo/src/data/old/Kind.js | 2 +- .../images/dojo/src/data/old/Observable.js | 6 +- .../webapp/images/dojo/src/data/old/Value.js | 4 +- .../images/dojo/src/data/old/format/Csv.js | 22 +- .../images/dojo/src/data/old/format/Json.js | 14 +- .../images/dojo/src/data/old/provider/Base.js | 4 +- .../dojo/src/data/old/provider/Delicious.js | 22 +- .../dojo/src/data/old/provider/FlatFile.js | 4 +- .../dojo/src/data/old/provider/JotSpot.js | 2 +- .../dojo/src/data/old/provider/MySql.js | 2 +- .../webapp/images/dojo/src/data/old/to_do.txt | 8 +- .../webapp/images/dojo/src/date/common.js | 14 +- .../webapp/images/dojo/src/date/format.js | 80 +- .../webapp/images/dojo/src/date/serialize.js | 12 +- .../images/dojo/src/date/supplemental.js | 2 +- .../images/webapp/images/dojo/src/debug.js | 4 +- .../webapp/images/dojo/src/debug/console.js | 20 +- .../webapp/images/dojo/src/debug/deep.html | 8 +- .../webapp/images/dojo/src/dnd/DragAndDrop.js | 12 +- .../images/dojo/src/dnd/HtmlDragAndDrop.js | 24 +- .../images/dojo/src/dnd/HtmlDragManager.js | 18 +- .../images/dojo/src/dnd/TreeDragAndDrop.js | 4 +- .../images/dojo/src/dnd/TreeDragAndDropV3.js | 78 +- .../images/webapp/images/dojo/src/docs.js | 34 +- .../images/webapp/images/dojo/src/dom.js | 28 +- .../webapp/images/dojo/src/event/browser.js | 22 +- .../webapp/images/dojo/src/event/common.js | 84 +- .../webapp/images/dojo/src/event/topic.js | 24 +- .../webapp/images/dojo/src/experimental.js | 4 +- .../images/webapp/images/dojo/src/flash.js | 514 ++--- .../src/flash/flash6/DojoExternalInterface.as | 82 +- .../src/flash/flash8/DojoExternalInterface.as | 88 +- .../dojo/src/flash/flash8/ExpressInstall.as | 10 +- .../webapp/images/dojo/src/gfx/Colorspace.js | 2 +- .../webapp/images/dojo/src/gfx/color.js | 4 +- .../webapp/images/dojo/src/gfx/color/hsv.js | 38 +- .../webapp/images/dojo/src/gfx/common.js | 14 +- .../webapp/images/dojo/src/gfx/matrix.js | 66 +- .../images/webapp/images/dojo/src/gfx/path.js | 24 +- .../webapp/images/dojo/src/gfx/shape.js | 104 +- .../images/webapp/images/dojo/src/gfx/svg.js | 40 +- .../images/webapp/images/dojo/src/gfx/vml.js | 64 +- .../images/dojo/src/hostenv_adobesvg.js | 44 +- .../webapp/images/dojo/src/hostenv_browser.js | 2 +- .../images/dojo/src/hostenv_dashboard.js | 2 +- .../webapp/images/dojo/src/hostenv_jsc.js | 2 +- .../webapp/images/dojo/src/hostenv_rhino.js | 18 +- .../images/dojo/src/hostenv_spidermonkey.js | 16 +- .../webapp/images/dojo/src/hostenv_svg.js | 16 +- .../webapp/images/dojo/src/html/common.js | 22 +- .../webapp/images/dojo/src/html/display.js | 2 +- .../webapp/images/dojo/src/html/iframe.js | 8 +- .../webapp/images/dojo/src/html/layout.js | 42 +- .../webapp/images/dojo/src/html/metrics.js | 18 +- .../webapp/images/dojo/src/html/selection.js | 32 +- .../webapp/images/dojo/src/html/style.js | 80 +- .../webapp/images/dojo/src/i18n/currency.js | 6 +- .../images/dojo/src/i18n/currency/common.js | 6 +- .../webapp/images/dojo/src/i18n/number.js | 38 +- .../webapp/images/dojo/src/io/BrowserIO.js | 18 +- .../webapp/images/dojo/src/io/IframeIO.js | 12 +- .../webapp/images/dojo/src/io/RepubsubIO.js | 40 +- .../webapp/images/dojo/src/io/RhinoIO.js | 30 +- .../webapp/images/dojo/src/io/ScriptSrcIO.js | 32 +- .../images/dojo/src/io/XhrIframeProxy.js | 42 +- .../webapp/images/dojo/src/io/cometd.js | 20 +- .../webapp/images/dojo/src/io/common.js | 40 +- .../webapp/images/dojo/src/io/cookie.js | 10 +- .../webapp/images/dojo/src/io/xip_client.html | 46 +- .../webapp/images/dojo/src/io/xip_server.html | 64 +- .../images/webapp/images/dojo/src/json.js | 10 +- .../webapp/images/dojo/src/lang/array.js | 14 +- .../webapp/images/dojo/src/lang/assert.js | 22 +- .../webapp/images/dojo/src/lang/common.js | 24 +- .../webapp/images/dojo/src/lang/declare.js | 34 +- .../webapp/images/dojo/src/lang/extras.js | 10 +- .../webapp/images/dojo/src/lang/func.js | 8 +- .../images/dojo/src/lang/timing/Streamer.js | 8 +- .../images/dojo/src/lang/timing/Timer.js | 10 +- .../webapp/images/dojo/src/lang/type.js | 86 +- .../webapp/images/dojo/src/lfx/Animation.js | 66 +- .../webapp/images/dojo/src/lfx/extras.js | 14 +- .../images/webapp/images/dojo/src/lfx/html.js | 94 +- .../webapp/images/dojo/src/lfx/rounded.js | 26 +- .../webapp/images/dojo/src/lfx/toggle.js | 2 +- .../images/webapp/images/dojo/src/loader.js | 60 +- .../webapp/images/dojo/src/loader_xd.js | 32 +- .../images/dojo/src/logging/ConsoleLogger.js | 14 +- .../webapp/images/dojo/src/logging/Logger.js | 20 +- .../images/webapp/images/dojo/src/math.js | 2 +- .../webapp/images/dojo/src/math/curves.js | 2 +- .../webapp/images/dojo/src/math/matrix.js | 18 +- .../webapp/images/dojo/src/namespaces/dojo.js | 8 +- framework/images/webapp/images/dojo/src/ns.js | 6 +- .../images/webapp/images/dojo/src/regexp.js | 58 +- .../webapp/images/dojo/src/rpc/JotService.js | 2 +- .../webapp/images/dojo/src/rpc/JsonService.js | 14 +- .../webapp/images/dojo/src/rpc/RpcService.js | 10 +- .../webapp/images/dojo/src/rpc/yahoo.smd | 8 +- .../images/dojo/src/selection/Selection.js | 12 +- .../images/webapp/images/dojo/src/storage.js | 146 +- .../webapp/images/dojo/src/storage/Storage.as | 52 +- .../webapp/images/dojo/src/storage/browser.js | 124 +- .../webapp/images/dojo/src/string/Builder.js | 24 +- .../webapp/images/dojo/src/string/common.js | 2 +- .../images/webapp/images/dojo/src/svg.js | 14 +- .../webapp/images/dojo/src/undo/Manager.js | 10 +- .../webapp/images/dojo/src/undo/browser.js | 36 +- .../images/webapp/images/dojo/src/uri/Uri.js | 2 +- .../dojo/src/uuid/LightweightGenerator.js | 20 +- .../dojo/src/uuid/NameBasedGenerator.js | 12 +- .../images/dojo/src/uuid/NilGenerator.js | 6 +- .../images/dojo/src/uuid/RandomGenerator.js | 8 +- .../dojo/src/uuid/TimeBasedGenerator.js | 68 +- .../webapp/images/dojo/src/uuid/Uuid.js | 84 +- .../images/dojo/src/validate/__package__.js | 12 +- .../webapp/images/dojo/src/validate/check.js | 48 +- .../webapp/images/dojo/src/validate/common.js | 28 +- .../images/dojo/src/validate/creditCard.js | 14 +- .../images/dojo/src/validate/datetime.js | 8 +- .../webapp/images/dojo/src/validate/de.js | 2 +- .../webapp/images/dojo/src/validate/web.js | 2 +- .../dojo/src/widget/AccordionContainer.js | 24 +- .../images/dojo/src/widget/AnimatedPng.js | 6 +- .../webapp/images/dojo/src/widget/Button.js | 70 +- .../webapp/images/dojo/src/widget/Chart.js | 4 +- .../webapp/images/dojo/src/widget/Checkbox.js | 6 +- .../webapp/images/dojo/src/widget/Clock.js | 34 +- .../images/dojo/src/widget/ColorPalette.js | 2 +- .../images/dojo/src/widget/ContentPane.js | 108 +- .../images/dojo/src/widget/CurrencyTextbox.js | 6 +- .../images/dojo/src/widget/DatePicker.js | 78 +- .../images/dojo/src/widget/DateTextbox.js | 16 +- .../webapp/images/dojo/src/widget/Dialog.js | 26 +- .../webapp/images/dojo/src/widget/DocPane.js | 28 +- .../images/dojo/src/widget/DomWidget.js | 108 +- .../dojo/src/widget/DropdownContainer.js | 4 +- .../dojo/src/widget/DropdownDatePicker.js | 32 +- .../dojo/src/widget/DropdownTimePicker.js | 42 +- .../webapp/images/dojo/src/widget/Editor2.js | 10 +- .../widget/Editor2Plugin/AlwaysShowToolbar.js | 2 +- .../src/widget/Editor2Plugin/FindReplace.js | 18 +- .../widget/Editor2Plugin/FindReplaceDialog.js | 4 +- .../widget/Editor2Plugin/TableOperation.js | 2 +- .../widget/Editor2Plugin/ToolbarDndSupport.js | 2 +- .../src/widget/Editor2Plugin/__package__.js | 2 +- .../images/dojo/src/widget/Editor2Toolbar.js | 2 +- .../images/dojo/src/widget/FilteringTable.js | 58 +- .../images/dojo/src/widget/FisheyeList.js | 30 +- .../webapp/images/dojo/src/widget/Form.js | 10 +- .../images/dojo/src/widget/GoogleMap.js | 6 +- .../images/dojo/src/widget/HtmlWidget.js | 10 +- .../images/dojo/src/widget/InlineEditBox.js | 20 +- .../images/dojo/src/widget/IntegerTextbox.js | 8 +- .../images/dojo/src/widget/InternetTextbox.js | 38 +- .../images/dojo/src/widget/LayoutContainer.js | 2 +- .../webapp/images/dojo/src/widget/Manager.js | 34 +- .../webapp/images/dojo/src/widget/Menu2.js | 24 +- .../images/dojo/src/widget/MonthlyCalendar.js | 24 +- .../images/dojo/src/widget/PageContainer.js | 24 +- .../webapp/images/dojo/src/widget/Parse.js | 52 +- .../images/dojo/src/widget/PopupContainer.js | 6 +- .../images/dojo/src/widget/ProgressBar.js | 62 +- .../images/dojo/src/widget/RadioGroup.js | 62 +- .../dojo/src/widget/RealNumberTextbox.js | 18 +- .../images/dojo/src/widget/RegexpTextbox.js | 4 +- .../dojo/src/widget/RemoteTabController.js | 4 +- .../webapp/images/dojo/src/widget/Repeater.js | 12 +- .../dojo/src/widget/ResizableTextarea.js | 10 +- .../images/dojo/src/widget/ResizeHandle.js | 8 +- .../webapp/images/dojo/src/widget/RichText.js | 4 +- .../webapp/images/dojo/src/widget/Rounded.js | 106 +- .../webapp/images/dojo/src/widget/Select.js | 2 +- .../webapp/images/dojo/src/widget/Show.js | 18 +- .../images/dojo/src/widget/ShowAction.js | 2 +- .../images/dojo/src/widget/ShowSlide.js | 6 +- .../images/dojo/src/widget/SlideShow.js | 22 +- .../webapp/images/dojo/src/widget/Slider.js | 48 +- .../images/dojo/src/widget/SortableTable.js | 26 +- .../webapp/images/dojo/src/widget/Spinner.js | 2 +- .../images/dojo/src/widget/SplitContainer.js | 16 +- .../images/dojo/src/widget/SvgButton.js | 4 +- .../images/dojo/src/widget/TabContainer.js | 8 +- .../webapp/images/dojo/src/widget/TaskBar.js | 8 +- .../webapp/images/dojo/src/widget/Textbox.js | 22 +- .../images/dojo/src/widget/TimePicker.js | 60 +- .../images/dojo/src/widget/TitlePane.js | 8 +- .../webapp/images/dojo/src/widget/Toaster.js | 12 +- .../webapp/images/dojo/src/widget/Toggler.js | 4 +- .../webapp/images/dojo/src/widget/Tooltip.js | 12 +- .../dojo/src/widget/TreeBasicControllerV3.js | 364 ++-- .../images/dojo/src/widget/TreeCommon.js | 88 +- .../dojo/src/widget/TreeContextMenuV3.js | 30 +- .../webapp/images/dojo/src/widget/TreeDemo.js | 54 +- .../src/widget/TreeDeselectOnDblselect.js | 4 +- .../src/widget/TreeDisableWrapExtension.js | 16 +- .../dojo/src/widget/TreeDndControllerV3.js | 52 +- .../dojo/src/widget/TreeDocIconExtension.js | 66 +- .../images/dojo/src/widget/TreeEditor.js | 52 +- .../dojo/src/widget/TreeEmphasizeOnSelect.js | 14 +- .../src/widget/TreeExpandToNodeOnSelect.js | 18 +- .../dojo/src/widget/TreeLinkExtension.js | 32 +- .../src/widget/TreeLoadingControllerV3.js | 218 +- .../images/dojo/src/widget/TreeNodeV3.js | 432 ++-- .../dojo/src/widget/TreeRPCController.js | 8 +- .../dojo/src/widget/TreeRpcControllerV3.js | 222 +- .../images/dojo/src/widget/TreeSelectorV3.js | 156 +- .../dojo/src/widget/TreeTimeoutIterator.js | 82 +- .../dojo/src/widget/TreeToggleOnSelect.js | 16 +- .../webapp/images/dojo/src/widget/TreeV3.js | 156 +- .../images/dojo/src/widget/TreeWithNode.js | 114 +- .../dojo/src/widget/ValidationTextbox.js | 60 +- .../webapp/images/dojo/src/widget/Widget.js | 94 +- .../webapp/images/dojo/src/widget/Wizard.js | 4 +- .../webapp/images/dojo/src/widget/YahooMap.js | 8 +- .../images/dojo/src/widget/__package__.js | 6 +- .../src/widget/demoEngine/DemoContainer.js | 10 +- .../dojo/src/widget/demoEngine/DemoItem.js | 4 +- .../src/widget/demoEngine/DemoNavigator.js | 26 +- .../dojo/src/widget/demoEngine/DemoPane.js | 6 +- .../dojo/src/widget/demoEngine/SourcePane.js | 8 +- .../images/dojo/src/widget/html/layout.js | 2 +- .../images/dojo/src/widget/html/loader.js | 52 +- .../images/dojo/src/widget/html/stabile.js | 6 +- .../images/dojo/src/widget/svg/Chart.js | 46 +- .../src/widget/templates/CheckboxA11y.html | 2 +- .../dojo/src/widget/templates/ComboBox.css | 8 +- .../dojo/src/widget/templates/ComboBox.html | 4 +- .../dojo/src/widget/templates/DatePicker.html | 30 +- .../dojo/src/widget/templates/DocPane.html | 10 +- .../Editor2/showtableborder_gecko.css | 10 +- .../src/widget/templates/EditorToolbar.css | 4 +- .../src/widget/templates/EditorToolbar.html | 12 +- .../templates/EditorToolbarOneline.html | 20 +- .../dojo/src/widget/templates/Menu2.css | 2 +- .../src/widget/templates/MonthlyCalendar.html | 28 +- .../widget/templates/ResizableTextarea.html | 4 +- .../dojo/src/widget/templates/SlideShow.css | 2 +- .../dojo/src/widget/templates/SlideShow.html | 8 +- .../dojo/src/widget/templates/Slider.css | 12 +- .../dojo/src/widget/templates/Slider.html | 24 +- .../dojo/src/widget/templates/TaskBar.css | 2 +- .../dojo/src/widget/templates/TimePicker.css | 2 +- .../dojo/src/widget/templates/TimePicker.html | 10 +- .../dojo/src/widget/templates/Toaster.css | 6 +- .../dojo/src/widget/templates/TreeV3.css | 18 +- .../src/widget/templates/richtextframe.html | 2 +- .../webapp/images/dojo/src/widget/validate.js | 2 +- .../images/dojo/src/widget/vml/Chart.js | 34 +- .../webapp/images/dojo/src/xml/Parse.js | 36 +- .../images/dojo/src/xml/XslTransform.js | 58 +- framework/images/webapp/images/fieldlookup.js | 18 +- .../webapp/images/htmledit/whizzywig.js | 56 +- framework/images/webapp/images/jsgantt.js | 226 +- framework/images/webapp/images/maincss.css | 14 +- framework/images/webapp/images/mainrtl.css | 6 +- .../webapp/images/prototypejs/builder.js | 28 +- .../webapp/images/prototypejs/controls.js | 140 +- .../webapp/images/prototypejs/dragdrop.js | 288 +-- .../webapp/images/prototypejs/effects.js | 250 +-- .../webapp/images/prototypejs/popup.css | 2 +- .../images/webapp/images/prototypejs/popup.js | 20 +- .../images/prototypejs/scriptaculous.js | 14 +- .../prototypejs/scriptaculouscontrols.css | 2 +- .../webapp/images/prototypejs/slider.js | 74 +- .../images/webapp/images/prototypejs/sound.js | 8 +- .../webapp/images/prototypejs/tooltips.css | 2 +- .../webapp/images/prototypejs/tooltips.js | 26 +- .../webapp/images/prototypejs/unittest.js | 132 +- .../webapp/images/prototypejs/validation.js | 14 +- framework/images/webapp/images/selectall.js | 32 +- framework/jetty/ofbiz-component.xml | 2 +- framework/minilang/dtd/minilang-catalog.xml | 4 +- framework/minilang/dtd/simple-methods.xsd | 1350 ++++++------ framework/minilang/ofbiz-component.xml | 2 +- ...iz.minilang.method.MethodOperation$Factory | 4 +- ...lang.method.conditional.ConditionalFactory | 4 +- .../minilang/method/conditional/ElseIf.java | 2 +- .../minilang/method/conditional/MasterIf.java | 6 +- .../minilang/method/conditional/While.java | 4 +- .../method/otherops/PropertyToField.java | 2 +- .../resources/templates/CommonScreens.xml | 4 +- framework/resources/templates/Forms.xml | 2 +- framework/resources/templates/Screens.xml | 2 +- framework/resources/templates/build.xml | 10 +- framework/resources/templates/controller.xml | 4 +- framework/resources/templates/entitymodel.xml | 4 +- framework/resources/templates/error.jsp | 6 +- .../resources/templates/ofbiz-component.xml | 2 +- framework/resources/templates/services.xml | 2 +- framework/resources/templates/web.xml | 12 +- framework/security/config/jndiLdap.properties | 4 +- framework/security/config/security.properties | 6 +- framework/security/data/SecurityData.xml | 4 +- framework/security/entitydef/entitymodel.xml | 26 +- framework/security/ofbiz-component.xml | 2 +- framework/service/config/serviceengine.xml | 6 +- framework/service/data/ServiceDemoData.xml | 8 +- framework/service/dtd/service-catalog.xml | 12 +- framework/service/dtd/service-config.xsd | 4 +- framework/service/dtd/service-eca.xsd | 6 +- framework/service/dtd/services.xsd | 8 +- framework/service/entitydef/entitymodel.xml | 4 +- framework/service/ofbiz-component.xml | 4 +- framework/service/servicedef/services.xml | 8 +- .../service/servicedef/services_test_se.xml | 8 +- .../org/ofbiz/service/DispatchContext.java | 4 +- .../org/ofbiz/service/ModelServiceReader.java | 2 +- .../data/ServiceDeadLockRetryAssertData.xml | 4 +- .../service/testdef/data/ServiceTestData.xml | 8 +- framework/service/testdef/servicetests.xml | 10 +- framework/start/build.xml | 14 +- .../org/ofbiz/base/start/install.properties | 4 +- .../src/org/ofbiz/base/start/jetty.properties | 4 +- .../src/org/ofbiz/base/start/pos.properties | 4 +- .../src/org/ofbiz/base/start/rmi.properties | 4 +- .../src/org/ofbiz/base/start/setup.properties | 4 +- .../src/org/ofbiz/base/start/start.properties | 4 +- .../src/org/ofbiz/base/start/test.properties | 4 +- .../org/ofbiz/base/start/testlist.properties | 4 +- framework/testtools/dtd/test-suite.xsd | 6 +- framework/testtools/ofbiz-component.xml | 2 +- framework/testtools/servicedef/services.xml | 2 +- framework/webapp/config/fop.xconf | 12 +- .../config/frameworkTransforms.properties | 4 +- .../config/freemarkerTransforms.properties | 4 +- .../webapp/config/serverstats.properties | 4 +- framework/webapp/config/url.properties | 4 +- framework/webapp/config/wfs.properties | 4 +- framework/webapp/dtd/regions.xsd | 4 +- framework/webapp/dtd/site-conf.xsd | 10 +- framework/webapp/dtd/webapp-catalog.xml | 6 +- framework/webapp/entitydef/entitymodel.xml | 10 +- framework/webapp/ofbiz-component.xml | 2 +- .../webapp/control/ProtectViewWorker.java | 2 +- .../ofbiz/webapp/control/RequestHandler.java | 4 +- .../event/AbstractJSONEventHandler.java | 2 +- .../org/ofbiz/webapp/event/CoreEvents.java | 4 +- .../event/DojoJSONServiceEventHandler.java | 2 +- .../webapp/event/JSONJavaEventHandler.java | 2 +- .../webapp/event/JSONServiceEventHandler.java | 2 +- .../webapp/event/ServiceEventHandler.java | 2 +- .../event/ServiceMultiEventHandler.java | 2 +- .../webapp/event/XmlRpcEventHandler.java | 2 +- .../ofbiz/webapp/view/JPublishWrapper.java | 2 +- .../org/ofbiz/webapp/view/ViewFactory.java | 2 +- .../webslinger/config/webslinger.properties | 4 +- .../webslinger/entitydef/entitymodel.xml | 4 +- .../ofbiz/Classes/org/webslinger/mime.types | 4 +- .../Ofbiz/FilterOfbizConditionData.groovy | 4 +- framework/webslinger/ofbiz-component.xml | 2 +- .../webapp/webslinger/WEB-INF/web.xml | 30 +- .../webtools/config/WebtoolsUiLabels.xml | 2 +- .../webtools/data/WebtoolsSecurityData.xml | 6 +- framework/webtools/servicedef/services.xml | 18 +- .../actions/artifactinfo/ArtifactInfo.groovy | 4 +- .../actions/cache/EditUtilCache.groovy | 8 +- .../actions/cache/FindUtilCache.groovy | 6 +- .../cache/FindUtilCacheElements.groovy | 6 +- .../actions/datafile/viewdatafile.groovy | 4 +- .../WEB-INF/actions/entity/CheckDb.groovy | 8 +- .../WEB-INF/actions/entity/EntityMaint.groovy | 12 +- .../entity/EntityPerformanceTest.groovy | 18 +- .../WEB-INF/actions/entity/EntityRef.groovy | 4 +- .../actions/entity/EntityRefList.groovy | 10 +- .../actions/entity/EntitySQLProcessor.groovy | 6 +- .../WEB-INF/actions/entity/FindGeneric.groovy | 46 +- .../WEB-INF/actions/entity/ViewGeneric.groovy | 148 +- .../actions/entity/ViewRelations.groovy | 6 +- .../WEB-INF/actions/entity/XmlDsDump.groovy | 16 +- .../actions/labelmanager/LabelManager.groovy | 4 +- .../actions/labelmanager/UpdateManager.groovy | 4 +- .../actions/labelmanager/ViewFile.groovy | 4 +- .../actions/log/LogConfiguration.groovy | 6 +- .../WEB-INF/actions/log/LogView.groovy | 6 +- .../actions/service/AvailableServices.groovy | 26 +- .../actions/service/ScheduleJob.groovy | 6 +- .../actions/service/ServiceResult.groovy | 4 +- .../WEB-INF/actions/service/Services.groovy | 4 +- .../WEB-INF/actions/service/Threads.groovy | 4 +- .../actions/stats/StatBinsHistory.groovy | 4 +- .../actions/stats/StatsSinceStart.groovy | 4 +- .../WEB-INF/actions/workflow/ReadXpdl.groovy | 8 +- .../actions/workflow/WorkflowMonitor.groovy | 6 +- .../webapp/webtools/WEB-INF/controller.xml | 66 +- .../webtools/webapp/webtools/WEB-INF/web.xml | 12 +- .../webtools/artifactinfo/ArtifactInfo.ftl | 68 +- .../webtools/component/viewComponents.ftl | 2 +- .../webapp/webtools/entity/EditEntity.jsp | 8 +- .../webtools/entity/EntityExportAll.ftl | 2 +- .../webapp/webtools/entity/EntityMaint.ftl | 8 +- .../webapp/webtools/entity/EntityRefList.ftl | 2 +- .../webapp/webtools/entity/EntityRefMain.ftl | 32 +- .../webtools/entity/EntityRefReport.fo.ftl | 8 +- .../webtools/entity/EntitySQLProcessor.ftl | 6 +- .../webapp/webtools/entity/FindGeneric.ftl | 18 +- .../webtools/entity/ModelGroupWriter.jsp | 2 +- .../webtools/entity/ModelInduceFromDb.jsp | 4 +- .../webapp/webtools/entity/ModelWriter.jsp | 4 +- .../webapp/webtools/entity/ViewGeneric.ftl | 82 +- .../webapp/webtools/entity/ViewRelations.ftl | 2 +- .../webapp/webtools/entity/dataMySql.jsp | 2 +- .../webtools/entity/droptablesMySql.jsp | 4 +- .../webtools/entity/droptablesplain.jsp | 4 +- .../webapp/webtools/entity/tablesMySql.jsp | 4 +- .../webapp/webtools/entity/xmldsdump.ftl | 4 +- .../webapp/webtools/entity/xmldsdump.jsp | 24 +- .../webapp/webtools/entity/xmldsrawdump.jsp | 6 +- .../webtools/webapp/webtools/error/error.jsp | 6 +- .../webtools/labelmanager/SearchLabels.ftl | 2 +- .../webtools/labelmanager/UpdateLabel.ftl | 2 +- .../webtools/labelmanager/ViewLabels.ftl | 6 +- .../webtools/webapp/webtools/log/LogForms.xml | 6 +- .../performance/EntityPerformanceTest.ftl | 2 +- .../webapp/webtools/service/ServiceForms.xml | 10 +- .../webtools/service/availableservices.ftl | 8 +- .../webapp/webtools/service/serviceResult.ftl | 2 +- .../webtools/service/setServiceParameter.ftl | 4 +- .../webtools/tempexpr/tempExprForms.xml | 2 +- .../webtools/widget/ArtifactInfoScreens.xml | 2 +- .../widget/AvailableServicesScreens.xml | 4 +- framework/webtools/widget/CacheScreens.xml | 12 +- framework/webtools/widget/CommonScreens.xml | 22 +- framework/webtools/widget/EntityForms.xml | 4 +- framework/webtools/widget/EntityScreens.xml | 34 +- framework/webtools/widget/EntitySyncForms.xml | 6 +- .../webtools/widget/EntitySyncScreens.xml | 4 +- .../webtools/widget/LabelManagerScreens.xml | 2 +- framework/webtools/widget/LogScreens.xml | 6 +- framework/webtools/widget/Menus.xml | 6 +- framework/webtools/widget/MiscScreens.xml | 4 +- framework/webtools/widget/ServiceScreens.xml | 8 +- framework/webtools/widget/StatsScreens.xml | 6 +- framework/webtools/widget/TempExprScreens.xml | 6 +- framework/widget/config/conditional.xml | 4 +- .../config/freemarkerTransforms.properties | 4 +- framework/widget/config/widget.properties | 4 +- framework/widget/dtd/widget-catalog.xml | 10 +- framework/widget/dtd/widget-form.xsd | 26 +- framework/widget/dtd/widget-menu.xsd | 4 +- framework/widget/dtd/widget-screen.xsd | 6 +- framework/widget/ofbiz-component.xml | 2 +- .../src/org/ofbiz/widget/WidgetWorker.java | 4 +- .../ofbiz/widget/form/MacroFormRenderer.java | 52 +- .../ofbiz/widget/form/ModelFormAction.java | 2 +- .../ofbiz/widget/menu/ModelMenuAction.java | 2 +- .../org/ofbiz/widget/screen/HtmlWidget.java | 2 +- .../widget/screen/MacroScreenRenderer.java | 26 +- .../widget/screen/ModelScreenAction.java | 2 +- .../widget/templates/htmlFormMacroLibrary.ftl | 34 +- .../templates/htmlScreenMacroLibrary.ftl | 2 +- .../widget/templates/textFormMacroLibrary.ftl | 6 +- .../templates/xmlScreenMacroLibrary.ftl | 2 +- ij.ofbiz | 4 +- rc.ofbiz | 18 +- runtime/data/derby.properties | 6 +- specialpurpose/assetmaint/build.xml | 4 +- .../data/AssetMaintSecurityData.xml | 2 +- .../assetmaint/entitydef/entitymodel.xml | 39 +- specialpurpose/assetmaint/ofbiz-component.xml | 10 +- .../assetmaint/FixedAssetMaintEvents.xml | 12 +- .../assetmaint/servicedef/secas.xml | 2 +- .../assetmaint/servicedef/services.xml | 4 +- .../actions/assetmaint/EditMaint.groovy | 6 +- .../actions/workeffort/EditWorkEfforts.groovy | 2 +- .../webapp/assetmaint/WEB-INF/controller.xml | 14 +- .../webapp/assetmaint/WEB-INF/web.xml | 14 +- .../assetmaint/printFixedAssetMaint.fo.ftl | 16 +- .../webapp/assetmaint/error/error.jsp | 6 +- .../webapp/ismgr/WEB-INF/controller.xml | 37 +- .../assetmaint/webapp/ismgr/WEB-INF/web.xml | 14 +- .../assetmaint/webapp/ismgr/error/error.jsp | 6 +- .../assetmaint/widget/AssetmaintScreens.xml | 10 +- .../assetmaint/widget/CommonScreens.xml | 8 +- .../assetmaint/widget/FacilityScreens.xml | 6 +- .../assetmaint/widget/LookupScreens.xml | 6 +- specialpurpose/assetmaint/widget/Menus.xml | 12 +- .../assetmaint/widget/ProductScreens.xml | 10 +- .../widget/forms/FixedAssetForms.xml | 16 +- .../assetmaint/widget/forms/LookupForms.xml | 8 +- .../assetmaint/widget/forms/ProductForms.xml | 6 +- .../widget/forms/WorkEffortForms.xml | 10 +- .../assetmaint/widget/ismgr/CommonScreens.xml | 13 +- .../widget/ismgr/FieldLookupForms.xml | 12 +- .../widget/ismgr/FixedAssetForms.xml | 34 +- .../widget/ismgr/FixedAssetScreens.xml | 5 +- .../assetmaint/widget/ismgr/LookupScreens.xml | 8 +- .../assetmaint/widget/ismgr/Menus.xml | 9 +- specialpurpose/build.xml | 20 +- .../cmssite/data/CmsSiteDemoData.xml | 20 +- specialpurpose/cmssite/ofbiz-component.xml | 2 +- .../cmssite/template/cms/BlogList.ftl | 2 +- .../cmssite/template/cms/HtmlHead.ftl | 5 +- .../cmssite/template/ofbiz/ofbizHead.ftl | 2 +- .../cmssite/template/ofbiz/ofbizMain.ftl | 56 +- .../cmssite/template/ofbiz/ofbizMenu.ftl | 18 +- .../webapp/cmssite/WEB-INF/controller.xml | 4 +- .../cmssite/webapp/cmssite/WEB-INF/web.xml | 22 +- .../cmssite/webapp/cmssite/error/error.jsp | 6 +- .../webapp/ofbizsite/WEB-INF/controller.xml | 6 +- .../cmssite/webapp/ofbizsite/WEB-INF/web.xml | 22 +- .../cmssite/webapp/ofbizsite/error/error.jsp | 6 +- .../cmssite/webapp/ofbizsite/images/ofbws.css | 10 +- .../cmssite/widget/CmssiteScreens.xml | 10 +- .../cmssite/widget/OfbizsiteScreens.xml | 12 +- specialpurpose/component-load.xml | 2 +- specialpurpose/ebay/build.xml | 4 +- .../ebay/config/ebayExport.properties | 4 +- specialpurpose/ebay/ofbiz-component.xml | 2 +- specialpurpose/ebay/servicedef/services.xml | 14 +- .../actions/find/ProductsExportToEbay.groovy | 4 +- .../ebay/webapp/ebay/WEB-INF/controller.xml | 14 +- .../ebay/webapp/ebay/WEB-INF/web.xml | 10 +- .../webapp/ebay/find/productsExportToEbay.ftl | 4 +- specialpurpose/ebay/widget/EbayForms.xml | 2 +- specialpurpose/ebay/widget/EbayScreens.xml | 30 +- .../ecommerce/config/EcommerceUiLabels.xml | 2 +- .../ecommerce/config/blog.properties | 4 +- .../ecommerce/data/DemoConfigurator.xml | 74 +- .../ecommerce/data/DemoFinAccount.xml | 2 +- .../ecommerce/data/DemoMarketing.xml | 22 +- .../ecommerce/data/DemoOrderPeopleData.xml | 48 +- .../ecommerce/data/DemoOrderTestData.xml | 26 +- specialpurpose/ecommerce/data/DemoProduct.xml | 82 +- .../data/DemoProductCategoriesI18nData.xml | 126 +- .../ecommerce/data/DemoProductI18nData.xml | 14 +- .../ecommerce/data/DemoProductImages.xml | 2 +- .../ecommerce/data/DemoPurchasing.xml | 22 +- .../ecommerce/data/DemoRentalProduct.xml | 12 +- .../ecommerce/data/DemoShipping.xml | 14 +- .../ecommerce/data/DemoStandardCosting.xml | 6 +- .../data/DemoStoreGiftCertificateSettings.xml | 12 +- specialpurpose/ecommerce/data/DemoSurvey.xml | 10 +- .../ecommerce/data/DemoTaxAuthority.xml | 52 +- .../ecommerce/data/DemoTreeContent.xml | 26 +- .../data/DemoWebSitePublishPointData.xml | 20 +- .../ecommerce/data/EcommerceTypeData.xml | 2 +- specialpurpose/ecommerce/ofbiz-component.xml | 8 +- .../ecommerce/customer/CustomerEvents.xml | 132 +- .../customer/QuickAnonCustomerEvents.xml | 58 +- .../ecommerce/misc/AffiliateMapProcs.xml | 2 +- .../ecommerce/misc/AffiliateSimpleEvents.xml | 2 +- .../order/ProcessPaymentSettings.groovy | 12 +- .../email/ShipmentNotificationEmail.ftl | 20 +- .../templates/survey/genericresult.ftl | 2 +- .../ecommerce/templates/survey/miniresult.ftl | 2 +- .../webapp/ecomclone/WEB-INF/controller.xml | 2 +- .../webapp/ecomclone/WEB-INF/web.xml | 24 +- .../webapp/ecomclone/error/error.jsp | 6 +- .../ecommerce/WEB-INF/actions/Login.groovy | 4 +- .../ecommerce/WEB-INF/actions/Main.groovy | 12 +- .../WEB-INF/actions/cart/ShowCart.groovy | 4 +- .../WEB-INF/actions/cart/ShowPromoText.groovy | 4 +- .../actions/catalog/MiniProductSummary.groovy | 14 +- .../actions/catalog/MiniReorderProds.groovy | 4 +- .../actions/content/AdvancedSearchPrep.groovy | 4 +- .../actions/content/ContentPrep.groovy | 4 +- .../WEB-INF/actions/content/Mrv.groovy | 8 +- .../WEB-INF/actions/content/Search.groovy | 6 +- .../actions/customer/ChangePassword.groovy | 6 +- .../actions/customer/ContactList.groovy | 4 +- .../actions/customer/CustomerSurvey.groovy | 4 +- .../customer/EditBillingAddress.groovy | 14 +- .../actions/customer/EditContactMech.groovy | 16 +- .../customer/EditEmailAndTelecomNumber.groovy | 10 +- .../actions/customer/EditPaymentMethod.groovy | 6 +- .../actions/customer/EditPerson.groovy | 6 +- .../customer/EditShippingAddress.groovy | 8 +- .../actions/customer/GiftCardBalance.groovy | 4 +- .../actions/customer/GiftCardLink.groovy | 4 +- .../actions/customer/NewCustomer.groovy | 4 +- .../actions/customer/ViewProfile.groovy | 4 +- .../actions/forum/ContentAddPrep.groovy | 4 +- .../WEB-INF/actions/forum/ContentPrep.groovy | 8 +- .../actions/forum/CurrentValPrep.groovy | 8 +- .../WEB-INF/actions/forum/EditAddPrep.groovy | 4 +- .../WEB-INF/actions/forum/FormPrep.groovy | 8 +- .../WEB-INF/actions/forum/HtmlAreaPrep.groovy | 4 +- .../actions/forum/NodeTrailPrep.groovy | 8 +- .../actions/forum/OwnerContentPrep.groovy | 4 +- .../WEB-INF/actions/forum/PermPrep.groovy | 6 +- .../WEB-INF/actions/forum/PubInit.groovy | 4 +- .../actions/forum/RespondPermAndPrep.groovy | 4 +- .../WEB-INF/actions/forum/ResponsePrep.groovy | 6 +- .../WEB-INF/actions/forum/ViewPrep.groovy | 4 +- .../WEB-INF/actions/includes/MruAdd.groovy | 4 +- .../order/AnonymousCheckoutLinks.groovy | 4 +- .../actions/order/AnonymousTrail.groovy | 4 +- .../WEB-INF/actions/order/BillSettings.groovy | 4 +- .../actions/order/CheckoutReview.groovy | 4 +- .../order/CheckoutShippingOptions.groovy | 4 +- .../WEB-INF/actions/order/CustSettings.groovy | 16 +- .../actions/order/OptionSettings.groovy | 4 +- .../WEB-INF/actions/order/OrderHistory.groovy | 16 +- .../WEB-INF/actions/order/OrderStatus.groovy | 16 +- .../actions/order/PaymentInformation.groovy | 14 +- .../actions/order/PaymentOptions.groovy | 4 +- .../order/QuickAnonCheckoutLinks.groovy | 6 +- .../order/QuickAnonCustSettings.groovy | 26 +- .../order/QuickAnonOptionSettings.groovy | 4 +- .../order/QuickAnonPaymentInformation.groovy | 8 +- .../actions/order/RequestReturn.groovy | 8 +- .../WEB-INF/actions/order/ShipSettings.groovy | 10 +- .../actions/order/ShipmentStatus.groovy | 4 +- .../WEB-INF/actions/order/SplitShip.groovy | 4 +- .../shoppinglist/EditShoppingList.groovy | 16 +- .../webapp/ecommerce/WEB-INF/controller.xml | 154 +- .../webapp/ecommerce/WEB-INF/web.xml | 20 +- .../ecommerce/webapp/ecommerce/blog/main.ftl | 2 +- .../webapp/ecommerce/cart/minipromotext.ftl | 2 +- .../webapp/ecommerce/cart/showcart.ftl | 8 +- .../ecommerce/catalog/ProductCategoryLink.ftl | 4 +- .../ecommerce/catalog/advancedsearch.ftl | 6 +- .../ecommerce/catalog/configproductdetail.ftl | 18 +- .../ecommerce/catalog/lastviewedproducts.ftl | 4 +- .../catalog/minilastviewedcategories.ftl | 6 +- .../ecommerce/catalog/miniproductsummary.ftl | 2 +- .../ecommerce/catalog/productdetail.ftl | 32 +- .../ecommerce/catalog/sidedeepcategory.ftl | 2 +- .../webapp/ecommerce/content/ContentForms.xml | 8 +- .../webapp/ecommerce/content/bloglib.ftl | 2 +- .../ecommerce/content/showcontenttree.ftl | 16 +- .../webapp/ecommerce/content/viewcontent.ftl | 2 +- .../ecommerce/customer/digitalproductlist.ftl | 2 +- .../customer/profile/EditBillToAddress.ftl | 2 +- .../customer/profile/EditPostalAddress.ftl | 2 +- .../customer/profile/EditShipToAddress.ftl | 6 +- .../customer/profile/ManageAddress.ftl | 4 +- .../customer/profile/NewCustomer.ftl | 22 +- .../webapp/ecommerce/customer/viewprofile.ftl | 4 +- .../webapp/ecommerce/error/error.jsp | 6 +- .../webapp/ecommerce/forum/ForumForms.xml | 14 +- .../ecommerce/forum/ViewComboResponse.ftl | 4 +- .../webapp/ecommerce/forum/bloglib.ftl | 2 +- .../webapp/ecommerce/forum/forumPaging.ftl | 2 +- .../webapp/ecommerce/forum/forums.ftl | 2 +- .../webapp/ecommerce/forum/messageDisplay.ftl | 2 +- .../webapp/ecommerce/forum/mostrecent.ftl | 2 +- .../webapp/ecommerce/forum/showblog.ftl | 4 +- .../ecommerce/forum/showforumresponse.ftl | 4 +- .../webapp/ecommerce/images/blog.css | 2 +- .../ecommerce/images/checkoutProcess.js | 68 +- .../ecommerce/images/geoAutoCompleter.js | 8 +- .../webapp/ecommerce/images/profile.js | 36 +- .../ecommerce/images/quickAnonCustSettings.js | 6 +- .../webapp/ecommerce/includes/headerHead.ftl | 8 +- .../ecommerce/webapp/ecommerce/login.ftl | 2 +- .../webapp/ecommerce/makebogodata.jsp | 2 +- .../order/OnePageCheckoutProcess.ftl | 80 +- .../webapp/ecommerce/order/orderheader.ftl | 26 +- .../webapp/ecommerce/order/paymentoptions.ftl | 2 +- .../ecommerce/order/quickAnonCustSettings.ftl | 8 +- .../ecommerce/order/quickAnonOrderHeader.ftl | 6 +- .../order/quickAnonPaymentInformation.ftl | 18 +- .../webapp/ecommerce/order/requestreturn.ftl | 2 +- .../webapp/ecommerce/order/splitship.ftl | 2 +- .../webapp/ecommerce/quote/QuoteList.ftl | 2 +- .../ecommerce/widget/CartScreens.xml | 8 +- .../ecommerce/widget/CatalogScreens.xml | 26 +- .../ecommerce/widget/CommonScreens.xml | 34 +- .../ecommerce/widget/ContentScreens.xml | 2 +- .../ecommerce/widget/CustomerScreens.xml | 20 +- .../ecommerce/widget/EcommerceSetup.groovy | 4 +- .../widget/EmailContactListScreens.xml | 4 +- .../ecommerce/widget/EmailGiftCardScreens.xml | 2 +- .../ecommerce/widget/EmailOrderScreens.xml | 4 +- .../ecommerce/widget/EmailProductScreens.xml | 2 +- .../ecommerce/widget/EmailReturnScreens.xml | 2 +- .../ecommerce/widget/ForumForms.xml | 4 +- .../ecommerce/widget/ForumTrees.xml | 12 +- .../ecommerce/widget/OrderScreens.xml | 72 +- .../ecommerce/widget/QuoteScreens.xml | 4 +- .../ecommerce/widget/RequestScreens.xml | 4 +- .../ecommerce/widget/ShoppingListScreens.xml | 2 +- .../ecommerce/widget/blog/BlogForms.xml | 12 +- .../ecommerce/widget/blog/BlogMenus.xml | 4 +- .../ecommerce/widget/blog/BlogTrees.xml | 2 +- .../config/googleCheckout.properties | 4 +- .../googleCheckout/ofbiz-component.xml | 4 +- .../googleCheckout/PrepareXMLTemplate.xml | 4 +- .../googleCheckout/ShoppingCartServices.xml | 4 +- .../googleCheckout/servicedef/services.xml | 4 +- .../widget/GoogleCheckoutScreens.xml | 4 +- specialpurpose/googlebase/build.xml | 2 +- .../config/googleBaseExport.properties | 4 +- specialpurpose/googlebase/ofbiz-component.xml | 2 +- .../webapp/googlebase/WEB-INF/controller.xml | 6 +- .../webapp/googlebase/WEB-INF/web.xml | 10 +- .../googlebase/widget/GoogleBaseForms.xml | 2 +- .../googlebase/widget/GoogleBaseScreens.xml | 34 +- .../org/ofbiz/hhfacility/FacilityServices.xml | 4 +- .../servicedef/services_hhfacility.xml | 6 +- .../WEB-INF/actions/Facilities.groovy | 4 +- .../WEB-INF/actions/ProductList.groovy | 4 +- .../WEB-INF/actions/ProductStockTake.groovy | 10 +- .../webapp/hhfacility/WEB-INF/controller.xml | 26 +- .../webapp/hhfacility/WEB-INF/web.xml | 8 +- .../webapp/hhfacility/error/error.jsp | 6 +- .../webapp/hhfacility/forms/FacilityForms.xml | 4 +- .../webapp/hhfacility/includes/header.ftl | 6 +- .../hhfacility/webapp/hhfacility/login.ftl | 2 +- .../webapp/hhfacility/productstocktake.ftl | 8 +- .../widget/hhfacility/FacilityScreens.xml | 8 +- specialpurpose/ldap/config/ldap.xml | 4 +- .../myportal/data/MyPortalDemoData.xml | 16 +- .../myportal/data/MyPortalSecurityData.xml | 2 +- .../myportal/data/MyPortalTypeData.xml | 42 +- specialpurpose/myportal/ofbiz-component.xml | 10 +- .../script/org/ofbiz/myportal/Events.xml | 30 +- .../org/ofbiz/myportal/MyPortalServices.xml | 12 +- .../myportal/servicedef/services.xml | 2 +- .../actions/ConvertInvoiceCurrency.groovy | 18 +- .../webapp/myportal/WEB-INF/controller.xml | 24 +- .../myportal/webapp/myportal/WEB-INF/web.xml | 14 +- .../myportal/webapp/myportal/error/error.jsp | 6 +- .../myportal/widget/MyPortalForms.xml | 6 +- .../myportal/widget/MyPortalMenus.xml | 8 +- .../myportal/widget/MyPortalScreens.xml | 2 +- .../myportal/widget/RequestForms.xml | 4 +- specialpurpose/oagis/config/OagisUiLabels.xml | 2 +- specialpurpose/oagis/config/oagis.properties | 4 +- specialpurpose/oagis/data/OagisTypeData.xml | 10 +- .../oagis/dtd/002_confirm_bod_004.xsd | 12 +- .../oagis/dtd/068_sync_inventory_005.xsd | 8 +- .../oagis/dtd/161B_process_shipment_001.xsd | 16 +- .../oagis/dtd/161_show_shipment_005.xsd | 16 +- .../dtd/196_acknowledge_delivery_001.xsd | 10 +- .../oagis/dtd/197_receive_delivery_001.xsd | 10 +- specialpurpose/oagis/dtd/oagis_fields.xsd | 28 +- specialpurpose/oagis/dtd/oagis_segments.xsd | 28 +- .../oagis/entitydef/entitymodel.xml | 16 +- specialpurpose/oagis/ofbiz-component.xml | 8 +- .../org/ofbiz/oagis/OagisMessageServices.xml | 16 +- specialpurpose/oagis/servicedef/services.xml | 30 +- .../ofbiz/oagis/OagisInventoryServices.java | 10 +- .../src/org/ofbiz/oagis/OagisServices.java | 2 +- .../ofbiz/oagis/OagisShipmentServices.java | 2 +- .../templates/email/InventoryNoticeEmail.ftl | 20 +- .../oagis/webapp/oagis/WEB-INF/controller.xml | 48 +- .../oagis/webapp/oagis/WEB-INF/web.xml | 14 +- .../oagis/webapp/oagis/error/error.jsp | 6 +- .../oagis/webapp/oagis/message/ConfirmBod.ftl | 4 +- .../webapp/oagis/message/ProcessShipment.ftl | 12 +- .../webapp/oagis/message/ReceiveDelivery.ftl | 12 +- specialpurpose/oagis/widget/CommonScreens.xml | 2 +- .../oagis/widget/EmailOagisMessageScreens.xml | 8 +- specialpurpose/oagis/widget/Menus.xml | 6 +- .../oagis/widget/MessageInfoScreens.xml | 50 +- .../oagis/widget/forms/MessageInfoForms.xml | 16 +- .../pos/config/XuiLabels_es.properties | 4 +- .../pos/config/XuiLabels_it.properties | 4 +- .../pos/config/XuiLabels_ro.properties | 8 +- .../pos/config/XuiLabels_zh.properties | 4 +- specialpurpose/pos/config/balance.txt | 4 +- specialpurpose/pos/config/buttonevents.xml | 2 +- specialpurpose/pos/config/custreceipt.txt | 6 +- specialpurpose/pos/config/jpos.properties | 6 +- specialpurpose/pos/config/jpos.xml | 16 +- .../pos/config/parameters.properties | 36 +- specialpurpose/pos/config/storereceipt.txt | 4 +- specialpurpose/pos/config/totals.txt | 4 +- specialpurpose/pos/config/xpos.properties | 4 +- specialpurpose/pos/data/DemoRetail.xml | 10 +- specialpurpose/pos/data/PosSecurityData.xml | 8 +- specialpurpose/pos/data/PosSyncSettings.xml | 10 +- specialpurpose/pos/entitydef/entitymodel.xml | 4 +- specialpurpose/pos/ofbiz-component.xml | 4 +- .../screens/default/dialog/ConfigureItem.xml | 6 +- .../pos/screens/default/dialog/PaidInOut.xml | 2 +- .../pos/screens/default/dialog/keyboard.xml | 28 +- .../pos/screens/default/dialog/numeric.xml | 4 +- .../pos/screens/default/dialog/savesale.xml | 2 +- .../pos/screens/default/includes/journal.xml | 2 +- .../pos/screens/default/includes/numeric.xml | 2 +- .../pos/screens/default/includes/payinput.xml | 2 +- .../pos/screens/default/menu/mgrmain.xml | 2 +- .../pos/screens/default/menu/posmain.xml | 4 +- .../pos/screens/default/menu/promomain.xml | 4 +- .../org/ofbiz/pos/event/PaymentEvents.java | 2 +- .../src/org/ofbiz/pos/screen/PosScreen.java | 2 +- specialpurpose/pos/styles/posstyles.xml | 2 +- specialpurpose/pos/styles/posstyles_zh.xml | 2 +- .../projectmgr/data/ProjectMgrDemoData.xml | 30 +- .../projectmgr/data/ProjectMgrPortletData.xml | 42 +- .../data/ProjectMgrSecurityData.xml | 10 +- .../projectmgr/data/ProjectMgrTypeData.xml | 14 +- .../projectmgr/entitydef/entitymodel.xml | 16 +- specialpurpose/projectmgr/ofbiz-component.xml | 6 +- .../project/ProjectPermissionServices.xml | 34 +- .../org/ofbiz/project/ProjectServices.xml | 216 +- .../org/ofbiz/project/ProjectSimpleEvents.xml | 34 +- .../projectmgr/servicedef/secas.xml | 6 +- .../projectmgr/servicedef/services.xml | 46 +- .../WEB-INF/actions/EditWeekTimesheet.groovy | 46 +- .../WEB-INF/actions/GanttChart.groovy | 16 +- .../actions/ListCurrentProjects.groovy | 8 +- .../actions/ListResourceBillingHours.groovy | 8 +- .../WEB-INF/actions/ProjectBilling.groovy | 12 +- .../WEB-INF/actions/getProjectId.groovy | 6 +- .../webapp/projectmgr/WEB-INF/web.xml | 14 +- .../webapp/projectmgr/error/error.jsp | 6 +- .../projectmgr/project/edittaskandassoc.ftl | 62 +- .../webapp/projectmgr/project/gantChart.ftl | 7 +- .../projectmgr/project/summary/noteinfo.ftl | 22 +- .../request/overViewRequestItems.ftl | 2 +- .../projectmgr/widget/CommonScreens.xml | 40 +- specialpurpose/projectmgr/widget/Menus.xml | 24 +- .../projectmgr/widget/ProjectScreens.xml | 8 +- .../projectmgr/widget/RequestScreens.xml | 8 +- .../projectmgr/widget/ResourceScreens.xml | 24 +- .../projectmgr/widget/TaskScreens.xml | 84 +- .../projectmgr/widget/TimeSheetScreens.xml | 38 +- .../projectmgr/widget/WorkEffortTrees.xml | 2 +- .../projectmgr/widget/forms/ProjectForms.xml | 2 +- .../projectmgr/widget/forms/RequestForms.xml | 12 +- .../shark/config/SharkUiLabels.properties | 4 +- .../shark/config/SharkUiLabels_ru.properties | 4 +- specialpurpose/shark/config/shark.properties | 4 +- .../shark/entitydef/entitymodel.xml | 6 +- specialpurpose/shark/ofbiz-component.xml | 2 +- .../shark/servicedef/services_test.xml | 2 +- .../actions/process/processDetailList.bsh | 8 +- .../actions/process/processHistory.bsh | 4 +- .../WEB-INF/actions/process/processList.bsh | 8 +- .../WEB-INF/actions/process/processSteps.bsh | 4 +- .../actions/repository/showRepository.bsh | 4 +- .../WEB-INF/actions/tasklist/worklist.bsh | 4 +- .../shark/webapp/shark/WEB-INF/controller.xml | 12 +- .../shark/webapp/shark/WEB-INF/web.xml | 10 +- .../shark/webapp/shark/includes/appheader.ftl | 6 +- specialpurpose/shark/webapp/shark/main.ftl | 2 +- .../shark/repository/showRepository.ftl | 2 +- specialpurpose/shark/widget/CommonScreens.xml | 4 +- .../shark/widget/ProcessScreens.xml | 10 +- .../shark/widget/RepositoryScreens.xml | 2 +- .../shark/widget/TaskListScreens.xml | 2 +- specialpurpose/webpos/data/DemoPosData.xml | 2 +- specialpurpose/webpos/ofbiz-component.xml | 6 +- .../org/ofbiz/webpos/WebPosServices.xml | 2 +- .../org/ofbiz/webpos/event/ManagerEvents.xml | 10 +- .../org/ofbiz/webpos/event/PaymentEvents.xml | 66 +- specialpurpose/webpos/servicedef/services.xml | 6 +- .../webpos/servicedef/services_manager.xml | 18 +- .../webpos/servicedef/services_payment.xml | 18 +- .../webpos/servicedef/services_promo.xml | 4 +- .../webpos/WEB-INF/actions/Login.groovy | 8 +- .../WEB-INF/actions/buttons/Main.groovy | 6 +- .../WEB-INF/actions/buttons/Payment.groovy | 8 +- .../WEB-INF/actions/cart/MicroCart.groovy | 4 +- .../WEB-INF/actions/cart/ShowCart.groovy | 6 +- .../actions/manager/PaidOutAndIn.groovy | 4 +- .../webapp/webpos/WEB-INF/controller.xml | 104 +- .../webpos/webapp/webpos/WEB-INF/web.xml | 14 +- .../webpos/webapp/webpos/buttons/Main.ftl | 6 +- .../webpos/webapp/webpos/cart/ShowCart.ftl | 14 +- .../webpos/webapp/webpos/error/error.jsp | 6 +- .../webapp/webpos/images/js/SearchProducts.js | 12 +- .../webpos/webapp/webpos/images/webpos.css | 4 +- .../webpos/webapp/webpos/includes/Header.ftl | 4 +- .../webpos/widget/ButtonsScreens.xml | 2 +- .../webpos/widget/CommonScreens.xml | 34 +- .../webpos/widget/ManagerScreens.xml | 10 +- .../webpos/widget/PaymentScreens.xml | 12 +- specialpurpose/webpos/widget/PromoScreens.xml | 2 +- .../webpos/widget/WebPosScreens.xml | 20 +- .../webpos/widget/WebPosSetup.groovy | 4 +- .../workflow/data/WorkFlowTypeData.xml | 2 +- .../workflow/entitydef/entitymodel.xml | 2 +- specialpurpose/workflow/ofbiz-component.xml | 4 +- .../workflow/servicedef/services.xml | 34 +- .../ofbiz/workflow/impl/WfActivityImpl.java | 2 +- .../ofbiz/workflow/impl/WfAssignmentImpl.java | 2 +- .../ofbiz/workflow/impl/WfRequesterImpl.java | 2 +- .../webapp/workflow/WEB-INF/controller.xml | 10 +- .../workflow/workflow/workflowMonitor.ftl | 4 +- .../workflow/widget/MiscScreens.xml | 6 +- startofbiz.bat | 2 +- startofbiz.sh | 4 +- startofbizNoLog.bat | 2 +- stopofbiz.sh | 6 +- themes/bluelight/includes/header.ftl | 4 +- .../webapp/bluelight/WEB-INF/web.xml | 2 +- themes/bluelight/webapp/bluelight/dropdown.js | 2 +- themes/bluelight/webapp/bluelight/style.css | 32 +- themes/multiflex/includes/header.ftl | 22 +- .../webapp/multiflex/WEB-INF/web.xml | 2 +- 2213 files changed, 21453 insertions(+), 21464 deletions(-) diff --git a/APACHE2_HEADER b/APACHE2_HEADER index 46734c60ef..6d0a4c2bb0 100644 --- a/APACHE2_HEADER +++ b/APACHE2_HEADER @@ -1,5 +1,5 @@ -The information here is based on the ASF Source Header and Copyright Notice +The information here is based on the ASF Source Header and Copyright Notice Policy which can be found here: http://www.apache.org/legal/src-headers.html @@ -23,7 +23,7 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + ===================================================================== For Java and BSH and JS Files: ===================================================================== @@ -35,9 +35,9 @@ For Java and BSH and JS Files: * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -124,9 +124,9 @@ For Properties Files: # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/LICENSE b/LICENSE index 46b9a1fab3..517b512463 100644 --- a/LICENSE +++ b/LICENSE @@ -4,7 +4,7 @@ The source code that makes up The Apache Open For Business Project licensed under the Apache License Version 2.0. Other licenses used by libraries distributed with Apache OFBiz are listed -below. This file includes a list of all libraries distributed with Apache +below. This file includes a list of all libraries distributed with Apache OFBiz and the full text of the license used for each. For additional details, see the NOTICE file and: @@ -300,18 +300,18 @@ ofbiz/trunk/applications/content/lib/poi.jar to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + ========================================================================= -The following libraries distributed with Apache OFBiz are licensed under the +The following libraries distributed with Apache OFBiz are licensed under the Apache Software License: ofbiz/trunk/framework/webapp/lib/DataVision-1.0.0.jar ========================================================================= @@ -321,50 +321,50 @@ Version 1.1 Copyright (c) 2000 The Apache Software Foundation. All rights reserved. -Redistribution and use in source and binary forms, with or without +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. The end-user documentation included with the redistribution, if any, must +3. The end-user documentation included with the redistribution, if any, must include the following acknowledgment: -"This product includes software developed by the Apache Software Foundation +"This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." -Alternately, this acknowledgment may appear in the software itself, if and +Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. -4. The names "Apache" and "Apache Software Foundation" must not be used to -endorse or promote products derived from this software without prior written +4. The names "Apache" and "Apache Software Foundation" must not be used to +endorse or promote products derived from this software without prior written permission. For written permission, please contact apache@apache.org. -5. Products derived from this software may not be called "Apache", nor may -"Apache" appear in their name, without prior written permission of the Apache +5. Products derived from this software may not be called "Apache", nor may +"Apache" appear in their name, without prior written permission of the Apache Software Foundation. -THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE -SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE +SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -This software consists of voluntary contributions made by many individuals on -behalf of the Apache Software Foundation. For more information on the Apache +This software consists of voluntary contributions made by many individuals on +behalf of the Apache Software Foundation. For more information on the Apache Software Foundation, please see . -Portions of this software are based upon public domain software originally -written at the National Center for Supercomputing Applications, University of +Portions of this software are based upon public domain software originally +written at the National Center for Supercomputing Applications, University of Illinois, Urbana-Champaign. ========================================================================= @@ -375,33 +375,33 @@ ofbiz/trunk/framework/webapp/lib/jdom-1.1.jar The JDOM License Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions, and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions, and the disclaimer that follows - these conditions in the documentation and/or other materials + notice, this list of conditions, and the disclaimer that follows + these conditions in the documentation and/or other materials provided with the distribution. 3. The name "JDOM" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact . - + 4. Products derived from this software may not be called "JDOM", nor may "JDOM" appear in their name, without prior written permission from the JDOM Project Management . - - In addition, we request (but do not require) that you include in the - end-user documentation provided with the redistribution and/or in the + + In addition, we request (but do not require) that you include in the + end-user documentation provided with the redistribution and/or in the software itself an acknowledgement equivalent to the following: "This product includes software developed by the JDOM Project (http://www.jdom.org/)." - Alternatively, the acknowledgment may be graphical using the logos + Alternatively, the acknowledgment may be graphical using the logos available at http://www.jdom.org/images/logos. THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED @@ -417,14 +417,14 @@ The JDOM License OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - This software consists of voluntary contributions made by many - individuals on behalf of the JDOM Project and was originally + This software consists of voluntary contributions made by many + individuals on behalf of the JDOM Project and was originally created by Jason Hunter and Brett McLaughlin . For more information on the JDOM Project, please see ========================================================================= -The following libraries distributed with Apache OFBiz are licensed under the +The following libraries distributed with Apache OFBiz are licensed under the BSD License: ofbiz/trunk/framework/base/lib/antisamy-bin.1.2.jar ofbiz/trunk/framework/base/lib/freemarker-2.3.15.jar @@ -449,23 +449,23 @@ ofbiz/trunk/specialpurpose/pos/lib/looks-2.0.2.jar ========================================================================= The BSD License -The following is a BSD license template. To generate your own license, change -the values of OWNER, ORGANIZATION and YEAR from their original values as given +The following is a BSD license template. To generate your own license, change +the values of OWNER, ORGANIZATION and YEAR from their original values as given here, and substitute your own. -Note: The advertising clause in the license appearing on BSD Unix files was -officially rescinded by the Director of the Office of Technology Licensing of -the University of California on July 22 1999. He states that clause 3 is +Note: The advertising clause in the license appearing on BSD Unix files was +officially rescinded by the Director of the Office of Technology Licensing of +the University of California on July 22 1999. He states that clause 3 is "hereby deleted in its entirety." -Note the new BSD license is thus equivalent to the MIT License, except for the +Note the new BSD license is thus equivalent to the MIT License, except for the no-endorsement final clause. = Regents of the University of California = University of California, Berkeley = 1998 -In the original BSD license, both occurrences of the phrase "COPYRIGHT HOLDERS +In the original BSD license, both occurrences of the phrase "COPYRIGHT HOLDERS AND CONTRIBUTORS" in the disclaimer read "REGENTS AND CONTRIBUTORS". Here is the license template: @@ -473,33 +473,33 @@ Here is the license template: Copyright (c) , All rights reserved. -Redistribution and use in source and binary forms, with or without +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, this +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation +Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Neither the name of the nor the names of its contributors may -be used to endorse or promote products derived from this software without +Neither the name of the nor the names of its contributors may +be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ========================================================================= -The following libraries distributed with Apache OFBiz are licensed under the +The following libraries distributed with Apache OFBiz are licensed under the Mozilla Public License Version 1.1: ofbiz/trunk/framework/guiapp/lib/XuiCoreSwing-v3.2rc2b.jar ofbiz/trunk/framework/guiapp/lib/XuiOptional-v3.2rc2b.jar @@ -976,7 +976,7 @@ EXHIBIT A -Mozilla Public License. Original Code Source Code for Your Modifications.] ========================================================================= -The following libraries distributed with Apache OFBiz are licensed under the +The following libraries distributed with Apache OFBiz are licensed under the Common Public License: ofbiz/trunk/specialpurpose/pos/lib/jcl.jar ofbiz/trunk/specialpurpose/pos/lib/jpos18-controls.jar @@ -1078,13 +1078,13 @@ by that Contributor alone and not by any other party; and iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or -through a medium customarily used for software exchange. +through a medium customarily used for software exchange. When the Program is made available in source code form: a) it must be made available under this Agreement; and - b) a copy of this Agreement must be included with each copy of the Program. + b) a copy of this Agreement must be included with each copy of the Program. Contributors may not remove or alter any copyright notices contained within the Program. @@ -1198,7 +1198,7 @@ after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. ========================================================================= -The following libraries distributed with Apache OFBiz are licensed under the +The following libraries distributed with Apache OFBiz are licensed under the MIT/X License: ofbiz/trunk/framework/base/lib/icu4j_3_6.jar ofbiz/trunk/framework/entity/lib/ofbiz-minerva.jar @@ -1231,7 +1231,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ========================================================================= -The following libraries distributed with Apache OFBiz are licensed under the +The following libraries distributed with Apache OFBiz are licensed under the W3C License: ofbiz/trunk/framework/base/lib/Tidy.jar ========================================================================= @@ -1255,7 +1255,7 @@ W3C¨ SOFTWARE NOTICE AND LICENSE 1. The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. - + 2. Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any @@ -1263,7 +1263,7 @@ W3C¨ SOFTWARE NOTICE AND LICENSE Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/" - + 3. Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.) @@ -1284,7 +1284,7 @@ W3C¨ SOFTWARE NOTICE AND LICENSE documentation will at all times remain with copyright holders. ========================================================================= -The following libraries distributed with Apache OFBiz are licensed under the +The following libraries distributed with Apache OFBiz are licensed under the Sun Public License: ofbiz/trunk/framework/base/lib/scripting/bsh-2.0b4.jar ========================================================================= @@ -1912,7 +1912,7 @@ ofbiz/trunk/framework/base/lib/jdbm-1.0.jar * * 4. Products derived from this Software may not be called "JDBM" * nor may "JDBM" appear in their names without prior written - * permission of Cees de Groot. + * permission of Cees de Groot. * * 5. Due credit should be given to the JDBM Project * (http://jdbm.sourceforge.net/). @@ -1945,7 +1945,7 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 1. Definitions. -1.1. Contributor means each individual or entity that creates or +1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications. 1.2. Contributor Version means the combination of the Original Software, @@ -1953,7 +1953,7 @@ prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor. 1.3. Covered Software means (a) the Original Software, or -(b) Modifications, or (c) the combination of files containing +(b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof. @@ -1962,7 +1962,7 @@ including portions thereof. 1.5. Initial Developer means the individual or entity that first makes Original Software available under this License. -1.6. Larger Work means a work which combines Covered Software or portions +1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License. 1.7. License means this document. @@ -1972,265 +1972,265 @@ possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. 1.9. Modifications means the Source Code and Executable form of any -of the following: A. Any file that results from an addition to, deletion -from or modification of the contents of a file containing Original Software -or previous Modifications; B. Any new file that contains any part of the -Original Software or previous Modification; or C. Any new file that is +of the following: A. Any file that results from an addition to, deletion +from or modification of the contents of a file containing Original Software +or previous Modifications; B. Any new file that contains any part of the +Original Software or previous Modification; or C. Any new file that is contributed or otherwise made available under the terms of this License. -1.10. Original Software means the Source Code and Executable form of +1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License. -1.11. Patent Claims means any patent claim(s), now owned or hereafter +1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. -1.12. Source Code means (a) the common form of computer software code in -which modifications are made and (b) associated documentation included +1.12. Source Code means (a) the common form of computer software code in +which modifications are made and (b) associated documentation included in or with such code. -1.13. You (or Your) means an individual or a legal entity exercising -rights under, and complying with all of the terms of, this License. +1.13. You (or Your) means an individual or a legal entity exercising +rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, -or is under common control with You. For purposes of this definition, -control means (a) the power, direct or indirect, to cause the direction or -management of such entity, whether by contract or otherwise, or (b) ownership of -more than fifty percent (50%) of the outstanding shares or beneficial +or is under common control with You. For purposes of this definition, +control means (a) the power, direct or indirect, to cause the direction or +management of such entity, whether by contract or otherwise, or (b) ownership of +more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. 2. License Grants. - 2.1. The Initial Developer Grant. Conditioned upon Your compliance with -Section 3.1 below and subject to third party intellectual property claims, -the Initial Developer hereby grants You a world-wide, royalty-free, + 2.1. The Initial Developer Grant. Conditioned upon Your compliance with +Section 3.1 below and subject to third party intellectual property claims, +the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license: -(a) under intellectual property rights (other than patent or trademark) -Licensable by Initial Developer, to use, reproduce, modify, display, perform, -sublicense and distribute the Original Software (or portions thereof), with or +(a) under intellectual property rights (other than patent or trademark) +Licensable by Initial Developer, to use, reproduce, modify, display, perform, +sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and -(b) under Patent Claims infringed by the making, using or selling of -Original Software, to make, have made, use, practice, sell, and offer for sale, +(b) under Patent Claims infringed by the making, using or selling of +Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof); - (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date -Initial Developer first distributes or otherwise makes the Original Software + (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date +Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License; - (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for -code that You delete from the Original Software, or (2) for infringements caused -by: (i) the modification of the Original Software, or (ii) the combination of + (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for +code that You delete from the Original Software, or (2) for infringements caused +by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices. -2.2. Contributor Grant. Conditioned upon Your compliance with Section 3.1 below -and subject to third party intellectual property claims, each Contributor hereby +2.2. Contributor Grant. Conditioned upon Your compliance with Section 3.1 below +and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license: -(a) under intellectual property rights (other than patent or trademark) -Licensable by Contributor to use, reproduce, modify, display, perform, -sublicense and distribute the Modifications created by such Contributor -(or portions thereof), either on an unmodified basis, with other Modifications, +(a) under intellectual property rights (other than patent or trademark) +Licensable by Contributor to use, reproduce, modify, display, perform, +sublicense and distribute the Modifications created by such Contributor +(or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and -(b) under Patent Claims infringed by the making, using, or selling of -Modifications made by that Contributor either alone and/or in combination with -its Contributor Version (or portions of such combination), to make, use, sell, -offer for sale, have made, and/or otherwise dispose of: (1) Modifications made -by that Contributor (or portions thereof); and (2) the combination of -Modifications made by that Contributor with its Contributor Version +(b) under Patent Claims infringed by the making, using, or selling of +Modifications made by that Contributor either alone and/or in combination with +its Contributor Version (or portions of such combination), to make, use, sell, +offer for sale, have made, and/or otherwise dispose of: (1) Modifications made +by that Contributor (or portions thereof); and (2) the combination of +Modifications made by that Contributor with its Contributor Version (or portions of such combination). -(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the -date Contributor first distributes or otherwise makes the Modifications +(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the +date Contributor first distributes or otherwise makes the Modifications available to a third party. -(d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for -any code that Contributor has deleted from the Contributor Version; (2) for -infringements caused by: (i) third party modifications of Contributor Version, -or (ii) the combination of Modifications made by that Contributor with other -software (except as part of the Contributor Version) or other devices; or (3) -under Patent Claims infringed by Covered Software in the absence of +(d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for +any code that Contributor has deleted from the Contributor Version; (2) for +infringements caused by: (i) third party modifications of Contributor Version, +or (ii) the combination of Modifications made by that Contributor with other +software (except as part of the Contributor Version) or other devices; or (3) +under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor. 3. Distribution Obligations. -3.1. Availability of Source Code. Any Covered Software that You distribute or -otherwise make available in Executable form must also be made available in -Source Code form and that Source Code form must be distributed only under the -terms of this License. You must include a copy of this License with every copy -of the Source Code form of the Covered Software You distribute or otherwise -make available. You must inform recipients of any such Covered Software in -Executable form as to how they can obtain such Covered Software in Source Code -form in a reasonable manner on or through a medium customarily used +3.1. Availability of Source Code. Any Covered Software that You distribute or +otherwise make available in Executable form must also be made available in +Source Code form and that Source Code form must be distributed only under the +terms of this License. You must include a copy of this License with every copy +of the Source Code form of the Covered Software You distribute or otherwise +make available. You must inform recipients of any such Covered Software in +Executable form as to how they can obtain such Covered Software in Source Code +form in a reasonable manner on or through a medium customarily used for software exchange. -3.2. Modifications. The Modifications that You create or to which You contribute -are governed by the terms of this License. You represent that You believe Your -Modifications are Your original creation(s) and/or You have sufficient rights +3.2. Modifications. The Modifications that You create or to which You contribute +are governed by the terms of this License. You represent that You believe Your +Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License. -3.3. Required Notices. You must include a notice in each of Your Modifications -that identifies You as the Contributor of the Modification. You may not remove -or alter any copyright, patent or trademark notices contained within the -Covered Software, or any notices of licensing or any descriptive text giving +3.3. Required Notices. You must include a notice in each of Your Modifications +that identifies You as the Contributor of the Modification. You may not remove +or alter any copyright, patent or trademark notices contained within the +Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer. -3.4. Application of Additional Terms. You may not offer or impose any terms on -any Covered Software in Source Code form that alters or restricts the applicable -version of this License or the recipients rights hereunder. You may choose to -offer, and to charge a fee for, warranty, support, indemnity or liability -obligations to one or more recipients of Covered Software. However, you may do -so only on Your own behalf, and not on behalf of the Initial Developer or any -Contributor. You must make it absolutely clear that any such warranty, support, -indemnity or liability obligation is offered by You alone, and You hereby agree -to indemnify the Initial Developer and every Contributor for any liability -incurred by the Initial Developer or such Contributor as a result of warranty, +3.4. Application of Additional Terms. You may not offer or impose any terms on +any Covered Software in Source Code form that alters or restricts the applicable +version of this License or the recipients rights hereunder. You may choose to +offer, and to charge a fee for, warranty, support, indemnity or liability +obligations to one or more recipients of Covered Software. However, you may do +so only on Your own behalf, and not on behalf of the Initial Developer or any +Contributor. You must make it absolutely clear that any such warranty, support, +indemnity or liability obligation is offered by You alone, and You hereby agree +to indemnify the Initial Developer and every Contributor for any liability +incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. -3.5. Distribution of Executable Versions. You may distribute the Executable form -of the Covered Software under the terms of this License or under the terms of a -license of Your choice, which may contain terms different from this License, -provided that You are in compliance with the terms of this License and that the -license for the Executable form does not attempt to limit or alter the -recipients rights in the Source Code form from the rights set forth in this -License. If You distribute the Covered Software in Executable form under a -different license, You must make it absolutely clear that any terms which -differ from this License are offered by You alone, not by the Initial -Developer or Contributor. You hereby agree to indemnify the Initial Developer -and every Contributor for any liability incurred by the Initial Developer or +3.5. Distribution of Executable Versions. You may distribute the Executable form +of the Covered Software under the terms of this License or under the terms of a +license of Your choice, which may contain terms different from this License, +provided that You are in compliance with the terms of this License and that the +license for the Executable form does not attempt to limit or alter the +recipients rights in the Source Code form from the rights set forth in this +License. If You distribute the Covered Software in Executable form under a +different license, You must make it absolutely clear that any terms which +differ from this License are offered by You alone, not by the Initial +Developer or Contributor. You hereby agree to indemnify the Initial Developer +and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. -3.6. Larger Works. You may create a Larger Work by combining Covered Software -with other code not governed by the terms of this License and distribute the -Larger Work as a single product. In such a case, You must make sure the +3.6. Larger Works. You may create a Larger Work by combining Covered Software +with other code not governed by the terms of this License and distribute the +Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software. 4. Versions of the License. -4.1. New Versions. Sun Microsystems, Inc. is the initial license steward and may -publish revised and/or new versions of this License from time to time. Each -version will be given a distinguishing version number. Except as provided in -Section 4.3, no one other than the license steward has the right to modify +4.1. New Versions. Sun Microsystems, Inc. is the initial license steward and may +publish revised and/or new versions of this License from time to time. Each +version will be given a distinguishing version number. Except as provided in +Section 4.3, no one other than the license steward has the right to modify this License. -4.2. Effect of New Versions. You may always continue to use, distribute or -otherwise make the Covered Software available under the terms of the version of -the License under which You originally received the Covered Software. If the -Initial Developer includes a notice in the Original Software prohibiting it -from being distributed or otherwise made available under any subsequent version -of the License, You must distribute and make the Covered Software available -under the terms of the version of the License under which You originally -received the Covered Software. Otherwise, You may also choose to use, -distribute or otherwise make the Covered Software available under the terms of +4.2. Effect of New Versions. You may always continue to use, distribute or +otherwise make the Covered Software available under the terms of the version of +the License under which You originally received the Covered Software. If the +Initial Developer includes a notice in the Original Software prohibiting it +from being distributed or otherwise made available under any subsequent version +of the License, You must distribute and make the Covered Software available +under the terms of the version of the License under which You originally +received the Covered Software. Otherwise, You may also choose to use, +distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward. -4.3. Modified Versions. When You are an Initial Developer and You want to create -a new license for Your Original Software, You may create and use a modified -version of this License if You: (a) rename the license and remove any references -to the name of the license steward (except to note that the license differs -from this License); and (b) otherwise make it clear that the license contains +4.3. Modified Versions. When You are an Initial Developer and You want to create +a new license for Your Original Software, You may create and use a modified +version of this License if You: (a) rename the license and remove any references +to the name of the license steward (except to note that the license differs +from this License); and (b) otherwise make it clear that the license contains terms which differ from this License. -5. DISCLAIMER OF WARRANTY. COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN -AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF -DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE -ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH -YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU -(NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY -NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY -CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS +5. DISCLAIMER OF WARRANTY. COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN +AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF +DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE +ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH +YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU +(NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY +NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY +CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. 6. TERMINATION. -6.1. This License and the rights granted hereunder will terminate automatically -if You fail to comply with terms herein and fail to cure such breach within 30 -days of becoming aware of the breach. Provisions which, by their nature, must +6.1. This License and the rights granted hereunder will terminate automatically +if You fail to comply with terms herein and fail to cure such breach within 30 +days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. -6.2. If You assert a patent infringement claim (excluding declaratory judgment -actions) against Initial Developer or a Contributor (the Initial Developer or -Contributor against whom You assert such claim is referred to as Participant) -alleging that the Participant Software (meaning the Contributor Version where -the Participant is a Contributor or the Original Software where the Participant -is the Initial Developer) directly or indirectly infringes any patent, then any -and all rights granted directly or indirectly to You by such Participant, the -Initial Developer (if the Initial Developer is not the Participant) and all -Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days -notice from Participant terminate prospectively and automatically at the -expiration of such 60 day notice period, unless if within such 60 day period -You withdraw Your claim with respect to the Participant Software against such -Participant either unilaterally or pursuant to a written agreement +6.2. If You assert a patent infringement claim (excluding declaratory judgment +actions) against Initial Developer or a Contributor (the Initial Developer or +Contributor against whom You assert such claim is referred to as Participant) +alleging that the Participant Software (meaning the Contributor Version where +the Participant is a Contributor or the Original Software where the Participant +is the Initial Developer) directly or indirectly infringes any patent, then any +and all rights granted directly or indirectly to You by such Participant, the +Initial Developer (if the Initial Developer is not the Participant) and all +Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days +notice from Participant terminate prospectively and automatically at the +expiration of such 60 day notice period, unless if within such 60 day period +You withdraw Your claim with respect to the Participant Software against such +Participant either unilaterally or pursuant to a written agreement with Participant. -6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user -licenses that have been validly granted by You or any distributor hereunder -prior to termination (excluding licenses granted to You by any distributor) +6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user +licenses that have been validly granted by You or any distributor hereunder +prior to termination (excluding licenses granted to You by any distributor) shall survive termination. -7. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, -WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE -INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, -OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, -SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT -LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, -COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR -LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH -DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR -PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE -LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR -LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND +7. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, +WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE +INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, +OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, +SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT +LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, +COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR +LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH +DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR +PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE +LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR +LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. -8. U.S. GOVERNMENT END USERS. The Covered Software is a commercial item, as that -term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of commercial computer -software (as that term is defined at 48 C.F.R. 252.227-7014(a)(1)) and -commercial computer software documentation as such terms are used in -48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. -227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire -Covered Software with only those rights set forth herein. This U.S. Government -Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause -or provision that addresses Government rights in computer software +8. U.S. GOVERNMENT END USERS. The Covered Software is a commercial item, as that +term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of commercial computer +software (as that term is defined at 48 C.F.R. 252.227-7014(a)(1)) and +commercial computer software documentation as such terms are used in +48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. +227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire +Covered Software with only those rights set forth herein. This U.S. Government +Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause +or provision that addresses Government rights in computer software under this License. -9. MISCELLANEOUS. This License represents the complete agreement concerning -subject matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent necessary -to make it enforceable. This License shall be governed by the law of the -jurisdiction specified in a notice contained within the Original Software -(except to the extent applicable law, if any, provides otherwise), excluding such -jurisdictions conflict-of-law provisions. Any litigation relating to this -License shall be subject to the jurisdiction of the courts located in the -jurisdiction and venue specified in a notice contained within the Original -Software, with the losing party responsible for costs, including, without -limitation, court costs and reasonable attorneys fees and expenses. -The application of the United Nations Convention on Contracts for the -International Sale of Goods is expressly excluded. Any law or regulation which -provides that the language of a contract shall be construed against the drafter -shall not apply to this License. You agree that You alone are responsible for -compliance with the United States export administration regulations (and the -export control laws and regulation of any other countries) when You use, +9. MISCELLANEOUS. This License represents the complete agreement concerning +subject matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent necessary +to make it enforceable. This License shall be governed by the law of the +jurisdiction specified in a notice contained within the Original Software +(except to the extent applicable law, if any, provides otherwise), excluding such +jurisdictions conflict-of-law provisions. Any litigation relating to this +License shall be subject to the jurisdiction of the courts located in the +jurisdiction and venue specified in a notice contained within the Original +Software, with the losing party responsible for costs, including, without +limitation, court costs and reasonable attorneys fees and expenses. +The application of the United Nations Convention on Contracts for the +International Sale of Goods is expressly excluded. Any law or regulation which +provides that the language of a contract shall be construed against the drafter +shall not apply to this License. You agree that You alone are responsible for +compliance with the United States export administration regulations (and the +export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software. -10. RESPONSIBILITY FOR CLAIMS. As between Initial Developer and the Contributors, -each party is responsible for claims and damages arising, directly or indirectly, -out of its utilization of rights under this License and You agree to work with -Initial Developer and Contributors to distribute such responsibility on an -equitable basis. Nothing herein is intended or shall be deemed to constitute +10. RESPONSIBILITY FOR CLAIMS. As between Initial Developer and the Contributors, +each party is responsible for claims and damages arising, directly or indirectly, +out of its utilization of rights under this License and You agree to work with +Initial Developer and Contributors to distribute such responsibility on an +equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. -NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE -(CDDL) The code released under the CDDL shall be governed by the laws of the -State of California (excluding conflict-of-law provisions). Any litigation -relating to this License shall be subject to the jurisdiction of the Federal -Courts of the Northern District of California and the state courts of the State +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE +(CDDL) The code released under the CDDL shall be governed by the laws of the +State of California (excluding conflict-of-law provisions). Any litigation +relating to this License shall be subject to the jurisdiction of the Federal +Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California. ========================================================================= Apache OFBiz includes the XML Schema files from the Open Applications Group, Inc -NOTE: these files and the license are for an older version of the OAGIS +NOTE: these files and the license are for an older version of the OAGIS specification, namely version 7.2.1. ofbiz/specialpurpose/oagis/dtd/002_confirm_bod_004.xsd ofbiz/specialpurpose/oagis/dtd/068_sync_inventory_005.xsd @@ -2256,7 +2256,7 @@ include the following on ALL copies of the file that you use: 1. A reference to the original Open Applications Group resource 2. A notice of the form "Copyright (c) Open Applications Group. All Rights Reserved -When space permits, inclusion of the full text of this NOTICE should be provided. +When space permits, inclusion of the full text of this NOTICE should be provided. Attribution is requested to be provided in any software, documentation, or other items or products that you create related to the implementation of the contents of this file. @@ -2281,7 +2281,7 @@ Please contact the Open Applications Group at www.openapplications.org with any questions or comments regarding the usage of this material. ========================================================================= -The following libraries distributed with Apache OFBiz are licensed under the +The following libraries distributed with Apache OFBiz are licensed under the Eclipse Public License - v 1.0: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-jdt.jar ========================================================================= @@ -2497,11 +2497,11 @@ after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. ================================================================================== -Apache Ofbiz includes prototype.js from http://www.prototypejs.org licensed under -the terms of the MIT License +Apache Ofbiz includes prototype.js from http://www.prototypejs.org licensed under +the terms of the MIT License ofbiz/trunk/framework/images/webapp/images/prototype/prototype.js =================================================================================== -Apache Ofbiz includes Scriptalous javascript lib from http://script.aculo.us +Apache Ofbiz includes Scriptalous javascript lib from http://script.aculo.us licensed under the terms of the MIT License ofbiz/trunk/framework/images/webapp/images/prototype/controls.js ofbiz/trunk/framework/images/webapp/images/prototype/dragdrop.js @@ -2512,13 +2512,13 @@ ofbiz/trunk/framework/images/webapp/images/prototype/sound.js ofbiz/trunk/framework/images/webapp/images/prototype/unittest.js ofbiz/trunk/framework/images/webapp/images/prototype/builder.js =================================================================================== -Apache Ofbiz includes LivePipe Control Suite from http://livepipe.net/projects/control_suite/ -licensed under the terms of the MIT License +Apache Ofbiz includes LivePipe Control Suite from http://livepipe.net/projects/control_suite/ +licensed under the terms of the MIT License ofbiz/trunk/framework/images/webapp/images/prototype/control.progress_bar.js ofbiz/trunk/framework/images/webapp/images/prototype/progress_bar.css =================================================================================== -Apache Ofbiz includes validation.js file from -http://www.tetlaw.id.au/view/javascript/really-easy-field-validation. +Apache Ofbiz includes validation.js file from +http://www.tetlaw.id.au/view/javascript/really-easy-field-validation. ofbiz/trunk/framework/images/webapp/images/prototype/validation.js validation.js is Licensed as follows =================================================================================== @@ -2526,7 +2526,7 @@ validation.js is Licensed as follows http://tetlaw.id.au/view/javascript/really-easy-field-validation Andrew Tetlaw Version 1.5.4.1 (2007-01-05) - + Copyright (c) 2007 Andrew Tetlaw Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -2535,10 +2535,10 @@ validation.js is Licensed as follows modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND diff --git a/NOTICE b/NOTICE index 2909e86de8..999cf6b61e 100644 --- a/NOTICE +++ b/NOTICE @@ -32,15 +32,15 @@ Foundation. This product is developed by the Apache Avalon Project. http://avalon.apache.org -The names "Avalon" and "Merlin" must not be used to endorse or promote -products derived from this software without prior written permission. +The names "Avalon" and "Merlin" must not be used to endorse or promote +products derived from this software without prior written permission. For written permission, please contact pmc@avalon.apache.org. ========================================================================= == Apache Batik Notice == ========================================================================= -This software contains code from the World Wide Web Consortium (W3C) for the +This software contains code from the World Wide Web Consortium (W3C) for the Document Object Model API (DOM API) and SVG Document Type Definition (DTD). This software contains code from the International Organisation for Standardization @@ -61,10 +61,10 @@ and are placed here unaltered. (C) Copyright 1997,2004 International Business Machines Corporation. All rights reserved. -(C) Copyright IBM Corp. 2003. +(C) Copyright IBM Corp. 2003. -The portion of the functionTests under 'nist' was originally -developed by the National Institute of Standards and Technology (NIST), +The portion of the functionTests under 'nist' was originally +developed by the National Institute of Standards and Technology (NIST), an agency of the United States Department of Commerce, and adapted by International Business Machines Corporation in accordance with the NIST Software Acknowledgment and Redistribution document at @@ -117,8 +117,8 @@ The full snowball package is available from == Apache Tomcat Notice == ========================================================================= -Java compilation software for JSP pages is provided by Eclipse, -which is open source software. The orginal software and +Java compilation software for JSP pages is provided by Eclipse, +which is open source software. The orginal software and related infomation is available at http://www.eclipse.org. @@ -129,7 +129,7 @@ http://www.eclipse.org. Portions of this software were originally based on the following: - software copyright (c) 1999, IBM Corporation., http://www.ibm.com. - software copyright (c) 1999, Sun Microsystems., http://www.sun.com. - - voluntary contributions made by Paul Eng on behalf of the + - voluntary contributions made by Paul Eng on behalf of the Apache Software Foundation that were originally developed at iClick, Inc., software copyright (c) 1999. @@ -148,31 +148,31 @@ Portions of this software was originally based on the following: - software copyright (c) 2003, IBM Corporation., http://www.ibm.com. - voluntary contributions made by Ovidiu Predescu on behalf of the Apache Software Foundation that was originally developed - at Hewlett Packard Company. + at Hewlett Packard Company. The binary distribution package (ie. jars, samples and documentation) of this product includes software developed by the following: - - - The Apache Software Foundation - - Xerces Java - see xercesImpl.README.txt + + - The Apache Software Foundation + - Xerces Java - see xercesImpl.README.txt - JAXP 1.3 APIs - see xml-apis.README.txt - Bytecode Engineering Library - see BCEL.README.txt - Regular Expression - see regexp.README.txt - - - Scott Hudson, Frank Flannery, C. Scott Ananian - - CUP Parser Generator runtime (javacup\runtime) - see runtime.README.txt - + + - Scott Hudson, Frank Flannery, C. Scott Ananian + - CUP Parser Generator runtime (javacup\runtime) - see runtime.README.txt + The source distribution package (ie. all source and tools required to build Xalan Java) of this product includes software developed by the following: - + - The Apache Software Foundation - - Xerces Java - see xercesImpl.README.txt + - Xerces Java - see xercesImpl.README.txt - JAXP 1.3 APIs - see xml-apis.README.txt - Bytecode Engineering Library - see BCEL.README.txt - Regular Expression - see regexp.README.txt - Ant - see ant.README.txt - - Stylebook doc tool - see stylebook-1.0-b3_xalan-2.README.txt - - - Elliot Joel Berk and C. Scott Ananian + - Stylebook doc tool - see stylebook-1.0-b3_xalan-2.README.txt + + - Elliot Joel Berk and C. Scott Ananian - Lexical Analyzer Generator (JLex) - see JLex.README.txt ========================================================================= @@ -188,7 +188,7 @@ Portions of this software was originally based on the following: - software copyright (c) 2001-2002, Sun Microsystems., http://www.sun.com. - software copyright (c) 2003, IBM Corporation., http://www.ibm.com. - + ========================================================================= == Barcode4J Notice == ========================================================================= @@ -210,7 +210,7 @@ Visigoth Software Society (http://www.visigoths.org/). == JDBM Notice == ========================================================================= -This product includes software developed by the JDBM Project +This product includes software developed by the JDBM Project (http://jdbm.sourceforge.net/). ========================================================================= @@ -218,7 +218,7 @@ This product includes software developed by the JDBM Project ========================================================================= ============================================================== - Jetty Web Container + Jetty Web Container Copyright 1995-2006 Mort Bay Consulting Pty Ltd ============================================================== @@ -226,16 +226,16 @@ The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd unless otherwise noted. It is licensed under the apache 2.0 license. -The javax.servlet package used by Jetty is copyright -Sun Microsystems, Inc and Apache Software Foundation. It is +The javax.servlet package used by Jetty is copyright +Sun Microsystems, Inc and Apache Software Foundation. It is distributed under the Common Development and Distribution License. -You can obtain a copy of the license at +You can obtain a copy of the license at https://glassfish.dev.java.net/public/CDDLv1.0.html. The UnixCrypt.java code ~Implements the one way cryptography used by Unix systems for simple password protection. Copyright 1996 Aki Yoshida, modified April 2001 by Iris Van den Broeke, Daniel Deville. -Permission to use, copy, modify and distribute UnixCrypt +Permission to use, copy, modify and distribute UnixCrypt for non-commercial or commercial purposes and without fee is granted provided that the copyright notice appears in all copies. @@ -244,7 +244,7 @@ from project Glassfish http://glassfish.dev.java.net. Copyright 2005 Sun Microsystems, Inc. and portions Copyright Apache Software Foundation. Some portions of the code are Copyright: - 2006 Tim Vernum + 2006 Tim Vernum 1999 Jason Gilbert. The jboss integration module contains some LGPL code. @@ -333,31 +333,31 @@ Thomas Fuchs (http://script.aculo.us). ========================================================================= == BIS Crypto TSU exception notice == ========================================================================= - This distribution includes cryptographic software. The country in - which you currently reside may have restrictions on the import, - possession, use, and/or re-export to another country, of - encryption software. BEFORE using any encryption software, please + This distribution includes cryptographic software. The country in + which you currently reside may have restrictions on the import, + possession, use, and/or re-export to another country, of + encryption software. BEFORE using any encryption software, please check your country's laws, regulations and policies concerning the - import, possession, or use, and re-export of encryption software, to + import, possession, or use, and re-export of encryption software, to see if this is permitted. See for more information. The U.S. Government Department of Commerce, Bureau of Industry and - Security (BIS), has classified this software as Export Commodity + Security (BIS), has classified this software as Export Commodity Control Number (ECCN) 5D002.C.1, which includes information security software using or performing cryptographic functions with asymmetric algorithms. The form and manner of this Apache Software Foundation distribution makes it eligible for export under the License Exception - ENC Technology Software Unrestricted (TSU) exception (see the BIS - Export Administration Regulations, Section 740.13) for both object + ENC Technology Software Unrestricted (TSU) exception (see the BIS + Export Administration Regulations, Section 740.13) for both object code and source code. The following provides more details on the included cryptographic software: - - * Various classes in OFBiz, including DesCrypt, HashCrypt, and + + * Various classes in OFBiz, including DesCrypt, HashCrypt, and BlowFishCrypt use libraries from the Sun Java JDK API including - java.security.* and javax.crypto.* (the JCE, Java Cryptography + java.security.* and javax.crypto.* (the JCE, Java Cryptography Extensions API) * Other classes such as HttpClient and various related ones use the JSSE (Java Secure Sockets Extension) API @@ -375,5 +375,5 @@ Copyright (c) 2001-2003 jpim development team. == JavaCC Notice == ========================================================================= -This product includes software developed by the javacc team +This product includes software developed by the javacc team (http://javacc.dev.java.net/). The included version is 4.1. diff --git a/OPTIONAL_LIBRARIES b/OPTIONAL_LIBRARIES index fa5d691f09..9be0825010 100644 --- a/OPTIONAL_LIBRARIES +++ b/OPTIONAL_LIBRARIES @@ -1,6 +1,6 @@ DESCRIPTION This file contains information about libraries that are supported -by code in OFBiz but that are left out of SVN because of licensing issues. +by code in OFBiz but that are left out of SVN because of licensing issues. What is below is a list of jar files and where to put them, and the file(s) to change to include them in the OFBiz build and/or run-time configuration. @@ -10,7 +10,7 @@ on the old Undersun SVN server in the specialized/libraries component directory. -=- Workflow __________________________________________________________________________________________________________________________________________________ -Shark (LGPL): - http://www.enhydra.org/workflow/shark/ + http://www.enhydra.org/workflow/shark/ Current version : http://shark.objectweb.org/doc/1.1/release_notes/release_notes.html framework/shark/lib: js.jar @@ -49,26 +49,26 @@ on the old Undersun SVN server in the specialized/libraries component directory. sharkwebservice-wfxmlapi-1.2_1.jar sharkwebservice-wfxmlutils-1.2_1.jar sharkxpdl-standard-1.2_1.jar - wrd-1.2_1.jar + wrd-1.2_1.jar NOTE: these jars based on a build from version 1.2_1 may be found attached - in https://issues.apache.org/jira/browse/OFBIZ-552 + in https://issues.apache.org/jira/browse/OFBIZ-552 For an updated version some changes to the integration code in the shark component may be necessary. - TO BUILD: once the jars are in place you can build from the + TO BUILD: once the jars are in place you can build from the ofbiz/framework/shark directory, or you can add it to the build list in the ofbiz/build.xml file in the framework-builds file list. TO DEPLOY: once the build is done the Shark container must be setup in the ofbiz-containers.xml file or other containers file being used. The shark-container container should be un-commented. TO DEPLOY, PART 2: to get the component to load on startup, and get the webapp - in place and such the shark component needs to be uncommented in the + in place and such the shark component needs to be uncommented in the framework/component-load.xml file. You may experiment online with Jawe XPDL editor: http://www.enhydra.org/workflow/jawe/index.html There is an example XPDL file in https://issues.apache.org/jira/browse/OFBIZ-552 it came from http://www.wfmc.org/standards/docs/xpdl_sample/sample%20workflow%20process.xpdl - For the moment Shark engine in OFBiz refuses to load it (OK in Jawe) + For the moment Shark engine in OFBiz refuses to load it (OK in Jawe) -=- Web Presentation: ________________________________________________________________________________________________________________________________________________ @@ -104,7 +104,7 @@ on the old Undersun SVN server in the specialized/libraries component directory. If you're using the Sun JDK/JRE 1.4 or greater, the jar is located under jre/lib and it's called plugin.jar. You may also find it in the old Undersun SVN server in the specialized/libraries component directory. TO BUILD: Copy plugin.jar in framework/base/lib. This seems only needed under Windows. - + -=- Reporting: ________________________________________________________________________________________________________________________________________________ @@ -118,26 +118,26 @@ on the old Undersun SVN server in the specialized/libraries component directory. http://java.sun.com/products/jimi FOP may require a library called JIMI to print certain graphical formats such as GIFs. Jimi is a Sun library which cannot be included in OFBIZ due to licensing incompatibility, but you can download it yourself at: http://java.sun.com/products/jimi/ - and rename the ZIP file that comes with it as jimi-xxx.jar, then copy it into the same directory as fop.jar, which at this time + and rename the ZIP file that comes with it as jimi-xxx.jar, then copy it into the same directory as fop.jar, which at this time is ${ofbiz.home}/framework/webapp/lib/ -=- POS _______________________________________________________________________________________________________________________________________________________ -GTK Swing (LGPL): http://sourceforge.net/projects/gtkswing/ - TO DEPLOY: base/config/pos-containers.xml:org.gtk.java.swing.plaf.gtk.GtkLookAndFeel for look and feel + TO DEPLOY: base/config/pos-containers.xml:org.gtk.java.swing.plaf.gtk.GtkLookAndFeel for look and feel -JavaPOS hardware drivers TO DEPLOY: specialpurpose/pos/lib/ - + Epson Printer TM-T88III (Proprietay licence) needs jpos18-controls.jar (version specific) https://www.epson-pos.com/cgi-bin/sdssm/main/td_login.jsp - epsonJposService180.jar + epsonJposService180.jar epsonJposServiceCommon.jar - + Star (Proprietay licence) http://www.star-micronics.co.jp/service/s_print/starjavapos_win32-linux-macosx_yyyymmdd.zip.htm - starjavapos.jar - + starjavapos.jar + -=- Office (Word, etc) File Handling __________________________________________________________________________________________________________________________ diff --git a/README b/README index 7e7d6d5977..bde69feca0 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ Welcome to Apache OFBiz! If you have a release build all you need to run OFBiz is a 1.5 series JDK (not just the JRE, the full J2SDK). -However if you have downloaded ofbiz from SVN then you should +However if you have downloaded ofbiz from SVN then you should load the demo data (strongly advised) with the following command on the command line: @@ -28,7 +28,7 @@ http://localhost:8080/webtools/ You can log in with the user "admin" and password "ofbiz". For more details about running a build, or for information on -getting, building, and running the source please see the +getting, building, and running the source please see the Apache OFBiz Setup Guide: http://docs.ofbiz.org/x/rwM @@ -49,31 +49,31 @@ Enjoy! ========================================================================= == BIS Crypto TSU exception notice == ========================================================================= - This distribution includes cryptographic software. The country in - which you currently reside may have restrictions on the import, - possession, use, and/or re-export to another country, of - encryption software. BEFORE using any encryption software, please + This distribution includes cryptographic software. The country in + which you currently reside may have restrictions on the import, + possession, use, and/or re-export to another country, of + encryption software. BEFORE using any encryption software, please check your country's laws, regulations and policies concerning the - import, possession, or use, and re-export of encryption software, to + import, possession, or use, and re-export of encryption software, to see if this is permitted. See for more information. The U.S. Government Department of Commerce, Bureau of Industry and - Security (BIS), has classified this software as Export Commodity + Security (BIS), has classified this software as Export Commodity Control Number (ECCN) 5D002.C.1, which includes information security software using or performing cryptographic functions with asymmetric algorithms. The form and manner of this Apache Software Foundation distribution makes it eligible for export under the License Exception - ENC Technology Software Unrestricted (TSU) exception (see the BIS - Export Administration Regulations, Section 740.13) for both object + ENC Technology Software Unrestricted (TSU) exception (see the BIS + Export Administration Regulations, Section 740.13) for both object code and source code. The following provides more details on the included cryptographic software: - - * Various classes in OFBiz, including DesCrypt, HashCrypt, and + + * Various classes in OFBiz, including DesCrypt, HashCrypt, and BlowFishCrypt use libraries from the Sun Java JDK API including - java.security.* and javax.crypto.* (the JCE, Java Cryptography + java.security.* and javax.crypto.* (the JCE, Java Cryptography Extensions API) * Other classes such as HttpClient and various related ones use the JSSE (Java Secure Sockets Extension) API diff --git a/ant b/ant index 4fdc4dc981..7c80111f13 100755 --- a/ant +++ b/ant @@ -7,9 +7,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/ant.bat b/ant.bat index 96c49bfa7b..2400e34ef1 100644 --- a/ant.bat +++ b/ant.bat @@ -7,9 +7,9 @@ REM # regarding copyright ownership. The ASF licenses this file REM # to you under the Apache License, Version 2.0 (the REM # "License"); you may not use this file except in compliance REM # with the License. You may obtain a copy of the License at -REM # +REM # REM # http://www.apache.org/licenses/LICENSE-2.0 -REM # +REM # REM # Unless required by applicable law or agreed to in writing, REM # software distributed under the License is distributed on an REM # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/accounting/config/AccountingConfig.properties b/applications/accounting/config/AccountingConfig.properties index 873c12ed80..8c2ec3e384 100644 --- a/applications/accounting/config/AccountingConfig.properties +++ b/applications/accounting/config/AccountingConfig.properties @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -17,7 +17,7 @@ # under the License. ############################################################################### -# User Interface properties/defaults of the extented Accounting component. +# User Interface properties/defaults of the extented Accounting component. # what should the default of the payment to invoice processing be? # paymentProcessing by invoice or paymentprocessing by invoiceitem? diff --git a/applications/accounting/config/arithmetic.properties b/applications/accounting/config/arithmetic.properties index 2b57250cdf..5dea2b2b57 100644 --- a/applications/accounting/config/arithmetic.properties +++ b/applications/accounting/config/arithmetic.properties @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -17,7 +17,7 @@ # under the License. ############################################################################### # -# Arithmetic properties for configuring BigDecimal calculations +# Arithmetic properties for configuring BigDecimal calculations # # This is only used for rounding of GL posting trial balances and should be 1 digit more than any other financial rounding setting. diff --git a/applications/accounting/config/payment.properties b/applications/accounting/config/payment.properties index b443aaf09c..c689874563 100644 --- a/applications/accounting/config/payment.properties +++ b/applications/accounting/config/payment.properties @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -206,7 +206,7 @@ payment.verisign.checkCvv2=Y # Pre-Authorize Payments (if set to N will auto-capture) payment.verisign.preAuth=Y -# Set to false to not transmit anything +# Set to false to not transmit anything payment.verisign.enable_transmit=true ############################################ diff --git a/applications/accounting/config/paymentTest.properties b/applications/accounting/config/paymentTest.properties index 1b0dcca2b5..5df8bdac09 100644 --- a/applications/accounting/config/paymentTest.properties +++ b/applications/accounting/config/paymentTest.properties @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -38,7 +38,7 @@ payment.clearcommerce.alias=UK11113322GBP payment.clearcommerce.effectiveAlias= # Process mode (Y: approve / N: decline / R: random / P: production) // Y,N,R = test mode Y approve always -payment.clearcommerce.processMode=Y +payment.clearcommerce.processMode=Y # Server URL of the payment processor payment.clearcommerce.serverURL=https://www.uat.apixml.netq.hsbc.com diff --git a/applications/accounting/data/AccountingPortletData.xml b/applications/accounting/data/AccountingPortletData.xml index 155f6dc50a..2a20f76d5f 100644 --- a/applications/accounting/data/AccountingPortletData.xml +++ b/applications/accounting/data/AccountingPortletData.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -20,12 +20,12 @@ - - - + diff --git a/applications/accounting/data/AccountingSecurityData.xml b/applications/accounting/data/AccountingSecurityData.xml index a5984d92df..03d095e5af 100644 --- a/applications/accounting/data/AccountingSecurityData.xml +++ b/applications/accounting/data/AccountingSecurityData.xml @@ -29,7 +29,7 @@ under the License. - + @@ -43,7 +43,7 @@ under the License. - + @@ -57,7 +57,7 @@ under the License. - + @@ -75,7 +75,7 @@ under the License. - + @@ -87,7 +87,7 @@ under the License. - + @@ -111,5 +111,5 @@ under the License. - + diff --git a/applications/accounting/data/AccountingTypeData.xml b/applications/accounting/data/AccountingTypeData.xml index d1b153f2a1..8c4cf32af8 100644 --- a/applications/accounting/data/AccountingTypeData.xml +++ b/applications/accounting/data/AccountingTypeData.xml @@ -53,7 +53,7 @@ under the License. - + @@ -81,11 +81,11 @@ under the License. - + - + @@ -119,7 +119,7 @@ under the License. - + @@ -149,7 +149,7 @@ under the License. - + @@ -170,7 +170,7 @@ under the License. - + @@ -186,10 +186,10 @@ under the License. @@ -257,8 +257,8 @@ under the License. - - + + @@ -270,7 +270,7 @@ under the License. - + @@ -303,7 +303,7 @@ under the License. - + @@ -325,11 +325,11 @@ under the License. - + - + @@ -347,7 +347,7 @@ under the License. - + @@ -433,7 +433,7 @@ under the License. - + @@ -484,11 +484,11 @@ under the License. - + - + @@ -573,14 +573,14 @@ under the License. - + - + @@ -594,7 +594,7 @@ under the License. - + /> @@ -609,13 +609,13 @@ under the License. - + - + @@ -623,7 +623,7 @@ under the License. - + @@ -663,8 +663,8 @@ under the License. - - + + @@ -679,7 +679,7 @@ under the License. - + @@ -718,8 +718,8 @@ under the License. - - + + @@ -732,7 +732,7 @@ under the License. - + @@ -768,21 +768,21 @@ under the License. - + - + - + - + @@ -795,7 +795,7 @@ under the License. - + @@ -803,7 +803,7 @@ under the License. - + @@ -823,50 +823,50 @@ under the License. - + - + diff --git a/applications/accounting/data/DemoGeneralChartOfAccounts.xml b/applications/accounting/data/DemoGeneralChartOfAccounts.xml index c226f0b18d..9ba81d0bc3 100644 --- a/applications/accounting/data/DemoGeneralChartOfAccounts.xml +++ b/applications/accounting/data/DemoGeneralChartOfAccounts.xml @@ -21,578 +21,578 @@ under the License. - - - - - - - - - - - - - - - + + accountName="PETTY CASH" description="" postedBalance="0.0"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + - - - - - - - - - - + - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - + - - - + - - - - - - - - - - - - - + - - - - - - - - - + - - + - - - - + - - - - - - - + - - - - + - - - - + - - - + - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/applications/accounting/data/DemoGlSetupData.xml b/applications/accounting/data/DemoGlSetupData.xml index 123e11b278..383cfef43e 100644 --- a/applications/accounting/data/DemoGlSetupData.xml +++ b/applications/accounting/data/DemoGlSetupData.xml @@ -58,12 +58,12 @@ under the License. - + - + - + @@ -168,11 +168,11 @@ under the License. - + - - + @@ -344,7 +344,7 @@ under the License. - - + + diff --git a/applications/accounting/data/DemoOrganizationData.xml b/applications/accounting/data/DemoOrganizationData.xml index 61e121e82d..81d8fdbe63 100644 --- a/applications/accounting/data/DemoOrganizationData.xml +++ b/applications/accounting/data/DemoOrganizationData.xml @@ -31,43 +31,43 @@ under the License. - - - + + + - + - + - + - + - + - + diff --git a/applications/accounting/data/InvoiceScheduledServiceData.xml b/applications/accounting/data/InvoiceScheduledServiceData.xml index 1c8f057b14..524cbf57a9 100644 --- a/applications/accounting/data/InvoiceScheduledServiceData.xml +++ b/applications/accounting/data/InvoiceScheduledServiceData.xml @@ -36,6 +36,6 @@ under the License. ]]> - + diff --git a/applications/accounting/data/PaymentsInvoices.xml b/applications/accounting/data/PaymentsInvoices.xml index 0db9ef62c4..6322c1737a 100644 --- a/applications/accounting/data/PaymentsInvoices.xml +++ b/applications/accounting/data/PaymentsInvoices.xml @@ -56,7 +56,7 @@ under the License. - + diff --git a/applications/accounting/entitydef/eecas.xml b/applications/accounting/entitydef/eecas.xml index d8a2888542..7b1541bc8d 100644 --- a/applications/accounting/entitydef/eecas.xml +++ b/applications/accounting/entitydef/eecas.xml @@ -18,18 +18,18 @@ under the License. --> - - + - + - + - diff --git a/applications/accounting/entitydef/entitymodel.xml b/applications/accounting/entitydef/entitymodel.xml index d7d460b169..7a52686f43 100644 --- a/applications/accounting/entitydef/entitymodel.xml +++ b/applications/accounting/entitydef/entitymodel.xml @@ -93,7 +93,7 @@ under the License. - + @@ -329,7 +329,7 @@ under the License. - + @@ -502,8 +502,8 @@ under the License. - @@ -530,14 +530,14 @@ under the License. - - + @@ -581,7 +581,7 @@ under the License. - View entity to help calculate total of financial account transactions by doing a query for the sum of all amounts + View entity to help calculate total of financial account transactions by doing a query for the sum of all amounts on a range of transactionDates for a given finAccountId, finAccountTransTypeId @@ -590,7 +590,7 @@ under the License. - View entity to help calculate total of financial account authorizations by doing a query for the sum of all amounts + View entity to help calculate total of financial account authorizations by doing a query for the sum of all amounts on a range of transactionDates for a given finAccountId. Note there is no auth type to consider here, but authorizations do have from and thru dates @@ -598,13 +598,13 @@ under the License. - + - + - + @@ -732,12 +732,12 @@ under the License. - + - + @@ -757,8 +757,8 @@ under the License. - - + + @@ -818,7 +818,7 @@ under the License. - + - + @@ -1041,13 +1041,13 @@ under the License. - - + @@ -1067,17 +1067,17 @@ under the License. - - - + + - + - - + + @@ -1088,15 +1088,15 @@ under the License. - - - + @@ -2500,7 +2500,7 @@ under the License. - + @@ -2555,7 +2555,7 @@ under the License. - + @@ -2639,7 +2639,7 @@ under the License. package-name="org.ofbiz.accounting.payment" never-cache="true" title="Payment and Payment type View Entity"> - + @@ -2698,7 +2698,7 @@ under the License. - If filled in, payment is applied directly against this GL account + If filled in, payment is applied directly against this GL account @@ -2856,7 +2856,7 @@ under the License. - + - + @@ -3036,11 +3036,11 @@ under the License. - + - + @@ -3190,7 +3190,7 @@ under the License. - + @@ -3280,7 +3280,7 @@ under the License. - + @@ -3306,14 +3306,14 @@ under the License. - + - @@ -3321,7 +3321,7 @@ under the License. - + @@ -3431,5 +3431,5 @@ under the License. - + diff --git a/applications/accounting/entitydef/entitymodel_olap.xml b/applications/accounting/entitydef/entitymodel_olap.xml index 18bd1c88a3..2e784d0e01 100644 --- a/applications/accounting/entitydef/entitymodel_olap.xml +++ b/applications/accounting/entitydef/entitymodel_olap.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -101,7 +101,7 @@ under the License. - + @@ -119,7 +119,7 @@ under the License. Invoice Item star schema (Profit and Loss Statement). - + @@ -161,5 +161,5 @@ under the License. - + diff --git a/applications/accounting/ofbiz-component.xml b/applications/accounting/ofbiz-component.xml index 50908173ed..0d2a841cef 100644 --- a/applications/accounting/ofbiz-component.xml +++ b/applications/accounting/ofbiz-component.xml @@ -45,7 +45,7 @@ under the License. - + @@ -60,7 +60,7 @@ under the License. - + @@ -84,7 +84,7 @@ under the License. location="webapp/accounting" base-permission="OFBTOOLS,ACCOUNTING" mount-point="/accounting"/> - + - - - + @@ -32,7 +32,7 @@ under the License. - + @@ -40,7 +40,7 @@ under the License. - + @@ -61,7 +61,7 @@ under the License. - + @@ -77,40 +77,40 @@ under the License. - + - + - + - + - + - - + + - + @@ -119,13 +119,13 @@ under the License. - + - + diff --git a/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml b/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml index d0102fbcd7..6db2e11138 100644 --- a/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml @@ -18,13 +18,13 @@ specific language governing permissions and limitations under the License. --> - - + @@ -58,7 +58,7 @@ under the License. - + @@ -184,7 +184,7 @@ under the License. - + @@ -210,7 +210,7 @@ under the License. - + @@ -288,7 +288,7 @@ under the License. - + @@ -296,13 +296,13 @@ under the License. - + - + @@ -315,13 +315,13 @@ under the License. - + - + diff --git a/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml b/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml index f1bd340969..728a2afd31 100644 --- a/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml @@ -18,9 +18,9 @@ specific language governing permissions and limitations under the License. --> - - + diff --git a/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml b/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml index 794ec6fa19..dae231517d 100644 --- a/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml @@ -21,23 +21,23 @@ under the License. - + - + - + - + - + - + @@ -54,7 +54,7 @@ under the License. - + @@ -63,7 +63,7 @@ under the License. - + @@ -71,17 +71,17 @@ under the License. - - - - - + - + @@ -108,16 +108,16 @@ under the License. - + - + - + @@ -129,7 +129,7 @@ under the License. - + diff --git a/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml b/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml index 101603d2fc..f8e4dfe9eb 100644 --- a/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml @@ -20,7 +20,7 @@ under the License. - + @@ -29,12 +29,12 @@ under the License. - + - + @@ -47,9 +47,9 @@ under the License. - + - + @@ -71,7 +71,7 @@ under the License. - + @@ -79,13 +79,13 @@ under the License. - + - + @@ -113,7 +113,7 @@ under the License. - + @@ -127,19 +127,19 @@ under the License. - + - + - + - + @@ -150,18 +150,18 @@ under the License. - + - + - + - + @@ -173,7 +173,7 @@ under the License. - + @@ -189,7 +189,7 @@ under the License. - + @@ -211,15 +211,15 @@ under the License. - + - + - + @@ -236,7 +236,7 @@ under the License. - + @@ -250,7 +250,7 @@ under the License. - + @@ -260,7 +260,7 @@ under the License. - + @@ -271,15 +271,15 @@ under the License. - + - + - + @@ -316,7 +316,7 @@ under the License. - + @@ -324,7 +324,7 @@ under the License. - + @@ -332,18 +332,18 @@ under the License. - + - + - + @@ -351,13 +351,13 @@ under the License. - + - + diff --git a/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml b/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml index 8b76e37c4f..31be9d0b5f 100644 --- a/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml @@ -18,13 +18,13 @@ specific language governing permissions and limitations under the License. --> - - + @@ -46,7 +46,7 @@ under the License. - + @@ -61,27 +61,27 @@ under the License. - + - + - + - + - + @@ -91,16 +91,16 @@ under the License. - + @@ -128,7 +128,7 @@ under the License. - + @@ -206,7 +206,7 @@ under the License. - + @@ -215,7 +215,7 @@ under the License. - + @@ -240,8 +240,8 @@ under the License. - - + + @@ -308,11 +308,11 @@ under the License. - + - + @@ -471,7 +471,7 @@ under the License. - + @@ -481,8 +481,8 @@ under the License. - - + + @@ -493,7 +493,7 @@ under the License. - + @@ -504,17 +504,17 @@ under the License. - + - - + + - + @@ -526,18 +526,18 @@ under the License. - + - + - + @@ -564,7 +564,7 @@ under the License. - + @@ -601,7 +601,7 @@ under the License. - + @@ -647,7 +647,7 @@ under the License. - + @@ -716,7 +716,7 @@ under the License. - + @@ -735,6 +735,6 @@ under the License. - + diff --git a/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml b/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml index fa495c3762..01ac645270 100644 --- a/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml +++ b/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml @@ -244,7 +244,7 @@ under the License. - + @@ -524,7 +524,7 @@ under the License. - + @@ -579,7 +579,7 @@ under the License. - + diff --git a/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml b/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml index b42ea1c8f1..46c18e4b9b 100644 --- a/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml @@ -512,7 +512,7 @@ under the License. - + @@ -567,7 +567,7 @@ under the License. - + diff --git a/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml b/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml index 967c757236..57c0d30b2d 100644 --- a/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml @@ -30,7 +30,7 @@ under the License. - + @@ -46,7 +46,7 @@ under the License. - + @@ -58,11 +58,11 @@ under the License. - + - + @@ -70,7 +70,7 @@ under the License. - + diff --git a/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml b/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml index 3aa816fe44..1f8c1b661c 100644 --- a/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -26,10 +26,10 @@ under the License. - + - + @@ -39,19 +39,19 @@ under the License. - + - + - + - + @@ -61,7 +61,7 @@ under the License. - + @@ -70,7 +70,7 @@ under the License. - + @@ -83,7 +83,7 @@ under the License. - + @@ -122,7 +122,7 @@ under the License. - + @@ -135,7 +135,7 @@ under the License. - + @@ -145,10 +145,10 @@ under the License. - + - + @@ -178,14 +178,14 @@ under the License. - + - + - + @@ -193,7 +193,7 @@ under the License. - + @@ -217,12 +217,12 @@ under the License. - + - + @@ -238,7 +238,7 @@ under the License. - + @@ -246,7 +246,7 @@ under the License. - + @@ -255,7 +255,7 @@ under the License. - + @@ -265,7 +265,7 @@ under the License. - + @@ -344,7 +344,7 @@ under the License. - + @@ -358,13 +358,13 @@ under the License. - + - - + + @@ -406,20 +406,20 @@ under the License. - + - + - + - + diff --git a/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml b/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml index 0cf1c4b1e3..d5cda6d498 100644 --- a/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -150,7 +150,7 @@ under the License. - + diff --git a/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml b/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml index f3e76ed91e..66ccc96a13 100644 --- a/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml @@ -18,27 +18,27 @@ specific language governing permissions and limitations under the License. --> - - + - - + + - - + + - + @@ -50,31 +50,31 @@ under the License. - + - + - + - + - + - - + + @@ -83,11 +83,11 @@ under the License. - + - + diff --git a/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml b/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml index 5c9fc8c8f8..d9048838ad 100644 --- a/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml +++ b/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -37,7 +37,7 @@ under the License. - + diff --git a/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml b/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml index 52f127f73a..58b88c76d2 100644 --- a/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml +++ b/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml @@ -18,9 +18,9 @@ specific language governing permissions and limitations under the License. --> - - + diff --git a/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml b/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml index aa22db07e9..eafdd6afe2 100644 --- a/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - - + @@ -77,7 +77,7 @@ under the License. - + @@ -91,7 +91,7 @@ under the License. - + @@ -108,18 +108,18 @@ under the License. - + - + - + diff --git a/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml b/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml index be82c3f877..f346b19c1f 100644 --- a/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml @@ -19,31 +19,31 @@ under the License. --> - - + + - + - + - + - + @@ -56,7 +56,7 @@ under the License. - + @@ -66,7 +66,7 @@ under the License. - + @@ -74,7 +74,7 @@ under the License. - + @@ -98,11 +98,11 @@ under the License. - + - + @@ -116,7 +116,7 @@ under the License. - + @@ -163,7 +163,7 @@ under the License. - + @@ -172,7 +172,7 @@ under the License. - + @@ -183,7 +183,7 @@ under the License. - + @@ -192,8 +192,8 @@ under the License. - - + + @@ -209,16 +209,16 @@ under the License. - + - - + + - + diff --git a/applications/accounting/script/org/ofbiz/accounting/period/PeriodServices.xml b/applications/accounting/script/org/ofbiz/accounting/period/PeriodServices.xml index f7154e6485..15b9c8a04b 100644 --- a/applications/accounting/script/org/ofbiz/accounting/period/PeriodServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/period/PeriodServices.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -27,7 +27,7 @@ under the License. - + @@ -46,7 +46,7 @@ under the License. - + @@ -64,9 +64,9 @@ under the License. - + diff --git a/applications/accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml b/applications/accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml index f44da7a569..8f22228fa3 100644 --- a/applications/accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -104,7 +104,7 @@ under the License. - + diff --git a/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml b/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml index 997e2b87ea..3ba07f57bf 100644 --- a/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -42,7 +42,7 @@ under the License. - + @@ -68,13 +68,13 @@ under the License. - + - + @@ -108,7 +108,7 @@ under the License. - @@ -125,13 +125,13 @@ under the License. - + - + @@ -146,14 +146,14 @@ under the License. - + - + @@ -168,14 +168,14 @@ under the License. - + - + @@ -190,14 +190,14 @@ under the License. - + - + @@ -221,7 +221,7 @@ under the License. - + @@ -239,7 +239,7 @@ under the License. - + @@ -258,7 +258,7 @@ under the License. - + @@ -287,15 +287,15 @@ under the License. - + - + - + @@ -313,7 +313,7 @@ under the License. - + @@ -340,14 +340,14 @@ under the License. - + - + - + @@ -365,11 +365,11 @@ under the License. - + - + diff --git a/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml b/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml index 3aeed76046..dd838f0bb2 100644 --- a/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml +++ b/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -26,17 +26,17 @@ under the License. - + - - + + - + @@ -45,28 +45,28 @@ under the License. - + - + - + - - + + - + @@ -75,27 +75,27 @@ under the License. - + - + - + - - + + - + @@ -104,7 +104,7 @@ under the License. - + @@ -120,23 +120,23 @@ under the License. - + - + - - + + - + @@ -145,29 +145,29 @@ under the License. - + - + - + - + - - + + - + @@ -176,45 +176,45 @@ under the License. - + - + - + - + - - - + + + - + - + - + @@ -229,12 +229,12 @@ under the License. - + - + @@ -247,5 +247,5 @@ under the License. ]]> - + diff --git a/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml b/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml index 643ee065e2..1c96eef79d 100644 --- a/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml +++ b/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml @@ -18,17 +18,17 @@ specific language governing permissions and limitations under the License. --> - - + - - + @@ -50,7 +50,7 @@ under the License. - + @@ -69,12 +69,12 @@ under the License. - + - + @@ -154,13 +154,13 @@ under the License. - + - + @@ -177,24 +177,24 @@ under the License. - + - + - - + @@ -297,9 +297,9 @@ under the License. - + - @@ -355,7 +355,7 @@ under the License. - + @@ -392,7 +392,7 @@ under the License. - + @@ -400,20 +400,20 @@ under the License. - + - + - + @@ -428,7 +428,7 @@ under the License. - + @@ -447,7 +447,7 @@ under the License. - + - + @@ -488,14 +488,14 @@ under the License. - + - + - + - + - + @@ -526,7 +526,7 @@ under the License. - + @@ -539,6 +539,6 @@ under the License. - + diff --git a/applications/accounting/servicedef/groups.xml b/applications/accounting/servicedef/groups.xml index d976b5a212..4b27541eeb 100644 --- a/applications/accounting/servicedef/groups.xml +++ b/applications/accounting/servicedef/groups.xml @@ -18,9 +18,9 @@ specific language governing permissions and limitations under the License. --> - - + @@ -31,7 +31,7 @@ under the License. - + diff --git a/applications/accounting/servicedef/secas.xml b/applications/accounting/servicedef/secas.xml index 7a21964474..7de0e8b142 100644 --- a/applications/accounting/servicedef/secas.xml +++ b/applications/accounting/servicedef/secas.xml @@ -18,26 +18,26 @@ specific language governing permissions and limitations under the License. --> - - + - - - + @@ -57,7 +57,7 @@ under the License. - + @@ -113,7 +113,7 @@ under the License. - + @@ -133,7 +133,7 @@ under the License. - + - - diff --git a/applications/accounting/servicedef/secas_ledger.xml b/applications/accounting/servicedef/secas_ledger.xml index f51fb8c6cb..1cbdd8c28a 100644 --- a/applications/accounting/servicedef/secas_ledger.xml +++ b/applications/accounting/servicedef/secas_ledger.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -33,7 +33,7 @@ under the License. - + @@ -53,21 +53,21 @@ under the License. - + - + - + @@ -93,8 +93,8 @@ under the License. - - + + @@ -104,7 +104,7 @@ under the License. - + @@ -112,18 +112,18 @@ under the License. - + - + - - + + \ No newline at end of file diff --git a/applications/accounting/servicedef/secas_olap.xml b/applications/accounting/servicedef/secas_olap.xml index 3ca31af0fd..c8ccca963e 100644 --- a/applications/accounting/servicedef/secas_olap.xml +++ b/applications/accounting/servicedef/secas_olap.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - diff --git a/applications/accounting/servicedef/secas_payment.xml b/applications/accounting/servicedef/secas_payment.xml index b3fed1e279..b0e8a782b0 100644 --- a/applications/accounting/servicedef/secas_payment.xml +++ b/applications/accounting/servicedef/secas_payment.xml @@ -18,10 +18,10 @@ specific language governing permissions and limitations under the License. --> - - - Accounting Services - Miscellaneous OFBiz @@ -62,8 +62,8 @@ under the License. - - Update the conversion rate between two currencies and expire the old conversion rates @@ -105,7 +105,7 @@ under the License. - + add a default GL account number to a payment method type. diff --git a/applications/accounting/servicedef/services_agreement.xml b/applications/accounting/servicedef/services_agreement.xml index 1948d177cf..238fc0c674 100644 --- a/applications/accounting/servicedef/services_agreement.xml +++ b/applications/accounting/servicedef/services_agreement.xml @@ -17,12 +17,12 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - Accounting Services: Agreements OFBiz 1.0 - + @@ -201,9 +201,9 @@ under the License. - Update an Agreement Role - + location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreementRole" auth="true"> + Update an Agreement Role + Delete an Agreement Role - + Get commission receiving parties and amounts for a product. <br/> @@ -232,16 +232,16 @@ under the License. - + Create AgreementWorkEffortAppl - + - Delete AgreementWorkEffortAppl + Delete AgreementWorkEffortAppl diff --git a/applications/accounting/servicedef/services_authorizedotnet.xml b/applications/accounting/servicedef/services_authorizedotnet.xml index a7742b00fd..9228f8cffa 100644 --- a/applications/accounting/servicedef/services_authorizedotnet.xml +++ b/applications/accounting/servicedef/services_authorizedotnet.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - Accounting Services OFBiz diff --git a/applications/accounting/servicedef/services_billing.xml b/applications/accounting/servicedef/services_billing.xml index 5f66ef8799..68120d6e6b 100644 --- a/applications/accounting/servicedef/services_billing.xml +++ b/applications/accounting/servicedef/services_billing.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - Accounting Services OFBiz diff --git a/applications/accounting/servicedef/services_clearcommerce.xml b/applications/accounting/servicedef/services_clearcommerce.xml index 804fb3a09c..339a00520f 100644 --- a/applications/accounting/servicedef/services_clearcommerce.xml +++ b/applications/accounting/servicedef/services_clearcommerce.xml @@ -17,8 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - - Clear Commerce Services OFBiz @@ -50,12 +50,12 @@ under the License. location="org.ofbiz.accounting.thirdparty.clearcommerce.CCPaymentServices" invoke="ccCredit"> ClearCommerce Credit Card Credit - + - - + + - + diff --git a/applications/accounting/servicedef/services_cost.xml b/applications/accounting/servicedef/services_cost.xml index cf9c42326c..a5ca35bb10 100644 --- a/applications/accounting/servicedef/services_cost.xml +++ b/applications/accounting/servicedef/services_cost.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - Cost Services OFBiz @@ -48,18 +48,18 @@ under the License. - - Create a WorkEffortCostCalc entry + + Create a WorkEffortCostCalc entry - - Remove a WorkEffortCostCalc entry + + Remove a WorkEffortCostCalc entry @@ -70,7 +70,7 @@ under the License. Accounting Cost Permission Checking Logic - + Create Product Average Cost record @@ -79,18 +79,18 @@ under the License. - + Update a Product Average Cost record - + Delete a Product Average Cost record - + diff --git a/applications/accounting/servicedef/services_cybersource.xml b/applications/accounting/servicedef/services_cybersource.xml index 7e953f1f51..4d80e83034 100644 --- a/applications/accounting/servicedef/services_cybersource.xml +++ b/applications/accounting/servicedef/services_cybersource.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - Accounting Services OFBiz diff --git a/applications/accounting/servicedef/services_finaccount.xml b/applications/accounting/servicedef/services_finaccount.xml index 2ff860c041..5cbdba9cc9 100644 --- a/applications/accounting/servicedef/services_finaccount.xml +++ b/applications/accounting/servicedef/services_finaccount.xml @@ -71,7 +71,7 @@ under the License. - + @@ -86,7 +86,7 @@ under the License. Post a Financial Account Transaction to the General Ledger; meant to be called as an SECA - + Create a new Financial Account Role @@ -111,7 +111,7 @@ under the License. Lower level service for creating authorization against a fin account. Will use current time for authorizationDate and thruDate if not supplied. - + @@ -119,7 +119,7 @@ under the License. - + @@ -155,9 +155,9 @@ under the License. location="org.ofbiz.accounting.finaccount.FinAccountPaymentServices" invoke="finAccountWithdraw" auth="true"> Deposit Funds into a Financial Account - + - + @@ -172,7 +172,7 @@ under the License. Refunds the deposits to a financial account back to the source - + @@ -186,7 +186,7 @@ under the License. - + @@ -215,7 +215,7 @@ under the License. - + diff --git a/applications/accounting/servicedef/services_fixedasset.xml b/applications/accounting/servicedef/services_fixedasset.xml index 2a58bea846..6720dfd11e 100644 --- a/applications/accounting/servicedef/services_fixedasset.xml +++ b/applications/accounting/servicedef/services_fixedasset.xml @@ -18,12 +18,12 @@ specific language governing permissions and limitations under the License. --> - Accounting Services: Fixed Asset OFBiz 1.0 - + @@ -51,7 +51,7 @@ under the License. - + Update the Product to Fixed Asset information @@ -59,7 +59,7 @@ under the License. - + Remove Product From Fixed Asset @@ -67,7 +67,7 @@ under the License. - - + @@ -154,7 +154,7 @@ under the License. - + @@ -220,7 +220,7 @@ under the License. - + @@ -230,7 +230,7 @@ under the License. - + Update Party to Fixed Asset @@ -238,7 +238,7 @@ under the License. - + Delete Party to Fixed Asset @@ -252,7 +252,7 @@ under the License. Fixed Asset Permission Checking Logic - + Interface to describe base parameters for Depreciation Calculation Services diff --git a/applications/accounting/servicedef/services_invoice.xml b/applications/accounting/servicedef/services_invoice.xml index c61c815737..deee0fa61a 100644 --- a/applications/accounting/servicedef/services_invoice.xml +++ b/applications/accounting/servicedef/services_invoice.xml @@ -18,20 +18,20 @@ specific language governing permissions and limitations under the License. --> - Accounting Services OFBiz 1.0 - + Get the Next Invoice ID According to Settings on the PartyAcctgPreference Entity for the given Party - + @@ -83,12 +83,12 @@ under the License. - + @@ -113,7 +113,7 @@ under the License. - + Create a new Invoice Role Record @@ -181,8 +181,8 @@ under the License. - A sample/example service to calculate an affiliate commission (direct relationship to customer) and create - and invoice for it on behalf of the affiliate, ie an invoice from the affiliate to the company that can + A sample/example service to calculate an affiliate commission (direct relationship to customer) and create + and invoice for it on behalf of the affiliate, ie an invoice from the affiliate to the company that can then be paid by the company to balance it. @@ -209,7 +209,7 @@ under the License. - Create sales invoice(s) from a drop shipment by wrapping a call to + Create sales invoice(s) from a drop shipment by wrapping a call to createInvoicesFromShipments with the createSalesInvoicesForDropShipments parameter @@ -223,7 +223,7 @@ under the License. one invoice for each order will be created (each invoice could contain items shipped in different shipments). If the shipments are drop shipments, the type of invoices (purchase or sales) created - will be controlled by the createSalesInvoicesForDropShipments parameter (purchase by default). + will be controlled by the createSalesInvoicesForDropShipments parameter (purchase by default). invoicesCreated = List of invoiceIds which were created by this service diff --git a/applications/accounting/servicedef/services_ledger.xml b/applications/accounting/servicedef/services_ledger.xml index 3401c71952..0c40aa678d 100644 --- a/applications/accounting/servicedef/services_ledger.xml +++ b/applications/accounting/servicedef/services_ledger.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - Accounting Services OFBiz @@ -74,7 +74,7 @@ under the License. - Creates an AcctgTrans and two offsetting AcctgTransEntry records @@ -87,7 +87,7 @@ under the License. - + Calculate Trial Balance for a GlJournal @@ -279,22 +279,22 @@ under the License. - Post a AcctgTrans and related entries. This will make sure that the time period is not closed and that - the sum of the debits and credits are equal. + Post a AcctgTrans and related entries. This will make sure that the time period is not closed and that + the sum of the debits and credits are equal. - - Close a financial time period - + + Close a financial time period + - Prepare the data for the Income Statement @@ -304,7 +304,7 @@ under the License. - Prepare the data for the Balance Sheet @@ -314,7 +314,7 @@ under the License. - Prepare the data for the Balance Sheet @@ -328,10 +328,10 @@ under the License. - - Look up a GlAccountId first in ProductGlAccount by productId and productGlAccountTypeId, if not found, - then in organizationPartyId and glAccountTypeId + + Look up a GlAccountId first in ProductGlAccount by productId and productGlAccountTypeId, if not found, + then in organizationPartyId and glAccountTypeId @@ -343,11 +343,11 @@ under the License. - - get an ownerPartyId from inventoryItemId - - + + get an ownerPartyId from inventoryItemId + + @@ -416,7 +416,7 @@ under the License. delete a Variance Reason Gl Account - + @@ -449,7 +449,7 @@ under the License. - + - + Create an accounting transaction for an incoming payment - + @@ -490,7 +490,7 @@ under the License. - + @@ -498,7 +498,7 @@ under the License. - + @@ -506,7 +506,7 @@ under the License. - + @@ -515,7 +515,7 @@ under the License. - + Create an accounting transaction for a payment application @@ -538,10 +538,10 @@ under the License. - Delete an existing General Ledger Account of a Party - + diff --git a/applications/accounting/servicedef/services_payment.xml b/applications/accounting/servicedef/services_payment.xml index 1ed68946a6..b4ded7e06b 100644 --- a/applications/accounting/servicedef/services_payment.xml +++ b/applications/accounting/servicedef/services_payment.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - Accounting Services OFBiz @@ -37,14 +37,14 @@ under the License. - + Update a Payment - + Change the status of a Payment @@ -52,13 +52,13 @@ under the License. - + Checks to see if each invoice to which a payment is applied has been fully paid up. If so, sets the invoice status to PAID. - + Updates a Payment and then marks it as PMNT_SENT @@ -66,7 +66,7 @@ under the License. - Create a payment application @@ -87,7 +87,7 @@ under the License. - + @@ -98,7 +98,7 @@ under the License. - + @@ -107,8 +107,8 @@ under the License. - - Create a payment and a payment application for the full amount diff --git a/applications/accounting/servicedef/services_paymentmethod.xml b/applications/accounting/servicedef/services_paymentmethod.xml index a7b30dfaa5..0a9967d8da 100644 --- a/applications/accounting/servicedef/services_paymentmethod.xml +++ b/applications/accounting/servicedef/services_paymentmethod.xml @@ -674,7 +674,7 @@ under the License. EFT Account Test Release - + @@ -702,7 +702,7 @@ under the License. delete a Credit Card Gl Account - + diff --git a/applications/accounting/servicedef/services_pccharge.xml b/applications/accounting/servicedef/services_pccharge.xml index 85500ef1b9..77bb832364 100644 --- a/applications/accounting/servicedef/services_pccharge.xml +++ b/applications/accounting/servicedef/services_pccharge.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - Accounting Services OFBiz diff --git a/applications/accounting/servicedef/services_rate.xml b/applications/accounting/servicedef/services_rate.xml index d6b337fc11..828a005f4a 100644 --- a/applications/accounting/servicedef/services_rate.xml +++ b/applications/accounting/servicedef/services_rate.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - Accounting Services: Rate and related services OFBiz @@ -68,5 +68,5 @@ under the License. - + diff --git a/applications/accounting/servicedef/services_rita.xml b/applications/accounting/servicedef/services_rita.xml index f35cc07a46..ae7cc47d2b 100644 --- a/applications/accounting/servicedef/services_rita.xml +++ b/applications/accounting/servicedef/services_rita.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - Accounting Services OFBiz diff --git a/applications/accounting/servicedef/services_tax.xml b/applications/accounting/servicedef/services_tax.xml index b535a67df8..6031b2cade 100644 --- a/applications/accounting/servicedef/services_tax.xml +++ b/applications/accounting/servicedef/services_tax.xml @@ -18,12 +18,12 @@ specific language governing permissions and limitations under the License. --> - Accounting Services: TaxAuthority and related OFBiz 1.0 - + Tax Calc Service Interface @@ -42,7 +42,7 @@ under the License. Tax Calc Total For Display Service Interface - + @@ -52,7 +52,7 @@ under the License. - + @@ -64,7 +64,7 @@ under the License. Tax Authority Rate Product Calc Service - + @@ -145,7 +145,7 @@ under the License. - + @@ -165,7 +165,7 @@ under the License. - + @@ -195,7 +195,7 @@ under the License. - + @@ -203,7 +203,7 @@ under the License. - + Zip Sales Calc Tax Service - change this to calcTax to run diff --git a/applications/accounting/servicedef/services_valuelink.xml b/applications/accounting/servicedef/services_valuelink.xml index 221d2d4106..d55a70b9f5 100644 --- a/applications/accounting/servicedef/services_valuelink.xml +++ b/applications/accounting/servicedef/services_valuelink.xml @@ -51,7 +51,7 @@ under the License. location="org.ofbiz.accounting.thirdparty.valuelink.ValueLinkServices" invoke="giftCardReload" auth="true"> Gift Card Payment Processing - + - + @@ -53,5 +53,5 @@ - + diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/admin/FilterOutReceipts.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/admin/FilterOutReceipts.groovy index f98880139b..e145736011 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/admin/FilterOutReceipts.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/admin/FilterOutReceipts.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/admin/ListInvoiceItemTypesGlAccount.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/admin/ListInvoiceItemTypesGlAccount.groovy index 11b2682d09..0c97e1b3d7 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/admin/ListInvoiceItemTypesGlAccount.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/admin/ListInvoiceItemTypesGlAccount.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ - + import java.util.*; import java.lang.*; import org.ofbiz.entity.*; diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.groovy index bdeeb115c6..f6918af556 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy index 434c41938a..4af0ebcfe9 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -24,11 +24,10 @@ fixedAssetId = parameters.fixedAssetId if (fixedAssetId) { latestGeoPoint = GeoWorker.findLatestGeoPoint(delegator, "FixedAssetAndGeoPoint", "fixedAssetId", fixedAssetId, null, null); context.latestGeoPoint = latestGeoPoint; - context.fixedAssetId = fixedAssetId; - + context.fixedAssetId = fixedAssetId; + if (latestGeoPoint) { elevationUom = delegator.findOne("Uom", [uomId : latestGeoPoint.elevationUomId], false); context.elevationUomAbbr = elevationUom.abbreviation; } } - \ No newline at end of file diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/ViewCalendar.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/ViewCalendar.groovy index 7bd947241e..b8e72964e5 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/ViewCalendar.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/ViewCalendar.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -30,7 +30,7 @@ parameters.viewMode = viewMode; // Prepare vars for mode-specific date calculations startParam = parameters.start; -if(!startParam) { +if (!startParam) { start = nowTimestamp.clone(); } else { start = new Timestamp(Long.parseLong(startParam)); diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy index ce34916ebb..20e965d6c5 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy index 7ca9480438..a9472ba770 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,7 +29,7 @@ import java.math.MathContext; import org.ofbiz.base.util.UtilNumber; import javolution.util.FastList; - + invoiceId = parameters.get("invoiceId"); invoice = delegator.findByPrimaryKey("Invoice", [invoiceId : invoiceId]); @@ -45,24 +45,24 @@ if (invoice) { if (currency && !invoice.getString("currencyUomId").equals(currency)) { conversionRate = InvoiceWorker.getInvoiceCurrencyConversionRate(invoice); invoice.currencyUomId = currency; - invoice.invoiceMessage = " converted from original with a rate of: " + conversionRate.setScale(8, rounding); + invoice.invoiceMessage = " converted from original with a rate of: " + conversionRate.setScale(8, rounding); } - + invoiceItems = invoice.getRelatedOrderBy("InvoiceItem", ["invoiceItemSeqId"]); invoiceItemsConv = FastList.newInstance(); invoiceItems.each { invoiceItem -> invoiceItem.amount = invoiceItem.getBigDecimal("amount").multiply(conversionRate).setScale(decimals, rounding); invoiceItemsConv.add(invoiceItem); } - + context.invoiceItems = invoiceItemsConv; - + invoiceTotal = InvoiceWorker.getInvoiceTotal(invoice).multiply(conversionRate).setScale(decimals, rounding); invoiceNoTaxTotal = InvoiceWorker.getInvoiceNoTaxTotal(invoice).multiply(conversionRate).setScale(decimals, rounding); - context.invoiceTotal = invoiceTotal; + context.invoiceTotal = invoiceTotal; context.invoiceNoTaxTotal = invoiceNoTaxTotal; - + // each invoice of course has two billing addresses, but the one that is relevant for purchase invoices is the PAYMENT_LOCATION of the invoice // (ie Accounts Payable address for the supplier), while the right one for sales invoices is the BILLING_LOCATION (ie Accounts Receivable or // home of the customer.) @@ -80,12 +80,12 @@ if (invoice) { context.sendingParty = sendingParty; //*________________this snippet was added for adding Tax ID in invoice header if needed _________________ - + sendingTaxInfos = sendingParty.getRelated("PartyTaxAuthInfo"); billingTaxInfos = billingParty.getRelated("PartyTaxAuthInfo"); sendingPartyTaxId = null; billingPartyTaxId = null; - + if (billingAddress) { sendingTaxInfos.eachWithIndex { sendingTaxInfo, i -> if (sendingTaxInfo.taxAuthGeoId.equals(billingAddress.countryGeoId)) { @@ -105,29 +105,29 @@ if (invoice) { context.billingPartyTaxId = billingPartyTaxId; } //________________this snippet was added for adding Tax ID in invoice header if needed _________________*/ - + terms = invoice.getRelated("InvoiceTerm"); context.terms = terms; - + paymentAppls = delegator.findByAnd("PaymentApplication", [invoiceId : invoiceId]); context.payments = paymentAppls; - + orderItemBillings = delegator.findByAnd("OrderItemBilling", [invoiceId : invoiceId], ['orderId']); orders = new LinkedHashSet(); orderItemBillings.each { orderIb -> orders.add(orderIb.orderId); } context.orders = orders; - - invoiceStatus = invoice.getRelatedOne("StatusItem"); + + invoiceStatus = invoice.getRelatedOne("StatusItem"); context.invoiceStatus = invoiceStatus; - + edit = parameters.editInvoice; - if ("true".equalsIgnoreCase(edit)) { + if ("true".equalsIgnoreCase(edit)) { invoiceItemTypes = delegator.findList("InvoiceItemType", null, null, null, null, false); - context.invoiceItemTypes = invoiceItemTypes; - context.editInvoice = true; + context.invoiceItemTypes = invoiceItemTypes; + context.editInvoice = true; } // format the date diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy index ab1974133e..f10dbd7a36 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -32,9 +32,9 @@ glAccountOrganizationAndClassList = null; if ("SALES_INVOICE".equals(invoice.invoiceTypeId)) { List itemTypes = FastList.newInstance(); itemTypes.add(EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.EQUALS, "INVOICE_ADJ")); - itemTypes.add(EntityCondition.makeCondition("parentTypeId", EntityOperator.EQUALS, "INVOICE_ADJ")); + itemTypes.add(EntityCondition.makeCondition("parentTypeId", EntityOperator.EQUALS, "INVOICE_ADJ")); itemTypes.add(EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.EQUALS, "INVOICE_ITM_ADJ")); - itemTypes.add(EntityCondition.makeCondition("parentTypeId", EntityOperator.EQUALS, "INVOICE_ITM_ADJ")); + itemTypes.add(EntityCondition.makeCondition("parentTypeId", EntityOperator.EQUALS, "INVOICE_ITM_ADJ")); itemTypes.add(EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.EQUALS, "INV_PROD_ITEM")); itemTypes.add(EntityCondition.makeCondition("parentTypeId", EntityOperator.EQUALS, "INV_PROD_ITEM")); itemTypesCond = EntityCondition.makeCondition(itemTypes, EntityOperator.OR); diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy index f116773e4b..cd6d9a5b23 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -61,7 +61,7 @@ List getPayments(List payments, boolean actual) { paymentList = []; // to pass back to the screeen list of unapplied payments invoiceApplied = InvoiceWorker.getInvoiceApplied(invoice); invoiceAmount = InvoiceWorker.getInvoiceTotal(invoice); - invoiceToApply = InvoiceWorker.getInvoiceNotApplied(invoice); + invoiceToApply = InvoiceWorker.getInvoiceNotApplied(invoice); payments.each { payment -> paymentMap = [:]; paymentApplied = PaymentWorker.getPaymentApplied(payment, true); diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/OrderListInvoiceItem.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/OrderListInvoiceItem.groovy index 9c56cd2401..767803a2bd 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/OrderListInvoiceItem.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/OrderListInvoiceItem.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -31,11 +31,11 @@ invoiceItemList = delegator.findByAnd("InvoiceItem", [invoiceId : invoiceId], [" if (invoiceItemList) { invoiceItemList.each { invoiceItem -> invoiceItemSeqId = invoiceItem.invoiceItemSeqId; - invoiceId = invoiceItem.invoiceId; + invoiceId = invoiceItem.invoiceId; orderItemBilling = EntityUtil.getFirst(delegator.findByAnd("OrderItemBilling", [invoiceId : invoiceId, invoiceItemSeqId : invoiceItemSeqId])); Map invoiceItemMap = FastMap.newInstance(); invoiceItemMap.putAll((Map) invoiceItem); - if(orderItemBilling) { + if (orderItemBilling) { orderId = orderItemBilling.orderId; invoiceItemMap.orderId = orderId; } diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy index 4e96beb627..f65ed96e51 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -21,17 +21,17 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.util.EntityUtil; import javolution.util.FastMap; -if(billingAccountId) { - orderPaymentPreferencesList = []; +if (billingAccountId) { + orderPaymentPreferencesList = []; orderList = delegator.findByAnd("OrderHeader", [billingAccountId : billingAccountId]); - if(orderList) { + if (orderList) { orderList.each { orderHeader -> - orderId = orderHeader.orderId; + orderId = orderHeader.orderId; orderBillingAcc = EntityUtil.getFirst(delegator.findByAnd("OrderHeaderAndPaymentPref", [orderId : orderId])); orderBillingAccMap = FastMap.newInstance(); - if(orderBillingAcc.paymentMethodTypeId.equals("EXT_BILLACT") && orderBillingAcc.paymentStatusId.equals("PAYMENT_NOT_RECEIVED")) { - orderBillingAccMap.putAll(orderBillingAcc); - orderId = orderBillingAcc.orderId; + if (orderBillingAcc.paymentMethodTypeId.equals("EXT_BILLACT") && orderBillingAcc.paymentStatusId.equals("PAYMENT_NOT_RECEIVED")) { + orderBillingAccMap.putAll(orderBillingAcc); + orderId = orderBillingAcc.orderId; orderBillingAccMap.orderId = orderId; } orderPaymentPreferencesList.add(orderBillingAccMap); diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy index 6de3712f5d..a18602e228 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ - + import java.util.*; import org.ofbiz.entity.*; import org.ofbiz.base.util.*; @@ -76,7 +76,7 @@ List getInvoices(List invoices, boolean actual) { invoiceMap = [:]; invoiceMap.putAll(invoice); invoiceMap.amount = invoiceAmount; - invoiceMap.description = invoice.description; + invoiceMap.description = invoice.description; invoiceMap.amountApplied = invoiceApplied; if (paymentToApply.compareTo(invoiceToApply) < 0 ) { invoiceMap.amountToApply = paymentToApply; diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedPayments.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedPayments.groovy index cfeeb79c0f..9b952794f8 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedPayments.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedPayments.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ - + import java.util.*; import org.ofbiz.entity.*; import org.ofbiz.base.util.*; @@ -45,20 +45,20 @@ paymentsMapList = []; // to pass back to the screeen list of unapplied payments List payments = null; exprList = []; expr = EntityCondition.makeCondition("partyIdTo", EntityOperator.EQUALS, basePayment.getString("partyIdFrom")); -exprList.add(expr); +exprList.add(expr); expr = EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, basePayment.getString("partyIdTo")); -exprList.add(expr); +exprList.add(expr); expr = EntityCondition.makeCondition("paymentId", EntityOperator.NOT_EQUAL, basePayment.getString("paymentId")); -exprList.add(expr); +exprList.add(expr); // only payments with received and sent exprListStatus = []; expr = EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "PMNT_RECEIVED"); -exprListStatus.add(expr); +exprListStatus.add(expr); expr = EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "PMNT_SENT"); exprListStatus.add(expr); orCond = EntityCondition.makeCondition(exprListStatus, EntityOperator.OR); -exprList.add(orCond); +exprList.add(orCond); topCond = EntityCondition.makeCondition(exprList, EntityOperator.AND); @@ -67,7 +67,7 @@ payments = delegator.findList("Payment", topCond, null, ["effectiveDate"], null, if (payments) { basePaymentApplied = PaymentWorker.getPaymentApplied(basePayment); basePaymentAmount = basePayment.getBigDecimal("amount"); - basePaymentToApply = basePaymentAmount.subtract(basePaymentApplied); + basePaymentToApply = basePaymentAmount.subtract(basePaymentApplied); payments.each { payment -> if (PaymentWorker.getPaymentNotApplied(payment).signum() == 1) { // positiv not applied amount? // yes, put in the map diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy index 87c0fadfc3..f38747984e 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy index 9b5bc2515f..e56548ecd3 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy index 52fe5d4db5..51373fe2ca 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy index 7ce291fa3f..a673474066 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -28,7 +28,7 @@ import org.ofbiz.entity.util.*; //NOTE: this code ignores from/thru dates on the products and categories under the rootProductCategoryId! //TODO_MAYBE: variant product support for products in category, and product shown directly (should we really do this?) -//TODO: +//TODO: // get products and categories under the root category productMemberList = delegator.findByAnd("ProductCategoryMember", [productCategoryId : rootProductCategoryId], ["sequenceNum"]); @@ -103,7 +103,7 @@ for (int currentDay = 0; currentDay <= daysInMonth; currentDay++) { currentDayBegin = new java.sql.Timestamp(currentDayCal.getTimeInMillis()); currentDayCal.add(Calendar.DAY_OF_MONTH, 1); nextDayBegin = new java.sql.Timestamp(currentDayCal.getTimeInMillis()); - + findOpts = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true); // do the product find @@ -112,7 +112,7 @@ for (int currentDay = 0; currentDay <= daysInMonth; currentDay++) { if (productIdSet) productAndExprs.add(EntityCondition.makeCondition("productId", EntityOperator.IN, productIdSet)); productAndExprs.add(EntityCondition.makeCondition("invoiceDate", EntityOperator.GREATER_THAN_EQUAL_TO, currentDayBegin)); productAndExprs.add(EntityCondition.makeCondition("invoiceDate", EntityOperator.LESS_THAN, nextDayBegin)); - + productResultListIterator = delegator.find("InvoiceItemProductSummary", EntityCondition.makeCondition(productAndExprs, EntityOperator.AND), null, productFieldsToSelect, null, findOpts); productResultMap = FastMap.newInstance(); while ((productResult = productResultListIterator.next())) { @@ -123,13 +123,13 @@ for (int currentDay = 0; currentDay <= daysInMonth; currentDay++) { } productResultListIterator.close(); productResultMapByDayList.add(productResultMap); - + // do the category find categoryAndExprs = FastList.newInstance(); categoryAndExprs.addAll(baseCategoryAndExprs); categoryAndExprs.add(EntityCondition.makeCondition("invoiceDate", EntityOperator.GREATER_THAN_EQUAL_TO, currentDayBegin)); categoryAndExprs.add(EntityCondition.makeCondition("invoiceDate", EntityOperator.LESS_THAN, nextDayBegin)); - + categoryResultListIterator = delegator.find("InvoiceItemCategorySummary", EntityCondition.makeCondition(categoryAndExprs, EntityOperator.AND), null, categoryFieldsToSelect, null, findOpts); categoryResultMap = FastMap.newInstance(); while ((categoryResult = categoryResultListIterator.next())) { @@ -140,7 +140,7 @@ for (int currentDay = 0; currentDay <= daysInMonth; currentDay++) { } categoryResultListIterator.close(); categoryResultMapByDayList.add(categoryResultMap); - + // do a find for InvoiceItem with a null productId productNullAndExprs = FastList.newInstance(); productNullAndExprs.addAll(baseProductAndExprs); @@ -171,4 +171,3 @@ context.monthProductNullResult = monthProductNullResult; context.productCategoryList = productCategoryList; context.productList = productList; - \ No newline at end of file diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy index a5c2e05c55..61bf4958be 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy index 68ffcd0f04..7a0634dede 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -25,23 +25,23 @@ orderPaymentPreferenceId = context.orderPaymentPreferenceId; if ((!orderId) || (!orderPaymentPreferenceId)) return; -if(orderId) { +if (orderId) { orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]); context.orderHeader = orderHeader; } -if(orderHeader) { +if (orderHeader) { orh = new OrderReadHelper(orderHeader); context.orh = orh; context.overrideAmount = orh.getOrderGrandTotal(); } -if(orderPaymentPreferenceId) { +if (orderPaymentPreferenceId) { orderPaymentPreference = delegator.findByPrimaryKey("OrderPaymentPreference", [orderPaymentPreferenceId : orderPaymentPreferenceId]); context.orderPaymentPreference = orderPaymentPreference; } -if(orderPaymentPreference) { +if (orderPaymentPreference) { paymentMethodType = orderPaymentPreference.getRelatedOneCache("PaymentMethodType"); context.paymentMethodType = paymentMethodType; context.overrideAmount = orderPaymentPreference.getBigDecimal("maxAmount"); diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy index d4d144ab33..fd7a429178 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -28,7 +28,7 @@ orderPaymentPreferenceId = context.orderPaymentPreferenceId; if ((!orderId) || (!orderPaymentPreferenceId)) return; -if (orderId){ +if (orderId) { orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]); context.orderHeader = orderHeader; } diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy index 53efbe7dc4..b6f9fbc221 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy +++ b/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -/* +/* * The first purpose of this script is to retrieve the orderId and paymentPreferenceId of this gateway response. It is * activated if orderPaymentPreferenceId is not supplied. * diff --git a/applications/accounting/webapp/accounting/WEB-INF/controller.xml b/applications/accounting/webapp/accounting/WEB-INF/controller.xml index d869673a87..0c316b67cf 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/controller.xml +++ b/applications/accounting/webapp/accounting/WEB-INF/controller.xml @@ -18,12 +18,12 @@ specific language governing permissions and limitations under the License. --> - - + Accounting Manager Module Site Configuration File Copyright 2001-2008 The Apache Software Foundation - + - + @@ -71,7 +71,7 @@ under the License. - + @@ -88,20 +88,20 @@ under the License. - + - + - - + + @@ -110,7 +110,7 @@ under the License. - + @@ -120,11 +120,11 @@ under the License. - + - + @@ -156,11 +156,11 @@ under the License. - + - + @@ -182,7 +182,7 @@ under the License. - + @@ -210,7 +210,7 @@ under the License. - + @@ -237,7 +237,7 @@ under the License. - + @@ -260,7 +260,7 @@ under the License. - + @@ -277,7 +277,7 @@ under the License. - + @@ -289,7 +289,7 @@ under the License. - + @@ -298,11 +298,11 @@ under the License. - + - + @@ -318,7 +318,7 @@ under the License. - + @@ -340,7 +340,7 @@ under the License. - + @@ -505,7 +505,7 @@ under the License. - + @@ -523,14 +523,14 @@ under the License. - + - + @@ -546,12 +546,12 @@ under the License. - + - + @@ -566,11 +566,11 @@ under the License. - + - + @@ -585,7 +585,7 @@ under the License. - + @@ -629,11 +629,11 @@ under the License. - + - + @@ -654,8 +654,8 @@ under the License. - - + + @@ -679,7 +679,7 @@ under the License. - + @@ -729,7 +729,7 @@ under the License. - + @@ -755,7 +755,7 @@ under the License. - + @@ -778,10 +778,10 @@ under the License. --> - + - + @@ -824,7 +824,7 @@ under the License. - + @@ -945,7 +945,7 @@ under the License. - + @@ -954,7 +954,7 @@ under the License. - + @@ -982,7 +982,7 @@ under the License. - + @@ -996,7 +996,7 @@ under the License. - + @@ -1016,8 +1016,8 @@ under the License. - - + + @@ -1144,7 +1144,7 @@ under the License. - + @@ -1155,7 +1155,7 @@ under the License. - + @@ -1198,7 +1198,7 @@ under the License. - + @@ -1218,7 +1218,7 @@ under the License. - + @@ -1232,7 +1232,7 @@ under the License. - + @@ -1273,7 +1273,7 @@ under the License. - + @@ -1309,14 +1309,14 @@ under the License. - + - + @@ -1341,7 +1341,7 @@ under the License. - + @@ -1361,61 +1361,61 @@ under the License. - + - + - + - + - + - + - + - + - + @@ -1434,151 +1434,151 @@ under the License. - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - - + + - + - + @@ -1610,7 +1610,7 @@ under the License. - + @@ -1620,9 +1620,9 @@ under the License. - + - + @@ -1642,7 +1642,7 @@ under the License. - + @@ -1722,62 +1722,62 @@ under the License. - + - + - + - + - + - + - + - + - + - + @@ -1801,55 +1801,55 @@ under the License. - + - + - + - + - + - + - + - + - + - + @@ -1860,27 +1860,27 @@ under the License. - - + + - + - + - + - + @@ -1890,21 +1890,21 @@ under the License. - + - + - + @@ -1928,7 +1928,7 @@ under the License. - + @@ -1943,7 +1943,7 @@ under the License. - + @@ -1956,7 +1956,7 @@ under the License. - + @@ -1977,7 +1977,7 @@ under the License. - + @@ -1986,12 +1986,12 @@ under the License. - - - - + + + + - @@ -1999,40 +1999,40 @@ under the License. - + - + - - - + - - - + + + - - - - - + + + + + - + @@ -2049,7 +2049,7 @@ under the License. - + @@ -2060,7 +2060,7 @@ under the License. - + @@ -2072,7 +2072,7 @@ under the License. - + @@ -2097,21 +2097,21 @@ under the License. - + - + - + - + @@ -2123,7 +2123,7 @@ under the License. - + @@ -2139,11 +2139,11 @@ under the License. - + - + @@ -2152,13 +2152,13 @@ under the License. - + - + - + @@ -2170,7 +2170,7 @@ under the License. --> - + diff --git a/applications/accounting/webapp/accounting/WEB-INF/web.xml b/applications/accounting/webapp/accounting/WEB-INF/web.xml index cd4a0eaf1c..d2dddb9bab 100644 --- a/applications/accounting/webapp/accounting/WEB-INF/web.xml +++ b/applications/accounting/webapp/accounting/WEB-INF/web.xml @@ -23,7 +23,7 @@ under the License. Open For Business - Accounting Manager Accounting Manager Module of the Open For Business Project - + webSiteId ACCOUNTING @@ -43,13 +43,13 @@ under the License. serviceReaderUrls /WEB-INF/services.xml Configuration File(s) For The Service Dispatcher - + mainDecoratorLocation component://accounting/widget/CommonScreens.xml The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files. - + ContextFilter ContextFilter @@ -69,18 +69,18 @@ under the License. redirectPath /control/main - + ContextFilter /* - + org.ofbiz.webapp.control.ControlEventListener org.ofbiz.webapp.control.LoginEventListener - + ControlServlet ControlServlet diff --git a/applications/accounting/webapp/accounting/agreement/AgreementForms.xml b/applications/accounting/webapp/accounting/agreement/AgreementForms.xml index a88cca052c..0efe3f21bb 100644 --- a/applications/accounting/webapp/accounting/agreement/AgreementForms.xml +++ b/applications/accounting/webapp/accounting/agreement/AgreementForms.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -
- + @@ -214,7 +214,7 @@ under the License. - + @@ -240,7 +240,7 @@ under the License. - + @@ -263,7 +263,7 @@ under the License. - + @@ -317,7 +317,7 @@ under the License. - + @@ -529,7 +529,7 @@ under the License.
+ header-row-style="header-row" default-table-style="basic-table"> @@ -538,7 +538,7 @@ under the License. - + @@ -555,12 +555,12 @@ under the License. - + - +
- + @@ -599,7 +599,7 @@ under the License. -
@@ -609,6 +609,6 @@ under the License. - +
\ No newline at end of file diff --git a/applications/accounting/webapp/accounting/error/error.jsp b/applications/accounting/webapp/accounting/error/error.jsp index bab526dbe3..dcfa3b066b 100644 --- a/applications/accounting/webapp/accounting/error/error.jsp +++ b/applications/accounting/webapp/accounting/error/error.jsp @@ -32,12 +32,12 @@ under the License. - - + - + diff --git a/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl b/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl index 2350305635..3048512841 100644 --- a/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl +++ b/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl @@ -19,11 +19,11 @@ under the License. <#if latestGeoPoint?has_content> <#if latestGeoPoint.latitude?has_content && latestGeoPoint.longitude?has_content> ${uiLabelMap.CommonLatitude}${latestGeoPoint.latitude}
- ${uiLabelMap.CommonLongitude}${latestGeoPoint.longitude} + ${uiLabelMap.CommonLongitude}${latestGeoPoint.longitude} <#if latestGeoPoint.elevation?has_content>
${uiLabelMap.CommonElevation}${latestGeoPoint.elevation} ${elevationUomAbbr} - - <#if latestGeoPoint.dataSourceId?has_content> + + <#if latestGeoPoint.dataSourceId?has_content> <#if latestGeoPoint.dataSourceId == "GEOPT_GOOGLE">
${uiLabelMap.CommonLoading}
@@ -34,17 +34,17 @@ under the License. type="text/javascript"> - <#elseif latestGeoPoint.dataSourceId == "GEOPT_YAHOO"> - <#elseif latestGeoPoint.dataSourceId == "GEOPT_MICROSOFT"> - <#elseif latestGeoPoint.dataSourceId == "GEOPT_MAPTP"> - - + + <#elseif latestGeoPoint.dataSourceId == "GEOPT_YAHOO"> + <#elseif latestGeoPoint.dataSourceId == "GEOPT_MICROSOFT"> + <#elseif latestGeoPoint.dataSourceId == "GEOPT_MAPTP"> + + <#else> -

${uiLabelMap.CommonNoGeolocationAvailable}

+

${uiLabelMap.CommonNoGeolocationAvailable}

diff --git a/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml b/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml index 297427e984..c0c40ac648 100644 --- a/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml +++ b/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml @@ -631,5 +631,5 @@ under the License. - + diff --git a/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl b/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl index cb7250c9cf..fd361b2551 100644 --- a/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl +++ b/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl @@ -39,7 +39,7 @@ under the License. <#if billingPartyTaxId?has_content> Tax ID: ${billingPartyTaxId} - + diff --git a/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl b/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl index 0c56226e7f..62754d8f86 100644 --- a/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl +++ b/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl @@ -95,7 +95,7 @@ under the License. <#if newShipmentId?exists & newShipmentId != currentShipmentId> - <#-- the shipment id is printed at the beginning for each + <#-- the shipment id is printed at the beginning for each group of invoice items created for the same shipment --> @@ -117,22 +117,22 @@ under the License. - ${invoiceItem.invoiceItemSeqId} - + ${invoiceItem.invoiceItemSeqId} + - ${invoiceItem.productId?if_exists} - + ${invoiceItem.productId?if_exists} + - ${description?if_exists} - + ${description?if_exists} + - <#if invoiceItem.quantity?exists>${invoiceItem.quantity?string.number} + <#if invoiceItem.quantity?exists>${invoiceItem.quantity?string.number} - <#if invoiceItem.quantity?exists><@ofbizCurrency amount=invoiceItem.amount?if_exists isoCode=invoice.currencyUomId?if_exists/> + <#if invoiceItem.quantity?exists><@ofbizCurrency amount=invoiceItem.amount?if_exists isoCode=invoice.currencyUomId?if_exists/> - <@ofbizCurrency amount=(Static["org.ofbiz.accounting.invoice.InvoiceWorker"].getInvoiceItemTotal(invoiceItem)) isoCode=invoice.currencyUomId?if_exists/> + <@ofbizCurrency amount=(Static["org.ofbiz.accounting.invoice.InvoiceWorker"].getInvoiceItemTotal(invoiceItem)) isoCode=invoice.currencyUomId?if_exists/> @@ -168,11 +168,11 @@ under the License. - <@ofbizCurrency amount=invoiceNoTaxTotal isoCode=invoice.currencyUomId?if_exists/> + <@ofbizCurrency amount=invoiceNoTaxTotal isoCode=invoice.currencyUomId?if_exists/> - + <#-- a block with the invoice message--> diff --git a/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml b/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml index efb2536643..9018023734 100644 --- a/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml +++ b/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
- +
- - + +
- +
@@ -95,7 +95,7 @@ under the License. - +
- - + +
- +
@@ -162,8 +162,8 @@ under the License. - - + +
- +
@@ -193,8 +193,8 @@ under the License. - - + +
@@ -212,19 +212,19 @@ under the License. - + - +
+ header-row-style="header-row" default-table-style="basic-table"> - - + +
- + - +
\ No newline at end of file diff --git a/applications/accounting/webapp/accounting/main.ftl b/applications/accounting/webapp/accounting/main.ftl index d8f85e27a1..cd12cfcdbc 100644 --- a/applications/accounting/webapp/accounting/main.ftl +++ b/applications/accounting/webapp/accounting/main.ftl @@ -21,9 +21,9 @@ under the License.
- + - - + - - + - + - - + - + @@ -63,7 +63,7 @@ under the License. - + <#-- Totals for the month --> diff --git a/applications/accounting/webapp/ap/WEB-INF/controller.xml b/applications/accounting/webapp/ap/WEB-INF/controller.xml index ab3dd904c1..f25019ab40 100644 --- a/applications/accounting/webapp/ap/WEB-INF/controller.xml +++ b/applications/accounting/webapp/ap/WEB-INF/controller.xml @@ -15,13 +15,13 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - - + Accounting Manager : AP Module Site Configuration File Copyright 2001-2008 The Apache Software Foundation - + @@ -51,7 +51,7 @@ under the License. - + diff --git a/applications/accounting/webapp/ap/WEB-INF/web.xml b/applications/accounting/webapp/ap/WEB-INF/web.xml index ab793c2f57..3c6a3ef543 100644 --- a/applications/accounting/webapp/ap/WEB-INF/web.xml +++ b/applications/accounting/webapp/ap/WEB-INF/web.xml @@ -39,12 +39,12 @@ under the License. serviceReaderUrls /WEB-INF/services.xml Configuration File(s) For The Service Dispatcher - + mainDecoratorLocation component://accounting/widget/ap/CommonScreens.xml The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files. - + ContextFilter @@ -65,12 +65,12 @@ under the License. redirectPath /control/main - + ContextFilter /* - + org.ofbiz.webapp.control.ControlEventListener org.ofbiz.webapp.control.LoginEventListener diff --git a/applications/accounting/webapp/ar/WEB-INF/controller.xml b/applications/accounting/webapp/ar/WEB-INF/controller.xml index b6faccfae8..77a5126664 100644 --- a/applications/accounting/webapp/ar/WEB-INF/controller.xml +++ b/applications/accounting/webapp/ar/WEB-INF/controller.xml @@ -17,14 +17,14 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - Accounting Manager Module Site Configuration File Copyright 2001-2008 The Apache Software Foundation - - + + diff --git a/applications/accounting/webapp/ar/WEB-INF/web.xml b/applications/accounting/webapp/ar/WEB-INF/web.xml index e051b21fe7..e79ce4a9ef 100644 --- a/applications/accounting/webapp/ar/WEB-INF/web.xml +++ b/applications/accounting/webapp/ar/WEB-INF/web.xml @@ -43,13 +43,13 @@ under the License. serviceReaderUrls /WEB-INF/services.xml Configuration File(s) For The Service Dispatcher - + mainDecoratorLocation component://accounting/widget/ar/CommonScreens.xml The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files. - + ContextFilter ContextFilter @@ -69,18 +69,18 @@ under the License. redirectPath /control/main - + ContextFilter /* - + org.ofbiz.webapp.control.ControlEventListener org.ofbiz.webapp.control.LoginEventListener - + ControlServlet ControlServlet diff --git a/applications/accounting/webapp/ar/main.ftl b/applications/accounting/webapp/ar/main.ftl index 30f42e5b4b..d71df4c066 100644 --- a/applications/accounting/webapp/ar/main.ftl +++ b/applications/accounting/webapp/ar/main.ftl @@ -22,7 +22,7 @@ under the License. - -
+
:ERROR MESSAGE:
<%=UtilFormatOut.replaceString(errorMsg, "\n", "
")%>

${uiLabelMap.AccountingAgreements}

+ @@ -33,33 +33,33 @@ under the License.

${uiLabelMap.AccountingBillingMenu}

+

${uiLabelMap.AccountingFixedAssets}

+

${uiLabelMap.AccountingInvoicesMenu}

    diff --git a/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl b/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl index c67ca43631..e2f93459cf 100644 --- a/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl +++ b/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl @@ -17,8 +17,8 @@ specific language governing permissions and limitations under the License. --> -<#-- -Generates PDF of multiple checks in two styles: one check per page, multiple checks per page +<#-- +Generates PDF of multiple checks in two styles: one check per page, multiple checks per page Note that this must be customized to fit specific check layouts. The layout here is copied by hand from a real template using a ruler. --> @@ -57,7 +57,7 @@ by hand from a real template using a ruler. - + @@ -101,7 +101,7 @@ by hand from a real template using a ruler. - + @@ -144,7 +144,7 @@ by hand from a real template using a ruler. ${uiLabelMap.AccountingPayment} - + @@ -176,7 +176,7 @@ by hand from a real template using a ruler. <#list PayrolGroups as payrolGroup> <#assign fontSize = "75%"> <#assign lineStyle = "dashed"> - + <#assign sumQuantity = 0> <#assign sumAmount = 0> <#assign sumSubTotal = 0> @@ -212,7 +212,7 @@ by hand from a real template using a ruler. - + <#assign sumQuantity = 0> <#assign sumAmount = 0> <#assign sumSubTotal = 0> @@ -236,7 +236,7 @@ by hand from a real template using a ruler. - + <#assign sumQuantity = 0> <#assign sumAmount = 0> <#assign sumSubTotal = 0> @@ -265,16 +265,16 @@ by hand from a real template using a ruler. - + - + - + ${uiLabelMap.AccountingCheckAmount} @@ -300,7 +300,7 @@ by hand from a real template using a ruler. - + @@ -372,7 +372,7 @@ by hand from a real template using a ruler. <#list PayrolGroups as payrolGroup> <#assign fontSize = "75%"> <#assign lineStyle = "dashed"> - + <#assign sumQuantity = 0> <#assign sumAmount = 0> <#assign sumSubTotal = 0> @@ -408,7 +408,7 @@ by hand from a real template using a ruler. - + <#assign sumQuantity = 0> <#assign sumAmount = 0> <#assign sumSubTotal = 0> @@ -432,7 +432,7 @@ by hand from a real template using a ruler. - + <#assign sumQuantity = 0> <#assign sumAmount = 0> <#assign sumSubTotal = 0> @@ -461,16 +461,16 @@ by hand from a real template using a ruler. - + - + - + ${uiLabelMap.AccountingCheckAmount} diff --git a/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl b/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl index 2f742fc06e..d54f7c9059 100644 --- a/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl +++ b/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl @@ -21,7 +21,7 @@ under the License.
    <#if security.hasPermission("PERIOD_MAINT", session)>
    -
    +
    • ${uiLabelMap.AccountingShowOnlyPeriodsWithOrganization}
    diff --git a/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl b/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl index 065ee47b1b..11e087cc94 100644 --- a/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl +++ b/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl @@ -48,7 +48,7 @@ under the License. <#list productNullResultByDayList as productNullResult> <#assign productResultMap = productResultMapByDayList.get(productNullResult_index)/> <#assign categoryResultMap = categoryResultMapByDayList.get(productNullResult_index)/> - + <#-- now do the null product, then iterate through the products, then categories -->
${(productNullResult_index + 1)}
Month Total

${uiLabelMap.AccountingAgreements}

+ @@ -87,7 +87,7 @@ under the License.

${uiLabelMap.AccountingReports}

+ @@ -95,4 +95,4 @@ under the License.
- \ No newline at end of file + \ No newline at end of file diff --git a/applications/accounting/widget/AccountingPrintScreens.xml b/applications/accounting/widget/AccountingPrintScreens.xml index 82614e65bf..e920ed26f2 100644 --- a/applications/accounting/widget/AccountingPrintScreens.xml +++ b/applications/accounting/widget/AccountingPrintScreens.xml @@ -20,7 +20,7 @@ under the License. - @@ -33,7 +33,7 @@ under the License.
-

${uiLabelMap.PageTitleFindInventoryEventPlan}

+

${uiLabelMap.PageTitleFindInventoryEventPlan}

@@ -46,7 +46,7 @@ function lookupInventory() { <#if inventoryList?exists> ${uiLabelMap.CommonHideFields} - ${uiLabelMap.CommonLookup} + ${uiLabelMap.CommonLookup}

@@ -65,7 +65,7 @@ function lookupInventory() { Click here For Field Lookup - + @@ -79,7 +79,7 @@ function lookupInventory() { Calendar - +   @@ -116,7 +116,7 @@ document.lookupinventory.productId.focus(); ${uiLabelMap.CommonElementsFound}
- + <#if 0 < viewIndex> " class="submenutext">${uiLabelMap.CommonPrevious} <#else> @@ -130,7 +130,7 @@ document.lookupinventory.productId.focus(); <#else> ${uiLabelMap.CommonNext} - +  
@@ -176,7 +176,7 @@ document.lookupinventory.productId.focus(); <#else> <#assign additionalErrorMessage = "No QOH information found, assuming 0."> - + [${inven.productId}]  ${product.internalName?if_exists} @@ -225,7 +225,7 @@ document.lookupinventory.productId.focus(); <#assign count=count+1> - + <#else>
diff --git a/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl b/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl index 6fc59767fd..fcbeec247c 100644 --- a/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl +++ b/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl @@ -32,14 +32,14 @@ under the License. - <#if showLocation == "Y"> - <#if mrpName?exists> - Doc.F0 + <#if showLocation == "Y"> + <#if mrpName?exists> + Doc.F0 <#else> Doc.F2 - <#else> - <#if mrpName?exists> + <#else> + <#if mrpName?exists> Doc.F1 <#else> Doc.F3 @@ -68,7 +68,7 @@ under the License. - <#if mrpName?exists> + <#if mrpName?exists> ${uiLabelMap.ManufacturingPlan}: ${mrpName} <#else> @@ -158,7 +158,7 @@ under the License. - <#if showLocation == "Y"> + <#if showLocation == "Y"> ${uiLabelMap.ManufacturingQtyM2} <#else> ${uiLabelMap.CommonQuantity} @@ -167,7 +167,7 @@ under the License. - <#if showLocation == "Y"> + <#if showLocation == "Y"> ${uiLabelMap.ManufacturingPanelNumber} <#else> ${uiLabelMap.ProductFacilityLocation} @@ -202,7 +202,7 @@ under the License. - <#if showLocation == "Y"> + <#if showLocation == "Y"> ${product.panelQuantity?if_exists} <#else> ${product.Location?if_exists} diff --git a/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl b/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl index a7f76f8fa4..f27695db27 100644 --- a/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl +++ b/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl @@ -35,7 +35,7 @@ under the License. - Doc.G + Doc.G @@ -127,7 +127,7 @@ under the License. - @@ -168,7 +168,7 @@ under the License. ${uiLabelMap.ManufacturingReleasedNote} ---> +--> <#assign row = 0> @@ -202,7 +202,7 @@ under the License. - + diff --git a/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl b/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl index 1c48ae2e67..bc592c49e0 100644 --- a/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl +++ b/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl @@ -33,12 +33,12 @@ under the License. - <#if shipment?exists> + <#if shipment?exists> Doc.E1 <#else> Doc.E0 - - + + diff --git a/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl b/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl index e378ff5b1c..04513712ce 100644 --- a/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl +++ b/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl @@ -35,8 +35,8 @@ under the License. - - + + @@ -61,16 +61,16 @@ under the License. ${uiLabelMap.ManufacturingEstimatedCompletionDate}: - + - + ${uiLabelMap.ManufacturingPlan}: - + - + ${uiLabelMap.ManufacturingEstimatedCompletionDate}: @@ -89,19 +89,19 @@ under the License. - ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRun.productionRun.estimatedCompletionDate, "dd/MM/yyyy")} + ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRun.productionRun.estimatedCompletionDate, "dd/MM/yyyy")} - + ${productionRun.productionRun.workEffortName} - + ${productionRun.productionRun.estimatedCompletionDate} @@ -152,7 +152,7 @@ under the License. - ${Static["org.ofbiz.base.util.UtilDateTime"].nowDateString("dd/MM/yyyy")} + ${Static["org.ofbiz.base.util.UtilDateTime"].nowDateString("dd/MM/yyyy")} @@ -174,7 +174,7 @@ under the License. - ${nowTimestamp} + ${nowTimestamp} @@ -236,11 +236,11 @@ under the License. - ${stackInfo.qty} + ${stackInfo.qty} - + - + Doc.B - + @@ -49,7 +49,7 @@ Doc.B @@ -58,7 +58,7 @@ Doc.B - + @@ -87,20 +87,20 @@ Doc.B ${package.orderShipment.shipmentId} - + ${uiLabelMap.ManufacturingPackageNumber}: ${package.packageId} - + - + - ${Static["org.ofbiz.base.util.UtilDateTime"].nowDateString("dd/MM/yyyy")} + ${Static["org.ofbiz.base.util.UtilDateTime"].nowDateString("dd/MM/yyyy")} - + @@ -121,7 +121,7 @@ Doc.B ${uiLabelMap.OrderOrderId} : - + ${package.orderShipment.orderId} @@ -140,7 +140,7 @@ Doc.B - + @@ -188,7 +188,7 @@ Doc.B - ${uiLabelMap.PartyParty} + ${uiLabelMap.PartyParty} @@ -234,7 +234,7 @@ Doc.B - <#list components as component> + <#list components as component> @@ -299,7 +299,7 @@ Doc.B - + diff --git a/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl b/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl index 6c5388724e..3ec19cd2d3 100644 --- a/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl +++ b/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl @@ -28,11 +28,11 @@ under the License. <#if hasPermission> - <#if records?has_content> - - - <#assign index = 1> - <#list records as record> + <#if records?has_content> + + + <#assign index = 1> + <#list records as record> <#if index == 1> @@ -40,88 +40,88 @@ under the License. ${uiLabelMap.ManufacturingShipTo}: - + ${record.get("shippingAddressName")} - + ${record.get("shippingAddressAddress")} - + ${record.get("shippingAddressCity")} - - - - - - + + + + + + - + ${uiLabelMap.OrderOrderId} - + ${uiLabelMap.ProductProductId} - + ${uiLabelMap.CommonDescription} - + ${uiLabelMap.CommonQuantity} - + - - - - + + + + - + - + ${record.get("orderId")} ${record.get("orderItemSeqId")} - + ${record.get("productId")} - + ${record.get("productName")} - + ${record.get("quantity")} - - - - + + + + <#assign shipmentPackageSeqId = record.get("shipmentPackageSeqId")> <#if estimatedReadyDatePar?has_content> <#assign shipDate = record.get("shipDate")> - <#assign index = index + 1> - + <#assign index = index + 1> + @@ -130,36 +130,36 @@ under the License. ${uiLabelMap.ManufacturingPackage} - + ${uiLabelMap.ProductShipmentPlan} - + ${uiLabelMap.ManufacturingEstimatedShipDate} - - + + ${shipmentIdPar}/${shipmentPackageSeqId} - + ${shipmentIdPar} - + <#if shipDate?has_content>${shipDate} - - - - - - - <#else> + + + + + + + <#else> diff --git a/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl b/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl index 8def9f582b..d20ddba5b6 100644 --- a/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl +++ b/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl @@ -28,17 +28,17 @@ under the License. <#if hasPermission> - <#if records?has_content> + <#if records?has_content> ${uiLabelMap.CommonPage} - - + + ${uiLabelMap.ManufacturingComponentsOfShipmentPlan} - + @@ -48,47 +48,47 @@ under the License. ${uiLabelMap.ManufacturingShipmentId}: ${shipmentIdPar} - + ${uiLabelMap.ManufacturingEstimatedCompletionDate}: <#if estimatedReadyDatePar?has_content>${estimatedReadyDatePar} - + ${uiLabelMap.ManufacturingEstimatedShipDate}: <#if estimatedShipDatePar?has_content>${estimatedShipDatePar} - + - - - + + + - + ${uiLabelMap.OrderOrderId} - + ${uiLabelMap.ManufacturingProductsComponents} - - + + ${uiLabelMap.CommonDescription} - - + + ${uiLabelMap.ManufacturingNeedQuantity} - - + + ${uiLabelMap.ManufacturingOnHandQuantity} - + - + - + <#list records as record> - + @@ -101,57 +101,57 @@ under the License. ${record.get("ORDER_ID")}/${record.get("ORDER_ITEM_SEQ_ID")} - + ${record.get("PRODUCT_ID")} - + ${record.get("PRODUCT_NAME")} - + ${record.get("QUANTITY")} - + - + - + - + ${record.get("componentId")} - + ${record.get("componentName")} - + ${record.get("componentQuantity")} - + ${record.get("componentOnHand")} - + - - - + + + - - <#else> + + <#else> diff --git a/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl b/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl index 4d7cf5b8fd..1baf286e52 100644 --- a/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl +++ b/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl @@ -28,17 +28,17 @@ under the License. <#if hasPermission> - <#if records?has_content> + <#if records?has_content> ${uiLabelMap.CommonPage} - + ${uiLabelMap.ManufacturingOperationRunForShipment}:${shipmentIdPar} - + @@ -49,84 +49,84 @@ under the License. - + ${uiLabelMap.ManufacturingShopOrder} - + ${uiLabelMap.ManufacturingWorkCenter} - + ${uiLabelMap.ProductProductId} - + ${uiLabelMap.CommonDescription} - - + + ${uiLabelMap.ManufacturingOperationCodeAndDescription} - - + + ${uiLabelMap.ManufacturingTaskRunTime} - - + + ${uiLabelMap.ManufacturingTaskSetupTime} - + - - - - <#list records as record> - + + + + <#list records as record> + - - + + ${record.get("workEffortId")} - + <#if estimatedReadyDatePar?has_content>${record.get("fixedAssetId")} - + ${record.get("productId")} - + ${record.get("productName")} - - + + ${record.get("taskName")} ${record.get("taskDescription")} - - + + ${record.get("taskEstimatedTime")} - - + + ${record.get("taskEstimatedSetup")} - + - - - - - - + + + + + + - + ${fixedAssetTime} - + - - + + - <#else> + <#else> diff --git a/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml b/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml index 04eecb2141..ef8a60770f 100644 --- a/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml +++ b/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -54,7 +54,7 @@ under the License. - + @@ -62,7 +62,7 @@ under the License. - + @@ -70,10 +70,10 @@ under the License. - +
- + @@ -95,14 +95,14 @@ under the License. - +
- + @@ -110,7 +110,7 @@ under the License. - + @@ -153,7 +153,7 @@ under the License. - +
diff --git a/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl b/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl index dd2b2be377..cbd4e4bf33 100644 --- a/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl +++ b/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl @@ -20,19 +20,19 @@ under the License. <#if techDataCalendar?has_content>
-

${uiLabelMap.ManufacturingUpdateCalendar}

+

${uiLabelMap.ManufacturingUpdateCalendar}

- ${uiLabelMap.ManufacturingNewCalendar} + ${uiLabelMap.ManufacturingNewCalendar} <#else>
-

${uiLabelMap.ManufacturingCreateCalendar}

+

${uiLabelMap.ManufacturingCreateCalendar}

-
- ${uiLabelMap.ManufacturingNewCalendar} +
+ ${uiLabelMap.ManufacturingNewCalendar} diff --git a/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl b/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl index e6643b7d6b..296963a38a 100644 --- a/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl +++ b/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl @@ -20,9 +20,9 @@ under the License. <#if techDataCalendar?has_content>
-

${uiLabelMap.ManufacturingEditCalendarExceptionDayFor}  - <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}" - [${uiLabelMap.CommonId} ${techDataCalendar.calendarId?if_exists}]

+

${uiLabelMap.ManufacturingEditCalendarExceptionDayFor}  + <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}" + [${uiLabelMap.CommonId} ${techDataCalendar.calendarId?if_exists}]

${listCalendarExceptionDayWrapper.renderFormString(context)} @@ -31,7 +31,7 @@ under the License. <#if calendarExceptionDay?has_content>
-

${uiLabelMap.PageTitleEditCalendarExceptionWeek}

+

${uiLabelMap.PageTitleEditCalendarExceptionWeek}

${updateCalendarExceptionDayWrapper.renderFormString(context)} @@ -40,7 +40,7 @@ under the License.
-

${uiLabelMap.PageTitleAddCalendarExceptionWeek}

+

${uiLabelMap.PageTitleAddCalendarExceptionWeek}

${addCalendarExceptionDayWrapper.renderFormString(context)} diff --git a/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl b/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl index a2e959afee..3fc59b039b 100644 --- a/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl +++ b/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl @@ -20,9 +20,9 @@ under the License. <#if techDataCalendar?has_content>
-

${uiLabelMap.ManufacturingEditCalendarExceptionWeekFor}  - <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}" - [${uiLabelMap.CommonId} ${techDataCalendar.calendarId?if_exists}]

+

${uiLabelMap.ManufacturingEditCalendarExceptionWeekFor}  + <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}" + [${uiLabelMap.CommonId} ${techDataCalendar.calendarId?if_exists}]

${listCalendarExceptionWeekWrapper.renderFormString(context)} @@ -31,7 +31,7 @@ under the License. <#if calendarExceptionWeek?has_content>
-

${uiLabelMap.PageTitleEditCalendarExceptionWeek}

+

${uiLabelMap.PageTitleEditCalendarExceptionWeek}

${updateCalendarExceptionWeekWrapper.renderFormString(context)} @@ -40,10 +40,10 @@ under the License.
-

${uiLabelMap.PageTitleAddCalendarExceptionWeek}

+

${uiLabelMap.PageTitleAddCalendarExceptionWeek}

${addCalendarExceptionWeekWrapper.renderFormString(context)}
-
+
\ No newline at end of file diff --git a/applications/manufacturing/widget/manufacturing/BomScreens.xml b/applications/manufacturing/widget/manufacturing/BomScreens.xml index 0e161de787..c3637d08e2 100644 --- a/applications/manufacturing/widget/manufacturing/BomScreens.xml +++ b/applications/manufacturing/widget/manufacturing/BomScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
@@ -76,7 +76,7 @@ under the License. - + @@ -151,7 +151,7 @@ under the License. - - + <#if product.virtualVariantMethodEnum?if_exists == "VV_FEATURETREE" && featureLists?has_content> - - + + <#assign price = priceMap?if_exists/>
@@ -260,10 +260,10 @@ ${virtualJavaScript?if_exists} <#assign productLargeImageUrl = firstLargeImage> <#if productLargeImageUrl?string?has_content> - + - +
- + + + - <#if productCategory.categoryImageUrl?exists || productCategory.longDescription?exists> + <#if productCategory.categoryImageUrl?exists || productCategory.longDescription?exists> + diff --git a/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl b/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl index 7af81c3f4e..1c1a3c069c 100644 --- a/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl +++ b/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl @@ -39,9 +39,9 @@ under the License. <#else> ${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} - <#else> + <#else> <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - ${category.categoryName?if_exists} + ${category.categoryName?if_exists} <#else> ${category.categoryName?default(category.description)?default(category.productCategoryId)} diff --git a/applications/order/webapp/ordermgr/entry/checkinits.ftl b/applications/order/webapp/ordermgr/entry/checkinits.ftl index 0a4979716d..e000f10826 100644 --- a/applications/order/webapp/ordermgr/entry/checkinits.ftl +++ b/applications/order/webapp/ordermgr/entry/checkinits.ftl @@ -58,7 +58,7 @@ under the License. <#if defaultProductStore?has_content> - + <#list productStores as productStore> @@ -79,8 +79,8 @@ under the License. <#if defaultSalesChannel?has_content> - - + + <#list salesChannels as salesChannel> diff --git a/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl b/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl index e59e1aaf19..9143c18957 100644 --- a/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl +++ b/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl @@ -145,7 +145,7 @@ function submitForm(form, mode, value) {
<#--

${productContentWrapper.get("PRODUCT_NAME")?if_exists}

--> <#assign inStock = true> @@ -273,9 +273,9 @@ ${virtualJavaScript?if_exists} <#list featureList as feature> <#if feature_index == 0>
${feature.description}: @@ -283,7 +283,7 @@ ${virtualJavaScript?if_exists} - + <#if !product.virtualVariantMethodEnum?exists || product.virtualVariantMethodEnum == "VV_VARIANTTREE"> <#if variantTree?exists && (variantTree.size() > 0)> <#list featureSet as currentType> @@ -305,7 +305,7 @@ ${virtualJavaScript?if_exists}
${uiLabelMap.ProductItemOutOfStock}.
<#assign inStock = false> - + <#else> @@ -318,7 +318,7 @@ ${virtualJavaScript?if_exists} <#else>
${product.inventoryMessage?if_exists}
- +
@@ -336,15 +336,15 @@ ${virtualJavaScript?if_exists} <#assign hiddenStyle = "visible"> <#else> <#assign hiddenStyle = "hidden"> - +
${uiLabelMap.CommonAmount}: 
- -
<#if variantTree?exists && 0 < variantTree.size()> diff --git a/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl b/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl index 781e9d06c0..e7e2193262 100644 --- a/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl +++ b/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl @@ -152,13 +152,13 @@ ${virtualJavaScript?if_exists} if (index == -1) { <#if featureOrderFirst?exists> var Variable1 = eval("list" + "${featureOrderFirst}" + "()"); - + } else { var Variable1 = eval("list" + OPT[(currentFeatureIndex+1)] + selectedValue + "()"); } // set the product ID to NULL to trigger the alerts setAddProductId('NULL'); - + // set the variant price to NULL setVariantPrice('NULL'); } else { @@ -170,7 +170,7 @@ ${virtualJavaScript?if_exists} // set the product ID setAddProductId(sku); - + // set the variant price setVariantPrice(sku); @@ -182,13 +182,13 @@ ${virtualJavaScript?if_exists} function validate(x){ var msg=new Array(); msg[0]="Please use correct date format [yyyy-mm-dd]"; - + var y=x.split("-"); if(y.length!=3){ alert(msg[0]);return false; } if((y[2].length>2)||(parseInt(y[2])>31)) { alert(msg[0]); return false; } if(y[2].length==1){ y[2]="0"+y[2]; } if((y[1].length>2)||(parseInt(y[1])>12)){ alert(msg[0]); return false; } - if(y[1].length==1){ y[1]="0"+y[1]; } + if(y[1].length==1){ y[1]="0"+y[1]; } if(y[0].length>4){ alert(msg[0]); return false; } if(y[0].length<4) { if(y[0].length==2) { @@ -199,7 +199,7 @@ ${virtualJavaScript?if_exists} } } return (y[0]+"-"+y[1]+"-"+y[2]); - } + } function additemSubmit(){ <#if product.productTypeId?if_exists == "ASSET_USAGE"> @@ -235,7 +235,7 @@ ${virtualJavaScript?if_exists} } - <#if product.virtualVariantMethodEnum?if_exists == "VV_FEATURETREE" && featureLists?has_content> + <#if product.virtualVariantMethodEnum?if_exists == "VV_FEATURETREE" && featureLists?has_content> function checkRadioButton() { var block1 = document.getElementById("addCart1"); var block2 = document.getElementById("addCart2"); @@ -249,13 +249,13 @@ ${virtualJavaScript?if_exists} return; } <#break> - + block1.style.display = "block"; block2.style.display = "none"; } - + //--> @@ -308,7 +308,7 @@ ${virtualJavaScript?if_exists} - + <#-- for prices: - if price < competitivePrice, show competitive or "Compare At" price - if price < listPrice, show list price @@ -419,9 +419,9 @@ ${virtualJavaScript?if_exists} <#list featureList as feature> <#if feature_index == 0>
${feature.description}: @@ -434,13 +434,13 @@ ${virtualJavaScript?if_exists} ${uiLabelMap.OrderAddToCart}   -
+
${uiLabelMap.CommonQuantity}:  ${uiLabelMap.OrderAddToCart}   -
+ <#if !product.virtualVariantMethodEnum?exists || product.virtualVariantMethodEnum == "VV_VARIANTTREE"> <#if variantTree?exists && (variantTree.size() > 0)> @@ -463,7 +463,7 @@ ${virtualJavaScript?if_exists}
${uiLabelMap.ProductItemOutOfStock}.
<#assign inStock = false> - + <#else> @@ -493,7 +493,7 @@ ${virtualJavaScript?if_exists} <#assign hiddenStyle = "visible"> <#else> <#assign hiddenStyle = "hidden"> - +
${uiLabelMap.CommonAmount}:  diff --git a/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl b/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl index 6dffcab7ff..6f39a1a96f 100644 --- a/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl +++ b/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl @@ -19,10 +19,10 @@ under the License. <#if product?exists> <#-- variable setup --> <#assign productUrl = Static["org.ofbiz.product.category.CatalogUrlServlet"].makeCatalogUrl(request, product.productId, categoryId, "")/> - + <#if requestAttributes.productCategoryMember?exists> <#assign prodCatMem = requestAttributes.productCategoryMember> - + <#assign smallImageUrl = productContentWrapper.get("SMALL_IMAGE_URL")?if_exists> <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"> <#-- end variable setup --> @@ -74,7 +74,7 @@ under the License. - + ${uiLabelMap.OrderAddToCart} @@ -93,12 +93,12 @@ under the License. ${productContentWrapper.get("PRODUCT_NAME")?if_exists}
${productContentWrapper.get("DESCRIPTION")?if_exists}<#if daysToShip?exists> - ${uiLabelMap.ProductUsuallyShipsIn} ${daysToShip} ${uiLabelMap.CommonDays}!
- + <#-- Display category-specific product comments --> - <#if prodCatMem?exists && prodCatMem.comments?has_content> + <#if prodCatMem?exists && prodCatMem.comments?has_content>
${prodCatMem.comments}
- + <#-- example of showing a certain type of feature with the product --> <#if sizeProductFeatureAndAppls?has_content>
diff --git a/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl b/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl index 9512b059ef..cb3d41e3ea 100644 --- a/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl +++ b/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl @@ -39,7 +39,7 @@ under the License.

@@ -62,19 +62,19 @@ under the License. - + +
<#list productCategoryMembers as productCategoryMember> <#assign product = productCategoryMember.getRelatedOneCache("Product")> - ${setRequestAttribute("optProductId", productCategoryMember.productId)} + ${setRequestAttribute("optProductId", productCategoryMember.productId)} ${screens.render(quickaddsummaryScreen)} - - + +
+ <#else> diff --git a/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl b/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl index 4584bd8093..f6e1f5c38c 100644 --- a/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl +++ b/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl @@ -38,23 +38,23 @@ under the License.
<#if totalPrice?exists>
${uiLabelMap.ProductAggregatedPrice}: <@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/>
- <#else> + <#else>
<@ofbizCurrency amount=price.price isoCode=price.currencyUsed/>
-
<#-- check to see if introductionDate hasn't passed yet --> <#if product.introductionDate?exists && nowTimestamp.before(product.introductionDate)>
${uiLabelMap.ProductNotYetAvailable}
<#-- check to see if salesDiscontinuationDate has passed --> <#elseif product.salesDiscontinuationDate?exists && nowTimestamp.before(product.salesDiscontinuationDate)> -
${uiLabelMap.ProductNoLongerAvailable}
+
${uiLabelMap.ProductNoLongerAvailable}
<#-- check to see if the product is a virtual product --> <#elseif product.isVirtual?default("N") == "Y"> ${uiLabelMap.OrderChooseVariations}... - <#else> + <#else>
- + <#-- Party Tax Info --> <#-- commented out by default because the TaxAuthority drop-down is just too wide...
@@ -362,7 +362,7 @@ function submitForm(form, mode, value) { <#list finAccounts as finAccount> - checked="checked"/> + checked="checked"/> ${uiLabelMap.AccountingFinAccount} #${finAccount.finAccountId} diff --git a/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl b/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl index 979c285a65..7e11fb9f0b 100644 --- a/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl +++ b/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl @@ -98,10 +98,10 @@ function toggleBillingAccount(box) { -
 ${uiLabelMap.AccountingAgreementInformation}
- +
 ${uiLabelMap.AccountingAgreementInformation}
+
<#if agreements?exists> - <#if agreements.size()!=1> + <#if agreements.size()!=1> - + <#else> - <#list agreements as agreement> - checked>${agreement.description?if_exists} will be used for this order. - + <#list agreements as agreement> + checked>${agreement.description?if_exists} will be used for this order. + - +
  @@ -119,15 +119,15 @@ function toggleBillingAccount(box) {
-
+
<#-- Party Tax Info -->
 ${uiLabelMap.PartyTaxIdentification}
${screens.render("component://order/widget/ordermgr/OrderEntryOrderScreens.xml#customertaxinfo")} diff --git a/applications/order/webapp/ordermgr/entry/editShipAddress.ftl b/applications/order/webapp/ordermgr/entry/editShipAddress.ftl index e0eee2819d..b3a9608c39 100644 --- a/applications/order/webapp/ordermgr/entry/editShipAddress.ftl +++ b/applications/order/webapp/ordermgr/entry/editShipAddress.ftl @@ -23,7 +23,7 @@ under the License. @@ -102,7 +102,7 @@ under the License. @@ -116,7 +116,7 @@ under the License. - +
- <#if postalAddress?has_content> + <#if postalAddress?has_content>
<#else> @@ -86,7 +86,7 @@ under the License.
 
${uiLabelMap.CommonCountry}
  - ${screens.render("component://common/widget/CommonScreens.xml#countries")} *
diff --git a/applications/order/webapp/ordermgr/entry/optionsettings.ftl b/applications/order/webapp/ordermgr/entry/optionsettings.ftl index 73ba96b840..4d9401e549 100644 --- a/applications/order/webapp/ordermgr/entry/optionsettings.ftl +++ b/applications/order/webapp/ordermgr/entry/optionsettings.ftl @@ -24,7 +24,7 @@ under the License.
- - - <#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0> + <#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0> - + <#else> diff --git a/applications/order/webapp/ordermgr/entry/order/orderitems.ftl b/applications/order/webapp/ordermgr/entry/order/orderitems.ftl index 3e31b18eff..f11c6ad2c1 100644 --- a/applications/order/webapp/ordermgr/entry/order/orderitems.ftl +++ b/applications/order/webapp/ordermgr/entry/order/orderitems.ftl @@ -39,21 +39,21 @@ under the License. <#list orderItems?if_exists as orderItem> <#assign itemType = orderItem.getRelatedOne("OrderItemType")?if_exists> - - <#if orderItem.productId?exists && orderItem.productId == "_?_"> - + <#if orderItem.productId?exists && orderItem.productId == "_?_"> + - <#else> - + <#if maySelectItems?default(false)> - @@ -131,22 +131,22 @@ under the License. - + <#list headerAdjustmentsToShow?if_exists as orderHeaderAdjustment> - + - + - + diff --git a/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl b/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl index 655cc08e6d..77cac5c3c9 100644 --- a/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl +++ b/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl @@ -30,20 +30,20 @@ under the License. <#if paymentMethodType.paymentMethodTypeId == "EXT_OFFLINE"> + + <#else> <#assign outputted = true> - +
+
<#list 1..cart.getShipGroupSize() as currIndex> @@ -50,10 +50,10 @@ under the License.
<#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId> - checked> + checked> -
+
+
<#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId?if_exists} ${carrierShipmentMethod.description?if_exists} <#if cart.getShippingContactMechId(shipGroupIndex)?exists> <#assign shippingEst = shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)> @@ -66,11 +66,11 @@ under the License. -
+
@@ -80,7 +80,7 @@ under the License.



+
>> ${orderItem.itemDescription}
-
- <#if orderItem.productId?exists> + <#else> +
+
+ <#if orderItem.productId?exists> ${orderItem.productId} - ${orderItem.itemDescription} - <#else> + <#else> ${itemType?if_exists.description?if_exists} : ${orderItem.itemDescription?if_exists}
- +
${orderItem.quantity?string.number}
@@ -66,9 +66,9 @@ under the License.
<@ofbizCurrency amount=localOrderReadHelper.getOrderItemSubTotal(orderItem) isoCode=currencyUomId/>
-
+
${uiLabelMap.OrderSubTotal}
 <#if orderSubTotal?exists><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/>
${localOrderReadHelper.getAdjustmentType(orderHeaderAdjustment)}
<@ofbizCurrency amount=localOrderReadHelper.getOrderAdjustmentTotal(orderHeaderAdjustment) isoCode=currencyUomId/>
${uiLabelMap.FacilityShippingAndHandling}
<#if orderShippingTotal?exists><@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/>
${uiLabelMap.OrderSalesTax}
<#if orderTaxTotal?exists><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/>

${uiLabelMap.OrderGrandTotal}
-
${uiLabelMap.AccountingOfflinePayment}
- <#if orderHeader?has_content && paymentAddress?has_content> +
${uiLabelMap.AccountingOfflinePayment}
+ <#if orderHeader?has_content && paymentAddress?has_content>

${uiLabelMap.AccountingPleaseSendPaymentTo}:
<#if paymentAddress.toName?has_content>
${paymentAddress.toName}
<#if paymentAddress.attnName?has_content>
${uiLabelMap.CommonAttn}: ${paymentAddress.attnName}
${paymentAddress.address1}
- <#if paymentAddress.address2?has_content>
${paymentAddress.address2}
+ <#if paymentAddress.address2?has_content>
${paymentAddress.address2}
${paymentAddress.city}<#if paymentAddress.stateProvinceGeoId?has_content>, ${paymentAddress.stateProvinceGeoId} ${paymentAddress.postalCode} -
${paymentAddress.countryGeoId}
+
${paymentAddress.countryGeoId}

${uiLabelMap.OrderBeSureIncludeOrder} #
- -
@@ -54,7 +54,7 @@ under the License. <#if paymentMethod?has_content> <#assign outputted = true> - <#-- credit card info --> + <#-- credit card info --> <#if creditCard?has_content>
@@ -109,7 +109,7 @@ under the License.
diff --git a/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl b/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl index 387d672a84..95325924eb 100644 --- a/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl +++ b/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl @@ -17,10 +17,10 @@ specific language governing permissions and limitations under the License. --> -<#-- -Ship group summary for order confirmation. Lists each ship group, its +<#-- +Ship group summary for order confirmation. Lists each ship group, its destination address, products and quantities associated with it, -and similar information. This is designed to be tacked on to the +and similar information. This is designed to be tacked on to the standard order confirmation page and to be re-usable by other screens. --> @@ -46,9 +46,9 @@ standard order confirmation page and to be re-usable by other screens. <#-- BEGIN LIST SHIP GROUPS --> - <#-- - The structure of this table is one row per line item, grouped by ship group. - The address column spans a number of rows equal to the number of items of its group. + <#-- + The structure of this table is one row per line item, grouped by ship group. + The address column spans a number of rows equal to the number of items of its group. --> <#list cart.getShipGroups() as cartShipInfo> @@ -67,7 +67,7 @@ standard order confirmation page and to be re-usable by other screens. <#if contactMech?has_content> <#assign address = contactMech.getRelatedOne("PostalAddress")?if_exists /> - + <#if address?exists> <#if address.toName?has_content>${uiLabelMap.CommonTo}: ${address.toName}
<#if address.attnName?has_content>${uiLabelMap.CommonAttn}: ${address.attnName}
diff --git a/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl b/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl index 7bf331b644..7ee7da8410 100644 --- a/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl +++ b/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl @@ -37,7 +37,7 @@ under the License.
- + <#if shoppingCart.getOrderType() != "PURCHASE_ORDER"> - + - - <#if "PURCHASE_ORDER" == cart.getOrderType()> + + <#if "PURCHASE_ORDER" == cart.getOrderType()> - + - + - + <#if cart.getOrderType() != "PURCHASE_ORDER"> @@ -110,7 +110,7 @@ under the License. - + @@ -194,7 +194,7 @@ under the License. - + <#if cart.getOrderType() == "PURCHASE_ORDER"> @@ -211,7 +211,7 @@ under the License. - +
${uiLabelMap.OrderOrderName}:${uiLabelMap.OrderOrderName}: @@ -59,7 +59,7 @@ under the License.
${uiLabelMap.OrderPONumber}:${uiLabelMap.OrderPONumber}: diff --git a/applications/order/webapp/ordermgr/entry/orderagreements.ftl b/applications/order/webapp/ordermgr/entry/orderagreements.ftl index 9983c37e8f..458bc41b6b 100644 --- a/applications/order/webapp/ordermgr/entry/orderagreements.ftl +++ b/applications/order/webapp/ordermgr/entry/orderagreements.ftl @@ -75,8 +75,8 @@ under the License.
  @@ -86,9 +86,9 @@ under the License.
  @@ -99,7 +99,7 @@ under the License.
 
 
diff --git a/applications/order/webapp/ordermgr/entry/orderparty.ftl b/applications/order/webapp/ordermgr/entry/orderparty.ftl index b13882e2e9..77b02856ba 100644 --- a/applications/order/webapp/ordermgr/entry/orderparty.ftl +++ b/applications/order/webapp/ordermgr/entry/orderparty.ftl @@ -25,7 +25,7 @@ under the License.
 ${uiLabelMap.PartyParty}
- + @@ -33,7 +33,7 @@ under the License. - + +
<#if person?has_content> @@ -46,7 +46,7 @@ under the License. ${uiLabelMap.CommonSet} | ${uiLabelMap.CommonFind}<#if partyId?default("_NA_") != "_NA_" && partyId?default("_NA_") != ""> | ${uiLabelMap.CommonView} -
diff --git a/applications/order/webapp/ordermgr/entry/shipsettings.ftl b/applications/order/webapp/ordermgr/entry/shipsettings.ftl index 6e63429215..9433750534 100644 --- a/applications/order/webapp/ordermgr/entry/shipsettings.ftl +++ b/applications/order/webapp/ordermgr/entry/shipsettings.ftl @@ -20,7 +20,7 @@ under the License. <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) || security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)> <#-- Purchase Orders --> - + <#if facilityMaps?exists>
@@ -49,7 +49,7 @@ under the License.
<#-- company postal addresses --> - + <#if facilityContactMechList?has_content> <#list facilityContactMechList as shippingContactMech> <#if shippingContactMech.postalAddress?exists> @@ -102,7 +102,7 @@ under the License. <#-- Sales Orders --> - + <#if (cart.getShipGroupSize() > 1)> @@ -142,7 +142,7 @@ under the License. <#assign facility = productStoreFacility.getRelatedOne("Facility")> - +
@@ -177,12 +177,12 @@ under the License. <#if shippingAddress.city?has_content>${shippingAddress.city} <#if shippingAddress.stateProvinceGeoId?has_content>
${shippingAddress.stateProvinceGeoId} <#if shippingAddress.postalCode?has_content>
${shippingAddress.postalCode} - <#if shippingAddress.countryGeoId?has_content>
${shippingAddress.countryGeoId} + <#if shippingAddress.countryGeoId?has_content>
${shippingAddress.countryGeoId}
- + <#if shippingContactMech_has_next>
@@ -209,17 +209,17 @@ under the License. <#if shippingAddress.city?has_content>${shippingAddress.city} <#if shippingAddress.stateProvinceGeoId?has_content>
${shippingAddress.stateProvinceGeoId} <#if shippingAddress.postalCode?has_content>
${shippingAddress.postalCode} - <#if shippingAddress.countryGeoId?has_content>
${shippingAddress.countryGeoId} + <#if shippingAddress.countryGeoId?has_content>
${shippingAddress.countryGeoId}
-   +   <#if shippingContactMech_has_next>
- + diff --git a/applications/order/webapp/ordermgr/error/error.jsp b/applications/order/webapp/ordermgr/error/error.jsp index bab526dbe3..dcfa3b066b 100644 --- a/applications/order/webapp/ordermgr/error/error.jsp +++ b/applications/order/webapp/ordermgr/error/error.jsp @@ -32,12 +32,12 @@ under the License. - - + - + diff --git a/applications/order/webapp/ordermgr/images/js/return.js b/applications/order/webapp/ordermgr/images/js/return.js index 8eb1f285b6..a78116ddc7 100644 --- a/applications/order/webapp/ordermgr/images/js/return.js +++ b/applications/order/webapp/ordermgr/images/js/return.js @@ -26,14 +26,14 @@ Event.observe(window, 'load', function() { function changeStatusCorrespondingToHeaderType() { var listOptions = []; new Ajax.Request('/ordermgr/control/getStatusItemsForReturn', { - asynchronous: false, + asynchronous: false, onSuccess: function(transport) { var data = transport.responseText.evalJSON(true); var statusItems = data.statusItems; statusItems.each( function(statusItem) { listOptions.push(""); }); - $('statusId').update(listOptions); + $('statusId').update(listOptions); }, parameters: {returnHeaderTypeId: $F('returnHeaderTypeId')}, requestHeaders: {Accept: 'application/json'} - }); + }); } \ No newline at end of file diff --git a/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml b/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml index c9f797341c..e5a6bf7246 100644 --- a/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml +++ b/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml @@ -18,10 +18,10 @@ specific language governing permissions and limitations under the License. --> - - @@ -57,7 +57,7 @@ under the License. - +
- + -
@@ -173,7 +173,7 @@ under the License. - + @@ -219,7 +219,7 @@ under the License. - +
- +
@@ -262,7 +262,7 @@ under the License. - +
- +
@@ -321,7 +321,7 @@ under the License. - +
--> - +
- +
@@ -459,10 +459,10 @@ under the License. - + -
@@ -495,7 +495,7 @@ under the License. - +
- diff --git a/applications/order/webapp/ordermgr/order/OrderForms.xml b/applications/order/webapp/ordermgr/order/OrderForms.xml index b426d53037..845fa5592a 100644 --- a/applications/order/webapp/ordermgr/order/OrderForms.xml +++ b/applications/order/webapp/ordermgr/order/OrderForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -29,7 +29,7 @@ under the License.
- + @@ -38,7 +38,7 @@ under the License. - + @@ -54,7 +54,7 @@ under the License. - + @@ -63,7 +63,7 @@ under the License. - + @@ -72,7 +72,7 @@ under the License. - + diff --git a/applications/order/webapp/ordermgr/order/OrderShopListForms.xml b/applications/order/webapp/ordermgr/order/OrderShopListForms.xml index ee43830d53..d9c7ff78ff 100644 --- a/applications/order/webapp/ordermgr/order/OrderShopListForms.xml +++ b/applications/order/webapp/ordermgr/order/OrderShopListForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - diff --git a/applications/order/webapp/ordermgr/order/appendorderitem.ftl b/applications/order/webapp/ordermgr/order/appendorderitem.ftl index 96d460221d..db5f0e009c 100644 --- a/applications/order/webapp/ordermgr/order/appendorderitem.ftl +++ b/applications/order/webapp/ordermgr/order/appendorderitem.ftl @@ -52,7 +52,7 @@ under the License.
- + - - + + - + - +
+
:ERROR MESSAGE:
<%=UtilFormatOut.replaceString(errorMsg, "\n", "
")%>
${uiLabelMap.ProductProductId} @@ -84,8 +84,8 @@ under the License.
${uiLabelMap.OrderDesiredDeliveryDate} @@ -103,7 +103,7 @@ under the License.
${uiLabelMap.CommonComment} diff --git a/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl b/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl index 201bb7780a..d88bb8a6da 100644 --- a/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl +++ b/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl @@ -34,8 +34,8 @@ under the License. ${uiLabelMap.CommonNoPostalAddress} ${uiLabelMap.CommonFor}: ${companyName} - - <#if sendingPartyTaxId?exists || phone?exists || email?exists || website?exists || eftAccount?exists> + + <#if sendingPartyTaxId?exists || phone?exists || email?exists || website?exists || eftAccount?exists> <#if sendingPartyTaxId?exists> diff --git a/applications/order/webapp/ordermgr/order/editorderitems.ftl b/applications/order/webapp/ordermgr/order/editorderitems.ftl index 2222c73859..fc5fb086fa 100644 --- a/applications/order/webapp/ordermgr/order/editorderitems.ftl +++ b/applications/order/webapp/ordermgr/order/editorderitems.ftl @@ -31,7 +31,7 @@ float: right; <#-- price change rules --> <#assign allowPriceChange = false/> -<#if (orderHeader.orderTypeId == 'PURCHASE_ORDER' || security.hasEntityPermission("ORDERMGR", "_SALES_PRICEMOD", session))> +<#if (orderHeader.orderTypeId == 'PURCHASE_ORDER' || security.hasEntityPermission("ORDERMGR", "_SALES_PRICEMOD", session))> <#assign allowPriceChange = true/> @@ -53,11 +53,11 @@ float: right; ${uiLabelMap.checkhelper_sales_order_lines_lookup_failed} <#else> - - <#if (orderHeader.orderTypeId == 'PURCHASE_ORDER')> + + <#if (orderHeader.orderTypeId == 'PURCHASE_ORDER')> - + @@ -118,7 +118,7 @@ float: right; - + <#-- now show status details per line item --> <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")> - + <#-- now update/cancel reason and comment field --> - <#if orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && ("Y" != orderItem.isPromo?if_exists)> + <#if orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && ("Y" != orderItem.isPromo?if_exists)> - + <#-- now show adjustment details per line item --> <#assign orderItemAdjustments = Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentList(orderItem, orderAdjustments)> <#if orderItemAdjustments?exists && orderItemAdjustments?has_content> @@ -206,7 +206,7 @@ float: right; - + <#-- now show ship group info per line item --> <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc")?if_exists> <#if orderItemShipGroupAssocs?has_content> @@ -249,8 +249,8 @@ float: right; @@ -292,7 +292,7 @@ float: right; ${uiLabelMap.CommonDelete} <#else> - <@ofbizAmount amount=adjustmentAmount/> + <@ofbizAmount amount=adjustmentAmount/> @@ -340,28 +340,28 @@ float: right; - + <#-- other adjustments --> - + <#-- shipping adjustments --> - + <#-- tax adjustments --> - + <#-- grand total --> diff --git a/applications/order/webapp/ordermgr/order/findOrders.ftl b/applications/order/webapp/ordermgr/order/findOrders.ftl index a534cbae58..ab8f32235f 100644 --- a/applications/order/webapp/ordermgr/order/findOrders.ftl +++ b/applications/order/webapp/ordermgr/order/findOrders.ftl @@ -78,7 +78,7 @@ function runAction() { <#if orderList?exists>
  • ${uiLabelMap.CommonHideFields}
  • ${uiLabelMap.PartyLookupParty}
  • ${uiLabelMap.OrderLookupOrder}
  • - +
    @@ -234,7 +234,7 @@ function runAction() { - +
    ${uiLabelMap.ProductProduct} @@ -153,7 +153,7 @@ float: right;   <#else>
    <@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/> / <@ofbizCurrency amount=orderItem.unitListPrice isoCode=currencyUomId/>
    - +
    <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentsTotal(orderItem, orderAdjustments, true, false, false) isoCode=currencyUomId/> @@ -169,15 +169,15 @@ float: right; <#if ("Y" != orderItem.isPromo?if_exists) && ((security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED") || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && orderHeader.statusId != "ORDER_SENT"))> ${uiLabelMap.CommonCancelAll} - <#else> + <#else>  
    ${uiLabelMap.OrderReturnReason} ${uiLabelMap.CommonComments} - + <#if (orderHeader.orderTypeId == 'PURCHASE_ORDER')> ${uiLabelMap.OrderEstimatedShipDate} @@ -196,7 +196,7 @@ float: right; ${uiLabelMap.OrderCalendarClickHereForCalendar}
    ${uiLabelMap.OrderAdjustment} ${adjustmentType.get("description",locale)}  ${orderItemAdjustment.get("description",locale)?if_exists} (${orderItemAdjustment.comments?default("")}) - + <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX"> <#if orderItemAdjustment.primaryGeoId?has_content> <#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/> @@ -230,7 +230,7 @@ float: right;
    <#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)) && ("Y" != orderItem.isPromo?if_exists))> <#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")> - ${uiLabelMap.CommonCancel} - <#else> + ${uiLabelMap.CommonCancel} + <#else>  
    <@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/>  
    ${uiLabelMap.OrderTotalOtherOrderAdjustments} <@ofbizCurrency amount=otherAdjAmount isoCode=currencyUomId/>  
    ${uiLabelMap.OrderTotalShippingAndHandling} <@ofbizCurrency amount=shippingAmount isoCode=currencyUomId/>  
    ${uiLabelMap.OrderTotalSalesTax} <@ofbizCurrency amount=taxAmount isoCode=currencyUomId/>  
    ${uiLabelMap.OrderTotalDue}
    ${uiLabelMap.CommonStatus}${uiLabelMap.CommonStatus}  
    checked="checked" /> + <#if requestParameters.filterInventoryProblems?default("N") == "Y">checked="checked" />
    ${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPartiallyReceivedPOs}   @@ -307,12 +307,12 @@ function runAction() {
    checked="checked" /> + <#if requestParameters.filterPartiallyReceivedPOs?default("N") == "Y">checked="checked" />
    - + ${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPOsOpenPastTheirETA}   @@ -321,12 +321,12 @@ function runAction() { checked="checked" /> + <#if requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y">checked="checked" /> - + ${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPOsWithRejectedItems}   @@ -335,12 +335,12 @@ function runAction() { checked="checked" /> + <#if requestParameters.filterPOsWithRejectedItems?default("N") == "Y">checked="checked" /> - +
      @@ -391,7 +391,7 @@ document.lookuporder.orderId.focus();
    - +
     
    @@ -431,12 +431,12 @@ document.lookuporder.orderId.focus(); ${uiLabelMap.OrderRemainingSubTotal} ${uiLabelMap.OrderOrderTotal}   - <#if (requestParameters.filterInventoryProblems?default("N") == "Y") || (requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y") || (requestParameters.filterPOsWithRejectedItems?default("N") == "Y") || (requestParameters.filterPartiallyReceivedPOs?default("N") == "Y")> + <#if (requestParameters.filterInventoryProblems?default("N") == "Y") || (requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y") || (requestParameters.filterPOsWithRejectedItems?default("N") == "Y") || (requestParameters.filterPartiallyReceivedPOs?default("N") == "Y")> ${uiLabelMap.CommonStatus} ${uiLabelMap.CommonFilter} <#else> ${uiLabelMap.CommonStatus} - + ${uiLabelMap.OrderDate} ${uiLabelMap.PartyPartyId}   @@ -501,22 +501,22 @@ document.lookuporder.orderId.focus();   ${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))} - <#if (requestParameters.filterInventoryProblems?default("N") == "Y") || (requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y") || (requestParameters.filterPOsWithRejectedItems?default("N") == "Y") || (requestParameters.filterPartiallyReceivedPOs?default("N") == "Y")> + <#if (requestParameters.filterInventoryProblems?default("N") == "Y") || (requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y") || (requestParameters.filterPOsWithRejectedItems?default("N") == "Y") || (requestParameters.filterPartiallyReceivedPOs?default("N") == "Y")> <#if filterInventoryProblems.contains(orderHeader.orderId)> - Inv  + Inv  <#if filterPOsOpenPastTheirETA.contains(orderHeader.orderId)> - ETA  + ETA  <#if filterPOsWithRejectedItems.contains(orderHeader.orderId)> - Rej  + Rej  <#if filterPartiallyReceivedPOs.contains(orderHeader.orderId)> - Part  - + Part  + - + ${orderHeader.getString("orderDate")} <#if partyId != "_NA_"> diff --git a/applications/order/webapp/ordermgr/order/newnote.ftl b/applications/order/webapp/ordermgr/order/newnote.ftl index c7371e82f3..f58a2c8e52 100644 --- a/applications/order/webapp/ordermgr/order/newnote.ftl +++ b/applications/order/webapp/ordermgr/order/newnote.ftl @@ -25,7 +25,7 @@ under the License.
    - <#else> diff --git a/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl b/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl index 26766dc1e0..fb3bfa3866 100644 --- a/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl +++ b/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl @@ -24,16 +24,16 @@ under the License. - + ${uiLabelMap.OrderProduct} ${uiLabelMap.OrderQuantity} ${uiLabelMap.OrderUnitList} ${uiLabelMap.OrderSubTotal} - + - + <#list orderItemList as orderItem> <#assign orderItemType = orderItem.getRelatedOne("OrderItemType")?if_exists> @@ -52,7 +52,7 @@ under the License. - ${remainingQuantity} + ${remainingQuantity} <@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/> <#if orderItem.statusId != "ITEM_CANCELLED"> @@ -79,7 +79,7 @@ under the License. - <#-- summary of order amounts --> + <#-- summary of order amounts --> ${uiLabelMap.OrderItemsSubTotal} @@ -119,31 +119,31 @@ under the License. ${uiLabelMap.OrderNotes} - - + + <#list orderNotes as note> <#if (note.internalNote?has_content) && (note.internalNote != "Y")> - + - ${note.noteInfo?if_exists} + ${note.noteInfo?if_exists} <#assign notePartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", note.noteParty, "compareDate", note.noteDateTime, "lastNameFirst", "Y", "userLogin", userLogin))/> ${uiLabelMap.CommonBy}: ${notePartyNameResult.fullName?default("${uiLabelMap.OrderPartyNameNotFound}")} - ${uiLabelMap.CommonAt}: ${note.noteDateTime?string?if_exists} + ${uiLabelMap.CommonAt}: ${note.noteDateTime?string?if_exists} - + - + \ No newline at end of file diff --git a/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl b/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl index 9cdd401db3..8854afc9ce 100644 --- a/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl +++ b/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl @@ -22,7 +22,7 @@ under the License. <#-- this part could use some improvement --> - + <#assign createEmptyCell = true> <#-- a special purchased from address for Purchase Orders --> <#if orderHeader.getString("orderTypeId") == "PURCHASE_ORDER"> @@ -51,10 +51,10 @@ under the License. ${uiLabelMap.OrderPurchasedFrom}: ${Static['org.ofbiz.party.party.PartyHelper'].getPartyName(vendorParty)} - + - + <#-- list all postal addresses of the order. there should be just a billing and a shipping here. --> <#list orderContactMechValueMaps as orderContactMechValueMap> <#assign contactMech = orderContactMechValueMap.contactMech> @@ -81,13 +81,13 @@ under the License. - - + + - - <#-- payment info --> + + <#-- payment info --> <#if orderPaymentPreferences?has_content> @@ -106,7 +106,7 @@ under the License. - + <#-- shipping method. currently not shown for PO's because we are not recording a shipping method for PO's in order entry --> <#if orderHeader.getString("orderTypeId") == "SALES_ORDER"> diff --git a/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl b/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl index 767ccdb541..0eac52c5ac 100644 --- a/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl +++ b/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl @@ -26,14 +26,14 @@ under the License. ${orderHeader.getRelatedOne("OrderType").get("description",locale)} - + ${uiLabelMap.OrderDateOrdered} <#assign dateFormat = Static["java.text.DateFormat"].LONG> <#assign orderDate = Static["java.text.DateFormat"].getDateInstance(dateFormat,locale).format(orderHeader.get("orderDate"))> ${orderDate} - + ${uiLabelMap.OrderOrder} # ${orderId} @@ -48,7 +48,7 @@ under the License. ${uiLabelMap.FormFieldTitle_cancelBackOrderDate} <#assign dateFormat = Static["java.text.DateFormat"].LONG> <#assign cancelBackOrderDate = Static["java.text.DateFormat"].getDateInstance(dateFormat,locale).format(orderItem.get("cancelBackOrderDate"))> - <#if cancelBackOrderDate?has_content>${cancelBackOrderDate} + <#if cancelBackOrderDate?has_content>${cancelBackOrderDate} diff --git a/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl b/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl index 9c3f835de9..dce5edcc56 100644 --- a/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl +++ b/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl @@ -31,14 +31,14 @@ under the License. - + <#if displayParty?has_content || orderContactMechValueMaps?has_content>
    •  ${uiLabelMap.OrderContactInformation}

    -
    +
    @@ -53,7 +53,7 @@ under the License. <#if partyId?exists>  (${partyId})
    - <#if orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL"> + <#if orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL">
    ${uiLabelMap.OrderNewOrder} ${uiLabelMap.OrderOtherOrders} @@ -99,9 +99,9 @@ under the License. -
    +
    <@partyPostalAddress postalContactMechList = postalContactMechList?if_exists contactMechPurposeTypeId = contactMechPurpose.contactMechPurposeTypeId?if_exists contactPostalAddress=postalAddress?if_exists/>
    - + <#elseif contactMech.contactMechTypeId == "TELECOM_NUMBER"> diff --git a/applications/order/webapp/ordermgr/order/orderinfo.ftl b/applications/order/webapp/ordermgr/order/orderinfo.ftl index 9026e384bc..1513f9a534 100644 --- a/applications/order/webapp/ordermgr/order/orderinfo.ftl +++ b/applications/order/webapp/ordermgr/order/orderinfo.ftl @@ -25,7 +25,7 @@ under the License. <#assign orderType = orderHeader.getRelatedOne("OrderType")/>
  •  ${orderType?if_exists.get("description", locale)?default(uiLabelMap.OrderOrder)} #${orderId} ${externalOrder?if_exists} [ PDF ]
  • - + <#if currentStatus.statusId == "ORDER_CREATED" || currentStatus.statusId == "ORDER_PROCESSING">
  • ${uiLabelMap.OrderApproveOrder}
  • @@ -75,10 +75,10 @@ under the License.
    - - + + - + <#-- order status history --> @@ -123,7 +123,7 @@ under the License. - @@ -219,7 +219,7 @@ under the License. diff --git a/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl b/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl index b7ca0c78e1..fd535767a1 100644 --- a/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl +++ b/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl @@ -78,7 +78,7 @@ under the License. @@ -431,7 +431,7 @@ under the License. <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED")) && (paymentMethodValueMaps?has_content)>
     ${uiLabelMap.OrderOrderName}  ${orderHeader.orderName}
    ${orderHeader.orderName}

     ${uiLabelMap.OrderStatusHistory}
     ${uiLabelMap.OrderSalesChannel}   + <#if orderHeader.salesChannelEnumId?has_content> <#assign channel = orderHeader.getRelatedOne("SalesChannelEnumeration")> ${(channel.get("description",locale))?default("N/A")} @@ -211,7 +211,7 @@ under the License. <#if "SALES_ORDER" == orderHeader.orderTypeId> - +

     ${uiLabelMap.FormFieldTitle_priority} diff --git a/applications/order/webapp/ordermgr/order/orderitems.ftl b/applications/order/webapp/ordermgr/order/orderitems.ftl index 0dee525f5d..7f443a646c 100644 --- a/applications/order/webapp/ordermgr/order/orderitems.ftl +++ b/applications/order/webapp/ordermgr/order/orderitems.ftl @@ -24,7 +24,7 @@ under the License.
  •  ${uiLabelMap.OrderOrderItems}

  • - +
    @@ -150,7 +150,7 @@ under the License. <#assign returnHeader = returnItem.getRelatedOne("ReturnHeader")> <#if returnHeader.statusId != "RETURN_CANCELLED">
    - ${uiLabelMap.OrderReturned}# + ${uiLabelMap.OrderReturned}# ${returnItem.returnId} @@ -181,7 +181,7 @@ under the License.
    - <#if orderHeader.orderTypeId == "SALES_ORDER"> + <#if orderHeader.orderTypeId == "SALES_ORDER"> <#if pickedQty gt 0 && orderHeader.statusId == "ORDER_APPROVED"> @@ -192,7 +192,7 @@ under the License. <#else> - + @@ -211,9 +211,9 @@ under the License. <#else>${orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0) - shippedQuantity} - - - + + + @@ -358,10 +358,10 @@ under the License. <#list orderItemAdjustments as orderItemAdjustment> <#assign adjustmentType = orderItemAdjustment.getRelatedOneCache("OrderAdjustmentType")> - diff --git a/applications/order/webapp/ordermgr/order/orderlist.ftl b/applications/order/webapp/ordermgr/order/orderlist.ftl index 9bcd3f4d96..f9e5833381 100644 --- a/applications/order/webapp/ordermgr/order/orderlist.ftl +++ b/applications/order/webapp/ordermgr/order/orderlist.ftl @@ -32,10 +32,10 @@ under the License. } } } - + -<#macro pagination> +<#macro pagination>
    ${uiLabelMap.OrderCancelled} ${orderItem.cancelQuantity?default(0)?string.number}${uiLabelMap.OrderQtyPicked} ${pickedQty?default(0)?string.number}   
    ${uiLabelMap.OrderRemaining}
    ${uiLabelMap.OrderInvoiced} ${orderReadHelper.getOrderItemInvoicedQuantity(orderItem)} ${uiLabelMap.OrderReturned}
    +
    ${uiLabelMap.OrderAdjustment} ${adjustmentType.get("description",locale)} - ${orderItemAdjustment.get("description",locale)?if_exists} + ${orderItemAdjustment.get("description",locale)?if_exists} <#if orderItemAdjustment.comments?has_content>(${orderItemAdjustment.comments?default("")}) <#if orderItemAdjustment.productPromoId?has_content> @@ -586,7 +586,7 @@ under the License. ${itemIssuance.inventoryItemId} ${uiLabelMap.OrderShipGroup} ${itemIssuance.shipGroupSeqId?if_exists} - <#if (inventoryItem.serialNumber?has_content)>
    ${uiLabelMap.ProductSerialNumber} ${inventoryItem.serialNumber}  + <#if (inventoryItem.serialNumber?has_content)>
    ${uiLabelMap.ProductSerialNumber} ${inventoryItem.serialNumber} 
    + @@ -91,7 +91,7 @@ under the License. checked="checked"/> ${descr_PURCHASE_ORDER} - + @@ -146,7 +146,7 @@ under the License.
    -
    +
    @@ -79,7 +79,7 @@ under the License. checked="checked" />${uiLabelMap.CommonRejected} checked="checked" />${uiLabelMap.CommonCancelled} -
    ${uiLabelMap.CommonType}
    ${uiLabelMap.CommonFilter}
    @@ -156,7 +156,7 @@ under the License. - <#if state.hasFilter('filterInventoryProblems') || state.hasFilter('filterAuthProblems') || state.hasFilter('filterPOsOpenPastTheirETA') || state.hasFilter('filterPOsWithRejectedItems') || state.hasFilter('filterPartiallyReceivedPOs')> + <#if state.hasFilter('filterInventoryProblems') || state.hasFilter('filterAuthProblems') || state.hasFilter('filterPOsOpenPastTheirETA') || state.hasFilter('filterPOsWithRejectedItems') || state.hasFilter('filterPartiallyReceivedPOs')> <#else> @@ -164,7 +164,7 @@ under the License. <#list orderHeaderList as orderHeader> - <#assign status = orderHeader.getRelatedOneCache("StatusItem")> + <#assign status = orderHeader.getRelatedOneCache("StatusItem")> <#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)> <#assign billToParty = orh.getBillToParty()?if_exists> <#assign billFromParty = orh.getBillFromParty()?if_exists> @@ -187,14 +187,14 @@ under the License. - <#if state.hasFilter('filterInventoryProblems') || state.hasFilter('filterAuthProblems') || state.hasFilter('filterPOsOpenPastTheirETA') || state.hasFilter('filterPOsWithRejectedItems') || state.hasFilter('filterPartiallyReceivedPOs')> + <#if state.hasFilter('filterInventoryProblems') || state.hasFilter('filterAuthProblems') || state.hasFilter('filterPOsOpenPastTheirETA') || state.hasFilter('filterPOsWithRejectedItems') || state.hasFilter('filterPartiallyReceivedPOs')> - <#if note_has_next> + <#if note_has_next>
    ${uiLabelMap.CommonDate}${uiLabelMap.OrderOrderBillToParty} ${uiLabelMap.CommonAmount} ${uiLabelMap.OrderTrackingCode}${uiLabelMap.CommonStatus} ${uiLabelMap.CommonFilter}
    <@ofbizCurrency amount=orderHeader.grandTotal isoCode=orderHeader.currencyUom/> <#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder")> - <#list trackingCodes as trackingCode> + <#list trackingCodes as trackingCode> <#if trackingCode?has_content> ${trackingCode.trackingCodeId}
    - +
    ${orderHeader.getRelatedOneCache("StatusItem").get("description",locale)} <#if filterInventoryProblems.contains(orderHeader.orderId)> Inv  diff --git a/applications/order/webapp/ordermgr/order/ordernotes.ftl b/applications/order/webapp/ordermgr/order/ordernotes.ftl index 7d99efee43..ef0a03a9d5 100644 --- a/applications/order/webapp/ordermgr/order/ordernotes.ftl +++ b/applications/order/webapp/ordermgr/order/ordernotes.ftl @@ -48,19 +48,19 @@ under the License. <#if note.internalNote?if_exists == "N"> ${uiLabelMap.OrderPrintableNote} ${uiLabelMap.OrderNotesPrivate} - + <#if note.internalNote?if_exists == "Y"> ${uiLabelMap.OrderNotPrintableNote} ${uiLabelMap.OrderNotesPublic} - +

    - <#else> + <#else>  ${uiLabelMap.OrderNoNotes}.
    <#if (finAccountType?has_content)> - ${finAccountType.description?default(finAccountType.finAccountTypeId)}  + ${finAccountType.description?default(finAccountType.finAccountTypeId)}  #${finAccount.finAccountCode?default(finAccount.finAccountId)} (${finAccount.finAccountId})
    @@ -159,7 +159,7 @@ under the License.
    <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))> - <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> + <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
    ${uiLabelMap.CommonCancel}
    @@ -244,7 +244,7 @@ under the License.
    <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))> - <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> + <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> ${uiLabelMap.CommonCancel} @@ -284,7 +284,7 @@ under the License. <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))> - <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> + <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> ${uiLabelMap.CommonCancel} @@ -342,7 +342,7 @@ under the License. <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))> - <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> + <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> ${uiLabelMap.CommonCancel} @@ -393,7 +393,7 @@ under the License.   - #${billingAccount.billingAccountId} - ${billingAccount.description?if_exists} + #${billingAccount.billingAccountId} - ${billingAccount.description?if_exists}  

    - + @@ -461,7 +461,7 @@ under the License. - + <#assign openAmount = orderReadHelper.getOrderOpenAmount()> @@ -475,12 +475,12 @@ under the License.
     
    ${uiLabelMap.AccountingAmount}    - +  
    - +
    diff --git a/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl b/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl index f1c171bf4e..905045fc99 100644 --- a/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl +++ b/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl @@ -86,7 +86,7 @@ under the License.
  • ${uiLabelMap.OrderCreateReturn}
  • - + <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED"> @@ -130,7 +130,7 @@ under the License.  
    - <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> + <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> <#else> ${(shipGroupAddress.address1)?default("")} - +
    - - <#-- the setting of shipping method is only supported for sales orders at this time --> + + <#-- the setting of shipping method is only supported for sales orders at this time --> <#if orderHeader.orderTypeId == "SALES_ORDER" && shipGroup.shipmentMethodTypeId?has_content> @@ -161,8 +161,8 @@ under the License. <#if shipGroup.carrierPartyId?has_content || shipmentMethodType?has_content>
    - <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> - <#-- passing the shipmentMethod value as the combination of two fields value + <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> + <#-- passing the shipmentMethod value as the combination of two fields value i.e shipmentMethodTypeId & carrierPartyId and this two field values are separated bye "@" symbol. --> @@ -174,8 +174,8 @@ under the License. - - <#else> + + <#else> <#if shipGroup.carrierPartyId != "_NA_"> ${shipGroup.carrierPartyId?if_exists} @@ -186,7 +186,7 @@ under the License. - <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> + <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED">     @@ -367,7 +367,7 @@ under the License. - + <#else> <#assign facilities = facilitiesForShipGroup.get(shipGroup.shipGroupSeqId)> diff --git a/applications/order/webapp/ordermgr/order/orderstats.ftl b/applications/order/webapp/ordermgr/order/orderstats.ftl index a21b7beae7..e71641c4ac 100644 --- a/applications/order/webapp/ordermgr/order/orderstats.ftl +++ b/applications/order/webapp/ordermgr/order/orderstats.ftl @@ -30,7 +30,7 @@ under the License. ${uiLabelMap.CommonToday} ${uiLabelMap.OrderWTD} ${uiLabelMap.OrderMTD} - ${uiLabelMap.OrderYTD} + ${uiLabelMap.OrderYTD}   @@ -83,7 +83,7 @@ under the License. ${weekItemCountPaid?string.number} ${monthItemCountPaid?string.number} ${yearItemCountPaid?string.number} - +   ${uiLabelMap.OrderPendingPaymentItemsSoldIncludesPromotions} @@ -91,7 +91,7 @@ under the License. ${weekItemCountPending?string.number} ${monthItemCountPending?string.number} ${yearItemCountPending?string.number} - +
    ${uiLabelMap.OrderOrdersPending} @@ -112,7 +112,7 @@ under the License. -- -- -- - +   ${uiLabelMap.OrderWaitingCompletion} @@ -120,7 +120,7 @@ under the License. -- -- -- - +
    ${uiLabelMap.OrderStatusChanges} @@ -141,7 +141,7 @@ under the License. ${weekApprove?size?default(0)?string.number} ${monthApprove?size?default(0)?string.number} ${yearApprove?size?default(0)?string.number} - +   ${uiLabelMap.OrderCompleted} @@ -149,7 +149,7 @@ under the License. ${weekComplete?size?default(0)?string.number} ${monthComplete?size?default(0)?string.number} ${yearComplete?size?default(0)?string.number} - +   ${uiLabelMap.OrderCancelled} @@ -157,7 +157,7 @@ under the License. ${weekCancelled?size?default(0)?string.number} ${monthCancelled?size?default(0)?string.number} ${yearCancelled?size?default(0)?string.number} - +   ${uiLabelMap.OrderRejected} @@ -165,7 +165,7 @@ under the License. ${weekRejected?size?default(0)?string.number} ${monthRejected?size?default(0)?string.number} ${yearRejected?size?default(0)?string.number} - +
    diff --git a/applications/order/webapp/ordermgr/order/orderterms.ftl b/applications/order/webapp/ordermgr/order/orderterms.ftl index 0ef7eee770..17f94fcb82 100644 --- a/applications/order/webapp/ordermgr/order/orderterms.ftl +++ b/applications/order/webapp/ordermgr/order/orderterms.ftl @@ -39,7 +39,7 @@ under the License. ${orderTerm.termValue?default("")} ${orderTerm.termDays?default("")} ${orderTerm.textValue?default("")} - +
    diff --git a/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl b/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl index 86b85697a5..fa8a8fc6b9 100644 --- a/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl +++ b/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl @@ -25,7 +25,7 @@ under the License.
    -
    +
    ${uiLabelMap.CommonGoBack} ${uiLabelMap.CommonSend}
    @@ -36,7 +36,7 @@ under the License. - +
    ${uiLabelMap.OrderSendConfirmationEmailSubject}  diff --git a/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl b/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl index d8cfea5e02..9bea5a7083 100644 --- a/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl +++ b/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl @@ -125,7 +125,7 @@ under the License. ${uiLabelMap.ProductOpenQuantity} - + diff --git a/applications/order/webapp/ordermgr/order/transitions.ftl b/applications/order/webapp/ordermgr/order/transitions.ftl index 6c2a16fc79..552bd81d66 100644 --- a/applications/order/webapp/ordermgr/order/transitions.ftl +++ b/applications/order/webapp/ordermgr/order/transitions.ftl @@ -32,31 +32,31 @@ under the License. <#if workEffortStatus == "WF_SUSPENDED">
    - + -
    ${uiLabelMap.OrderProcessingInHold} ${uiLabelMap.OrderProcessingInHoldNote} + ${uiLabelMap.OrderRelease}
    -
    + <#if workEffortStatus == "WF_RUNNING">
    - + -
    ${uiLabelMap.OrderProcessingInActive} + ${uiLabelMap.OrderHold}
    -
    - + +
    @@ -72,7 +72,7 @@ under the License.
    -
    +
    @@ -80,7 +80,7 @@ under the License. - + -
    @@ -93,14 +93,14 @@ under the License. - + + ${uiLabelMap.CommonContinue}
    - +
    diff --git a/applications/order/webapp/ordermgr/quote/QuoteForms.xml b/applications/order/webapp/ordermgr/quote/QuoteForms.xml index 7dac5f036a..7adac79009 100644 --- a/applications/order/webapp/ordermgr/quote/QuoteForms.xml +++ b/applications/order/webapp/ordermgr/quote/QuoteForms.xml @@ -17,12 +17,12 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -
    - + @@ -73,7 +73,7 @@ under the License. -
    @@ -330,7 +330,7 @@ under the License. - +
    @@ -420,7 +420,7 @@ under the License.
    -
    diff --git a/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl b/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl index c6babe2ac3..91d183cc5e 100644 --- a/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl +++ b/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl @@ -82,8 +82,8 @@ under the License. ${quoteItem.quantity?if_exists} ${quoteItem.selectedAmount?if_exists} <@ofbizCurrency amount=quoteItem.quoteUnitPrice isoCode=quote.currencyUomId/> - <@ofbizCurrency amount=totalQuoteItemAdjustmentAmount isoCode=quote.currencyUomId/> - <@ofbizCurrency amount=totalQuoteItemAmount isoCode=quote.currencyUomId/> + <@ofbizCurrency amount=totalQuoteItemAdjustmentAmount isoCode=quote.currencyUomId/> + <@ofbizCurrency amount=totalQuoteItemAmount isoCode=quote.currencyUomId/> <#-- now show adjustment details per line item --> <#list quoteItemAdjustments as quoteItemAdjustment> diff --git a/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl b/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl index 0877797290..4abff9d246 100644 --- a/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl +++ b/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl @@ -103,14 +103,14 @@ under the License. <#assign rowColor = "#D4D0C8"> <#else> <#assign rowColor = "white"> - - + + - - - - + + + + diff --git a/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl b/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl index c0d8cb18fb..1b0b357867 100644 --- a/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl +++ b/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl @@ -100,8 +100,8 @@ under the License. <#assign rowColor = "#D4D0C8"> <#else> <#assign rowColor = "white"> - - + + diff --git a/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl b/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl index 09eb43d8ed..25938b32a5 100644 --- a/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl +++ b/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl @@ -110,8 +110,8 @@ under the License. <#assign rowColor = "#D4D0C8"> <#else> <#assign rowColor = "white"> - - + + diff --git a/applications/order/webapp/ordermgr/reports/OrderReportPrepare.groovy b/applications/order/webapp/ordermgr/reports/OrderReportPrepare.groovy index 28de702353..cb29b5b951 100644 --- a/applications/order/webapp/ordermgr/reports/OrderReportPrepare.groovy +++ b/applications/order/webapp/ordermgr/reports/OrderReportPrepare.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl b/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl index d9948274e4..147c838708 100644 --- a/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl +++ b/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl @@ -40,7 +40,7 @@ under the License. ${uiLabelMap.OrderReportPurchasesByOrganization} <#if !showToParty>${uiLabelMap.CommonFor}: ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, toPartyId, false)} <#if !showFromParty>${uiLabelMap.CommonFrom}: ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, fromPartyId, false)} - ${uiLabelMap.FormFieldTitle_orderStatusId}: + ${uiLabelMap.FormFieldTitle_orderStatusId}: <#if parameters.orderStatusId?has_content>${parameters.orderStatusId}<#else>${uiLabelMap.CommonAny} <#if parameters.fromOrderDate?has_content>${uiLabelMap.CommonFromDate}: ${parameters.fromOrderDate} (${uiLabelMap.OrderDate} >= ${uiLabelMap.CommonFrom}) @@ -76,8 +76,8 @@ under the License. <#assign rowColor = "#D4D0C8"> <#else> <#assign rowColor = "white"> - - + + diff --git a/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl b/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl index 022b4178e2..3ab5029233 100644 --- a/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl +++ b/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl @@ -40,7 +40,7 @@ under the License. ${uiLabelMap.OrderReportSalesByStore} <#if !showProductStore>${uiLabelMap.CommonFor} ${uiLabelMap.ProductProductStore}: ${parameters.productStoreId} - ${productReportList.get(0).storeName?if_exists} <#if !showToParty>${uiLabelMap.PartyParty}: ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, toPartyId, false)} - ${uiLabelMap.FormFieldTitle_orderStatusId}: + ${uiLabelMap.FormFieldTitle_orderStatusId}: <#if parameters.orderStatusId?has_content>${parameters.orderStatusId}<#else>${uiLabelMap.CommonAny} <#if parameters.fromOrderDate?has_content>${uiLabelMap.CommonFromDate}: ${parameters.fromOrderDate} (${uiLabelMap.OrderDate} >= ${uiLabelMap.CommonFrom}) @@ -87,8 +87,8 @@ under the License. <#assign rowColor = "#D4D0C8"> <#else> <#assign rowColor = "white"> - - + + diff --git a/applications/order/webapp/ordermgr/reports/reportlist.ftl b/applications/order/webapp/ordermgr/reports/reportlist.ftl index 6ac22d42f8..52970b9901 100644 --- a/applications/order/webapp/ordermgr/reports/reportlist.ftl +++ b/applications/order/webapp/ordermgr/reports/reportlist.ftl @@ -17,14 +17,14 @@ specific language governing permissions and limitations under the License. --> -
    NOTE: These report are for demonstration purposes only. -They use the JasperReports reporting tool. They have not been polished yet, but -they are good examples of creating detailed reports that you have a lot of +
    NOTE: These report are for demonstration purposes only. +They use the JasperReports reporting tool. They have not been polished yet, but +they are good examples of creating detailed reports that you have a lot of control over. special thanks for Britton LaRoche for creating the first pass of these reports and helping to improve them.

    - + @@ -62,7 +62,7 @@ these reports and helping to improve them. - +
    From Date:
    diff --git a/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl b/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl index 72eb1288e6..d7eb69982e 100644 --- a/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl +++ b/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl @@ -29,7 +29,7 @@ under the License.

    Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been completed.

    The status and used hours can always be checked at the url:
    - ${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId} + ${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}

    Regards.

    Thank you for your business. diff --git a/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl b/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl index 8ae63cae40..3b037aa161 100644 --- a/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl +++ b/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl @@ -31,7 +31,7 @@ under the License. We will solve/implement the request as soon as possible

    The status and used hours can always be checked at the url:
    - ${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId} + ${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}

    Regards.

    diff --git a/applications/order/webapp/ordermgr/request/RequestForms.xml b/applications/order/webapp/ordermgr/request/RequestForms.xml index e3a6449e55..b1a545bbb3 100644 --- a/applications/order/webapp/ordermgr/request/RequestForms.xml +++ b/applications/order/webapp/ordermgr/request/RequestForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -80,8 +80,8 @@ under the License. - -
    @@ -149,7 +149,7 @@ under the License. -
    @@ -182,7 +182,7 @@ under the License. -
    @@ -195,8 +195,8 @@ under the License. - -
    @@ -211,8 +211,8 @@ under the License. - - + +
    @@ -406,7 +406,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> -
    @@ -421,7 +421,7 @@ under the License. - +
    @@ -431,8 +431,8 @@ under the License.
    - -
    @@ -447,7 +447,7 @@ under the License. - + @@ -456,9 +456,9 @@ under the License. - +
    - +
    @@ -495,7 +495,7 @@ under the License. - + @@ -510,11 +510,11 @@ under the License. - + - - + +
    @@ -526,7 +526,7 @@ under the License. - + @@ -540,11 +540,11 @@ under the License. - + - + -
    @@ -676,5 +676,5 @@ under the License.
    - +
    diff --git a/applications/order/webapp/ordermgr/requirement/RequirementForms.xml b/applications/order/webapp/ordermgr/requirement/RequirementForms.xml index 3f43efc3a8..bca2df7770 100644 --- a/applications/order/webapp/ordermgr/requirement/RequirementForms.xml +++ b/applications/order/webapp/ordermgr/requirement/RequirementForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
    diff --git a/applications/order/webapp/ordermgr/return/returnHeader.ftl b/applications/order/webapp/ordermgr/return/returnHeader.ftl index c502551e29..f9c7c0d260 100644 --- a/applications/order/webapp/ordermgr/return/returnHeader.ftl +++ b/applications/order/webapp/ordermgr/return/returnHeader.ftl @@ -34,14 +34,14 @@ under the License. - +

    From Date:
    <#if returnHeader?exists> - + @@ -67,7 +67,7 @@ under the License. - + @@ -79,7 +79,7 @@ under the License. Calendar - + @@ -90,7 +90,7 @@ under the License. Click here For Field Lookup - + @@ -106,8 +106,8 @@ under the License. <#list facilityList as facility> - - + + @@ -127,7 +127,7 @@ under the License. <#else> - + @@ -214,11 +214,11 @@ under the License. <#if (addressEditable)> <#list addresses as address > <@displayAddress postalAddress = address.postalAddress editable = true/> - + checked="checked">${uiLabelMap.CommonNoAddress} <#else> <#if (postalAddressFrom?has_content)> - <@displayAddress postalAddress = postalAddressFrom editable = false /> + <@displayAddress postalAddress = postalAddressFrom editable = false /> <#else> ${uiLabelMap.CommonNoAddress} @@ -235,34 +235,34 @@ under the License. <@displayAddress postalAddress = postalAddressTo editable=false /> - + - + - + <#else> - + - +
      ${uiLabelMap.OrderReturnId}  ${returnHeader.returnId}${returnHeader.returnId}
     
     
     
      ${uiLabelMap.AccountingBillingAccount}
     
         
         
    <#macro displayAddress postalAddress editable> <#if postalAddress?has_content>
    <#if (editable)> - checked="checked"> - + checked="checked"> + <#if postalAddress.toName?has_content>${uiLabelMap.CommonTo} ${postalAddress.toName}
    <#if postalAddress.attnName?has_content>${uiLabelMap.CommonAttn} ${postalAddress.attnName}
    <#if postalAddress.address1?has_content>    ${postalAddress.address1}
    diff --git a/applications/order/webapp/ordermgr/return/returnItemInc.ftl b/applications/order/webapp/ordermgr/return/returnItemInc.ftl index e5682ea182..6229b5954c 100644 --- a/applications/order/webapp/ordermgr/return/returnItemInc.ftl +++ b/applications/order/webapp/ordermgr/return/returnItemInc.ftl @@ -32,16 +32,16 @@ under the License. ${uiLabelMap.OrderOrderTotal} <@ofbizCurrency amount=orh.getOrderGrandTotal() isoCode=orh.getCurrency()/> - + ${uiLabelMap.OrderAmountAlreadyCredited} <@ofbizCurrency amount=orh.getOrderReturnedCreditTotalBd() isoCode=orh.getCurrency()/> - + ${uiLabelMap.OrderAmountAlreadyRefunded} <@ofbizCurrency amount=orh.getOrderReturnedRefundTotalBd() isoCode=orh.getCurrency()/> - - + + @@ -65,7 +65,7 @@ under the License. <#assign adjustmentType = orderItem.getRelatedOne("OrderAdjustmentType")/> <#assign description = orderItem.description?default(adjustmentType.get("description",locale))/> - + class="alternate-row"> @@ -164,7 +164,7 @@ under the License. <#if orderHeaderAdjustments?has_content> ${uiLabelMap.CommonDescription} - ${uiLabelMap.CommonAmount} + ${uiLabelMap.CommonAmount} ${uiLabelMap.OrderReturnType} ${uiLabelMap.OrderOrderInclude}? @@ -173,7 +173,7 @@ under the License. <#assign adjustmentType = adj.getRelatedOne("OrderAdjustmentType")/> <#assign description = adj.description?default(adjustmentType.get("description",locale))/> - + @@ -182,7 +182,7 @@ under the License.
    ${description?default("N/A")}
    - + value="${adj.amount?string("##0.00")}"/> @@ -236,7 +236,7 @@ under the License. - ${uiLabelMap.OrderReturnSelectedItems} + ${uiLabelMap.OrderReturnSelectedItems} <#else> diff --git a/applications/order/webapp/ordermgr/return/returnItems.ftl b/applications/order/webapp/ordermgr/return/returnItems.ftl index d88873b229..989c9e2ee2 100644 --- a/applications/order/webapp/ordermgr/return/returnItems.ftl +++ b/applications/order/webapp/ordermgr/return/returnItems.ftl @@ -62,7 +62,7 @@ under the License. <#assign rowCount = rowCount + 1> <#assign returnTotal = returnTotal + returnAdjustment.amount?default(0)> - + <#if returnHeader?has_content> @@ -75,11 +75,11 @@ under the License. <#if returnShipmentIds?has_content> <#list returnShipmentIds as returnShipmentId> ${uiLabelMap.ProductShipmentId} ${returnShipmentId.shipmentId} - - <#else> + + <#else> ${uiLabelMap.OrderCreateReturnShipment} - - + +
    @@ -99,7 +99,7 @@ under the License. <#assign readOnly = (returnHeader.statusId != "SUP_RETURN_REQUESTED")>

    ${uiLabelMap.OrderOrderReturn} #${returnId}

    - + <#-- information about orders and amount refunded/credited on past returns --> <#if orh?exists> @@ -107,16 +107,16 @@ under the License. ${uiLabelMap.OrderOrderTotal} <@ofbizCurrency amount=orh.getOrderGrandTotal() isoCode=orh.getCurrency()/> - + ${uiLabelMap.OrderAmountAlreadyCredited} <@ofbizCurrency amount=orh.getReturnedCreditTotalWithBillingAccountBd() isoCode=orh.getCurrency()/> - + ${uiLabelMap.OrderAmountAlreadyRefunded} <@ofbizCurrency amount=orh.getReturnedRefundTotalWithBillingAccountBd() isoCode=orh.getCurrency()/> - - + +
    @@ -131,14 +131,14 @@ under the License. ${uiLabelMap.OrderItemStatus} ${uiLabelMap.CommonType} <#if (readOnly)> - ${uiLabelMap.OrderReturnResponse} - + ${uiLabelMap.OrderReturnResponse} +   <#assign returnTotal = 0.0> <#assign rowCount = 0> - + <#if returnItems?has_content> <#assign alt_row = false> <#list returnItems as item> @@ -169,14 +169,14 @@ under the License.
    <#if readOnly> - ${item.description?default("N/A")} + ${item.description?default("N/A")} <#else>
    <#if readOnly> - ${item.returnQuantity?string.number} + ${item.returnQuantity?string.number} <#else> @@ -263,7 +263,7 @@ under the License. <#else>
    ${uiLabelMap.CommonNA}
    - + <#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED"> ${uiLabelMap.CommonRemove} @@ -294,7 +294,7 @@ under the License. <@displayReturnAdjustment returnAdjustment=returnAdjustment adjEditable=adjEditable/> - <#-- show the return total --> + <#-- show the return total -->
      @@ -302,15 +302,15 @@ under the License. <@ofbizCurrency amount=returnTotal isoCode=returnHeader.currencyUomId/> <#if (!readOnly) && (rowCount > 0)> - + -
    +
    - + <#if (returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED") && (rowCount > 0)>
    @@ -327,7 +327,7 @@ under the License.
    - + <#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED">
    @@ -335,17 +335,17 @@ under the License. <#if partyOrders?has_content> - + - - + <#else> @@ -354,12 +354,12 @@ under the License. - - + - + - + <#list returnList as returnHeader> <#assign statusItem = returnHeader.getRelatedOne("StatusItem")> <#if returnHeader.destinationFacilityId?exists> @@ -45,7 +45,7 @@ under the License. - +

    ${uiLabelMap.OrderReturnItems}

    ${uiLabelMap.OrderOrderId}   +
    ${uiLabelMap.OrderReturnLoadItems}
    ${uiLabelMap.OrderReturnLoadItems}
    ${uiLabelMap.OrderOrderId}
      +
    ${uiLabelMap.OrderReturnLoadItems}
    ${uiLabelMap.OrderReturnLoadItems}
      diff --git a/applications/order/webapp/ordermgr/return/returnList.ftl b/applications/order/webapp/ordermgr/return/returnList.ftl index 27eeef708f..cc6ccb4d60 100644 --- a/applications/order/webapp/ordermgr/return/returnList.ftl +++ b/applications/order/webapp/ordermgr/return/returnList.ftl @@ -28,7 +28,7 @@ under the License. ${uiLabelMap.PartyParty} ${uiLabelMap.FacilityFacility} ${uiLabelMap.CommonStatus}
    <#if facility?exists>${facility.facilityName?default(facility.facilityId)}<#else>${uiLabelMap.CommonNone}${statusItem.get("description",locale)}${statusItem.get("description",locale)}
    \ No newline at end of file diff --git a/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl b/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl index d66f7c9fdb..70b3c31015 100644 --- a/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl +++ b/applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl @@ -30,7 +30,7 @@ under the License. <@ofbizCurrency amount=returnAdjustment.amount isoCode=returnHeader.currencyUomId/> - <#if returnAdjustment.amount?has_content> + <#if returnAdjustment.amount?has_content> <#assign total = total + returnAdjustment.get("amount")> @@ -73,7 +73,7 @@ under the License. <@ofbizCurrency amount=(returnItem.returnPrice * returnItem.returnQuantity) isoCode=returnHeader.currencyUomId/> <#assign total = total + returnItem.returnQuantity.doubleValue() * returnItem.returnPrice.doubleValue()/> - + <#assign returnItemAdjustments = returnItem.getRelated("ReturnAdjustment")> <#if (returnItemAdjustments?has_content)> <#list returnItemAdjustments as returnItemAdjustment> @@ -81,9 +81,9 @@ under the License. - + <#-- order level adjustments --> - <#if (returnAdjustments?has_content)> + <#if (returnAdjustments?has_content)> <#list returnAdjustments as returnAdjustment> <@displayReturnAdjustment returnAdjustment=returnAdjustment/> diff --git a/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl b/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl index 2728c81bd4..b52b900dfe 100644 --- a/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl +++ b/applications/order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl @@ -20,7 +20,7 @@ under the License. <#assign fromPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", returnHeader.fromPartyId, "compareDate", returnHeader.entryDate, "userLogin", userLogin))/> <#assign toPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", returnHeader.toPartyId, "compareDate", returnHeader.entryDate, "userLogin", userLogin))/> - + @@ -63,7 +63,7 @@ ${postalAddressTo.city}<#if (postalAddressTo.stateProvinceGeoId)?has_content>, $ - + diff --git a/applications/order/webapp/ordermgr/return/returnReportHeaderInfo.fo.ftl b/applications/order/webapp/ordermgr/return/returnReportHeaderInfo.fo.ftl index 10080ae916..25d46d818e 100644 --- a/applications/order/webapp/ordermgr/return/returnReportHeaderInfo.fo.ftl +++ b/applications/order/webapp/ordermgr/return/returnReportHeaderInfo.fo.ftl @@ -41,7 +41,7 @@ under the License. ${uiLabelMap.CommonStatus} - + ${returnHeader.entryDate?string("yyyy-MM-dd")} diff --git a/applications/order/webapp/ordermgr/setup/paymentsetup.ftl b/applications/order/webapp/ordermgr/setup/paymentsetup.ftl index f9fc41d360..0e64ce05cf 100644 --- a/applications/order/webapp/ordermgr/setup/paymentsetup.ftl +++ b/applications/order/webapp/ordermgr/setup/paymentsetup.ftl @@ -33,7 +33,7 @@ under the License.
     Payment Processor Setup
    - + @@ -42,7 +42,7 @@ under the License. - -
    + @@ -51,9 +51,9 @@ under the License. - + - + <#if paymentSetups?has_content> <#list paymentSetups as paymentSetting> <#if rowStyle?exists && rowStyle == "alternate-row"> @@ -68,7 +68,7 @@ under the License. - +
    WebSite
    Re-Auth Service
    Capture Service
    Refund Service
    Payment Config
    Payment Config
     
    ${paymentSetting.paymentReAuthService?if_exists}
    ${paymentSetting.paymentCaptureService?if_exists}
    ${paymentSetting.paymentRefundService?if_exists}
    ${paymentSetting.paymentConfiguration?if_exists}
    ${paymentSetting.paymentConfiguration?if_exists}
      <#if security.hasEntityPermission("PAYPROC", "_UPDATE", session)> @@ -92,7 +92,7 @@ under the License.
    + <#if security.hasEntityPermission("PAYPROC", "_CREATE", session)>
    @@ -109,7 +109,7 @@ under the License. <#if webSitePayment?has_content> - Add New + Add New <#else> @@ -121,8 +121,8 @@ under the License. - @@ -164,32 +164,32 @@ under the License. - + - + - + - + - + - + @@ -201,9 +201,9 @@ under the License.
    - <#if webSitePayment?has_content> + + <#if webSitePayment?has_content> <#else> @@ -137,13 +137,13 @@ under the License.
    ${webSitePayment.siteName} (This cannot be changed without re-creating the setting.)
    - <#else> + <#else> - +
    Processor Auth Service
     
    Processor Re-Auth Service
     
    Processor Capture Service
     
    Processor Refund Service
     
    Processor Properties URL
     
     
    - + - + <#else>

    You do not have permission to view this page. ("PAYSETUP_VIEW" or "PAYSETUP_ADMIN" needed)

    diff --git a/applications/order/webapp/ordermgr/task/ordertasklist.ftl b/applications/order/webapp/ordermgr/task/ordertasklist.ftl index bbb5656ec9..84505ecd2a 100644 --- a/applications/order/webapp/ordermgr/task/ordertasklist.ftl +++ b/applications/order/webapp/ordermgr/task/ordertasklist.ftl @@ -25,7 +25,7 @@ under the License. form.action = "<@ofbizUrl>acceptassignment"; } else { form.action = "<@ofbizUrl>orderview"; - } + } } else { if (form.delegate.checked) { form.action = "<@ofbizUrl>delegateassignment"; @@ -45,9 +45,9 @@ under the License.
    ${uiLabelMap.OrderOrderNeedingAttention}
    - - -
    + + + -
    <#if poList?has_content> <#assign tasksFound = true> @@ -71,7 +71,7 @@ under the License. <#assign statusItem = orderHeaderAndRole.getRelatedOneCache("StatusItem")> <#assign placingParty = orh.getPlacingParty()?if_exists> class="alternate-row"> - + + <#-- toggle the row color --> <#assign alt_row = !alt_row> @@ -112,7 +112,7 @@ under the License.
    ${orderHeaderAndRole.orderId}${orderHeaderAndRole.orderId}
    <#assign partyId = "_NA_"> @@ -102,7 +102,7 @@ under the License.
       Schedule Delivery -
    - + <#if partyTasks?has_content> <#assign tasksFound = true> @@ -133,8 +133,8 @@ under the License. <#assign alt_row = false> <#list partyTasks as task> class="alternate-row"> - + + @@ -177,8 +177,8 @@ under the License.
    - <#assign orderStr = "orderId=" + task.orderId + "&partyId=" + userLogin.partyId + "&roleTypeId=" + task.roleTypeId + "&workEffortId=" + task.workEffortId + "&fromDate=" + task.get("fromDate").toString()> + + <#assign orderStr = "orderId=" + task.orderId + "&partyId=" + userLogin.partyId + "&roleTypeId=" + task.roleTypeId + "&workEffortId=" + task.workEffortId + "&fromDate=" + task.get("fromDate").toString()> ${task.orderId} @@ -152,7 +152,7 @@ under the License.
    ${task.get("orderDate").toString()}
    -
    <@ofbizCurrency amount=task.grandTotal isoCode=orderCurrencyMap.get(task.orderId)/>    @@ -160,12 +160,12 @@ under the License. <#assign actualStartDate = task.get("actualStartDate").toString()> <#else> <#assign actualStartDate = "N/A"> - +
    ${actualStartDate}
    -
    ${task.priority?default("0")} - + ${Static["org.ofbiz.order.task.TaskWorker"].getPrettyStatus(task)}
    - - + + <#if roleTasks?has_content> <#assign tasksFound = true> @@ -189,7 +189,7 @@ under the License. - + @@ -198,31 +198,31 @@ under the License. - + <#assign alt_row = false> <#list roleTasks as task> - + <#if task.statusId?exists && task.statusId == "CAL_SENT"> - <#else> + <#else> - + class="alternate-row"> - + + +
    ${uiLabelMap.OrderOrderNumber} ${uiLabelMap.CommonName}${uiLabelMap.OrderOrderDate}${uiLabelMap.OrderOrderDate} ${uiLabelMap.CommonTotal}    ${uiLabelMap.CommonStartDateTime}${uiLabelMap.CommonPriority} ${uiLabelMap.CommonStatus}  
    + ${task.orderId} @@ -238,7 +238,7 @@ under the License.
    ${task.get("orderDate").toString()}
    -
    <@ofbizCurrency amount=task.grandTotal isoCode=orderCurrencyMap.get(task.orderId)/>    @@ -246,16 +246,16 @@ under the License. <#assign actualStartDate = task.get("actualStartDate").toString()> <#else> <#assign actualStartDate = "N/A"> - +
    ${actualStartDate}
    -
    <#if task.wepaPartyId == "_NA_">
    N/A
    - <#else> + <#else> ${task.wepaPartyId} -
    ${Static["org.ofbiz.order.task.TaskWorker"].getRoleDescription(task)} ${task.priority?default("0")} @@ -276,16 +276,16 @@ under the License.
    +
    <#if !tasksFound>
    ${uiLabelMap.CommonNoTaskAssigned}
    - +
    <#else> -

    You do not have permission to view this page. ("ORDERMGR_VIEW" or "ORDERMGR_ADMIN" needed)

    +

    You do not have permission to view this page. ("ORDERMGR_VIEW" or "ORDERMGR_ADMIN" needed)

    \ No newline at end of file diff --git a/applications/order/widget/ordermgr/CommonScreens.xml b/applications/order/widget/ordermgr/CommonScreens.xml index 53f6ffa2f9..03f6e7ddbb 100644 --- a/applications/order/widget/ordermgr/CommonScreens.xml +++ b/applications/order/widget/ordermgr/CommonScreens.xml @@ -18,12 +18,12 @@ specific language governing permissions and limitations under the License. --> -
    - + @@ -115,14 +115,14 @@ under the License. - + - + -
    + @@ -151,14 +151,14 @@ under the License. - + - + - + diff --git a/applications/order/widget/ordermgr/LookupScreens.xml b/applications/order/widget/ordermgr/LookupScreens.xml index b113fb549f..e2f66a44c7 100644 --- a/applications/order/widget/ordermgr/LookupScreens.xml +++ b/applications/order/widget/ordermgr/LookupScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
    diff --git a/applications/order/widget/ordermgr/Menus.xml b/applications/order/widget/ordermgr/Menus.xml index f547992b7b..4218c8bc8c 100644 --- a/applications/order/widget/ordermgr/Menus.xml +++ b/applications/order/widget/ordermgr/Menus.xml @@ -126,7 +126,7 @@ under the License. - + @@ -235,7 +235,7 @@ under the License. - + @@ -253,14 +253,14 @@ under the License. - + - + @@ -287,5 +287,5 @@ under the License. - + \ No newline at end of file diff --git a/applications/order/widget/ordermgr/OrderEntryCartScreens.xml b/applications/order/widget/ordermgr/OrderEntryCartScreens.xml index fc6f08bbdd..6576e1a78a 100644 --- a/applications/order/widget/ordermgr/OrderEntryCartScreens.xml +++ b/applications/order/widget/ordermgr/OrderEntryCartScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -58,7 +58,7 @@ under the License.
    - +
    diff --git a/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml b/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml index 16b797a6fa..b1a63ff0a4 100644 --- a/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml +++ b/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -64,7 +64,7 @@ under the License.
    - +
    @@ -192,13 +192,13 @@ under the License.
    - - + <#if partyList?exists> <#if hideFields != "Y"> diff --git a/applications/party/webapp/partymgr/party/linkparty.ftl b/applications/party/webapp/partymgr/party/linkparty.ftl index 4a8a59f612..a8c59abfed 100644 --- a/applications/party/webapp/partymgr/party/linkparty.ftl +++ b/applications/party/webapp/partymgr/party/linkparty.ftl @@ -27,7 +27,7 @@ under the License.

    ${uiLabelMap.PartyLink}

    -
    +
    <#if partyTo?has_content && partyFrom?has_content>
    @@ -77,7 +77,7 @@ under the License. ${uiLabelMap.CommonLink}
    - +
    diff --git a/applications/party/webapp/partymgr/party/partygeolocation.ftl b/applications/party/webapp/partymgr/party/partygeolocation.ftl index ad6ef8993e..5409b8bc3f 100644 --- a/applications/party/webapp/partymgr/party/partygeolocation.ftl +++ b/applications/party/webapp/partymgr/party/partygeolocation.ftl @@ -19,11 +19,11 @@ under the License. <#if latestGeoPoint?has_content> <#if latestGeoPoint.latitude?has_content && latestGeoPoint.longitude?has_content> ${uiLabelMap.CommonLatitude}${latestGeoPoint.latitude}
    - ${uiLabelMap.CommonLongitude}${latestGeoPoint.longitude} + ${uiLabelMap.CommonLongitude}${latestGeoPoint.longitude} <#if latestGeoPoint.elevation?has_content>
    ${uiLabelMap.CommonElevation}${latestGeoPoint.elevation} ${elevationUomAbbr} - - <#if latestGeoPoint.dataSourceId?has_content> + + <#if latestGeoPoint.dataSourceId?has_content> <#if latestGeoPoint.dataSourceId == "GEOPT_GOOGLE">
    ${uiLabelMap.CommonLoading}
    @@ -34,17 +34,17 @@ under the License. type="text/javascript"> - <#elseif latestGeoPoint.dataSourceId == "GEOPT_YAHOO"> - <#elseif latestGeoPoint.dataSourceId == "GEOPT_MICROSOFT"> - <#elseif latestGeoPoint.dataSourceId == "GEOPT_MAPTP"> - - + + <#elseif latestGeoPoint.dataSourceId == "GEOPT_YAHOO"> + <#elseif latestGeoPoint.dataSourceId == "GEOPT_MICROSOFT"> + <#elseif latestGeoPoint.dataSourceId == "GEOPT_MAPTP"> + + <#else> -

    ${uiLabelMap.CommonNoGeolocationAvailable}

    +

    ${uiLabelMap.CommonNoGeolocationAvailable}

    diff --git a/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl b/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl index 59c5b1969f..e873696b02 100644 --- a/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl +++ b/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl @@ -152,4 +152,3 @@ under the License.
    - \ No newline at end of file diff --git a/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl b/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl index 9134c5edf6..8cdbf345b5 100644 --- a/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl +++ b/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl @@ -18,7 +18,7 @@ under the License. --> -
    +
    <#if partyContent?has_content> <#list partyContent as pContent> @@ -38,7 +38,7 @@ under the License. diff --git a/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl b/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl index 6e5538def7..fd7732e159 100644 --- a/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl +++ b/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl @@ -149,4 +149,3 @@ under the License. - \ No newline at end of file diff --git a/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl b/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl index 975ef4796b..8f44c77e72 100644 --- a/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl +++ b/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl @@ -52,9 +52,9 @@ under the License. diff --git a/applications/party/webapp/partymgr/security/ViewCertificate.ftl b/applications/party/webapp/partymgr/security/ViewCertificate.ftl index 4e01195b34..d09c89a61a 100644 --- a/applications/party/webapp/partymgr/security/ViewCertificate.ftl +++ b/applications/party/webapp/partymgr/security/ViewCertificate.ftl @@ -55,7 +55,7 @@ under the License. <#list components as component> - <#assign keystores = component.getKeystoreInfos()?if_exists/> + <#assign keystores = component.getKeystoreInfos()?if_exists/> <#list keystores as store> <#if (store.isTrustStore())> @@ -63,7 +63,7 @@ under the License. - +
    <#if (content.contentName?has_content)> ${uiLabelMap.CommonView} - + ${uiLabelMap.CommonRemove}
    ${inventoryItem.serialNumber?if_exists} ${inventoryItem.softIdentifier?if_exists} - <#if (inventoryItem.softIdentifier?has_content && inventoryItem.softIdentifier?matches("\\d+"))> + <#if (inventoryItem.softIdentifier?has_content && inventoryItem.softIdentifier?matches("\\d+"))> <#assign sid = Static["java.lang.Long"].decode(inventoryItem.softIdentifier)/> - (0x${Static["java.lang.Long"].toHexString(sid)}) + (0x${Static["java.lang.Long"].toHexString(sid)}) ${inventoryItem.activationNumber?if_exists} 
    ${component.getComponentName()} ${store.getName()} diff --git a/applications/party/webapp/partymgr/static/partymgr.css b/applications/party/webapp/partymgr/static/partymgr.css index a1dcb717d4..ccb52ac81c 100644 --- a/applications/party/webapp/partymgr/static/partymgr.css +++ b/applications/party/webapp/partymgr/static/partymgr.css @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/party/webapp/partymgr/visit/showvisits.ftl b/applications/party/webapp/partymgr/visit/showvisits.ftl index eff9db2a60..7c70141d18 100644 --- a/applications/party/webapp/partymgr/visit/showvisits.ftl +++ b/applications/party/webapp/partymgr/visit/showvisits.ftl @@ -29,10 +29,10 @@ under the License.
  • ${uiLabelMap.PartyShowActive}
  • <#elseif !partyId?exists>
  • ${uiLabelMap.PartyShowAll}
  • - +
    - +

    @@ -43,16 +43,16 @@ under the License. ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${visitSize} <#if highIndex < visitSize> - | ${uiLabelMap.CommonNext} + | ${uiLabelMap.CommonNext}

    -
    +
    - + @@ -65,7 +65,7 @@ under the License. <#assign alt_row = false> <#list visitList as visitObj> class="alternate-row"> - + @@ -87,7 +87,7 @@ under the License. ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${visitSize} <#if highIndex < visitSize> - | ${uiLabelMap.CommonNext} + | ${uiLabelMap.CommonNext} diff --git a/applications/party/webapp/partymgr/visit/visitdetail.ftl b/applications/party/webapp/partymgr/visit/visitdetail.ftl index 9cbcf24283..8ae84ad66f 100644 --- a/applications/party/webapp/partymgr/visit/visitdetail.ftl +++ b/applications/party/webapp/partymgr/visit/visitdetail.ftl @@ -21,10 +21,10 @@ under the License.
      -
    • ${uiLabelMap.PartyVisitDetail}
    • +
    • ${uiLabelMap.PartyVisitDetail}

    -
    +
    ${uiLabelMap.PartyVisitId}${uiLabelMap.PartyVisitId} ${uiLabelMap.PartyVisitorId} ${uiLabelMap.PartyPartyId} ${uiLabelMap.PartyUserLoginId}${visitObj.visitId}${visitObj.visitId} ${visitObj.visitorId?if_exists} ${visitObj.partyId?if_exists} ${visitObj.userLoginId?if_exists}
    @@ -89,10 +89,10 @@ under the License.
      -
    • ${uiLabelMap.PartyHitTracker}
    • +
    • ${uiLabelMap.PartyHitTracker}

    -
    +
    <#if serverHits?has_content>
    @@ -123,7 +123,7 @@ under the License. <#assign alt_row = false> <#if serverHits?has_content> <#list serverHits[lowIndex..highIndex-1] as hit> - <#assign serverHitType = hit.getRelatedOne("ServerHitType")?if_exists> + <#assign serverHitType = hit.getRelatedOne("ServerHitType")?if_exists> class="alternate-row">
    @@ -171,11 +171,11 @@ under the License.
      -
    • ${uiLabelMap.PartyPagePushFollowing}
    • +
    • ${uiLabelMap.PartyPagePushFollowing}

    -
    -
    +
    +
    <#if security.hasPermission("SEND_CONTROL_APPLET", session)>
    ${hit.contentId?if_exists} ${serverHitType.get("description",locale)?if_exists}
    diff --git a/applications/party/widget/partymgr/CommonScreens.xml b/applications/party/widget/partymgr/CommonScreens.xml index d93c38b066..183caab5b2 100644 --- a/applications/party/widget/partymgr/CommonScreens.xml +++ b/applications/party/widget/partymgr/CommonScreens.xml @@ -18,12 +18,12 @@ specific language governing permissions and limitations under the License. --> -
    - + @@ -48,7 +48,7 @@ under the License. - + @@ -59,7 +59,7 @@ under the License.
    - + @@ -110,7 +110,7 @@ under the License.
    - +
    @@ -155,7 +155,7 @@ under the License. - + diff --git a/applications/party/widget/partymgr/EmailPartyScreens.xml b/applications/party/widget/partymgr/EmailPartyScreens.xml index 4104a834f5..7a68ab37c0 100644 --- a/applications/party/widget/partymgr/EmailPartyScreens.xml +++ b/applications/party/widget/partymgr/EmailPartyScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
    @@ -39,7 +39,7 @@ under the License.
    -
    +
    diff --git a/applications/party/widget/partymgr/LookupScreens.xml b/applications/party/widget/partymgr/LookupScreens.xml index b52b06f85d..b4e2b48ede 100644 --- a/applications/party/widget/partymgr/LookupScreens.xml +++ b/applications/party/widget/partymgr/LookupScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
    @@ -141,7 +141,7 @@ under the License.
    - +
    @@ -263,7 +263,7 @@ under the License.
    - +
    @@ -272,7 +272,7 @@ under the License. - + diff --git a/applications/party/widget/partymgr/PartyInvitationScreens.xml b/applications/party/widget/partymgr/PartyInvitationScreens.xml index 079ff83bed..42a120cbc4 100644 --- a/applications/party/widget/partymgr/PartyInvitationScreens.xml +++ b/applications/party/widget/partymgr/PartyInvitationScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
    @@ -94,7 +94,7 @@ under the License.
    - +
    @@ -134,7 +134,7 @@ under the License.
    - +
    @@ -166,7 +166,7 @@ under the License.
    - +
    @@ -186,7 +186,7 @@ under the License.
    - +
    diff --git a/applications/party/widget/partymgr/PartyScreens.xml b/applications/party/widget/partymgr/PartyScreens.xml index ceaed04807..0b30716a52 100644 --- a/applications/party/widget/partymgr/PartyScreens.xml +++ b/applications/party/widget/partymgr/PartyScreens.xml @@ -64,10 +64,10 @@ under the License. - - + + - + - +
    @@ -91,7 +91,7 @@ under the License.
    ${uiLabelMap.ProductProduct}

    - + <#assign listIndex = lowIndex> @@ -109,11 +109,11 @@ under the License. <#assign rowClass = "1"> <#else> <#assign rowClass = "2"> - +
    - + @@ -138,5 +138,5 @@ under the License.

    -
    - \ No newline at end of file + + \ No newline at end of file diff --git a/applications/product/webapp/catalog/find/keywordsearchactions.ftl b/applications/product/webapp/catalog/find/keywordsearchactions.ftl index 1efb3b6de6..021be8194a 100644 --- a/applications/product/webapp/catalog/find/keywordsearchactions.ftl +++ b/applications/product/webapp/catalog/find/keywordsearchactions.ftl @@ -21,11 +21,11 @@ under the License.
    ${uiLabelMap.ProductNote}: ${uiLabelMap.ProductNoteKeywordSearch}
    - + ${screens.render("component://product/widget/catalog/ProductScreens.xml#CreateVirtualWithVariantsFormInclude")} - +
    - +
    ${uiLabelMap.ProductRemoveResultsFrom} ${uiLabelMap.ProductCategory}: @@ -36,9 +36,9 @@ under the License.
    - +
    - +
    ${uiLabelMap.ProductExpireResultsFrom} ${uiLabelMap.ProductCategory}: @@ -50,9 +50,9 @@ under the License.
    - +
    - +
    ${uiLabelMap.ProductAddResultsTo} ${uiLabelMap.ProductCategory}: @@ -64,14 +64,14 @@ under the License.
    - +
    - +
    ${uiLabelMap.ProductAddFeatureToResults}:
    ${uiLabelMap.ProductFeatureId} - ${uiLabelMap.CommonFrom}Calendar + ${uiLabelMap.CommonFrom}Calendar ${uiLabelMap.CommonThru}Calendar
    ${uiLabelMap.CommonAmount} @@ -92,9 +92,9 @@ under the License.
    - +
    - +
    ${uiLabelMap.ProductRemoveFeatureFromResults}:
    @@ -104,9 +104,9 @@ under the License.
    - +
    - +
    <#assign searchParams = Static["org.ofbiz.product.product.ProductSearchSession"].makeSearchParametersString(session)> @@ -116,9 +116,9 @@ under the License.
    - +
    - +
    ${uiLabelMap.ProductSearchExportProductList}:${uiLabelMap.ProductSearchExport}
    diff --git a/applications/product/webapp/catalog/find/sidedeepcategory.ftl b/applications/product/webapp/catalog/find/sidedeepcategory.ftl index e1a16d7b97..d4a61b3339 100644 --- a/applications/product/webapp/catalog/find/sidedeepcategory.ftl +++ b/applications/product/webapp/catalog/find/sidedeepcategory.ftl @@ -20,7 +20,7 @@ under the License. <#-- looping macro --> <#macro categoryList parentCategory category> <#if parentCategory.productCategoryId != category.productCategoryId> - <#local pStr = "&pcategory=" + parentCategory.productCategoryId> + <#local pStr = "&pcategory=" + parentCategory.productCategoryId> <#if curCategoryId?exists && curCategoryId == category.productCategoryId>
    @@ -35,15 +35,15 @@ under the License. <#else>
    <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> - ${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} [${category.productCategoryId}] + ${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} [${category.productCategoryId}] <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> - ${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} [${category.productCategoryId}] + ${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} [${category.productCategoryId}] <#else> ${category.categoryName?default(category.description)?if_exists} [${category.productCategoryId}] - +
    - + <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?exists && curCategoryId == category.productCategoryId)> <#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)> <#if subCatList?exists> diff --git a/applications/product/webapp/catalog/lookup/FieldLookupForms.xml b/applications/product/webapp/catalog/lookup/FieldLookupForms.xml index 5cca1f8e9b..8e493b348a 100644 --- a/applications/product/webapp/catalog/lookup/FieldLookupForms.xml +++ b/applications/product/webapp/catalog/lookup/FieldLookupForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
    @@ -96,7 +96,7 @@ under the License.
    - +
    @@ -159,7 +159,7 @@ under the License. - +
    @@ -208,11 +208,11 @@ under the License. + - + - + @@ -250,7 +250,7 @@ under the License. - +
    @@ -269,7 +269,7 @@ under the License. - +
    - + - - + +
    - + - + diff --git a/applications/product/webapp/catalog/main.ftl b/applications/product/webapp/catalog/main.ftl index bc85ad65f1..ee22d8f5d5 100644 --- a/applications/product/webapp/catalog/main.ftl +++ b/applications/product/webapp/catalog/main.ftl @@ -33,7 +33,7 @@ under the License.
    -
    +
    ${uiLabelMap.ProductEditCategoryWithCategoryId}:
    diff --git a/applications/product/webapp/catalog/price/EditProductPriceRules.ftl b/applications/product/webapp/catalog/price/EditProductPriceRules.ftl index 9976ac2b6f..f3c57d925c 100644 --- a/applications/product/webapp/catalog/price/EditProductPriceRules.ftl +++ b/applications/product/webapp/catalog/price/EditProductPriceRules.ftl @@ -20,7 +20,7 @@ under the License.

    ${uiLabelMap.ProductGlobalPriceRule}

    -
    +
    ${uiLabelMap.ProductFindRule} @@ -117,7 +117,7 @@ under the License. <#assign rowClass = "1"> <#else> <#assign rowClass = "2"> - + - diff --git a/applications/product/webapp/catalog/product/EditProductAssoc.ftl b/applications/product/webapp/catalog/product/EditProductAssoc.ftl index 8179093411..87c1de475b 100644 --- a/applications/product/webapp/catalog/product/EditProductAssoc.ftl +++ b/applications/product/webapp/catalog/product/EditProductAssoc.ftl @@ -20,11 +20,11 @@ under the License.

    ${uiLabelMap.PageTitleEditProductAssociations}

    -
    +
    @@ -185,7 +185,7 @@ under the License. <#assign rowClass = "1"> <#else> <#assign rowClass = "2"> - +
    diff --git a/applications/product/webapp/catalog/price/PriceForms.xml b/applications/product/webapp/catalog/price/PriceForms.xml index 4e348308e8..a4fcbfccc4 100644 --- a/applications/product/webapp/catalog/price/PriceForms.xml +++ b/applications/product/webapp/catalog/price/PriceForms.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -18,15 +18,15 @@ under the License. --> - - - + diff --git a/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl b/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl index a539382500..12cd4c5297 100644 --- a/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl +++ b/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl @@ -88,7 +88,7 @@ under the License. Calendar +
    - + <#if !(productAssoc?exists)> <#if productId?exists && productIdTo?exists && productAssocTypeId?exists && fromDate?exists>
    <#assign uiLabelWithVar=uiLabelMap.ProductAssociationNotFound?interpret><@uiLabelWithVar/>
    @@ -139,7 +139,7 @@ under the License. @@ -159,13 +159,13 @@ under the License. - + - + @@ -179,7 +179,7 @@ under the License.

    ${uiLabelMap.ProductAssociationsFromProduct}

    -
    +
     
    - value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("THRU_DATE"))?if_exists}" size="30" maxlength="30"> + value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("THRU_DATE"))?if_exists}" size="30" maxlength="30"> '${request.getParameter("THRU_DATE")}'<#else>'${nowTimestampString}');">Calendar
      value="${(productAssoc.instruction)?if_exists}"<#else>value="${(request.getParameter("INSTRUCTION"))?if_exists}" size="60" maxlength="255">
    ${uiLabelMap.ProductQuantity}   value="${(productAssoc.quantity)?if_exists}"<#else>value="${(request.getParameter("QUANTITY"))?if_exists}" size="10" maxlength="15">
      value="${uiLabelMap.CommonCreate}"<#else>value="${uiLabelMap.CommonUpdate}">
    @@ -229,7 +229,7 @@ under the License.

    ${uiLabelMap.ProductAssociationsToProduct}

    -
    +
    ${uiLabelMap.ProductProductId}
    diff --git a/applications/product/webapp/catalog/product/EditProductContent.ftl b/applications/product/webapp/catalog/product/EditProductContent.ftl index cd00e46bed..3d8606a6cc 100644 --- a/applications/product/webapp/catalog/product/EditProductContent.ftl +++ b/applications/product/webapp/catalog/product/EditProductContent.ftl @@ -47,21 +47,21 @@ under the License. - + - + - + @@ -69,7 +69,7 @@ under the License.
    ${uiLabelMap.ProductIfNotSpecifiedDefaultsIsProductdetail} "productdetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#productdetail" - + - + @@ -188,7 +188,7 @@ under the License.
    ${uiLabelMap.ProductProductId}
    ${uiLabelMap.ProductProductDescription}  
    ${uiLabelMap.ProductLongDescription}  
    ${uiLabelMap.ProductDetailScreen}  
    ${uiLabelMap.ProductSmallImage}
    @@ -170,7 +170,7 @@ under the License.
     
    - diff --git a/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy b/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy index cf909acf4b..36286f63e5 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -68,7 +68,7 @@ if (action) { offsetQOH = Integer.parseInt(offsetQOHQty); hasOffsetQOH = true; searchParameterString = searchParameterString + "&offsetQOHQty=" + offsetQOH; - } catch(NumberFormatException nfe) { + } catch (NumberFormatException nfe) { } } if (offsetATPQty) { @@ -76,7 +76,7 @@ if (action) { offsetATP = Integer.parseInt(offsetATPQty); hasOffsetATP = true; searchParameterString = searchParameterString + "&offsetATPQty=" + offsetATP; - } catch(NumberFormatException nfe) { + } catch (NumberFormatException nfe) { } } @@ -97,7 +97,7 @@ if (action) { conditionMap.productTypeId = productTypeId; searchParameterString = searchParameterString + "&productTypeId=" + productTypeId; } - + prodView.addMemberEntity("IITE", "InventoryItem"); prodView.addViewLink("PRFA", "IITE", Boolean.FALSE, ModelKeyMap.makeKeyMapList("productId", "productId", "facilityId", "facilityId")); prodView.addAlias("IITE", "totalQuantityOnHandTotal", "quantityOnHandTotal", null, null, null, "sum"); @@ -126,7 +126,7 @@ if (action) { conditionMap.partyId = productSupplierId; searchParameterString = searchParameterString + "&productSupplierId=" + productSupplierId; } - + // set distinct on so we only get one row per product findOpts = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true); searchCondition = EntityCondition.makeCondition(conditionMap, EntityOperator.AND); @@ -152,8 +152,8 @@ if (action) { whereConditionsList.add(EntityCondition.makeCondition("internalName", EntityOperator.LIKE, "%" + internalName + "%")); searchParameterString = searchParameterString + "&internalName=" + internalName; } - - // add search on productId + + // add search on productId if (productId) { whereConditionsList.add(EntityCondition.makeCondition("productId", EntityOperator.LIKE, productId + "%")); searchParameterString = searchParameterString + "&productId=" + productId; @@ -201,7 +201,7 @@ if (action) { salesUsageViewEntity.addAlias("ItIss", "inventoryItemId"); salesUsageViewEntity.addAlias("ItIss", "quantity"); salesUsageViewEntity.addAlias("InvIt", "facilityId"); - + // Construct a dynamic view entity to search against for production usage quantities productionUsageViewEntity = new DynamicViewEntity(); productionUsageViewEntity.addMemberEntity("WEIA", "WorkEffortInventoryAssign"); @@ -257,11 +257,11 @@ if (action) { oneInventory.offsetATPQtyAvailable = offsetATPQtyAvailable; oneInventory.quantityOnOrder = InventoryWorker.getOutstandingPurchasedQuantity(oneProd.productId, delegator); - + if (checkTime) { - + // Make a query against the sales usage view entity - salesUsageIt = delegator.findListIteratorByCondition(salesUsageViewEntity, + salesUsageIt = delegator.findListIteratorByCondition(salesUsageViewEntity, EntityCondition.makeCondition( [EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId), EntityCondition.makeCondition("productId", EntityOperator.EQUALS, oneProd.productId), @@ -270,7 +270,7 @@ if (action) { EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, checkTime) ], EntityOperator.AND), null, null, null, null); - + // Sum the sales usage quantities found salesUsageQuantity = 0; salesUsageIt.each { salesUsageItem -> @@ -283,9 +283,9 @@ if (action) { } } salesUsageIt.close(); - + // Make a query against the production usage view entity - productionUsageIt = delegator.findListIteratorByCondition(productionUsageViewEntity, + productionUsageIt = delegator.findListIteratorByCondition(productionUsageViewEntity, EntityCondition.makeCondition( [EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId), EntityCondition.makeCondition("productId", EntityOperator.EQUALS, oneProd.productId), @@ -293,10 +293,10 @@ if (action) { EntityCondition.makeCondition("actualCompletionDate", EntityOperator.GREATER_THAN_EQUAL_TO, checkTime) ], EntityOperator.AND), null, null, null, null); - + // Sum the production usage quantities found productionUsageQuantity = 0; - productionUsageIt.each { productionUsageItem -> + productionUsageIt.each { productionUsageItem -> if (productionUsageItem.quantity) { try { productionUsageQuantity += productionUsageItem.getDouble("quantity").doubleValue(); @@ -305,9 +305,9 @@ if (action) { } } } - productionUsageIt.close(); - oneInventory.usageQuantity = salesUsageQuantity + productionUsageQuantity; - } + productionUsageIt.close(); + oneInventory.usageQuantity = salesUsageQuantity + productionUsageQuantity; + } rows.add(oneInventory); } if (rows.size() < viewSize.intValue()) { @@ -316,7 +316,7 @@ if (action) { // attempt to get the full size if (hasOffsetQOH || hasOffsetATP) { rowProcessed = 0; - while (nextValue = prodsEli.next()) { + while (nextValue = prodsEli.next()) { offsetQOHQtyAvailable = nextValue.getDouble("offsetQOHQtyAvailable"); offsetATPQtyAvailable = nextValue.getDouble("offsetATPQtyAvailable"); if (hasOffsetATP) { @@ -341,7 +341,7 @@ if (action) { if (highIndex > productListSize) { highIndex = productListSize; } - context.overrideListSize = productListSize; + context.overrideListSize = productListSize; context.highIndex = highIndex; context.lowIndex = lowIndex; diff --git a/applications/product/webapp/facility/WEB-INF/actions/facility/EditContactMech.groovy b/applications/product/webapp/facility/WEB-INF/actions/facility/EditContactMech.groovy index 82776fdf13..c5dc12d9af 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/facility/EditContactMech.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/facility/EditContactMech.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy b/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy index 9e9f0b3ce0..97ed7370f3 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacilityLocation.groovy b/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacilityLocation.groovy index 6f298a1e66..9f7d8a074c 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacilityLocation.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacilityLocation.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/product/webapp/facility/WEB-INF/actions/facility/FacilityLocationGeoLocation.groovy b/applications/product/webapp/facility/WEB-INF/actions/facility/FacilityLocationGeoLocation.groovy index 97479400a5..df90536ae8 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/facility/FacilityLocationGeoLocation.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/facility/FacilityLocationGeoLocation.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -18,7 +18,7 @@ */ import org.ofbiz.common.geo.GeoWorker; - + facilityId = parameters.facilityId locationSeqId = parameters.locationSeqId diff --git a/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacility.groovy b/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacility.groovy index 950e0427e8..bf903c7c0e 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacility.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacility.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -17,17 +17,16 @@ * under the License. */ import org.ofbiz.base.util.* - + findResult = delegator.findAll("Facility"); findResultSize = findResult.size(); -if(findResultSize == 1) { +if (findResultSize == 1) { context.showScreen = "one"; context.facility = findResult.get(0); context.parameters.facilityId = context.facility.facilityId; } -if((findResultSize > 1 ) && (findResultSize <= 10)) { +if ((findResultSize > 1 ) && (findResultSize <= 10)) { context.showScreen = "ten"; -} else if((findResultSize > 10 ) || (findResultSize <= 0)) { +} else if ((findResultSize > 10 ) || (findResultSize <= 0)) { context.showScreen = "more"; } - \ No newline at end of file diff --git a/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityLocation.groovy b/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityLocation.groovy index f25a9c5587..bf66463275 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityLocation.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityLocation.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.groovy b/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.groovy index 96013cd321..0ff118a8b4 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,14 +29,14 @@ context.completeRequested = completeRequested; // get the 'to' this facility transfers if (activeOnly) { - exprsTo = [EntityCondition.makeCondition("facilityIdTo", EntityOperator.EQUALS, facilityId), - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "IXF_COMPLETE"), + exprsTo = [EntityCondition.makeCondition("facilityIdTo", EntityOperator.EQUALS, facilityId), + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "IXF_COMPLETE"), EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "IXF_CANCELLED")]; } else { exprsTo = [EntityCondition.makeCondition("facilityIdTo", EntityOperator.EQUALS, facilityId)]; } if (completeRequested) { - exprsTo = [EntityCondition.makeCondition("facilityIdTo", EntityOperator.EQUALS, facilityId), + exprsTo = [EntityCondition.makeCondition("facilityIdTo", EntityOperator.EQUALS, facilityId), EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "IXF_REQUESTED")]; } ecl = EntityCondition.makeCondition(exprsTo, EntityOperator.AND); @@ -47,14 +47,14 @@ if (toTransfers) { // get the 'from' this facility transfers if (activeOnly) { - exprsFrom = [EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId), - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "IXF_COMPLETE"), + exprsFrom = [EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId), + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "IXF_COMPLETE"), EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "IXF_CANCELLED")]; } else { exprsFrom = [EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId)]; } if (completeRequested) { - exprsFrom = [EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId), + exprsFrom = [EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId), EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "IXF_REQUESTED")]; } ecl = EntityCondition.makeCondition(exprsFrom, EntityOperator.AND); diff --git a/applications/product/webapp/facility/WEB-INF/actions/facility/FindInventoryItemsByLabels.groovy b/applications/product/webapp/facility/WEB-INF/actions/facility/FindInventoryItemsByLabels.groovy index e63b74d698..c8acfc5f6d 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/facility/FindInventoryItemsByLabels.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/facility/FindInventoryItemsByLabels.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -31,7 +31,7 @@ numberOfFields = 0; numberOfFieldsStr = parameters.numberOfFields; try { numberOfFields = Integer.parseInt(numberOfFieldsStr); -} catch(Exception exc) { +} catch (Exception exc) { numberOfFields = 0; } diff --git a/applications/product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy b/applications/product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy index 758a1f8c7e..c08588c330 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy b/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy index ac86241c2d..58c0d12fd5 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -50,7 +50,7 @@ if (action) { offsetQOH = Integer.parseInt(offsetQOHQty); hasOffsetQOH = true; searchParameterString = searchParameterString + "&offsetQOHQty=" + offsetQOH; - } catch(NumberFormatException nfe) { + } catch (NumberFormatException nfe) { } } if (offsetATPQty) { @@ -58,7 +58,7 @@ if (action) { offsetATP = Integer.parseInt(offsetATPQty); hasOffsetATP = true; searchParameterString = searchParameterString + "&offsetATPQty=" + offsetATP; - } catch(NumberFormatException nfe) { + } catch (NumberFormatException nfe) { } } @@ -90,7 +90,7 @@ if (action) { conditionMap.partyId = productSupplierId; searchParameterString = searchParameterString + "&productSupplierId=" + productSupplierId; } - + // set distinct on so we only get one row per product findOpts = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true); searchCondition = EntityCondition.makeCondition(conditionMap, EntityOperator.AND); @@ -116,8 +116,8 @@ if (action) { whereConditionsList.add(EntityCondition.makeCondition("internalName", EntityOperator.LIKE, "%" + internalName + "%")); searchParameterString = searchParameterString + "&internalName=" + internalName; } - - // add search on productId + + // add search on productId if (productId) { whereConditionsList.add(EntityCondition.makeCondition("productId", EntityOperator.LIKE, productId + "%")); searchParameterString = searchParameterString + "&productId=" + productId; diff --git a/applications/product/webapp/facility/WEB-INF/actions/inventory/FindFacilityPhysicalInventory.groovy b/applications/product/webapp/facility/WEB-INF/actions/inventory/FindFacilityPhysicalInventory.groovy index c51e14ba5b..a3ecb3400d 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/inventory/FindFacilityPhysicalInventory.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/inventory/FindFacilityPhysicalInventory.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -44,7 +44,7 @@ if (conditions.size() > 2) { // also need the overal product QOH and ATP for each product atpMap = [:]; qohMap = [:]; - + // build a list of productIds productIds = [] as Set; physicalInventory.each { iter -> diff --git a/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy b/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy index 24aec9b69f..38e3789bb4 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,22 +27,22 @@ import org.ofbiz.entity.util.EntityUtil; facilityId = context.get("facilityId"); -EntityCondition whereConditions = EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId); +EntityCondition whereConditions = EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId); inventoryItems = delegator.findByCondition("InventoryItem", whereConditions, null, UtilMisc.toList("productId"), null, null); inventoryItemProducts = EntityUtil.getFieldListFromEntityList(inventoryItems, "productId", true); - + inventoryAverageCosts = FastList.newInstance(); inventoryItemProducts.each { productId -> productFacility = delegator.findByPrimaryKey("ProductFacility", UtilMisc.toMap("productId", productId, "facilityId", facilityId)); if (UtilValidate.isNotEmpty(productFacility)) { result = dispatcher.runSync("calculateProductAverageCost", UtilMisc.toMap("productId", productId, "facilityId", facilityId, "userLogin", userLogin)); totalQuantityOnHand = result.get("totalQuantityOnHand"); - + totalInventoryCost = result.get("totalInventoryCost"); productAverageCost = result.get("productAverageCost"); currencyUomId = result.get("currencyUomId"); if (!totalQuantityOnHand.equals(BigDecimal.ZERO)) { - inventoryAverageCosts.add(UtilMisc.toMap("productId", productId, "totalQuantityOnHand", totalQuantityOnHand, + inventoryAverageCosts.add(UtilMisc.toMap("productId", productId, "totalQuantityOnHand", totalQuantityOnHand, "productAverageCost", productAverageCost, "totalInventoryCost", totalInventoryCost, "currencyUomId", currencyUomId)); } } diff --git a/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy b/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy index abef289aa1..64813367b3 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -32,7 +32,7 @@ totalCostPriceGrandTotal = 0.0; totalRetailPriceGrandTotal = 0.0; boolean beganTransaction = false; if (action) { - conditions = [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INV_DELIVERED")]; + conditions = [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INV_DELIVERED")]; conditions.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, null)); conditionList = EntityCondition.makeCondition(conditions, EntityOperator.OR); try { @@ -51,7 +51,7 @@ if (action) { retailPrice = 0.0; productPrices = product.getRelated("ProductPrice"); if (productPrices) { - productPrices.each { productPrice -> + productPrices.each { productPrice -> if (("DEFAULT_PRICE").equals(productPrice.productPriceTypeId)) { retailPrice = productPrice.getDouble("price"); } @@ -79,8 +79,8 @@ if (action) { if (retailPrice) { retailPriceGrandTotal += retailPrice; } - - resultMap = [productId : product.productId, quantityOnHand : quantityOnHandTotal, availableToPromise : availableToPromiseTotal, + + resultMap = [productId : product.productId, quantityOnHand : quantityOnHandTotal, availableToPromise : availableToPromiseTotal, costPrice : costPrice, retailPrice : retailPrice]; inventoryItemTotals.add(resultMap); } @@ -101,11 +101,11 @@ if (action) { // only commit the transaction if we started one... this will throw an exception if it fails TransactionUtil.commit(beganTransaction); } - + } inventoryItemGrandTotals = []; -inventoryItemGrandTotals.add([qohGrandTotal : qohGrandTotal, atpGrandTotal : atpGrandTotal, +inventoryItemGrandTotals.add([qohGrandTotal : qohGrandTotal, atpGrandTotal : atpGrandTotal, totalCostPriceGrandTotal : totalCostPriceGrandTotal, totalRetailPriceGrandTotal : totalRetailPriceGrandTotal]); context.inventoryItemTotals = inventoryItemTotals; diff --git a/applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy b/applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy index 2973849d7e..dbeac69bd9 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy b/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy index ad7d6df5ee..ef32aebc1f 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ - + import org.ofbiz.entity.util.* import org.ofbiz.entity.condition.* import org.ofbiz.service.ServiceUtil -facilityId = request.getParameter("facilityId"); +facilityId = request.getParameter("facilityId"); purchaseOrderId = request.getParameter("purchaseOrderId"); productId = request.getParameter("productId"); shipmentId = request.getParameter("shipmentId"); @@ -38,7 +38,7 @@ if (facility) { result = dispatcher.runSync("getPartyAccountingPreferences", [organizationPartyId : owner.partyId, userLogin : request.getAttribute("userLogin")]); if (!ServiceUtil.isError(result) && result.partyAccountingPreference) { ownerAcctgPref = result.partyAccountingPreference; - } + } } } @@ -51,8 +51,8 @@ if (purchaseOrderId) { } product = null; -if (productId) { - product = delegator.findOne("Product", [productId : productId], false); +if (productId) { + product = delegator.findOne("Product", [productId : productId], false); } shipments = null; @@ -67,7 +67,7 @@ if (purchaseOrder && !shipmentId) { (!shipment.destinationFacilityId || facilityId.equals(shipment.destinationFacilityId))) { shipments.add(shipment); } - } + } } } @@ -92,9 +92,9 @@ if (purchaseOrder) { issuanceQty += ((Double)shippedQuantities.get(issuance.orderItemSeqId)).doubleValue(); } shippedQuantities.put(issuance.orderItemSeqId, issuanceQty); - } + } purchaseOrderItems = EntityUtil.filterByOr(orderItems, exprs); - } else { + } else { purchaseOrderItems = purchaseOrder.getRelated("OrderItem"); } } @@ -105,10 +105,10 @@ if (purchaseOrder && facility) { orderCurrencyUomId = purchaseOrder.currencyUom; if (!orderCurrencyUomId.equals(ownerCurrencyUomId)) { purchaseOrderItems.each { item -> - serviceResults = dispatcher.runSync("convertUom", + serviceResults = dispatcher.runSync("convertUom", [uomId : orderCurrencyUomId, uomIdTo : ownerCurrencyUomId, originalValue : item.unitPrice]); if (ServiceUtil.isError(serviceResults)) { - request.setAttribute("_ERROR_MESSAGE_", ServiceUtil.getErrorMessage(serviceResults)); + request.setAttribute("_ERROR_MESSAGE_", ServiceUtil.getErrorMessage(serviceResults)); return; } else { convertedValue = serviceResults.convertedValue; @@ -143,19 +143,19 @@ if (purchaseOrderItems) { } if (rejected) { totalReceived += rejected.doubleValue(); - } + } } - } + } } receivedQuantities.put(thisItem.orderItemSeqId, new Double(totalReceived)); //---------------------- salesOrderItemAssocs = delegator.findList("OrderItemAssoc", EntityCondition.makeCondition([orderItemAssocTypeId : 'PURCHASE_ORDER', toOrderId : thisItem.orderId, - toOrderItemSeqId : thisItem.orderItemSeqId]), + toOrderItemSeqId : thisItem.orderItemSeqId]), null, null, null, false); if (salesOrderItemAssocs) { salesOrderItem = EntityUtil.getFirst(salesOrderItemAssocs); - salesOrderItems.put(thisItem.orderItemSeqId, salesOrderItem); + salesOrderItems.put(thisItem.orderItemSeqId, salesOrderItem); } } } @@ -190,7 +190,7 @@ if (ownerAcctgPref) { purchaseOrderItems.each { orderItem -> productId = orderItem.productId; if (productId) { - result = dispatcher.runSync("getProductCost", [productId : productId, currencyUomId : ownerAcctgPref.baseCurrencyUomId, + result = dispatcher.runSync("getProductCost", [productId : productId, currencyUomId : ownerAcctgPref.baseCurrencyUomId, costComponentTypePrefix : 'EST_STD', userLogin : request.getAttribute("userLogin")]); if (!ServiceUtil.isError(result)) { standardCosts.put(productId, result.productCost); @@ -201,7 +201,7 @@ if (ownerAcctgPref) { // get the unit cost of a single product if (productId) { - result = dispatcher.runSync("getProductCost", [productId : productId, currencyUomId : ownerAcctgPref.baseCurrencyUomId, + result = dispatcher.runSync("getProductCost", [productId : productId, currencyUomId : ownerAcctgPref.baseCurrencyUomId, costComponentTypePrefix : 'EST_STD', userLogin : request.getAttribute("userLogin")]); if (!ServiceUtil.isError(result)) { standardCosts.put(productId, result.productCost); diff --git a/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy b/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy index 374b22285a..5f1592e30c 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -59,12 +59,12 @@ if (inventoryItemId) { inventoryItem = null; } if (inventoryItem) { - context.inventoryItem = inventoryItem; + context.inventoryItem = inventoryItem; inventoryItemType = inventoryItem.getRelatedOne("InventoryItemType"); - + if (inventoryItemType) { context.inventoryItemType = inventoryItemType; - } + } if (inventoryItem.statusId) { inventoryStatus = inventoryItem.getRelatedOne("StatusItem"); if (inventoryStatus) { diff --git a/applications/product/webapp/facility/WEB-INF/actions/returns/ReceiveReturn.groovy b/applications/product/webapp/facility/WEB-INF/actions/returns/ReceiveReturn.groovy index 101d2f246c..06bf7f7df4 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/returns/ReceiveReturn.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/returns/ReceiveReturn.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ - + import org.ofbiz.entity.*; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.util.*; import org.ofbiz.base.util.*; -facilityId = request.getParameter("facilityId"); +facilityId = request.getParameter("facilityId"); returnId = request.getParameter("returnId"); facility = null; diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy index 73caab2fd4..570d44f08d 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,11 +29,11 @@ shipmentItems = shipment.getRelated("ShipmentItem"); shipmentItems.each { shipmentItem -> productId = shipmentItem.productId; internalName = shipmentItem.getRelated("Product").internalName; - EntityCondition cond = EntityCondition.makeCondition([EntityCondition.makeCondition("returnId", shipment.primaryReturnId), + EntityCondition cond = EntityCondition.makeCondition([EntityCondition.makeCondition("returnId", shipment.primaryReturnId), EntityCondition.makeCondition("productId", productId)], EntityOperator.AND); returnItem = EntityUtil.getFirst(delegator.findList("ReturnItem", cond, null, null, null, true)); returnQuantity = Double.valueOf(returnItem.returnQuantity); - + shipmentItemQty = Double.valueOf(shipmentItem.quantity); itemIssuances = shipmentItem.getRelated("ItemIssuance", [shipmentId : shipmentId, shipmentItemSeqId : shipmentItem.shipmentItemSeqId], ["inventoryItemId"]); totalQtyIssued = 0; @@ -57,7 +57,7 @@ shipmentItems.each { shipmentItem -> totalQtyIssued : totalQtyIssued, issuedItems : issuedItems, qtyStillNeedToBeIssued : qtyStillNeedToBeIssued, - ]); + ]); } context.shipmentId = shipmentId; context.items = items; \ No newline at end of file diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy index 9c9e286775..4d9c6b8674 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -43,11 +43,11 @@ if (!shipGroupSeqId && shipment) { if (orderId && shipment) { orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false); context.orderHeader = orderHeader; - + if (orderHeader) { context.orderHeaderStatus = orderHeader.getRelatedOne("StatusItem"); context.orderType = orderHeader.getRelatedOne("OrderType"); - + isSalesOrder = "SALES_ORDER".equals(orderHeader.orderTypeId); context.isSalesOrder = isSalesOrder; @@ -66,7 +66,7 @@ if (orderId && shipment) { orderItems.each { orderItemAndShipGroupAssoc -> orderItemData = [:]; product = orderItemAndShipGroupAssoc.getRelatedOne("Product"); - + itemIssuances = orderItemAndShipGroupAssoc.getRelated("ItemIssuance"); totalQuantityIssued = 0; itemIssuances.each { itemIssuance -> @@ -86,24 +86,24 @@ if (orderId && shipment) { orderItemShipGrpInvResList = orderItemAndShipGroupAssoc.getRelated("OrderItemShipGrpInvRes", oisgirLimitMap, ['reservedDatetime']); orderItemShipGrpInvResDatas = [] as LinkedList; totalQuantityReserved = 0; - orderItemShipGrpInvResList.each { orderItemShipGrpInvRes -> + orderItemShipGrpInvResList.each { orderItemShipGrpInvRes -> inventoryItem = orderItemShipGrpInvRes.getRelatedOne("InventoryItem"); orderItemShipGrpInvResData = [:]; orderItemShipGrpInvResData.orderItemShipGrpInvRes = orderItemShipGrpInvRes; orderItemShipGrpInvResData.inventoryItem = inventoryItem; orderItemShipGrpInvResData.inventoryItemFacility = inventoryItem.getRelatedOne("Facility"); orderItemShipGrpInvResDatas.add(orderItemShipGrpInvResData); - + if (orderItemShipGrpInvRes.quantity) { totalQuantityReserved += orderItemShipGrpInvRes.getDouble("quantity"); } } - + orderItemData.orderItemShipGrpInvResDatas = orderItemShipGrpInvResDatas; orderItemData.totalQuantityReserved = totalQuantityReserved; orderItemData.totalQuantityIssuedAndReserved = totalQuantityReserved + totalQuantityIssued; } - + orderItemData.orderItemAndShipGroupAssoc = orderItemAndShipGroupAssoc; orderItemData.product = product; orderItemData.itemIssuances = itemIssuances; @@ -140,9 +140,9 @@ if (shipment && selectFromShipmentPlan) { } plannedQuantity = shipmentPlan.getDouble("quantity"); totalProposedQuantity = 0.0; - + product = orderItem.getRelatedOne("Product"); - + itemIssuances = orderItem.getRelated("ItemIssuance"); totalQuantityIssued = 0; totalQuantityIssuedInShipment = 0; @@ -152,12 +152,12 @@ if (shipment && selectFromShipmentPlan) { } if (itemIssuance.cancelQuantity) { totalQuantityIssued -= itemIssuance.getDouble("cancelQuantity"); - } + } if (itemIssuance.shipmentId && itemIssuance.shipmentId.equals(shipmentId)) { totalQuantityIssuedInShipment += itemIssuance.getDouble("quantity"); if (itemIssuance.cancelQuantity) { totalQuantityIssuedInShipment -= itemIssuance.getDouble("cancelQuantity"); - } + } } } diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy index 45cbd7b2f6..03d8c4b051 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -43,13 +43,13 @@ if (!shipment) { editShipmentWrapper.setUseRequestParameters(true); } -// the kind of StatusItem to use is based on the type of order +// the kind of StatusItem to use is based on the type of order if (orderHeader && "PURCHASE_ORDER".equals(orderHeader.orderTypeId)) { statusItemType = "PURCH_SHIP_STATUS"; } else { statusItemType = "SHIPMENT_STATUS"; } -editShipmentWrapper.putInContext("statusItemType", statusItemType); +editShipmentWrapper.putInContext("statusItemType", statusItemType); context.shipmentId = shipmentId; context.shipment = shipment; @@ -66,7 +66,7 @@ if (shipment) { fromPerson = shipment.getRelatedOne("FromPerson"); fromPartyGroup = shipment.getRelatedOne("FromPartyGroup"); primaryOrderId = shipment.getString("primaryOrderId"); - + editShipmentWrapper.putInContext("currentStatus", currentStatus); editShipmentWrapper.putInContext("originPostalAddress", originPostalAddress); editShipmentWrapper.putInContext("destinationPostalAddress", destinationPostalAddress); @@ -90,10 +90,10 @@ if (shipment) { context.toPartyGroup = toPartyGroup; context.fromPerson = fromPerson; context.fromPartyGroup = fromPartyGroup; - + if (primaryOrderId) { ord = delegator.findOne("OrderHeader", [orderId : primaryOrderId], false); pfc = delegator.findList("ProductStoreFacility", null, null, null, null, false); - fac = delegator.findList("ProductStoreFacilityByOrder", EntityCondition.makeCondition([orderId : primaryOrderId]), null, null, null, false); + fac = delegator.findList("ProductStoreFacilityByOrder", EntityCondition.makeCondition([orderId : primaryOrderId]), null, null, null, false); } } \ No newline at end of file diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy index 40fba0672d..0815826de5 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -42,12 +42,12 @@ if (shipment) { totalQuantityPackaged += shipmentPackageContent.getDouble("quantity"); } } - + totalQuantityToPackage = 0; if (shipmentItem.quantity) { totalQuantityToPackage = shipmentItem.getDouble("quantity") - totalQuantityPackaged; } - + shipmentItemData = [:]; shipmentItemData.shipmentItem = shipmentItem; shipmentItemData.shipmentPackageContents = shipmentPackageContents; @@ -60,7 +60,7 @@ if (shipment) { } } shipmentPackages = shipment.getRelated("ShipmentPackage", null, ['shipmentPackageSeqId']); - + context.shipment = shipment; context.shipmentItemDatas = shipmentItemDatas; context.shipmentPackages = shipmentPackages; diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy index dd1f0f5c57..cc35c3f59e 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -42,12 +42,12 @@ if (shipment) { shipmentPackageDatas.add(shipmentPackageData); } } - + shipmentItems = shipment.getRelated("ShipmentItem", null, ['shipmentItemSeqId']); shipmentRouteSegments = shipment.getRelated("ShipmentRouteSegment", null, ['shipmentRouteSegmentId']); weightUoms = delegator.findList("Uom", EntityCondition.makeCondition([uomTypeId : 'WEIGHT_MEASURE']), null, ['description'], null, false); boxTypes = delegator.findList("ShipmentBoxType", null, null, null, null, false); - + context.shipment = shipment; context.shipmentPackageDatas = shipmentPackageDatas; context.shipmentItems = shipmentItems; diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy index a5453f03b1..56461ec33e 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -76,12 +76,12 @@ if (shipmentPlans) { orderedQuantity = Double.valueOf(orderedQuantity.doubleValue() - canceledQuantity.doubleValue()); } oneRow.totOrderedQuantity = orderedQuantity.intValue(); - + // Total quantity issued issuedQuantity = 0.0; qtyIssuedInShipment = [:]; issuances = orderItem.getRelated("ItemIssuance"); - issuances.each { issuance -> + issuances.each { issuance -> if (issuance.quantity) { issuedQuantity += issuance.getDouble("quantity"); if (issuance.cancelQuantity) { @@ -92,14 +92,14 @@ if (shipmentPlans) { qtyInShipment += issuance.getDouble("quantity"); if (issuance.cancelQuantity) { qtyInShipment -= issuance.getDouble("cancelQuantity"); - } + } qtyIssuedInShipment.put(issuance.shipmentId, qtyInShipment); } else { qtyInShipment = issuance.getDouble("quantity"); if (issuance.cancelQuantity) { qtyInShipment -= issuance.getDouble("cancelQuantity"); - } - qtyIssuedInShipment.put(issuance.shipmentId, qtyInShipment); + } + qtyIssuedInShipment.put(issuance.shipmentId, qtyInShipment); } } } @@ -148,7 +148,7 @@ if (shipmentPlans) { } } oneRow.notAvailableQuantity = reservedNotAvailable; - + // Planned Weight and Volume product = orderItem.getRelatedOne("Product"); weight = 0.0; @@ -171,7 +171,7 @@ if (shipmentPlans) { // TODO: check if uom conversion is needed volume = product.getDouble("productHeight") * product.getDouble("productWidth") * - product.getDouble("productDepth") * + product.getDouble("productDepth") * quantity; } oneRow.volume = volume; @@ -205,7 +205,7 @@ if (orderItemShipGroupAssocs) { canceledQuantity = orderItem.getDouble("cancelQuantity"); if (canceledQuantity) { orderedQuantity = Double.valueOf(orderedQuantity.doubleValue() - canceledQuantity.doubleValue()); - } + } oneRow.orderedQuantity = orderedQuantity; // Total quantity issued issuedQuantity = 0.0; @@ -216,7 +216,7 @@ if (orderItemShipGroupAssocs) { issuedQuantity += issuance.getDouble("quantity"); if (issuance.cancelQuantity) { issuedQuantity -= issuance.getDouble("cancelQuantity"); - } + } if (qtyIssuedInShipment.containsKey(issuance.shipmentId)) { qtyInShipment = ((Double)qtyIssuedInShipment.get(issuance.shipmentId)).doubleValue(); qtyInShipment += issuance.getDouble("quantity"); @@ -225,8 +225,8 @@ if (orderItemShipGroupAssocs) { qtyInShipment = issuance.getDouble("quantity"); if (issuance.cancelQuantity) { qtyInShipment -= issuance.getDouble("cancelQuantity"); - } - qtyIssuedInShipment.put(issuance.shipmentId, qtyInShipment); + } + qtyIssuedInShipment.put(issuance.shipmentId, qtyInShipment); } } } @@ -241,11 +241,11 @@ if (orderItemShipGroupAssocs) { } } oneRow.plannedQuantity = plannedQuantity; - + // (default) quantity for plan planQuantity = (orderedQuantity - plannedQuantity - issuedQuantity > 0? orderedQuantity - plannedQuantity - issuedQuantity: 0); oneRow.quantity = planQuantity; - + // Planned (unitary) Weight and Volume weight = new Double(0); product = orderItem.getRelatedOne("Product"); diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy index cdb1fc8d1c..8d866c532a 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -57,13 +57,13 @@ if (shipment) { shipmentRouteSegmentDatas.add(shipmentRouteSegmentData); } } - + shipmentPackages = shipment.getRelated("ShipmentPackage", null, ['shipmentPackageSeqId']); facilities = delegator.findList("Facility", null, null, ['facilityName'], null, false); shipmentMethodTypes = delegator.findList("ShipmentMethodType", null, null, ['description'], null, false); weightUoms = delegator.findList("Uom", EntityCondition.makeCondition([uomTypeId : 'WEIGHT_MEASURE']), null, null, null, false); currencyUoms = delegator.findList("Uom", EntityCondition.makeCondition([uomTypeId : 'CURRENCY_MEASURE']), null, null, null, false); - + carrierPartyRoles = delegator.findList("PartyRole", EntityCondition.makeCondition([roleTypeId : 'CARRIER']), null, null, null, false); carrierPartyDatas = [] as LinkedList; carrierPartyRoles.each { carrierPartyRole -> @@ -74,7 +74,7 @@ if (shipment) { carrierPartyData.partyGroup = party.getRelatedOne("PartyGroup"); carrierPartyDatas.add(carrierPartyData); } - + context.shipment = shipment; context.shipmentRouteSegmentDatas = shipmentRouteSegmentDatas; context.shipmentPackages = shipmentPackages; diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy index d51a799f4f..ea020cd745 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -79,7 +79,7 @@ if (minDate && minDate.length() > 8) { } paramListBuffer.append("&minDate="); paramListBuffer.append(minDate); - findShipmentExprs.add(EntityCondition.makeCondition("estimatedShipDate", EntityOperator.GREATER_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(minDate, "Timestamp", null, null))); + findShipmentExprs.add(EntityCondition.makeCondition("estimatedShipDate", EntityOperator.GREATER_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(minDate, "Timestamp", null, null))); } if (maxDate && maxDate.length() > 8) { maxDate = maxDate.trim(); diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy index fd03a8d0eb..c98312b6ea 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -156,7 +156,7 @@ if (orderId) { } // Try to get the defaultWeightUomId first from the facility, then from the shipment properties, and finally defaulting to kilos -defaultWeightUomId = null; +defaultWeightUomId = null; if (facility) { defaultWeightUomId = facility.defaultWeightUomId; } diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy index 87100a8ce5..dec2dba9a2 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -47,12 +47,12 @@ shipmentItems.each { shipmentItem -> } // Add in the total of all previously shipped items -previousShipmentIter = delegator.find("Shipment", +previousShipmentIter = delegator.find("Shipment", EntityCondition.makeCondition( UtilMisc.toList( EntityCondition.makeCondition("primaryOrderId", EntityOperator.EQUALS, shipment.getString("primaryOrderId")), EntityCondition.makeCondition("shipmentTypeId", EntityOperator.EQUALS, "SALES_SHIPMENT"), - EntityCondition.makeCondition("createdDate", EntityOperator.LESS_THAN_EQUAL_TO, + EntityCondition.makeCondition("createdDate", EntityOperator.LESS_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(shipment.getString("createdDate"), "Timestamp", null, null)) ), EntityOperator.AND), null, null, null, null); diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy index 114ea7f011..82f5c90ad0 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -46,7 +46,7 @@ if (shipmentId) { if (shipment) { // nuke event message - throws off the flow request.setAttribute("_EVENT_MESSAGE_", null); - + // set the shipment context info context.shipmentType = shipment.getRelatedOneCache("ShipmentType"); context.statusItem = shipment.getRelatedOne("StatusItem"); @@ -63,7 +63,7 @@ if (shipmentId) { context.shipmentRoutes = shipment.getRelated("ShipmentRouteSegment", null, ['shipmentRouteSegmentId']); context.shipment = shipment; context.shipmentId = shipmentId; - + weightUoms = delegator.findList("Uom", EntityCondition.makeCondition(['uomTypeId' : 'WEIGHT_MEASURE']), null, ['description'], null, false); defaultWeightUom = UtilProperties.getPropertyValue("shipment.properties", "shipment.default.weight.uom"); if (defaultWeightUom) { @@ -73,5 +73,5 @@ if (shipmentId) { } } context.weightUomList = weightUoms; - } + } } \ No newline at end of file diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy index 47e0032f58..789911ebb8 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -33,7 +33,7 @@ itemQuantitiesToReceive = session.getAttribute("purchaseOrderItemQuantitiesToRec if (itemQuantitiesToReceive) { sessionShipmentId = itemQuantitiesToReceive._shipmentId; sessionOrderId = itemQuantitiesToReceive._orderId; - if ((sessionShipmentId && !sessionShipmentId.equals(shipmentId)) || + if ((sessionShipmentId && !sessionShipmentId.equals(shipmentId)) || ((sessionOrderId && !sessionOrderId.equals(orderId))) || "Y".equals(request.getParameter("clearAll"))) { @@ -117,9 +117,9 @@ totalAvailableToReceive = 0; // Populate the order item data for the FTL orderItems = orderHeader.getRelated("OrderItemAndShipGroupAssoc", oiasgaLimitMap, ['shipGroupSeqId', 'orderItemSeqId']); -orderItems.each { orderItemAndShipGroupAssoc -> +orderItems.each { orderItemAndShipGroupAssoc -> product = orderItemAndShipGroupAssoc.getRelatedOne("Product"); - + // Get the order item, since the orderItemAndShipGroupAssoc's quantity field is manipulated in some cases orderItem = delegator.findOne("OrderItem", [orderId : orderId, orderItemSeqId : orderItemAndShipGroupAssoc.orderItemSeqId], false); orderItemData = [:]; @@ -140,7 +140,7 @@ orderItems.each { orderItemAndShipGroupAssoc -> receipts = delegator.findList("ShipmentReceipt", EntityCondition.makeCondition([orderId : orderId, orderItemSeqId : orderItem.orderItemSeqId]), null, null, null, false); fulfilledReservations = [] as ArrayList; if (receipts) { - receipts.each { rec -> + receipts.each { rec -> accepted = rec.getDouble("quantityAccepted"); rejected = rec.getDouble("quantityRejected"); if (accepted) { @@ -170,11 +170,11 @@ orderItems.each { orderItemAndShipGroupAssoc -> // Retrieve the backordered quantity // TODO: limit to a facility? The shipment destination facility is not necessarily the same facility as the inventory - conditions = [EntityCondition.makeCondition("productId", EntityOperator.EQUALS, product.productId), + conditions = [EntityCondition.makeCondition("productId", EntityOperator.EQUALS, product.productId), EntityCondition.makeCondition("availableToPromiseTotal", EntityOperator.LESS_THAN, new Double(0))]; negativeInventoryItems = delegator.findList("InventoryItem", EntityCondition.makeCondition(conditions, EntityOperator.AND), null, null, null, false); backOrderedQuantity = 0; - negativeInventoryItems.each { negativeInventoryItem -> + negativeInventoryItems.each { negativeInventoryItem -> backOrderedQuantity += negativeInventoryItem.getDouble("availableToPromiseTotal").doubleValue(); } orderItemData.backOrderedQuantity = Math.abs(backOrderedQuantity); @@ -214,7 +214,7 @@ if (productIdToReceive) { } } } - + if (candidateOrderItems) { quantity = 0; if (productQtyToReceive) { @@ -234,24 +234,24 @@ if (productIdToReceive) { qtyBefore = itemQuantitiesToReceive.containsKey(orderItemSeqId) ? itemQuantitiesToReceive.get(orderItemSeqId) : 0; totalQuantityToReceiveBefore += qtyBefore; qtyMaxAvailable = orderItemDatas.get(orderItemSeqId).availableToReceive - qtyBefore; - + if (qtyMaxAvailable <= 0) { continue; } - + qtyUsedForItem = quantity - totalQuantityUsed >= qtyMaxAvailable ? qtyMaxAvailable : quantity - totalQuantityUsed; itemQuantitiesToReceive.put(orderItemSeqId, qtyUsedForItem + qtyBefore); totalQuantityUsed += qtyUsedForItem; } - + // If there's any quantity to receive left after using as much as possible for every relevant order item, add an error message to the context if (quantity > totalQuantityUsed) { context.ProductReceiveInventoryAgainstPurchaseOrderQuantityExceedsAvailableToReceive = true; } - + // Notify if some or all of the quantity just entered for the product will go to a backorder backOrderedQuantity = orderItemDatas.get(EntityUtil.getFirst(candidateOrderItems).orderItemSeqId).backOrderedQuantity - totalQuantityToReceiveBefore; - + if (backOrderedQuantity > 0) { totalQtyUsedForBackorders = backOrderedQuantity >= totalQuantityUsed ? totalQuantityUsed : backOrderedQuantity; if (totalQtyUsedForBackorders > 0) { diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy index 0d98ab958b..ba207dc484 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -24,7 +24,7 @@ import org.ofbiz.content.report.* shipmentId = request.getParameter("shipmentId"); shipment = delegator.findOne("Shipment", [shipmentId : shipmentId], false); -if (shipment) { +if (shipment) { shipmentPackageRouteSegs = shipment.getRelated("ShipmentPackageRouteSeg", null, ['shipmentRouteSegmentId', 'shipmentPackageSeqId']); shipmentPackageDatas = [] as LinkedList; if (shipmentPackageRouteSegs) { @@ -39,7 +39,7 @@ if (shipment) { shipmentPackageContents.each { shipmentPackageContent -> shipmentItemsData = [:]; packageQuantity = shipmentPackageContent.getDouble("quantity"); - shipmentItem = shipmentPackageContent.getRelatedOne("ShipmentItem"); + shipmentItem = shipmentPackageContent.getRelatedOne("ShipmentItem"); if (shipmentItem) { shippedQuantity = shipmentItem.getDouble("quantity"); shipmentItemsData.shipmentItem = shipmentItem; diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy index 70ed32d0bc..421a8b333f 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy b/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy index 55661c187b..3b567ab143 100644 --- a/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy +++ b/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/product/webapp/facility/WEB-INF/controller.xml b/applications/product/webapp/facility/WEB-INF/controller.xml index 67d931956c..2196b39827 100644 --- a/applications/product/webapp/facility/WEB-INF/controller.xml +++ b/applications/product/webapp/facility/WEB-INF/controller.xml @@ -20,7 +20,7 @@ under the License. - + Facility Manager Module Site Configuration File Copyright 2001-2008 The Apache Software Foundation @@ -383,7 +383,7 @@ under the License. - + @@ -516,7 +516,7 @@ under the License. - + @@ -726,7 +726,7 @@ under the License. - + @@ -734,7 +734,7 @@ under the License. - + @@ -797,14 +797,14 @@ under the License. - + - + @@ -1097,7 +1097,7 @@ under the License. - + @@ -1122,7 +1122,7 @@ under the License. --> - + @@ -1151,7 +1151,7 @@ under the License. - + @@ -1196,7 +1196,7 @@ under the License. - + @@ -1218,7 +1218,7 @@ under the License. - + @@ -1236,16 +1236,16 @@ under the License. - + - + - + diff --git a/applications/product/webapp/facility/WEB-INF/web.xml b/applications/product/webapp/facility/WEB-INF/web.xml index 2f2a28857a..7de88cb142 100644 --- a/applications/product/webapp/facility/WEB-INF/web.xml +++ b/applications/product/webapp/facility/WEB-INF/web.xml @@ -23,7 +23,7 @@ under the License. Open For Business - Facility Manager Facility Manager Module of the Open For Business Project - + webSiteId FACILITY @@ -53,7 +53,7 @@ under the License. serviceReaderUrls /WEB-INF/services.xml Configuration File(s) For The Service Dispatcher - + ContextFilter @@ -74,18 +74,18 @@ under the License. redirectPath /control/main - + ContextFilter /* - + org.ofbiz.webapp.control.ControlEventListener org.ofbiz.webapp.control.LoginEventListener - + ControlServlet ControlServlet diff --git a/applications/product/webapp/facility/error/error.jsp b/applications/product/webapp/facility/error/error.jsp index ba5a349b8d..123c910fb3 100644 --- a/applications/product/webapp/facility/error/error.jsp +++ b/applications/product/webapp/facility/error/error.jsp @@ -33,12 +33,12 @@ under the License. - + -
    +   diff --git a/applications/product/webapp/catalog/product/EditProductFeatures.ftl b/applications/product/webapp/catalog/product/EditProductFeatures.ftl index a02f2cbecf..2cf2a688da 100644 --- a/applications/product/webapp/catalog/product/EditProductFeatures.ftl +++ b/applications/product/webapp/catalog/product/EditProductFeatures.ftl @@ -16,12 +16,12 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<#if productId?exists> +<#if productId?exists>

    ${uiLabelMap.PageTitleEditProductFeatures}

    -
    +
    @@ -73,7 +73,7 @@ under the License. -
    + @@ -98,7 +98,7 @@ under the License.

    ${uiLabelMap.ProductAddProductFeatureFromCategory}

    -
    +
    <#list productFeatureApplTypes as productFeatureApplType> - + >${(productFeatureApplType.get("description",locale))?if_exists} @@ -130,7 +130,7 @@ under the License.

    ${uiLabelMap.ProductAddProductFeatureTypeId}

    -
    +
    ${uiLabelMap.ProductFeatureType}: <#list productFeatureApplTypes as productFeatureApplType> - + >${(productFeatureApplType.get("description",locale))?if_exists}
    @@ -163,7 +163,7 @@ under the License.

    ${uiLabelMap.ProductAddProductFeatureID}

    -
    +
    ${uiLabelMap.CommonId}: @@ -171,15 +171,15 @@ under the License. Click here For Field Lookup - + ${uiLabelMap.ProductFeatureApplicationType}:
    diff --git a/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl b/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl index 0389c18e6c..4770b8435c 100644 --- a/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl +++ b/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl @@ -21,7 +21,7 @@ under the License.

    ${uiLabelMap.ProductInventoryItems} ${uiLabelMap.CommonFor} <#if product?exists>${(product.internalName)?if_exists} [${uiLabelMap.CommonId}:${productId?if_exists}]

    -
    +
    <#if productId?has_content> ${uiLabelMap.ProductCreateNewInventoryItemProduct} <#if showEmpty> diff --git a/applications/product/webapp/catalog/product/EditProductParties.ftl b/applications/product/webapp/catalog/product/EditProductParties.ftl index d6ede2a0e7..a3b5eff8ac 100644 --- a/applications/product/webapp/catalog/product/EditProductParties.ftl +++ b/applications/product/webapp/catalog/product/EditProductParties.ftl @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<#if productId?exists && product?exists> +<#if productId?exists && product?exists> diff --git a/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl b/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl index 9ef6bf4fec..0f1707e8fd 100644 --- a/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl +++ b/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl @@ -273,7 +273,7 @@ function doPublish() { - +
    ${uiLabelMap.PartyPartyId}
    @@ -453,7 +453,7 @@ function doPublish() {
    -
    +
    <#else>

    ${uiLabelMap.ProductProductNotFound} ${productId?if_exists}

    diff --git a/applications/product/webapp/catalog/product/ProductInventorySummary.ftl b/applications/product/webapp/catalog/product/ProductInventorySummary.ftl index 60bd5b2b2b..7e8643a996 100644 --- a/applications/product/webapp/catalog/product/ProductInventorySummary.ftl +++ b/applications/product/webapp/catalog/product/ProductInventorySummary.ftl @@ -25,7 +25,7 @@ under the License.

    ${uiLabelMap.ProductInventorySummary}

    -
    +
    @@ -54,7 +54,7 @@ under the License. <#assign outgoingProductionRunList = manufacturingOutQuantitySummary.outgoingProductionRunList?if_exists> <#assign outgoingQuantityTotal = manufacturingOutQuantitySummary.estimatedQuantityTotal?if_exists> class="alternate-row"> - diff --git a/applications/product/webapp/catalog/product/QuickAddVariants.ftl b/applications/product/webapp/catalog/product/QuickAddVariants.ftl index cccc2ac659..90341f116e 100644 --- a/applications/product/webapp/catalog/product/QuickAddVariants.ftl +++ b/applications/product/webapp/catalog/product/QuickAddVariants.ftl @@ -38,11 +38,11 @@ function clickAll(e) { var cform = document.selectAllForm; var len = cform.elements.length; for (var i = 0; i < len; i++) { - var element = cform.elements[i]; + var element = cform.elements[i]; if (element.name.substring(0, 10) == "_rowSubmit" && element.checked != e.checked) { element.click(); - } - } + } + } } <#if (product.isVirtual)?if_exists != "Y"> @@ -64,7 +64,7 @@ function clickAll(e) { - + <#assign defaultSequenceNum = 10> <#assign rowClass = "2"> <#list featureCombinationInfos as featureCombinationInfo> @@ -93,7 +93,7 @@ function clickAll(e) { - diff --git a/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl b/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl index 13b0695369..bb2d397050 100644 --- a/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl +++ b/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl @@ -37,7 +37,7 @@ under the License. - + diff --git a/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl b/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl index b0ed2c9703..b69a9d9655 100644 --- a/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl +++ b/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl @@ -29,7 +29,7 @@ under the License. - <#assign rowClass = "2"> + <#assign rowClass = "2"> <#list productPromoRules as productPromoRule> <#assign productPromoConds = productPromoRule.getRelated("ProductPromoCond")> <#assign productPromoActions = productPromoRule.getRelated("ProductPromoAction")> diff --git a/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl b/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl index 66b0ea5d0a..143c8638da 100644 --- a/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl +++ b/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl @@ -16,12 +16,12 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<#if productPromoId?exists && productPromo?exists> +<#if productPromoId?exists && productPromo?exists>

    ${uiLabelMap.PageTitleEditProductPromoStores}

    -
    +
    ${uiLabelMap.ProductFacility}
    ${(facility.facilityName)?if_exists} [${facilityId?default("[No Facility]")}] + ${(facility.facilityName)?if_exists} [${facilityId?default("[No Facility]")}] ${uiLabelMap.ProductInventoryReceive} <#if totalAvailableToPromise?exists>${totalAvailableToPromise}<#else>  <#if totalQuantityOnHand?exists>${totalQuantityOnHand}<#else> ${uiLabelMap.ProductExistingVariant} : ${uiLabelMap.CommonAll}
    +
    ${uiLabelMap.ProductRuleName}  
    @@ -29,8 +29,8 @@ under the License. - <#assign line = 0> - <#assign rowClass = "2"> + <#assign line = 0> + <#assign rowClass = "2"> <#list productStorePromoAppls as productStorePromoAppl> <#assign line = line + 1> <#assign productStore = productStorePromoAppl.getRelatedOne("ProductStore")> @@ -62,7 +62,7 @@ under the License. <#assign rowClass = "1"> <#else> <#assign rowClass = "2"> - +
    ${uiLabelMap.ProductStoreNameId}${uiLabelMap.ProductThruDateTimeSequence}  
    diff --git a/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl b/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl index 37393bdc72..184270932d 100644 --- a/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl +++ b/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl @@ -23,7 +23,7 @@ under the License.
    - + ${uiLabelMap.ProductPromoUserEntered}: ${uiLabelMap.ProductPromotionReqEmailOrParty}: ${uiLabelMap.ProductPromotionUseLimits}: @@ -42,7 +42,7 @@ under the License.

    ${uiLabelMap.ProductPromotionAddSetOfPromotionCodes}

    - + ${uiLabelMap.CommonQuantity}: ${uiLabelMap.ProductPromoUserEntered}: diff --git a/applications/product/webapp/catalog/promo/PromoForms.xml b/applications/product/webapp/catalog/promo/PromoForms.xml index 0da49cbd4c..197a8c4b12 100644 --- a/applications/product/webapp/catalog/promo/PromoForms.xml +++ b/applications/product/webapp/catalog/promo/PromoForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -69,7 +69,7 @@ under the License.
    + header-row-style="header-row" default-table-style="basic-table"> @@ -101,7 +101,7 @@ under the License. - +
    diff --git a/applications/product/webapp/catalog/reviews/pendingReviews.ftl b/applications/product/webapp/catalog/reviews/pendingReviews.ftl index 8cd28c6c9a..3a8211d631 100644 --- a/applications/product/webapp/catalog/reviews/pendingReviews.ftl +++ b/applications/product/webapp/catalog/reviews/pendingReviews.ftl @@ -26,7 +26,7 @@ under the License.

    ${uiLabelMap.ProductReviewsPendingApproval}

    -
    +
    <#if !pendingReviews?has_content>

    ${uiLabelMap.ProductReviewsNoPendingApproval}

    <#else> @@ -100,7 +100,7 @@ under the License. <#assign rowClass = "1"> <#else> <#assign rowClass = "2"> - +
    diff --git a/applications/product/webapp/catalog/shipping/ShippingForms.xml b/applications/product/webapp/catalog/shipping/ShippingForms.xml index 19a285de11..7f1741596a 100644 --- a/applications/product/webapp/catalog/shipping/ShippingForms.xml +++ b/applications/product/webapp/catalog/shipping/ShippingForms.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl b/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl index 71466df7c7..931de0e918 100644 --- a/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl +++ b/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl @@ -20,12 +20,12 @@ under the License. ${uiLabelMap.ProductShowAll} <#else> ${uiLabelMap.ProductShowActive} - +

    ${uiLabelMap.PageTitleEditProductStoreRoles}

    -
    +
    @@ -66,7 +66,7 @@ under the License.

    ${uiLabelMap.ProductCreateProductStoreRole}

    -
    +
    ${uiLabelMap.PartyParty}
    @@ -91,7 +91,7 @@ under the License. diff --git a/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl b/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl index bfdda9f883..addac48e61 100644 --- a/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl +++ b/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl @@ -20,7 +20,7 @@ under the License.

    ${uiLabelMap.PageTitleEditProductStoreSurveys}

    -
    +
    ${uiLabelMap.CommonFromDate} - Calendar + Calendar
    @@ -50,7 +50,7 @@ under the License. <#assign rowClass = "1"> <#else> <#assign rowClass = "2"> - +
    ${uiLabelMap.CommonType}
    @@ -59,7 +59,7 @@ under the License.

    ${uiLabelMap.PageTitleAddProductStoreSurveys}

    -
    +
    @@ -76,7 +76,7 @@ under the License. diff --git a/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl b/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl index a870095d8c..80b38f90a6 100644 --- a/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl +++ b/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl @@ -45,7 +45,7 @@ under the License. <#assign rowClass = "1"> <#else> <#assign rowClass = "2"> - +
    ${uiLabelMap.CommonGroup} ${uiLabelMap.CommonName} - +
    diff --git a/applications/product/webapp/catalog/store/ProductStoreForms.xml b/applications/product/webapp/catalog/store/ProductStoreForms.xml index 2526121bdf..fc969da23b 100644 --- a/applications/product/webapp/catalog/store/ProductStoreForms.xml +++ b/applications/product/webapp/catalog/store/ProductStoreForms.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -55,7 +55,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -292,7 +292,7 @@ - + @@ -310,7 +310,7 @@ - + @@ -388,7 +388,7 @@ - + @@ -427,7 +427,7 @@ - + @@ -637,7 +637,7 @@ - + @@ -661,8 +661,8 @@ - - + +
    @@ -737,19 +737,19 @@ - + - + - + @@ -771,7 +771,7 @@ - + @@ -792,7 +792,7 @@ - + @@ -814,7 +814,7 @@ - + @@ -828,8 +828,8 @@ - - + + @@ -880,13 +880,13 @@ - + - + @@ -895,7 +895,7 @@ - + @@ -905,7 +905,7 @@ - + @@ -915,7 +915,7 @@ - + @@ -951,12 +951,12 @@ - + -
    @@ -1064,7 +1064,7 @@ - + @@ -1074,7 +1074,7 @@ - + diff --git a/applications/product/webapp/catalog/store/prepareCreateShipMeth.groovy b/applications/product/webapp/catalog/store/prepareCreateShipMeth.groovy index 0c10846848..11091af3df 100644 --- a/applications/product/webapp/catalog/store/prepareCreateShipMeth.groovy +++ b/applications/product/webapp/catalog/store/prepareCreateShipMeth.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl b/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl index 483ca486c8..79b7b600a1 100644 --- a/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl +++ b/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl @@ -77,7 +77,7 @@ under the License. <#assign rowClass = "1"> <#else> <#assign rowClass = "2"> - +
    - - + - + diff --git a/applications/product/webapp/facility/facility/EditFacility.ftl b/applications/product/webapp/facility/facility/EditFacility.ftl index 5f12f133ad..5fd6473c0e 100644 --- a/applications/product/webapp/facility/facility/EditFacility.ftl +++ b/applications/product/webapp/facility/facility/EditFacility.ftl @@ -81,7 +81,7 @@ under the License. - + + <#-- toggle the row color --> <#if rowClass == "2"> diff --git a/applications/product/webapp/facility/facility/PickMoveStock.ftl b/applications/product/webapp/facility/facility/PickMoveStock.ftl index 87ecd808bd..e9e58da8a6 100644 --- a/applications/product/webapp/facility/facility/PickMoveStock.ftl +++ b/applications/product/webapp/facility/facility/PickMoveStock.ftl @@ -28,7 +28,7 @@ under the License.
    <#-- general request fields --> - + <#assign rowCount = 0>
    +
    :ERROR MESSAGE:
    <%=UtilFormatOut.replaceString(errorMsg, "\n", "
    ")%>
    ${uiLabelMap.ProductFacilityDefaultInventoryItemType} + <#elseif facilityLocation?exists> @@ -50,7 +50,7 @@ under the License.

    ${uiLabelMap.ProductNotCreateLocationFacilityId}

    -<#if facilityId?exists> +<#if facilityId?exists> - + <#if locationSeqId?exists> @@ -102,7 +102,7 @@ under the License.

    ${uiLabelMap.ProductLocationProduct}

    -
    +
    <#-- ProductFacilityLocation stuff -->
    ${uiLabelMap.ProductType} @@ -85,7 +85,7 @@ under the License.
    ${uiLabelMap.ProductPosition}
     
    @@ -128,12 +128,12 @@ under the License.
    - +

    ${uiLabelMap.ProductAddProduct}

    -
    +
    @@ -144,7 +144,7 @@ under the License.
    -
    +
    - + diff --git a/applications/product/webapp/facility/facility/FacilityForms.xml b/applications/product/webapp/facility/facility/FacilityForms.xml index 27fcd57c21..6a481dada3 100644 --- a/applications/product/webapp/facility/facility/FacilityForms.xml +++ b/applications/product/webapp/facility/facility/FacilityForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
    @@ -42,7 +42,7 @@ under the License. - +
    @@ -82,7 +82,7 @@ under the License.
    -
    @@ -239,7 +239,7 @@ under the License. - + @@ -293,7 +293,7 @@ under the License. - + @@ -343,7 +343,7 @@ under the License. - + @@ -369,7 +369,7 @@ under the License. -
    @@ -400,10 +400,10 @@ under the License. - + - + @@ -418,7 +418,7 @@ under the License. -
    @@ -434,7 +434,7 @@ under the License. - + @@ -498,7 +498,7 @@ under the License. -
    @@ -535,7 +535,7 @@ under the License.
    -
    @@ -610,7 +610,7 @@ under the License.
    - +
    @@ -646,10 +646,10 @@ under the License.
    -
    - + @@ -659,14 +659,14 @@ under the License.
    -
    - + @@ -680,8 +680,8 @@ under the License.
    -
    + diff --git a/applications/product/webapp/facility/facility/FacilityLocationGeoLocation.ftl b/applications/product/webapp/facility/facility/FacilityLocationGeoLocation.ftl index 2814c006ca..e8cdbcedda 100644 --- a/applications/product/webapp/facility/facility/FacilityLocationGeoLocation.ftl +++ b/applications/product/webapp/facility/facility/FacilityLocationGeoLocation.ftl @@ -19,11 +19,11 @@ under the License. <#if latestGeoPoint?has_content> <#if latestGeoPoint.latitude?has_content && latestGeoPoint.longitude?has_content> ${uiLabelMap.CommonLatitude}${latestGeoPoint.latitude}
    - ${uiLabelMap.CommonLongitude}${latestGeoPoint.longitude} + ${uiLabelMap.CommonLongitude}${latestGeoPoint.longitude} <#if latestGeoPoint.elevation?has_content>
    ${uiLabelMap.CommonElevation}${latestGeoPoint.elevation} ${elevationUomAbbr} - - <#if latestGeoPoint.dataSourceId?has_content> + + <#if latestGeoPoint.dataSourceId?has_content> <#if latestGeoPoint.dataSourceId == "GEOPT_GOOGLE">
    ${uiLabelMap.CommonLoading}
    @@ -34,17 +34,17 @@ under the License. type="text/javascript"> - <#elseif latestGeoPoint.dataSourceId == "GEOPT_YAHOO"> - <#elseif latestGeoPoint.dataSourceId == "GEOPT_MICROSOFT"> - <#elseif latestGeoPoint.dataSourceId == "GEOPT_MAPTP"> - - + + <#elseif latestGeoPoint.dataSourceId == "GEOPT_YAHOO"> + <#elseif latestGeoPoint.dataSourceId == "GEOPT_MICROSOFT"> + <#elseif latestGeoPoint.dataSourceId == "GEOPT_MAPTP"> + + <#else> -

    ${uiLabelMap.CommonNoGeolocationAvailable}

    +

    ${uiLabelMap.CommonNoGeolocationAvailable}

    diff --git a/applications/product/webapp/facility/facility/FindFacilityLocation.ftl b/applications/product/webapp/facility/facility/FindFacilityLocation.ftl index 0e7a5f7a83..6469758800 100644 --- a/applications/product/webapp/facility/facility/FindFacilityLocation.ftl +++ b/applications/product/webapp/facility/facility/FindFacilityLocation.ftl @@ -16,13 +16,13 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - +

    ${title}

    - + <#if !(facilityId?exists)> @@ -62,14 +62,14 @@ under the License. - +
    ${uiLabelMap.ProductPosition}
     
    - + <#if foundLocations?exists> <#-- TODO: Put this in a screenlet - make it look more like the party find screen -->
    @@ -98,14 +98,14 @@ under the License.
    ${(location.aisleId)?if_exists} ${(location.sectionId)?if_exists} ${(location.levelId)?if_exists}${(location.positionId)?if_exists}${(location.positionId)?if_exists} ${uiLabelMap.ProductNewInventoryItem} <#if itemId?exists> ${uiLabelMap.ProductSetItem} ${itemId} - + ${uiLabelMap.CommonEdit} -
    @@ -70,14 +70,14 @@ under the License. - - @@ -104,18 +104,18 @@ under the License. - - - <#assign rowCount = rowCount + 1> + <#assign rowCount = rowCount + 1>
    ${moveByOisgirInfo.availableToPromiseTotalTo?if_exists} ${targetProductFacilityLocation.minimumStock?if_exists} ${targetProductFacilityLocation.moveQuantity?if_exists} + +
    ${moveByPflInfo.availableToPromiseTotalTo?if_exists} ${targetProductFacilityLocation.minimumStock?if_exists} ${targetProductFacilityLocation.moveQuantity?if_exists} + +
    @@ -127,7 +127,7 @@ under the License. <#assign messageCount = 0> <#list pflWarningMessageList?if_exists as pflWarningMessage> - <#assign messageCount = messageCount + 1> + <#assign messageCount = messageCount + 1>

    ${messageCount}:${pflWarningMessage}.

    diff --git a/applications/product/webapp/facility/facility/Picklist.fo.ftl b/applications/product/webapp/facility/facility/Picklist.fo.ftl index f4eb854ac8..7a1280b6bc 100644 --- a/applications/product/webapp/facility/facility/Picklist.fo.ftl +++ b/applications/product/webapp/facility/facility/Picklist.fo.ftl @@ -21,7 +21,7 @@ under the License. <#-- It is important to set defaults for facilityLocation and facilityLocationInfo in case the picklisted item has no location defined in facility. - Because these defaults are scalars, we must then use the ?is_hash check directive as well before trying to access them --> + Because these defaults are scalars, we must then use the ?is_hash check directive as well before trying to access them --> <#macro pickInfoDetail pickQuantity picklistBinInfoList product facilityLocation="" facilityLocationInfo=""> diff --git a/applications/product/webapp/facility/facility/ViewContactMechs.ftl b/applications/product/webapp/facility/facility/ViewContactMechs.ftl index 1e0897eb60..e620d39ad0 100644 --- a/applications/product/webapp/facility/facility/ViewContactMechs.ftl +++ b/applications/product/webapp/facility/facility/ViewContactMechs.ftl @@ -72,7 +72,7 @@ under the License. <#if postalAddress.geoPointId?has_content> <#assign popUptitle = contactMechPurposeType.get("description",locale) + uiLabelMap.CommonGeoLocation>
    ${uiLabelMap.CommonGeoLocation} - + <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId> <#assign telecomNumber = contactMechMap.telecomNumber> ${telecomNumber.countryCode?if_exists} diff --git a/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl b/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl index a0eeee42df..d7c85a2030 100644 --- a/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl +++ b/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl @@ -17,22 +17,22 @@ specific language governing permissions and limitations under the License. --> -<#-- +<#-- The form widget of type multi can have only one submit button, and hence only one operation on the selected labels. To support more than one action, we can create another submit button outside the form and use a javascript function to change the target of the multi form and submit it. In this case, the multi form has two actions: Print as labels, which generates a PDF of selected labels, and mark as accepted, which updates the selected shipment route segments. The label printing button is handled - normally in the form widget. The mark action is handled here using the technique described above. If more + normally in the form widget. The mark action is handled here using the technique described above. If more actions are required, we can create more submit buttons in this file with their own action-changing submit functions. Note that the facilityId in the form action is a trick to pass the facilityId on to the next request. - Also note that for layout purposes, the submit button in the form widget can be converted and moved here so that all + Also note that for layout purposes, the submit button in the form widget can be converted and moved here so that all the buttons can be arranged as desired. --> - + - + <#-- Initial Screen --> <#else> @@ -243,20 +243,20 @@ under the License. - + + + - + - +

    ${uiLabelMap.ProductReceiveReturn}

    ${uiLabelMap.ProductReturnNumber}   - -  
      ${uiLabelMap.ProductReceiveProduct}
    diff --git a/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl b/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl index dbffde7a70..72378b9d90 100644 --- a/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl +++ b/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl @@ -56,21 +56,21 @@ under the License.
    - + Lookup - +
    +
    -
    \ No newline at end of file +
    \ No newline at end of file diff --git a/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl b/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl index f972c8eda2..ed9a6100d0 100644 --- a/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl +++ b/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl @@ -73,7 +73,7 @@ under the License.

    ${uiLabelMap.ProductNoteOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}, ${uiLabelMap.ProductNoItemsLeft}.

    <#else>

    ${uiLabelMap.ProductWarningOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}; ${uiLabelMap.ProductApprovedBeforeShipping}.

    - +
    <#if orderItemDatas?exists> @@ -169,10 +169,10 @@ under the License. - + - <#assign rowCount = rowCount + 1> + <#assign rowCount = rowCount + 1> <#else>     @@ -213,10 +213,10 @@ under the License. - + - <#assign rowCount = rowCount + 1> + <#assign rowCount = rowCount + 1> <#else> ${uiLabelMap.ProductNotOriginFacility}   diff --git a/applications/product/webapp/facility/shipment/EditShipmentItems.ftl b/applications/product/webapp/facility/shipment/EditShipmentItems.ftl index b9ce28b08e..0e3f5099de 100644 --- a/applications/product/webapp/facility/shipment/EditShipmentItems.ftl +++ b/applications/product/webapp/facility/shipment/EditShipmentItems.ftl @@ -95,7 +95,7 @@ under the License.   -
    ${uiLabelMap.ProductAddToPackage} +
    ${uiLabelMap.ProductAddToPackage} <#list shipmentItems as shipmentItem> @@ -130,7 +130,7 @@ under the License. ${uiLabelMap.ProductTrack}
    - ${uiLabelMap.ProductBox} + ${uiLabelMap.ProductBox} ${uiLabelMap.CommonUpdate} ${uiLabelMap.CommonDelete} @@ -186,7 +186,7 @@ under the License. -->
    -
    +
    <#else>
    diff --git a/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl b/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl index 86411c86cc..97e81da00b 100644 --- a/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl +++ b/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl @@ -45,13 +45,13 @@ under the License. rowCountElement.setAttribute("type", "hidden"); rowCountElement.setAttribute("value", rowCount); document.forms.addToShipmentPlan.appendChild(rowCountElement); - + var shipmentIdElement = document.createElement("input"); shipmentIdElement.setAttribute("name", "shipmentId"); shipmentIdElement.setAttribute("type", "hidden"); shipmentIdElement.setAttribute("value", ${shipmentId}); document.forms.addToShipmentPlan.appendChild(shipmentIdElement); - + document.forms.addToShipmentPlan.submit(); } @@ -72,7 +72,7 @@ under the License. ${listShipmentPlanForm.renderFormString(context)}
    -

    ${uiLabelMap.ProductShipmentTotalWeight}: ${totWeight} ${uiLabelMap.ProductShipmentTotalVolume}: ${totVolume}

    +

    ${uiLabelMap.ProductShipmentTotalWeight}: ${totWeight} ${uiLabelMap.ProductShipmentTotalVolume}: ${totVolume}

    ${shipmentPlanToOrderItemsForm.renderFormString(context)}
    diff --git a/applications/product/webapp/facility/shipment/FindShipment.ftl b/applications/product/webapp/facility/shipment/FindShipment.ftl index dd19145260..8d4ef1a675 100644 --- a/applications/product/webapp/facility/shipment/FindShipment.ftl +++ b/applications/product/webapp/facility/shipment/FindShipment.ftl @@ -49,7 +49,7 @@ function lookupShipments() { ${uiLabelMap.ProductShipmentId}   - + ${uiLabelMap.ProductShipmentType}   @@ -59,13 +59,13 @@ function lookupShipments() { - + <#list shipmentTypes as shipmentType> - + ${uiLabelMap.ProductOriginFacility}   @@ -75,13 +75,13 @@ function lookupShipments() { - + <#list facilities as facility> - + ${uiLabelMap.ProductDestinationFacility}   @@ -91,58 +91,58 @@ function lookupShipments() { - + <#list facilities as facility> - + ${uiLabelMap.ProductStatus}   - <#if currentStatus?has_content> - - + + <#list shipmentStatuses as shipmentStatus> - + <#list purchaseShipmentStatuses as shipmentStatus> - + ${uiLabelMap.ProductDateFilter}   - - + - - +
    +
    Calendar ${uiLabelMap.CommonFrom}
    +
    - Calendar + Calendar ${uiLabelMap.CommonThru}
    - - + +
    <#if shipmentList?exists> @@ -150,7 +150,7 @@ function lookupShipments() {
    • ${uiLabelMap.ProductShipmentsFound}
    • - <#if 0 < shipmentList?size> + <#if 0 < shipmentList?size> <#if (shipmentList?size > highIndex)>
    • ${uiLabelMap.CommonNext}
    • <#else> @@ -176,7 +176,7 @@ function lookupShipments() { ${uiLabelMap.ProductDestFacility} ${uiLabelMap.ProductShipDate}   - + <#if shipmentList?has_content> <#assign alt_row = false> <#list shipmentList as shipment> @@ -197,13 +197,13 @@ function lookupShipments() { <#-- toggle the row color --> <#assign alt_row = !alt_row> - + <#else>

      ${uiLabelMap.ProductNoShipmentsFound}.

      - + - +
    \ No newline at end of file diff --git a/applications/product/webapp/facility/shipment/QuickShipOrder.ftl b/applications/product/webapp/facility/shipment/QuickShipOrder.ftl index 0067a174e6..423a733b77 100644 --- a/applications/product/webapp/facility/shipment/QuickShipOrder.ftl +++ b/applications/product/webapp/facility/shipment/QuickShipOrder.ftl @@ -31,13 +31,13 @@ function setWeight(weight) { ${uiLabelMap.ProductEditShipment} - - <#if shipment?exists> + + <#if shipment?exists> <#if 1 < shipmentPackages.size()> <#-- multiple packages -->
    ${uiLabelMap.ProductMorePackageFoundShipment}.
    <#else> - <#-- single package --> + <#-- single package --> <#assign shipmentPackage = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentPackages))?if_exists> <#if shipmentPackage?has_content> <#assign weight = (shipmentPackage.weight)?default(0.00)> @@ -69,13 +69,13 @@ function setWeight(weight) { <#list carrierPartyDatas as carrierPartyData> - +   - + ${uiLabelMap.ProductConfirmShipmentUps} - + ${uiLabelMap.ProductShipMethod}   @@ -90,7 +90,7 @@ function setWeight(weight) { <#list shipmentMethodTypes as shipmentMethodTypeOption> - +   @@ -105,10 +105,10 @@ function setWeight(weight) {   - + - - + + + <#-- todo embed the applet @@ -165,9 +165,9 @@ function setWeight(weight) { <#else>
    ${uiLabelMap.ProductErrorNoPackagesFoundForShipment} !
    - +
    - ${pages.get("/shipment/ViewShipmentInfo.ftl")} + ${pages.get("/shipment/ViewShipmentInfo.ftl")}
    ${pages.get("/shipment/ViewShipmentItemInfo.ftl")}
    ${pages.get("/shipment/ViewShipmentPackageInfo.ftl")} <#if allDone?default("no") == "yes"> @@ -179,26 +179,26 @@ function setWeight(weight) { - - +
    + + + - + - +
    ${uiLabelMap.ProductOrderNumber}   - -  
      ${uiLabelMap.ProductShipOrder}
    - + \ No newline at end of file diff --git a/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl b/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl index 841e2ce6b9..e91f9736f2 100644 --- a/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl +++ b/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl @@ -77,10 +77,10 @@ under the License. - + <#if shipment?exists> <#if isPurchaseShipment> - + <#assign itemsAvailableToReceive = totalAvailableToReceive?default(0) > 0/> <#if orderItemDatas?exists>
    @@ -94,7 +94,7 @@ under the License. - + <#-- Must use the uiLabelMap[""] notation since the label key has . in it --> @@ -172,24 +172,24 @@ under the License. <#assign totalReadyToReceive = totalReadyToReceive + quantityToReceive/> - - - - <#assign rowCount = rowCount + 1> + <#assign rowCount = rowCount + 1> <#-- toggle the row color --> diff --git a/applications/product/webapp/facility/shipment/ShipmentForms.xml b/applications/product/webapp/facility/shipment/ShipmentForms.xml index d873af03bf..94288cde08 100644 --- a/applications/product/webapp/facility/shipment/ShipmentForms.xml +++ b/applications/product/webapp/facility/shipment/ShipmentForms.xml @@ -18,13 +18,13 @@ specific language governing permissions and limitations under the License. --> -
    - + @@ -34,7 +34,7 @@ under the License. - + @@ -56,7 +56,7 @@ under the License. - + @@ -71,8 +71,8 @@ under the License. - - + + @@ -103,17 +103,17 @@ under the License. - - - - - @@ -121,12 +121,12 @@ under the License. - + - + @@ -191,7 +191,7 @@ under the License. - +
    diff --git a/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl b/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl index 19d6a5944a..3165a0d1ac 100644 --- a/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl +++ b/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl @@ -21,10 +21,10 @@ under the License. <#list shipmentPackageDatas as shipmentPackageData> <#assign shipmentRouteSegment = shipmentPackageData.get("shipmentRouteSegment")> <#assign shipmentPackage = shipmentPackageData.get("shipmentPackage")> - <#assign shipmentItemsDatas = shipmentPackageData.get("shipmentItemsDatas")> + <#assign shipmentItemsDatas = shipmentPackageData.get("shipmentItemsDatas")> ${uiLabelMap.ProductShipmentManifest} #${shipmentId} - + @@ -41,10 +41,10 @@ under the License. <#assign shipmentMethodType = shipmentRouteSegment.getRelatedOne("ShipmentMethodType")?if_exists> - ${uiLabelMap.ProductShipmentMethod}: <#if shipmentMethodType?has_content>${shipmentMethodType.description}<#else>${uiLabelMap.CommonNA} - + ${uiLabelMap.ProductShipmentMethod}: <#if shipmentMethodType?has_content>${shipmentMethodType.description}<#else>${uiLabelMap.CommonNA} + - + @@ -60,9 +60,9 @@ under the License. ${originPostalAddress.city?if_exists}<#if originPostalAddress.stateProvinceGeoId?has_content>, ${originPostalAddress.stateProvinceGeoId} ${originPostalAddress.postalCode?if_exists} ${originPostalAddress.countryGeoId?if_exists} - + - + <#if destinationPostalAddress?has_content> @@ -78,11 +78,11 @@ under the License. - + - + @@ -92,18 +92,18 @@ under the License. ${uiLabelMap.FormFieldTitle_shipmentPackageSeqId}: ${shipmentPackage.shipmentPackageSeqId} - + <#if shipmentPackage.weight?has_content && shipmentPackage.weightUomId?has_content> <#assign weightUom = shipmentPackage.getRelatedOne("WeightUom")> ${uiLabelMap.ProductWeight}: ${shipmentPackage.weight} ${weightUom.get("description",locale)} - + - + - + @@ -123,19 +123,19 @@ under the License. ${uiLabelMap.ProductIssuedQuantity} - + ${uiLabelMap.FormFieldTitle_orderItemSeqId} - + - - - <#list shipmentItemsDatas as shipmentItemsData> - <#assign shipmentItem = shipmentItemsData.get("shipmentItem")> - <#assign shippedQuantity = shipmentItemsData.get("shippedQuantity")> - <#assign packageQuantity = shipmentItemsData.get("packageQuantity")> - <#assign product = shipmentItem.getRelatedOne("Product")> - <#assign itemIssuances = shipmentItem.getRelated("ItemIssuance")> + + + <#list shipmentItemsDatas as shipmentItemsData> + <#assign shipmentItem = shipmentItemsData.get("shipmentItem")> + <#assign shippedQuantity = shipmentItemsData.get("shippedQuantity")> + <#assign packageQuantity = shipmentItemsData.get("packageQuantity")> + <#assign product = shipmentItem.getRelatedOne("Product")> + <#assign itemIssuances = shipmentItem.getRelated("ItemIssuance")> ${product.internalName} [${shipmentItem.productId}] @@ -145,9 +145,9 @@ under the License. ${packageQuantity} - - - <#list itemIssuances as itemIssuance> + + + <#list itemIssuances as itemIssuance> @@ -165,11 +165,11 @@ under the License. ${itemIssuance.orderId}:${itemIssuance.orderItemSeqId} - - - - - + + + + + <#else> ${uiLabelMap.ProductFacilityViewPermissionError} diff --git a/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl b/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl index b520a3a358..320fc83847 100644 --- a/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl +++ b/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl @@ -29,7 +29,7 @@ under the License.
    - + @@ -45,7 +45,7 @@ under the License. - + @@ -122,7 +122,7 @@ under the License.
    ${uiLabelMap.CommonBy} [${shipment.lastModifiedByUserLogin?if_exists}] ${uiLabelMap.CommonOn} ${(shipment.lastModifiedDate.toString())?if_exists}
    -
    ${uiLabelMap.ProductProduct}${uiLabelMap["GoodIdentificationType.description.UPCA"]} ${uiLabelMap.OrderOrder} + + ${uiLabelMap.CommonClear} +
    ${uiLabelMap.ProductShipmentId} ${shipment.shipmentId}
    ${uiLabelMap.ProductShipmentType} ${(shipmentType.get("description",locale))?default(shipment.shipmentTypeId?if_exists)}
    ${uiLabelMap.ProductPrimaryReturnId} <#if shipment.primaryReturnId?exists>${shipment.primaryReturnId}
    ${uiLabelMap.ProductPrimaryShipGroupSeqId} ${shipment.primaryShipGroupSeqId?if_exists}
    + - + \ No newline at end of file diff --git a/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl b/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl index ecd9eb6b87..3e05f7f84a 100644 --- a/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl +++ b/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl @@ -117,7 +117,7 @@ under the License. <#-- toggle the row color --> <#assign alt_row = !alt_row> - + \ No newline at end of file diff --git a/applications/product/widget/catalog/CatalogScreens.xml b/applications/product/widget/catalog/CatalogScreens.xml index 2b2635dc98..2ec70c5eba 100644 --- a/applications/product/widget/catalog/CatalogScreens.xml +++ b/applications/product/widget/catalog/CatalogScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
    @@ -28,7 +28,7 @@ under the License. - + @@ -65,10 +65,10 @@ under the License. - + - + @@ -129,7 +129,7 @@ under the License. - + @@ -186,7 +186,7 @@ under the License. - + @@ -259,7 +259,7 @@ under the License. -
    + diff --git a/applications/product/widget/catalog/CategoryScreens.xml b/applications/product/widget/catalog/CategoryScreens.xml index 00a14fa0fc..f08abb95e5 100644 --- a/applications/product/widget/catalog/CategoryScreens.xml +++ b/applications/product/widget/catalog/CategoryScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
    @@ -43,7 +43,7 @@ under the License. - + @@ -63,7 +63,7 @@ under the License. -
    + @@ -145,7 +145,7 @@ under the License. - + @@ -160,7 +160,7 @@ under the License. - + @@ -199,7 +199,7 @@ under the License. - + @@ -214,7 +214,7 @@ under the License. - + @@ -229,7 +229,7 @@ under the License. - + @@ -457,7 +457,7 @@ under the License.
    - +
    @@ -478,7 +478,7 @@ under the License.
    -
    +
    @@ -502,7 +502,7 @@ under the License.
    - +
    @@ -553,5 +553,5 @@ under the License.
    - +
    \ No newline at end of file diff --git a/applications/product/widget/catalog/CommonScreens.xml b/applications/product/widget/catalog/CommonScreens.xml index 5e7136d534..f141924f06 100644 --- a/applications/product/widget/catalog/CommonScreens.xml +++ b/applications/product/widget/catalog/CommonScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
    @@ -29,7 +29,7 @@ under the License. - + @@ -132,7 +132,7 @@ under the License.
    - + @@ -293,7 +293,7 @@ under the License. - + - <#elseif geoPoint.dataSourceId == "GEOPT_YAHOO"> - <#elseif geoPoint.dataSourceId == "GEOPT_MICROSOFT"> - <#elseif geoPoint.dataSourceId == "GEOPT_MAPTP"> - - + loadGoogleMap("${geoPoint.latitude}", + "${geoPoint.longitude}") + + <#elseif geoPoint.dataSourceId == "GEOPT_YAHOO"> + <#elseif geoPoint.dataSourceId == "GEOPT_MICROSOFT"> + <#elseif geoPoint.dataSourceId == "GEOPT_MAPTP"> + + <#else> -

    ${uiLabelMap.CommonNoGeolocationAvailable}

    +

    ${uiLabelMap.CommonNoGeolocationAvailable}

    diff --git a/framework/common/webcommon/WEB-INF/portal-controller.xml b/framework/common/webcommon/WEB-INF/portal-controller.xml index 2578085a9c..8485e92468 100644 --- a/framework/common/webcommon/WEB-INF/portal-controller.xml +++ b/framework/common/webcommon/WEB-INF/portal-controller.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - Portal ControlServlet Configuration File Copyright 2001-2008 The Apache Software Foundation diff --git a/framework/common/webcommon/WEB-INF/tempexpr-controller.xml b/framework/common/webcommon/WEB-INF/tempexpr-controller.xml index 5544055791..ad273bb249 100644 --- a/framework/common/webcommon/WEB-INF/tempexpr-controller.xml +++ b/framework/common/webcommon/WEB-INF/tempexpr-controller.xml @@ -18,13 +18,13 @@ specific language governing permissions and limitations under the License. --> - Temporal Expression Events Configuration File Copyright 2001-2008 The Apache Software Foundation - + @@ -46,7 +46,7 @@ under the License. - + diff --git a/framework/common/webcommon/error.fo.ftl b/framework/common/webcommon/error.fo.ftl index 36ca9aaa41..7f55c9f3a4 100644 --- a/framework/common/webcommon/error.fo.ftl +++ b/framework/common/webcommon/error.fo.ftl @@ -39,7 +39,7 @@ under the License. - + <#-- Header --> <#-- The elements it it are positioned using a table composed by one row @@ -88,12 +88,12 @@ under the License. - + <#-- Footer --> ${uiLabelMap.CommonPage} ${uiLabelMap.CommonOf} - + <#-- Body --> diff --git a/framework/common/webcommon/includes/footer.ftl b/framework/common/webcommon/includes/footer.ftl index 2aa3998ab9..64b38d9e4f 100644 --- a/framework/common/webcommon/includes/footer.ftl +++ b/framework/common/webcommon/includes/footer.ftl @@ -55,7 +55,7 @@ under the License. <#if visualThemes?has_content> - <#assign orderByList = Static["org.ofbiz.base.util.UtilMisc"].toList("visualThemeId")/> + <#assign orderByList = Static["org.ofbiz.base.util.UtilMisc"].toList("visualThemeId")/> <#list visualThemes as visualTheme> <#assign screenshots = delegator.findByAnd("VisualThemeResource", Static["org.ofbiz.base.util.UtilMisc"].toMap( diff --git a/framework/common/webcommon/includes/lookup.ftl b/framework/common/webcommon/includes/lookup.ftl index 5ea5c141ad..e73170f75a 100644 --- a/framework/common/webcommon/includes/lookup.ftl +++ b/framework/common/webcommon/includes/lookup.ftl @@ -59,9 +59,9 @@ under the License. var num_id = (re_id.exec(String(window.location)) ? new Number(RegExp.$1) : 0); var obj_caller = (window.opener ? window.opener.lookups[num_id] : null); - if (obj_caller == null) + if (obj_caller == null) obj_caller = window.opener; - + var bkColor = "yellow"; function setSourceColor(src){ if(src != null) @@ -86,11 +86,11 @@ under the License. obj_caller.target.value = value; var thisForm = obj_caller.target.form; var evalString = ""; - + if (arguments.length > 2 ) { for(var i=1; i < arguments.length; i=i+2) { evalString = "setSourceColor(thisForm." + arguments[i] + ")"; - eval(evalString); + eval(evalString); evalString = "thisForm." + arguments[i] + ".value='" + arguments[i+1] + "'"; eval(evalString); } diff --git a/framework/common/webcommon/includes/reportTemplate.fo.ftl b/framework/common/webcommon/includes/reportTemplate.fo.ftl index 441d3dcd10..3685fbf6ba 100644 --- a/framework/common/webcommon/includes/reportTemplate.fo.ftl +++ b/framework/common/webcommon/includes/reportTemplate.fo.ftl @@ -45,7 +45,7 @@ under the License. - + <#-- Header --> diff --git a/framework/common/webcommon/includes/simple.fo.ftl b/framework/common/webcommon/includes/simple.fo.ftl index fe54ce103c..af39d632b2 100644 --- a/framework/common/webcommon/includes/simple.fo.ftl +++ b/framework/common/webcommon/includes/simple.fo.ftl @@ -39,7 +39,7 @@ under the License. - + <#-- Header --> <#-- The elements it it are positioned using a table composed by one row @@ -89,12 +89,12 @@ under the License. - + <#-- Footer --> ${uiLabelMap.CommonPage} ${uiLabelMap.CommonOf} - + <#-- Body --> ${sections.render("body")} diff --git a/framework/common/webcommon/includes/simple.ftl b/framework/common/webcommon/includes/simple.ftl index c8027a030a..8ab9fb8445 100644 --- a/framework/common/webcommon/includes/simple.ftl +++ b/framework/common/webcommon/includes/simple.ftl @@ -29,7 +29,7 @@ under the License. ${layoutSettings.companyName?if_exists}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)?if_exists}</#if> <#if layoutSettings.shortcutIcon?has_content> - + <#if layoutSettings.javaScripts?has_content> <#--layoutSettings.javaScripts is a list of java scripts. --> diff --git a/framework/common/webcommon/portal/editPortalPage.ftl b/framework/common/webcommon/portal/editPortalPage.ftl index d87f059aa6..850ee4030b 100644 --- a/framework/common/webcommon/portal/editPortalPage.ftl +++ b/framework/common/webcommon/portal/editPortalPage.ftl @@ -18,7 +18,7 @@ under the License. --> <#if portalPage?has_content>
    - + <#list portalPageColumnList?if_exists as portalPageColumn> <#macro renderFormatHeaderRowFormCellTitleSeparator style isLast><#if style?has_content> - <#if style?has_content> - + <#macro renderFormatItemRowOpen itemIndex altRowStyles evenRowStyle oddRowStyle> <#if itemIndex%2==0><#if evenRowStyle?has_content>class="${evenRowStyle}<#if altRowStyles?has_content> ${altRowStyles}"<#elseif altRowStyles?has_content>class="${altRowStyles}"<#else><#if oddRowStyle?has_content>class="${oddRowStyle}<#if altRowStyles?has_content> ${altRowStyles}"<#elseif altRowStyles?has_content>class="${altRowStyles}" > <#macro renderFormatItemRowClose> <#macro renderFormatItemRowCellOpen style positionSpan> <#if paymentMethodType.paymentMethodTypeId == "EXT_OFFLINE"> + + <#else> <#assign outputted = true> - +

    @@ -62,33 +62,33 @@ under the License. - +
    • Portlet : ${portlet.portletName?if_exists} [${portlet.portalPortletId}]
    • ${portletFields}
         
    • <#if (portlet.editFormName?has_content && portlet.editFormLocation?has_content)>
    • ${portletFields}
         
    • - + <#if !firstInColumn>
    • ${portletFields}
         
    • - + <#if portlet_has_next>
    • ${portletFields}
         
    • - + <#if portalPageColumn_has_next>
    • ${portletFields}
         
    • - + <#if (portalPageColumn_index > 0)>
    • ${portletFields}
         
    • - + <#if !firstInColumn>
    • ${portletFields}
         
    • - + <#if portlet_has_next>
    • ${portletFields}
         
    • - + <#if (portalPages.size() > 1)>

    - +
    ${setRequestAttribute("portalPageId", portalPage.portalPageId)} @@ -111,7 +111,7 @@ under the License. ${setRequestAttribute("portletSeqId", portlet.portletSeqId)} ${screens.render(portlet.screenLocation, portlet.screenName)}
    - +
    diff --git a/framework/common/webcommon/portal/listPortalPortlets.ftl b/framework/common/webcommon/portal/listPortalPortlets.ftl index 02accbcba8..ea7adbee75 100644 --- a/framework/common/webcommon/portal/listPortalPortlets.ftl +++ b/framework/common/webcommon/portal/listPortalPortlets.ftl @@ -31,10 +31,10 @@ margin: 1em;
    <#if portalPortlets?has_content> - <#assign orderByList = Static["org.ofbiz.base.util.UtilMisc"].toList("portalPortletId")/> - + <#assign orderByList = Static["org.ofbiz.base.util.UtilMisc"].toList("portalPortletId")/> + - <#assign leftColumn = true/> + <#assign leftColumn = true/> <#list portalPortlets as portalPortlet> <#if leftColumn==true> @@ -66,7 +66,7 @@ margin: 1em; <#if leftColumn==false> - <#assign leftColumn = !leftColumn/> + <#assign leftColumn = !leftColumn/>
    <#else/> diff --git a/framework/common/webcommon/portal/portalPageHeader.ftl b/framework/common/webcommon/portal/portalPageHeader.ftl index b2ebe4b075..4c0a40610d 100644 --- a/framework/common/webcommon/portal/portalPageHeader.ftl +++ b/framework/common/webcommon/portal/portalPageHeader.ftl @@ -33,11 +33,11 @@ under the License. <#if (currentPortalPage.portalPageId != portalPage.portalPageId)> - + - + <#if configurePortalPage?has_content>
  • ${uiLabelMap.CommonAddAPortlet} diff --git a/framework/common/widget/CommonMenus.xml b/framework/common/widget/CommonMenus.xml index 12653ecc4d..cd9775acd1 100644 --- a/framework/common/widget/CommonMenus.xml +++ b/framework/common/widget/CommonMenus.xml @@ -26,7 +26,7 @@ under the License. - - + + diff --git a/framework/common/widget/CommonScreens.xml b/framework/common/widget/CommonScreens.xml index 2c2d5db3f2..454c19fc6f 100644 --- a/framework/common/widget/CommonScreens.xml +++ b/framework/common/widget/CommonScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -114,7 +114,7 @@ under the License.
    - + @@ -143,7 +143,7 @@ under the License. - +
    @@ -174,7 +174,7 @@ under the License. - + @@ -185,7 +185,7 @@ under the License. - +
    @@ -273,7 +273,7 @@ under the License. - + @@ -490,6 +490,6 @@ under the License.
    - + diff --git a/framework/common/widget/LookupForms.xml b/framework/common/widget/LookupForms.xml index 5da8376300..8f061594da 100644 --- a/framework/common/widget/LookupForms.xml +++ b/framework/common/widget/LookupForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
    @@ -34,7 +34,7 @@ under the License. - +
    diff --git a/framework/common/widget/LookupScreens.xml b/framework/common/widget/LookupScreens.xml index 9a1986311f..7247ab61b0 100644 --- a/framework/common/widget/LookupScreens.xml +++ b/framework/common/widget/LookupScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - diff --git a/framework/common/widget/PortalPageForms.xml b/framework/common/widget/PortalPageForms.xml index 33f06c20d4..64b83d3ddf 100644 --- a/framework/common/widget/PortalPageForms.xml +++ b/framework/common/widget/PortalPageForms.xml @@ -32,7 +32,7 @@ under the License. - + @@ -93,7 +93,7 @@ under the License. - +
    @@ -101,7 +101,7 @@ under the License.
    - +
    diff --git a/framework/common/widget/PortalPageScreens.xml b/framework/common/widget/PortalPageScreens.xml index ebb7142a88..0a522d02ac 100644 --- a/framework/common/widget/PortalPageScreens.xml +++ b/framework/common/widget/PortalPageScreens.xml @@ -72,11 +72,11 @@ under the License. - + - + diff --git a/framework/common/widget/PortletEditForms.xml b/framework/common/widget/PortletEditForms.xml index 9bd1472cdf..aa0fac9f14 100644 --- a/framework/common/widget/PortletEditForms.xml +++ b/framework/common/widget/PortletEditForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -27,7 +27,7 @@ under the License. - + diff --git a/framework/component-load.xml b/framework/component-load.xml index d949d042dc..5328768b18 100644 --- a/framework/component-load.xml +++ b/framework/component-load.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - diff --git a/framework/datafile/ofbiz-component.xml b/framework/datafile/ofbiz-component.xml index d2b825c822..60ed792ac6 100644 --- a/framework/datafile/ofbiz-component.xml +++ b/framework/datafile/ofbiz-component.xml @@ -19,7 +19,7 @@ under the License. --> diff --git a/framework/entity/config/entityengine.xml b/framework/entity/config/entityengine.xml index bf5691a821..51c6c136c8 100644 --- a/framework/entity/config/entityengine.xml +++ b/framework/entity/config/entityengine.xml @@ -60,11 +60,11 @@ access. For a detailed description see the core/docs/entityconfig.html file. - + - + @@ -91,7 +91,7 @@ access. For a detailed description see the core/docs/entityconfig.html file. - + @@ -214,7 +214,7 @@ access. For a detailed description see the core/docs/entityconfig.html file. pool-maxsize="250"/> - + - @@ -361,7 +361,7 @@ access. For a detailed description see the core/docs/entityconfig.html file. - --> - + --> - - - - - - + + + + + + diff --git a/framework/entity/dtd/entity-eca.xsd b/framework/entity/dtd/entity-eca.xsd index 1d56200738..43db8d29c7 100644 --- a/framework/entity/dtd/entity-eca.xsd +++ b/framework/entity/dtd/entity-eca.xsd @@ -35,7 +35,7 @@ under the License. - + @@ -174,7 +174,7 @@ under the License. - + diff --git a/framework/entity/dtd/entitygroup.xsd b/framework/entity/dtd/entitygroup.xsd index 4f24148590..f22c9b059b 100644 --- a/framework/entity/dtd/entitygroup.xsd +++ b/framework/entity/dtd/entitygroup.xsd @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - diff --git a/framework/entity/dtd/entitymodel.xsd b/framework/entity/dtd/entitymodel.xsd index 05f71a3087..0f4318c1e5 100644 --- a/framework/entity/dtd/entitymodel.xsd +++ b/framework/entity/dtd/entitymodel.xsd @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - @@ -136,7 +136,7 @@ under the License. - If this is set to true then whenever the value for this field on a record changes the Entity Engine will record the change in the EntityAuditLog entity. + If this is set to true then whenever the value for this field on a record changes the Entity Engine will record the change in the EntityAuditLog entity. Defaults to false. @@ -153,7 +153,7 @@ under the License. This makes the field NOT NULL on the database (like primary key fields). It's possible to use an id-ne similiar field type. But rows can be added from outside of ofbiz (e.g. database manager, third party programm, etc). - This patch uses the ability of a database to set not null constraints. + This patch uses the ability of a database to set not null constraints. Defaults to false. @@ -373,15 +373,15 @@ under the License. - In every SELECT statement, the fields that are normally used are really defined to be expressions. + In every SELECT statement, the fields that are normally used are really defined to be expressions. This means for example that you can supply an expression like (discountPercent * 100) in place of just a field name. The complex-alias tag is the Ofbiz way to do this. - + The argument to the right of operator = can be any operator valid for that data type on the database system you are using. - For example, *, +, -, and / are commonly available mathematical operators (min, max, sum, avg, count, count-distinct, upper, lower) + For example, *, +, -, and / are commonly available mathematical operators (min, max, sum, avg, count, count-distinct, upper, lower) You can also use any operator on any data type supported on the underlying database system including string and date operators. complex-alias can be as complex as you need by adding nested complex-alias statements and complex-alias-field - can use the same functions (min, max, count, count-distinct, sum, avg, upper, and lower) as the alias tag. + can use the same functions (min, max, count, count-distinct, sum, avg, upper, and lower) as the alias tag. diff --git a/framework/entity/entitydef/entitymodel.xml b/framework/entity/entitydef/entitymodel.xml index a36cd0f6a5..584699cf4b 100644 --- a/framework/entity/entitydef/entitymodel.xml +++ b/framework/entity/entitydef/entitymodel.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - diff --git a/framework/entity/entitydef/entitymodel_test.xml b/framework/entity/entitydef/entitymodel_test.xml index d20d9f98a8..2ca86a6905 100644 --- a/framework/entity/entitydef/entitymodel_test.xml +++ b/framework/entity/entitydef/entitymodel_test.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -32,20 +32,20 @@ under the License. - - - + @@ -81,9 +81,9 @@ under the License. - - - @@ -121,7 +121,7 @@ under the License. - - - + - + @@ -46,7 +46,7 @@ under the License. - + diff --git a/framework/entity/fieldtype/fieldtypeaxion.xml b/framework/entity/fieldtype/fieldtypeaxion.xml index d8bc0e3cbb..f5ac2c9174 100644 --- a/framework/entity/fieldtype/fieldtypeaxion.xml +++ b/framework/entity/fieldtype/fieldtypeaxion.xml @@ -18,37 +18,37 @@ specific language governing permissions and limitations under the License. --> - - + - + - + - + - + - + diff --git a/framework/entity/fieldtype/fieldtypecloudscape.xml b/framework/entity/fieldtype/fieldtypecloudscape.xml index ecaee7056b..41b89155e8 100644 --- a/framework/entity/fieldtype/fieldtypecloudscape.xml +++ b/framework/entity/fieldtype/fieldtypecloudscape.xml @@ -18,16 +18,16 @@ specific language governing permissions and limitations under the License. --> - - + - + - + @@ -43,7 +43,7 @@ under the License. - + diff --git a/framework/entity/fieldtype/fieldtypedaffodil.xml b/framework/entity/fieldtype/fieldtypedaffodil.xml index 331615868e..fc0b36ecd5 100644 --- a/framework/entity/fieldtype/fieldtypedaffodil.xml +++ b/framework/entity/fieldtype/fieldtypedaffodil.xml @@ -18,16 +18,16 @@ specific language governing permissions and limitations under the License. --> - - + - + - + @@ -43,7 +43,7 @@ under the License. - + diff --git a/framework/entity/fieldtype/fieldtypederby.xml b/framework/entity/fieldtype/fieldtypederby.xml index e4998f3962..1ac3f05e13 100644 --- a/framework/entity/fieldtype/fieldtypederby.xml +++ b/framework/entity/fieldtype/fieldtypederby.xml @@ -18,37 +18,37 @@ specific language governing permissions and limitations under the License. --> - - + - + - + - + - + - + diff --git a/framework/entity/fieldtype/fieldtypefirebird.xml b/framework/entity/fieldtype/fieldtypefirebird.xml index 0843ba2475..535af042c8 100644 --- a/framework/entity/fieldtype/fieldtypefirebird.xml +++ b/framework/entity/fieldtype/fieldtypefirebird.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -43,7 +43,7 @@ under the License. - + diff --git a/framework/entity/fieldtype/fieldtypehsql.xml b/framework/entity/fieldtype/fieldtypehsql.xml index 13c3da256e..c2c297cc1f 100644 --- a/framework/entity/fieldtype/fieldtypehsql.xml +++ b/framework/entity/fieldtype/fieldtypehsql.xml @@ -18,37 +18,37 @@ specific language governing permissions and limitations under the License. --> - - + - + - + - + - + - + - + diff --git a/framework/entity/fieldtype/fieldtypemssql.xml b/framework/entity/fieldtype/fieldtypemssql.xml index 7e62d9e661..615fcd6d16 100644 --- a/framework/entity/fieldtype/fieldtypemssql.xml +++ b/framework/entity/fieldtype/fieldtypemssql.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - diff --git a/framework/entity/fieldtype/fieldtypemysql.xml b/framework/entity/fieldtype/fieldtypemysql.xml index 8f1b2260cd..34334c6d7b 100644 --- a/framework/entity/fieldtype/fieldtypemysql.xml +++ b/framework/entity/fieldtype/fieldtypemysql.xml @@ -18,37 +18,37 @@ specific language governing permissions and limitations under the License. --> - - + - + - + - + - + - + - + diff --git a/framework/entity/fieldtype/fieldtypeoracle.xml b/framework/entity/fieldtype/fieldtypeoracle.xml index 14e7e043fa..d7c61e8e91 100644 --- a/framework/entity/fieldtype/fieldtypeoracle.xml +++ b/framework/entity/fieldtype/fieldtypeoracle.xml @@ -18,16 +18,16 @@ specific language governing permissions and limitations under the License. --> - - + - + - + @@ -37,14 +37,14 @@ under the License. - + - - + - + - + - + - + - + diff --git a/framework/entity/fieldtype/fieldtypepostnew.xml b/framework/entity/fieldtype/fieldtypepostnew.xml index b937d95393..457f6d6252 100644 --- a/framework/entity/fieldtype/fieldtypepostnew.xml +++ b/framework/entity/fieldtype/fieldtypepostnew.xml @@ -27,12 +27,12 @@ under the License. This fieldtype file uses TEXT for ALL VARCHAR type fields, per a tip in the PostgreSQL manual: - Tip: There are no performance differences between these three - types, apart from the increased storage size when using the - blank-padded type. While character(n) has performance advantages - in some other database systems, it has no such advantages in - PostgreSQL. In most situations text or character varying - should be used instead. + Tip: There are no performance differences between these three + types, apart from the increased storage size when using the + blank-padded type. While character(n) has performance advantages + in some other database systems, it has no such advantages in + PostgreSQL. In most situations text or character varying + should be used instead. (Section 8.3. Character Types from the PostgreSQL 8.1 manual) @@ -43,43 +43,43 @@ under the License. the data). This has the other advantage that the java type matches the sql type or at - least the DB can store anything that java can store (TEXT in PostgreSQL + least the DB can store anything that java can store (TEXT in PostgreSQL can go to 2 Gig) Indicator is still a CHAR(1). --> - - + - + - + - + - + - + diff --git a/framework/entity/fieldtype/fieldtypesapdb.xml b/framework/entity/fieldtype/fieldtypesapdb.xml index 595cc2a72d..3af69d21c1 100644 --- a/framework/entity/fieldtype/fieldtypesapdb.xml +++ b/framework/entity/fieldtype/fieldtypesapdb.xml @@ -18,16 +18,16 @@ specific language governing permissions and limitations under the License. --> - - + - + @@ -37,18 +37,18 @@ under the License. - + - + - + diff --git a/framework/entity/fieldtype/fieldtypesybase.xml b/framework/entity/fieldtype/fieldtypesybase.xml index 8a8e319c6c..cf939cbfd7 100644 --- a/framework/entity/fieldtype/fieldtypesybase.xml +++ b/framework/entity/fieldtype/fieldtypesybase.xml @@ -18,15 +18,15 @@ specific language governing permissions and limitations under the License. --> - - - - + + + - - - + + + @@ -34,26 +34,26 @@ under the License. - - - + + + - - - - - + + + + + - - + + - + - + - + diff --git a/framework/entity/ofbiz-component.xml b/framework/entity/ofbiz-component.xml index 7c2dbc54b1..ee14a2e6da 100644 --- a/framework/entity/ofbiz-component.xml +++ b/framework/entity/ofbiz-component.xml @@ -19,7 +19,7 @@ under the License. --> @@ -31,6 +31,6 @@ under the License. - + diff --git a/framework/entity/src/META-INF/services/org.ofbiz.base.util.CachedClassLoader$Init b/framework/entity/src/META-INF/services/org.ofbiz.base.util.CachedClassLoader$Init index ee09893526..30405c4c63 100644 --- a/framework/entity/src/META-INF/services/org.ofbiz.base.util.CachedClassLoader$Init +++ b/framework/entity/src/META-INF/services/org.ofbiz.base.util.CachedClassLoader$Init @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/framework/entity/src/org/ofbiz/entity/GenericValue.java b/framework/entity/src/org/ofbiz/entity/GenericValue.java index be50d1b1dc..bafdca21df 100644 --- a/framework/entity/src/org/ofbiz/entity/GenericValue.java +++ b/framework/entity/src/org/ofbiz/entity/GenericValue.java @@ -441,7 +441,7 @@ public class GenericValue extends GenericEntity implements Reusable { while (relItr.hasNext()) { ModelRelation relation = relItr.next(); if ("one".equalsIgnoreCase(relation.getType())) { - // see if the related value exists + // see if the related value exists Map fields = FastMap.newInstance(); for (int i = 0; i < relation.getKeyMapsSize(); i++) { ModelKeyMap keyMap = relation.getKeyMap(i); diff --git a/framework/entity/src/org/ofbiz/entity/GenericValueHtmlWrapper.java b/framework/entity/src/org/ofbiz/entity/GenericValueHtmlWrapper.java index 6e39ef3c67..3712caa57f 100644 --- a/framework/entity/src/org/ofbiz/entity/GenericValueHtmlWrapper.java +++ b/framework/entity/src/org/ofbiz/entity/GenericValueHtmlWrapper.java @@ -58,7 +58,7 @@ public class GenericValueHtmlWrapper extends GenericValue { } /* NOTE: this is NOT used because there are certain FTL files that call services and things, and this messes those up, so only overriding the Map.get(Object) method to get use of this as a Map - * Override the basic get method, which all other get methods call so we only need to do this one (though most important for the Map.get(Object) and the getString() methods + * Override the basic get method, which all other get methods call so we only need to do this one (though most important for the Map.get(Object) and the getString() methods public Object get(String name) { Object value = super.get(name); if (value instanceof String) { diff --git a/framework/entity/src/org/ofbiz/entity/connection/XaPoolConnectionFactory.java b/framework/entity/src/org/ofbiz/entity/connection/XaPoolConnectionFactory.java index 2aeab899da..5fe49ccbe6 100644 --- a/framework/entity/src/org/ofbiz/entity/connection/XaPoolConnectionFactory.java +++ b/framework/entity/src/org/ofbiz/entity/connection/XaPoolConnectionFactory.java @@ -108,7 +108,7 @@ public class XaPoolConnectionFactory { // set the transaction manager in the pool pds.setTransactionManager(TransactionFactory.getTransactionManager()); - // configure the pool settings + // configure the pool settings try { pds.setMaxSize(Integer.parseInt(jotmJdbcElement.getAttribute("pool-maxsize"))); pds.setMinSize(Integer.parseInt(jotmJdbcElement.getAttribute("pool-minsize"))); diff --git a/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java b/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java index 4304a1e10c..17103893c1 100644 --- a/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java +++ b/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java @@ -658,7 +658,7 @@ public class SqlJdbcUtil { } private static Object deserializeField(byte[] fieldBytes, int ind, ModelField curField) throws GenericDataSourceException { - // NOTE DEJ20071022: the following code is to convert the byte[] back into an object; if that fails + // NOTE DEJ20071022: the following code is to convert the byte[] back into an object; if that fails //just return the byte[]; this was for the ByteWrapper thing which is now deprecated, so this may //be removed in the near future to enhance performance InputStream binaryInput = null; diff --git a/framework/entity/testdef/entitytests.xml b/framework/entity/testdef/entitytests.xml index 1ecc4307d7..09721a38a5 100644 --- a/framework/entity/testdef/entitytests.xml +++ b/framework/entity/testdef/entitytests.xml @@ -19,7 +19,7 @@ under the License. --> diff --git a/framework/entityext/entitydef/entitymodel.xml b/framework/entityext/entitydef/entitymodel.xml index b3bc42ece3..897e2adec7 100644 --- a/framework/entityext/entitydef/entitymodel.xml +++ b/framework/entityext/entitydef/entitymodel.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - diff --git a/framework/entityext/ofbiz-component.xml b/framework/entityext/ofbiz-component.xml index 9f2199dffe..44e6564be2 100644 --- a/framework/entityext/ofbiz-component.xml +++ b/framework/entityext/ofbiz-component.xml @@ -19,7 +19,7 @@ under the License. --> diff --git a/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml b/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml index ff4bc3f5fb..3d0bbfe411 100644 --- a/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml +++ b/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -47,7 +47,7 @@ under the License. - + @@ -66,7 +66,7 @@ under the License. - + diff --git a/framework/entityext/servicedef/groups.xml b/framework/entityext/servicedef/groups.xml index 2e1a53f7b6..7eb4726002 100644 --- a/framework/entityext/servicedef/groups.xml +++ b/framework/entityext/servicedef/groups.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - diff --git a/framework/entityext/servicedef/secas.xml b/framework/entityext/servicedef/secas.xml index f97df34e9d..9f8ca5e5d9 100644 --- a/framework/entityext/servicedef/secas.xml +++ b/framework/entityext/servicedef/secas.xml @@ -18,11 +18,11 @@ specific language governing permissions and limitations under the License. --> - - + diff --git a/framework/entityext/servicedef/services.xml b/framework/entityext/servicedef/services.xml index 3c36333a99..2fed7ea05d 100644 --- a/framework/entityext/servicedef/services.xml +++ b/framework/entityext/servicedef/services.xml @@ -18,12 +18,12 @@ specific language governing permissions and limitations under the License. --> - Entity Extension Services OFBiz 1.0 - + @@ -152,7 +152,7 @@ under the License. - + @@ -229,7 +229,7 @@ under the License. - + diff --git a/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java b/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java index 8ebfe6d3ef..e299cb63d8 100644 --- a/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java +++ b/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java @@ -210,7 +210,7 @@ public class EntitySyncContext { /** * To see if it is running check: - * - in the running status + * - in the running status * - AND when the entitySync was last updated, and if it was more than maxRunningNoUpdateMillis ago, then don't consider it to be running * @return boolean representing if the EntitySync should be considered running */ diff --git a/framework/example/config/config.txt b/framework/example/config/config.txt index a83f40d0ee..115f4aca71 100644 --- a/framework/example/config/config.txt +++ b/framework/example/config/config.txt @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/framework/example/data/ExamplePortalSeedData.xml b/framework/example/data/ExamplePortalSeedData.xml index 2253609e73..308e43103a 100644 --- a/framework/example/data/ExamplePortalSeedData.xml +++ b/framework/example/data/ExamplePortalSeedData.xml @@ -23,7 +23,7 @@ under the License. - + diff --git a/framework/example/data/ExamplePortletData.xml b/framework/example/data/ExamplePortletData.xml index e92e669c79..f11b715a80 100644 --- a/framework/example/data/ExamplePortletData.xml +++ b/framework/example/data/ExamplePortletData.xml @@ -22,7 +22,7 @@ under the License. screenName="ExamplePortlet1" screenLocation="component://example/widget/example/PortletScreens.xml" editFormName="ExamplePortlet1Edit" editFormLocation="component://example/widget/example/PortletEditForms.xml" screenshot="/images/ofbiz_logo.jpg"/> - + @@ -30,7 +30,7 @@ under the License. - + diff --git a/framework/example/data/ExampleTypeData.xml b/framework/example/data/ExampleTypeData.xml index e83350830a..9357bcdedb 100644 --- a/framework/example/data/ExampleTypeData.xml +++ b/framework/example/data/ExampleTypeData.xml @@ -22,11 +22,11 @@ under the License. - + - + @@ -45,7 +45,7 @@ under the License. - + diff --git a/framework/example/dtd/dtd.txt b/framework/example/dtd/dtd.txt index d9c3d7abba..de6b448ddb 100644 --- a/framework/example/dtd/dtd.txt +++ b/framework/example/dtd/dtd.txt @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -17,5 +17,5 @@ # under the License. ##################################################################### -Place all DTDs / schemas which need to be included on the classpath here. +Place all DTDs / schemas which need to be included on the classpath here. All files located in this directory will be placed in the root of the built jar. diff --git a/framework/example/entitydef/entitydef.txt b/framework/example/entitydef/entitydef.txt index e62564696b..70a1482349 100644 --- a/framework/example/entitydef/entitydef.txt +++ b/framework/example/entitydef/entitydef.txt @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -17,7 +17,7 @@ # under the License. ##################################################################### -Entity model, Entity ECA, and Entity group definitions. +Entity model, Entity ECA, and Entity group definitions. Usually in the format of: entitymodel.xml diff --git a/framework/example/entitydef/entitymodel.xml b/framework/example/entitydef/entitymodel.xml index b5f9a7f666..6e6e02eeff 100644 --- a/framework/example/entitydef/entitymodel.xml +++ b/framework/example/entitydef/entitymodel.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -28,18 +28,18 @@ under the License. Copyright 2001-2008 The Apache Software Foundation None 1.0 - + - + - + - @@ -126,7 +126,7 @@ under the License. - + diff --git a/framework/example/lib/lib.txt b/framework/example/lib/lib.txt index a8f1c9715d..570b39f39c 100644 --- a/framework/example/lib/lib.txt +++ b/framework/example/lib/lib.txt @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/framework/example/ofbiz-component.xml b/framework/example/ofbiz-component.xml index bcbf6ca46f..d913a231f0 100644 --- a/framework/example/ofbiz-component.xml +++ b/framework/example/ofbiz-component.xml @@ -38,7 +38,7 @@ under the License. - + - - + @@ -39,9 +39,9 @@ under the License. - - - + + + @@ -57,7 +57,7 @@ under the License. - + diff --git a/framework/example/script/script.txt b/framework/example/script/script.txt index bda50d6fe5..b364991677 100644 --- a/framework/example/script/script.txt +++ b/framework/example/script/script.txt @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/framework/example/servicedef/servicedef.txt b/framework/example/servicedef/servicedef.txt index a8d04549d3..bcb5846c44 100644 --- a/framework/example/servicedef/servicedef.txt +++ b/framework/example/servicedef/servicedef.txt @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/framework/example/servicedef/services.xml b/framework/example/servicedef/services.xml index 960ce0a54a..b9be4eab48 100644 --- a/framework/example/servicedef/services.xml +++ b/framework/example/servicedef/services.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - Example Services OFBiz @@ -55,7 +55,7 @@ under the License. - + Create a ExampleItem @@ -115,7 +115,7 @@ under the License. - + diff --git a/framework/example/src/src.txt b/framework/example/src/src.txt index a5a5f5e4d7..b8f9e6ccae 100644 --- a/framework/example/src/src.txt +++ b/framework/example/src/src.txt @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -17,4 +17,4 @@ # under the License. ##################################################################### -All source code related to the component. \ No newline at end of file +All source code related to the component. \ No newline at end of file diff --git a/framework/example/webapp/appheader.ftl b/framework/example/webapp/appheader.ftl index 1227786709..c2900cbed2 100644 --- a/framework/example/webapp/appheader.ftl +++ b/framework/example/webapp/appheader.ftl @@ -23,11 +23,11 @@ under the License.
  • ${uiLabelMap.ExampleApplication}

      - <#if userLogin?has_content> + <#if userLogin?has_content>
    • class="selected">${uiLabelMap.ExampleExample}
    • class="selected">${uiLabelMap.ExampleFeature}
    • class="selected">${uiLabelMap.ExampleFormWidgetExamples}
    • -
    • class="selected">${uiLabelMap.ExampleAjaxExamples}
    • +
    • class="selected">${uiLabelMap.ExampleAjaxExamples}
    • <#if portalPages?has_content> <#list portalPages as page> <#if page.portalPageName?has_content> diff --git a/framework/example/webapp/example/WEB-INF/actions/includes/FindExampleFeatures.groovy b/framework/example/webapp/example/WEB-INF/actions/includes/FindExampleFeatures.groovy index 98b96e17ec..25890b0f27 100644 --- a/framework/example/webapp/example/WEB-INF/actions/includes/FindExampleFeatures.groovy +++ b/framework/example/webapp/example/WEB-INF/actions/includes/FindExampleFeatures.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/framework/example/webapp/example/WEB-INF/controller.xml b/framework/example/webapp/example/WEB-INF/controller.xml index 3f65d5953d..4feacc2645 100644 --- a/framework/example/webapp/example/WEB-INF/controller.xml +++ b/framework/example/webapp/example/WEB-INF/controller.xml @@ -18,14 +18,14 @@ specific language governing permissions and limitations under the License. --> - - - - + + + Example Component Site Configuration File Copyright 2001-2008 The Apache Software Foundation @@ -85,7 +85,7 @@ under the License. - + @@ -157,7 +157,7 @@ under the License. - + @@ -197,7 +197,7 @@ under the License. - + @@ -214,7 +214,7 @@ under the License. - + diff --git a/framework/example/webapp/example/WEB-INF/web.xml b/framework/example/webapp/example/WEB-INF/web.xml index d2b1d2f3a4..a903cdf798 100644 --- a/framework/example/webapp/example/WEB-INF/web.xml +++ b/framework/example/webapp/example/WEB-INF/web.xml @@ -22,7 +22,7 @@ under the License. Open For Business - Example Component Example Component of the Open For Business Project - + webSiteId EXAMPLE @@ -31,7 +31,7 @@ under the License. localDispatcherNameexample A unique name used to identify/recognize the local dispatcher for the Service Engine - + entityDelegatorNamedefault The Name of the Entity Delegator to use, defined in entityengine.xml @@ -51,7 +51,7 @@ under the License. false Remove unnecessary whitespace from HTML output. - + ContextFilter ContextFilter @@ -62,15 +62,15 @@ under the License. /control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css errorCode403 - redirectPath/control/main + redirectPath/control/main - ContextFilter/* + ContextFilter/* org.ofbiz.webapp.control.ControlEventListener org.ofbiz.webapp.control.LoginEventListener - + ControlServlet ControlServlet diff --git a/framework/example/webapp/example/error/error.jsp b/framework/example/webapp/example/error/error.jsp index bab526dbe3..dcfa3b066b 100644 --- a/framework/example/webapp/example/error/error.jsp +++ b/framework/example/webapp/example/error/error.jsp @@ -32,12 +32,12 @@ under the License.
  • - - + - + diff --git a/framework/example/webapp/example/reports/fonts.fo.ftl b/framework/example/webapp/example/reports/fonts.fo.ftl index 0c690a05f5..9e2c06f9a6 100644 --- a/framework/example/webapp/example/reports/fonts.fo.ftl +++ b/framework/example/webapp/example/reports/fonts.fo.ftl @@ -36,7 +36,7 @@ under the License. the quick brown fox jumps over the lazy dog 1234657890the quick brown fox jumps over the lazy dog 1234657890the quick brown fox jumps over the lazy dog 1234657890 - Times + Timesthe quick brown fox jumps over the lazy dog 1234657890the quick brown fox jumps over the lazy dog 1234657890the quick brown fox jumps over the lazy dog 1234657890 diff --git a/framework/example/webapp/webapp.txt b/framework/example/webapp/webapp.txt index a21eb149d9..d4a77a91ec 100644 --- a/framework/example/webapp/webapp.txt +++ b/framework/example/webapp/webapp.txt @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/framework/example/widget/example/CommonScreens.xml b/framework/example/widget/example/CommonScreens.xml index 777a28d139..7675cf5dc2 100644 --- a/framework/example/widget/example/CommonScreens.xml +++ b/framework/example/widget/example/CommonScreens.xml @@ -18,22 +18,22 @@ specific language governing permissions and limitations under the License. --> -
    - + - + - + @@ -115,7 +115,7 @@ under the License. -
    + @@ -172,7 +172,7 @@ under the License. - + diff --git a/framework/example/widget/example/ExampleFeatureForms.xml b/framework/example/widget/example/ExampleFeatureForms.xml index 7979ab72fc..23d8aa04ab 100644 --- a/framework/example/widget/example/ExampleFeatureForms.xml +++ b/framework/example/widget/example/ExampleFeatureForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -136,7 +136,7 @@ under the License. - + @@ -153,7 +153,7 @@ under the License. - + diff --git a/framework/example/widget/example/ExampleFeatureScreens.xml b/framework/example/widget/example/ExampleFeatureScreens.xml index 788859fa17..b0033ec396 100644 --- a/framework/example/widget/example/ExampleFeatureScreens.xml +++ b/framework/example/widget/example/ExampleFeatureScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -58,7 +58,7 @@ under the License.
    - +
    @@ -102,7 +102,7 @@ under the License. - + diff --git a/framework/example/widget/example/ExampleForms.xml b/framework/example/widget/example/ExampleForms.xml index baaaa989aa..b8a836358d 100644 --- a/framework/example/widget/example/ExampleForms.xml +++ b/framework/example/widget/example/ExampleForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
    @@ -66,7 +66,7 @@ under the License.
    @@ -205,7 +205,7 @@ under the License. - +
    @@ -244,7 +244,7 @@ under the License. - + @@ -268,7 +268,7 @@ under the License. --> - + diff --git a/framework/example/widget/example/ExampleMenus.xml b/framework/example/widget/example/ExampleMenus.xml index 9d35c7bcf5..f2be8906e8 100644 --- a/framework/example/widget/example/ExampleMenus.xml +++ b/framework/example/widget/example/ExampleMenus.xml @@ -18,8 +18,8 @@ specific language governing permissions and limitations under the License. --> - + diff --git a/framework/example/widget/example/ExampleScreens.xml b/framework/example/widget/example/ExampleScreens.xml index 7bd3e23c8e..129b656c35 100644 --- a/framework/example/widget/example/ExampleScreens.xml +++ b/framework/example/widget/example/ExampleScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -58,7 +58,7 @@ under the License.
    - +
    @@ -148,5 +148,5 @@ under the License.
    - +
    diff --git a/framework/example/widget/example/FormWidgetExampleForms.xml b/framework/example/widget/example/FormWidgetExampleForms.xml index 81a588d0d8..a4c8cbe177 100644 --- a/framework/example/widget/example/FormWidgetExampleForms.xml +++ b/framework/example/widget/example/FormWidgetExampleForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -223,12 +223,12 @@ under the License. - +
    - +
    diff --git a/framework/example/widget/example/FormWidgetExampleScreens.xml b/framework/example/widget/example/FormWidgetExampleScreens.xml index da3f442f6c..4c9c702992 100644 --- a/framework/example/widget/example/FormWidgetExampleScreens.xml +++ b/framework/example/widget/example/FormWidgetExampleScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - diff --git a/framework/example/widget/example/PortletEditForms.xml b/framework/example/widget/example/PortletEditForms.xml index a590f74225..bce2f03628 100644 --- a/framework/example/widget/example/PortletEditForms.xml +++ b/framework/example/widget/example/PortletEditForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - diff --git a/framework/example/widget/example/PortletScreens.xml b/framework/example/widget/example/PortletScreens.xml index c418ab410c..7cecb77849 100644 --- a/framework/example/widget/example/PortletScreens.xml +++ b/framework/example/widget/example/PortletScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - diff --git a/framework/exampleext/ofbiz-component.xml b/framework/exampleext/ofbiz-component.xml index 70fbc016ec..ccb14841ac 100644 --- a/framework/exampleext/ofbiz-component.xml +++ b/framework/exampleext/ofbiz-component.xml @@ -19,7 +19,7 @@ under the License. --> diff --git a/framework/exampleext/webapp/exampleext/WEB-INF/controller.xml b/framework/exampleext/webapp/exampleext/WEB-INF/controller.xml index 09b4f0a69a..8f3afb908c 100644 --- a/framework/exampleext/webapp/exampleext/WEB-INF/controller.xml +++ b/framework/exampleext/webapp/exampleext/WEB-INF/controller.xml @@ -18,9 +18,9 @@ specific language governing permissions and limitations under the License. --> - - + Extended Catalog Manager Controller Configuration File diff --git a/framework/exampleext/webapp/exampleext/WEB-INF/web.xml b/framework/exampleext/webapp/exampleext/WEB-INF/web.xml index 21519f3880..eb5ef9920f 100644 --- a/framework/exampleext/webapp/exampleext/WEB-INF/web.xml +++ b/framework/exampleext/webapp/exampleext/WEB-INF/web.xml @@ -22,7 +22,7 @@ under the License. Open For Business - Extended Example Component Extended Example Component of the Open For Business Project - + webSiteId EXAMPLEEXT @@ -31,7 +31,7 @@ under the License. localDispatcherNameexampleext A unique name used to identify/recognize the local dispatcher for the Service Engine - + entityDelegatorNamedefault The Name of the Entity Delegator to use, defined in entityengine.xml @@ -41,7 +41,7 @@ under the License. component://exampleext/widget/example/CommonScreens.xml The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files. - + ContextFilter ContextFilter @@ -52,15 +52,15 @@ under the License. /control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css errorCode403 - redirectPath/control/main + redirectPath/control/main - ContextFilter/* - + ContextFilter/* + org.ofbiz.webapp.control.ControlEventListener org.ofbiz.webapp.control.LoginEventListener - + ControlServlet ControlServlet @@ -69,9 +69,9 @@ under the License. 1 ControlServlet/control/* - + 60 - + index.jsp index.html diff --git a/framework/exampleext/widget/example/CommonScreens.xml b/framework/exampleext/widget/example/CommonScreens.xml index f9d541acbb..0d2f2e2116 100644 --- a/framework/exampleext/widget/example/CommonScreens.xml +++ b/framework/exampleext/widget/example/CommonScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -31,7 +31,7 @@ under the License. - +
    @@ -75,7 +75,7 @@ under the License. -
    + diff --git a/framework/exampleext/widget/example/ExampleScreens.xml b/framework/exampleext/widget/example/ExampleScreens.xml index ef51881275..2b130d3f3a 100644 --- a/framework/exampleext/widget/example/ExampleScreens.xml +++ b/framework/exampleext/widget/example/ExampleScreens.xml @@ -18,9 +18,9 @@ specific language governing permissions and limitations under the License. --> - - +
    diff --git a/framework/geronimo/ofbiz-component.xml b/framework/geronimo/ofbiz-component.xml index a5b8c55daf..042095f667 100644 --- a/framework/geronimo/ofbiz-component.xml +++ b/framework/geronimo/ofbiz-component.xml @@ -19,7 +19,7 @@ under the License. --> diff --git a/framework/guiapp/config/xui.properties b/framework/guiapp/config/xui.properties index b35e873331..88c19fc487 100644 --- a/framework/guiapp/config/xui.properties +++ b/framework/guiapp/config/xui.properties @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/framework/guiapp/ofbiz-component.xml b/framework/guiapp/ofbiz-component.xml index 6276a76f2e..aafcb6028d 100644 --- a/framework/guiapp/ofbiz-component.xml +++ b/framework/guiapp/ofbiz-component.xml @@ -19,10 +19,10 @@ under the License. --> - + diff --git a/framework/images/ofbiz-component.xml b/framework/images/ofbiz-component.xml index fd8b9359a9..b4197bd086 100644 --- a/framework/images/ofbiz-component.xml +++ b/framework/images/ofbiz-component.xml @@ -19,7 +19,7 @@ under the License. --> ' + text1 + ''; } - if (info2) { + if (info2) { html = html + '' + text2 + ''; } html = html + '.'; } else { html = html + 'No specific information.'; } - marker.openInfoWindowHtml(html); + marker.openInfoWindowHtml(html); } } \ No newline at end of file diff --git a/framework/images/webapp/images/GooglemapSimple.js b/framework/images/webapp/images/GooglemapSimple.js index 8c574776ee..708874f8dd 100644 --- a/framework/images/webapp/images/GooglemapSimple.js +++ b/framework/images/webapp/images/GooglemapSimple.js @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -24,7 +24,7 @@ function loadGoogleMap(lat,lgt, link1, text1, link2, text2) { lat = lat.replace(",","."); // For decimals separator, in French for instance, please add more if needed lgt = lgt.replace(",","."); // For decimals separator, in French for instance, please add more if needed map = new GMap2(document.getElementById("map")); - map.setCenter(new GLatLng(lat, lgt), 13); + map.setCenter(new GLatLng(lat, lgt), 13); marker = new GMarker(new GLatLng(lat, lgt)); map.addControl(new GSmallMapControl()); map.addOverlay(marker); diff --git a/framework/images/webapp/images/WEB-INF/web.xml b/framework/images/webapp/images/WEB-INF/web.xml index dab7a54deb..5a171d9b1b 100644 --- a/framework/images/webapp/images/WEB-INF/web.xml +++ b/framework/images/webapp/images/WEB-INF/web.xml @@ -24,7 +24,7 @@ under the License. Demo Store Images for the Open For Business Project - 1 + 1 diff --git a/framework/images/webapp/images/calendar_date_select.js b/framework/images/webapp/images/calendar_date_select.js index 4802ec6e20..b416e5544a 100644 --- a/framework/images/webapp/images/calendar_date_select.js +++ b/framework/images/webapp/images/calendar_date_select.js @@ -1,5 +1,5 @@ // CalendarDateSelect version 1.10.2 - a prototype based date picker -// Questions, comments, bugs? - email the Author - Tim Harper <"timseeharper@gmail.seeom".gsub("see", "c")> +// Questions, comments, bugs? - email the Author - Tim Harper <"timseeharper@gmail.seeom".gsub("see", "c")> if (typeof Prototype == 'undefined') alert("CalendarDateSelect Error: Prototype could not be found. Please make sure that your application's layout includes prototype.js (.g. <%= javascript_include_tag :defaults %>) *before* it includes calendar_date_select.js (.g. <%= calendar_date_select_includes %>)."); if (Prototype.Version < "1.6") alert("Prototype 1.6.0 is required. If using earlier version of prototype, please use calendar_date_select version 1.8.3"); @@ -16,7 +16,7 @@ Element.build = function(type, options, style) { var e = $(document.createElement(type)); $H(options).each(function(pair) { eval("e." + pair.key + " = pair.value" ); }); - if (style) + if (style) $H(style).each(function(pair) { eval("e.style." + pair.key + " = pair.value" ); }); return e; }; @@ -35,7 +35,7 @@ Date.prototype.daysDistance = function(compare_date) { return Math.round((compar Date.prototype.toFormattedString = function(include_time){ var hour, str; str = Date.months[this.getMonth()] + " " + this.getDate() + ", " + this.getFullYear(); - + if (include_time) { hour = this.getHours(); str += " " + this.getAMPMHour() + ":" + this.getPaddedMinutes() + " " + this.getAMPM() } return str; } @@ -73,7 +73,7 @@ CalendarDateSelect.prototype = { this.target_element = $(target_element); // make sure it's an element, not a string if (!this.target_element) { alert("Target element " + target_element + " not found!"); return false;} if (this.target_element.tagName != "INPUT") this.target_element = this.target_element.down("INPUT") - + this.target_element.calendar_date_select = this; this.last_click_at = 0; // initialize the date control @@ -104,17 +104,17 @@ CalendarDateSelect.prototype = { }, positionCalendarDiv: function() { var above = false; - var c_pos = this.calendar_div.cumulativeOffset(), c_left = c_pos[0], c_top = c_pos[1], c_dim = this.calendar_div.getDimensions(), c_height = c_dim.height, c_width = c_dim.width; + var c_pos = this.calendar_div.cumulativeOffset(), c_left = c_pos[0], c_top = c_pos[1], c_dim = this.calendar_div.getDimensions(), c_height = c_dim.height, c_width = c_dim.width; var w_top = window.f_scrollTop(), w_height = window.f_height(); var e_dim = $(this.options.get("popup_by")).cumulativeOffset(), e_top = e_dim[1], e_left = e_dim[0], e_height = $(this.options.get("popup_by")).getDimensions().height, e_bottom = e_top + e_height; - + if ( (( e_bottom + c_height ) > (w_top + w_height)) && ( e_bottom - c_height > w_top )) above = true; var left_px = e_left.toString() + "px", top_px = (above ? (e_top - c_height ) : ( e_top + e_height )).toString() + "px"; - + this.calendar_div.style.left = left_px; this.calendar_div.style.top = top_px; - + this.calendar_div.setStyle({visibility:""}); - + // draw an iframe behind the calendar -- ugly hack to make IE 6 happy if(navigator.appName=="Microsoft Internet Explorer") this.iframe = $(document.body).build("iframe", {src: "javascript:false", className: "ie6_blocker"}, { left: left_px, top: top_px, height: c_height.toString()+"px", width: c_width.toString()+"px", border: "0px"}) }, @@ -127,18 +127,18 @@ CalendarDateSelect.prototype = { var style = { position:"absolute", visibility: "hidden", left:0, top:0 } } this.calendar_div = $(parent).build('div', {className: "calendar_date_select"}, style); - + var that = this; // create the divs $w("top header body buttons footer bottom").each(function(name) { eval("var " + name + "_div = that." + name + "_div = that.calendar_div.build('div', { className: 'cds_"+name+"' }, { clear: 'left'} ); "); }); - + this.initHeaderDiv(); this.initButtonsDiv(); this.initCalendarGrid(); this.updateFooter(" "); - + this.refresh(); this.setUseTime(this.use_time); }, @@ -147,10 +147,10 @@ CalendarDateSelect.prototype = { this.close_button = header_div.build("a", { innerHTML: "x", href:"#", onclick:function () { this.close(); return false; }.bindAsEventListener(this), className: "close" }); this.next_month_button = header_div.build("a", { innerHTML: ">", href:"#", onclick:function () { this.navMonth(this.date.getMonth() + 1 ); return false; }.bindAsEventListener(this), className: "next" }); this.prev_month_button = header_div.build("a", { innerHTML: "<", href:"#", onclick:function () { this.navMonth(this.date.getMonth() - 1 ); return false; }.bindAsEventListener(this), className: "prev" }); - + if (this.options.get("month_year")=="dropdowns") { - this.month_select = new SelectBox(header_div, $R(0,11).map(function(m){return [Date.months[m], m]}), {className: "month", onchange: function () { this.navMonth(this.month_select.getValue()) }.bindAsEventListener(this)}); - this.year_select = new SelectBox(header_div, [], {className: "year", onchange: function () { this.navYear(this.year_select.getValue()) }.bindAsEventListener(this)}); + this.month_select = new SelectBox(header_div, $R(0,11).map(function(m){return [Date.months[m], m]}), {className: "month", onchange: function () { this.navMonth(this.month_select.getValue()) }.bindAsEventListener(this)}); + this.year_select = new SelectBox(header_div, [], {className: "year", onchange: function () { this.navYear(this.year_select.getValue()) }.bindAsEventListener(this)}); this.populateYearRange(); } else { this.month_year_label = header_div.build("span") @@ -162,10 +162,10 @@ CalendarDateSelect.prototype = { var days_table = body_div.build("table", { cellPadding: "0px", cellSpacing: "0px", width: "100%" }) // make the weekdays! var weekdays_row = days_table.build("thead").build("tr"); - Date.weekdays.each( function(weekday) { + Date.weekdays.each( function(weekday) { weekdays_row.build("th", {innerHTML: weekday}); }); - + var days_tbody = days_table.build("tbody") // Make the days! var row_number = 0, weekday; @@ -192,29 +192,29 @@ CalendarDateSelect.prototype = { { var blank_time = $A(this.options.get("time")=="mixed" ? [[" - ", ""]] : []); buttons_div.build("span", {innerHTML:"@", className: "at_sign"}); - + var t = new Date(); this.hour_select = new SelectBox(buttons_div, blank_time.concat($R(0,23).map(function(x) {t.setHours(x); return $A([t.getAMPMHour()+ " " + t.getAMPM(),x])} )), - { - calendar_date_select: this, + { + calendar_date_select: this, onchange: function() { this.calendar_date_select.updateSelectedDate( { hour: this.value });}, - className: "hour" + className: "hour" } ); buttons_div.build("span", {innerHTML:":", className: "seperator"}); var that = this; this.minute_select = new SelectBox(buttons_div, blank_time.concat($R(0,59).select(function(x){return (x % that.options.get('minute_interval')==0)}).map(function(x){ return $A([ Date.padded2(x), x]); } ) ), - { - calendar_date_select: this, - onchange: function() { this.calendar_date_select.updateSelectedDate( {minute: this.value }) }, - className: "minute" + { + calendar_date_select: this, + onchange: function() { this.calendar_date_select.updateSelectedDate( {minute: this.value }) }, + className: "minute" } ); - + } else if (! this.options.get("buttons")) buttons_div.remove(); - + if (this.options.get("buttons")) { buttons_div.build("span", {innerHTML: " "}); if (this.options.get("time")=="mixed" || !this.options.get("time")) b = buttons_div.build("a", { @@ -222,15 +222,15 @@ CalendarDateSelect.prototype = { href: "#", onclick: function() {this.today(false); return false;}.bindAsEventListener(this) }); - + if (this.options.get("time")=="mixed") buttons_div.build("span", {innerHTML: " | ", className:"button_seperator"}) - + if (this.options.get("time")) b = buttons_div.build("a", { innerHTML: _translations["Now"], href: "#", onclick: function() {this.today(true); return false}.bindAsEventListener(this) }); - + if (!this.options.get("embedded")) { buttons_div.build("span", {innerHTML: " "}); @@ -242,7 +242,7 @@ CalendarDateSelect.prototype = { { this.refreshMonthYear(); this.refreshCalendarGrid(); - + this.setSelectedClass(); this.updateFooter(); }, @@ -253,9 +253,9 @@ CalendarDateSelect.prototype = { var pre_days = this.beginning_date.getDay() // draw some days before the fact if (pre_days < 3) pre_days += 7; this.beginning_date.setDate(1 - pre_days + Date.first_day_of_week); - + var iterator = new Date(this.beginning_date); - + var today = new Date().stripTime(); var this_month = this.date.getMonth(); vdc = this.options.get("valid_date_check"); @@ -269,9 +269,9 @@ CalendarDateSelect.prototype = { if (vdc) { if (vdc(iterator.stripTime())) cell.removeClassName("disabled"); else cell.addClassName("disabled") }; iterator.setDate( day + 1); } - + if (this.today_cell) this.today_cell.removeClassName("today"); - + if ( $R( 0, 41 ).include(days_until = this.beginning_date.stripTime().daysDistance(today)) ) { this.today_cell = this.calendar_day_grid[days_until]; this.today_cell.addClassName("today"); @@ -281,15 +281,15 @@ CalendarDateSelect.prototype = { var m = this.date.getMonth(); var y = this.date.getFullYear(); // set the month - if (this.options.get("month_year") == "dropdowns") + if (this.options.get("month_year") == "dropdowns") { this.month_select.setValue(m, false); - - var e = this.year_select.element; + + var e = this.year_select.element; if (this.flexibleYearRange() && (!(this.year_select.setValue(y, false)) || e.selectedIndex <= 1 || e.selectedIndex >= e.options.length - 2 )) this.populateYearRange(); - + this.year_select.setValue(y); - + } else { this.month_year_label.update( Date.months[m] + " " + y.toString() ); } @@ -300,7 +300,7 @@ CalendarDateSelect.prototype = { yearRange: function() { if (!this.flexibleYearRange()) return $R(this.options.get("year_range")[0], this.options.get("year_range")[1]); - + var y = this.date.getFullYear(); return $R(y - this.options.get("year_range"), y + this.options.get("year_range")); }, @@ -345,22 +345,22 @@ CalendarDateSelect.prototype = { for (var x = 0; x<=3; x++) t_selected_date.setDate(parts.get("day")); t_selected_date.setYear(parts.get("year")); t_selected_date.setMonth(parts.get("month")); - + if (vdc && ! vdc(t_selected_date.stripTime())) { return false; } this.selected_date = t_selected_date; this.selection_made = true; } - + if (!isNaN(parts.get("hour"))) this.selected_date.setHours(parts.get("hour")); if (!isNaN(parts.get("minute"))) this.selected_date.setMinutes( Math.floor_to_interval(parts.get("minute"), this.options.get("minute_interval")) ); - if (parts.get("hour") === "" || parts.get("minute") === "") + if (parts.get("hour") === "" || parts.get("minute") === "") this.setUseTime(false); else if (!isNaN(parts.get("hour")) || !isNaN(parts.get("minute"))) this.setUseTime(true); - + this.updateFooter(); this.setSelectedClass(); - + if (this.selection_made) this.updateValue(); if (this.closeOnClick()) { this.close(); } if (via_click && !this.options.get("embedded")) { @@ -390,7 +390,7 @@ CalendarDateSelect.prototype = { if (this.use_time && this.selected_date) { // only set hour/minute if a date is already selected var minute = Math.floor_to_interval(this.selected_date.getMinutes(), this.options.get("minute_interval")); var hour = this.selected_date.getHours(); - + this.hour_select.setValue(hour); this.minute_select.setValue(minute) } else if (this.options.get("time")=="mixed") { @@ -405,7 +405,7 @@ CalendarDateSelect.prototype = { today: function(now) { var d = new Date(); this.date = new Date(); var o = $H({ day: d.getDate(), month: d.getMonth(), year: d.getFullYear(), hour: d.getHours(), minute: d.getMinutes()}); - if ( ! now ) o = o.merge({hour: "", minute:""}); + if ( ! now ) o = o.merge({hour: "", minute:""}); this.updateSelectedDate(o, true); this.refresh(); }, @@ -427,7 +427,7 @@ CalendarDateSelect.prototype = { if (e.keyCode==Event.KEY_ESC) this.close(); }, callback: function(name, param) { if (this.options.get(name)) { this.options.get(name).bind(this.target_element)(param); } } - + } @@ -466,15 +466,15 @@ Date.parseFormattedString = function (string) { dt_date.setSeconds(arr_sec[0]); if (!arr_sec[1]) dt_date.setMilliseconds(0); dt_date.setMilliseconds(arr_sec[1]); - + return dt_date; }; // OFBiz addition: functions to call the calendar -function call_cal(target, datetime) { - new CalendarDateSelect(target, {time:true, year_range:10} ); +function call_cal(target, datetime) { + new CalendarDateSelect(target, {time:true, year_range:10} ); } -function call_cal_notime(target, datetime) { - new CalendarDateSelect(target, {year_range:10} ); +function call_cal_notime(target, datetime) { + new CalendarDateSelect(target, {year_range:10} ); } \ No newline at end of file diff --git a/framework/images/webapp/images/catalog/dirholder.txt b/framework/images/webapp/images/catalog/dirholder.txt index 09a53d2cd8..de19bb3f20 100644 --- a/framework/images/webapp/images/catalog/dirholder.txt +++ b/framework/images/webapp/images/catalog/dirholder.txt @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/framework/images/webapp/images/combobox.js b/framework/images/webapp/images/combobox.js index 07042f76e9..99741352b3 100644 --- a/framework/images/webapp/images/combobox.js +++ b/framework/images/webapp/images/combobox.js @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,7 +27,7 @@ function other_choice(dropDown) { function activate(field) { field.disabled=false; if(document.styleSheets)field.style.visibility = 'visible'; - field.focus(); + field.focus(); } function process_choice(selection,textfield) { @@ -35,9 +35,9 @@ function process_choice(selection,textfield) { if(b) { activate(textfield); } else { - textfield.disabled = true; + textfield.disabled = true; if(document.styleSheets)textfield.style.visibility = 'hidden'; - textfield.value = ''; + textfield.value = ''; } } @@ -45,6 +45,6 @@ function check_choice(dropDown) { if(!other_choice(dropDown)) { dropDown.blur(); alert('Please check your menu selection first'); - dropDown.focus(); + dropDown.focus(); } } diff --git a/framework/images/webapp/images/dojo/LICENSE b/framework/images/webapp/images/dojo/LICENSE index 225d20c796..2a04e7c8a0 100644 --- a/framework/images/webapp/images/dojo/LICENSE +++ b/framework/images/webapp/images/dojo/LICENSE @@ -7,7 +7,7 @@ the directories in which they reside and in the code itself. No external contributions are allowed under licenses which are fundamentally incompatible with the AFL or BSD licenses that Dojo is distributed under. -The text of the AFL and BSD licenses is reproduced below. +The text of the AFL and BSD licenses is reproduced below. ------------------------------------------------------------------------------- The "New" BSD License: diff --git a/framework/images/webapp/images/dojo/build.txt b/framework/images/webapp/images/dojo/build.txt index d2266aaafc..6e1f1d13b6 100644 --- a/framework/images/webapp/images/dojo/build.txt +++ b/framework/images/webapp/images/dojo/build.txt @@ -76,4 +76,3 @@ dojoGuardEnd.js, ../src/widget/Editor2Plugin/AlwaysShowToolbar.js, ../src/widget/Editor2.js - \ No newline at end of file diff --git a/framework/images/webapp/images/dojo/dojo.js.uncompressed.js b/framework/images/webapp/images/dojo/dojo.js.uncompressed.js index 8de5d352ed..492bab50f1 100644 --- a/framework/images/webapp/images/dojo/dojo.js.uncompressed.js +++ b/framework/images/webapp/images/dojo/dojo.js.uncompressed.js @@ -359,15 +359,15 @@ dojo.hostenv.getBaseScriptUri = function(){ //Additional properties for dojo.hostenv var _addHostEnv = { pkgFileName: "__package__", - + // for recursion protection loading_modules_: {}, loaded_modules_: {}, addedToLoadingCount: [], removedFromLoadingCount: [], - + inFlightCount: 0, - + // FIXME: it should be possible to pull module prefixes in from djConfig modulePrefixes_: { dojo: {name: "dojo", value: "src"} @@ -395,16 +395,16 @@ dojo.hostenv.getBaseScriptUri = function(){ getTextStack: [], loadUriStack: [], loadedUris: [], - + //WARNING: This variable is referenced by packages outside of bootstrap: FloatingPane.js and undo/browser.js post_load_: false, - + //Egad! Lots of test files push on this directly instead of using dojo.addOnLoad. modulesLoadedListeners: [], unloadListeners: [], loadNotifying: false }; - + //Add all of these properties to dojo.hostenv for(var param in _addHostEnv){ dojo.hostenv[param] = _addHostEnv[param]; @@ -514,7 +514,7 @@ dojo.hostenv.unloaded = function(){ dojo.addOnLoad = function(/*Object?*/obj, /*String|Function*/functionName) { // summary: -// Registers a function to be triggered after the DOM has finished loading +// Registers a function to be triggered after the DOM has finished loading // and widgets declared in markup have been instantiated. Images and CSS files // may or may not have finished downloading when the specified function is called. // (Note that widgets' CSS and HTML code is guaranteed to be downloaded before said @@ -561,7 +561,7 @@ dojo.addOnUnload = function(/*Object?*/obj, /*String|Function?*/functionName){ dojo.hostenv.modulesLoaded = function(){ if(this.post_load_){ return; } if(this.loadUriStack.length==0 && this.getTextStack.length==0){ - if(this.inFlightCount > 0){ + if(this.inFlightCount > 0){ dojo.debug("files still in flight!"); return; } @@ -583,8 +583,8 @@ dojo.hostenv.getModuleSymbols = function(/*String*/modulename){ var syms = modulename.split("."); for(var i = syms.length; i>0; i--){ var parentModule = syms.slice(0, i).join("."); - if((i==1) && !this.moduleHasPrefix(parentModule)){ - // Support default module directory (sibling of dojo) for top-level modules + if((i==1) && !this.moduleHasPrefix(parentModule)){ + // Support default module directory (sibling of dojo) for top-level modules syms[0] = "../" + syms[0]; }else{ var parentModulePath = this.getModulePrefix(parentModule); @@ -603,30 +603,30 @@ dojo.hostenv.loadModule = function(/*String*/moduleName, /*Boolean?*/exactOnly, // loads a Javascript module from the appropriate URI // // description: -// loadModule("A.B") first checks to see if symbol A.B is defined. +// loadModule("A.B") first checks to see if symbol A.B is defined. // If it is, it is simply returned (nothing to do). -// +// // If it is not defined, it will look for "A/B.js" in the script root directory, // followed by "A.js". -// +// // It throws if it cannot find a file to load, or if the symbol A.B is not // defined after loading. -// +// // It returns the object A.B. -// +// // This does nothing about importing symbols into the current package. // It is presumed that the caller will take care of that. For example, to import // all symbols: -// +// // with (dojo.hostenv.loadModule("A.B")) { // ... // } -// +// // And to import just the leaf symbol: -// +// // var B = dojo.hostenv.loadModule("A.B"); // ... -// +// // dj_load is an alias for dojo.hostenv.loadModule if(!moduleName){ return; } @@ -646,7 +646,7 @@ dojo.hostenv.loadModule = function(/*String*/moduleName, /*Boolean?*/exactOnly, var relpath = moduleName.replace(/\./g, '/') + '.js'; var nsyms = moduleName.split("."); - + // this line allowed loading of a module manifest as if it were a namespace // it's an interesting idea, but shouldn't be combined with 'namespaces' proper // and leads to unwanted dependencies @@ -707,7 +707,7 @@ dojo.hostenv.loadModule = function(/*String*/moduleName, /*Boolean?*/exactOnly, // pass in false so we can give better error module = this.findModule(moduleName, false); if(!module){ - dojo.raise("symbol '" + moduleName + "' is not defined after loading '" + relpath + "'"); + dojo.raise("symbol '" + moduleName + "' is not defined after loading '" + relpath + "'"); } } @@ -736,7 +736,7 @@ dojo.hostenv.startPackage = function(/*String*/packageName){ var evaledPkg = dojo.evalObjPath(strippedPkgName, true); this.loaded_modules_[fullPkgName] = evaledPkg; this.loaded_modules_[strippedPkgName] = evaledPkg; - + return evaledPkg; // Object } @@ -771,7 +771,7 @@ dojo.kwCompoundRequire = function(/*Object containing Arrays*/modMap){ // the hostenv.name_ item. The items in the "common" array will _always_ be // loaded, regardless of which list is chosen. Here's how it's normally // called: -// +// // dojo.kwCompoundRequire({ // browser: [ // ["foo.bar.baz", true, true], // an example that passes multiple args to loadModule() @@ -802,7 +802,7 @@ dojo.require = function(/*String*/ resourceName){ // description // dojo.require() is similar to C's #include command or java's "import" command. // You call dojo.require() to pull in the resources (ie, javascript source files) - // that define the functions you are using. + // that define the functions you are using. // // Note that in the case of a build, many resources have already been included // into dojo.js (ie, many of the javascript source files have been compressed and @@ -834,7 +834,7 @@ dojo.provide = function(/*String*/ resourceName){ // Each javascript source file is called a resource. When a resource // is loaded by the browser, dojo.provide() registers that it has // been loaded. - // + // // For backwards compatibility reasons, in addition to registering the resource, // dojo.provide() also ensures that the javascript object for the module exists. For // example, dojo.provide("dojo.html.common"), in addition to registering that common.js @@ -852,7 +852,7 @@ dojo.registerModulePath = function(/*String*/module, /*String*/prefix){ // summary: maps a module name to a path // description: An unregistered module is given the default path of ../, // relative to Dojo root. For example, module acme is mapped to ../acme. - // If you want to use a different module name, use dojo.registerModulePath. + // If you want to use a different module name, use dojo.registerModulePath. return dojo.hostenv.setModulePrefix(module, prefix); } @@ -917,7 +917,7 @@ dojo.hostenv.localesGenerated /***BUILD:localesGenerated***/; // value will be i dojo.hostenv.registerNlsPrefix = function(){ // summary: // Register module "nls" to point where Dojo can find pre-built localization files - dojo.registerModulePath("nls","nls"); + dojo.registerModulePath("nls","nls"); } dojo.hostenv.preloadLocalizations = function(){ @@ -1006,7 +1006,7 @@ dojo.requireLocalization = function(/*String*/moduleName, /*String*/bundleName, // The structure on disk is intended to be most convenient for developers and translators, but in memory // it is more logical and efficient to store in a different order. Locales cannot use dashes, since the // resulting path will not evaluate as valid JS, so we translate them to underscores. - + //Find the best-match locale to load if we have available flat locales. var bestLocale = ""; if(availableFlatLocales){ @@ -1021,7 +1021,7 @@ dojo.requireLocalization = function(/*String*/moduleName, /*String*/bundleName, } if(!bestLocale){ bestLocale = "ROOT"; - } + } } //See if the desired locale is already loaded. @@ -1067,7 +1067,7 @@ dojo.requireLocalization = function(/*String*/moduleName, /*String*/bundleName, }else{ bundle[jsLoc] = parent; } - + if(availableFlatLocales){ //Stop the locale path searching if we know the availableFlatLocales, since //the first call to this function will load the only bundle that is needed. @@ -1135,7 +1135,7 @@ if(typeof window != 'undefined'){ } if( - ((djConfig["baseScriptUri"] == "")||(djConfig["baseRelativePath"] == "")) && + ((djConfig["baseScriptUri"] == "")||(djConfig["baseRelativePath"] == "")) && (document && document.getElementsByTagName) ){ var scripts = document.getElementsByTagName("script"); @@ -1700,7 +1700,7 @@ dojo.dom.DOCUMENT_NODE = 9; dojo.dom.DOCUMENT_TYPE_NODE = 10; dojo.dom.DOCUMENT_FRAGMENT_NODE = 11; dojo.dom.NOTATION_NODE = 12; - + dojo.dom.dojoml = "http://www.dojotoolkit.org/2004/dojoml"; /** @@ -1933,10 +1933,10 @@ dojo.dom.getAncestors = function(/*Node*/node, /*function?*/filterFunction, /*bo if(!isFunction || filterFunction(node)){ ancestors.push(node); } - if(returnFirstHit && ancestors.length > 0){ + if(returnFirstHit && ancestors.length > 0){ return ancestors[0]; // Node } - + node = node.parentNode; } if(returnFirstHit){ return null; } @@ -1965,7 +1965,7 @@ dojo.dom.isDescendantOf = function(/* Node */node, /* Node */ancestor, /* boolea // guaranteeDescendant allows us to be a "true" isDescendantOf function if(guaranteeDescendant && node) { node = node.parentNode; } while(node) { - if(node == ancestor){ + if(node == ancestor){ return true; // boolean } node = node.parentNode; @@ -2004,7 +2004,7 @@ dojo.dom.createDocument = function(){ (_document.implementation.createDocument)){ doc = _document.implementation.createDocument("", "", null); } - + return doc; // DOMDocument } @@ -2101,8 +2101,8 @@ dojo.dom.insertAfter = function(/*Node*/node, /*Node*/ref, /*boolean?*/force){ dojo.dom.insertAtPosition = function(/*Node*/node, /*Node*/ref, /*string*/position){ // summary: // attempt to insert node in relation to ref based on position - if((!node)||(!ref)||(!position)){ - return false; // boolean + if((!node)||(!ref)||(!position)){ + return false; // boolean } switch(position.toLowerCase()){ case "before": @@ -2126,10 +2126,10 @@ dojo.dom.insertAtPosition = function(/*Node*/node, /*Node*/ref, /*string*/positi dojo.dom.insertAtIndex = function(/*Node*/node, /*Element*/containingNode, /*number*/insertionIndex){ // summary: // insert node into child nodes nodelist of containingNode at - // insertionIndex. insertionIndex should be between 0 and + // insertionIndex. insertionIndex should be between 0 and // the number of the childNodes in containingNode. insertionIndex // specifys after how many childNodes in containingNode the node - // shall be inserted. If 0 is given, node will be appended to + // shall be inserted. If 0 is given, node will be appended to // containingNode. var siblingNodes = containingNode.childNodes; @@ -2148,7 +2148,7 @@ dojo.dom.insertAtIndex = function(/*Node*/node, /*Element*/containingNode, /*num return dojo.dom.insertAfter(node, siblingNodes[insertionIndex-1]); // boolean } - + dojo.dom.textContent = function(/*Node*/node, /*string*/text){ // summary: // implementation of the DOM Level 3 attribute; scan node for text @@ -2210,14 +2210,14 @@ dojo.dom.isTag = function(/* Node */node /* ... */){ return ""; // string } -dojo.dom.setAttributeNS = function( /*Element*/elem, /*string*/namespaceURI, +dojo.dom.setAttributeNS = function( /*Element*/elem, /*string*/namespaceURI, /*string*/attrName, /*string*/attrValue){ // summary: // implementation of DOM2 setAttributeNS that works cross browser. if(elem == null || ((elem == undefined)&&(typeof elem == "undefined"))){ dojo.raise("No element given to dojo.dom.setAttributeNS"); } - + if(!((elem.setAttributeNS == undefined)&&(typeof elem.setAttributeNS == "undefined"))){ // w3c elem.setAttributeNS(namespaceURI, attrName, attrValue); }else{ // IE @@ -2228,10 +2228,10 @@ dojo.dom.setAttributeNS = function( /*Element*/elem, /*string*/namespaceURI, attrName, namespaceURI ); - + // set value attribute.nodeValue = attrValue; - + // attach to element elem.setAttributeNode(attribute); } @@ -2248,7 +2248,7 @@ dojo.xml.Parse = function(){ // summary: // generic class for taking a DOM node and parsing it into an object // based on the "dojo tag name" of that node. - // + // // supported dojoTagName's: // => prefix:tag // => dojo:tag @@ -2256,7 +2256,7 @@ dojo.xml.Parse = function(){ // => dojo:type // => prefix:type // => dojo:type - // => dojo:type + // => dojo:type var isIE = ((dojo.render.html.capable)&&(dojo.render.html.ie)); @@ -2318,12 +2318,12 @@ dojo.xml.Parse = function(){ try{ // FIXME: IE really really doesn't like this, so we squelch errors for it djt = node.getAttribute("dojo:type"); - }catch(e){ - // FIXME: log? + }catch(e){ + // FIXME: log? } if(djt){ return "dojo:"+djt.toLowerCase(); } - // => dojo:type - if((dj_global["djConfig"])&&(!djConfig["ignoreClassNames"])){ + // => dojo:type + if((dj_global["djConfig"])&&(!djConfig["ignoreClassNames"])){ // FIXME: should we make this optionally enabled via djConfig? var classes = node.className||node.getAttribute("class"); // FIXME: following line, without check for existence of classes.indexOf @@ -2332,7 +2332,7 @@ dojo.xml.Parse = function(){ var aclasses = classes.split(" "); for(var x=0, c=aclasses.length; x... + //
    ...
    // would yeild the following return structure when passed into this // function: // { @@ -2493,16 +2493,16 @@ dojo.xml.Parse = function(){ if((typeof attnode == "object")&& (typeof attnode.nodeValue == 'undefined')|| (attnode.nodeValue == null)|| - (attnode.nodeValue == '')){ - continue; + (attnode.nodeValue == '')){ + continue; } } var nn = attnode.nodeName.split(":"); nn = (nn.length == 2) ? nn[1] : attnode.nodeName; - - parsedAttributeSet[nn] = { - value: attnode.nodeValue + + parsedAttributeSet[nn] = { + value: attnode.nodeValue }; } return parsedAttributeSet; @@ -2513,7 +2513,7 @@ dojo.provide("dojo.lang.common"); dojo.lang.inherits = function(/*Function*/subclass, /*Function*/superclass){ // summary: Set up inheritance between two classes. - if(!dojo.lang.isFunction(superclass)){ + if(!dojo.lang.isFunction(superclass)){ dojo.raise("dojo.inherits: superclass argument ["+superclass+"] must be a function (subclass: ["+subclass+"']"); } subclass.prototype = new superclass(); @@ -2539,7 +2539,7 @@ dojo.lang._mixin = function(/*Object*/ obj, /*Object*/ props){ } } // IE doesn't recognize custom toStrings in for..in - if(dojo.render.html.ie + if(dojo.render.html.ie && (typeof(props["toString"]) == "function") && (props["toString"] != obj["toString"]) && (props["toString"] != tobj["toString"])) @@ -2550,7 +2550,7 @@ dojo.lang._mixin = function(/*Object*/ obj, /*Object*/ props){ } dojo.lang.mixin = function(/*Object*/obj, /*Object...*/props){ - // summary: Adds all properties and methods of props to obj. + // summary: Adds all properties and methods of props to obj. for(var i=1, l=arguments.length; i1; }); // // returns false // dojo.lang.every([1, 2, 3, 4], function(item){ return item>0; }); - // // returns true + // // returns true return this._everyOrSome(true, arr, callback, thisObject); // Boolean }, @@ -3270,7 +3270,7 @@ dojo.lang.setTimeout = function(/*Function*/func, /*int*/delay /*, ...*/){ if(dojo.lang.isString(func)){ func = context[func]; } - + var args = []; for (var i = argsStart; i < arguments.length; i++){ args.push(arguments[i]); @@ -3289,7 +3289,7 @@ dojo.lang.clearTimeout = function(/*int*/timer){ } dojo.lang.getNameInObj = function(/*Object*/ns, /*unknown*/item){ - // summary: + // summary: // looks for a value in the object ns with a value matching item and // returns the property name // ns: if null, dj_global is used @@ -3307,12 +3307,12 @@ dojo.lang.getNameInObj = function(/*Object*/ns, /*unknown*/item){ dojo.lang.shallowCopy = function(/*Object*/obj, /*Boolean?*/deep){ // summary: // copies object obj one level deep, or full depth if deep is true - var i, ret; + var i, ret; if(obj === null){ /*obj: null*/ return null; } // null - + if(dojo.lang.isObject(obj)){ - // obj: Object + // obj: Object ret = new obj.constructor(); for(i in obj){ if(dojo.lang.isUndefined(ret[i])){ @@ -3384,9 +3384,9 @@ dojo.lang.setObjPathValue = function(/*String*/objpath, /*anything*/value, /*Obj dojo.provide("dojo.lang.declare"); -dojo.lang.declare = function( /*String*/ className, - /*Function|Array*/ superclass, - /*Function?*/ init, +dojo.lang.declare = function( /*String*/ className, + /*Function|Array*/ superclass, + /*Function?*/ init, /*Object|Array*/ props){ /* * summary: Create a feature-rich constructor with a compact notation @@ -3402,17 +3402,17 @@ dojo.lang.declare = function( /*String*/ className, * description: * Create a constructor using a compact notation for inheritance and * prototype extension. "superclass" argument may be a Function, or an - * array of Functions. + * array of Functions. * * If "superclass" is an array, the first element is used as the * prototypical ancestor and any following Functions become mixin - * ancestors. - * + * ancestors. + * * All "superclass(es)" must be Functions (not mere Objects). * * Using mixin ancestors provides a type of multiple inheritance. * Mixin ancestors prototypical properties are copied to the subclass, - * and any inializater/constructor is invoked. + * and any inializater/constructor is invoked. * * Properties of object "props" are copied to the constructor * prototype. If "props" is an array, properties of each object in the @@ -3420,10 +3420,10 @@ dojo.lang.declare = function( /*String*/ className, * * name of the class ("className" argument) is stored in * "declaredClass" property - * + * * Initializer functions are called when an object is instantiated * from this constructor. - * + * * Aliased as "dojo.declare" * * Usage: @@ -3431,24 +3431,24 @@ dojo.lang.declare = function( /*String*/ className, * dojo.declare("my.classes.bar", my.classes.foo, * function(){ * // initialization function - * this.myComplicatedObject = new ReallyComplicatedObject(); + * this.myComplicatedObject = new ReallyComplicatedObject(); * }, * { // properties to be added to the class prototype * someValue: 2, - * someMethod: function(){ - * doStuff(); + * someMethod: function(){ + * doStuff(); * } * } * ); * */ - if((dojo.lang.isFunction(props))||((!props)&&(!dojo.lang.isFunction(init)))){ + if((dojo.lang.isFunction(props))||((!props)&&(!dojo.lang.isFunction(init)))){ // parameter juggling to support omitting init param (also allows // reordering init and props arguments) var temp = props; props = init; init = temp; - } + } var mixins = [ ]; if(dojo.lang.isArray(superclass)){ mixins = superclass; @@ -3463,7 +3463,7 @@ dojo.lang.declare = function( /*String*/ className, if(scp){ scp.prototyping = true; ctor.prototype = new superclass(); - scp.prototyping = false; + scp.prototyping = false; } ctor.superclass = scp; ctor.mixins = mixins; @@ -3486,7 +3486,7 @@ dojo.lang.declare = function( /*String*/ className, } dojo.lang.declare._makeConstructor = function(){ - return function(){ + return function(){ // get the generational context (which object [or prototype] should be constructed) var self = this._getPropContext(); var s = self.constructor.superclass; @@ -3515,7 +3515,7 @@ dojo.lang.declare._common = { var result, stack = this.___proto; this.___proto = ptype; try { result = ptype[method].apply(this,(args||[])); } - catch(e) { throw e; } + catch(e) { throw e; } finally { this.___proto = stack; } return result; }, @@ -3575,7 +3575,7 @@ dojo.ns = { // FIXME: do we really ever have re-entrancy situation? this would appear to be really bad // original code did not throw an exception, although that seems the only course // adding debug output here to track if this occurs. - dojo.debug('dojo.namespace.require: re-entrant request to load namespace "' + name + '" must fail.'); + dojo.debug('dojo.namespace.require: re-entrant request to load namespace "' + name + '" must fail.'); return false; // Boolean } // workaround so we don't break the build system @@ -3623,7 +3623,7 @@ dojo.ns.Ns.prototype.resolve = function(/*String*/name, /*String*/domain, /*Bool if(dojo.hostenv.findModule(fullName, false)){ this._loaded[fullName] = true; }else{ - if(!omitModuleCheck){dojo.raise("dojo.ns.Ns.resolve: module '" + fullName + "' not found after loading via namespace '" + this.name + "'");} + if(!omitModuleCheck){dojo.raise("dojo.ns.Ns.resolve: module '" + fullName + "' not found after loading via namespace '" + this.name + "'");} this._failed[fullName] = true; } } @@ -3652,7 +3652,7 @@ dojo.registerNamespaceResolver = function(/*String*/name, /*Function*/resolver){ // // example: // dojo.registerNamespaceResolver("acme", - // function(name){ + // function(name){ // return "acme.widget."+dojo.string.capitalize(name); // } // ); @@ -3832,12 +3832,12 @@ dojo.event = new function(){ if(!ao.adviceObj){ dojo.raise("bad adviceObj for adviceFunc: "+ao.adviceFunc); } - + if(!ao.adviceFunc){ dojo.debug("bad adviceFunc for srcFunc: "+ao.srcFunc); dojo.debugShallow(ao); - } - + } + return ao; } @@ -3857,28 +3857,28 @@ dojo.event = new function(){ // dojo.event.connect(scope1, "functionName1", scope2, "functionName2"); // dojo.event.connect("after", scope1, "functionName1", scope2, "functionName2"); // dojo.event.connect("before", scope1, "functionName1", scope2, "functionName2"); - // dojo.event.connect("around", scope1, "functionName1", + // dojo.event.connect("around", scope1, "functionName1", // scope2, "functionName2", // aroundFunctionReference); - // dojo.event.connect("around", scope1, "functionName1", + // dojo.event.connect("around", scope1, "functionName1", // scope2, "functionName2", // scope3, "aroundFunctionName"); - // dojo.event.connect("before-around", scope1, "functionName1", + // dojo.event.connect("before-around", scope1, "functionName1", // scope2, "functionName2", // aroundFunctionReference); - // dojo.event.connect("after-around", scope1, "functionName1", + // dojo.event.connect("after-around", scope1, "functionName1", // scope2, "functionName2", // aroundFunctionReference); - // dojo.event.connect("after-around", scope1, "functionName1", + // dojo.event.connect("after-around", scope1, "functionName1", // scope2, "functionName2", // scope3, "aroundFunctionName"); - // dojo.event.connect("around", scope1, "functionName1", + // dojo.event.connect("around", scope1, "functionName1", // scope2, "functionName2", // scope3, "aroundFunctionName", true, 30); - // dojo.event.connect("around", scope1, "functionName1", + // dojo.event.connect("around", scope1, "functionName1", // scope2, "functionName2", // scope3, "aroundFunctionName", null, null, 10); - // adviceType: + // adviceType: // Optional. String. One of "before", "after", "around", // "before-around", or "after-around". FIXME // srcObj: @@ -4073,7 +4073,7 @@ dojo.event = new function(){ // - srcObj // - srcFunc // - adviceObj - // - adviceFunc + // - adviceFunc // - aroundObj // - aroundFunc // - once @@ -4160,7 +4160,7 @@ dojo.event.MethodInvocation.prototype.proceed = function(){ var meth = ti[1]; return mobj[meth].call(mobj, this); } -} +} dojo.event.MethodJoinPoint = function(/*Object*/obj, /*String*/funcName){ @@ -4191,7 +4191,7 @@ dojo.event.MethodJoinPoint.getForMethod = function(/*Object*/obj, /*String*/func } }else if((!dojo.lang.isFunction(obj[funcName]))&&(!dojo.lang.isAlien(obj[funcName]))){ // FIXME: should we throw an exception here instead? - return null; + return null; } // we hide our joinpoint instance in obj[funcName + '$joinpoint'] var jpname = funcName + "$joinpoint"; @@ -4211,7 +4211,7 @@ dojo.event.MethodJoinPoint.getForMethod = function(/*Object*/obj, /*String*/func obj[jpfuncname] = obj[funcName]; // joinpoint = obj[jpname] = new dojo.event.MethodJoinPoint(obj, funcName); joinpoint = obj[jpname] = new dojo.event.MethodJoinPoint(obj, jpfuncname); - obj[funcName] = function(){ + obj[funcName] = function(){ var args = []; if((isNode)&&(!arguments.length)){ @@ -4242,8 +4242,8 @@ dojo.event.MethodJoinPoint.getForMethod = function(/*Object*/obj, /*String*/func } } } - // return joinpoint.run.apply(joinpoint, arguments); - return joinpoint.run.apply(joinpoint, args); + // return joinpoint.run.apply(joinpoint, arguments); + return joinpoint.run.apply(joinpoint, args); } obj[funcName].__preJoinArity = origArity; } @@ -4252,7 +4252,7 @@ dojo.event.MethodJoinPoint.getForMethod = function(/*Object*/obj, /*String*/func dojo.lang.extend(dojo.event.MethodJoinPoint, { unintercept: function(){ - // summary: + // summary: // destroy the connection to all listeners that may have been // registered on this joinpoint this.object[this.methodname] = this.methodfunc; @@ -4278,19 +4278,19 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { aargs[x] = args[x]; } - var unrollAdvice = function(marr){ + var unrollAdvice = function(marr){ if(!marr){ dojo.debug("Null argument to unrollAdvice()"); return; } - + var callObj = marr[0]||dj_global; var callFunc = marr[1]; - + if(!callObj[callFunc]){ dojo.raise("function \"" + callFunc + "\" does not exist on \"" + callObj + "\""); } - + var aroundObj = marr[2]||dj_global; var aroundFunc = marr[3]; var msg = marr[6]; @@ -4344,16 +4344,16 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { if((hasDelay)&&((dojo.render.html)||(dojo.render.svg))){ // FIXME: the render checks are grotty! dj_global["setTimeout"](function(){ if(msg){ - callObj[callFunc].call(callObj, to); + callObj[callFunc].call(callObj, to); }else{ - callObj[callFunc].apply(callObj, args); + callObj[callFunc].apply(callObj, args); } }, delay); }else{ // many environments can't support delay! if(msg){ - callObj[callFunc].call(callObj, to); + callObj[callFunc].call(callObj, to); }else{ - callObj[callFunc].apply(callObj, args); + callObj[callFunc].apply(callObj, args); } } } @@ -4363,7 +4363,7 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { if(this.squelch){ try{ return unrollAdvice.apply(this, arguments); - }catch(e){ + }catch(e){ dojo.debug(e); } }else{ @@ -4384,11 +4384,11 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { }else if(this.methodfunc){ result = this.object[this.methodname].apply(this.object, args); } - }catch(e){ - if(!this.squelch){ + }catch(e){ + if(!this.squelch){ dojo.debug(e,"when calling",this.methodname,"on",this.object,"with arguments",args); dojo.raise(e); - } + } } if((this["after"])&&(this.after.length>0)){ @@ -4422,23 +4422,23 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { // An object that can have the following properties: // - adviceType // - adviceObj - // - adviceFunc + // - adviceFunc // - aroundObj // - aroundFunc // - once // - delay // - rate // - adviceMsg - this.addAdvice( args["adviceObj"], args["adviceFunc"], - args["aroundObj"], args["aroundFunc"], - args["adviceType"], args["precedence"], - args["once"], args["delay"], args["rate"], + this.addAdvice( args["adviceObj"], args["adviceFunc"], + args["aroundObj"], args["aroundFunc"], + args["adviceType"], args["precedence"], + args["once"], args["delay"], args["rate"], args["adviceMsg"]); }, - addAdvice: function( thisAdviceObj, thisAdvice, - thisAroundObj, thisAround, - adviceType, precedence, + addAdvice: function( thisAdviceObj, thisAdvice, + thisAroundObj, thisAround, + adviceType, precedence, once, delay, rate, asMessage){ // summary: // add advice to this joinpoint using positional parameters @@ -4451,7 +4451,7 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { // thisAroundFunc: // the name of the function that will be used to mediate the // advice call. - // adviceType: + // adviceType: // Optional. String. One of "before", "after", "around", // "before-around", or "after-around". FIXME // once: @@ -4474,7 +4474,7 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { } var ao = [thisAdviceObj, thisAdvice, thisAroundObj, thisAround, delay, rate, asMessage]; - + if(once){ if(this.hasAdvice(thisAdviceObj, thisAdvice, adviceType, arr) >= 0){ return; @@ -4497,7 +4497,7 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { // the scope in which to locate/execute the named adviceFunc. // thisAdviceFunc: // the name of the function being conected - // adviceType: + // adviceType: // Optional. String. One of "before", "after", "around", // "before-around", or "after-around". FIXME // arr: @@ -4524,7 +4524,7 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { // the scope in which to locate/execute the named adviceFunc. // thisAdviceFunc: // the name of the function being conected - // adviceType: + // adviceType: // Optional. String. One of "before", "after", "around", // "before-around", or "after-around". FIXME // once: @@ -4567,7 +4567,7 @@ dojo.event.topic = new function(){ // calls to the function will cause a publish event on the topic // with the arguments passed to the function passed to registered // listeners. - // topic: + // topic: // a unique, opaque string that names the topic // obj: // the scope to locate the function in @@ -4582,7 +4582,7 @@ dojo.event.topic = new function(){ // susbscribes the function to the topic. Subsequent events // dispached to the topic will create a function call for the // obj.funcName() function. - // topic: + // topic: // a unique, opaque string that names the topic // obj: // the scope to locate the function in @@ -4595,7 +4595,7 @@ dojo.event.topic = new function(){ this.unsubscribe = function(/*String*/topic, /*Object*/obj, /*String*/funcName){ // summary: // unsubscribes the obj.funcName() from the topic - // topic: + // topic: // a unique, opaque string that names the topic // obj: // the scope to locate the function in @@ -4606,7 +4606,7 @@ dojo.event.topic = new function(){ } this.destroy = function(/*String*/topic){ - // summary: + // summary: // destroys the topic and unregisters all listeners // topic: // a unique, opaque string that names the topic @@ -4615,7 +4615,7 @@ dojo.event.topic = new function(){ } this.publishApply = function(/*String*/topic, /*Array*/args){ - // summary: + // summary: // dispatches an event to the topic using the args array as the // source for the call arguments to each listener. This is similar // to JavaScript's built-in Function.apply() @@ -4628,7 +4628,7 @@ dojo.event.topic = new function(){ } this.publish = function(/*String*/topic, /*Object*/message){ - // summary: + // summary: // manually "publish" to the passed topic // topic: // a unique, opaque string that names the topic @@ -4667,8 +4667,8 @@ dojo.event.topic.TopicImpl = function(topicName){ var tf = listenerMethod||listenerObject; var to = (!listenerMethod) ? dj_global : listenerObject; return dojo.event.kwConnect({ // dojo.event.MethodJoinPoint - srcObj: this, - srcFunc: "sendMessage", + srcObj: this, + srcFunc: "sendMessage", adviceObj: to, adviceFunc: tf }); @@ -4688,8 +4688,8 @@ dojo.event.topic.TopicImpl = function(topicName){ var tf = (!listenerMethod) ? listenerObject : listenerMethod; var to = (!listenerMethod) ? null : listenerObject; return dojo.event.kwDisconnect({ // dojo.event.MethodJoinPoint - srcObj: this, - srcFunc: "sendMessage", + srcObj: this, + srcFunc: "sendMessage", adviceObj: to, adviceFunc: tf }); @@ -4700,7 +4700,7 @@ dojo.event.topic.TopicImpl = function(topicName){ } this.setSquelch = function(/*Boolean*/shouldSquelch){ - // summary: + // summary: // determine whether or not exceptions in the calling of a // listener in the chain should stop execution of the chain. this._getJoinPoint().squelch = shouldSquelch; @@ -4711,7 +4711,7 @@ dojo.event.topic.TopicImpl = function(topicName){ this._getJoinPoint().disconnect(); } - this.registerPublisher = function( /*Object*/publisherObject, + this.registerPublisher = function( /*Object*/publisherObject, /*Function or String*/publisherMethod){ // summary: // registers the passed function as a publisher on this topic. @@ -4832,7 +4832,7 @@ dojo.event.browser = new function(){ break; } } - + this.clean = function(/*DOMNode*/node){ // summary: // removes native event handlers so that destruction of the node @@ -4840,7 +4840,7 @@ dojo.event.browser = new function(){ // it's critical for manual node removal on IE. // node: // A DOM node. All of it's children will also be cleaned. - if(dojo.render.html.ie){ + if(dojo.render.html.ie){ dojo._ie_clobber.clobber(node); } } @@ -4875,9 +4875,9 @@ dojo.event.browser = new function(){ } } - this.removeListener = function( /*DOMNode*/ node, - /*String*/ evtName, - /*Function*/fp, + this.removeListener = function( /*DOMNode*/ node, + /*String*/ evtName, + /*Function*/fp, /*Boolean*/ capture){ // summary: // clobbers the listener from the node @@ -4946,7 +4946,7 @@ dojo.event.browser = new function(){ newfp = fp; } - if(node.addEventListener){ + if(node.addEventListener){ node.addEventListener(evtName.substr(2), newfp, capture); return newfp; }else{ @@ -4967,7 +4967,7 @@ dojo.event.browser = new function(){ } this.isEvent = function(/*Object*/obj){ - // summary: + // summary: // Tries to determine whether or not the object is a DOM event. // FIXME: event detection hack ... could test for additional attributes @@ -4978,7 +4978,7 @@ dojo.event.browser = new function(){ } this.currentEvent = null; - + this.callListener = function(/*Function*/listener, /*DOMNode*/curTarget){ // summary: // calls the specified listener in the context of the passed node @@ -4995,7 +4995,7 @@ dojo.event.browser = new function(){ } this._stopPropagation = function(){ - dojo.event.browser.currentEvent.cancelBubble = true; + dojo.event.browser.currentEvent.cancelBubble = true; } this._preventDefault = function(){ @@ -5080,7 +5080,7 @@ dojo.event.browser = new function(){ evt = window.event; } } - + if((evt["type"])&&(evt["type"].indexOf("key") == 0)){ // key events evt.keys = this.revKeys; // FIXME: how can we eliminate this iteration? @@ -5228,7 +5228,7 @@ dojo.event.browser = new function(){ case 63249://scrolllock case 63289://numlock break; - default: + default: evt.key = evt.charCode >= evt.KEY_SPACE ? String.fromCharCode(evt.charCode) : evt.keyCode; } }else{ @@ -5285,7 +5285,7 @@ dojo.provide("dojo.widget.Manager"); dojo.widget.manager = new function(){ this.widgets = []; this.widgetIds = []; - + // map of widgetId-->widget for widgets without parents (top level widgets) this.topWidgets = {}; @@ -5348,7 +5348,7 @@ dojo.widget.manager = new function(){ this.removeById(widgetIndex); } } - + // FIXME: suboptimal performance this.removeById = function(id) { if(!dojo.lang.isString(id)){ @@ -5372,7 +5372,7 @@ dojo.widget.manager = new function(){ this.getWidgetsByType = function(type){ var lt = type.toLowerCase(); - var getType = (type.indexOf(":") < 0 ? + var getType = (type.indexOf(":") < 0 ? function(x) { return x.widgetType.toLowerCase(); } : function(x) { return x.getNamespacedType(); } ); @@ -5433,15 +5433,15 @@ dojo.widget.manager = new function(){ widgetPackages.push(pname); } } - + this.getWidgetPackageList = function() { return dojo.lang.map(widgetPackages, function(elt) { return(elt!==true ? elt : undefined); }); } - + this.getImplementation = function(widgetName, ctorObject, mixins, ns){ // try and find a name for the widget var impl = this.getImplementationName(widgetName, ns); - if(impl){ + if(impl){ // var tic = new Date(); var ret = ctorObject ? new impl(ctorObject) : new impl(); // dojo.debug(new Date() - tic); @@ -5463,7 +5463,7 @@ dojo.widget.manager = new function(){ //renderPrefixCache.push(""); // empty prefix is included automatically } - + var findImplementationInModule = function(lowerCaseWidgetName, module){ if(!module){return null;} for(var i=0, l=renderPrefixCache.length, widgetModule; i<=l; i++){ @@ -5487,14 +5487,14 @@ dojo.widget.manager = new function(){ this.getImplementationName = function(widgetName, ns){ /* - * Locate an implementation (constructor) for 'widgetName' in namespace 'ns' + * Locate an implementation (constructor) for 'widgetName' in namespace 'ns' * widgetNames are case INSENSITIVE - * + * * 1. Return value from implementation cache, if available, for quick turnaround. * 2. Locate a namespace registration for 'ns' * 3. If no namespace found, register the conventional one (ns.widget) * 4. Allow the namespace resolver (if any) to load a module for this widget. - * 5. Permute the widget name and capable rendering prefixes to locate, cache, and return + * 5. Permute the widget name and capable rendering prefixes to locate, cache, and return * an appropriate widget implementation. * 6. If no implementation is found, attempt to load the namespace manifest, * and then look again for an implementation to cache and return. @@ -5512,7 +5512,7 @@ dojo.widget.manager = new function(){ if(impl){ return impl; } - + // (one time) store a list of the render prefixes we are capable of rendering if(!renderPrefixCache.length){ buildPrefixCache(); @@ -5525,7 +5525,7 @@ dojo.widget.manager = new function(){ dojo.ns.register(ns, ns + '.widget'); nsObj = dojo.ns.get(ns); } - + // allow the namespace to resolve the widget module if(nsObj){nsObj.resolve(widgetName);} @@ -5540,20 +5540,20 @@ dojo.widget.manager = new function(){ impl = findImplementation(lowerCaseWidgetName, nsObj.module); if(impl){return(imps[lowerCaseWidgetName] = impl)}; } - + // this is an error condition under new rules - dojo.deprecated('dojo.widget.Manager.getImplementationName', - 'Could not locate widget implementation for "' + widgetName + '" in "' + nsObj.module + '" registered to namespace "' + nsObj.name + '". ' + dojo.deprecated('dojo.widget.Manager.getImplementationName', + 'Could not locate widget implementation for "' + widgetName + '" in "' + nsObj.module + '" registered to namespace "' + nsObj.name + '". ' + "Developers must specify correct namespaces for all non-Dojo widgets", "0.5"); // backward compat: if the user has not specified any namespace and their widget is not in dojo.widget.* // search registered widget packages [sic] - // note: registerWidgetPackage itself is now deprecated + // note: registerWidgetPackage itself is now deprecated for(var i=0; i -1) ? module.substring(0,pos) : module; // FIXME: hrm, this might make things simpler //dojo.widget.tags.addParseTreeHandler(nsName+":"+type.toLowerCase()); - + props=(props)||{}; props.widgetType = type; if((!init)&&(props["classConstructor"])){ @@ -6797,11 +6797,11 @@ dojo.provide("dojo.widget.Parse"); // // a particular dojoML tag would be handled by a registered tagHandler with a hook for a default handler // if the widget system is loaded, a widget builder would be attach itself as the default handler -// +// // widget tags are no longer registered themselves: -// they are now arbitrarily namespaced, so we cannot register them all, and the non-prefixed portions -// are no longer guaranteed unique -// +// they are now arbitrarily namespaced, so we cannot register them all, and the non-prefixed portions +// are no longer guaranteed unique +// // therefore dojo.widget.tags should go with this parser code out of the widget module // @@ -6815,12 +6815,12 @@ dojo.widget.Parse = function(/*Object*/fragment){ // if we have items to parse/create at this level, do it! try{ if(frag && frag.tagName && (frag != frag.nodeRef)){ - - // these are in fact, not ever for widgets per-se anymore, + + // these are in fact, not ever for widgets per-se anymore, // but for other markup elements (aka components) var djTags = dojo.widget.tags; - - // we split so that you can declare multiple + + // we split so that you can declare multiple // non-destructive components from the same ctor node var tna = String(frag.tagName).split(";"); for(var x=0; x -1){ name = name.substring(pos+1); } var lowerCaseName = name.toLowerCase(); var namespacedName = ns + ":" + lowerCaseName; - isNode = (dojo.byId(name) && !dojo.widget.tags[namespacedName]); + isNode = (dojo.byId(name) && !dojo.widget.tags[namespacedName]); } if((arguments.length == 1) && (isNode || !isNameStr)){ - // we got a DOM node - var xp = new dojo.xml.Parse(); - // FIXME: we should try to find the parent! - var tn = isNode ? dojo.byId(name) : name; - return dojo.widget.getParser().createComponents(xp.parseElement(tn, null, true))[0]; + // we got a DOM node + var xp = new dojo.xml.Parse(); + // FIXME: we should try to find the parent! + var tn = isNode ? dojo.byId(name) : name; + return dojo.widget.getParser().createComponents(xp.parseElement(tn, null, true))[0]; } function fromScript(placeKeeperNode, name, props, ns){ - props[namespacedName] = { + props[namespacedName] = { dojotype: [{value: lowerCaseName}], nodeRef: placeKeeperNode, fastMixIn: true @@ -7121,7 +7121,7 @@ dojo.provide("dojo.html.style"); dojo.html.getClass = function(/* HTMLElement */node){ // summary - // Returns the string value of the list of CSS classes currently assigned directly + // Returns the string value of the list of CSS classes currently assigned directly // to the node in question. Returns an empty string if no class attribute is found; node = dojo.byId(node); if(!node){ return ""; } @@ -7136,7 +7136,7 @@ dojo.html.getClass = function(/* HTMLElement */node){ dojo.html.getClasses = function(/* HTMLElement */node) { // summary - // Returns an array of CSS classes currently assigned directly to the node in question. + // Returns an array of CSS classes currently assigned directly to the node in question. // Returns an empty array if no classes are found; var c = dojo.html.getClass(node); return (c == "") ? [] : c.split(/\s+/g); // array @@ -7225,10 +7225,10 @@ dojo.html.classMatchType = { dojo.html.getElementsByClass = function( - /* string */classStr, - /* HTMLElement? */parent, - /* string? */nodeType, - /* integer? */classMatchType, + /* string */classStr, + /* HTMLElement? */parent, + /* string? */nodeType, + /* integer? */classMatchType, /* boolean? */useNonXpath ){ // summary @@ -7245,7 +7245,7 @@ dojo.html.getElementsByClass = function( var reClass = new RegExp("(\\s|^)((" + classes.join(")|(") + "))(\\s|$)"); var srtLength = classes.join(" ").length; var candidateNodes = []; - + if(!useNonXpath && _document.evaluate) { // supports dom 3 xpath var xpath = ".//" + (nodeType || "*") + "[contains("; if(classMatchType != dojo.html.classMatchType.ContainsAny){ @@ -7283,7 +7283,7 @@ dojo.html.getElementsByClass = function( var nodeClasses = dojo.html.getClasses(node); if(nodeClasses.length == 0){ continue outer; } var matches = 0; - + for(var j = 0; j < nodeClasses.length; j++){ if(reClass.test(nodeClasses[j])){ if(classMatchType == dojo.html.classMatchType.ContainsAny){ @@ -7298,7 +7298,7 @@ dojo.html.getElementsByClass = function( } } } - + if(matches == classes.length){ if( (classMatchType == dojo.html.classMatchType.IsOnly)&& (matches == nodeClasses.length)){ @@ -7337,7 +7337,7 @@ dojo.html.getComputedStyle = function(/* HTMLElement */node, /* string */cssSele var cssSelector = dojo.html.toSelectorCase(cssSelector); var property = dojo.html.toCamelCase(cssSelector); if(!node || !node.style){ - return inValue; + return inValue; } else if (document.defaultView && dojo.html.isDescendantOf(node, node.ownerDocument)){ // W3, gecko, KHTML try{ // mozilla segfaults when margin-* and node is removed from doc @@ -7345,7 +7345,7 @@ dojo.html.getComputedStyle = function(/* HTMLElement */node, /* string */cssSele var cs = document.defaultView.getComputedStyle(node, ""); if(cs){ return cs.getPropertyValue(cssSelector); // integer - } + } }catch(e){ // reports are that Safari can throw an exception above if(node.style.getPropertyValue){ // W3 return node.style.getPropertyValue(cssSelector); // integer @@ -7356,7 +7356,7 @@ dojo.html.getComputedStyle = function(/* HTMLElement */node, /* string */cssSele } else if(node.currentStyle){ // IE return node.currentStyle[property]; // integer } - + if(node.style.getPropertyValue){ // W3 return node.style.getPropertyValue(cssSelector); // integer }else{ @@ -7400,11 +7400,11 @@ dojo.html.setStyleText = function (/* HTMLElement */target, /* string */text) { dojo.html.copyStyle = function(/* HTMLElement */target, /* HTMLElement */source){ // summary - // work around for opera which doesn't have cssText, and for IE which fails on setAttribute - if(!source.style.cssText){ - target.setAttribute("style", source.getAttribute("style")); + // work around for opera which doesn't have cssText, and for IE which fails on setAttribute + if(!source.style.cssText){ + target.setAttribute("style", source.getAttribute("style")); }else{ - target.style.cssText = source.style.cssText; + target.style.cssText = source.style.cssText; } dojo.html.addClass(target, dojo.html.getClass(source)); } @@ -7413,10 +7413,10 @@ dojo.html.getUnitValue = function(/* HTMLElement */node, /* string */cssSelector // summary // Get the value of passed selector, with the specific units used var s = dojo.html.getComputedStyle(node, cssSelector); - if((!s)||((s == 'auto')&&(autoIsZero))){ - return { value: 0, units: 'px' }; // object + if((!s)||((s == 'auto')&&(autoIsZero))){ + return { value: 0, units: 'px' }; // object } - // FIXME: is regex inefficient vs. parseInt or some manual test? + // FIXME: is regex inefficient vs. parseInt or some manual test? var match = s.match(/(\-?[\d.]+)([a-z%]*)/i); if (!match){return dojo.html.getUnitValue.bad;} return { value: Number(match[1]), units: match[2].toLowerCase() }; // object @@ -7428,13 +7428,13 @@ dojo.html.getPixelValue = function(/* HTMLElement */node, /* string */cssSelecto // Get the value of passed selector in pixels. var result = dojo.html.getUnitValue(node, cssSelector, autoIsZero); // FIXME: there is serious debate as to whether or not this is the right solution - if(isNaN(result.value)){ - return 0; // integer - } - // FIXME: code exists for converting other units to px (see Dean Edward's IE7) + if(isNaN(result.value)){ + return 0; // integer + } + // FIXME: code exists for converting other units to px (see Dean Edward's IE7) // but there are cross-browser complexities - if((result.value)&&(result.units != 'px')){ - return NaN; // integer + if((result.value)&&(result.units != 'px')){ + return NaN; // integer } return result.value; // integer } @@ -7443,15 +7443,15 @@ dojo.html.setPositivePixelValue = function(/* HTMLElement */node, /* string */se // summary // Attempt to set the value of selector on node as a positive pixel value. if(isNaN(value)){return false;} - node.style[selector] = Math.max(0, value) + 'px'; + node.style[selector] = Math.max(0, value) + 'px'; return true; // boolean } dojo.html.styleSheet = null; // FIXME: this is a really basic stub for adding and removing cssRules, but -// it assumes that you know the index of the cssRule that you want to add -// or remove, making it less than useful. So we need something that can +// it assumes that you know the index of the cssRule that you want to add +// or remove, making it less than useful. So we need something that can // search for the selector that you you want to remove. dojo.html.insertCssRule = function(/* string */selector, /* string */declaration, /* integer? */index) { // summary @@ -7463,8 +7463,8 @@ dojo.html.insertCssRule = function(/* string */selector, /* string */declaration // FIXME: should create a new style sheet here // fall back on an exsiting style sheet dojo.html.styleSheet = document.styleSheets[0]; - } else { - return null; // integer + } else { + return null; // integer } // fail } @@ -7473,8 +7473,8 @@ dojo.html.insertCssRule = function(/* string */selector, /* string */declaration index = dojo.html.styleSheet.cssRules.length; } else if (dojo.html.styleSheet.rules) { // IE index = dojo.html.styleSheet.rules.length; - } else { - return null; // integer + } else { + return null; // integer } // fail } @@ -7483,7 +7483,7 @@ dojo.html.insertCssRule = function(/* string */selector, /* string */declaration return dojo.html.styleSheet.insertRule(rule, index); // integer } else if (dojo.html.styleSheet.addRule) { // IE return dojo.html.styleSheet.addRule(selector, declaration, index); // integer - } else { + } else { return null; // integer } // fail } @@ -7554,7 +7554,7 @@ dojo.html.insertCssText = function(/* string */cssStr, /* HTMLDocument? */doc, / // summary // Attempt to insert CSS rules into the document through inserting a style element // DomNode Style = insertCssText(String ".dojoMenu {color: green;}"[, DomDoc document, dojo.uri.Uri Url ]) - if(!cssStr){ + if(!cssStr){ return; // HTMLStyleElement } if(!doc){ doc = document; } @@ -7566,14 +7566,14 @@ dojo.html.insertCssText = function(/* string */cssStr, /* HTMLDocument? */doc, / // IE is b0rken enough to require that we add the element to the doc // before changing it's properties var head = doc.getElementsByTagName("head")[0]; - if(!head){ // must have a head tag + if(!head){ // must have a head tag dojo.debug("No head tag in document, aborting styles"); return; // HTMLStyleElement }else{ head.appendChild(style); } if(style.styleSheet){// IE - var setFunc = function(){ + var setFunc = function(){ try{ style.styleSheet.cssText = cssStr; }catch(e){ dojo.debug(e); } @@ -7643,11 +7643,11 @@ dojo.html.getActiveStyleSheet = function(){ // return the title of the currently active stylesheet var i = 0, a, els = dojo.doc().getElementsByTagName("link"); while (a = els[i++]) { - if (a.getAttribute("rel").indexOf("style") != -1 - && a.getAttribute("title") + if (a.getAttribute("rel").indexOf("style") != -1 + && a.getAttribute("title") && !a.disabled ){ - return a.getAttribute("title"); // string + return a.getAttribute("title"); // string } } return null; // string @@ -7661,7 +7661,7 @@ dojo.html.getPreferredStyleSheet = function(){ if(a.getAttribute("rel").indexOf("style") != -1 && a.getAttribute("rel").indexOf("alt") == -1 && a.getAttribute("title") - ){ + ){ return a.getAttribute("title"); // string } } @@ -7789,13 +7789,13 @@ dojo.widget.waiNames = ["waiRole", "waiState"]; dojo.widget.wai = { // summary: Contains functions to set accessibility roles and states // onto widget elements - waiRole: { + waiRole: { // name: String: // information for mapping accessibility role - name: "waiRole", + name: "waiRole", // namespace: String: // URI of the namespace for the set of roles - "namespace": "http://www.w3.org/TR/xhtml2", + "namespace": "http://www.w3.org/TR/xhtml2", // alias: String: // The alias to assign the namespace alias: "x2", @@ -7803,13 +7803,13 @@ dojo.widget.wai = { // The prefix to assign to the role value prefix: "wairole:" }, - waiState: { + waiState: { // name: String: // information for mapping accessibility state - name: "waiState", + name: "waiState", // namespace: String: // URI of the namespace for the set of states - "namespace": "http://www.w3.org/2005/07/aaa", + "namespace": "http://www.w3.org/2005/07/aaa", // alias: String: // The alias to assign the namespace alias: "aaa", @@ -7820,7 +7820,7 @@ dojo.widget.wai = { setAttr: function(/*DomNode*/node, /*String*/ ns, /*String*/ attr, /*String|Boolean*/value){ // summary: Use appropriate API to set the role or state attribute onto the element. // description: In IE use the generic setAttribute() api. Append a namespace - // alias to the attribute name and appropriate prefix to the value. + // alias to the attribute name and appropriate prefix to the value. // Otherwise, use the setAttribueNS api to set the namespaced attribute. Also // add the appropriate prefix to the attribute value. if(dojo.render.html.ie){ @@ -7832,7 +7832,7 @@ dojo.widget.wai = { getAttr: function(/*DomNode*/ node, /*String*/ ns, /*String|Boolena*/ attr){ // Summary: Use the appropriate API to retrieve the role or state value - // Description: In IE use the generic getAttribute() api. An alias value + // Description: In IE use the generic getAttribute() api. An alias value // was added to the attribute name to simulate a namespace when the attribute // was set. Otherwise use the getAttributeNS() api to retrieve the state value if(dojo.render.html.ie){ @@ -7843,7 +7843,7 @@ dojo.widget.wai = { }, removeAttr: function(/*DomNode*/ node, /*String*/ ns, /*String|Boolena*/ attr){ // summary: Use the appropriate API to remove the role or state value - // description: In IE use the generic removeAttribute() api. An alias value + // description: In IE use the generic removeAttribute() api. An alias value // was added to the attribute name to simulate a namespace when the attribute // was set. Otherwise use the removeAttributeNS() api to remove the state value var success = true; //only IE returns a value @@ -7862,7 +7862,7 @@ dojo.widget.attachTemplateNodes = function(rootNode, /*Widget*/ targetObj, event // the dom node and it's descendants. This function iterates over all // nodes and looks for these properties: // * dojoAttachPoint - // * dojoAttachEvent + // * dojoAttachEvent // * waiRole // * waiState // * any "dojoOn*" proprties passed in the events array @@ -7882,7 +7882,7 @@ dojo.widget.attachTemplateNodes = function(rootNode, /*Widget*/ targetObj, event return str.replace(/^\s+|\s+$/g, ""); } - if(!rootNode){ + if(!rootNode){ rootNode = targetObj.domNode; } @@ -7931,8 +7931,8 @@ dojo.widget.attachTemplateNodes = function(rootNode, /*Widget*/ targetObj, event if(!thisFunc){ thisFunc = tevt; } - - var tf = function(){ + + var tf = function(){ var ntf = new String(thisFunc); return function(evt){ if(_this[ntf]){ @@ -7944,7 +7944,7 @@ dojo.widget.attachTemplateNodes = function(rootNode, /*Widget*/ targetObj, event // dojo.event.browser.addListener(baseNode, tevt, dojo.lang.hitch(_this, thisFunc)); } } - + for(var y=0; y -1) { value=value.replace("\"","""); @@ -8489,10 +8489,10 @@ dojo.declare("dojo.widget.DomWidget", }else{ // otherwise, we are required to instantiate a copy of the template // string if one is provided. - + // FIXME: need to be able to distinguish here what should be done // or provide a generic interface across all DOM implementations - // FIMXE: this breaks if the template has whitespace as its first + // FIMXE: this breaks if the template has whitespace as its first // characters // node = this.createNodesFromText(this.templateString, true); // this.templateNode = node[0].cloneNode(true); // we're optimistic here @@ -8502,7 +8502,7 @@ dojo.declare("dojo.widget.DomWidget", } } } - if((!this.templateNode)&&(!matches)){ + if((!this.templateNode)&&(!matches)){ dojo.debug("DomWidget.buildFromTemplate: could not create template"); return false; }else if(!matches){ @@ -8519,7 +8519,7 @@ dojo.declare("dojo.widget.DomWidget", // dojo.profile.start("attachTemplateNodes"); this.attachTemplateNodes(); // dojo.profile.end("attachTemplateNodes"); - + // relocate source contents to templated container node // this.containerNode must be able to receive children, or exceptions will be thrown if (this.isContainer && this.containerNode){ @@ -8531,7 +8531,7 @@ dojo.declare("dojo.widget.DomWidget", }, attachTemplateNodes: function(baseNode, targetObj){ - // summary: + // summary: // hooks up event handlers and property/node linkages. Calls // dojo.widget.attachTemplateNodes to do all the hard work. // baseNode: DomNode @@ -8540,7 +8540,7 @@ dojo.declare("dojo.widget.DomWidget", // defaults to "this" if(!baseNode){ baseNode = this.domNode; } if(!targetObj){ targetObj = this; } - return dojo.widget.attachTemplateNodes(baseNode, targetObj, + return dojo.widget.attachTemplateNodes(baseNode, targetObj, dojo.widget.getDojoEventsFromStr(this.templateString)); }, @@ -8554,7 +8554,7 @@ dojo.declare("dojo.widget.DomWidget", // dojo.unimplemented("dojo.widget.DomWidget.fillInTemplate"); }, - + // method over-ride destroyRendering: function(){ // summary: UI destructor. Destroy the dom nodes associated w/this widget. @@ -8629,7 +8629,7 @@ dojo.html.toggleShowing = function(/* HTMLElement */node){ } // Simple mapping of tag names to display values -// FIXME: simplistic +// FIXME: simplistic dojo.html.displayMap = { tr: '', td: '', th: '', img: 'inline', span: 'inline', input: 'inline', button: 'inline' }; dojo.html.suggestDisplayByTagName = function(/* HTMLElement */node){ @@ -8772,7 +8772,7 @@ dojo.html.sumAncestorProperties = function(/* HTMLElement */node, /* string */pr // Returns the sum of the passed property on all ancestors of node. node = dojo.byId(node); if(!node){ return 0; } // FIXME: throw an error? - + var retVal = 0; while(node){ if(dojo.html.getComputedStyle(node, 'position') == 'fixed'){ @@ -8788,35 +8788,35 @@ dojo.html.sumAncestorProperties = function(/* HTMLElement */node, /* string */pr return retVal; // integer } -dojo.html.setStyleAttributes = function(/* HTMLElement */node, /* string */attributes) { +dojo.html.setStyleAttributes = function(/* HTMLElement */node, /* string */attributes) { // summary // allows a dev to pass a string similar to what you'd pass in style="", and apply it to a node. node = dojo.byId(node); - var splittedAttribs=attributes.replace(/(;)?\s*$/, "").split(";"); - for(var i=0; i0){ ret.x += isNaN(n) ? 0 : n; @@ -8985,7 +8985,7 @@ dojo.html.getMarginExtent = function(/* HTMLElement */node, /* string */side){ dojo.html.getPaddingExtent = function(/* HTMLElement */node, /* string */side){ // summary - // Returns the width of the requested padding + // Returns the width of the requested padding return dojo.html._sumPixelValues(node, ["padding-" + side], true); // integer } @@ -9011,7 +9011,7 @@ dojo.html.getBoxSizing = function(/* HTMLElement */node){ // Returns which box model the passed element is working with var h = dojo.render.html; var bs = dojo.html.boxSizing; - if(((h.ie)||(h.opera)) && node.nodeName!="IMG"){ + if(((h.ie)||(h.opera)) && node.nodeName!="IMG"){ var cm = document["compatMode"]; if((cm == "BackCompat")||(cm == "QuirksMode")){ return bs.BORDER_BOX; // string @@ -9798,7 +9798,7 @@ dojo.gfx.color.named = { }; dojo.gfx.color.blend = function(a, b, weight){ - // summary: + // summary: // blend colors a and b (both as RGB array or hex strings) with weight // from -1 to +1, 0 being a 50/50 blend if(typeof a == "string"){ @@ -9812,7 +9812,7 @@ dojo.gfx.color.blend = function(a, b, weight){ // alex: this interface blows. // map -1 to 1 to the range 0 to 1 weight = ((weight + 1)/2); - + var c = []; // var stop = (1000*weight); @@ -9905,7 +9905,7 @@ dojo.lfx.Line = function(/*int*/ start, /*int*/ end){ dojo.lang.forEach(this.start, function(s,i){ diff[i] = this.end[i] - s; }, this); - + this.getValue = function(/*float*/ n){ var res = []; dojo.lang.forEach(this.start, function(s, i){ @@ -9915,7 +9915,7 @@ dojo.lfx.Line = function(/*int*/ start, /*int*/ end){ } }else{ var diff = end - start; - + this.getValue = function(/*float*/ n){ // summary: returns the point on the line // n: a floating point number greater than 0 and less than 1 @@ -9966,7 +9966,7 @@ dojo.lang.extend(dojo.lfx.IAnimation, { easing: null, repeatCount: 0, rate: 25, - + // events handler: null, beforeBegin: null, @@ -9976,12 +9976,12 @@ dojo.lang.extend(dojo.lfx.IAnimation, { onPlay: null, onPause: null, onStop: null, - + // public methods play: null, pause: null, stop: null, - + connect: function(/*Event*/ evt, /*Object*/ scope, /*Function*/ newFunc){ // summary: Convenience function. Quickly connect to an event // of this object and save the old functions connected to it. @@ -10015,7 +10015,7 @@ dojo.lang.extend(dojo.lfx.IAnimation, { } return this; // dojo.lfx.IAnimation }, - + repeat: function(/*int*/ count){ // summary: Set the repeat count of this object. // count: How many times to repeat the animation. @@ -10028,11 +10028,11 @@ dojo.lang.extend(dojo.lfx.IAnimation, { _paused: false }); -dojo.lfx.Animation = function( /*Object*/ handlers, - /*int*/ duration, - /*dojo.lfx.Line*/ curve, - /*function*/ easing, - /*int*/ repeatCount, +dojo.lfx.Animation = function( /*Object*/ handlers, + /*int*/ duration, + /*dojo.lfx.Line*/ curve, + /*function*/ easing, + /*int*/ repeatCount, /*int*/ rate){ // summary // a generic animation object that fires callbacks into it's handlers @@ -10068,7 +10068,7 @@ dojo.lfx.Animation = function( /*Object*/ handlers, if(rate){ this.rate = rate; } if(handlers){ dojo.lang.forEach([ - "handler", "beforeBegin", "onBegin", + "handler", "beforeBegin", "onBegin", "onEnd", "onPlay", "onStop", "onAnimate" ], function(item){ if(handlers[item]){ @@ -10103,7 +10103,7 @@ dojo.lang.extend(dojo.lfx.Animation, { }else if(this._active && !this._paused){ return this; // dojo.lfx.Animation } - + this.fire("handler", ["beforeBegin"]); this.fire("beforeBegin"); @@ -10111,7 +10111,7 @@ dojo.lang.extend(dojo.lfx.Animation, { setTimeout(dojo.lang.hitch(this, function(){ this.play(null, gotoStart); }), delay); return this; // dojo.lfx.Animation } - + this._startTime = new Date().valueOf(); if(this._paused){ this._startTime -= (this.duration * this._percent / 100); @@ -10120,7 +10120,7 @@ dojo.lang.extend(dojo.lfx.Animation, { this._active = true; this._paused = false; - + var step = this._percent / 100; var value = this.curve.getValue(step); if(this._percent == 0 ){ @@ -10201,7 +10201,7 @@ dojo.lang.extend(dojo.lfx.Animation, { }else{ this._percent = step * 100; } - + // Perform easing if((this.easing)&&(dojo.lang.isFunction(this.easing))){ step = this.easing(step); @@ -10240,14 +10240,14 @@ dojo.lfx.Combine = function(/*dojo.lfx.IAnimation...*/ animations){ dojo.lfx.IAnimation.call(this); this._anims = []; this._animsEnded = 0; - + var anims = arguments; if(anims.length == 1 && (dojo.lang.isArray(anims[0]) || dojo.lang.isArrayLike(anims[0]))){ /* animations: dojo.lfx.IAnimation[] pId: a */ anims = anims[0]; } - + dojo.lang.forEach(anims, function(anim){ this._anims.push(anim); anim.connect("onEnd", dojo.lang.hitch(this, "_onAnimsEnded")); @@ -10257,7 +10257,7 @@ dojo.inherits(dojo.lfx.Combine, dojo.lfx.IAnimation); dojo.lang.extend(dojo.lfx.Combine, { // private members _animsEnded: 0, - + // public methods play: function(/*int?*/ delay, /*bool?*/ gotoStart){ // summary: Start the animations. @@ -10272,7 +10272,7 @@ dojo.lang.extend(dojo.lfx.Combine, { setTimeout(dojo.lang.hitch(this, function(){ this.play(null, gotoStart); }), delay); return this; // dojo.lfx.Combine } - + if(gotoStart || this._anims[0].percent == 0){ this.fire("onBegin"); } @@ -10280,14 +10280,14 @@ dojo.lang.extend(dojo.lfx.Combine, { this._animsCall("play", null, gotoStart); return this; // dojo.lfx.Combine }, - + pause: function(){ // summary: Pauses the running animations. this.fire("onPause"); - this._animsCall("pause"); + this._animsCall("pause"); return this; // dojo.lfx.Combine }, - + stop: function(/*bool?*/ gotoEnd){ // summary: Stops the running animations. // gotoEnd: If true, the animations will end. @@ -10295,7 +10295,7 @@ dojo.lang.extend(dojo.lfx.Combine, { this._animsCall("stop", gotoEnd); return this; // dojo.lfx.Combine }, - + // private methods _onAnimsEnded: function(){ this._animsEnded++; @@ -10304,7 +10304,7 @@ dojo.lang.extend(dojo.lfx.Combine, { } return this; // dojo.lfx.Combine }, - + _animsCall: function(/*String*/ funcName){ var args = []; if(arguments.length > 1){ @@ -10326,14 +10326,14 @@ dojo.lfx.Chain = function(/*dojo.lfx.IAnimation...*/ animations) { dojo.lfx.IAnimation.call(this); this._anims = []; this._currAnim = -1; - + var anims = arguments; if(anims.length == 1 && (dojo.lang.isArray(anims[0]) || dojo.lang.isArrayLike(anims[0]))){ /* animations: dojo.lfx.IAnimation[] pId: a */ anims = anims[0]; } - + var _this = this; dojo.lang.forEach(anims, function(anim, i, anims_arr){ this._anims.push(anim); @@ -10348,7 +10348,7 @@ dojo.inherits(dojo.lfx.Chain, dojo.lfx.IAnimation); dojo.lang.extend(dojo.lfx.Chain, { // private members _currAnim: -1, - + // public methods play: function(/*int?*/ delay, /*bool?*/ gotoStart){ // summary: Start the animation sequence. @@ -10367,7 +10367,7 @@ dojo.lang.extend(dojo.lfx.Chain, { setTimeout(dojo.lang.hitch(this, function(){ this.play(null, gotoStart); }), delay); return this; // dojo.lfx.Chain } - + if(currentAnimation){ if(this._currAnim == 0){ this.fire("handler", ["begin", this._currAnim]); @@ -10378,7 +10378,7 @@ dojo.lang.extend(dojo.lfx.Chain, { } return this; // dojo.lfx.Chain }, - + pause: function(){ // summary: Pauses the running animation sequence. if( this._anims[this._currAnim] ) { @@ -10387,7 +10387,7 @@ dojo.lang.extend(dojo.lfx.Chain, { } return this; // dojo.lfx.Chain }, - + playPause: function(){ // summary: If the animation sequence is playing, pause it; otherwise, // play it. @@ -10403,7 +10403,7 @@ dojo.lang.extend(dojo.lfx.Chain, { } return this; // dojo.lfx.Chain }, - + stop: function(){ // summary: Stops the running animations. var currAnim = this._anims[this._currAnim]; @@ -10413,7 +10413,7 @@ dojo.lang.extend(dojo.lfx.Chain, { } return currAnim; // dojo.lfx.IAnimation }, - + // private methods _playNext: function(){ if( this._currAnim == -1 || this._anims.length == 0 ) { return this; } @@ -10498,8 +10498,8 @@ dojo.lfx.html._byId = function(nodes){ } } -dojo.lfx.html.propertyAnimation = function( /*DOMNode[]*/ nodes, - /*Object[]*/ propertyMap, +dojo.lfx.html.propertyAnimation = function( /*DOMNode[]*/ nodes, + /*Object[]*/ propertyMap, /*int*/ duration, /*function*/ easing, /*Object*/ handlers){ @@ -10519,12 +10519,12 @@ dojo.lfx.html.propertyAnimation = function( /*DOMNode[]*/ nodes, "duration": duration, "easing": easing||dojo.lfx.easeDefault }; - + var setEmUp = function(args){ if(args.nodes.length==1){ // FIXME: we're only supporting start-value filling when one node is // passed - + var pm = args.propertyMap; if(!dojo.lang.isArray(args.propertyMap)){ // it's stupid to have to pack an array with a set of objects @@ -10550,7 +10550,7 @@ dojo.lfx.html.propertyAnimation = function( /*DOMNode[]*/ nodes, var coordsAsInts = function(coords){ var cints = []; - dojo.lang.forEach(coords, function(c){ + dojo.lang.forEach(coords, function(c){ cints.push(Math.round(c)); }); return cints; @@ -10613,10 +10613,10 @@ dojo.lfx.html.propertyAnimation = function( /*DOMNode[]*/ nodes, return ret; } } - + var anim = new dojo.lfx.Animation({ - beforeBegin: function(){ - setEmUp(targs); + beforeBegin: function(){ + setEmUp(targs); anim.curve = new propLine(targs.propertyMap); }, onAnimate: function(propValues){ @@ -10625,7 +10625,7 @@ dojo.lfx.html.propertyAnimation = function( /*DOMNode[]*/ nodes, }); } }, - targs.duration, + targs.duration, null, targs.easing ); @@ -10636,7 +10636,7 @@ dojo.lfx.html.propertyAnimation = function( /*DOMNode[]*/ nodes, } } } - + return anim; // dojo.lfx.Animation } @@ -10718,7 +10718,7 @@ dojo.lfx.html.fadeOut = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Funct // nodes: An array of DOMNodes or one DOMNode. // duration: Duration of the animation in milliseconds. // easing: An easing function. - // callback: Function to run at the end of the animation. + // callback: Function to run at the end of the animation. return dojo.lfx.html.fade(nodes, { end: 0 }, duration, easing, callback); // dojo.lfx.Animation } @@ -10728,14 +10728,14 @@ dojo.lfx.html.fadeShow = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Func // nodes: An array of DOMNodes or one DOMNode. // duration: Duration of the animation in milliseconds. // easing: An easing function. - // callback: Function to run at the end of the animation. + // callback: Function to run at the end of the animation. nodes=dojo.lfx.html._byId(nodes); dojo.lang.forEach(nodes, function(node){ dojo.html.setOpacity(node, 0.0); }); var anim = dojo.lfx.html.fadeIn(nodes, duration, easing, callback); - anim.connect("beforeBegin", function(){ + anim.connect("beforeBegin", function(){ if(dojo.lang.isArrayLike(nodes)){ dojo.lang.forEach(nodes, dojo.html.show); }else{ @@ -10761,7 +10761,7 @@ dojo.lfx.html.fadeHide = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Func } if(callback){ callback(nodes, anim); } }); - + return anim; // dojo.lfx.Animation } @@ -10776,7 +10776,7 @@ dojo.lfx.html.wipeIn = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Functi dojo.lang.forEach(nodes, function(node){ var oprop = { }; // old properties of node (before we mucked w/them) - + // get node height, either it's natural height or it's height specified via style or class attributes // (for FF, the node has to be (temporarily) rendered to measure height) // TODO: should this offscreen code be part of dojo.html, so that getBorderBox() works on hidden nodes? @@ -10795,12 +10795,12 @@ dojo.lfx.html.wipeIn = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Functi var anim = dojo.lfx.propertyAnimation(node, { "height": { start: 1, // 0 causes IE to display the whole panel - end: function(){ return height; } + end: function(){ return height; } } - }, - duration, + }, + duration, easing); - + anim.connect("beforeBegin", function(){ oprop.overflow = node.style.overflow; oprop.height = node.style.height; @@ -10810,8 +10810,8 @@ dojo.lfx.html.wipeIn = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Functi } dojo.html.show(node); }); - - anim.connect("onEnd", function(){ + + anim.connect("onEnd", function(){ with(node.style){ overflow = oprop.overflow; height = oprop.height; @@ -10820,7 +10820,7 @@ dojo.lfx.html.wipeIn = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Functi }); anims.push(anim); }); - + return dojo.lfx.combine(anims); // dojo.lfx.Combine } @@ -10832,14 +10832,14 @@ dojo.lfx.html.wipeOut = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Funct // callback: Function to run at the end of the animation. nodes = dojo.lfx.html._byId(nodes); var anims = []; - + dojo.lang.forEach(nodes, function(node){ var oprop = { }; // old properties of node (before we mucked w/them) var anim = dojo.lfx.propertyAnimation(node, { "height": { start: function(){ return dojo.html.getContentBox(node).height; }, end: 1 // 0 causes IE to display the whole panel - } + } }, duration, easing, @@ -10852,8 +10852,8 @@ dojo.lfx.html.wipeOut = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Funct } dojo.html.show(node); }, - - "onEnd": function(){ + + "onEnd": function(){ dojo.html.hide(node); with(node.style){ overflow = oprop.overflow; @@ -10884,7 +10884,7 @@ dojo.lfx.html.slideTo = function(/*DOMNode*/ nodes, nodes = dojo.lfx.html._byId(nodes); var anims = []; var compute = dojo.html.getComputedStyle; - + if(dojo.lang.isArray(coords)){ /* coords: Array pId: a */ @@ -10894,7 +10894,7 @@ dojo.lfx.html.slideTo = function(/*DOMNode*/ nodes, dojo.lang.forEach(nodes, function(node){ var top = null; var left = null; - + var init = (function(){ var innerNode = node; return function(){ @@ -10911,7 +10911,7 @@ dojo.lfx.html.slideTo = function(/*DOMNode*/ nodes, } })(); init(); - + var anim = dojo.lfx.propertyAnimation(node, { "top": { start: top, end: (coords.top||0) }, "left": { start: left, end: (coords.left||0) } @@ -10927,7 +10927,7 @@ dojo.lfx.html.slideTo = function(/*DOMNode*/ nodes, anims.push(anim); }); - + return dojo.lfx.combine(anims); // dojo.lfx.Combine } @@ -10953,7 +10953,7 @@ dojo.lfx.html.slideBy = function(/*DOMNode*/ nodes, /*Object*/ coords, /*int?*/ dojo.lang.forEach(nodes, function(node){ var top = null; var left = null; - + var init = (function(){ var innerNode = node; return function(){ @@ -10970,7 +10970,7 @@ dojo.lfx.html.slideBy = function(/*DOMNode*/ nodes, /*Object*/ coords, /*int?*/ } })(); init(); - + var anim = dojo.lfx.propertyAnimation(node, { "top": { start: top, end: top+(coords.top||0) }, @@ -10994,7 +10994,7 @@ dojo.lfx.html.explode = function(/*DOMNode*/ start, /*int?*/ duration, /*Function?*/ easing, /*Function?*/ callback){ - // summary: Returns an animation that will + // summary: Returns an animation that will // start: // endNode: // duration: Duration of the animation in milliseconds. @@ -11031,8 +11031,8 @@ dojo.lfx.html.explode = function(/*DOMNode*/ start, dojo.lang.forEach(["height", "width", "top", "left"], function(type){ props[type] = { start: startCoords[type], end: endCoords[type] } }); - - var anim = new dojo.lfx.propertyAnimation(outline, + + var anim = new dojo.lfx.propertyAnimation(outline, props, duration, easing, @@ -11058,7 +11058,7 @@ dojo.lfx.html.implode = function(/*DOMNode*/ startNode, /*int?*/ duration, /*Function?*/ easing, /*Function?*/ callback){ - // summary: Returns an animation that will + // summary: Returns an animation that will // startNode: // end: // duration: Duration of the animation in milliseconds. @@ -11085,7 +11085,7 @@ dojo.lfx.html.implode = function(/*DOMNode*/ startNode, dojo.lang.forEach(["height", "width", "top", "left"], function(type){ props[type] = { start: startCoords[type], end: endCoords[type] } }); - + var anim = new dojo.lfx.propertyAnimation(outline, props, duration, @@ -11132,18 +11132,18 @@ dojo.lfx.html.highlight = function(/*DOMNode[]*/ nodes, var rgb = new dojo.gfx.color.Color(startColor); var endRgb = new dojo.gfx.color.Color(color); - var anim = dojo.lfx.propertyAnimation(node, - { "background-color": { start: rgb, end: endRgb } }, - duration, + var anim = dojo.lfx.propertyAnimation(node, + { "background-color": { start: rgb, end: endRgb } }, + duration, easing, { - "beforeBegin": function(){ + "beforeBegin": function(){ if(bgImage){ node.style.backgroundImage = "none"; } node.style.backgroundColor = "rgb(" + rgb.toRgb().join(",") + ")"; }, - "onEnd": function(){ + "onEnd": function(){ if(bgImage){ node.style.backgroundImage = bgImage; } @@ -11181,19 +11181,19 @@ dojo.lfx.html.unhighlight = function(/*DOMNode[]*/ nodes, var rgb = new dojo.gfx.color.Color(endColor); var bgImage = dojo.html.getStyle(node, "background-image"); - - var anim = dojo.lfx.propertyAnimation(node, + + var anim = dojo.lfx.propertyAnimation(node, { "background-color": { start: color, end: rgb } }, - duration, + duration, easing, { - "beforeBegin": function(){ + "beforeBegin": function(){ if(bgImage){ node.style.backgroundImage = "none"; } node.style.backgroundColor = "rgb(" + color.toRgb().join(",") + ")"; }, - "onEnd": function(){ + "onEnd": function(){ if(callback){ callback(node, anim); } @@ -11215,7 +11215,7 @@ dojo.lfx.toggle.plain = { dojo.html.show(node); if(dojo.lang.isFunction(callback)){ callback(); } }, - + hide: function(node, duration, easing, callback){ dojo.html.hide(node); if(dojo.lang.isFunction(callback)){ callback(); } @@ -11254,15 +11254,15 @@ dojo.lfx.toggle.explode = { dojo.provide("dojo.widget.HtmlWidget"); -dojo.declare("dojo.widget.HtmlWidget", dojo.widget.DomWidget, { +dojo.declare("dojo.widget.HtmlWidget", dojo.widget.DomWidget, { // summary // Base class for all browser based widgets, or at least "html" widgets. // The meaning of "html" has become unclear; in practice, all widgets derive from this class. - + // templateCssPath: String // Path to CSS file for this widget templateCssPath: null, - + // templatePath: String // Path to template (HTML file) for this widget templatePath: null, @@ -11315,7 +11315,7 @@ dojo.declare("dojo.widget.HtmlWidget", dojo.widget.DomWidget, { ///////////////////////////////////////////////////////// isShowing: function(){ // summary - // Tests whether widget is set to show-mode or hide-mode (see show() and + // Tests whether widget is set to show-mode or hide-mode (see show() and // hide() methods) // // This function is poorly named. Even if widget is in show-mode, @@ -11403,7 +11403,7 @@ dojo.declare("dojo.widget.HtmlWidget", dojo.widget.DomWidget, { resizeTo: function(w, h){ // summary: explicitly set this widget's size (in pixels). dojo.html.setMarginBox(this.domNode, { width: w, height: h }); - + // can't do sizing if widget is hidden because referencing node.offsetWidth/node.offsetHeight returns 0. // do sizing on show() instead. if(this.isShowing()){ @@ -11468,7 +11468,7 @@ dojo.string.repeat = function(/* string */str, /* integer */count, /* string? */ dojo.string.pad = function(/* string */str, /* integer */len/*=2*/, /* string */ c/*='0'*/, /* integer */dir/*=1*/) { // summary - // Pad 'str' to guarantee that it is at least 'len' length with the character 'c' at either the + // Pad 'str' to guarantee that it is at least 'len' length with the character 'c' at either the // start (dir=1) or end (dir=-1) of the string var out = String(str); if(!c) { @@ -11505,7 +11505,7 @@ dojo.provide("dojo.io.common"); /****************************************************************************** * Notes about dojo.io design: - * + * * The dojo.io.* package has the unenviable task of making a lot of different * types of I/O feel natural, despite a universal lack of good (or even * reasonable!) I/O capability in the host environment. So lets pin this down @@ -11549,7 +11549,7 @@ dojo.provide("dojo.io.common"); * A discussion between Dylan, Mark, Tom, and Alex helped to lay down a lot * the IO API interface. A transcript of it can be found at: * http://dojotoolkit.org/viewcvs/viewcvs.py/documents/irc/irc_io_api_log.txt?rev=307&view=auto - * + * * Also referenced in the design of the API was the DOM 3 L&S spec: * http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407/load-save.html ******************************************************************************/ @@ -11582,28 +11582,28 @@ dojo.lang.extend(dojo.io.Request, { /** The URL to hit */ url: "", - + /** The mime type used to interrpret the response body */ mimetype: "text/plain", - + /** The HTTP method to use */ method: "GET", - + /** An Object containing key-value pairs to be included with the request */ content: undefined, // Object - + /** The transport medium to use */ transport: undefined, // String - + /** If defined the URL of the page is physically changed */ changeUrl: undefined, // String - + /** A form node to use in the request */ formNode: undefined, // HTMLFormElement - + /** Whether the request should be made synchronously */ sync: false, - + bindSuccess: false, /** Cache/look for the request in the cache before attempting to request? @@ -11613,7 +11613,7 @@ dojo.lang.extend(dojo.io.Request, { /** Prevent the browser from caching this by adding a query string argument to the URL */ preventCache: false, - + // events stuff load: function(/*String*/type, /*Object*/data, /*Object*/transportImplementation, /*Object*/kwArgs){ // summary: @@ -11682,18 +11682,18 @@ dojo.lang.extend(dojo.io.Request, { // kwArgs: Object // Object that contains the request parameters that were given to the // bind call. Useful for storing and retrieving state from when bind - // was called. + // was called. }, //FIXME: change IframeIO.js to use timeouts? // The number of seconds to wait until firing a timeout callback. // If it is zero, that means, don't do a timeout check. timeoutSeconds: 0, - + // the abort method needs to be filled in by the transport that accepts the // bind() request abort: function(){ }, - + // backButton: function(){ }, // forwardButton: function(){ }, @@ -11707,7 +11707,7 @@ dojo.lang.extend(dojo.io.Request, { if(!kwArgs["method"] && kwArgs["formNode"] && kwArgs["formNode"].method) { kwArgs.method = kwArgs["formNode"].method; } - + // backwards compatibility if(!kwArgs["handle"] && kwArgs["handler"]){ kwArgs.handle = kwArgs.handler; } if(!kwArgs["load"] && kwArgs["loaded"]){ kwArgs.load = kwArgs.loaded; } @@ -11787,7 +11787,7 @@ dojo.io.bind = function(/*dojo.io.Request or Object*/request){ } }else{ // otherwise we do our best to auto-detect what available transports - // will handle + // will handle for(var x=0; x 0){ @@ -12465,7 +12465,7 @@ dojo.undo.browser = { return; } } - + // ok, that didn't work, try someplace back in the history stack if((hsl >= 2)&&(this.historyStack[hsl-2])){ if(this.historyStack[hsl-2].urlHash==window.location.hash){ @@ -12480,7 +12480,7 @@ dojo.undo.browser = { //summary: private method. Do not call this directly. if(!dojo.render.html.opera){ var query = this._getUrlQuery(ifrLoc.href); - if(query == null){ + if(query == null){ // alert("iframeLoaded"); // we hit the end of the history, so we should go back if(this.historyStack.length == 1){ @@ -12493,7 +12493,7 @@ dojo.undo.browser = { this.moveForward = false; return; } - + //Check the back stack first, since it is more likely. //Note that only one step back or forward is supported. if(this.historyStack.length >= 2 && query == this._getUrlQuery(this.historyStack[this.historyStack.length-2].url)){ @@ -12558,12 +12558,12 @@ dojo.undo.browser = { return segments[1]; //String } }, - + _loadIframeHistory: function(){ //summary: private method. Do not call this directly. var url = dojo.hostenv.getBaseScriptUri()+"iframe_history.html?"+(new Date()).getTime(); this.moveForward = true; - dojo.io.setIFrameSrc(this.historyIframe, url, false); + dojo.io.setIFrameSrc(this.historyIframe, url, false); return url; //String } } @@ -12910,7 +12910,7 @@ dojo.io.XMLHTTPTransport = new function(){ try{ var tif = this.inFlight[x]; if(!tif || tif.http._aborted || !tif.http.readyState){ - this.inFlight.splice(x, 1); continue; + this.inFlight.splice(x, 1); continue; } if(4==tif.http.readyState){ // remove it so we can clean refs @@ -12926,7 +12926,7 @@ dojo.io.XMLHTTPTransport = new function(){ if(typeof tif.http.abort == "function"){ tif.http.abort(); } - + // remove it so we can clean refs this.inFlight.splice(x, 1); tif.req[(typeof tif.req.timeout == "function") ? "timeout" : "handle"]("timeout", null, tif.http, tif.req); @@ -13058,7 +13058,7 @@ dojo.io.XMLHTTPTransport = new function(){ // enforce multipart when sending files kwArgs.multipart = true; }else if(!kwArgs["multipart"]){ - // default + // default kwArgs.multipart = false; } } @@ -13082,7 +13082,7 @@ dojo.io.XMLHTTPTransport = new function(){ if(content) { query += dojo.io.argsFromMap(content, kwArgs.encoding); } - + if(kwArgs.method.toLowerCase() == "get" || !kwArgs.multipart){ break; } @@ -13094,7 +13094,7 @@ dojo.io.XMLHTTPTransport = new function(){ if(q[i].length){ var p = q[i].split("="); t.push( "--" + this.multipartBoundary, - "Content-Disposition: form-data; name=\"" + p[0] + "\"", + "Content-Disposition: form-data; name=\"" + p[0] + "\"", "", p[1]); } @@ -13150,12 +13150,12 @@ dojo.io.XMLHTTPTransport = new function(){ // much of this is from getText, but reproduced here because we need // more flexibility - var http = dojo.hostenv.getXmlhttpObject(kwArgs); + var http = dojo.hostenv.getXmlhttpObject(kwArgs); var received = false; // build a handler function that calls back to the handler obj if(async){ - var startTime = + var startTime = // FIXME: setting up this callback handler leaks on IE!!! this.inFlight.push({ "req": kwArgs, @@ -13179,7 +13179,7 @@ dojo.io.XMLHTTPTransport = new function(){ http.open("POST", url, async, kwArgs.user, kwArgs.password); } setHeaders(http, kwArgs); - http.setRequestHeader("Content-Type", kwArgs.multipart ? ("multipart/form-data; boundary=" + this.multipartBoundary) : + http.setRequestHeader("Content-Type", kwArgs.multipart ? ("multipart/form-data; boundary=" + this.multipartBoundary) : (kwArgs.contentType || "application/x-www-form-urlencoded")); try{ http.send(query); @@ -13221,7 +13221,7 @@ dojo.io.XMLHTTPTransport = new function(){ kwArgs.abort = function(){ try{// khtml doesent reset readyState on abort, need this workaround - http._aborted = true; + http._aborted = true; }catch(e){/*squelsh*/} return http.abort(); } @@ -13234,8 +13234,8 @@ dojo.io.XMLHTTPTransport = new function(){ } dojo.provide("dojo.io.cookie"); -dojo.io.cookie.setCookie = function(/*String*/name, /*String*/value, - /*Number?*/days, /*String?*/path, +dojo.io.cookie.setCookie = function(/*String*/name, /*String*/value, + /*Number?*/days, /*String?*/path, /*String?*/domain, /*boolean?*/secure){ //summary: sets a cookie. var expires = -1; @@ -13279,9 +13279,9 @@ dojo.io.cookie.deleteCookie = function(/*String*/name){ dojo.io.cookie.setCookie(name, "-", 0); } -dojo.io.cookie.setObjectCookie = function( /*String*/name, /*Object*/obj, - /*Number?*/days, /*String?*/path, - /*String?*/domain, /*boolean?*/secure, +dojo.io.cookie.setObjectCookie = function( /*String*/name, /*Object*/obj, + /*Number?*/days, /*String?*/path, + /*String?*/domain, /*boolean?*/secure, /*boolean?*/clearCurrent){ //summary: Takes an object, serializes it to a cookie value, and either //sets a cookie with the serialized value. @@ -14306,7 +14306,7 @@ dojo.html.clearSelection = function(){ var _window = dojo.global(); var _document = dojo.doc(); try{ - if(_window["getSelection"]){ + if(_window["getSelection"]){ if(dojo.render.html.safari){ // pulled from WebCore/ecma/kjs_window.cpp, line 2536 _window.getSelection().collapse(); @@ -14331,11 +14331,11 @@ dojo.html.disableSelection = function(/*DomNode*/element){ // summary: disable selection on a node element = dojo.byId(element)||dojo.body(); var h = dojo.render.html; - + if(h.mozilla){ element.style.MozUserSelect = "none"; }else if(h.safari){ - element.style.KhtmlUserSelect = "none"; + element.style.KhtmlUserSelect = "none"; }else if(h.ie){ element.unselectable = "on"; }else{ @@ -14347,10 +14347,10 @@ dojo.html.disableSelection = function(/*DomNode*/element){ dojo.html.enableSelection = function(/*DomNode*/element){ // summary: enable selection on a node element = dojo.byId(element)||dojo.body(); - + var h = dojo.render.html; - if(h.mozilla){ - element.style.MozUserSelect = ""; + if(h.mozilla){ + element.style.MozUserSelect = ""; }else if(h.safari){ element.style.KhtmlUserSelect = ""; }else if(h.ie){ @@ -14396,12 +14396,12 @@ dojo.lang.mixin(dojo.html.selection, { return dojo.html.selectionType[dojo.doc().selection.type.toUpperCase()]; }else{ var stype = dojo.html.selectionType.TEXT; - + // Check if the actual selection is a CONTROL (IMG, TABLE, HR, etc...). var oSel; try {oSel = dojo.global().getSelection();} catch (e) {} - + if(oSel && oSel.rangeCount==1){ var oRange = oSel.getRangeAt(0); if (oRange.startContainer == oRange.endContainer && (oRange.endOffset - oRange.startOffset) == 1 @@ -14428,13 +14428,13 @@ dojo.lang.mixin(dojo.html.selection, { } }, getSelectedElement: function() { - // summary: + // summary: // Retrieves the selected element (if any), just in the case that a single // element (object like and image or a table) is selected. if ( dojo.html.selection.getType() == dojo.html.selectionType.CONTROL ){ if(dojo.doc()["selection"]){ //IE var range = dojo.doc().selection.createRange(); - + if ( range && range.item ){ return dojo.doc().selection.createRange().item(0); } @@ -14445,7 +14445,7 @@ dojo.lang.mixin(dojo.html.selection, { } }, getParentElement: function() { - // summary: + // summary: // Get the parent element of the current selection if(dojo.html.selection.getType() == dojo.html.selectionType.CONTROL){ var p = dojo.html.selection.getSelectedElement(); @@ -14457,11 +14457,11 @@ dojo.lang.mixin(dojo.html.selection, { var selection = dojo.global().getSelection(); if(selection){ var node = selection.anchorNode; - + while ( node && node.nodeType != dojo.dom.ELEMENT_NODE ){ node = node.parentNode; } - + return node; } } @@ -14502,7 +14502,7 @@ dojo.lang.mixin(dojo.html.selection, { } }, hasAncestorElement: function(/*String*/tagName /* ... */){ - // summary: + // summary: // Check whether current selection has a parent element which is of type tagName (or one of the other specified tagName) return (dojo.html.selection.getAncestorElement.apply(this, arguments) != null); }, @@ -14639,7 +14639,7 @@ dojo.lang.mixin(dojo.html.selection, { if ( selection.type.toUpperCase() != "NONE" ){ selection.clear(); } - + return selection; }else{ var selection = dojo.global().getSelection(); @@ -14647,7 +14647,7 @@ dojo.lang.mixin(dojo.html.selection, { for ( var i = 0; i < selection.rangeCount; i++ ){ selection.getRangeAt(i).deleteContents(); } - + return selection; } } @@ -14657,7 +14657,7 @@ dojo.provide("dojo.Deferred"); dojo.Deferred = function(/*Function?*/ canceller){ /* - NOTE: this namespace and documentation are imported wholesale + NOTE: this namespace and documentation are imported wholesale from MochiKit Encapsulates a sequence of callbacks in response to a value that @@ -14745,7 +14745,7 @@ dojo.Deferred = function(/*Function?*/ canceller){ cancellable Deferreds. */ - + this.chain = []; this.id = this._nextId(); this.fired = -1; @@ -14816,7 +14816,7 @@ dojo.lang.extend(dojo.Deferred, { this.results[0].cancel(); } }, - + _pause: function(){ // summary: Used internally to signal that it's waiting on another Deferred @@ -14857,7 +14857,7 @@ dojo.lang.extend(dojo.Deferred, { callback: function(res){ // summary: Begin the callback sequence with a non-error value. - + /* callback or errback should only be called once on a given Deferred. @@ -15091,7 +15091,7 @@ dojo.widget.defineWidget( setupDefaultShortcuts: function(){ // summary: add some default key handlers - // description: + // description: // Overwrite this to setup your own handlers. The default // implementation does not use Editor2 commands, but directly // executes the builtin commands within the underlying browser @@ -15942,7 +15942,7 @@ dojo.widget.defineWidget( var isLastNode = (sel.focusNode == this.document.body.lastChild); if(!isLastNode){ return; } - var isText = (sel.focusNode.nodeType == 3); + var isText = (sel.focusNode.nodeType == 3); if(!isText){ return; } var isLastChar = (sel.focusOffset == sel.focusNode.nodeValue.length); if(!isLastChar){ return; } @@ -16713,7 +16713,7 @@ dojo.widget.defineWidget( { // summary // Grid showing various colors, so the user pick a certain color - + // palette: String // Size of grid, either "7x10" or "3x4". palette: "7x10", @@ -17314,26 +17314,26 @@ dojo.lang.getType = function(/* anything */ value){ // summary: Attempts to determine what type value is. // value: Any literal value or object instance. try{ - if(dojo.lang.isArray(value)){ - return "array"; // string + if(dojo.lang.isArray(value)){ + return "array"; // string } - if(dojo.lang.isFunction(value)){ - return "function"; // string + if(dojo.lang.isFunction(value)){ + return "function"; // string } - if(dojo.lang.isString(value)){ - return "string"; // string + if(dojo.lang.isString(value)){ + return "string"; // string } - if(dojo.lang.isNumber(value)){ - return "number"; // string + if(dojo.lang.isNumber(value)){ + return "number"; // string } - if(dojo.lang.isBoolean(value)){ - return "boolean"; // string + if(dojo.lang.isBoolean(value)){ + return "boolean"; // string } - if(dojo.lang.isAlien(value)){ - return "alien"; // string + if(dojo.lang.isAlien(value)){ + return "alien"; // string } - if(dojo.lang.isUndefined(value)){ - return "undefined"; // string + if(dojo.lang.isUndefined(value)){ + return "undefined"; // string } // FIXME: should this go first? for(var name in dojo.lang.whatAmI.custom){ @@ -17341,8 +17341,8 @@ dojo.lang.getType = function(/* anything */ value){ return name; // string } } - if(dojo.lang.isObject(value)){ - return "object"; // string + if(dojo.lang.isObject(value)){ + return "object"; // string } }catch(e){} return "unknown"; // string @@ -17352,7 +17352,7 @@ dojo.lang.isNumeric = function(/* anything */ value){ // summary: // Returns true if value can be interpreted as a number // value: Any literal value or object instance. - // examples: + // examples: // dojo.lang.isNumeric(3); // returns true // dojo.lang.isNumeric("3"); // returns true // dojo.lang.isNumeric(new Number(3)); // returns true @@ -17363,11 +17363,11 @@ dojo.lang.isNumeric = function(/* anything */ value){ // dojo.lang.isNumeric(new Number("foo")); // returns false // dojo.lang.isNumeric(false); // returns false // dojo.lang.isNumeric(true); // returns false - return (!isNaN(value) - && isFinite(value) - && (value != null) - && !dojo.lang.isBoolean(value) - && !dojo.lang.isArray(value) + return (!isNaN(value) + && isFinite(value) + && (value != null) + && !dojo.lang.isBoolean(value) + && !dojo.lang.isArray(value) && !/^\s*$/.test(value) ); // boolean } @@ -17375,20 +17375,20 @@ dojo.lang.isNumeric = function(/* anything */ value){ dojo.lang.isBuiltIn = function(/* anything */ value){ // summary: // Returns true if value is of a type provided by core JavaScript - // description: + // description: // Returns true for any literal, and for any object that is an // instance of a built-in type like String, Number, Boolean, Array, - // Function, or Error. + // Function, or Error. // value: Any literal value or object instance. - + return (dojo.lang.isArray(value) - || dojo.lang.isFunction(value) + || dojo.lang.isFunction(value) || dojo.lang.isString(value) || dojo.lang.isNumber(value) || dojo.lang.isBoolean(value) || (value == null) || (value instanceof Error) - || (typeof value == "error") + || (typeof value == "error") ); // boolean } @@ -17396,20 +17396,20 @@ dojo.lang.isPureObject = function(/* anything */ value){ // summary: // Returns true for any value where the value of value.constructor == // Object - // description: + // description: // Returns true for any literal, and for any object that is an // instance of a built-in type like String, Number, Boolean, Array, // Function, or Error. // value: // Any literal value or object instance. - // examples: + // examples: // dojo.lang.isPureObject(new Object()); // returns true // dojo.lang.isPureObject({a: 1, b: 2}); // returns true // // dojo.lang.isPureObject(new Date()); // returns false // dojo.lang.isPureObject([11, 2, 3]); // returns false - return ((value != null) - && dojo.lang.isObject(value) + return ((value != null) + && dojo.lang.isObject(value) && value.constructor == Object ); // boolean } @@ -17417,7 +17417,7 @@ dojo.lang.isPureObject = function(/* anything */ value){ dojo.lang.isOfType = function(/* anything */ value, /* function */ type, /* object? */ keywordParameters) { /* summary: * Returns true if 'value' is of type 'type' - * description: + * description: * Given a value and a datatype, this method returns true if the * type of the value matches the datatype. The datatype parameter * can be an array of datatypes, in which case the method returns @@ -17426,8 +17426,8 @@ dojo.lang.isOfType = function(/* anything */ value, /* function */ type, /* obje * type: A class of object, or a literal type, or the string name of a type, or an array with a list of types. * keywordParameters: {optional: boolean} */ - - /* examples: + + /* examples: * dojo.lang.isOfType("foo", String); // returns true * dojo.lang.isOfType(12345, Number); // returns true * dojo.lang.isOfType(false, Boolean); // returns true @@ -17449,7 +17449,7 @@ dojo.lang.isOfType = function(/* anything */ value, /* function */ type, /* obje * dojo.lang.isOfType(12345, [Number, String, Boolean]); // returns true * dojo.lang.isOfType(false, [Number, String, Boolean]); // returns true * - * dojo.lang.isOfType(null, Date, {optional: true} ); // returns true // description: + * dojo.lang.isOfType(null, Date, {optional: true} ); // returns true // description: */ var optional = false; if(keywordParameters){ @@ -17520,20 +17520,20 @@ dojo.lang.isOfType = function(/* anything */ value, /* function */ type, /* obje dojo.lang.getObject=function(/* String */ str){ // summary: // Will return an object, if it exists, based on the name in the passed string. - var parts=str.split("."), i=0, obj=dj_global; - do{ - obj=obj[parts[i++]]; - }while(i]*>\s*([\s\S]+)\s*<\/body>/im); if(match) { s = match[1]; } } - + /*** replace scriptScope prefix in html Event handler * working order: find tags with scriptScope in a tag attribute * then replace all standalone scriptScope occurencies with reference to to this widget @@ -18866,7 +18866,7 @@ dojo.widget.defineWidget( if(this.executeScripts && this.scriptSeparation){ var regex = /(<[a-zA-Z][a-zA-Z0-9]*\s[^>]*?\S=)((['"])[^>]*scriptScope[^>]*>)/; var regexAttr = /([\s'";:\(])scriptScope(.*)/; // we rely on that attribute begins ' or " - str = ""; + str = ""; while(tag = regex.exec(s)){ tmp = ((tag[3]=="'") ? '"': "'");fix= ""; str += s.substring(0, tag.index) + tag[1]; @@ -18887,11 +18887,11 @@ dojo.widget.defineWidget( "scripts": scripts, "url": url}; }, - - + + _setContent: function(cont){ this.destroyChildren(); - + // remove old stylenodes from HEAD for(var i = 0; i < this._styleNodes.length; i++){ if(this._styleNodes[i] && this._styleNodes[i].parentNode){ @@ -18915,7 +18915,7 @@ dojo.widget.defineWidget( this._handleDefaults(e, "onContentError"); } }, - + setContent: function(data){ // summary: // Replaces old content with data content, include style classes from old content @@ -18924,7 +18924,7 @@ dojo.widget.defineWidget( this.abort(); if(this._callOnUnload){ this.onUnload(); }// this tells a remote script clean up after itself this._callOnUnload = true; - + if(!data || dojo.html.isNode(data)){ // if we do a clean using setContent(""); or setContent(#node) bypass all parsing, extractContent etc this._setContent(data); @@ -18933,9 +18933,9 @@ dojo.widget.defineWidget( }else{ // need to run splitAndFixPaths? ie. manually setting content // adjustPaths is taken care of inside splitAndFixPaths - if(typeof data.xml != "string"){ + if(typeof data.xml != "string"){ this.href = ""; // so we can refresh safely - data = this.splitAndFixPaths(data); + data = this.splitAndFixPaths(data); } this._setContent(data.xml); @@ -18948,7 +18948,7 @@ dojo.widget.defineWidget( this._styleNodes.push(dojo.html.insertCssText(data.styles[i])); } } - + if(this.parseContent){ for(var i = 0; i < data.requires.length; i++){ try{ @@ -18966,7 +18966,7 @@ dojo.widget.defineWidget( if(_self.executeScripts){ _self._executeScripts(data.scripts); } - + if(_self.parseContent){ var node = _self.containerNode || _self.domNode; var parser = new dojo.xml.Parse(); @@ -18974,7 +18974,7 @@ dojo.widget.defineWidget( // createSubComponents not createComponents because frag has already been created dojo.widget.getParser().createSubComponents(frag, _self); } - + _self.onResized(); _self.onLoad(); } @@ -19000,7 +19000,7 @@ dojo.widget.defineWidget( return fcn.apply(this, arguments); } }, - + _runHandler: function() { var ret = true; if(dojo.lang.isFunction(this.handler)) { @@ -19010,7 +19010,7 @@ dojo.widget.defineWidget( this.onLoad(); return ret; }, - + _executeScripts: function(scripts) { // loop through the scripts in the order they came in var self = this; @@ -19702,7 +19702,7 @@ dojo.widget.defineWidget( shareGroup: '', checkAvailability: function(){ // summary: returns whether items in this toolbar can be executed - // description: + // description: // For unshared toolbar, when clicking on a toolbar, the corresponding // editor will be focused, and this function always return true. For shared // toolbar, if the current focued editor is not one of the instances sharing @@ -19895,7 +19895,7 @@ dojo.widget.html.layout = function(/*DomNode*/ container, /*Object[]*/ children, child.resizeTo(w, f.height); }else{ dojo.html.setMarginBox(elm, { width: w, height: f.height }); - } + } f.width -= w; if(pos=="left"){ @@ -19956,7 +19956,7 @@ dojo.provide("dojo.dnd.DragAndDrop"); // that respond to drop events to take application-level actions. dojo.declare("dojo.dnd.DragSource", null, { - // String: + // String: // what kind of drag source are we? Used to determine if we can be // dropped on a given DropTarget type: "", @@ -19991,11 +19991,11 @@ dojo.declare("dojo.dnd.DragSource", null, { }); dojo.declare("dojo.dnd.DragObject", null, { - // String: + // String: // what kind of drag object are we? Used to determine if we can be // dropped on a given DropTarget type: "", - + register: function(){ // summary: register this DragObject with the manager var dm = dojo.dnd.dragManager; @@ -20012,7 +20012,7 @@ dojo.declare("dojo.dnd.DragObject", null, { }, onDragMove: function(/*dojo.dnd.DragEvent*/evt){ - // summary: + // summary: // Implemented by subclasses. Should change the UI for the drag // icon i.e., "it moves itself" }, @@ -20047,7 +20047,7 @@ dojo.declare("dojo.dnd.DragObject", null, { dojo.declare("dojo.dnd.DropTarget", null, { acceptsType: function(/*String*/type){ - // summary: + // summary: // determines whether or not this DropTarget will accept the given // type. The default behavior is to consult this.acceptedTypes and // if "*" is a member, to always accept the type. @@ -20058,7 +20058,7 @@ dojo.declare("dojo.dnd.DropTarget", null, { }, accepts: function(/*Array*/dragObjects){ - // summary: + // summary: // determines if we'll accept all members of the passed array of // dojo.dnd.DragObject instances if(!dojo.lang.inArray(this.acceptedTypes, "*")){ // wildcard @@ -20265,7 +20265,7 @@ dojo.declare("dojo.dnd.HtmlDragManager", dojo.dnd.DragManager, { // so we can drag links if(dojo.render.html.ie){ //dojo.profile.start("register DragSource IE"); - + dojo.event.browser.addListener(ds.domNode, "ondragstart", this.cancelEvent); // terribly slow //dojo.event.connect(ds.domNode, "ondragstart", this.cancelEvent); @@ -20286,7 +20286,7 @@ dojo.declare("dojo.dnd.HtmlDragManager", dojo.dnd.DragManager, { delete this.dragSources[dpIdx]; ds.domNode.setAttribute(dp, null); if(dojo.render.html.ie){ - dojo.event.browser.removeListener(ds.domNode, "ondragstart", this.cancelEvent); + dojo.event.browser.removeListener(ds.domNode, "ondragstart", this.cancelEvent); } } }, @@ -20305,7 +20305,7 @@ dojo.declare("dojo.dnd.HtmlDragManager", dojo.dnd.DragManager, { /** * Get the DOM element that is meant to drag. * Loop through the parent nodes of the event target until - * the element is found that was created as a DragSource and + * the element is found that was created as a DragSource and * return it. * * @param event object The event for which to get the drag source. @@ -20346,7 +20346,7 @@ dojo.declare("dojo.dnd.HtmlDragManager", dojo.dnd.DragManager, { // find a selection object, if one is a parent of the source node var ds = this.getDragSource(e); - + // this line is important. if we aren't selecting anything then // we need to return now, so preventDefault() isn't called, and thus // the event is propogated to other handling code @@ -20385,7 +20385,7 @@ dojo.declare("dojo.dnd.HtmlDragManager", dojo.dnd.DragManager, { // let ctrl be used for multiselect or another action // if I use same key to trigger treeV3 node selection and here, // I have bugs with drag'n'drop. why ?? no idea.. - if((!e.shiftKey)&&(!e.ctrlKey)){ + if((!e.shiftKey)&&(!e.ctrlKey)){ //if(!e.shiftKey){ if(this.currentDropTarget) { this.currentDropTarget.onDropStart(); @@ -20422,12 +20422,12 @@ dojo.declare("dojo.dnd.HtmlDragManager", dojo.dnd.DragManager, { // while the mouse doesnt "hold" the dragged object anymore ... and so on dojo.lang.delayThese([ function() { - // in FF1.5 this throws an exception, see + // in FF1.5 this throws an exception, see // http://dojotoolkit.org/pipermail/dojo-interest/2006-April/006751.html try{ tempDragObj.dragSource.onDragEnd(e) } catch(err) { - // since the problem seems passing e, we just copy all + // since the problem seems passing e, we just copy all // properties and try the copy ... var ecopy = {}; for (var i in e) { @@ -20536,7 +20536,7 @@ dojo.declare("dojo.dnd.HtmlDragManager", dojo.dnd.DragManager, { // selectedSources (elements that move along) then the first one is the master // and for it the events will be fired etc. this.dragSource = this.selectedSources[0]; - + dojo.lang.forEach(this.selectedSources, function(tempSource){ if(!tempSource){ return; } var tdo = tempSource.onDragStart(e); @@ -20661,7 +20661,7 @@ dojo.dnd.dragManager = new dojo.dnd.HtmlDragManager(); dojo.event.connect(d, "onmouseout", dm, "onMouseOut"); dojo.event.connect(d, "onmousedown", dm, "onMouseDown"); dojo.event.connect(d, "onmouseup", dm, "onMouseUp"); - // TODO: process scrolling of elements, not only window (focus manager would + // TODO: process scrolling of elements, not only window (focus manager would // probably come to rescue here as well) dojo.event.connect(window, "onscroll", dm, "onScroll"); })(); @@ -20703,7 +20703,7 @@ dojo.declare("dojo.dnd.HtmlDragSource", dojo.dnd.DragSource, { this.constrainingContainer = container; } }, - + /* * * see dojo.dnd.DragSource.onSelected @@ -20732,7 +20732,7 @@ dojo.declare("dojo.dnd.HtmlDragSource", dojo.dnd.DragSource, { this.dragObjects.push(dojo.byId(arguments[i])); } } - }, + }, function(node, type){ node = dojo.byId(node); @@ -20748,8 +20748,8 @@ dojo.declare("dojo.dnd.HtmlDragSource", dojo.dnd.DragSource, { } ); -dojo.declare("dojo.dnd.HtmlDragObject", - dojo.dnd.DragObject, +dojo.declare("dojo.dnd.HtmlDragObject", + dojo.dnd.DragObject, { dragClass: "", opacity: 0.5, @@ -20818,7 +20818,7 @@ dojo.declare("dojo.dnd.HtmlDragObject", this.dragClone = this.createDragNode(); - this.containingBlockPosition = this.domNode.offsetParent ? + this.containingBlockPosition = this.domNode.offsetParent ? dojo.html.getAbsolutePosition(this.domNode.offsetParent, true) : {x:0, y:0}; if(this.constrainToContainer){ @@ -20959,7 +20959,7 @@ dojo.declare("dojo.dnd.HtmlDragObject", this.constrainingContainer = this.domNode.parentNode; } } - }, + }, function(node, type){ this.domNode = dojo.byId(node); this.type = type; @@ -20970,8 +20970,8 @@ dojo.declare("dojo.dnd.HtmlDragObject", } ); -dojo.declare("dojo.dnd.HtmlDropTarget", - dojo.dnd.DropTarget, +dojo.declare("dojo.dnd.HtmlDropTarget", + dojo.dnd.DropTarget, { vertical: false, onDragOver: function(e){ @@ -20985,7 +20985,7 @@ dojo.declare("dojo.dnd.HtmlDropTarget", var pos = dojo.html.getAbsolutePosition(child, true); var inner = dojo.html.getBorderBox(child); this.childBoxes.push({top: pos.y, bottom: pos.y+inner.height, - left: pos.x, right: pos.x+inner.width, height: inner.height, + left: pos.x, right: pos.x+inner.width, height: inner.height, width: inner.width, node: child}); } @@ -21049,8 +21049,8 @@ dojo.declare("dojo.dnd.HtmlDropTarget", if(child.node === dragObjects[0].dragSource.domNode){ hide = true; }else{ - var currentPosChild = before ? - (i>0?this.childBoxes[i-1]:child) : + var currentPosChild = before ? + (i>0?this.childBoxes[i-1]:child) : (i 0) { - + var viewport = dojo.html.getViewport(); var h = viewport.height; var w = viewport.width; @@ -21436,7 +21436,7 @@ dojo.declare( var scroll_offset = dojo.html.getScroll().offset; var viewport_size = dojo.html.getViewport(); - + // find the size of the dialog (dialog needs to be showing to get the size) var mb; if(this.isShowing()){ @@ -21448,7 +21448,7 @@ dojo.declare( dojo.html.hide(this.domNode); dojo.html.setVisibility(this.domNode, true); } - + var x = scroll_offset.x + (viewport_size.width - mb.width)/2; var y = scroll_offset.y + (viewport_size.height - mb.height)/2; with(this.domNode.style){ @@ -21473,7 +21473,7 @@ dojo.declare( // opera won't tab to a div }else if (!dojo.render.html.opera){ try { - this.tabStart.focus(); + this.tabStart.focus(); } catch(e){} } } @@ -21492,9 +21492,9 @@ dojo.declare( this.setBackgroundOpacity(); this._sizeBackground(); this._showBackground(); - this._fromTrap = true; + this._fromTrap = true; - // set timeout to allow the browser to render dialog + // set timeout to allow the browser to render dialog setTimeout(dojo.lang.hitch(this, function(){ try{ this.tabStart.focus(); @@ -21509,7 +21509,7 @@ dojo.declare( // workaround for FF focus going into outer space if (this.focusElement) { - dojo.byId(this.focusElement).focus(); + dojo.byId(this.focusElement).focus(); dojo.byId(this.focusElement).blur(); } @@ -21540,7 +21540,7 @@ dojo.declare( this.onResized(); } }, - + onBackgroundClick: function(){ // summary // Callback on background click. @@ -21565,7 +21565,7 @@ dojo.widget.defineWidget( // blockDuration: Integer // number of seconds for which the user cannot dismiss the dialog blockDuration: 0, - + // lifetime: Integer // if set, this controls the number of seconds the dialog will be displayed before automatically disappearing lifetime: 0, @@ -21615,7 +21615,7 @@ dojo.widget.defineWidget( this.placeModalDialog(); dojo.widget.Dialog.superclass.onLoad.call(this); }, - + fillInTemplate: function(){ // dojo.event.connect(this.domNode, "onclick", this, "killEvent"); }, @@ -21628,7 +21628,7 @@ dojo.widget.defineWidget( clearInterval(this.timer); } }, - + setTimerNode: function(node){ // summary // specify into which node to write the remaining # of seconds @@ -21711,7 +21711,7 @@ dojo.widget.defineWidget( this.startSize = {'w':mb.width, 'h':mb.height}; dojo.event.kwConnect({ - srcObj: dojo.body(), + srcObj: dojo.body(), srcFunc: "onmousemove", targetObj: this, targetFunc: "_changeSizing", @@ -21733,7 +21733,7 @@ dojo.widget.defineWidget( } var dx = this.startPoint.x - e.clientX; var dy = this.startPoint.y - e.clientY; - + var newW = this.startSize.w - dx; var newH = this.startSize.h - dy; @@ -21747,13 +21747,13 @@ dojo.widget.defineWidget( newH = mb.height; } } - + if(this.targetWidget){ this.targetWidget.resizeTo(newW, newH); }else{ dojo.html.setMarginBox(this.targetDomNode, { width: newW, height: newH}); } - + e.preventDefault(); }, @@ -22240,7 +22240,7 @@ dojo.declare("dojo.widget.Editor2Plugin.AlwaysShowToolbar", null, if(!this._scrollSetUp){ this._scrollSetUp = true; - var editorWidth = dh.getMarginBox(this.editor.domNode).width; + var editorWidth = dh.getMarginBox(this.editor.domNode).width; this._scrollThreshold = dh.abs(tdn, true).y; // dojo.debug("threshold:", this._scrollThreshold); if((isIE)&&(db)&&(dh.getStyle(db, "background-image")=="none")){ @@ -22498,7 +22498,7 @@ dojo.widget.Editor2BrowserCommandNames={ // 'inlinedirrtl': } -dojo.lang.declare("dojo.widget.Editor2BrowserCommand", dojo.widget.Editor2Command, +dojo.lang.declare("dojo.widget.Editor2BrowserCommand", dojo.widget.Editor2Command, function(editor,name){ // summary: // dojo.widget.Editor2BrowserCommand is the base class for all the browser built @@ -22604,7 +22604,7 @@ dojo.widget.defineWidget( // contentFile: String // TODO contentFile: "", - + // contentClass: String // TODO contentClass: "", @@ -22789,8 +22789,8 @@ dojo.widget.defineWidget( _inSourceMode: false, _htmlEditNode: null, - // toolbarGroup: String: - // This instance of editor will share the same toolbar with other editor with the same toolbarGroup. + // toolbarGroup: String: + // This instance of editor will share the same toolbar with other editor with the same toolbarGroup. // By default, toolbarGroup is empty and standalone toolbar is used for this instance. toolbarGroup: '', @@ -22840,7 +22840,7 @@ dojo.widget.defineWidget( dojo.widget.Editor2ToolbarGroups[this.toolbarGroup] = this.toolbarWidget; } dojo.event.connect(this, "close", this.toolbarWidget, "hide"); - + this.toolbarLoaded(); } } diff --git a/framework/images/webapp/images/dojo/iframe_history.html b/framework/images/webapp/images/dojo/iframe_history.html index d4bf58bd74..e6ede009c8 100644 --- a/framework/images/webapp/images/dojo/iframe_history.html +++ b/framework/images/webapp/images/dojo/iframe_history.html @@ -35,7 +35,7 @@ if((window.parent != window)&&(window.parent["dojo"])){ //Set the page title so IE history shows up with a somewhat correct name. document.title = window.parent.document.title; - + //Notify parent that we are loaded. var pdj = window.parent.dojo; if(pdj["undo"] && pdj["undo"]["browser"]){ diff --git a/framework/images/webapp/images/dojo/src/AdapterRegistry.js b/framework/images/webapp/images/dojo/src/AdapterRegistry.js index 742b182134..99b1ac149c 100644 --- a/framework/images/webapp/images/dojo/src/AdapterRegistry.js +++ b/framework/images/webapp/images/dojo/src/AdapterRegistry.js @@ -25,7 +25,7 @@ dojo.AdapterRegistry = function(/*Boolean?*/ returnWrappers){ dojo.lang.extend(dojo.AdapterRegistry, { register: function(name, check, /*Function*/ wrap, directReturn, override){ - // summary: + // summary: // register a check function to determine if the wrap function or // object gets selected // name: String diff --git a/framework/images/webapp/images/dojo/src/Deferred.js b/framework/images/webapp/images/dojo/src/Deferred.js index 882ecfffa0..bd2028308e 100644 --- a/framework/images/webapp/images/dojo/src/Deferred.js +++ b/framework/images/webapp/images/dojo/src/Deferred.js @@ -13,7 +13,7 @@ dojo.require("dojo.lang.func"); dojo.Deferred = function(/*Function?*/ canceller){ /* - NOTE: this namespace and documentation are imported wholesale + NOTE: this namespace and documentation are imported wholesale from MochiKit Encapsulates a sequence of callbacks in response to a value that @@ -101,7 +101,7 @@ dojo.Deferred = function(/*Function?*/ canceller){ cancellable Deferreds. */ - + this.chain = []; this.id = this._nextId(); this.fired = -1; @@ -172,7 +172,7 @@ dojo.lang.extend(dojo.Deferred, { this.results[0].cancel(); } }, - + _pause: function(){ // summary: Used internally to signal that it's waiting on another Deferred @@ -213,7 +213,7 @@ dojo.lang.extend(dojo.Deferred, { callback: function(res){ // summary: Begin the callback sequence with a non-error value. - + /* callback or errback should only be called once on a given Deferred. diff --git a/framework/images/webapp/images/dojo/src/DeferredList.js b/framework/images/webapp/images/dojo/src/DeferredList.js index 0364ad8116..5326e71b77 100644 --- a/framework/images/webapp/images/dojo/src/DeferredList.js +++ b/framework/images/webapp/images/dojo/src/DeferredList.js @@ -25,20 +25,20 @@ dojo.DeferredList = function (list, /*bool?*/ fireOnOneCallback, /*bool?*/ fireO this.results = [null, null]; this.canceller = canceller; this.silentlyCancelled = false; - + if (this.list.length === 0 && !fireOnOneCallback) { this.callback(this.resultList); } - + this.finishedCount = 0; this.fireOnOneCallback = fireOnOneCallback; this.fireOnOneErrback = fireOnOneErrback; this.consumeErrors = consumeErrors; var index = 0; - + var _this = this; - + dojo.lang.forEach(this.list, function(d) { var _index = index; //dojo.debug("add cb/errb index "+_index); @@ -46,7 +46,7 @@ dojo.DeferredList = function (list, /*bool?*/ fireOnOneCallback, /*bool?*/ fireO d.addErrback(function(r) { _this._cbDeferred(_index, false, r) }); index++; }); - + }; @@ -72,7 +72,7 @@ dojo.lang.extend(dojo.DeferredList, { } return result; }, - + gatherResults: function (deferredList) { var d = new dojo.DeferredList(deferredList, false, true, false); d.addCallback(function (results) { diff --git a/framework/images/webapp/images/dojo/src/a11y.js b/framework/images/webapp/images/dojo/src/a11y.js index 2b417ae1ae..2cfea0f7cb 100644 --- a/framework/images/webapp/images/dojo/src/a11y.js +++ b/framework/images/webapp/images/dojo/src/a11y.js @@ -20,26 +20,26 @@ dojo.a11y = { // if true generate accessible widgets imgPath:dojo.uri.dojoUri("src/widget/templates/images"), doAccessibleCheck: true, - accessible: null, + accessible: null, - checkAccessible: function(){ - // summary: + checkAccessible: function(){ + // summary: // perform check for accessibility if accessibility checking is turned // on and the accessibility test has not been performed yet - if(this.accessible === null){ + if(this.accessible === null){ this.accessible = false; //default - if(this.doAccessibleCheck == true){ + if(this.doAccessibleCheck == true){ this.accessible = this.testAccessible(); } } return this.accessible; /* Boolean */ }, - + testAccessible: function(){ - // summary: - // Always perform the accessibility check to determine if high - // contrast mode is on or display of images are turned off. Currently only checks - // in IE and Mozilla. + // summary: + // Always perform the accessibility check to determine if high + // contrast mode is on or display of images are turned off. Currently only checks + // in IE and Mozilla. this.accessible = false; //default if (dojo.render.html.ie || dojo.render.html.mozilla){ var div = document.createElement("div"); @@ -49,10 +49,10 @@ dojo.a11y = { dojo.body().appendChild(div); // in FF and IE the value for the current background style of the added div // will be "none" in high contrast mode - // in FF the return value will be url(invalid-url:) when running over http + // in FF the return value will be url(invalid-url:) when running over http var bkImg = null; if (window.getComputedStyle ) { - var cStyle = getComputedStyle(div, ""); + var cStyle = getComputedStyle(div, ""); bkImg = cStyle.getPropertyValue("background-image"); }else{ bkImg = div.currentStyle.backgroundImage; @@ -67,28 +67,28 @@ dojo.a11y = { var testImg = new Image(); if(testImg.fileSize) { testImg.src = this.imgPath + "/tab_close.gif"; - if(testImg.fileSize < 0){ + if(testImg.fileSize < 0){ this.accessible = true; } - } + } }*/ dojo.body().removeChild(div); } return this.accessible; /* Boolean */ }, - - setCheckAccessible: function(/* Boolean */ bTest){ - // summary: + + setCheckAccessible: function(/* Boolean */ bTest){ + // summary: // Set whether or not to check for accessibility mode. Default value - // of module is true - perform check for accessibility modes. + // of module is true - perform check for accessibility modes. // bTest: Boolean - true to check; false to turn off checking this.doAccessibleCheck = bTest; }, setAccessibleMode: function(){ // summary: - // perform the accessibility check and sets the correct mode to load - // a11y widgets. Only runs if test for accessiiblity has not been performed yet. + // perform the accessibility check and sets the correct mode to load + // a11y widgets. Only runs if test for accessiiblity has not been performed yet. // Call testAccessible() to force the test. if (this.accessible === null){ if (this.checkAccessible()){ diff --git a/framework/images/webapp/images/dojo/src/animation/Animation.js b/framework/images/webapp/images/dojo/src/animation/Animation.js index 0d704e5603..cecba57bea 100644 --- a/framework/images/webapp/images/dojo/src/animation/Animation.js +++ b/framework/images/webapp/images/dojo/src/animation/Animation.js @@ -85,7 +85,7 @@ dojo.lang.extend(dojo.animation.Animation, { // public methods play: function(/*Boolean?*/ gotoStart) { // summary: Play the animation. - // goToStart: If true, will restart the animation from the beginning. + // goToStart: If true, will restart the animation from the beginning. // Otherwise, starts from current play counter. // description: Sends an "onPlay" event to any observers. // Also sends an "onBegin" event if starting from the beginning. @@ -205,7 +205,7 @@ dojo.lang.extend(dojo.animation.Animation, { } else { this._percent = step * 100; } - + // Perform accelleration if(this.accel && this.accel.getValue) { step = this.accel.getValue(step); diff --git a/framework/images/webapp/images/dojo/src/animation/AnimationEvent.js b/framework/images/webapp/images/dojo/src/animation/AnimationEvent.js index bc14d02a1b..125a2369b8 100644 --- a/framework/images/webapp/images/dojo/src/animation/AnimationEvent.js +++ b/framework/images/webapp/images/dojo/src/animation/AnimationEvent.js @@ -14,14 +14,14 @@ dojo.require("dojo.lang.common"); dojo.deprecated("dojo.animation.AnimationEvent is slated for removal in 0.5; use dojo.lfx.* instead.", "0.5"); dojo.animation.AnimationEvent = function( - /*dojo.animation.Animation*/ animation, - /*String*/type, - /*int[] */ coords, - /*int*/ startTime, - /*int*/ currentTime, - /*int*/ endTime, - /*int*/ duration, - /*int*/ percent, + /*dojo.animation.Animation*/ animation, + /*String*/type, + /*int[] */ coords, + /*int*/ startTime, + /*int*/ currentTime, + /*int*/ endTime, + /*int*/ duration, + /*int*/ percent, /*int?*/ fps) { // summary: Event sent at various points during an Animation. // animation: Animation throwing the event. @@ -35,7 +35,7 @@ dojo.animation.AnimationEvent = function( // fps: Frames currently shown per second. (Only sent for "animate" event). // description: The AnimationEvent has public properties of the same name as // all constructor arguments, plus "x", "y" and "z". - + this.type = type; // "animate", "begin", "end", "play", "pause", "stop" this.animation = animation; diff --git a/framework/images/webapp/images/dojo/src/behavior.js b/framework/images/webapp/images/dojo/src/behavior.js index 26995d6732..8b9c4bc998 100644 --- a/framework/images/webapp/images/dojo/src/behavior.js +++ b/framework/images/webapp/images/dojo/src/behavior.js @@ -38,7 +38,7 @@ dojo.behavior = new function(){ this.add = function(behaviorObj){ /* behavior objects are specified in the following format: * - * { + * { * "#id": { * "found": function(element){ * // ... @@ -107,7 +107,7 @@ dojo.behavior = new function(){ * The "found" method is a generalized handler that's called as soon * as the node matches the selector. Rules for values that follow also * apply to the "found" key. - * + * * The "on*" handlers are attached with dojo.event.connect(). If the * value is not a function but is rather an object, it's assumed to be * the "other half" of a dojo.event.kwConnect() argument object. It @@ -208,7 +208,7 @@ dojo.behavior = new function(){ // fast DOM queries...wheeee! forIn(this.behaviors, function(tBehavior, id){ var elems = dojo.behavior.elementsById(id); - dojo.lang.forEach(elems.added, + dojo.lang.forEach(elems.added, function(elem){ forIn(tBehavior, function(ruleSet, ruleSetName){ if(dojo.lang.isArray(ruleSet)){ @@ -222,7 +222,7 @@ dojo.behavior = new function(){ }); dojo.profile.end("dojo.behavior.applyFast"); } - + this.applySlow = function(){ // iterate. Ugg. dojo.profile.start("dojo.behavior.applySlow"); diff --git a/framework/images/webapp/images/dojo/src/browser_debug.js b/framework/images/webapp/images/dojo/src/browser_debug.js index b1b563d018..f008bfcc36 100644 --- a/framework/images/webapp/images/dojo/src/browser_debug.js +++ b/framework/images/webapp/images/dojo/src/browser_debug.js @@ -27,7 +27,7 @@ function removeComments(contents){ dojo.hostenv.getRequiresAndProvides = function(contents){ // FIXME: should probably memoize this! if(!contents){ return []; } - + // check to see if we need to load anything else first. Ugg. var deps = []; @@ -138,7 +138,7 @@ dojo.hostenv.loadUri = function(uri, cb /*optional*/){ var delayRequires = dojo.hostenv.getDelayRequiresAndProvides(text); eval(delayRequires.join(";")); } - }catch(e){ + }catch(e){ alert(e); } return true; @@ -161,7 +161,7 @@ dojo.hostenv.writeIncludes = function(willCallAgain){ } dojo.hostenv._global_omit_module_check = true; - + for(var x= dojo.hostenv._loadedUrisListStart; x"); } diff --git a/framework/images/webapp/images/dojo/src/cal/iCalendar.js b/framework/images/webapp/images/dojo/src/cal/iCalendar.js index 0da52f9d17..2e1a13734d 100644 --- a/framework/images/webapp/images/dojo/src/cal/iCalendar.js +++ b/framework/images/webapp/images/dojo/src/cal/iCalendar.js @@ -43,7 +43,7 @@ dojo.cal.iCalendar.fromText = function (/* string */text) { dojo.cal.iCalendar.Component = function (/* string */ body ) { // summary - // A component is the basic container of all this stuff. + // A component is the basic container of all this stuff. if (!this.name) { this.name = "COMPONENT" @@ -112,8 +112,8 @@ dojo.extend(dojo.cal.iCalendar.Component, { for (var x=0; x 0) { return events; - } + } - return null; + return null; } }); @@ -355,7 +355,7 @@ var VEventProperties = [ ]; dojo.cal.iCalendar.VEvent = function (/* string */ body) { - // summary + // summary // VEVENT Component this._ValidProperties = VEventProperties; this.name = "VEVENT"; @@ -372,11 +372,11 @@ dojo.extend(dojo.cal.iCalendar.VEvent, { var recurranceSet = []; var weekdays=["su","mo","tu","we","th","fr","sa"]; - var order = { + var order = { "daily": 1, "weekly": 2, "monthly": 3, "yearly": 4, "byday": 1, "bymonthday": 1, "byweekno": 2, "bymonth": 3, "byyearday": 4}; - // expand rrules into the recurrance + // expand rrules into the recurrance for (var x=0; x 1) { var regex = "([+-]?)([0-9]{1,3})"; for (var z=1; x 0) { var regex = "([+-]?)([0-9]{1,3})"; for (var z=0; z 0) { var regex = "([+-]?)([0-9]{0,1}?)([A-Za-z]{1,2})"; @@ -567,21 +567,21 @@ dojo.extend(dojo.cal.iCalendar.VEvent, { if (z==0) { for (var zz=0; zz < set.length; zz++) { if (regexResult[1] == "-") { - //find the nth to last occurance of date + //find the nth to last occurance of date var numDaysFound = 0; var lastDayOfMonth = dojo.date.getDaysInMonth(set[zz]); var daysToSubtract = 1; - set[zz].setDate(lastDayOfMonth); + set[zz].setDate(lastDayOfMonth); if (weekdays[set[zz].getDay()] == day) { numDaysFound++; daysToSubtract=7; } daysToSubtract = 1; while (numDaysFound < occurance) { - set[zz].setDate(set[zz].getDate()-daysToSubtract); + set[zz].setDate(set[zz].getDate()-daysToSubtract); if (weekdays[set[zz].getDay()] == day) { numDaysFound++; - daysToSubtract=7; + daysToSubtract=7; } } } else { @@ -612,7 +612,7 @@ dojo.extend(dojo.cal.iCalendar.VEvent, { lastDayOfMonth.setDate(daysInMonth); set[zz].setDate(1); - + if (weekdays[set[zz].getDay()] == day) { numDaysFound++; } @@ -626,7 +626,7 @@ dojo.extend(dojo.cal.iCalendar.VEvent, { } else { subset.push(tmpDate); tmpDate = new Date(tmpDate); - daysToAdd=7; + daysToAdd=7; tmpDate.setDate(tmpDate.getDate() + daysToAdd); } } else { @@ -634,7 +634,7 @@ dojo.extend(dojo.cal.iCalendar.VEvent, { } } var t = set.concat(subset); - set = t; + set = t; } } } @@ -664,8 +664,8 @@ dojo.extend(dojo.cal.iCalendar.VEvent, { } dojo.debug("TODO: Process BYrules for units larger than frequency"); - - //add this set of events to the complete recurranceSet + + //add this set of events to the complete recurranceSet var tmp = recurranceSet.concat(set); recurranceSet = tmp; } diff --git a/framework/images/webapp/images/dojo/src/cal/textDirectory.js b/framework/images/webapp/images/dojo/src/cal/textDirectory.js index 54a883ccf2..30fe124250 100644 --- a/framework/images/webapp/images/dojo/src/cal/textDirectory.js +++ b/framework/images/webapp/images/dojo/src/cal/textDirectory.js @@ -22,7 +22,7 @@ dojo.cal.textDirectory.Property = function(/*String*/line){ var left = dojo.string.trim(line.substring(0, line.indexOf(':'))); var right = dojo.string.trim(line.substr(line.indexOf(':') + 1)); - // separate name and paramters + // separate name and paramters var parameters = dojo.string.splitEscaped(left,';'); this.name = parameters[0]; parameters.splice(0, 1); diff --git a/framework/images/webapp/images/dojo/src/charting/Axis.js b/framework/images/webapp/images/dojo/src/charting/Axis.js index acf2ee27df..2d8bd7b359 100644 --- a/framework/images/webapp/images/dojo/src/charting/Axis.js +++ b/framework/images/webapp/images/dojo/src/charting/Axis.js @@ -33,8 +33,8 @@ dojo.charting.Axis.count = 0; dojo.extend(dojo.charting.Axis, { // TODO: implement log scaling. getCoord: function( - /* float */val, - /* dojo.charting.PlotArea */plotArea, + /* float */val, + /* dojo.charting.PlotArea */plotArea, /* dojo.charting.Plot */plot ){ // summary @@ -63,11 +63,11 @@ dojo.extend(dojo.charting.Axis, { initializeOrigin: function(drawAgainst, plane){ // figure out the origin value. if(isNaN(this.origin)){ - if(this.origin.toLowerCase() == "max"){ - this.origin = drawAgainst.range[(plane=="y")?"upper":"lower"]; + if(this.origin.toLowerCase() == "max"){ + this.origin = drawAgainst.range[(plane=="y")?"upper":"lower"]; } - else if (this.origin.toLowerCase() == "min"){ - this.origin = drawAgainst.range[(plane=="y")?"lower":"upper"]; + else if (this.origin.toLowerCase() == "min"){ + this.origin = drawAgainst.range[(plane=="y")?"lower":"upper"]; } else { this.origin=0; } } diff --git a/framework/images/webapp/images/dojo/src/charting/Chart.js b/framework/images/webapp/images/dojo/src/charting/Chart.js index 3ac3ddf1c9..7910d4b811 100644 --- a/framework/images/webapp/images/dojo/src/charting/Chart.js +++ b/framework/images/webapp/images/dojo/src/charting/Chart.js @@ -13,8 +13,8 @@ dojo.require("dojo.lang.common"); dojo.require("dojo.charting.PlotArea"); dojo.charting.Chart = function( - /* HTMLElement? */node, - /* string? */title, + /* HTMLElement? */node, + /* string? */title, /* string? */description ){ // summary @@ -36,7 +36,7 @@ dojo.extend(dojo.charting.Chart, { this.plotAreas.push(obj); if(doRender){ this.render(); } }, - + // events onInitialize:function(chart){ }, onRender:function(chart){ }, @@ -46,8 +46,8 @@ dojo.extend(dojo.charting.Chart, { initialize: function(){ // summary // Initialize the Chart by rendering it. - if(!this.node){ - dojo.raise("dojo.charting.Chart.initialize: there must be a root node defined for the Chart."); + if(!this.node){ + dojo.raise("dojo.charting.Chart.initialize: there must be a root node defined for the Chart."); } this.destroy(); this.render(); @@ -78,8 +78,8 @@ dojo.extend(dojo.charting.Chart, { this.plotAreas[i].plotArea.destroy(); }; // clean out any child nodes. - while(this.node && this.node.childNodes && this.node.childNodes.length > 0){ - this.node.removeChild(this.node.childNodes[0]); + while(this.node && this.node.childNodes && this.node.childNodes.length > 0){ + this.node.removeChild(this.node.childNodes[0]); } } }); diff --git a/framework/images/webapp/images/dojo/src/charting/Plot.js b/framework/images/webapp/images/dojo/src/charting/Plot.js index f363a39d1e..95cd1ccdb5 100644 --- a/framework/images/webapp/images/dojo/src/charting/Plot.js +++ b/framework/images/webapp/images/dojo/src/charting/Plot.js @@ -16,8 +16,8 @@ dojo.require("dojo.charting.Series"); dojo.charting.RenderPlotSeries = { Singly:"single", Grouped:"grouped" }; dojo.charting.Plot = function( - /* dojo.charting.Axis? */xaxis, - /* dojo.charting.Axis? */yaxis, + /* dojo.charting.Axis? */xaxis, + /* dojo.charting.Axis? */yaxis, /* dojo.charting.Series[]? */series ){ // summary diff --git a/framework/images/webapp/images/dojo/src/charting/PlotArea.js b/framework/images/webapp/images/dojo/src/charting/PlotArea.js index ebd8ba68a4..7b0e3b5399 100644 --- a/framework/images/webapp/images/dojo/src/charting/PlotArea.js +++ b/framework/images/webapp/images/dojo/src/charting/PlotArea.js @@ -35,7 +35,7 @@ dojo.charting.PlotArea = function(){ plots: null }; - // this is preset for a limited color range (green to purple), + // this is preset for a limited color range (green to purple), // anticipating a max of 32 series on this plot area. // if you need more flexibility, override these numbers. this._color = { h: 140, s: 120, l: 120, step: 27 }; @@ -48,8 +48,8 @@ dojo.extend(dojo.charting.PlotArea, { // Advances the internal HSV cursor and returns the next generated color. var rgb=dojo.gfx.color.hsl2rgb(this._color.h, this._color.s, this._color.l); this._color.h = (this._color.h + this._color.step)%360; - while(this._color.h < 140){ - this._color.h += this._color.step; + while(this._color.h < 140){ + this._color.h += this._color.step; } return dojo.gfx.color.rgb2hex(rgb[0], rgb[1], rgb[2]); // string }, @@ -61,7 +61,7 @@ dojo.extend(dojo.charting.PlotArea, { right: this.size.width - this.padding.right, top: this.padding.top, bottom: this.size.height - this.padding.bottom, - toString:function(){ + toString:function(){ var a=[ this.top, this.right, this.bottom, this.left ]; return "["+a.join()+"]"; } @@ -86,7 +86,7 @@ dojo.extend(dojo.charting.PlotArea, { plane: "y" }; } - return axes; // object + return axes; // object }, getLegendInfo: function(){ // summary @@ -129,7 +129,7 @@ dojo.extend(dojo.charting.PlotArea, { ay.upper=Math.max(ay.upper, y.upper); ay.lower=Math.min(ay.lower, y.lower); } - + // now that we have all the max/min ranges, set the axes for(var p in axes){ axes[p].range=ranges[p]; @@ -141,9 +141,9 @@ dojo.extend(dojo.charting.PlotArea, { // Render this plotArea. Optional kwArgs are the same as that taken for Series.evaluate; // applyToData is a callback function used by plotters for customization. if(!this.nodes.main - || !this.nodes.area - || !this.nodes.background - || !this.nodes.plots + || !this.nodes.area + || !this.nodes.background + || !this.nodes.plots || !this.nodes.axes ){ this.initialize(); } @@ -183,8 +183,8 @@ dojo.extend(dojo.charting.PlotArea, { var node=this.nodes[p]; if(!node) continue; if(!node.childNodes) continue; - while(node.childNodes.length > 0){ - node.removeChild(node.childNodes[0]); + while(node.childNodes.length > 0){ + node.removeChild(node.childNodes[0]); } this.nodes[p]=null; } diff --git a/framework/images/webapp/images/dojo/src/charting/Plotters.js b/framework/images/webapp/images/dojo/src/charting/Plotters.js index f403f0e08e..1cf46a222b 100644 --- a/framework/images/webapp/images/dojo/src/charting/Plotters.js +++ b/framework/images/webapp/images/dojo/src/charting/Plotters.js @@ -10,7 +10,7 @@ dojo.provide("dojo.charting.Plotters"); -/* +/* * Plotters is the placeholder; what will happen is that the proper renderer types * will be mixed into this object (as opposed to creating a new one). */ diff --git a/framework/images/webapp/images/dojo/src/charting/README.txt b/framework/images/webapp/images/dojo/src/charting/README.txt index c20a415547..c4217d682f 100644 --- a/framework/images/webapp/images/dojo/src/charting/README.txt +++ b/framework/images/webapp/images/dojo/src/charting/README.txt @@ -13,7 +13,7 @@ Chart A Chart object is the main entity; it is the entire graphic. A Chart may -have any number of PlotArea objects, which are the basic canvas against +have any number of PlotArea objects, which are the basic canvas against which data is plotted. A PlotArea may have any number of Plot objects, which is a container representing up to 2 axes and any number of series to be plotted against those axes; a Series represents a binding against @@ -36,7 +36,7 @@ are custom methods to render specific types of charts. ------------------------------------------------------------------------- In terms of widgets, the basic concept is that there is a central, super- flexible Chart widget (Chart, oddly enough), and then any number of preset -chart type widgets, that are basically built to serve a simple, easy +chart type widgets, that are basically built to serve a simple, easy purpose. For instance, if someone just needs to plot a series of lines, they would be better off using the LineChart widget; but if someone needed to plot a combo chart, that has 2 Y Axes (one linear, one log) against the diff --git a/framework/images/webapp/images/dojo/src/charting/Series.js b/framework/images/webapp/images/dojo/src/charting/Series.js index 65830e6abb..d3d0851c5f 100644 --- a/framework/images/webapp/images/dojo/src/charting/Series.js +++ b/framework/images/webapp/images/dojo/src/charting/Series.js @@ -48,7 +48,7 @@ dojo.extend(dojo.charting.Series, { var l = a.length; var start = 0; var end = l; - + /* Allow for ranges. Can be done in one of two ways: * 1. { from, to } as 0-based indices * 2. { length } as num of data points to get; a negative @@ -57,9 +57,9 @@ dojo.extend(dojo.charting.Series, { * and returned. */ if(kwArgs){ - if(kwArgs.from){ + if(kwArgs.from){ start = Math.max(kwArgs.from,0); - if(kwArgs.to){ + if(kwArgs.to){ end = Math.min(kwArgs.to, end); } } @@ -110,7 +110,7 @@ dojo.extend(dojo.charting.Series, { var total = 0; var count = 0; for(var i=range.index; i>=range.start; i--){ - total += values[i].y; + total += values[i].y; count++; } total /= Math.max(count,1); @@ -177,12 +177,12 @@ dojo.extend(dojo.charting.Series, { break; } } - if(!b){ - a.push(values[i].y); + if(!b){ + a.push(values[i].y); } } a.sort(); - if(a.length > 0){ + if(a.length > 0){ return a[Math.ceil(a.length / 2)]; // float } return 0; // float @@ -199,14 +199,14 @@ dojo.extend(dojo.charting.Series, { for(var i=range.index; i>=range.start; i--){ if (!o[values[i].y]){ o[values[i].y] = 1; - } else { + } else { o[values[i].y]++; } } for(var p in o){ - if(median < o[p]){ - median = o[p]; - ret=p; + if(median < o[p]){ + median = o[p]; + ret=p; } } return ret; diff --git a/framework/images/webapp/images/dojo/src/charting/svg/Axis.js b/framework/images/webapp/images/dojo/src/charting/svg/Axis.js index 8bdd15f26a..130de209dc 100644 --- a/framework/images/webapp/images/dojo/src/charting/svg/Axis.js +++ b/framework/images/webapp/images/dojo/src/charting/svg/Axis.js @@ -14,8 +14,8 @@ dojo.require("dojo.lang.common"); if(dojo.render.svg.capable){ dojo.extend(dojo.charting.Axis, { renderLines: function( - /* dojo.charting.PlotArea */plotArea, - /* dojo.charting.Plot */plot, + /* dojo.charting.PlotArea */plotArea, + /* dojo.charting.Plot */plot, /* string */plane ){ // summary @@ -29,7 +29,7 @@ if(dojo.render.svg.capable){ this.nodes.lines = null; } } - + var area = plotArea.getArea(); var g = this.nodes.lines = document.createElementNS(dojo.svg.xmlns.svg, "g"); g.setAttribute("id", this.getId()+"-lines"); @@ -56,8 +56,8 @@ if(dojo.render.svg.capable){ return g; // SVGGElement }, renderTicks: function( - /* dojo.charting.PlotArea */plotArea, - /* dojo.charting.Plot */plot, + /* dojo.charting.PlotArea */plotArea, + /* dojo.charting.Plot */plot, /* string */plane, /* float */coord ){ @@ -72,7 +72,7 @@ if(dojo.render.svg.capable){ this.nodes.ticks = null; } } - + var g = this.nodes.ticks = document.createElementNS(dojo.svg.xmlns.svg, "g"); g.setAttribute("id", this.getId()+"-ticks"); for(var i=0; i 0){ x = xOrigin; } - + var bar=document.createElementNS(dojo.svg.xmlns.svg, "rect"); bar.setAttribute("fill", data[j][i].series.color); bar.setAttribute("stroke-width", "0"); @@ -167,7 +167,7 @@ if(dojo.render.svg.capable){ var x = plot.axisX.getCoord(low, plotarea, plot); var w = plot.axisX.getCoord(high, plotarea, plot) - x; var y = yStart + (barH*j); - + var bar=document.createElementNS(dojo.svg.xmlns.svg, "rect"); bar.setAttribute("fill", data[j][i].series.color); bar.setAttribute("stroke-width", "0"); @@ -229,7 +229,7 @@ if(dojo.render.svg.capable){ if(j==0){ cmd.push("M"); } else { cmd.push("L"); } cmd.push(x+","+y); - + // points on the line var c=document.createElementNS(dojo.svg.xmlns.svg, "circle"); c.setAttribute("cx",x); @@ -326,7 +326,7 @@ if(dojo.render.svg.capable){ cmd.push(cx + "," + y); } cmd.push(x+","+y); - + // points on the line var c=document.createElementNS(dojo.svg.xmlns.svg, "circle"); c.setAttribute("cx",x); @@ -375,7 +375,7 @@ if(dojo.render.svg.capable){ * Single plotters: one series at a time. *********************************************************/ DataBar: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -385,7 +385,7 @@ if(dojo.render.svg.capable){ // Bindings: x/y var area = plotarea.getArea(); var group = document.createElementNS(dojo.svg.xmlns.svg, "g"); - + var n = data.length; var w = (area.right-area.left)/(plot.axisX.range.upper - plot.axisX.range.lower); // the width of each group. var yOrigin = plot.axisY.getCoord(plot.axisX.origin, plotarea, plot); @@ -415,7 +415,7 @@ if(dojo.render.svg.capable){ return group; // SVGGElement }, Line: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -443,7 +443,7 @@ if(dojo.render.svg.capable){ if(i==0){ cmd.push("M"); } else { cmd.push("L"); } cmd.push(x+","+y); - + // points on the line var c=document.createElementNS(dojo.svg.xmlns.svg, "circle"); c.setAttribute("cx",x); @@ -460,7 +460,7 @@ if(dojo.render.svg.capable){ return line; // SVGGElement }, CurvedLine: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -502,7 +502,7 @@ if(dojo.render.svg.capable){ cmd.push(cx + "," + y); } cmd.push(x+","+y); - + // points on the line var c=document.createElementNS(dojo.svg.xmlns.svg, "circle"); c.setAttribute("cx",x); @@ -519,7 +519,7 @@ if(dojo.render.svg.capable){ return line; // SVGGElement }, Area: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -548,7 +548,7 @@ if(dojo.render.svg.capable){ if(i==0){ cmd.push("M"); } else { cmd.push("L"); } cmd.push(x+","+y); - + // points on the line var c=document.createElementNS(dojo.svg.xmlns.svg, "circle"); c.setAttribute("cx",x); @@ -571,7 +571,7 @@ if(dojo.render.svg.capable){ return line; // SVGGElement }, CurvedArea: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -614,7 +614,7 @@ if(dojo.render.svg.capable){ cmd.push(cx + "," + y); } cmd.push(x+","+y); - + // points on the line var c=document.createElementNS(dojo.svg.xmlns.svg, "circle"); c.setAttribute("cx",x); @@ -637,7 +637,7 @@ if(dojo.render.svg.capable){ return line; // SVGGElement }, HighLow: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -647,7 +647,7 @@ if(dojo.render.svg.capable){ // Bindings: x/high/low var area = plotarea.getArea(); var group = document.createElementNS(dojo.svg.xmlns.svg, "g"); - + var n = data.length; var part = ((area.right-area.left)/(plot.axisX.range.upper - plot.axisX.range.lower))/4; var w = part*2; @@ -680,7 +680,7 @@ if(dojo.render.svg.capable){ return group; // SVGGElement }, HighLowClose: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -690,7 +690,7 @@ if(dojo.render.svg.capable){ // Bindings: x/high/low/close var area = plotarea.getArea(); var group = document.createElementNS(dojo.svg.xmlns.svg, "g"); - + var n = data.length; var part = ((area.right-area.left)/(plot.axisX.range.upper - plot.axisX.range.lower))/4; var w = part*2; @@ -738,7 +738,7 @@ if(dojo.render.svg.capable){ return group; // SVGGElement }, HighLowOpenClose: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -748,7 +748,7 @@ if(dojo.render.svg.capable){ // Bindings: x/high/low/open/close var area = plotarea.getArea(); var group = document.createElementNS(dojo.svg.xmlns.svg, "g"); - + var n = data.length; var part = ((area.right-area.left)/(plot.axisX.range.upper - plot.axisX.range.lower))/4; var w = part*2; @@ -807,7 +807,7 @@ if(dojo.render.svg.capable){ return group; // SVGGElement }, Scatter: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -837,7 +837,7 @@ if(dojo.render.svg.capable){ return group; // SVGGElement }, Bubble: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo diff --git a/framework/images/webapp/images/dojo/src/charting/vml/Axis.js b/framework/images/webapp/images/dojo/src/charting/vml/Axis.js index 538d3f67fa..18ccca71be 100644 --- a/framework/images/webapp/images/dojo/src/charting/vml/Axis.js +++ b/framework/images/webapp/images/dojo/src/charting/vml/Axis.js @@ -14,8 +14,8 @@ dojo.require("dojo.lang.common"); if(dojo.render.vml.capable){ dojo.extend(dojo.charting.Axis, { renderLines: function( - /* dojo.charting.PlotArea */plotArea, - /* dojo.charting.Plot */plot, + /* dojo.charting.PlotArea */plotArea, + /* dojo.charting.Plot */plot, /* string */plane ){ // summary @@ -29,7 +29,7 @@ if(dojo.render.vml.capable){ this.nodes.lines = null; } } - + var area = plotArea.getArea(); var g = this.nodes.lines = document.createElement("div"); g.setAttribute("id", this.getId()+"-lines"); @@ -61,8 +61,8 @@ if(dojo.render.vml.capable){ return g; // HTMLDivElement }, renderTicks: function( - /* dojo.charting.PlotArea */plotArea, - /* dojo.charting.Plot */plot, + /* dojo.charting.PlotArea */plotArea, + /* dojo.charting.Plot */plot, /* string */plane, /* float */coord ){ @@ -77,7 +77,7 @@ if(dojo.render.vml.capable){ this.nodes.ticks = null; } } - + var g = this.nodes.ticks = document.createElement("div"); g.setAttribute("id", this.getId()+"-ticks"); for(var i=0; i 0){ x = xOrigin; } - + var bar=document.createElement("v:rect"); bar.style.position="absolute"; bar.style.top=y+1+"px"; @@ -158,7 +158,7 @@ if(dojo.render.vml.capable){ xA = x; x = xOrigin; } - + } return group; // HTMLDivElement }, @@ -200,7 +200,7 @@ if(dojo.render.vml.capable){ var x = plot.axisX.getCoord(low, plotarea, plot); var w = plot.axisX.getCoord(high, plotarea, plot) - x; var y = yStart + (barH*j); - + var bar=document.createElement("v:rect"); bar.style.position="absolute"; bar.style.top=y+1+"px"; @@ -315,7 +315,7 @@ if(dojo.render.vml.capable){ for(var j=values.length-2; j>=0; j--){ var x = Math.round(plot.axisX.getCoord(values[j].x, plotarea, plot)); var y = Math.round(plot.axisY.getCoord(values[j].y, plotarea, plot)); - + cmd.push("l"); cmd.push(x+","+y); } @@ -388,7 +388,7 @@ if(dojo.render.vml.capable){ var lasty = Math.round(plot.axisY.getCoord(values[j-1].y, plotarea, plot)); var dx=x-lastx; var dy=y-lasty; - + cmd.push("c"); var cx=Math.round((x-(tension-1)*(dx/tension))); cmd.push(cx+","+lasty); @@ -436,7 +436,7 @@ if(dojo.render.vml.capable){ var lasty = Math.round(plot.axisY.getCoord(values[j+1].y, plotarea, plot)); var dx=x-lastx; var dy=y-lasty; - + cmd.push("c"); var cx=Math.round((x-(tension-1)*(dx/tension))); cmd.push(cx+","+lasty); @@ -455,7 +455,7 @@ if(dojo.render.vml.capable){ * Single plotters: one series at a time. *********************************************************/ DataBar: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -465,7 +465,7 @@ if(dojo.render.vml.capable){ // Bindings: x/y var area = plotarea.getArea(); var group = dojo.charting.Plotters._group(plotarea); - + var n = data.length; var w = (area.right-area.left)/(plot.axisX.range.upper - plot.axisX.range.lower); // the width of each group. var yOrigin = plot.axisY.getCoord(plot.axisX.origin, plotarea, plot); @@ -499,7 +499,7 @@ if(dojo.render.vml.capable){ return group; // HTMLDivElement }, Line: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -564,7 +564,7 @@ if(dojo.render.vml.capable){ return group; // HTMLDivElement }, CurvedLine: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -605,7 +605,7 @@ if(dojo.render.vml.capable){ var lasty = Math.round(plot.axisY.getCoord(data[i-1].y, plotarea, plot)); var dx=x-lastx; var dy=y-lasty; - + cmd.push("c"); var cx=Math.round((x-(tension-1)*(dx/tension))); cmd.push(cx+","+lasty); @@ -639,7 +639,7 @@ if(dojo.render.vml.capable){ return group; // HTMLDivElement }, Area: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -710,7 +710,7 @@ if(dojo.render.vml.capable){ return group; // HTMLDivElement }, CurvedArea: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -753,7 +753,7 @@ if(dojo.render.vml.capable){ var lasty = Math.round(plot.axisY.getCoord(data[i-1].y, plotarea, plot)); var dx=x-lastx; var dy=y-lasty; - + cmd.push("c"); var cx=Math.round((x-(tension-1)*(dx/tension))); cmd.push(cx+","+lasty); @@ -791,7 +791,7 @@ if(dojo.render.vml.capable){ return group; // HTMLDivElement }, HighLow: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -836,9 +836,9 @@ if(dojo.render.vml.capable){ group.appendChild(bar); } return group; // HTMLDivElement - }, + }, HighLowClose: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -904,9 +904,9 @@ if(dojo.render.vml.capable){ group.appendChild(g); } return group; // HTMLDivElement - }, + }, HighLowOpenClose: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -969,7 +969,7 @@ if(dojo.render.vml.capable){ str.setAttribute("opacity","0.6"); line.appendChild(str); g.appendChild(line); - + var line = document.createElement("v:line"); line.setAttribute("strokecolor", data[i].series.color); line.setAttribute("strokeweight", "1px"); @@ -989,9 +989,9 @@ if(dojo.render.vml.capable){ group.appendChild(g); } return group; // HTMLDivElement - }, + }, Scatter: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo @@ -1029,7 +1029,7 @@ if(dojo.render.vml.capable){ return group; // HTMLDivElement }, Bubble: function( - /* array */data, + /* array */data, /* dojo.charting.PlotArea */plotarea, /* dojo.charting.Plot */plot, /* function? */applyTo diff --git a/framework/images/webapp/images/dojo/src/collections/BinaryTree.js b/framework/images/webapp/images/dojo/src/collections/BinaryTree.js index 445e1059b1..4a13d8456c 100644 --- a/framework/images/webapp/images/dojo/src/collections/BinaryTree.js +++ b/framework/images/webapp/images/dojo/src/collections/BinaryTree.js @@ -73,7 +73,7 @@ dojo.collections.BinaryTree=function(data){ } return s; } - + function searchHelper(current, data){ if (!current) return null; var i=current.compareData(data); diff --git a/framework/images/webapp/images/dojo/src/collections/Collections.js b/framework/images/webapp/images/dojo/src/collections/Collections.js index 6c1cf628fb..c9058d0db1 100644 --- a/framework/images/webapp/images/dojo/src/collections/Collections.js +++ b/framework/images/webapp/images/dojo/src/collections/Collections.js @@ -15,11 +15,11 @@ dojo.collections.DictionaryEntry=function(/* string */k, /* object */v){ // return an object of type dojo.collections.DictionaryEntry this.key=k; this.value=v; - this.valueOf=function(){ + this.valueOf=function(){ return this.value; // object }; - this.toString=function(){ - return String(this.value); // string + this.toString=function(){ + return String(this.value); // string }; } @@ -115,10 +115,10 @@ dojo.collections.DictionaryIterator=function(/* object */obj){ return arr; // array } }; - this.reset=function() { + this.reset=function() { // summary // reset the internal cursor. - position=0; + position=0; this.element=a[position]; }; }; diff --git a/framework/images/webapp/images/dojo/src/collections/Dictionary.js b/framework/images/webapp/images/dojo/src/collections/Dictionary.js index e150bd4105..a96936a121 100644 --- a/framework/images/webapp/images/dojo/src/collections/Dictionary.js +++ b/framework/images/webapp/images/dojo/src/collections/Dictionary.js @@ -85,15 +85,15 @@ dojo.collections.Dictionary=function(/* dojo.collections.Dictionary? */dictionar this.getKeyList=function(){ // summary // Returns an array of the keys in the dictionary. - return (this.getIterator()).map(function(entry){ - return entry.key; + return (this.getIterator()).map(function(entry){ + return entry.key; }); // array }; this.getValueList=function(){ // summary // Returns an array of the values in the dictionary. - return (this.getIterator()).map(function(entry){ - return entry.value; + return (this.getIterator()).map(function(entry){ + return entry.value; }); // array }; this.item=function(/* string */k){ diff --git a/framework/images/webapp/images/dojo/src/collections/Graph.js b/framework/images/webapp/images/dojo/src/collections/Graph.js index 0428975fa6..1b328be253 100644 --- a/framework/images/webapp/images/dojo/src/collections/Graph.js +++ b/framework/images/webapp/images/dojo/src/collections/Graph.js @@ -66,7 +66,7 @@ dojo.collections.Graph=function(nodes){ this.element=o[position]; }; } - + this.add=function(node){ d.add(node.key, node); }; diff --git a/framework/images/webapp/images/dojo/src/collections/SkipList.js b/framework/images/webapp/images/dojo/src/collections/SkipList.js index 9247f1194d..1d64926485 100644 --- a/framework/images/webapp/images/dojo/src/collections/SkipList.js +++ b/framework/images/webapp/images/dojo/src/collections/SkipList.js @@ -102,7 +102,7 @@ dojo.collections.SkipList = function(){ } } }; - + this.contains = function(val){ var current = this.head; var i; @@ -132,7 +132,7 @@ dojo.collections.SkipList = function(){ } updates[i] = current; } - + current = current.nodes[0]; if (current != null && current.compare(val) == 0){ this.count--; @@ -143,7 +143,7 @@ dojo.collections.SkipList = function(){ if (this.head.nodes[this.head.height - 1] == null) this.head.decrementHeight(); } }; - this.resetComparisons = function(){ - comparisons = 0; + this.resetComparisons = function(){ + comparisons = 0; }; } diff --git a/framework/images/webapp/images/dojo/src/collections/SortedList.js b/framework/images/webapp/images/dojo/src/collections/SortedList.js index 0ba84da63e..5c8dfdd2e1 100644 --- a/framework/images/webapp/images/dojo/src/collections/SortedList.js +++ b/framework/images/webapp/images/dojo/src/collections/SortedList.js @@ -69,7 +69,7 @@ dojo.collections.SortedList=function(/* object? */ dictionary){ var e=this.getIterator(); while (!e.atEnd()){ var item=e.get(); - if(item.value==o){ + if(item.value==o){ return true; // bool } } diff --git a/framework/images/webapp/images/dojo/src/collections/Store.js b/framework/images/webapp/images/dojo/src/collections/Store.js index b7a42ff65e..cb3c8bae39 100644 --- a/framework/images/webapp/images/dojo/src/collections/Store.js +++ b/framework/images/webapp/images/dojo/src/collections/Store.js @@ -36,12 +36,12 @@ dojo.collections.Store = function(/* array? */jsonArray){ } return null; // null }; - this.getByIndex = function(/*number*/idx){ + this.getByIndex = function(/*number*/idx){ // summary // Get the internal data object by index. return data[idx]; // object }; - + this.getData = function(){ // summary // Get an array of source objects. @@ -61,7 +61,7 @@ dojo.collections.Store = function(/* array? */jsonArray){ } return null; // null }; - this.getDataByIndex = function(/*number*/idx){ + this.getDataByIndex = function(/*number*/idx){ // summary // Get the source object at index idx. return data[idx].src; // object @@ -71,7 +71,7 @@ dojo.collections.Store = function(/* array? */jsonArray){ var parts=fieldPath.split("."), i=0, o=obj, field; if(parts.length>1) { field = parts.pop(); - do{ + do{ if(parts[i].indexOf("()")>-1){ var temp=parts[i++].split("()")[0]; if(!o[temp]){ @@ -121,14 +121,14 @@ dojo.collections.Store = function(/* array? */jsonArray){ // Set up the internal data. data = []; // don't fire onClearData for(var i=0; i-1){ var temp=parts[i++].split("()")[0]; if(!o[temp]){ @@ -217,7 +217,7 @@ dojo.extend(dojo.collections.Store, { o = o[parts[i++]]; } } while (i>>18)&0x3f)); + s.push(tab.charAt((t>>>18)&0x3f)); s.push(tab.charAt((t>>>12)&0x3f)); s.push(tab.charAt((t>>>6)&0x3f)); s.push(tab.charAt(t&0x3f)); @@ -457,12 +457,12 @@ dojo.crypto.Blowfish = new function(){ vector.right=o.right;dojo.crypto.outputTypes.Hex } - cipher.push((o.left>>24)&0xff); - cipher.push((o.left>>16)&0xff); + cipher.push((o.left>>24)&0xff); + cipher.push((o.left>>16)&0xff); cipher.push((o.left>>8)&0xff); cipher.push(o.left&0xff); - cipher.push((o.right>>24)&0xff); - cipher.push((o.right>>16)&0xff); + cipher.push((o.right>>24)&0xff); + cipher.push((o.right>>16)&0xff); cipher.push((o.right>>8)&0xff); cipher.push(o.right&0xff); pos+=8; @@ -497,7 +497,7 @@ dojo.crypto.Blowfish = new function(){ } var bx = init(key); var pt=[]; - + var c=null; switch(ip){ case dojo.crypto.outputTypes.Hex:{ diff --git a/framework/images/webapp/images/dojo/src/crypto/SHA1.js b/framework/images/webapp/images/dojo/src/crypto/SHA1.js index 7119a7c1c9..af5deb816b 100644 --- a/framework/images/webapp/images/dojo/src/crypto/SHA1.js +++ b/framework/images/webapp/images/dojo/src/crypto/SHA1.js @@ -59,12 +59,12 @@ dojo.crypto.SHA1 = new function(){ return (m<<16)|(l&0xffff); } function r(x,n){ return (x<>>(32-n)); } - + // SHA rounds function f(u,v,w){ return ((u&v)|(~u&w)); } function g(u,v,w){ return ((u&v)|(u&w)|(v&w)); } function h(u,v,w){ return (u^v^w); } - + function fn(i,u,v,w){ if(i<20) return f(u,v,w); if(i<40) return h(u,v,w); @@ -88,7 +88,7 @@ dojo.crypto.SHA1 = new function(){ var c=-1732584194; // 0x98badcfe var d= 271733878; // 0x10325476 var e=-1009589776; // 0xc3d2e1f0 - + for(var i=0; i 0); }, - + containsValue: function(/* item */ item, /* attribute || attribute-name-string */ attribute, /* anything */ value) { // summary: See dojo.data.core.Read.containsValue() var values = this.getValues(item, attribute); @@ -145,17 +145,17 @@ dojo.declare("dojo.data.OpmlStore", dojo.data.core.Read, { } return false; // boolean }, - + isItem: function(/* anything */ something) { - return (something && - something.nodeType == Node.ELEMENT_NODE && + return (something && + something.nodeType == Node.ELEMENT_NODE && something.tagName == 'outline'); // boolean }, - + isItemAvailable: function(/* anything */ something) { return this.isItem(something); }, - + find: function(/* object? || dojo.data.core.Result */ keywordArgs) { // summary: See dojo.data.core.Read.find() var result = null; @@ -194,7 +194,7 @@ dojo.declare("dojo.data.OpmlStore", dojo.data.core.Read, { } } }; - + if (!this._loadFinished) { if (this._opmlFileUrl) { var bindRequest = dojo.io.bind({ @@ -207,13 +207,13 @@ dojo.declare("dojo.data.OpmlStore", dojo.data.core.Read, { } return result; // dojo.data.csv.Result }, - + getIdentity: function(/* item */ item) { // summary: See dojo.data.core.Read.getIdentity() dojo.unimplemented('dojo.data.OpmlStore.getIdentity()'); return null; }, - + findByIdentity: function(/* string */ identity) { // summary: See dojo.data.core.Read.findByIdentity() dojo.unimplemented('dojo.data.OpmlStore.findByIdentity()'); diff --git a/framework/images/webapp/images/dojo/src/data/RdfStore.js b/framework/images/webapp/images/dojo/src/data/RdfStore.js index 74c4751be7..5a53466396 100644 --- a/framework/images/webapp/images/dojo/src/data/RdfStore.js +++ b/framework/images/webapp/images/dojo/src/data/RdfStore.js @@ -15,16 +15,16 @@ dojo.require("dojo.data.core.RemoteStore"); dojo.require("dojo.experimental"); /* summary: - * RdfStore provides a dojo.data Store for querying and updating a server + * RdfStore provides a dojo.data Store for querying and updating a server * that supports the SPARQL Query Result JSON format. * (see http://www.w3.org/TR/rdf-sparql-json-res/) - * + * * It also maps RDF datatypes to Javascript objects. - * + * * RdfStore makes following assumptions about the Result JSON: - * (1) The result always contains 3 bound variables named "s","p", and "o", + * (1) The result always contains 3 bound variables named "s","p", and "o", * and each result binding is treated as an RDF statement. - * (2) When saving changes to the store, the JSON "results" object will also + * (2) When saving changes to the store, the JSON "results" object will also * contain a "deleted" key whose value is a list of deleted RDF resources. * */ @@ -36,8 +36,8 @@ dojo.data.RdfDatatypeSerializer = function(/* JavaScript type */type, /* functio this.type = type; this._converter = convertFunc; this.uri = uri; - this.serialize = function(value) { - return this._converter.call(value, value); + this.serialize = function(value) { + return this._converter.call(value, value); }; } @@ -45,50 +45,50 @@ dojo.declare("dojo.data.RdfStore", dojo.data.core.RemoteStore, { _datatypeMap: { //map datatype strings to constructor function - literal: function(value) { + literal: function(value) { var literal = value.value; if (value["xml:lang"]) { literal.lang = value["xml:lang"]; } return literal; }, - - uri: function(value) { - return { id: value.value }; - }, - - bnode: function(value) { - return { id: '_:' + value.value }; + + uri: function(value) { + return { id: value.value }; }, - 'http://www.w3.org/2001/XMLSchema#int': function(value) { - return parseInt(value.value); + bnode: function(value) { + return { id: '_:' + value.value }; }, - 'http://www.w3.org/2001/XMLSchema#integer': function(value) { + + 'http://www.w3.org/2001/XMLSchema#int': function(value) { return parseInt(value.value); }, - 'http://www.w3.org/2001/XMLSchema#long': function(value) { + 'http://www.w3.org/2001/XMLSchema#integer': function(value) { return parseInt(value.value); }, - 'http://www.w3.org/2001/XMLSchema#float': function(value) { + 'http://www.w3.org/2001/XMLSchema#long': function(value) { + return parseInt(value.value); + }, + 'http://www.w3.org/2001/XMLSchema#float': function(value) { return parseFloat(value.value); }, - 'http://www.w3.org/2001/XMLSchema#double': function(value) { + 'http://www.w3.org/2001/XMLSchema#double': function(value) { return parseFloat(value.value); }, - 'http://www.w3.org/2001/XMLSchema#boolean': function(value) { - return !value || value == "false" || value == "0" ? false : true; + 'http://www.w3.org/2001/XMLSchema#boolean': function(value) { + return !value || value == "false" || value == "0" ? false : true; } - //todo: more datatypes: + //todo: more datatypes: //integer subtypes, string types, XMLiteral //,'http://www.w3.org/2001/XMLSchema#... : function(value) { return parseInt(value.value); } }, _datatypeSerializers: [ - new dojo.data.RdfDatatypeSerializer(Number, Number.toString, 'http://www.w3.org/2001/XMLSchema#float'), + new dojo.data.RdfDatatypeSerializer(Number, Number.toString, 'http://www.w3.org/2001/XMLSchema#float'), new dojo.data.RdfDatatypeSerializer(Boolean, Boolean.toString, 'http://www.w3.org/2001/XMLSchema#boolean') ], - + _findDatatypeSerializer: function(value) { var length = this._datatypeSerializers.length; for (var i = 0; i < length; i++) { @@ -122,7 +122,7 @@ dojo.declare("dojo.data.RdfStore", dojo.data.core.RemoteStore, { value = new Number(value); else if (typeof value == "boolean") value = new Boolean(value); - + var datatype = this._findDatatypeSerializer(value); if (datatype) { rdfvalue = { @@ -133,24 +133,24 @@ dojo.declare("dojo.data.RdfStore", dojo.data.core.RemoteStore, { //Error: Function.prototype.toString called on incompatible number }; } else { - //treat it as a string + //treat it as a string //todo: warn? - rdfvalue = { - "type": "literal", + rdfvalue = { + "type": "literal", "value": value.toString() }; } } return rdfvalue; }, - - _setupSaveRequest: function(saveKeywordArgs, requestKw) { + + _setupSaveRequest: function(saveKeywordArgs, requestKw) { /* - This function prepares the save request by populating requestKw, + This function prepares the save request by populating requestKw, an associative array that will be passed to dojo.io.bind. */ - + //see http://www.w3.org/TR/rdf-sparql-json-res/ - var rdfResult = { "head": {'vars': ['s','p','o']}, + var rdfResult = { "head": {'vars': ['s','p','o']}, "results": {'bindings': []} }; var resources = []; @@ -158,14 +158,14 @@ dojo.declare("dojo.data.RdfStore", dojo.data.core.RemoteStore, { resources.push(key); } rdfResult.results.deleted = resources; - + for (key in this._changed) { var subject = this._toRDFValue(this.getIdentity(key)) - + var attributes = this._changed[key]; for (var attr in attributes) { var predicate = {type:'uri', value: attr}; - + var values = attributes[attr]; if (!values.length) continue; @@ -177,22 +177,22 @@ dojo.declare("dojo.data.RdfStore", dojo.data.core.RemoteStore, { } } } - + var oldRegistry = dojo.json.jsonRegistry; dojo.json.jsonRegistry = this._jsonRegistry; var jsonString = dojo.json.serialize(rdfResult); dojo.json.jsonRegistry = oldRegistry; - + //dojo.debug('save json' , jsonString); - + requestKw.postContent = jsonString; }, - + _resultToQueryMetadata: function(json) { return json.head; }, - - _resultToQueryData: function(json) { + + _resultToQueryData: function(json) { //assume s, p, o bindings var items = {}; var stmts = json.results.bindings; @@ -203,7 +203,7 @@ dojo.declare("dojo.data.RdfStore", dojo.data.core.RemoteStore, { if (stmt.s.type == 'bnode') { subject = '_:' + subject; } - //else { assert stmt.s.type == 'uri';} + //else { assert stmt.s.type == 'uri';} var attributes = data[subject]; if (!attributes) { attributes = {}; @@ -236,21 +236,21 @@ dojo.declare("dojo.data.RhizomeStore", dojo.data.RdfStore, { _resultToQueryMetadata: function(json) { return json; }, - - _resultToQueryData: function(json) { + + _resultToQueryData: function(json) { //dojo.debug( 'resultjson ' + dojo.json.serialize(json) ); return json; }, - - _setupSaveRequest: function(saveKeywordArgs, requestKw) { + + _setupSaveRequest: function(saveKeywordArgs, requestKw) { /* - This function prepares the save request by populating requestKw, + This function prepares the save request by populating requestKw, an associative array that will be passed to dojo.io.bind. */ requestKw.url = this._serverSaveUrl; requestKw.method = 'post'; requestKw.mimetype = "text/plain"; - + var resources = []; for (var key in this._deleted) { resources.push(key); @@ -261,7 +261,7 @@ dojo.declare("dojo.data.RhizomeStore", dojo.data.RdfStore, { if (!this._added[key]) { //don't put new resources in this list resources.push(key); } - + var attributes = this._changed[key]; var rdfattributes = {}; for (var attr in attributes) { @@ -277,12 +277,12 @@ dojo.declare("dojo.data.RhizomeStore", dojo.data.RdfStore, { } changes[key] = rdfattributes; } - + var oldRegistry = dojo.json.jsonRegistry; dojo.json.jsonRegistry = this._jsonRegistry; var jsonString = dojo.json.serialize(changes); dojo.json.jsonRegistry = oldRegistry; - + requestKw.content = { rdfFormat: 'json', resource: resources, diff --git a/framework/images/webapp/images/dojo/src/data/YahooStore.js b/framework/images/webapp/images/dojo/src/data/YahooStore.js index 52ad0cdfeb..7ff0054164 100644 --- a/framework/images/webapp/images/dojo/src/data/YahooStore.js +++ b/framework/images/webapp/images/dojo/src/data/YahooStore.js @@ -15,27 +15,27 @@ dojo.require("dojo.io.ScriptSrcIO"); dojo.declare("dojo.data.YahooStore", dojo.data.core.RemoteStore, { /* Summary: - * The YahooStore implements the dojo.data.core.Read API. - */ - _setupQueryRequest: function(result, requestKw) { + * The YahooStore implements the dojo.data.core.Read API. + */ + _setupQueryRequest: function(result, requestKw) { var start = 1; var count = 1; if (result) { start = result.start || start; count = result.count || count; } - var sourceUrl = "http://api.search.yahoo.com/WebSearchService/V1/webSearch?appid=dojo&language=en&query=" + + var sourceUrl = "http://api.search.yahoo.com/WebSearchService/V1/webSearch?appid=dojo&language=en&query=" + result.query + "&start=" + start + "&results=" + count + "&output=json"; requestKw.url = sourceUrl; requestKw.transport = "ScriptSrcTransport"; requestKw.mimetype = "text/json"; requestKw.jsonParamName = 'callback'; }, - - _resultToQueryMetadata: function(json) { - return json.ResultSet; + + _resultToQueryMetadata: function(json) { + return json.ResultSet; }, - + _resultToQueryData: function(json) { var data = {} for (var i = 0; i < json.ResultSet.totalResultsReturned; ++i) { diff --git a/framework/images/webapp/images/dojo/src/data/core/Read.js b/framework/images/webapp/images/dojo/src/data/core/Read.js index f687e2ebef..f4f8a9e13b 100644 --- a/framework/images/webapp/images/dojo/src/data/core/Read.js +++ b/framework/images/webapp/images/dojo/src/data/core/Read.js @@ -14,29 +14,29 @@ dojo.require("dojo.lang.declare"); dojo.require("dojo.experimental"); /* summary: - * This is an abstract API that data provider implementations conform to. + * This is an abstract API that data provider implementations conform to. * This file defines methods signatures and intentionally leaves all the * methods unimplemented. */ dojo.experimental("dojo.data.core.Read"); - + dojo.declare("dojo.data.core.Read", null, { get: function(/* item */ item, /* attribute || attribute-name-string */ attribute, /* value? */ defaultValue) { /* summary: * Returns a single attribute value. * Returns defaultValue if *item* does not have a value for *attribute*. * Returns null if null was explicitly set as the attribute value. - * Returns undefined if the item does not have a value for the given - * attribute, or if the item does not have the attribute. + * Returns undefined if the item does not have a value for the given + * attribute, or if the item does not have the attribute. * description: * Saying that an "item x does not have a value for an attribute y" - * is identical to saying that an "item x does not have attribute y". - * It is an oxymoron to say "that attribute is present but has no values" + * is identical to saying that an "item x does not have attribute y". + * It is an oxymoron to say "that attribute is present but has no values" * or "the item has that attribute but does not have any attribute values". * If store.hasAttribute(item, attribute) returns false, then * store.get(item, attribute) will return undefined. */ - + /* exceptions: * Conforming implementations should throw an exception if *item* is not * an item, or *attribute* is neither an attribute object or a string. @@ -47,7 +47,7 @@ dojo.declare("dojo.data.core.Read", null, { var attributeValue = null; return attributeValue; // a literal, an item, null, or undefined (never an array) }, - + getValues: function(/* item */ item, /* attribute || attribute-name-string */ attribute) { /* summary: * This getValues() method works just like the get() method, but getValues() @@ -58,9 +58,9 @@ dojo.declare("dojo.data.core.Read", null, { * will return an empty array: []. (So, if store.hasAttribute(item, attribute) * returns false, then store.getValues(item, attribute) will return [].) */ - + /* exceptions: - * Throws an exception if *item* is not an item, or *attribute* is neither an + * Throws an exception if *item* is not an item, or *attribute* is neither an * attribute object or a string. * examples: * var friendsOfLuke = store.get(lukeSkywalker, "friends"); @@ -69,16 +69,16 @@ dojo.declare("dojo.data.core.Read", null, { var array = null; return array; // an array that may contain literals and items }, - + getAttributes: function(/* item */ item) { /* summary: * Returns an array with all the attributes that this item has. This * method will always return an array; if the item has no attributes * at all, getAttributes() will return an empty array: []. */ - + /* exceptions: - * Throws an exception if *item* is not an item. + * Throws an exception if *item* is not an item. * examples: * var array = store.getAttributes(kermit); */ @@ -86,14 +86,14 @@ dojo.declare("dojo.data.core.Read", null, { var array = null; return array; // array }, - + hasAttribute: function(/* item */ item, /* attribute || attribute-name-string */ attribute) { /* summary: * Returns true if the given *item* has a value for the given *attribute*. */ - + /* exceptions: - * Throws an exception if *item* is not an item, or *attribute* is neither an + * Throws an exception if *item* is not an item, or *attribute* is neither an * attribute object or a string. * examples: * var trueOrFalse = store.hasAttribute(kermit, "color"); @@ -101,15 +101,15 @@ dojo.declare("dojo.data.core.Read", null, { dojo.unimplemented('dojo.data.core.Read.hasAttribute'); return false; // boolean }, - + containsValue: function(/* item */ item, /* attribute || attribute-name-string */ attribute, /* anything */ value) { /* summary: * Returns true if the given *value* is one of the values that getValue() * would return. */ - + /* exceptions: - * Throws an exception if *item* is not an item, or *attribute* is neither an + * Throws an exception if *item* is not an item, or *attribute* is neither an * attribute object or a string. * examples: * var trueOrFalse = store.containsValue(kermit, "color", "green"); @@ -117,13 +117,13 @@ dojo.declare("dojo.data.core.Read", null, { dojo.unimplemented('dojo.data.core.Read.containsValue'); return false; // boolean }, - + isItem: function(/* anything */ something) { /* summary: * Returns true if *something* is an item. Returns false if *something* * is a literal or is any object other than an item. */ - + /* examples: * var yes = store.isItem(store.newItem()); * var no = store.isItem("green"); @@ -131,7 +131,7 @@ dojo.declare("dojo.data.core.Read", null, { dojo.unimplemented('dojo.data.core.Read.isItem'); return false; // boolean }, - + isItemAvailable: function(/* anything */ something) { /* summary: * Returns false if isItem(something) is false. Returns false if @@ -139,7 +139,7 @@ dojo.declare("dojo.data.core.Read", null, { * in local memory (for example, if the item has not yet been fully * loaded from the server). */ - + /* examples: * var yes = store.isItemAvailable(store.newItem()); * var no = store.isItemAvailable("green"); @@ -147,7 +147,7 @@ dojo.declare("dojo.data.core.Read", null, { dojo.unimplemented('dojo.data.core.Read.isItemAvailable'); return false; // boolean }, - + find: function(/* object? || dojo.data.core.Result */ keywordArgs) { /* summary: * Given a query, this method executes the query and makes the @@ -156,13 +156,13 @@ dojo.declare("dojo.data.core.Read", null, { * A Result object will always be returned, even if the result set * is empty. A Result object will always be returned immediately. * By default the Result object will be fully populated with result - * items as soon as it is created (synchronously). The caller may + * items as soon as it is created (synchronously). The caller may * request that the find() operation be executed asynchronously, in - * which case the Result object will be returned immediately but - * will not yet be populated with result items. + * which case the Result object will be returned immediately but + * will not yet be populated with result items. * For more info about the Result API, see dojo.data.core.Result * keywordArgs: - * The keywordArgs parameter may either be an instance of + * The keywordArgs parameter may either be an instance of * dojo.data.core.Result or may be a simple anonymous object * that may contain any of the following: * { query: query-string or query-object, @@ -175,10 +175,10 @@ dojo.declare("dojo.data.core.Read", null, { * scope: object * } * All implementations should accept keywordArgs objects with any of - * the 7 standard properties: query, sync, saveResult, onnext, oncompleted, - * onerror, and scope. Some implementations may accept additional - * properties in the keywordArgs object as valid parameters, such as - * {maxResults:100} or {includeOutliers:true}. + * the 7 standard properties: query, sync, saveResult, onnext, oncompleted, + * onerror, and scope. Some implementations may accept additional + * properties in the keywordArgs object as valid parameters, such as + * {maxResults:100} or {includeOutliers:true}. * The *query* parameter. * The query may be optional in some data store implementations. * The dojo.data.core.Read API does not specify the syntax or semantics @@ -189,34 +189,34 @@ dojo.declare("dojo.data.core.Read", null, { * or some complex keyword parameter object. The dojo.data.core.Read * API is completely agnostic about what the query actually is. * The *sync* parameter. - * The sync parameter specifies whether the find operation is asynchronous - * or not, with {sync:false} for asynchronous finds operations and + * The sync parameter specifies whether the find operation is asynchronous + * or not, with {sync:false} for asynchronous finds operations and * {sync:true} for synchronous find operations. If no sync parameter * is specified, the default is {sync:true}. * The *saveResult* parameter. * If saveResult is true, then the find call will return a Result * object that includes a property called *items*, and *items* will * contain an array of the items found by the query. If no saveResult - * parameter is specified and no onnext Function is set, the default + * parameter is specified and no onnext Function is set, the default * saveResult value will be {saveResult:true}. If no saveResult - * parameter is specified but an onnext Function is set, the default - * saveResult value will be {saveResult:false}. + * parameter is specified but an onnext Function is set, the default + * saveResult value will be {saveResult:false}. * The *onbegin* parameter. * If an onbegin callback function is provided, the callback function * will be called just once, before the first onnext callback is called. * The onbegin callback function will be passed a single argument: - * the Result object. The onbegin callback will be called even if + * the Result object. The onbegin callback will be called even if * query returns zero items. * The *onnext* parameter. * If an onnext callback function is provided, the callback function - * will be called as each item in the result is received. The callback + * will be called as each item in the result is received. The callback * function will be passed two arguments: the item itself, and the * Result object. * The *oncompleted* parameter. * If an oncompleted callback function is provided, the callback function * will be called just once, after the last onnext callback is called. * The oncompleted callback function will be passed a single argument: - * the Result object. The oncompleted callback will be called even if + * the Result object. The oncompleted callback will be called even if * query returns zero items. * The *onerror* parameter. * If an onerror callback function is provided, the callback function @@ -225,37 +225,37 @@ dojo.declare("dojo.data.core.Read", null, { * The onerror callback function will be passed two arguments: * an Error object and the Result object. * The *scope* parameter. - * If a scope object is provided, all of the callback function (onnext, + * If a scope object is provided, all of the callback function (onnext, * oncompleted, onerror) will be invoked in the context of the scope * object. In the body of the callback function, the value of the "this" * keyword will be the scope object. If no scope object is provided, - * the callback functions will be called in the context of dj_global. - * For example, onnext.call(scope, item, result) vs. + * the callback functions will be called in the context of dj_global. + * For example, onnext.call(scope, item, result) vs. * onnext.call(dj_global, item, result) * returns: * The find() method will return an instance of dojo.data.core.Result * (or an object that extends dojo.data.core.Result or conforms to the * dojo.data.core.Result API). If the find() method was passed an * instance of dojo.data.core.Result as an argument, the same instance - * will be returned. If the find() method was passed a simple + * will be returned. If the find() method was passed a simple * keywordArgs object, like {sync:true}, then the properties in the - * keywordArgs object will be copied into the Result object that - * find() returns. The Result object will also have additional - * properties when it is returned. The result.store property will + * keywordArgs object will be copied into the Result object that + * find() returns. The Result object will also have additional + * properties when it is returned. The result.store property will * have a pointer to the datastore object that find() is a method of. - * The result.length will be -1 if the find() operation has not + * The result.length will be -1 if the find() operation has not * finished or if there was an error; if the find() operation * finishes successfully, result.length will be the number of items * that were found. If the saveResult property was set to true, or - * if no onnext callback was set, the result.item property will - * contain an array of data items. The result.resultMetadata property + * if no onnext callback was set, the result.item property will + * contain an array of data items. The result.resultMetadata property * will contain an additional metaData that was returned by the query * along with the data items. For example, if the query returned a * list of 500 houses for sales, the resultMetadata property might - * contain the average asking price of the houses, or info about + * contain the average asking price of the houses, or info about * how long the query took to execute. */ - + /* exceptions: * Throws an exception if the query is not valid, or if the query * is required but was not supplied. @@ -270,18 +270,18 @@ dojo.declare("dojo.data.core.Read", null, { var result = null; // new dojo.data.core.Result(). return result; // a dojo.data.core.Result object }, - + getIdentity: function(/* item */ item) { /* summary: * Returns a unique identifer for an item. The return value will be * either a string or something that has a toString() method (such as, * for example, a dojo.uuid.Uuid object). * description: - * ISSUE - + * ISSUE - * Should we move this method out of dojo.data.core.Read, and put it somewhere * else, like maybe dojo.data.core.Identity? */ - + /* exceptions: * Conforming implementations may throw an exception or return null if * item is not an item. @@ -293,23 +293,23 @@ dojo.declare("dojo.data.core.Read", null, { var itemIdentifyString = null; return itemIdentifyString; // string }, - + findByIdentity: function(/* string */ identity) { /* summary: - * Given the identity of an item, this method returns the item that has - * that identity. Conforming implementations should return null if there - * is no item with the given identity. Implementations of findByIdentity() - * may sometimes return an item from a local cache and may sometimes - * fetch an item from a remote server, in which case the call to - * findByIdentity() will block until the findByIdentity() implementation + * Given the identity of an item, this method returns the item that has + * that identity. Conforming implementations should return null if there + * is no item with the given identity. Implementations of findByIdentity() + * may sometimes return an item from a local cache and may sometimes + * fetch an item from a remote server, in which case the call to + * findByIdentity() will block until the findByIdentity() implementation * has the item to return. * description: - * FIXME - + * FIXME - * In our meeting on 2006-10-03 we resolved to move the findByIdentity() * method out of the Read.js API and into the Identity.js API, as soon * as we have an Identity.js API. */ - + /* examples: * var alaska = store.getByIdentity("AK"); * assert("AK" == store.getIdentity(store.getByIdentity("AK"))); diff --git a/framework/images/webapp/images/dojo/src/data/core/RemoteStore.js b/framework/images/webapp/images/dojo/src/data/core/RemoteStore.js index 2a4c2db88d..5e1d1548b0 100644 --- a/framework/images/webapp/images/dojo/src/data/core/RemoteStore.js +++ b/framework/images/webapp/images/dojo/src/data/core/RemoteStore.js @@ -19,22 +19,22 @@ dojo.require("dojo.json"); dojo.require("dojo.io.*"); /* summary: - * RemoteStore is an implemention the dojo.data.core.Read and Write APIs. - * It is designed to serve as a base class for dojo.data stores which interact - * with stateless web services that can querying and modifying record-oriented - * data. Its features include asynchronous and synchronous querying and saving; + * RemoteStore is an implemention the dojo.data.core.Read and Write APIs. + * It is designed to serve as a base class for dojo.data stores which interact + * with stateless web services that can querying and modifying record-oriented + * data. Its features include asynchronous and synchronous querying and saving; * caching of queries; transactions; and datatype mapping. */ /************************************************************************** - Classes derived from RemoteStore should implement the following three + Classes derived from RemoteStore should implement the following three methods, which are each described in the documentation below: - _setupQueryRequest(result, requestKw) - _resultToQueryData(responseData) + _setupQueryRequest(result, requestKw) + _resultToQueryData(responseData) _setupSaveRequest(saveKeywordArgs, requestKw) - + Data Consistency Guarantees - + * if two references to the same item are obtained (e.g. from two different query results) any changes to one item will be reflected in the other item reference. * If an item has changed on the server and the item is retrieved via a new query, any previously obtained references to the item will (silently) reflect these new values. * However, any uncommitted changes will not be "overwritten". @@ -42,25 +42,25 @@ dojo.require("dojo.io.*"); * However, uncomitted deleted items are removed from the query result. * The transaction isolation level is equivalent to JDBC's "Read Committed": each store instance is treated as separate transaction; since there is no row or table locking so nonrepeatable and phantom reads are possible. - + Memory Usage - + Because Javascript doesn't support weak references or user-defined finalize methods, there is a tradeoff between data consistency and memory usage. - In order to implement the above consistency guarantees (and to provide caching), RemoteStore remembers all the queries and items retrieved. + In order to implement the above consistency guarantees (and to provide caching), RemoteStore remembers all the queries and items retrieved. To reduce memory consumption, use the method forgetResults(query); - + Store assumptions - + RemoteStore makes some assumptions about the nature of the remote store, things may break if these aren't true: - * that the items contained in a query response include all the attributes of the item (e.g. all the columns of a row). + * that the items contained in a query response include all the attributes of the item (e.g. all the columns of a row). (to fix: changes need to record add and removes and fix self._data[key] = [ attributeDict, refCount]; ) * the query result may contain references to items that are not available to the client; use isItem() to test for the presence of the item. * that modification to an item's attributes won't change it's primary key. - + **************************************************************************/ /* dojo.data API issues to resolve: - * save should returns a Deferred, might want to add keyword argument with 'sync' + * save should returns a Deferred, might want to add keyword argument with 'sync' */ dojo.experimental("dojo.data.core.RemoteStore"); @@ -80,27 +80,27 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. } this._serverQueryUrl = kwArgs.queryUrl || ""; this._serverSaveUrl = kwArgs.saveUrl || ""; - - this._deleted = {}; // deleted items {id: 1} + + this._deleted = {}; // deleted items {id: 1} this._changed = {}; // {id: {attr: [new values]}} // [] if attribute is removed this._added = {}; // {id: 1} list of added items this._results = {}; // {query: [ id1, ]}; // todo: make MRUDict of queries - /* data is a dictionary that conforms to this format: + /* data is a dictionary that conforms to this format: { id-string: { attribute-string: [ value1, value2 ] } } - where value is either an atomic JSON data type or + where value is either an atomic JSON data type or { 'id': string } for references to items - or + or { 'type': 'name', 'value': 'value' } for user-defined datatypes - */ + */ this._data = {}; // {id: [values, refcount]} // todo: handle refcount this._numItems = 0; }, - - _setupQueryRequest: function(/* dojo.data.core.Result */ result, /* object */ requestKw) { + + _setupQueryRequest: function(/* dojo.data.core.Result */ result, /* object */ requestKw) { /* summary: * Classes derived from RemoteStore should override this method to * provide their own implementations. - * This function prepares the query request by populating requestKw, + * This function prepares the query request by populating requestKw, * an associative array that will be passed to dojo.io.bind. */ result.query = result.query || ""; @@ -109,7 +109,7 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. requestKw.mimetype = "text/json"; }, - _resultToQueryMetadata: function(/* varies */ serverResponseData) { + _resultToQueryMetadata: function(/* varies */ serverResponseData) { /* summary: * Classes derived from RemoteStore should override this method to * provide their own implementations. @@ -117,41 +117,41 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. * that will be returned to the caller. * returns: * This simple default implementation just returns the entire raw - * serverResponseData, allowing the caller complete access to the + * serverResponseData, allowing the caller complete access to the * raw response data and metadata. */ - return serverResponseData; + return serverResponseData; }, - + _resultToQueryData: function(/* varies */ serverResponseData) { /* summary: * Classes derived from RemoteStore should override this method to * provide their own implementations. - * Converts the server response data into the internal data structure - * used by RemoteStore. + * Converts the server response data into the internal data structure + * used by RemoteStore. * returns: - * The RemoteStore implementation requires _resultToQueryData() to + * The RemoteStore implementation requires _resultToQueryData() to * return an object that looks like: - * {item1-identifier-string: { - * attribute1-string: [ value1, value2, ... ], - * attribute2-string: [ value3, value4, ... ], + * {item1-identifier-string: { + * attribute1-string: [ value1, value2, ... ], + * attribute2-string: [ value3, value4, ... ], * ... * }, - * item2-identifier-string: { - * attribute1-string: [ value10, value11, ... ], - * attribute2-string: [ value12, value13, ... ], + * item2-identifier-string: { + * attribute1-string: [ value10, value11, ... ], + * attribute2-string: [ value12, value13, ... ], * ... * } * } - * where value is either an atomic JSON data type or + * where value is either an atomic JSON data type or * {'id': string } for references to items - * or + * or * {'type': 'name', 'value': 'value' } for user-defined datatypes * data: - * This simple default implementation assumes that the *serverResponseData* + * This simple default implementation assumes that the *serverResponseData* * argument is an object that looks like: * { data:{ ... }, format:'format identifier', other metadata } - * + * */ return serverResponseData.data; }, @@ -165,8 +165,8 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. if (type) { // todo: better error handling? var localValue = value.value; - if (this._datatypeMap[type]) - localValue = this._datatypeMap[type](value); + if (this._datatypeMap[type]) + localValue = this._datatypeMap[type](value); values[i] = localValue; } } @@ -176,7 +176,7 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. _queryToQueryKey: function(query) { /* summary: - * Convert the query to a string that uniquely represents this query. + * Convert the query to a string that uniquely represents this query. * (Used by the query cache.) */ if (typeof query == "string") @@ -186,11 +186,11 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. }, _assertIsItem: function(/* item */ item) { - if (!this.isItem(item)) { + if (!this.isItem(item)) { throw new Error("dojo.data.RemoteStore: a function was passed an item argument that was not an item"); } }, - + get: function(/* item */ item, /* attribute || string */ attribute, /* value? */ defaultValue) { // summary: See dojo.data.core.Read.get() var valueArray = this.getValues(item, attribute); @@ -200,13 +200,13 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. return valueArray[0]; // value }, - getValues: function(/* item */ item, /* attribute || string */ attribute) { + getValues: function(/* item */ item, /* attribute || string */ attribute) { // summary: See dojo.data.core.Read.getValues() var itemIdentity = this.getIdentity(item); this._assertIsItem(itemIdentity); var changes = this._changed[itemIdentity]; if (changes) { - var newvalues = changes[attribute]; + var newvalues = changes[attribute]; if (newvalues !== undefined) { return newvalues; // Array } @@ -218,10 +218,10 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. return this._data[itemIdentity][0][attribute]; // Array }, - getAttributes: function(/* item */ item) { + getAttributes: function(/* item */ item) { // summary: See dojo.data.core.Read.getAttributes() var itemIdentity = this.getIdentity(item); - if (!itemIdentity) + if (!itemIdentity) return undefined; //todo: raise exception var atts = []; @@ -232,7 +232,7 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. } return atts; // Array }, - + hasAttribute: function(/* item */ item, /* attribute || string */ attribute) { // summary: See dojo.data.core.Read.hasAttribute() var valueArray = this.getValues(item, attribute); @@ -242,22 +242,22 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. containsValue: function(/* item */ item, /* attribute || string */ attribute, /* value */ value) { // summary: See dojo.data.core.Read.containsValue() var valueArray = this.getValues(item, attribute); - for (var i=0; i < valueArray.length; i++) { + for (var i=0; i < valueArray.length; i++) { if (valueArray[i] == value) { return true; // Boolean } } return false; // Boolean }, - + isItem: function(/* anything */ something) { // summary: See dojo.data.core.Read.isItem() if (!something) { return false; } var itemIdentity = something; - // var id = something.id ? something.id : something; + // var id = something.id ? something.id : something; // if (!id) { return false; } if (this._deleted[itemIdentity]) { return false; } //todo: do this? - if (this._data[itemIdentity]) { return true; } + if (this._data[itemIdentity]) { return true; } if (this._added[itemIdentity]) { return true; } return false; // Boolean }, @@ -268,8 +268,8 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. * In addition to the keywordArgs parameters described in the * dojo.data.core.Read.find() documentation, the keywordArgs for * the RemoteStore find() method may include a bindArgs parameter, - * which the RemoteStore will pass to dojo.io.bind when it sends - * the query. The bindArgs parameter should be a keyword argument + * which the RemoteStore will pass to dojo.io.bind when it sends + * the query. The bindArgs parameter should be a keyword argument * object, as described in the dojo.io.bind documentation. */ var result = null; @@ -280,21 +280,21 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. result = new dojo.data.core.Result(keywordArgs, this); } var query = result.query; - + //todo: use this._results to implement caching var self = this; var bindfunc = function(type, data, evt) { var scope = result.scope || dj_global; - if(type == "load") { + if(type == "load") { //dojo.debug("loaded 1 " + dojo.json.serialize(data) ); result.resultMetadata = self._resultToQueryMetadata(data); - var dataDict = self._resultToQueryData(data); + var dataDict = self._resultToQueryData(data); //dojo.debug("loaded 2 " + dojo.json.serialize(dataDict) ); if (result.onbegin) { result.onbegin.call(scope, result); } var count = 0; - var resultData = []; + var resultData = []; var newItemCount = 0; for (var key in dataDict) { if (result._aborted) { @@ -302,7 +302,7 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. } if (!self._deleted[key]) { //skip deleted items //todo if in _added, remove from _added - var values = dataDict[key]; + var values = dataDict[key]; var attributeDict = self._remoteToLocalValues(values); var existingValue = self._data[key]; var refCount = 1; @@ -313,15 +313,15 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. } //note: if the item already exists, we replace the item with latest set of attributes //this assumes queries always return complete records - self._data[key] = [ attributeDict, refCount]; + self._data[key] = [ attributeDict, refCount]; resultData.push(key); - count++; + count++; if (result.onnext) { result.onnext.call(scope, key, result); } - } + } } - self._results[self._queryToQueryKey(query)] = resultData; + self._results[self._queryToQueryKey(query)] = resultData; self._numItems += newItemCount; result.length = count; @@ -349,8 +349,8 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. var request = dojo.io.bind(bindKw); //todo: error if not bind success //dojo.debug( "bind success " + request.bindSuccess); - result._abortFunc = request.abort; - return result; + result._abortFunc = request.abort; + return result; }, getIdentity: function(item) { @@ -367,7 +367,7 @@ dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data. var idQuery = "/" + "*[.='"+id+"']"; //if (!item) item = this.find(idQuery, {async=0}); //todo: support bind(async=0) if (item) - return new _Item(id, item, this); + return new _Item(id, item, this); return null; }, */ @@ -396,26 +396,26 @@ Write API } return { id: itemIdentity }; }, - + deleteItem: function(/* item */ item) { var identity = this.getIdentity(item); if (!identity) { return false; } - + if (this._added[identity]) { delete this._added[identity]; } else { - this._deleted[identity] = 1; + this._deleted[identity] = 1; //todo? this._numItems--; ?? but its still in this._data } - + if (this._changed[identity]) { - delete this._changed[identity]; + delete this._changed[identity]; } - return true; + return true; }, - + setValues: function(/* item */ item, /* attribute || string */ attribute, /* array */ values) { var identity = this.getIdentity(item); if (!identity) { @@ -426,28 +426,28 @@ Write API if (!changes) { changes = {} this._changed[identity] = changes; - } + } changes[attribute] = values; return true; // boolean }, set: function(/* item */ item, /* attribute || string */ attribute, /* almost anything */ value) { - return this.setValues(item, attribute, [value]); + return this.setValues(item, attribute, [value]); }, unsetAttribute: function(/* item */ item, /* attribute || string */ attribute) { - return this.setValues(item, attribute, []); + return this.setValues(item, attribute, []); }, _initChanges: function() { - this._deleted = {}; + this._deleted = {}; this._changed = {}; - this._added = {}; + this._added = {}; }, - _setupSaveRequest: function(saveKeywordArgs, requestKw) { + _setupSaveRequest: function(saveKeywordArgs, requestKw) { /* summary: - * This function prepares the save request by populating requestKw, + * This function prepares the save request by populating requestKw, * an associative array that will be passed to dojo.io.bind. */ requestKw.url = this._serverSaveUrl; @@ -457,7 +457,7 @@ Write API for (var key in this._deleted) { deleted.push(key); } - //don't need _added in saveStruct, changed covers that info + //don't need _added in saveStruct, changed covers that info var saveStruct = {'changed': this._changed, 'deleted': deleted }; var oldRegistry = dojo.json.jsonRegistry; dojo.json.jsonRegistry = this._jsonRegistry; @@ -470,25 +470,25 @@ Write API /* summary: * Saves all the changes that have been made. * keywordArgs: - * The optional keywordArgs parameter may contain 'sync' to specify - * whether the save operation is asynchronous or not. The default is - * asynchronous. - * examples: + * The optional keywordArgs parameter may contain 'sync' to specify + * whether the save operation is asynchronous or not. The default is + * asynchronous. + * examples: * store.save(); * store.save({sync:true}); * store.save({sync:false}); */ keywordArgs = keywordArgs || {}; - var result = new dojo.Deferred(); + var result = new dojo.Deferred(); var self = this; - var bindfunc = function(type, data, evt) { - if(type == "load"){ + var bindfunc = function(type, data, evt) { + if(type == "load"){ if (result.fired == 1) { - //it seems that mysteriously "load" sometime + //it seems that mysteriously "load" sometime //gets called after "error" - //so check if an error has already occurred - //and stop if it has + //so check if an error has already occurred + //and stop if it has return; } //update this._data upon save @@ -511,23 +511,23 @@ Write API delete self._data[key]; } } - self._initChanges(); + self._initChanges(); result.callback(true); //todo: what result to pass? } else if(type == "error" || type == 'timeout'){ result.errback(data); //todo: how to handle timeout - } + } }; - + var bindKw = { sync: keywordArgs["sync"], handle: bindfunc }; this._setupSaveRequest(keywordArgs, bindKw); var request = dojo.io.bind(bindKw); result.canceller = function(deferred) { request.abort(); }; - - return result; + + return result; }, - + revert: function() { - this._initChanges(); + this._initChanges(); return true; }, @@ -560,10 +560,10 @@ additional public methods return { id : idstring }; }, - getSize: function() { - return this._numItems; + getSize: function() { + return this._numItems; }, - + forgetResults: function(query) { var queryKey = this._queryToQueryKey(query); var results = this._results[queryKey]; @@ -583,7 +583,7 @@ additional public methods delete this._results[queryKey]; this._numItems -= removed; return true; - } + } }); diff --git a/framework/images/webapp/images/dojo/src/data/core/Result.js b/framework/images/webapp/images/dojo/src/data/core/Result.js index da6a4e63d9..f947262532 100644 --- a/framework/images/webapp/images/dojo/src/data/core/Result.js +++ b/framework/images/webapp/images/dojo/src/data/core/Result.js @@ -24,22 +24,22 @@ dojo.declare("dojo.data.core.Result", null, { this.fromKwArgs(keywordArgs || {}); this.items = null; this.resultMetadata = null; - this.length = -1; // -1 until completion + this.length = -1; // -1 until completion this.store = store; - + this._aborted = false; this._abortFunc = null; }, - /* Whether the request should be made synchronously. - * We default to true if there's no {sync:false} property in the keywordArgs + /* Whether the request should be made synchronously. + * We default to true if there's no {sync:false} property in the keywordArgs * in the initializer for a given instance of dojo.data.core.Result. */ sync: true, - + //timeout: function(type){ }, todo: support this //timeoutSeconds: 0, todo: support this - + // the abort method needs to be filled in by the transport that accepts the // bind() request abort: function() { @@ -48,7 +48,7 @@ dojo.declare("dojo.data.core.Result", null, { this._abortFunc(); } }, - + fromKwArgs: function(/* object */ kwArgs) { if (typeof kwArgs.saveResult == "undefined") { this.saveResult = kwArgs.onnext ? false : true; diff --git a/framework/images/webapp/images/dojo/src/data/core/Write.js b/framework/images/webapp/images/dojo/src/data/core/Write.js index 24df296a2e..0065c82eca 100644 --- a/framework/images/webapp/images/dojo/src/data/core/Write.js +++ b/framework/images/webapp/images/dojo/src/data/core/Write.js @@ -14,19 +14,19 @@ dojo.require("dojo.lang.declare"); dojo.require("dojo.experimental"); /* summary: - * This is an abstract API that data provider implementations conform to. + * This is an abstract API that data provider implementations conform to. * This file defines methods signatures and intentionally leaves all the * methods unimplemented. */ dojo.experimental("dojo.data.core.Write"); - + dojo.declare("dojo.data.core.Write", dojo.data.core.Read, { newItem: function(/* object? */ keywordArgs) { /* summary: * Returns a newly created item. Sets the attributes of the new * item based on the *keywordArgs* provided. */ - + /* exceptions: * Throws an exception if *keywordArgs* is a string or a number or * anything other than a simple anonymous object. @@ -37,14 +37,14 @@ dojo.declare("dojo.data.core.Write", dojo.data.core.Read, { dojo.unimplemented('dojo.data.core.Write.newItem'); return newItem; // item }, - + deleteItem: function(/* item */ item) { /* summary: * Deletes an item from the store. */ - + /* exceptions: - * Throws an exception if the argument *item* is not an item + * Throws an exception if the argument *item* is not an item * (if store.isItem(item) returns false). * examples: * var success = store.deleteItem(kermit); @@ -52,13 +52,13 @@ dojo.declare("dojo.data.core.Write", dojo.data.core.Read, { dojo.unimplemented('dojo.data.core.Write.deleteItem'); return false; // boolean }, - + set: function(/* item */ item, /* attribute || string */ attribute, /* almost anything */ value) { /* summary: * Sets the value of an attribute on an item. * Replaces any previous value or values. */ - + /* exceptions: * Throws an exception if *item* is not an item, or if *attribute* * is neither an attribute object or a string. @@ -69,7 +69,7 @@ dojo.declare("dojo.data.core.Write", dojo.data.core.Read, { dojo.unimplemented('dojo.data.core.Write.set'); return false; // boolean }, - + setValues: function(/* item */ item, /* attribute || string */ attribute, /* array */ values) { /* summary: * Adds each value in the *values* array as a value of the given @@ -78,7 +78,7 @@ dojo.declare("dojo.data.core.Write", dojo.data.core.Read, { * Calling store.setValues(x, y, []) (with *values* as an empty array) has * the same effect as calling store.clear(x, y). */ - + /* exceptions: * Throws an exception if *values* is not an array, if *item* is not an * item, or if *attribute* is neither an attribute object or a string. @@ -90,12 +90,12 @@ dojo.declare("dojo.data.core.Write", dojo.data.core.Read, { dojo.unimplemented('dojo.data.core.Write.setValues'); return false; // boolean }, - + unsetAttribute: function(/* item */ item, /* attribute || string */ attribute) { /* summary: * Deletes all the values of an attribute on an item. */ - + /* exceptions: * Throws an exception if *item* is not an item, or if *attribute* * is neither an attribute object or a string. @@ -106,7 +106,7 @@ dojo.declare("dojo.data.core.Write", dojo.data.core.Read, { dojo.unimplemented('dojo.data.core.Write.clear'); return false; // boolean }, - + save: function() { /* summary: * Saves to the server all the changes that have been made locally. @@ -118,7 +118,7 @@ dojo.declare("dojo.data.core.Write", dojo.data.core.Read, { * Different data store implementations may take additional optional * parameters. * description: - * ISSUE - + * ISSUE - * Should the async save take a callback, like this: * store.save({sync: false, onComplete: callback}); * Or should the async save return a Deferred, like this: @@ -127,7 +127,7 @@ dojo.declare("dojo.data.core.Write", dojo.data.core.Read, { * Or should save() return boolean, like this: * var success = store.save(); */ - + /* examples: * var success = store.save(); * var success = store.save({sync: false}); @@ -135,27 +135,27 @@ dojo.declare("dojo.data.core.Write", dojo.data.core.Read, { dojo.unimplemented('dojo.data.core.Write.save'); return false; // boolean }, - + revert: function() { /* summary: * Discards any unsaved changes. */ - + /* examples: * var success = store.revert(); */ dojo.unimplemented('dojo.data.core.Write.revert'); return false; // boolean }, - + isDirty: function(/* item? */ item) { /* summary: - * Given an item, isDirty() returns true if the item has been modified - * since the last save(). If isDirty() is called with no *item* argument, + * Given an item, isDirty() returns true if the item has been modified + * since the last save(). If isDirty() is called with no *item* argument, * then this method returns true if any item has been modified since * the last save(). */ - + /* exceptions: * Throws an exception if isDirty() is passed an argument and the * argument is not an item. diff --git a/framework/images/webapp/images/dojo/src/data/old/Attribute.js b/framework/images/webapp/images/dojo/src/data/old/Attribute.js index 3c0a4ceb10..4182c28cb9 100644 --- a/framework/images/webapp/images/dojo/src/data/old/Attribute.js +++ b/framework/images/webapp/images/dojo/src/data/old/Attribute.js @@ -18,7 +18,7 @@ dojo.require("dojo.lang.assert"); dojo.data.old.Attribute = function(/* dojo.data.old.provider.Base */ dataProvider, /* string */ attributeId) { /** * summary: - * An Attribute object represents something like a column in + * An Attribute object represents something like a column in * a relational database. */ dojo.lang.assertType(dataProvider, dojo.data.old.provider.Base, {optional: true}); @@ -37,26 +37,26 @@ dojo.data.old.Attribute.prototype.toString = function() { dojo.data.old.Attribute.prototype.getAttributeId = function() { /** - * summary: + * summary: * Returns the string token that uniquely identifies this * attribute within the context of a data provider. * For a data provider that accesses relational databases, - * typical attributeIds might be tokens like "name", "age", + * typical attributeIds might be tokens like "name", "age", * "ssn", or "dept_key". - */ + */ return this._attributeId; // string }; dojo.data.old.Attribute.prototype.getType = function() { /** * summary: Returns the data type of the values of this attribute. - */ + */ return this.get('type'); // dojo.data.old.Type or null }; dojo.data.old.Attribute.prototype.setType = function(/* dojo.data.old.Type or null */ type) { /** * summary: Sets the data type for this attribute. - */ + */ this.set('type', type); }; diff --git a/framework/images/webapp/images/dojo/src/data/old/Item.js b/framework/images/webapp/images/dojo/src/data/old/Item.js index 0a2df32a0a..9100583305 100644 --- a/framework/images/webapp/images/dojo/src/data/old/Item.js +++ b/framework/images/webapp/images/dojo/src/data/old/Item.js @@ -20,7 +20,7 @@ dojo.require("dojo.lang.assert"); dojo.data.old.Item = function(/* dojo.data.old.provider.Base */ dataProvider) { /** * summary: - * An Item has attributes and attribute values, sort of like + * An Item has attributes and attribute values, sort of like * a record in a database, or a 'struct' in C. Instances of * the Item class know how to store and retrieve their * attribute values. @@ -41,7 +41,7 @@ dojo.data.old.Item.compare = function(/* dojo.data.old.Item */ itemOne, /* dojo. * Given two Items to compare, this method returns 0, 1, or -1. * This method is designed to be used by sorting routines, like * the JavaScript built-in Array sort() method. - * + * * Example: *
     	 *   var a = dataProvider.newItem("kermit");
    @@ -62,7 +62,7 @@ dojo.data.old.Item.compare = function(/* dojo.data.old.Item */ itemOne, /* dojo.
     		var attributeArrayTwo = itemTwo.getAttributes();
     		if (attributeArrayOne.length != attributeArrayTwo.length) {
     			if (attributeArrayOne.length > attributeArrayTwo.length) {
    -				return 1; 
    +				return 1;
     			} else {
     				return -1;
     			}
    @@ -77,7 +77,7 @@ dojo.data.old.Item.compare = function(/* dojo.data.old.Item */ itemOne, /* dojo.
     			}
     			if (arrayOfValuesOne.length != arrayOfValuesTwo.length) {
     				if (arrayOfValuesOne.length > arrayOfValuesTwo.length) {
    -					return 1; 
    +					return 1;
     				} else {
     					return -1;
     				}
    @@ -92,7 +92,7 @@ dojo.data.old.Item.compare = function(/* dojo.data.old.Item */ itemOne, /* dojo.
     		}
     	} else {
     		if (nameOne > nameTwo) {
    -			return 1; 
    +			return 1;
     		} else {
     			return -1;  // 0, 1, or -1
     		}
    @@ -130,7 +130,7 @@ dojo.data.old.Item.prototype.toString = function() {
     dojo.data.old.Item.prototype.compare = function(/* dojo.data.old.Item */ otherItem) {
     	/**
     	 * summary: Compares this Item to another Item, and returns 0, 1, or -1.
    -	 */ 
    +	 */
     	return dojo.data.old.Item.compare(this, otherItem); // 0, 1, or -1
     };
     
    @@ -148,7 +148,7 @@ dojo.data.old.Item.prototype.getName = function() {
     dojo.data.old.Item.prototype.get = function(/* string or dojo.data.old.Attribute */ attributeId) {
     	/**
     	 * summary: Returns a single literal value, like "foo" or 33.
    -	 */ 
    +	 */
     	// dojo.lang.assertType(attributeId, [String, dojo.data.old.Attribute]);
     	var literalOrValueOrArray = this._dictionaryOfAttributeValues[attributeId];
     	if (dojo.lang.isUndefined(literalOrValueOrArray)) {
    @@ -167,7 +167,7 @@ dojo.data.old.Item.prototype.get = function(/* string or dojo.data.old.Attribute
     dojo.data.old.Item.prototype.getValue = function(/* string or dojo.data.old.Attribute */ attributeId) {
     	/**
     	 * summary: Returns a single instance of dojo.data.old.Value.
    -	 */ 
    +	 */
     	// dojo.lang.assertType(attributeId, [String, dojo.data.old.Attribute]);
     	var literalOrValueOrArray = this._dictionaryOfAttributeValues[attributeId];
     	if (dojo.lang.isUndefined(literalOrValueOrArray)) {
    @@ -189,7 +189,7 @@ dojo.data.old.Item.prototype.getValue = function(/* string or dojo.data.old.Attr
     dojo.data.old.Item.prototype.getValues = function(/* string or dojo.data.old.Attribute */ attributeId) {
     	/**
     	 * summary: Returns an array of dojo.data.old.Value objects.
    -	 */ 
    +	 */
     	// dojo.lang.assertType(attributeId, [String, dojo.data.old.Attribute]);
     	var literalOrValueOrArray = this._dictionaryOfAttributeValues[attributeId];
     	if (dojo.lang.isUndefined(literalOrValueOrArray)) {
    @@ -212,11 +212,11 @@ dojo.data.old.Item.prototype.getValues = function(/* string or dojo.data.old.Att
     
     dojo.data.old.Item.prototype.load = function(/* string or dojo.data.old.Attribute */ attributeId, /* anything */ value) {
     	/**
    -	 * summary: 
    +	 * summary:
     	 * Used for loading an attribute value into an item when
     	 * the item is first being loaded into memory from some
     	 * data store (such as a file).
    -	 */ 
    +	 */
     	// dojo.lang.assertType(attributeId, [String, dojo.data.old.Attribute]);
     	this._dataProvider.registerAttribute(attributeId);
     	var literalOrValueOrArray = this._dictionaryOfAttributeValues[attributeId];
    @@ -244,10 +244,10 @@ dojo.data.old.Item.prototype.load = function(/* string or dojo.data.old.Attribut
     
     dojo.data.old.Item.prototype.set = function(/* string or dojo.data.old.Attribute */ attributeId, /* anything */ value) {
     	/**
    -	 * summary: 
    +	 * summary:
     	 * Used for setting an attribute value as a result of a
     	 * user action.
    -	 */ 
    +	 */
     	// dojo.lang.assertType(attributeId, [String, dojo.data.old.Attribute]);
     	this._dataProvider.registerAttribute(attributeId);
     	this._dictionaryOfAttributeValues[attributeId] = value;
    @@ -260,17 +260,17 @@ dojo.data.old.Item.prototype.setValue = function(/* string or dojo.data.old.Attr
     
     dojo.data.old.Item.prototype.addValue = function(/* string or dojo.data.old.Attribute */ attributeId, /* anything */ value) {
     	/**
    -	 * summary: 
    +	 * summary:
     	 * Used for adding an attribute value as a result of a
     	 * user action.
    -	 */ 
    +	 */
     	this.load(attributeId, value);
     	this._dataProvider.noteChange(this, attributeId, value);
     };
     
     dojo.data.old.Item.prototype.setValues = function(/* string or dojo.data.old.Attribute */ attributeId, /* Array */ arrayOfValues) {
     	/**
    -	 * summary: 
    +	 * summary:
     	 * Used for setting an array of attribute values as a result of a
     	 * user action.
     	 */
    @@ -291,10 +291,10 @@ dojo.data.old.Item.prototype.setValues = function(/* string or dojo.data.old.Att
     
     dojo.data.old.Item.prototype.getAttributes = function() {
     	/**
    -	 * summary: 
    +	 * summary:
     	 * Returns an array containing all of the attributes for which
     	 * this item has attribute values.
    -	 */ 
    +	 */
     	var arrayOfAttributes = [];
     	for (var key in this._dictionaryOfAttributeValues) {
     		arrayOfAttributes.push(this._dataProvider.getAttribute(key));
    @@ -305,7 +305,7 @@ dojo.data.old.Item.prototype.getAttributes = function() {
     dojo.data.old.Item.prototype.hasAttribute = function(/* string or dojo.data.old.Attribute */ attributeId) {
     	/**
     	 * summary: Returns true if the given attribute of the item has been assigned any value.
    -	 */ 
    +	 */
     	// dojo.lang.assertType(attributeId, [String, dojo.data.old.Attribute]);
     	return (attributeId in this._dictionaryOfAttributeValues); // boolean
     };
    @@ -313,7 +313,7 @@ dojo.data.old.Item.prototype.hasAttribute = function(/* string or dojo.data.old.
     dojo.data.old.Item.prototype.hasAttributeValue = function(/* string or dojo.data.old.Attribute */ attributeId, /* anything */ value) {
     	/**
     	 * summary: Returns true if the given attribute of the item has been assigned the given value.
    -	 */ 
    +	 */
     	var arrayOfValues = this.getValues(attributeId);
     	for (var i in arrayOfValues) {
     		var candidateValue = arrayOfValues[i];
    diff --git a/framework/images/webapp/images/dojo/src/data/old/Kind.js b/framework/images/webapp/images/dojo/src/data/old/Kind.js
    index d0d33395df..332c7aa1b9 100644
    --- a/framework/images/webapp/images/dojo/src/data/old/Kind.js
    +++ b/framework/images/webapp/images/dojo/src/data/old/Kind.js
    @@ -20,7 +20,7 @@ dojo.data.old.Kind = function(/* dojo.data.old.provider.Base */ dataProvider) {
     	 * A Kind represents a kind of item.  In the dojo data model
     	 * the item Snoopy might belong to the 'kind' Dog, where in
     	 * a Java program the object Snoopy would belong to the 'class'
    -	 * Dog, and in MySQL the record for Snoopy would be in the 
    +	 * Dog, and in MySQL the record for Snoopy would be in the
     	 * table Dog.
     	 */
     	dojo.data.old.Item.call(this, dataProvider);
    diff --git a/framework/images/webapp/images/dojo/src/data/old/Observable.js b/framework/images/webapp/images/dojo/src/data/old/Observable.js
    index 92ed9730f5..14f1a194bc 100644
    --- a/framework/images/webapp/images/dojo/src/data/old/Observable.js
    +++ b/framework/images/webapp/images/dojo/src/data/old/Observable.js
    @@ -25,7 +25,7 @@ dojo.data.old.Observable.prototype.addObserver = function(/* object */ observer)
     	/**
     	 * summary: Registers an object as an observer of this item,
     	 * so that the object will be notified when the item changes.
    -	 */ 
    +	 */
     	dojo.lang.assertType(observer, Object);
     	dojo.lang.assertType(observer.observedObjectHasChanged, Function);
     	if (!this._arrayOfObservers) {
    @@ -40,7 +40,7 @@ dojo.data.old.Observable.prototype.removeObserver = function(/* object */ observ
     	/**
     	 * summary: Removes the observer registration for a previously
     	 * registered object.
    -	 */ 
    +	 */
     	if (!this._arrayOfObservers) {
     		return;
     	}
    @@ -53,7 +53,7 @@ dojo.data.old.Observable.prototype.removeObserver = function(/* object */ observ
     dojo.data.old.Observable.prototype.getObservers = function() {
     	/**
     	 * summary: Returns an array with all the observers of this item.
    -	 */ 
    +	 */
     	return this._arrayOfObservers; // Array or undefined
     };
     
    diff --git a/framework/images/webapp/images/dojo/src/data/old/Value.js b/framework/images/webapp/images/dojo/src/data/old/Value.js
    index 7ff1f6fc3c..baaa8e6f54 100644
    --- a/framework/images/webapp/images/dojo/src/data/old/Value.js
    +++ b/framework/images/webapp/images/dojo/src/data/old/Value.js
    @@ -34,14 +34,14 @@ dojo.data.old.Value.prototype.toString = function() {
     dojo.data.old.Value.prototype.getValue = function() {
     	/**
     	 * summary: Returns the value itself.
    -	 */ 
    +	 */
     	return this._value; // anything
     };
     
     dojo.data.old.Value.prototype.getType = function() {
     	/**
     	 * summary: Returns the data type of the value.
    -	 */ 
    +	 */
     	dojo.unimplemented('dojo.data.old.Value.prototype.getType');
     	return this._type; // dojo.data.old.Type
     };
    diff --git a/framework/images/webapp/images/dojo/src/data/old/format/Csv.js b/framework/images/webapp/images/dojo/src/data/old/format/Csv.js
    index 44cfc78d38..836b86adc5 100644
    --- a/framework/images/webapp/images/dojo/src/data/old/format/Csv.js
    +++ b/framework/images/webapp/images/dojo/src/data/old/format/Csv.js
    @@ -22,11 +22,11 @@ dojo.data.old.format.Csv = new function() {
     		 * Given a string containing CSV records, this method parses
     		 * the string and returns a data structure containing the parsed
     		 * content.  The data structure we return is an array of length
    -		 * R, where R is the number of rows (lines) in the CSV data.  The 
    -		 * return array contains one sub-array for each CSV line, and each 
    -		 * sub-array contains C string values, where C is the number of 
    +		 * R, where R is the number of rows (lines) in the CSV data.  The
    +		 * return array contains one sub-array for each CSV line, and each
    +		 * sub-array contains C string values, where C is the number of
     		 * columns in the CSV data.
    -		 * 
    +		 *
     		 * For example, given this CSV string as input:
     		 * 
     		 *   "Title, Year, Producer \n Alien, 1979, Ridley Scott \n Blade Runner, 1982, Ridley Scott"
    @@ -34,18 +34,18 @@ dojo.data.old.format.Csv = new function() {
     		 * We will return this data structure:
     		 * 
     		 *   [["Title", "Year", "Producer"]
    -		 *    ["Alien", "1979", "Ridley Scott"],  
    +		 *    ["Alien", "1979", "Ridley Scott"],
     		 *    ["Blade Runner", "1982", "Ridley Scott"]]
     		 * 
    */ dojo.lang.assertType(csvFileContents, String); - + var lineEndingCharacters = new RegExp("\r\n|\n|\r"); var leadingWhiteSpaceCharacters = new RegExp("^\\s+",'g'); var trailingWhiteSpaceCharacters = new RegExp("\\s+$",'g'); var doubleQuotes = new RegExp('""','g'); var arrayOfOutputRecords = []; - + var arrayOfInputLines = csvFileContents.split(lineEndingCharacters); for (var i in arrayOfInputLines) { var singleLine = arrayOfInputLines[i]; @@ -60,8 +60,8 @@ dojo.data.old.format.Csv = new function() { var lastChar = field.charAt(field.length - 1); var secondToLastChar = field.charAt(field.length - 2); var thirdToLastChar = field.charAt(field.length - 3); - if ((firstChar == '"') && - ((lastChar != '"') || + if ((firstChar == '"') && + ((lastChar != '"') || ((lastChar == '"') && (secondToLastChar == '"') && (thirdToLastChar != '"')) )) { if (j+1 === listOfFields.length) { // alert("The last field in record " + i + " is corrupted:\n" + field); @@ -102,11 +102,11 @@ dojo.data.old.format.Csv = new function() { } } }; - + this.getCsvStringFromResultSet = function(/* dojo.data.old.ResultSet */ resultSet) { dojo.unimplemented('dojo.data.old.format.Csv.getCsvStringFromResultSet'); var csvString = null; return csvString; // String }; - + }(); diff --git a/framework/images/webapp/images/dojo/src/data/old/format/Json.js b/framework/images/webapp/images/dojo/src/data/old/format/Json.js index 50d54eda16..2efaeff9f6 100644 --- a/framework/images/webapp/images/dojo/src/data/old/format/Json.js +++ b/framework/images/webapp/images/dojo/src/data/old/format/Json.js @@ -22,7 +22,7 @@ dojo.data.old.format.Json = new function() { var arrayOfJsonData = eval("(" + jsonFileContents + ")"); this.loadDataProviderFromArrayOfJsonData(dataProvider, arrayOfJsonData); }; - + this.loadDataProviderFromArrayOfJsonData = function(/* dojo.data.old.provider.Base */ dataProvider, /* Array */ arrayOfJsonData) { dojo.lang.assertType(arrayOfJsonData, Array, {optional: true}); if (arrayOfJsonData && (arrayOfJsonData.length > 0)) { @@ -47,8 +47,8 @@ dojo.data.old.format.Json = new function() { // Private functions // ------------------------------------------------------------------- function _loadDataProviderFromArrayOfArrays(/* dojo.data.old.provider.Base */ dataProvider, /* Array */ arrayOfJsonData) { - /** - * Example: + /** + * Example: * var arrayOfJsonStates = [ * [ "abbr", "population", "name" ] * [ "WA", 5894121, "Washington" ], @@ -70,8 +70,8 @@ dojo.data.old.format.Json = new function() { } function _loadDataProviderFromArrayOfObjects(/* dojo.data.old.provider.Base */ dataProvider, /* Array */ arrayOfJsonData) { - /** - * Example: + /** + * Example: * var arrayOfJsonStates = [ * { abbr: "WA", name: "Washington" }, * { abbr: "WV", name: "West Virginia" }, @@ -90,7 +90,7 @@ dojo.data.old.format.Json = new function() { for (var j in arrayOfValues) { value = arrayOfValues[j]; item.load(key, value); - // dojo.debug("loaded: " + key + " = " + value); + // dojo.debug("loaded: " + key + " = " + value); } } else { item.load(key, value); @@ -98,6 +98,6 @@ dojo.data.old.format.Json = new function() { } } } - + }(); diff --git a/framework/images/webapp/images/dojo/src/data/old/provider/Base.js b/framework/images/webapp/images/dojo/src/data/old/provider/Base.js index 67509b0b5e..418a662b41 100644 --- a/framework/images/webapp/images/dojo/src/data/old/provider/Base.js +++ b/framework/images/webapp/images/dojo/src/data/old/provider/Base.js @@ -33,7 +33,7 @@ dojo.data.old.provider.Base.prototype.beginTransaction = function() { /** * Marks the beginning of a transaction. * - * Each time you call beginTransaction() you open a new transaction, + * Each time you call beginTransaction() you open a new transaction, * which you need to close later using endTransaction(). Transactions * may be nested, but the beginTransaction and endTransaction calls * always need to come in pairs. @@ -132,7 +132,7 @@ dojo.data.old.provider.Base.prototype.removeItemObserver = function(/* dojo.data /** * summary: Removes the observer registration for a previously * registered object. - */ + */ dojo.lang.assertType(item, dojo.data.old.Item); item.removeObserver(observer); }; diff --git a/framework/images/webapp/images/dojo/src/data/old/provider/Delicious.js b/framework/images/webapp/images/dojo/src/data/old/provider/Delicious.js index d5f354b9c9..d64b99cab5 100644 --- a/framework/images/webapp/images/dojo/src/data/old/provider/Delicious.js +++ b/framework/images/webapp/images/dojo/src/data/old/provider/Delicious.js @@ -20,7 +20,7 @@ dojo.data.old.provider.Delicious = function() { * summary: * The Delicious Data Provider can be used to take data from * del.icio.us and make it available as dojo.data.old.Items - * In order to use the Delicious Data Provider, you need + * In order to use the Delicious Data Provider, you need * to have loaded a script tag that looks like this: * */ @@ -29,11 +29,11 @@ dojo.data.old.provider.Delicious = function() { if (Delicious && Delicious.posts) { dojo.data.old.format.Json.loadDataProviderFromArrayOfJsonData(this, Delicious.posts); } else { - // document.write(""); + // document.write(""); /* - document.write(""); - document.write(""); - document.write(""); + document.write(""); + document.write(""); + document.write(""); fetchComplete(); */ // dojo.debug("Delicious line 29: constructor"); @@ -41,11 +41,11 @@ dojo.data.old.provider.Delicious = function() { var u = this.registerAttribute('u'); var d = this.registerAttribute('d'); var t = this.registerAttribute('t'); - + u.load('name', 'Bookmark'); d.load('name', 'Description'); t.load('name', 'Tags'); - + u.load('type', 'String'); d.load('type', 'String'); t.load('type', 'String'); @@ -55,7 +55,7 @@ dojo.inherits(dojo.data.old.provider.Delicious, dojo.data.old.provider.FlatFile) /******************************************************************** * FIXME: the rest of this is work in progress * - + dojo.data.old.provider.Delicious.prototype.getNewItemToLoad = function() { var newItem = this._newItem(); this._currentArray.push(newItem); @@ -63,7 +63,7 @@ dojo.data.old.provider.Delicious.prototype.getNewItemToLoad = function() { }; dojo.data.old.provider.Delicious.prototype.fetchArray = function(query) { - if (!query) { + if (!query) { query = "gumption"; } this._currentArray = []; @@ -71,8 +71,8 @@ dojo.data.old.provider.Delicious.prototype.fetchArray = function(query) { alert("Delicious line 61: " + dojo); var sourceUrl = "http://del.icio.us/feeds/json/" + query + "?count=8"; document.write(""); - document.write(""); - document.write(""); + document.write(""); + document.write(""); alert("line 66"); dojo.data.old.format.Json.loadDataProviderFromArrayOfJsonData(this, Delicious.posts); return this._currentArray; // Array diff --git a/framework/images/webapp/images/dojo/src/data/old/provider/FlatFile.js b/framework/images/webapp/images/dojo/src/data/old/provider/FlatFile.js index fa95a11a18..317e3292c6 100644 --- a/framework/images/webapp/images/dojo/src/data/old/provider/FlatFile.js +++ b/framework/images/webapp/images/dojo/src/data/old/provider/FlatFile.js @@ -116,14 +116,14 @@ dojo.data.old.provider.FlatFile.prototype.getAttributes = function() { dojo.data.old.provider.FlatFile.prototype.fetchArray = function(query) { /** * summary: Returns an Array containing all of the Items. - */ + */ return this._arrayOfItems; // Array }; dojo.data.old.provider.FlatFile.prototype.fetchResultSet = function(query) { /** * summary: Returns a ResultSet containing all of the Items. - */ + */ if (!this._resultSet) { this._resultSet = new dojo.data.old.ResultSet(this, this.fetchArray(query)); } diff --git a/framework/images/webapp/images/dojo/src/data/old/provider/JotSpot.js b/framework/images/webapp/images/dojo/src/data/old/provider/JotSpot.js index 47b326b2e9..9e0e1045de 100644 --- a/framework/images/webapp/images/dojo/src/data/old/provider/JotSpot.js +++ b/framework/images/webapp/images/dojo/src/data/old/provider/JotSpot.js @@ -17,7 +17,7 @@ dojo.require("dojo.data.old.provider.Base"); dojo.data.old.provider.JotSpot = function() { /** * summary: - * A JotSpot Data Provider knows how to read data from a JotSpot data + * A JotSpot Data Provider knows how to read data from a JotSpot data * store and make the contents accessable as dojo.data.old.Items. */ dojo.unimplemented('dojo.data.old.provider.JotSpot'); diff --git a/framework/images/webapp/images/dojo/src/data/old/provider/MySql.js b/framework/images/webapp/images/dojo/src/data/old/provider/MySql.js index bbf443c2fe..74dbd3ec19 100644 --- a/framework/images/webapp/images/dojo/src/data/old/provider/MySql.js +++ b/framework/images/webapp/images/dojo/src/data/old/provider/MySql.js @@ -18,7 +18,7 @@ dojo.data.old.provider.MySql = function() { /** * summary: * A MySql Data Provider knows how to connect to a MySQL database - * on a server and and make the content records available as + * on a server and and make the content records available as * dojo.data.old.Items. */ dojo.unimplemented('dojo.data.old.provider.MySql'); diff --git a/framework/images/webapp/images/dojo/src/data/old/to_do.txt b/framework/images/webapp/images/dojo/src/data/old/to_do.txt index 6e705fc6c3..6aaedea24b 100644 --- a/framework/images/webapp/images/dojo/src/data/old/to_do.txt +++ b/framework/images/webapp/images/dojo/src/data/old/to_do.txt @@ -8,17 +8,17 @@ Existing Features * notifications: widgets are notified when data changes * notification available per-item or per-resultSet * can create ad-hoc attributes - * attributes can be loosely-typed + * attributes can be loosely-typed * attributes can have meta-data like type and display name * half-implemented support for sorting * half-implemented support for export to .json - * API for getting data in simple arrays + * API for getting data in simple arrays * API for getting ResultSets with iterators (precursor to support for something like the openrico.org live grid) - + ~~~~~~~~~~~~~~~~~~~~~~~~ To-Do List * be able to import data from an html
    +
    :ERROR MESSAGE:
    <%=UtilFormatOut.replaceString(errorMsg, "\n", "
    ")%>
    - * think about being able to import data from some type of XML + * think about being able to import data from some type of XML * think about integration with dojo.undo.Manager * think more about how to represent the notion of different data types * think about what problems we'll run into when we have a MySQL data provider diff --git a/framework/images/webapp/images/dojo/src/date/common.js b/framework/images/webapp/images/dojo/src/date/common.js index 43c26eb740..89055d12d0 100644 --- a/framework/images/webapp/images/dojo/src/date/common.js +++ b/framework/images/webapp/images/dojo/src/date/common.js @@ -140,7 +140,7 @@ dojo.date.getTimezoneName = function(/*Date*/dateObject){ // If at first you don't succeed ... else{ // If IE knows about the TZ, it appears before the year - // Capital letters or slash before a 4-digit year + // Capital letters or slash before a 4-digit year // at the end of string var pat = /([A-Z\/]+) \d{4}$/; if((match = str.match(pat))) { @@ -150,7 +150,7 @@ dojo.date.getTimezoneName = function(/*Date*/dateObject){ // of toLocaleString instead of putting it in toString else{ str = dateObject.toLocaleString(); - // Capital letters or slash -- end of string, + // Capital letters or slash -- end of string, // after space pat = / ([A-Z\/]+)$/; if((match = str.match(pat))) { @@ -181,7 +181,7 @@ dojo.date.getOrdinal = function(dateObject){ dojo.date.compareTypes={ // summary // bitmask for comparison operations. - DATE:1, TIME:2 + DATE:1, TIME:2 }; dojo.date.compare=function(/* Date */ dateA, /* Date */ dateB, /* dojo.date.compareTypes */ options){ // summary @@ -193,7 +193,7 @@ dojo.date.compare=function(/* Date */ dateA, /* Date */ dateB, /* dojo.date.comp with(dojo.date.compareTypes){ var opt=options||(DATE|TIME); var d1=new Date( - (opt&DATE)?dA.getFullYear():now.getFullYear(), + (opt&DATE)?dA.getFullYear():now.getFullYear(), (opt&DATE)?dA.getMonth():now.getMonth(), (opt&DATE)?dA.getDate():now.getDate(), (opt&TIME)?dA.getHours():0, @@ -218,7 +218,7 @@ dojo.date.compare=function(/* Date */ dateA, /* Date */ dateB, /* dojo.date.comp return 0; // int } -dojo.date.dateParts={ +dojo.date.dateParts={ // summary // constants for use in dojo.date.add YEAR:0, MONTH:1, DAY:2, HOUR:3, MINUTE:4, SECOND:5, MILLISECOND:6, QUARTER:7, WEEK:8, WEEKDAY:9 @@ -245,7 +245,7 @@ dojo.date.add = function(/* Date */ dt, /* dojo.date.dateParts */ interv, /* int sum.setDate(0); } } - + var sum = new Date(dt); with(dojo.date.dateParts){ @@ -401,7 +401,7 @@ dojo.date.diff = function(/* Date */ dtA, /* Date */ dtB, /* dojo.date.dateParts var adj = 0; var aDay = dtA.getDay(); var bDay = dtB.getDay(); - + weeks = parseInt(days/7); mod = days % 7; // Mark the date advanced by the number of diff --git a/framework/images/webapp/images/dojo/src/date/format.js b/framework/images/webapp/images/dojo/src/date/format.js index 4318525c83..343b219d44 100644 --- a/framework/images/webapp/images/dojo/src/date/format.js +++ b/framework/images/webapp/images/dojo/src/date/format.js @@ -393,7 +393,7 @@ dojo.date.parse = function(/*String*/value, /*Object?*/options){ dojo.debug("dojo.date.parse: Could not parse weekday name: '" + v + "'."); return null; } - break; + break; case 'd': result.setDate(v); expected.date = v; @@ -461,7 +461,7 @@ dojo.date.parse = function(/*String*/value, /*Object?*/options){ return null; } - //TODO: implement a getWeekday() method in order to test + //TODO: implement a getWeekday() method in order to test //validity of input strings containing 'EEE' or 'EEEE'... return result; /*Date*/ @@ -475,9 +475,9 @@ function _processPattern(pattern, applyPattern, applyLiteral, applyAll){ applyLiteral = applyLiteral || identity; applyAll = applyAll || identity; - //split on single quotes (which escape literals in date format strings) + //split on single quotes (which escape literals in date format strings) //but preserve escaped single quotes (e.g., o''clock) - var chunks = pattern.match(/(''|[^'])+/g); + var chunks = pattern.match(/(''|[^'])+/g); var literal = false; for(var i=0; i 0 ? "-" : "+") + + return (timezoneOffset > 0 ? "-" : "+") + _(Math.floor(Math.abs(timezoneOffset)/60)) + ":" + _(Math.abs(timezoneOffset)%60); case "Z": // time zone or name or abbreviation return dojo.date.getTimezoneName(dateObject); - + case "%": return "%"; } @@ -727,7 +727,7 @@ dojo.date.strftime = function(/*Date*/dateObject, /*String*/format, /*String?*/l var switchCase = null; while ((index = format.indexOf("%", i)) != -1){ string += format.substring(i, index++); - + // inspect modifier flag switch (format.charAt(index++)) { case "_": // Pad a numeric result string with spaces. @@ -772,12 +772,12 @@ dojo.date.strftime = function(/*Date*/dateObject, /*String*/format, /*String?*/l break; } switchCase = null; - + string += property; i = index; } string += format.substring(i); - + return string; // String }; diff --git a/framework/images/webapp/images/dojo/src/date/serialize.js b/framework/images/webapp/images/dojo/src/date/serialize.js index 6a43f98634..dab853e1dd 100644 --- a/framework/images/webapp/images/dojo/src/date/serialize.js +++ b/framework/images/webapp/images/dojo/src/date/serialize.js @@ -56,17 +56,17 @@ dojo.date.setIso8601Date = function(/*String*/dateObject, /*String*/formattedStr var gd = dateObject.getDay(); var day = gd ? gd : 7; var offset = Number(dayofweek) + (7 * Number(week)); - + if(day <= 4){ dateObject.setDate(offset + 1 - day); } else{ dateObject.setDate(offset + 8 - day); } } else{ if(month){ dateObject.setDate(1); - dateObject.setMonth(month - 1); + dateObject.setMonth(month - 1); } if(date){ dateObject.setDate(date); } } - + return dateObject; // Date }; @@ -111,7 +111,7 @@ dojo.date.setIso8601Time = function(/*Date*/dateObject, /*String*/formattedStrin if(offset !== 0){ dateObject.setTime(dateObject.getTime() + offset * 60000); - } + } return dateObject; // Date }; @@ -149,7 +149,7 @@ dojo.date.toRfc3339 = function(/*Date?*/dateObject, /*String?*/selector){ if(selector != "dateOnly"){ var time = [_(dateObject.getHours(),2), _(dateObject.getMinutes(),2), _(dateObject.getSeconds(),2)].join(':'); var timezoneOffset = dateObject.getTimezoneOffset(); - time += (timezoneOffset > 0 ? "-" : "+") + + time += (timezoneOffset > 0 ? "-" : "+") + _(Math.floor(Math.abs(timezoneOffset)/60),2) + ":" + _(Math.abs(timezoneOffset)%60,2); formattedDate.push(time); @@ -165,7 +165,7 @@ dojo.date.fromRfc3339 = function(/*String*/rfcDate){ // A string such as 2005-06-30T08:05:00-07:00 // "any" is also supported in place of a time. - // backwards compatible support for use of "any" instead of just not + // backwards compatible support for use of "any" instead of just not // including the time if(rfcDate.indexOf("Tany")!=-1){ rfcDate = rfcDate.replace("Tany",""); diff --git a/framework/images/webapp/images/dojo/src/date/supplemental.js b/framework/images/webapp/images/dojo/src/date/supplemental.js index 898c7f3dff..fe66616225 100644 --- a/framework/images/webapp/images/dojo/src/date/supplemental.js +++ b/framework/images/webapp/images/dojo/src/date/supplemental.js @@ -45,7 +45,7 @@ dojo.date.getWeekend = function(/*String?*/locale){ var weekendStart = {/*default is 6=Saturday*/ eg:5,il:5,sy:5, 'in':0, - ae:4,bh:4,dz:4,iq:4,jo:4,kw:4,lb:4,ly:4,ma:4,om:4,qa:4,sa:4,sd:4,tn:4,ye:4 + ae:4,bh:4,dz:4,iq:4,jo:4,kw:4,lb:4,ly:4,ma:4,om:4,qa:4,sa:4,sd:4,tn:4,ye:4 }; var weekendEnd = {/*default is 0=Sunday*/ diff --git a/framework/images/webapp/images/dojo/src/debug.js b/framework/images/webapp/images/dojo/src/debug.js index 337aaddc00..11697e6368 100644 --- a/framework/images/webapp/images/dojo/src/debug.js +++ b/framework/images/webapp/images/dojo/src/debug.js @@ -39,12 +39,12 @@ dojo.debug = function(/*...*/){ } s.push(msg); } - + dojo.hostenv.println(s.join(" ")); } /** - * this is really hacky for now - just + * this is really hacky for now - just * display the properties of the object **/ diff --git a/framework/images/webapp/images/dojo/src/debug/console.js b/framework/images/webapp/images/dojo/src/debug/console.js index 99bf32b3df..86cd41163e 100644 --- a/framework/images/webapp/images/dojo/src/debug/console.js +++ b/framework/images/webapp/images/dojo/src/debug/console.js @@ -15,15 +15,15 @@ dojo.require("dojo.logging.ConsoleLogger"); // Console logger, for use with FireFox Firebug, Safari and Opera's consoles. // description: // This package redirects the normal dojo debugging output to the console log in modern browsers. -// When using Firebug, it does this by sending the entire object to the console, -// rather than just overriding dojo.hostenv.println, so that Firebug's interactive +// When using Firebug, it does this by sending the entire object to the console, +// rather than just overriding dojo.hostenv.println, so that Firebug's interactive // object inspector is available. // see: http://www.joehewitt.com/software/firebug/docs.php if (window.console) { if (console.info != null) { // using a later version of Firebug -- lots of fun stuff! - + dojo.hostenv.println = function() { // summary: Write all of the arguments to the Firebug console // description: Uses console.info() so that the (i) icon prints next to the debug line @@ -49,7 +49,7 @@ if (window.console) { if (obj == null || obj.constructor == null) { return dojo.debug(obj); } - + // figure out type via a standard constructor (Object, String, Date, etc) var type = obj.declaredClass; if (type == null) { @@ -66,14 +66,14 @@ if (window.console) { } else { var propNames = []; if (showMethods) { - for (var prop in obj) { + for (var prop in obj) { propNames.push(prop); } } else { - for (var prop in obj) { + for (var prop in obj) { if (typeof obj[prop] != "function") { propNames.push(prop); } else dojo.debug(prop); - } + } } if (sort) propNames.sort(); var sortedObj = {}; @@ -84,12 +84,12 @@ if (window.console) { return dojo.debug(type+": %o\n%2.o",obj,sortedObj); } - - // otherwise just output the constructor + object, + + // otherwise just output the constructor + object, // which is nice for a DOM element, etc return dojo.debug(obj.constructor + ": ", obj); } - + } else if (console.log != null) { // using Safari or an old version of Firebug dojo.hostenv.println=function() { diff --git a/framework/images/webapp/images/dojo/src/debug/deep.html b/framework/images/webapp/images/dojo/src/debug/deep.html index 1a22fbfc45..e9920183c2 100644 --- a/framework/images/webapp/images/dojo/src/debug/deep.html +++ b/framework/images/webapp/images/dojo/src/debug/deep.html @@ -14,14 +14,14 @@ var tableHides = {}; var frame = null; window.onload = function(){ - // if IE loads this page too quickly (instantly) then + // if IE loads this page too quickly (instantly) then // window.debugVar might not have been set window.setTimeout(startMeUp, 100); } function startMeUp(){ frame = document.getElementById('frame'); - // GET string + // GET string var index = location.search.split("=").pop(); var debugObj = window.opener.dojo.debugDeep; var debugVar = debugObj.debugVars[index] || window.debugVar; @@ -102,7 +102,7 @@ function buildTableRow(path, tb, name, value) { var td2 = tr1.insertCell(1); var td3 = tr1.insertCell(2); var td4 = tr1.insertCell(3); - + tr1.style.verticalAlign = 'top'; td1.style.verticalAlign = 'middle'; @@ -160,7 +160,7 @@ function buildTableRow(path, tb, name, value) { var tr2 = tb.insertRow(row++); var td5 = tr2.insertCell(0); var td6 = tr2.insertCell(1); - + //var tr2 = document.createElement('tr'); //var td5 = document.createElement('td'); //var td6 = document.createElement('td'); diff --git a/framework/images/webapp/images/dojo/src/dnd/DragAndDrop.js b/framework/images/webapp/images/dojo/src/dnd/DragAndDrop.js index f8ac37212c..838a6480f0 100644 --- a/framework/images/webapp/images/dojo/src/dnd/DragAndDrop.js +++ b/framework/images/webapp/images/dojo/src/dnd/DragAndDrop.js @@ -45,7 +45,7 @@ dojo.provide("dojo.dnd.DragAndDrop"); // that respond to drop events to take application-level actions. dojo.declare("dojo.dnd.DragSource", null, { - // String: + // String: // what kind of drag source are we? Used to determine if we can be // dropped on a given DropTarget type: "", @@ -80,11 +80,11 @@ dojo.declare("dojo.dnd.DragSource", null, { }); dojo.declare("dojo.dnd.DragObject", null, { - // String: + // String: // what kind of drag object are we? Used to determine if we can be // dropped on a given DropTarget type: "", - + register: function(){ // summary: register this DragObject with the manager var dm = dojo.dnd.dragManager; @@ -101,7 +101,7 @@ dojo.declare("dojo.dnd.DragObject", null, { }, onDragMove: function(/*dojo.dnd.DragEvent*/evt){ - // summary: + // summary: // Implemented by subclasses. Should change the UI for the drag // icon i.e., "it moves itself" }, @@ -136,7 +136,7 @@ dojo.declare("dojo.dnd.DragObject", null, { dojo.declare("dojo.dnd.DropTarget", null, { acceptsType: function(/*String*/type){ - // summary: + // summary: // determines whether or not this DropTarget will accept the given // type. The default behavior is to consult this.acceptedTypes and // if "*" is a member, to always accept the type. @@ -147,7 +147,7 @@ dojo.declare("dojo.dnd.DropTarget", null, { }, accepts: function(/*Array*/dragObjects){ - // summary: + // summary: // determines if we'll accept all members of the passed array of // dojo.dnd.DragObject instances if(!dojo.lang.inArray(this.acceptedTypes, "*")){ // wildcard diff --git a/framework/images/webapp/images/dojo/src/dnd/HtmlDragAndDrop.js b/framework/images/webapp/images/dojo/src/dnd/HtmlDragAndDrop.js index a916532d99..884f966c1a 100644 --- a/framework/images/webapp/images/dojo/src/dnd/HtmlDragAndDrop.js +++ b/framework/images/webapp/images/dojo/src/dnd/HtmlDragAndDrop.js @@ -55,7 +55,7 @@ dojo.declare("dojo.dnd.HtmlDragSource", dojo.dnd.DragSource, { this.constrainingContainer = container; } }, - + /* * * see dojo.dnd.DragSource.onSelected @@ -84,7 +84,7 @@ dojo.declare("dojo.dnd.HtmlDragSource", dojo.dnd.DragSource, { this.dragObjects.push(dojo.byId(arguments[i])); } } - }, + }, function(node, type){ node = dojo.byId(node); @@ -100,8 +100,8 @@ dojo.declare("dojo.dnd.HtmlDragSource", dojo.dnd.DragSource, { } ); -dojo.declare("dojo.dnd.HtmlDragObject", - dojo.dnd.DragObject, +dojo.declare("dojo.dnd.HtmlDragObject", + dojo.dnd.DragObject, { dragClass: "", opacity: 0.5, @@ -170,7 +170,7 @@ dojo.declare("dojo.dnd.HtmlDragObject", this.dragClone = this.createDragNode(); - this.containingBlockPosition = this.domNode.offsetParent ? + this.containingBlockPosition = this.domNode.offsetParent ? dojo.html.getAbsolutePosition(this.domNode.offsetParent, true) : {x:0, y:0}; if(this.constrainToContainer){ @@ -311,7 +311,7 @@ dojo.declare("dojo.dnd.HtmlDragObject", this.constrainingContainer = this.domNode.parentNode; } } - }, + }, function(node, type){ this.domNode = dojo.byId(node); this.type = type; @@ -322,8 +322,8 @@ dojo.declare("dojo.dnd.HtmlDragObject", } ); -dojo.declare("dojo.dnd.HtmlDropTarget", - dojo.dnd.DropTarget, +dojo.declare("dojo.dnd.HtmlDropTarget", + dojo.dnd.DropTarget, { vertical: false, onDragOver: function(e){ @@ -337,7 +337,7 @@ dojo.declare("dojo.dnd.HtmlDropTarget", var pos = dojo.html.getAbsolutePosition(child, true); var inner = dojo.html.getBorderBox(child); this.childBoxes.push({top: pos.y, bottom: pos.y+inner.height, - left: pos.x, right: pos.x+inner.width, height: inner.height, + left: pos.x, right: pos.x+inner.width, height: inner.height, width: inner.width, node: child}); } @@ -401,8 +401,8 @@ dojo.declare("dojo.dnd.HtmlDropTarget", if(child.node === dragObjects[0].dragSource.domNode){ hide = true; }else{ - var currentPosChild = before ? - (i>0?this.childBoxes[i-1]:child) : + var currentPosChild = before ? + (i>0?this.childBoxes[i-1]:child) : (i 0){ + if(returnFirstHit && ancestors.length > 0){ return ancestors[0]; // Node } - + node = node.parentNode; } if(returnFirstHit){ return null; } @@ -287,7 +287,7 @@ dojo.dom.isDescendantOf = function(/* Node */node, /* Node */ancestor, /* boolea // guaranteeDescendant allows us to be a "true" isDescendantOf function if(guaranteeDescendant && node) { node = node.parentNode; } while(node) { - if(node == ancestor){ + if(node == ancestor){ return true; // boolean } node = node.parentNode; @@ -326,7 +326,7 @@ dojo.dom.createDocument = function(){ (_document.implementation.createDocument)){ doc = _document.implementation.createDocument("", "", null); } - + return doc; // DOMDocument } @@ -423,8 +423,8 @@ dojo.dom.insertAfter = function(/*Node*/node, /*Node*/ref, /*boolean?*/force){ dojo.dom.insertAtPosition = function(/*Node*/node, /*Node*/ref, /*string*/position){ // summary: // attempt to insert node in relation to ref based on position - if((!node)||(!ref)||(!position)){ - return false; // boolean + if((!node)||(!ref)||(!position)){ + return false; // boolean } switch(position.toLowerCase()){ case "before": @@ -448,10 +448,10 @@ dojo.dom.insertAtPosition = function(/*Node*/node, /*Node*/ref, /*string*/positi dojo.dom.insertAtIndex = function(/*Node*/node, /*Element*/containingNode, /*number*/insertionIndex){ // summary: // insert node into child nodes nodelist of containingNode at - // insertionIndex. insertionIndex should be between 0 and + // insertionIndex. insertionIndex should be between 0 and // the number of the childNodes in containingNode. insertionIndex // specifys after how many childNodes in containingNode the node - // shall be inserted. If 0 is given, node will be appended to + // shall be inserted. If 0 is given, node will be appended to // containingNode. var siblingNodes = containingNode.childNodes; @@ -470,7 +470,7 @@ dojo.dom.insertAtIndex = function(/*Node*/node, /*Element*/containingNode, /*num return dojo.dom.insertAfter(node, siblingNodes[insertionIndex-1]); // boolean } - + dojo.dom.textContent = function(/*Node*/node, /*string*/text){ // summary: // implementation of the DOM Level 3 attribute; scan node for text @@ -532,14 +532,14 @@ dojo.dom.isTag = function(/* Node */node /* ... */){ return ""; // string } -dojo.dom.setAttributeNS = function( /*Element*/elem, /*string*/namespaceURI, +dojo.dom.setAttributeNS = function( /*Element*/elem, /*string*/namespaceURI, /*string*/attrName, /*string*/attrValue){ // summary: // implementation of DOM2 setAttributeNS that works cross browser. if(elem == null || ((elem == undefined)&&(typeof elem == "undefined"))){ dojo.raise("No element given to dojo.dom.setAttributeNS"); } - + if(!((elem.setAttributeNS == undefined)&&(typeof elem.setAttributeNS == "undefined"))){ // w3c elem.setAttributeNS(namespaceURI, attrName, attrValue); }else{ // IE @@ -550,10 +550,10 @@ dojo.dom.setAttributeNS = function( /*Element*/elem, /*string*/namespaceURI, attrName, namespaceURI ); - + // set value attribute.nodeValue = attrValue; - + // attach to element elem.setAttributeNode(attribute); } diff --git a/framework/images/webapp/images/dojo/src/event/browser.js b/framework/images/webapp/images/dojo/src/event/browser.js index 33aaf01f18..d9ec139d03 100644 --- a/framework/images/webapp/images/dojo/src/event/browser.js +++ b/framework/images/webapp/images/dojo/src/event/browser.js @@ -106,7 +106,7 @@ dojo.event.browser = new function(){ break; } } - + this.clean = function(/*DOMNode*/node){ // summary: // removes native event handlers so that destruction of the node @@ -114,7 +114,7 @@ dojo.event.browser = new function(){ // it's critical for manual node removal on IE. // node: // A DOM node. All of it's children will also be cleaned. - if(dojo.render.html.ie){ + if(dojo.render.html.ie){ dojo._ie_clobber.clobber(node); } } @@ -149,9 +149,9 @@ dojo.event.browser = new function(){ } } - this.removeListener = function( /*DOMNode*/ node, - /*String*/ evtName, - /*Function*/fp, + this.removeListener = function( /*DOMNode*/ node, + /*String*/ evtName, + /*Function*/fp, /*Boolean*/ capture){ // summary: // clobbers the listener from the node @@ -220,7 +220,7 @@ dojo.event.browser = new function(){ newfp = fp; } - if(node.addEventListener){ + if(node.addEventListener){ node.addEventListener(evtName.substr(2), newfp, capture); return newfp; }else{ @@ -241,7 +241,7 @@ dojo.event.browser = new function(){ } this.isEvent = function(/*Object*/obj){ - // summary: + // summary: // Tries to determine whether or not the object is a DOM event. // FIXME: event detection hack ... could test for additional attributes @@ -252,7 +252,7 @@ dojo.event.browser = new function(){ } this.currentEvent = null; - + this.callListener = function(/*Function*/listener, /*DOMNode*/curTarget){ // summary: // calls the specified listener in the context of the passed node @@ -269,7 +269,7 @@ dojo.event.browser = new function(){ } this._stopPropagation = function(){ - dojo.event.browser.currentEvent.cancelBubble = true; + dojo.event.browser.currentEvent.cancelBubble = true; } this._preventDefault = function(){ @@ -354,7 +354,7 @@ dojo.event.browser = new function(){ evt = window.event; } } - + if((evt["type"])&&(evt["type"].indexOf("key") == 0)){ // key events evt.keys = this.revKeys; // FIXME: how can we eliminate this iteration? @@ -502,7 +502,7 @@ dojo.event.browser = new function(){ case 63249://scrolllock case 63289://numlock break; - default: + default: evt.key = evt.charCode >= evt.KEY_SPACE ? String.fromCharCode(evt.charCode) : evt.keyCode; } }else{ diff --git a/framework/images/webapp/images/dojo/src/event/common.js b/framework/images/webapp/images/dojo/src/event/common.js index 0756265f4e..4a8b6a675f 100644 --- a/framework/images/webapp/images/dojo/src/event/common.js +++ b/framework/images/webapp/images/dojo/src/event/common.js @@ -172,12 +172,12 @@ dojo.event = new function(){ if(!ao.adviceObj){ dojo.raise("bad adviceObj for adviceFunc: "+ao.adviceFunc); } - + if(!ao.adviceFunc){ dojo.debug("bad adviceFunc for srcFunc: "+ao.srcFunc); dojo.debugShallow(ao); - } - + } + return ao; } @@ -197,28 +197,28 @@ dojo.event = new function(){ // dojo.event.connect(scope1, "functionName1", scope2, "functionName2"); // dojo.event.connect("after", scope1, "functionName1", scope2, "functionName2"); // dojo.event.connect("before", scope1, "functionName1", scope2, "functionName2"); - // dojo.event.connect("around", scope1, "functionName1", + // dojo.event.connect("around", scope1, "functionName1", // scope2, "functionName2", // aroundFunctionReference); - // dojo.event.connect("around", scope1, "functionName1", + // dojo.event.connect("around", scope1, "functionName1", // scope2, "functionName2", // scope3, "aroundFunctionName"); - // dojo.event.connect("before-around", scope1, "functionName1", + // dojo.event.connect("before-around", scope1, "functionName1", // scope2, "functionName2", // aroundFunctionReference); - // dojo.event.connect("after-around", scope1, "functionName1", + // dojo.event.connect("after-around", scope1, "functionName1", // scope2, "functionName2", // aroundFunctionReference); - // dojo.event.connect("after-around", scope1, "functionName1", + // dojo.event.connect("after-around", scope1, "functionName1", // scope2, "functionName2", // scope3, "aroundFunctionName"); - // dojo.event.connect("around", scope1, "functionName1", + // dojo.event.connect("around", scope1, "functionName1", // scope2, "functionName2", // scope3, "aroundFunctionName", true, 30); - // dojo.event.connect("around", scope1, "functionName1", + // dojo.event.connect("around", scope1, "functionName1", // scope2, "functionName2", // scope3, "aroundFunctionName", null, null, 10); - // adviceType: + // adviceType: // Optional. String. One of "before", "after", "around", // "before-around", or "after-around". FIXME // srcObj: @@ -413,7 +413,7 @@ dojo.event = new function(){ // - srcObj // - srcFunc // - adviceObj - // - adviceFunc + // - adviceFunc // - aroundObj // - aroundFunc // - once @@ -500,7 +500,7 @@ dojo.event.MethodInvocation.prototype.proceed = function(){ var meth = ti[1]; return mobj[meth].call(mobj, this); } -} +} dojo.event.MethodJoinPoint = function(/*Object*/obj, /*String*/funcName){ @@ -531,7 +531,7 @@ dojo.event.MethodJoinPoint.getForMethod = function(/*Object*/obj, /*String*/func } }else if((!dojo.lang.isFunction(obj[funcName]))&&(!dojo.lang.isAlien(obj[funcName]))){ // FIXME: should we throw an exception here instead? - return null; + return null; } // we hide our joinpoint instance in obj[funcName + '$joinpoint'] var jpname = funcName + "$joinpoint"; @@ -551,7 +551,7 @@ dojo.event.MethodJoinPoint.getForMethod = function(/*Object*/obj, /*String*/func obj[jpfuncname] = obj[funcName]; // joinpoint = obj[jpname] = new dojo.event.MethodJoinPoint(obj, funcName); joinpoint = obj[jpname] = new dojo.event.MethodJoinPoint(obj, jpfuncname); - obj[funcName] = function(){ + obj[funcName] = function(){ var args = []; if((isNode)&&(!arguments.length)){ @@ -582,8 +582,8 @@ dojo.event.MethodJoinPoint.getForMethod = function(/*Object*/obj, /*String*/func } } } - // return joinpoint.run.apply(joinpoint, arguments); - return joinpoint.run.apply(joinpoint, args); + // return joinpoint.run.apply(joinpoint, arguments); + return joinpoint.run.apply(joinpoint, args); } obj[funcName].__preJoinArity = origArity; } @@ -592,7 +592,7 @@ dojo.event.MethodJoinPoint.getForMethod = function(/*Object*/obj, /*String*/func dojo.lang.extend(dojo.event.MethodJoinPoint, { unintercept: function(){ - // summary: + // summary: // destroy the connection to all listeners that may have been // registered on this joinpoint this.object[this.methodname] = this.methodfunc; @@ -618,19 +618,19 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { aargs[x] = args[x]; } - var unrollAdvice = function(marr){ + var unrollAdvice = function(marr){ if(!marr){ dojo.debug("Null argument to unrollAdvice()"); return; } - + var callObj = marr[0]||dj_global; var callFunc = marr[1]; - + if(!callObj[callFunc]){ dojo.raise("function \"" + callFunc + "\" does not exist on \"" + callObj + "\""); } - + var aroundObj = marr[2]||dj_global; var aroundFunc = marr[3]; var msg = marr[6]; @@ -684,16 +684,16 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { if((hasDelay)&&((dojo.render.html)||(dojo.render.svg))){ // FIXME: the render checks are grotty! dj_global["setTimeout"](function(){ if(msg){ - callObj[callFunc].call(callObj, to); + callObj[callFunc].call(callObj, to); }else{ - callObj[callFunc].apply(callObj, args); + callObj[callFunc].apply(callObj, args); } }, delay); }else{ // many environments can't support delay! if(msg){ - callObj[callFunc].call(callObj, to); + callObj[callFunc].call(callObj, to); }else{ - callObj[callFunc].apply(callObj, args); + callObj[callFunc].apply(callObj, args); } } } @@ -703,7 +703,7 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { if(this.squelch){ try{ return unrollAdvice.apply(this, arguments); - }catch(e){ + }catch(e){ dojo.debug(e); } }else{ @@ -724,11 +724,11 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { }else if(this.methodfunc){ result = this.object[this.methodname].apply(this.object, args); } - }catch(e){ - if(!this.squelch){ + }catch(e){ + if(!this.squelch){ dojo.debug(e,"when calling",this.methodname,"on",this.object,"with arguments",args); dojo.raise(e); - } + } } if((this["after"])&&(this.after.length>0)){ @@ -762,23 +762,23 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { // An object that can have the following properties: // - adviceType // - adviceObj - // - adviceFunc + // - adviceFunc // - aroundObj // - aroundFunc // - once // - delay // - rate // - adviceMsg - this.addAdvice( args["adviceObj"], args["adviceFunc"], - args["aroundObj"], args["aroundFunc"], - args["adviceType"], args["precedence"], - args["once"], args["delay"], args["rate"], + this.addAdvice( args["adviceObj"], args["adviceFunc"], + args["aroundObj"], args["aroundFunc"], + args["adviceType"], args["precedence"], + args["once"], args["delay"], args["rate"], args["adviceMsg"]); }, - addAdvice: function( thisAdviceObj, thisAdvice, - thisAroundObj, thisAround, - adviceType, precedence, + addAdvice: function( thisAdviceObj, thisAdvice, + thisAroundObj, thisAround, + adviceType, precedence, once, delay, rate, asMessage){ // summary: // add advice to this joinpoint using positional parameters @@ -791,7 +791,7 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { // thisAroundFunc: // the name of the function that will be used to mediate the // advice call. - // adviceType: + // adviceType: // Optional. String. One of "before", "after", "around", // "before-around", or "after-around". FIXME // once: @@ -814,7 +814,7 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { } var ao = [thisAdviceObj, thisAdvice, thisAroundObj, thisAround, delay, rate, asMessage]; - + if(once){ if(this.hasAdvice(thisAdviceObj, thisAdvice, adviceType, arr) >= 0){ return; @@ -837,7 +837,7 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { // the scope in which to locate/execute the named adviceFunc. // thisAdviceFunc: // the name of the function being conected - // adviceType: + // adviceType: // Optional. String. One of "before", "after", "around", // "before-around", or "after-around". FIXME // arr: @@ -864,7 +864,7 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, { // the scope in which to locate/execute the named adviceFunc. // thisAdviceFunc: // the name of the function being conected - // adviceType: + // adviceType: // Optional. String. One of "before", "after", "around", // "before-around", or "after-around". FIXME // once: diff --git a/framework/images/webapp/images/dojo/src/event/topic.js b/framework/images/webapp/images/dojo/src/event/topic.js index 597f1cf96f..d5efb550e0 100644 --- a/framework/images/webapp/images/dojo/src/event/topic.js +++ b/framework/images/webapp/images/dojo/src/event/topic.js @@ -32,7 +32,7 @@ dojo.event.topic = new function(){ // calls to the function will cause a publish event on the topic // with the arguments passed to the function passed to registered // listeners. - // topic: + // topic: // a unique, opaque string that names the topic // obj: // the scope to locate the function in @@ -47,7 +47,7 @@ dojo.event.topic = new function(){ // susbscribes the function to the topic. Subsequent events // dispached to the topic will create a function call for the // obj.funcName() function. - // topic: + // topic: // a unique, opaque string that names the topic // obj: // the scope to locate the function in @@ -60,7 +60,7 @@ dojo.event.topic = new function(){ this.unsubscribe = function(/*String*/topic, /*Object*/obj, /*String*/funcName){ // summary: // unsubscribes the obj.funcName() from the topic - // topic: + // topic: // a unique, opaque string that names the topic // obj: // the scope to locate the function in @@ -71,7 +71,7 @@ dojo.event.topic = new function(){ } this.destroy = function(/*String*/topic){ - // summary: + // summary: // destroys the topic and unregisters all listeners // topic: // a unique, opaque string that names the topic @@ -80,7 +80,7 @@ dojo.event.topic = new function(){ } this.publishApply = function(/*String*/topic, /*Array*/args){ - // summary: + // summary: // dispatches an event to the topic using the args array as the // source for the call arguments to each listener. This is similar // to JavaScript's built-in Function.apply() @@ -93,7 +93,7 @@ dojo.event.topic = new function(){ } this.publish = function(/*String*/topic, /*Object*/message){ - // summary: + // summary: // manually "publish" to the passed topic // topic: // a unique, opaque string that names the topic @@ -132,8 +132,8 @@ dojo.event.topic.TopicImpl = function(topicName){ var tf = listenerMethod||listenerObject; var to = (!listenerMethod) ? dj_global : listenerObject; return dojo.event.kwConnect({ // dojo.event.MethodJoinPoint - srcObj: this, - srcFunc: "sendMessage", + srcObj: this, + srcFunc: "sendMessage", adviceObj: to, adviceFunc: tf }); @@ -153,8 +153,8 @@ dojo.event.topic.TopicImpl = function(topicName){ var tf = (!listenerMethod) ? listenerObject : listenerMethod; var to = (!listenerMethod) ? null : listenerObject; return dojo.event.kwDisconnect({ // dojo.event.MethodJoinPoint - srcObj: this, - srcFunc: "sendMessage", + srcObj: this, + srcFunc: "sendMessage", adviceObj: to, adviceFunc: tf }); @@ -165,7 +165,7 @@ dojo.event.topic.TopicImpl = function(topicName){ } this.setSquelch = function(/*Boolean*/shouldSquelch){ - // summary: + // summary: // determine whether or not exceptions in the calling of a // listener in the chain should stop execution of the chain. this._getJoinPoint().squelch = shouldSquelch; @@ -176,7 +176,7 @@ dojo.event.topic.TopicImpl = function(topicName){ this._getJoinPoint().disconnect(); } - this.registerPublisher = function( /*Object*/publisherObject, + this.registerPublisher = function( /*Object*/publisherObject, /*Function or String*/publisherMethod){ // summary: // registers the passed function as a publisher on this topic. diff --git a/framework/images/webapp/images/dojo/src/experimental.js b/framework/images/webapp/images/dojo/src/experimental.js index 72a96cbeb0..c955c67c32 100644 --- a/framework/images/webapp/images/dojo/src/experimental.js +++ b/framework/images/webapp/images/dojo/src/experimental.js @@ -12,14 +12,14 @@ dojo.provide("dojo.experimental"); dojo.experimental = function(/* String */ moduleName, /* String? */ extra){ // summary: Marks code as experimental. - // description: + // description: // This can be used to mark a function, file, or module as experimental. // Experimental code is not ready to be used, and the APIs are subject // to change without notice. Experimental code may be completed deleted // without going through the normal deprecation process. // moduleName: The name of a module, or the name of a module file or a specific function // extra: some additional message for the user - + // examples: // dojo.experimental("dojo.data.Result"); // dojo.experimental("dojo.weather.toKelvin()", "PENDING approval from NOAA"); diff --git a/framework/images/webapp/images/dojo/src/flash.js b/framework/images/webapp/images/dojo/src/flash.js index d3ff508870..c557786ec6 100644 --- a/framework/images/webapp/images/dojo/src/flash.js +++ b/framework/images/webapp/images/dojo/src/flash.js @@ -18,101 +18,101 @@ dojo.flash = function(){ // summary: // The goal of dojo.flash is to make it easy to extend Flash's capabilities // into an AJAX/DHTML environment. - // description: + // description: // The goal of dojo.flash is to make it easy to extend Flash's capabilities - // into an AJAX/DHTML environment. Robust, performant, reliable + // into an AJAX/DHTML environment. Robust, performant, reliable // JavaScript/Flash communication is harder than most realize when they // delve into the topic, especially if you want it // to work on Internet Explorer, Firefox, and Safari, and to be able to // push around hundreds of K of information quickly. Dojo.flash makes it // possible to support these platforms; you have to jump through a few - // hoops to get its capabilites, but if you are a library writer + // hoops to get its capabilites, but if you are a library writer // who wants to bring Flash's storage or streaming sockets ability into // DHTML, for example, then dojo.flash is perfect for you. - // - // Dojo.flash provides an easy object for interacting with the Flash plugin. + // + // Dojo.flash provides an easy object for interacting with the Flash plugin. // This object provides methods to determine the current version of the Flash - // plugin (dojo.flash.info); execute Flash instance methods + // plugin (dojo.flash.info); execute Flash instance methods // independent of the Flash version - // being used (dojo.flash.comm); write out the necessary markup to - // dynamically insert a Flash object into the page (dojo.flash.Embed; and - // do dynamic installation and upgrading of the current Flash plugin in + // being used (dojo.flash.comm); write out the necessary markup to + // dynamically insert a Flash object into the page (dojo.flash.Embed; and + // do dynamic installation and upgrading of the current Flash plugin in // use (dojo.flash.Install). - // - // To use dojo.flash, you must first wait until Flash is finished loading - // and initializing before you attempt communication or interaction. + // + // To use dojo.flash, you must first wait until Flash is finished loading + // and initializing before you attempt communication or interaction. // To know when Flash is finished use dojo.event.connect: - // + // // dojo.event.connect(dojo.flash, "loaded", myInstance, "myCallback"); - // + // // Then, while the page is still loading provide the file name // and the major version of Flash that will be used for Flash/JavaScript - // communication (see "Flash Communication" below for information on the - // different kinds of Flash/JavaScript communication supported and how they + // communication (see "Flash Communication" below for information on the + // different kinds of Flash/JavaScript communication supported and how they // depend on the version of Flash installed): - // + // // dojo.flash.setSwf({flash6: "src/storage/storage_flash6.swf", // flash8: "src/storage/storage_flash8.swf"}); - // + // // This will cause dojo.flash to pick the best way of communicating // between Flash and JavaScript based on the platform. - // + // // If no SWF files are specified, then Flash is not initialized. - // + // // Your Flash must use DojoExternalInterface to expose Flash methods and // to call JavaScript; see "Flash Communication" below for details. - // + // // setSwf can take an optional 'visible' attribute to control whether // the Flash object is visible or not on the page; the default is visible: - // + // // dojo.flash.setSwf({flash6: "src/storage/storage_flash6.swf", // flash8: "src/storage/storage_flash8.swf", // visible: false}); - // + // // Once finished, you can query Flash version information: - // + // // dojo.flash.info.version - // + // // Or can communicate with Flash methods that were exposed: - // + // // var results = dojo.flash.comm.sayHello("Some Message"); - // + // // Only string values are currently supported for both arguments and // for return results. Everything will be cast to a string on both // the JavaScript and Flash sides. - // + // // ------------------- // Flash Communication // ------------------- - // - // dojo.flash allows Flash/JavaScript communication in + // + // dojo.flash allows Flash/JavaScript communication in // a way that can pass large amounts of data back and forth reliably and // very fast. The dojo.flash // framework encapsulates the specific way in which this communication occurs, // presenting a common interface to JavaScript irrespective of the underlying // Flash version. - // + // // There are currently three major ways to do Flash/JavaScript communication // in the Flash community: - // + // // 1) Flash 6+ - Uses Flash methods, such as SetVariable and TCallLabel, // and the fscommand handler to do communication. Strengths: Very fast, // mature, and can send extremely large amounts of data; can do - // synchronous method calls. Problems: Does not work on Safari; works on + // synchronous method calls. Problems: Does not work on Safari; works on // Firefox/Mac OS X only if Flash 8 plugin is installed; cryptic to work with. - // + // // 2) Flash 8+ - Uses ExternalInterface, which provides a way for Flash // methods to register themselves for callbacks from JavaScript, and a way // for Flash to call JavaScript. Strengths: Works on Safari; elegant to - // work with; can do synchronous method calls. Problems: Extremely buggy + // work with; can do synchronous method calls. Problems: Extremely buggy // (fails if there are new lines in the data, for example); performance // degrades drastically in O(n^2) time as data grows; locks up the browser while // it is communicating; does not work in Internet Explorer if Flash // object is dynamically added to page with document.writeln, DOM methods, // or innerHTML. - // - // 3) Flash 6+ - Uses two seperate Flash applets, one that we - // create over and over, passing input data into it using the PARAM tag, + // + // 3) Flash 6+ - Uses two seperate Flash applets, one that we + // create over and over, passing input data into it using the PARAM tag, // which then uses a Flash LocalConnection to pass the data to the main Flash // applet; communication back to Flash is accomplished using a getURL // call with a javascript protocol handler, such as "javascript:myMethod()". @@ -120,7 +120,7 @@ dojo.flash = function(){ // of Flash communication known; works on Safari. Problems: Timing issues; // clunky and complicated; slow; can only send very small amounts of // data (several K); all method calls are asynchronous. - // + // // dojo.flash.comm uses only the first two methods. This framework // was created primarily for dojo.storage, which needs to pass very large // amounts of data synchronously and reliably across the Flash/JavaScript @@ -128,42 +128,42 @@ dojo.flash = function(){ // that support it, while using the Flash 8 ExternalInterface method // only on Safari with some special code to help correct ExternalInterface's // bugs. - // + // // Since dojo.flash needs to have two versions of the Flash // file it wants to generate, a Flash 6 and a Flash 8 version to gain // true cross-browser compatibility, several tools are provided to ease // development on the Flash side. - // + // // In your Flash file, if you want to expose Flash methods that can be // called, use the DojoExternalInterface class to register methods. This // class is an exact API clone of the standard ExternalInterface class, but // can work in Flash 6+ browsers. Under the covers it uses the best // mechanism to do communication: - // + // // class HelloWorld{ // function HelloWorld(){ // // Initialize the DojoExternalInterface class // DojoExternalInterface.initialize(); - // + // // // Expose your methods // DojoExternalInterface.addCallback("sayHello", this, this.sayHello); - // + // // // Tell JavaScript that you are ready to have method calls // DojoExternalInterface.loaded(); - // + // // // Call some JavaScript // var resultsReady = function(results){ // trace("Received the following results from JavaScript: " + results); // } - // DojoExternalInterface.call("someJavaScriptMethod", resultsReady, + // DojoExternalInterface.call("someJavaScriptMethod", resultsReady, // someParameter); // } - // + // // function sayHello(){ ... } - // + // // static main(){ ... } // } - // + // // DojoExternalInterface adds two new functions to the ExternalInterface // API: initialize() and loaded(). initialize() must be called before // any addCallback() or call() methods are run, and loaded() must be @@ -171,71 +171,71 @@ dojo.flash = function(){ // will fire the dojo.flash.loaded() event, so that JavaScript can know that // Flash has finished loading and adding its callbacks, and can begin to // interact with the Flash file. - // + // // To generate your SWF files, use the ant task - // "buildFlash". You must have the open source Motion Twin ActionScript + // "buildFlash". You must have the open source Motion Twin ActionScript // compiler (mtasc) installed and in your path to use the "buildFlash" // ant task; download and install mtasc from http://www.mtasc.org/. - // - // - // + // + // + // // buildFlash usage: - // + // // ant buildFlash -Ddojo.flash.file=../tests/flash/HelloWorld.as - // - // where "dojo.flash.file" is the relative path to your Flash + // + // where "dojo.flash.file" is the relative path to your Flash // ActionScript file. - // + // // This will generate two SWF files, one ending in _flash6.swf and the other // ending in _flash8.swf in the same directory as your ActionScript method: - // + // // HelloWorld_flash6.swf // HelloWorld_flash8.swf - // + // // Initialize dojo.flash with the filename and Flash communication version to // use during page load; see the documentation for dojo.flash for details: - // + // // dojo.flash.setSwf({flash6: "tests/flash/HelloWorld_flash6.swf", // flash8: "tests/flash/HelloWorld_flash8.swf"}); - // + // // Now, your Flash methods can be called from JavaScript as if they are native // Flash methods, mirrored exactly on the JavaScript side: - // + // // dojo.flash.comm.sayHello(); - // + // // Only Strings are supported being passed back and forth currently. - // + // // JavaScript to Flash communication is synchronous; i.e., results are returned // directly from the method call: - // + // // var results = dojo.flash.comm.sayHello(); - // + // // Flash to JavaScript communication is asynchronous due to limitations in // the underlying technologies; you must use a results callback to handle // results returned by JavaScript in your Flash AS files: - // + // // var resultsReady = function(results){ // trace("Received the following results from JavaScript: " + results); // } // DojoExternalInterface.call("someJavaScriptMethod", resultsReady); - // - // - // + // + // + // // ------------------- // Notes // ------------------- - // + // // If you have both Flash 6 and Flash 8 versions of your file: - // + // // dojo.flash.setSwf({flash6: "tests/flash/HelloWorld_flash6.swf", // flash8: "tests/flash/HelloWorld_flash8.swf"}); - // + // // but want to force the browser to use a certain version of Flash for // all platforms (for testing, for example), use the djConfig // variable 'forceFlashComm' with the version number to force: - // + // // var djConfig = { forceFlashComm: 6 }; - // + // // Two values are currently supported, 6 and 8, for the two styles of // communication described above. Just because you force dojo.flash // to use a particular communication style is no guarantee that it will @@ -244,40 +244,40 @@ dojo.flash = function(){ // in Safari. It is best to let dojo.flash determine the best communication // mechanism, and to use the value above only for debugging the dojo.flash // framework itself. - // + // // Also note that dojo.flash can currently only work with one Flash object // on the page; it and the API do not yet support multiple Flash objects on // the same page. - // + // // We use some special tricks to get decent, linear performance // out of Flash 8's ExternalInterface on Safari; see the blog - // post + // post // http://codinginparadise.org/weblog/2006/02/how-to-speed-up-flash-8s.html // for details. - // + // // Your code can detect whether the Flash player is installing or having // its version revved in two ways. First, if dojo.flash detects that // Flash installation needs to occur, it sets dojo.flash.info.installing // to true. Second, you can detect if installation is necessary with the // following callback: - // + // // dojo.event.connect(dojo.flash, "installing", myInstance, "myCallback"); - // + // // You can use this callback to delay further actions that might need Flash; // when installation is finished the full page will be refreshed and the // user will be placed back on your page with Flash installed. - // + // // Two utility methods exist if you want to add loading and installing // listeners without creating dependencies on dojo.event; these are // 'addLoadingListener' and 'addInstallingListener'. - // + // // ------------------- // Todo/Known Issues // ------------------- // // There are several tasks I was not able to do, or did not need to fix - // to get dojo.storage out: - // + // to get dojo.storage out: + // // * When using Flash 8 communication, Flash method calls to JavaScript // are not working properly; serialization might also be broken for certain // invalid characters when it is Flash invoking JavaScript methods. @@ -286,14 +286,14 @@ dojo.flash = function(){ // test_flash2.html unit tests should also be updated to have much more // sophisticated Flash to JavaScript unit tests, including large // amounts of data. - // + // // * On Internet Explorer, after doing a basic install, the page is // not refreshed or does not detect that Flash is now available. The way // to fix this is to create a custom small Flash file that is pointed to // during installation; when it is finished loading, it does a callback // that says that Flash installation is complete on IE, and we can proceed // to initialize the dojo.flash subsystem. - // + // // Author- Brad Neuberg, bkn3@columbia.edu } @@ -304,7 +304,7 @@ dojo.flash = { _visible: true, _loadedListeners: new Array(), _installingListeners: new Array(), - + setSwf: function(/* Object */ fileInfo){ // summary: Sets the SWF files and versions we are using. // fileInfo: Object @@ -315,45 +315,45 @@ dojo.flash = { // Example- // var swfloc6 = dojo.uri.dojoUri("Storage_version6.swf").toString(); // var swfloc8 = dojo.uri.dojoUri("Storage_version8.swf").toString(); - // dojo.flash.setSwf({flash6: swfloc6, flash8: swfloc8, visible: false}); - + // dojo.flash.setSwf({flash6: swfloc6, flash8: swfloc8, visible: false}); + if(fileInfo == null || dojo.lang.isUndefined(fileInfo)){ return; } - + if(fileInfo.flash6 != null && !dojo.lang.isUndefined(fileInfo.flash6)){ this.flash6_version = fileInfo.flash6; } - + if(fileInfo.flash8 != null && !dojo.lang.isUndefined(fileInfo.flash8)){ this.flash8_version = fileInfo.flash8; } - + if(!dojo.lang.isUndefined(fileInfo.visible)){ this._visible = fileInfo.visible; } - - // initialize ourselves + + // initialize ourselves this._initialize(); }, - + useFlash6: function(){ /* Boolean */ // summary: Returns whether we are using Flash 6 for communication on this platform. - + if(this.flash6_version == null){ return false; }else if (this.flash6_version != null && dojo.flash.info.commVersion == 6){ - // if we have a flash 6 version of this SWF, and this browser supports + // if we have a flash 6 version of this SWF, and this browser supports // communicating using Flash 6 features... return true; }else{ return false; } }, - + useFlash8: function(){ /* Boolean */ // summary: Returns whether we are using Flash 8 for communication on this platform. - + if(this.flash8_version == null){ return false; }else if (this.flash8_version != null && dojo.flash.info.commVersion == 8){ @@ -364,37 +364,37 @@ dojo.flash = { return false; } }, - + addLoadedListener: function(/* Function */ listener){ // summary: - // Adds a listener to know when Flash is finished loading. + // Adds a listener to know when Flash is finished loading. // Useful if you don't want a dependency on dojo.event. // listener: Function // A function that will be called when Flash is done loading. - + this._loadedListeners.push(listener); }, addInstallingListener: function(/* Function */ listener){ // summary: - // Adds a listener to know if Flash is being installed. + // Adds a listener to know if Flash is being installed. // Useful if you don't want a dependency on dojo.event. // listener: Function // A function that will be called if Flash is being // installed - + this._installingListeners.push(listener); - }, - + }, + loaded: function(){ // summary: Called back when the Flash subsystem is finished loading. // description: // A callback when the Flash subsystem is finished loading and can be // worked with. To be notified when Flash is finished loading, connect // your callback to this method using the following: - // + // // dojo.event.connect(dojo.flash, "loaded", myInstance, "myCallback"); - + //dojo.debug("dojo.flash.loaded"); dojo.flash.ready = true; if(dojo.flash._loadedListeners.length > 0){ @@ -403,16 +403,16 @@ dojo.flash = { } } }, - + installing: function(){ // summary: Called if Flash is being installed. // description: // A callback to know if Flash is currently being installed or // having its version revved. To be notified if Flash is installing, connect // your callback to this method using the following: - // + // // dojo.event.connect(dojo.flash, "installing", myInstance, "myCallback"); - + //dojo.debug("installing"); if(dojo.flash._installingListeners.length > 0){ for(var i = 0; i < dojo.flash._installingListeners.length; i++){ @@ -420,7 +420,7 @@ dojo.flash = { } } }, - + // Initializes dojo.flash. _initialize: function(){ //dojo.debug("dojo.flash._initialize"); @@ -428,14 +428,14 @@ dojo.flash = { var installer = new dojo.flash.Install(); dojo.flash.installer = installer; - if(installer.needed() == true){ + if(installer.needed() == true){ installer.install(); }else{ //dojo.debug("Writing object out"); // write the flash object into the page dojo.flash.obj = new dojo.flash.Embed(this._visible); dojo.flash.obj.write(dojo.flash.info.commVersion); - + // initialize the way we do Flash/JavaScript communication dojo.flash.comm = new dojo.flash.Communicator(); } @@ -449,15 +449,15 @@ dojo.flash.Info = function(){ // A class that helps us determine whether Flash is available, // it's major and minor versions, and what Flash version features should // be used for Flash/JavaScript communication. Parts of this code - // are adapted from the automatic Flash plugin detection code autogenerated - // by the Macromedia Flash 8 authoring environment. - // + // are adapted from the automatic Flash plugin detection code autogenerated + // by the Macromedia Flash 8 authoring environment. + // // An instance of this class can be accessed on dojo.flash.info after // the page is finished loading. - // - // This constructor must be called before the page is finished loading. - - // Visual basic helper required to detect Flash Player ActiveX control + // + // This constructor must be called before the page is finished loading. + + // Visual basic helper required to detect Flash Player ActiveX control // version information on Internet Explorer if(dojo.render.html.ie){ document.writeln(''); - + // hook for Internet Explorer to receive FSCommands from Flash if(dojo.render.html.ie){ document.writeln(' @@ -248,7 +248,7 @@

    This file is used for Dojo's XMLHttpRequest Iframe Proxy. This is the "client" file used internally by dojo.io.XhrIframeProxy.

    - + diff --git a/framework/images/webapp/images/dojo/src/io/xip_server.html b/framework/images/webapp/images/dojo/src/io/xip_server.html index 6e25f95a74..7d0510107d 100644 --- a/framework/images/webapp/images/dojo/src/io/xip_server.html +++ b/framework/images/webapp/images/dojo/src/io/xip_server.html @@ -2,10 +2,10 @@ /* Copyright (c) 2004-2006, The Dojo Foundation All Rights Reserved. - + Licensed under the Academic Free License version 2.1 or above OR the modified BSD license. For more information on Dojo licensing, see: - + http://dojotoolkit.org/community/licensing.shtml */ Pieces taken from Dojo source to make this file stand-alone @@ -17,22 +17,22 @@ + <#else> " <@renderClass className alert /><#if id?has_content> id="${id}"<#if multiple?has_content> multiple="multiple"<#if otherFieldSize gt 0> onchange="process_choice(this,document.${formName}.${otherFieldName})"<#if event?has_content> ${event}="${action}"<#if size?has_content> size="${size}"> <#if firstInList?has_content && currentValue?has_content> @@ -103,9 +103,9 @@ _description"<#if id?has_content> id="${id}_description"<#if currentValue? <#if allowEmpty?has_content> -<#list options as item> +<#list options as item> selected="selected"<#elseif !currentValue?has_content && noCurrentSelectedKey?has_content && noCurrentSelectedKey == item.key> selected="selected" value="${item.key}">${item.description}<#rt/> - + <#if otherFieldName?has_content> @@ -122,14 +122,14 @@ if(disa && document.styleSheets) <#macro renderCheckField items className alert allChecked currentValue name event action> -<#list items as item> +<#list items as item> <#rt/> <#if allChecked?has_content && allChecked> checked="checked" <#elseif allChecked?has_content && !allChecked><#elseif currentValue?has_content && currentValue==item.key> checked="checked" name="${name?default("")?html}" value="${item.key?default("")?html}"<#if event?has_content> ${event}="${action}"/><#rt/> ${item.description?default("")} <#macro renderRadioField items className alert currentValue noCurrentSelectedKey name event action> -<#list items as item> +<#list items as item>
    ><#rt/> <#if rp.currentValue==item.key> checked="checked"<#elseif noCurrentSelectedKey?has_content && noCurrentSelectedKey == item.key> checked="checked" name="${name?default("")?html}" value="${item.key?default("")?html}"<#if event?has_content> ${event}="${action}"/><#rt/> ${item.description}
    @@ -151,11 +151,11 @@ ${item.description} <#macro renderFieldTitle style title><#if style?has_content> enctype="multipart/form-data"<#if targetWindow?has_content> target="${targetWindow}"<#if containerId?has_content> id="${containerId}" class=<#if containerStyle?has_content>"${containerStyle}"<#else>"basic-form" onSubmit="javascript:submitFormDisableSubmits(this)"<#if autocomplete?has_content> autocomplete="${autocomplete}" name="${name}" ><#if useRowSubmit?has_content && useRowSubmit> <#macro renderFormClose focusFieldName formName><#if focusFieldName?has_content> <#macro renderMultiFormClose> - + <#macro renderFormatListWrapperOpen style> <#macro renderFormatListWrapperClose>
    @@ -167,7 +167,7 @@ ${item.description} <#macro renderFormatHeaderRowFormCellOpen style>
    class="${style}"> <#macro renderFormatHeaderRowFormCellClose>
    colspan="${positionSpan}"<#if style?has_content>class="${style}"> @@ -207,7 +207,7 @@ ${item.description} <#macro renderTextFindField name value defaultOption opEquals opBeginsWith opContains opIsEmpty opNotEqual className alert size maxlength autocomplete titleStyle hideIgnoreCase ignCase ignoreCase> <#if opEquals?has_content> "${name}_fld1_op" class="selectBox"><#rt/> -<#rt/> +<#rt/> <#rt/> <#rt/> <#rt/> @@ -279,7 +279,7 @@ ${item.description} <#rt/> <#rt/> @@ -292,7 +292,7 @@ ${item.description} <#rt/> <#rt/> <#if titleStyle?has_content> @@ -308,7 +308,7 @@ ${item.description} onclick="javascript:toggleScreenlet(this, '$ ${menuString}
    id="${collapsibleAreaId}" <#if collapsed> style="${collapsed}display: none;"<#if padded> class="screenlet-body"> - + <#macro renderScreenletSubWidget> <#macro renderScreenletEnd>
    diff --git a/framework/widget/templates/textFormMacroLibrary.ftl b/framework/widget/templates/textFormMacroLibrary.ftl index e3d254e891..edf27ac429 100644 --- a/framework/widget/templates/textFormMacroLibrary.ftl +++ b/framework/widget/templates/textFormMacroLibrary.ftl @@ -49,11 +49,11 @@ under the License. <#macro renderFieldTitle style title><@renderField title /> <#macro renderSingleFormFieldTitle> - + <#macro renderFormOpen linkUrl formType targetWindow containerId containerStyle autocomplete name useRowSubmit> <#macro renderFormClose focusFieldName formName> <#macro renderMultiFormClose> - + <#macro renderFormatListWrapperOpen style> <#macro renderFormatListWrapperClose> @@ -65,7 +65,7 @@ under the License. <#macro renderFormatHeaderRowFormCellOpen style> <#macro renderFormatHeaderRowFormCellClose> <#macro renderFormatHeaderRowFormCellTitleSeparator style isLast> - + <#macro renderFormatItemRowOpen itemIndex altRowStyles evenRowStyle oddRowStyle> <#macro renderFormatItemRowClose> <#macro renderFormatItemRowCellOpen style positionSpan> diff --git a/framework/widget/templates/xmlScreenMacroLibrary.ftl b/framework/widget/templates/xmlScreenMacroLibrary.ftl index 45b86f7b41..6583f09320 100644 --- a/framework/widget/templates/xmlScreenMacroLibrary.ftl +++ b/framework/widget/templates/xmlScreenMacroLibrary.ftl @@ -81,7 +81,7 @@ expanded">
    onclick="javascript:toggleScreenlet(this, '$ ${menuString}
    id="${collapsibleAreaId}" <#if collapsed> style="${collapsed}display: none;"<#if padded> class="screenlet-body"> - + <#macro renderScreenletSubWidget> <#macro renderScreenletEnd>
    diff --git a/ij.ofbiz b/ij.ofbiz index 7b0c125d58..0e47dfcc71 100755 --- a/ij.ofbiz +++ b/ij.ofbiz @@ -7,9 +7,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/rc.ofbiz b/rc.ofbiz index ab838aed3b..7f2f5cf539 100644 --- a/rc.ofbiz +++ b/rc.ofbiz @@ -7,9 +7,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -25,12 +25,12 @@ # description: OFBiz server # Source function library -# this does not exist in Debian/Ubuntu/etc. -# => comment out and use "echo failure" and "echo success" in place of echo_failure and echo_success (minor anyway) +# this does not exist in Debian/Ubuntu/etc. +# => comment out and use "echo failure" and "echo success" in place of echo_failure and echo_success (minor anyway) . /etc/rc.d/init.d/functions # Source networking configuration -# this does not exist in Debian/Ubuntu/etc. => comment out +# this does not exist in Debian/Ubuntu/etc. => comment out . /etc/sysconfig/network # Paths - Edit for your locations @@ -78,7 +78,7 @@ start() { cd $OFBIZ_HOME umask 007 /bin/rm -f $OFBIZ_LOG - $JAVA_BINARY $JAVA_VMOPTIONS $JAVA_ARGS >>$OFBIZ_LOG 2>>$OFBIZ_LOG& + $JAVA_BINARY $JAVA_VMOPTIONS $JAVA_ARGS >>$OFBIZ_LOG 2>>$OFBIZ_LOG& echo_success return 0 } @@ -97,7 +97,7 @@ stop() { # All clear cd $OFBIZ_HOME - umask 007 + umask 007 $JAVA_BINARY $JAVA_VMOPTIONS $JAVA_ARGS -shutdown >>$OFBIZ_LOG ofbizprocs if [ "$OFBIZ_PROCS" != "" ]; then @@ -124,7 +124,7 @@ stop() { } # If root is running this script, su to $OFBIZ_USER first -# Note that under Debian/Ubuntu/etc. you should use instead +# Note that under Debian/Ubuntu/etc. you should use instead # if [ "$USER" = "root" ]; then if [ "$UID" = "0" ]; then exec su - $OFBIZ_USER -c "$0 $1" @@ -140,7 +140,7 @@ case "$1" in 'restart') stop start - ;; + ;; 'status') ofbizprocs if [ "$OFBIZ_PROCS" == "" ]; then diff --git a/runtime/data/derby.properties b/runtime/data/derby.properties index 34cf109701..ce877d6eac 100644 --- a/runtime/data/derby.properties +++ b/runtime/data/derby.properties @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -17,7 +17,7 @@ # under the License. ############################################################################### -derby.infolog.append=true +derby.infolog.append=true derby.storage.pageSize=8192 derby.storage.pageReservedSpace=60 derby.storage.fileSyncTransactionLog=true diff --git a/specialpurpose/assetmaint/build.xml b/specialpurpose/assetmaint/build.xml index 561113c06c..ef53ca4b61 100644 --- a/specialpurpose/assetmaint/build.xml +++ b/specialpurpose/assetmaint/build.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml b/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml index 3ae3e22fdd..67a5c8a1d5 100644 --- a/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml +++ b/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml @@ -32,6 +32,6 @@ under the License. - + diff --git a/specialpurpose/assetmaint/entitydef/entitymodel.xml b/specialpurpose/assetmaint/entitydef/entitymodel.xml index 753bf91bd6..a74f785676 100644 --- a/specialpurpose/assetmaint/entitydef/entitymodel.xml +++ b/specialpurpose/assetmaint/entitydef/entitymodel.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -20,7 +20,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -140,12 +140,12 @@ - - - - - - + + + + + + @@ -155,7 +155,7 @@ - + @@ -178,12 +178,12 @@ - - - - - - + + + + + + @@ -193,9 +193,8 @@ - + - \ No newline at end of file diff --git a/specialpurpose/assetmaint/ofbiz-component.xml b/specialpurpose/assetmaint/ofbiz-component.xml index 1279a69beb..52f11b910b 100644 --- a/specialpurpose/assetmaint/ofbiz-component.xml +++ b/specialpurpose/assetmaint/ofbiz-component.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -48,13 +48,13 @@ base-permission="ASSETMAINT" mount-point="/assetmaint" app-bar-display="true"/> - + - + diff --git a/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml b/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml index 2f93829359..dcff39b7d0 100644 --- a/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml +++ b/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -18,7 +18,7 @@ under the License. --> - - + @@ -59,7 +59,7 @@ - + @@ -68,4 +68,4 @@ - + diff --git a/specialpurpose/assetmaint/servicedef/secas.xml b/specialpurpose/assetmaint/servicedef/secas.xml index f94f659c48..ab9c247437 100644 --- a/specialpurpose/assetmaint/servicedef/secas.xml +++ b/specialpurpose/assetmaint/servicedef/secas.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - diff --git a/specialpurpose/assetmaint/servicedef/services.xml b/specialpurpose/assetmaint/servicedef/services.xml index ed2efc4da7..d9fb1aeb04 100644 --- a/specialpurpose/assetmaint/servicedef/services.xml +++ b/specialpurpose/assetmaint/servicedef/services.xml @@ -15,7 +15,7 @@ License for the specific language governing permissions and limitations under the License. --> - Assetmaint Services: Fixed Asset OFBiz @@ -30,7 +30,7 @@ under the License. - + Asset Maintentance Permission Checking Logic diff --git a/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy b/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy index e33cfd2e18..86daf88cbd 100644 --- a/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy +++ b/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -21,7 +21,7 @@ import org.ofbiz.entity.*; import org.ofbiz.entity.condition.*; import org.ofbiz.entity.util.*; -// This is a small script to set things up when the EditFixedAssetMaint +// This is a small script to set things up when the EditFixedAssetMaint // screen is called from one of the WorkEffort calendar screens. // The URL coming from WorkEffort does not contain the maintHistSeqId parameter, // so this script will look it up using the workEffortId parameter. diff --git a/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.groovy b/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.groovy index 65650ab7ea..938830cedf 100644 --- a/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.groovy +++ b/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.groovy @@ -18,7 +18,7 @@ */ import java.util.*; - + import org.ofbiz.base.util.*; import org.ofbiz.entity.*; import org.ofbiz.entity.condition.*; diff --git a/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml b/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml index ae13d7658f..c2fa93f51e 100644 --- a/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml +++ b/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -21,10 +21,10 @@ - - - - + + + + Asset Maintenance Component Site Configuration File @@ -60,7 +60,7 @@ - + diff --git a/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml b/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml index 090ee528ab..6871b0ba80 100644 --- a/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml +++ b/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml @@ -8,9 +8,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -22,7 +22,7 @@ Open For Business - Asset Maintenance Asset Management component of the Open For Business Project - + webSiteId ASSETMAINT @@ -37,7 +37,7 @@ localDispatcherName assetmaint A unique name used to identify/recognize the local dispatcher for the Service Engine - + mainDecoratorLocation component://assetmaint/widget/CommonScreens.xml @@ -78,18 +78,18 @@ redirectPath /control/main - + ContextFilter /* - + org.ofbiz.webapp.control.ControlEventListener org.ofbiz.webapp.control.LoginEventListener - + ControlServlet ControlServlet diff --git a/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl b/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl index 49c8a31056..72bf56358b 100644 --- a/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl +++ b/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl @@ -18,7 +18,7 @@ under the License. --> <#escape x as x?xml> - + <#-- Print FixedAsset Information --> @@ -51,7 +51,7 @@ under the License. <#if fixedAsset.locatedAtFacilityId?has_content> - + ${uiLabelMap.FormFieldTitle_locatedAtFacilityId} ${maintenance.facilityName?if_exists} @@ -66,7 +66,7 @@ under the License. <#-- End Print FixedAsset Information --> - + <#-- Start Print FixedAsset Maintenance Information --> @@ -110,7 +110,7 @@ under the License. <#-- End Print FixedAsset Maintenance Information --> - + <#-- Start Print Maintenance Schedule Information --> @@ -166,7 +166,7 @@ under the License. ${uiLabelMap.AssetMaintItemIssuance} ${uiLabelMap.OrderQuantity} - + <#list itemIssuanceList as itemIssuance> @@ -180,7 +180,7 @@ under the License. - ${quantity} + ${quantity} @@ -193,7 +193,7 @@ under the License. ${uiLabelMap.WorkEffortNotes} - + <#list notes as note> @@ -203,7 +203,7 @@ under the License. Date : ${note.noteDateTime?string.short} <#escape x as x?html> ${note.noteInfo?if_exists} - + diff --git a/specialpurpose/assetmaint/webapp/assetmaint/error/error.jsp b/specialpurpose/assetmaint/webapp/assetmaint/error/error.jsp index ba5a349b8d..123c910fb3 100644 --- a/specialpurpose/assetmaint/webapp/assetmaint/error/error.jsp +++ b/specialpurpose/assetmaint/webapp/assetmaint/error/error.jsp @@ -33,12 +33,12 @@ under the License.
    - - + - + diff --git a/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/controller.xml b/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/controller.xml index 7db440fc0d..19d731e74b 100644 --- a/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/controller.xml +++ b/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/controller.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -21,10 +21,10 @@ - - - - + + + + Information Systems Management Component Site Configuration File @@ -37,12 +37,12 @@ - + - + @@ -56,7 +56,7 @@ - + @@ -74,21 +74,20 @@ - + - - + + - + - - - - - + + + + + - \ No newline at end of file diff --git a/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml b/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml index a6c71327dd..98ae6c9ec4 100644 --- a/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml +++ b/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml @@ -8,9 +8,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -22,7 +22,7 @@ Open For Business - Information Systems Information Systems Management application of the Open For Business Project - + webSiteId ISMGR @@ -37,7 +37,7 @@ localDispatcherName ismgr A unique name used to identify/recognize the local dispatcher for the Service Engine - + mainDecoratorLocation component://assetmaint/widget/ismgr/CommonScreens.xml @@ -78,18 +78,18 @@ redirectPath /control/main - + ContextFilter /* - + org.ofbiz.webapp.control.ControlEventListener org.ofbiz.webapp.control.LoginEventListener - + ControlServlet ControlServlet diff --git a/specialpurpose/assetmaint/webapp/ismgr/error/error.jsp b/specialpurpose/assetmaint/webapp/ismgr/error/error.jsp index ba5a349b8d..123c910fb3 100644 --- a/specialpurpose/assetmaint/webapp/ismgr/error/error.jsp +++ b/specialpurpose/assetmaint/webapp/ismgr/error/error.jsp @@ -33,12 +33,12 @@ under the License. -
    +
    :ERROR MESSAGE:
    <%=UtilFormatOut.replaceString(errorMsg, "\n", "
    ")%>
    - - + - + diff --git a/specialpurpose/assetmaint/widget/AssetmaintScreens.xml b/specialpurpose/assetmaint/widget/AssetmaintScreens.xml index 5d8f1c0e00..598cfa40ca 100644 --- a/specialpurpose/assetmaint/widget/AssetmaintScreens.xml +++ b/specialpurpose/assetmaint/widget/AssetmaintScreens.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -18,14 +18,14 @@ under the License. --> -
    - + @@ -250,7 +250,7 @@
    - +
    diff --git a/specialpurpose/assetmaint/widget/CommonScreens.xml b/specialpurpose/assetmaint/widget/CommonScreens.xml index 5c7eaf6119..be645e0b3c 100644 --- a/specialpurpose/assetmaint/widget/CommonScreens.xml +++ b/specialpurpose/assetmaint/widget/CommonScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -37,7 +37,7 @@ under the License. then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. --> - + @@ -130,7 +130,7 @@ under the License. -
    + @@ -138,4 +138,4 @@ under the License.
    - + diff --git a/specialpurpose/assetmaint/widget/FacilityScreens.xml b/specialpurpose/assetmaint/widget/FacilityScreens.xml index e16f111a34..2c1f03c482 100644 --- a/specialpurpose/assetmaint/widget/FacilityScreens.xml +++ b/specialpurpose/assetmaint/widget/FacilityScreens.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -41,7 +41,7 @@ - + @@ -31,9 +31,8 @@ under the License. - + - \ No newline at end of file diff --git a/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl b/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl index 15c6d80bdf..e58fc9496b 100644 --- a/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl +++ b/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl @@ -38,7 +38,7 @@ under the License. - + diff --git a/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl b/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl index b7f549ed78..4183fcf567 100644 --- a/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl +++ b/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> - +

    What's new?

    @@ -34,11 +34,11 @@ under the License.

    Introduction: What is Apache OFBiz?

    -

    The Apache Open For Business Project is an open source enterprise +

    The Apache Open For Business Project is an open source enterprise automation software project licensed under the Apache License Version 2.0. By open source enterprise automation we mean: - Open Source ERP, Open Source CRM, Open Source E-Business / E-Commerce, Open Source SCM, Open Source MRP, + Open Source ERP, Open Source CRM, Open Source E-Business / E-Commerce, Open Source SCM, Open Source MRP, Open Source CMMS/EAM, and so on.

    - +

    Apache OFBiz is a foundation and starting point for enterprise solutions, be they for one organization or one million. OFBiz can certainly be used OOTB (out of the box), but if you're looking for something that works really well for that there are many open source projects that do a great job there. OFBiz is great for creating specialized applications for use OOTB by other organizations. @@ -47,7 +47,7 @@ under the License.

    Being open source under the Apache 2.0 license and driven by a community Apache OFBiz offers both flexibility by design and by access to code, and a solution where you're not alone but rather can work with many others to get things done.

    - +

    For answers to your questions you might find the following documents useful: Project Overview, Is Apache OFBiz for Me?, @@ -57,7 +57,7 @@ under the License.

    For more technical information, see the Documentation page.

    - +

    Apache OFBiz offers a great deal of functionality, including:

    • advanced e-commerce
    • @@ -82,9 +82,9 @@ under the License.

      Who is Using Apache OFBiz?

      - +

      It's hard to say who and how many organizations are using Apache OFBiz because you don't have to tell us when you use it, but there are lots of public sites and we've listed some of them for you here.

      - +

      Products based on Apache OFBiz: Codesquare Helix @@ -98,7 +98,7 @@ under the License. XtraMind Mietta 2

      - +

      A selection of public sites (mostly, but not all, ecommerce) using Apache OFBiz: ***1-800-Flowers.com ***Action Envelope @@ -134,7 +134,7 @@ under the License.

      For a more complete list of sites see the Apache OFBiz User List page.

      -
      + - -
      + +

      Old Announcements and News

      Announcements

      - +

      Check out the presentation on Apache OFBiz at JavaOne by Ean Scheussler of Brainfood and David Jones of HotWax Media: Session TS-7900, Apache OFBiz: Real-World Open Source Java Platform ERP. It was on Wednesday May 9th, 2007 at 4:10 PM.

      - +

      Apache OFBiz is now officially a TLP (top level project) at the Apache Software Foundation! See the details here.

      - +

      The 2006 OFBiz Users Conference turned out Great! The video recordings are available here.

      The 2006 Open For Business Users Conference was held in Ephraim, UT, USA on the 3rd and 4th of November, 2006. Special thanks to Automation Groups for hosting the conference this year.

      - +

      Apache OFBiz had an exhibit booth and BoF session at the upcoming OSCON show in Portland, OR on 26-28 July 2006. For details see the mailing list announcement here.

      @@ -184,33 +184,33 @@ under the License.

      Free Training Videos are now available that offer an introduction to the Apache OFBiz Framework, based on the example component. They can be downloaded here.

      - +

      The 2005 OFBiz Users Conference turned out Great! The video recordings are available here.

      - +

      The 2005 Open For Business Users Conference was held in St. Louis, MO, USA on the 21st and 22nd of July, 2005. Special thanks to Contegix for hosting the conference this year. - Hotwax Media teamed up with Contegix to offer 2 days of training prior to the conference (on July 19-20). - For details and registration information please see the official announcement on the OFBiz Users mailing list, + Hotwax Media teamed up with Contegix to offer 2 days of training prior to the conference (on July 19-20). + For details and registration information please see the official announcement on the OFBiz Users mailing list, and the preview/update with more information about what you'll see there.

      Also see the latest update on the 2005 OFBiz Users Conference with detailed session information and everything you need to know to attend.

      - +

      New Case Study from Integral Business Solutions about their projects based on Apache OFBiz, especially recent work they have done for the US Air Force. Download the complete document here.

      - +

      Apache OFBiz Basic Production Setup document Now Available: Apache OFBiz Production Setup Guide. - This is a free download meant to help you get going with Apache OFBiz. It is sponsored by - Hotwax Media and + This is a free download meant to help you get going with Apache OFBiz. It is sponsored by + Hotwax Media and Integral Business Solutions.

      - +

      New Success Story Article about OFBiz on java.net: Read it here.

      - +

      The 2004 Open For Business Users Conference was held in Minneapolis, MN, USA on the 27th and 28th of May, 2004. It was hosted by Integral Business Solutions @@ -223,7 +223,7 @@ under the License. discussion and presentation of new and stable features in OFBiz. For more information, see the Conference Videos page.

      - +

      News

      2005-11-18 "The Case for Open-Source ERP" on eWeek Channel Insider

      2005-09-06 "Open Source Offers ERP Alternative" on eWeek Channel Insider

      @@ -246,6 +246,6 @@ under the License.
      -
       
      +
       
      diff --git a/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl b/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl index 24482bc942..d93f3c7b7e 100644 --- a/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl +++ b/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl @@ -32,7 +32,7 @@ under the License. Conference Videos Framework Intro Videos - +

      Demo Sites

      Trunk Demo

      eCommerce Demo @@ -43,14 +43,14 @@ under the License. Management Apps

      Other Demos

      Alternative Demo Servers - +

      Download OFBiz

      Getting Started (Read this first) Copyright & License Source Access (Recommended) Nightly Builds (Ready to use) - +

      Resources & Tools

      Main Documentation Page Mailing Lists @@ -75,12 +75,12 @@ under the License. The Old SourceForge.net Site Apache Incubator Status --> - +

      Apache OFBiz Related Blogs

      Open Source Business and Open For Business by David E. Jones What's New in OFBiz by Si Chen - +

      Apache OFBiz Communities

      Locales

      - - + OFBiz: CMS Site Controller Configuration File diff --git a/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml b/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml index 1534d73fce..b36c05db74 100644 --- a/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml +++ b/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml @@ -49,7 +49,7 @@ under the License. component://cmssite/widget/CmssiteScreens.xml The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files. - + ContextFilter ContextFilter @@ -69,40 +69,40 @@ under the License. redirectPath /cms/cms - + ContextFilter /* - - + + org.ofbiz.webapp.control.ControlEventListener org.ofbiz.webapp.control.LoginEventListener - + ControlServlet ControlServlet Main Control Servlet org.ofbiz.webapp.control.ControlServlet 1 - - + + ControlServlet /cms/* - - + + - 60 + 60 index.jsp index.html index.htm - + diff --git a/specialpurpose/cmssite/webapp/cmssite/error/error.jsp b/specialpurpose/cmssite/webapp/cmssite/error/error.jsp index ba5a349b8d..123c910fb3 100644 --- a/specialpurpose/cmssite/webapp/cmssite/error/error.jsp +++ b/specialpurpose/cmssite/webapp/cmssite/error/error.jsp @@ -33,12 +33,12 @@ under the License.
    +
    :ERROR MESSAGE:
    <%=UtilFormatOut.replaceString(errorMsg, "\n", "
    ")%>
    - - + - + diff --git a/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml b/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml index c7875c9240..26c5f227b9 100644 --- a/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml +++ b/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/controller.xml @@ -18,10 +18,10 @@ specific language governing permissions and limitations under the License. --> - - + OFBiz: OFBiz Site Controller Configuration File @@ -47,7 +47,7 @@ under the License. - + diff --git a/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/web.xml b/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/web.xml index 99d10eebdc..042a0eee19 100644 --- a/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/web.xml +++ b/specialpurpose/cmssite/webapp/ofbizsite/WEB-INF/web.xml @@ -49,7 +49,7 @@ under the License. component://cmssite/widget/OfbizsiteScreens.xml The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files. - + ContextFilter ContextFilter @@ -69,40 +69,40 @@ under the License. redirectPath /cms/cms - + ContextFilter /* - - + + org.ofbiz.webapp.control.ControlEventListener org.ofbiz.webapp.control.LoginEventListener - + ControlServlet ControlServlet Main Control Servlet org.ofbiz.webapp.control.ControlServlet 1 - - + + ControlServlet /cms/* - - + + - 60 + 60 index.jsp index.html index.htm - + diff --git a/specialpurpose/cmssite/webapp/ofbizsite/error/error.jsp b/specialpurpose/cmssite/webapp/ofbizsite/error/error.jsp index ba5a349b8d..123c910fb3 100644 --- a/specialpurpose/cmssite/webapp/ofbizsite/error/error.jsp +++ b/specialpurpose/cmssite/webapp/ofbizsite/error/error.jsp @@ -33,12 +33,12 @@ under the License. @@ -380,8 +380,8 @@ under the License. - -<#-- ========================================================================================================================== --> + +<#-- ========================================================================================================================== -->
    ${uiLabelMap.EcommerceStep} 3: ${uiLabelMap.PageTitleShippingOptions}
    +
    :ERROR MESSAGE:
    <%=UtilFormatOut.replaceString(errorMsg, "\n", "
    ")%>
    - - + - + diff --git a/specialpurpose/cmssite/webapp/ofbizsite/images/ofbws.css b/specialpurpose/cmssite/webapp/ofbizsite/images/ofbws.css index 00ed079185..a306d95967 100644 --- a/specialpurpose/cmssite/webapp/ofbizsite/images/ofbws.css +++ b/specialpurpose/cmssite/webapp/ofbizsite/images/ofbws.css @@ -13,22 +13,22 @@ A { color: #4B107E; } -A:hover { +A:hover { color: #000000; text-decoration: underline; } UL { -margin-top: 0; +margin-top: 0; margin-bottom: 0; } DIV.endcolumns { clear: both; font-size: 1px; -} +} -.main-logo { +.main-logo { height: 30px; border: 0; } @@ -95,7 +95,7 @@ width: 210px; #link-column h2 { margin: 0px 0px 0px 0px; -padding: 6px 4px 6px 4px; +padding: 6px 4px 6px 4px; /*background: #CDDADC;*/ color: black; font-family: Arial, Verdana, Helvetica, sans-serif; diff --git a/specialpurpose/cmssite/widget/CmssiteScreens.xml b/specialpurpose/cmssite/widget/CmssiteScreens.xml index 3b5d6909b7..8da2d92d15 100644 --- a/specialpurpose/cmssite/widget/CmssiteScreens.xml +++ b/specialpurpose/cmssite/widget/CmssiteScreens.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -54,7 +54,7 @@ - +
    @@ -82,6 +82,6 @@
    - - + + \ No newline at end of file diff --git a/specialpurpose/cmssite/widget/OfbizsiteScreens.xml b/specialpurpose/cmssite/widget/OfbizsiteScreens.xml index 4d294ecc58..3a092a429c 100644 --- a/specialpurpose/cmssite/widget/OfbizsiteScreens.xml +++ b/specialpurpose/cmssite/widget/OfbizsiteScreens.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -45,8 +45,8 @@ - - + +
    @@ -60,6 +60,6 @@
    - - + + \ No newline at end of file diff --git a/specialpurpose/component-load.xml b/specialpurpose/component-load.xml index 18e435d9ab..7aba63751c 100644 --- a/specialpurpose/component-load.xml +++ b/specialpurpose/component-load.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - diff --git a/specialpurpose/ebay/build.xml b/specialpurpose/ebay/build.xml index 8821e99291..3e26e1b071 100644 --- a/specialpurpose/ebay/build.xml +++ b/specialpurpose/ebay/build.xml @@ -44,7 +44,7 @@ under the License. - + @@ -62,7 +62,7 @@ under the License. diff --git a/specialpurpose/ebay/config/ebayExport.properties b/specialpurpose/ebay/config/ebayExport.properties index cd411256ab..9992ddbefd 100644 --- a/specialpurpose/ebay/config/ebayExport.properties +++ b/specialpurpose/ebay/config/ebayExport.properties @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/specialpurpose/ebay/ofbiz-component.xml b/specialpurpose/ebay/ofbiz-component.xml index c8c25f85d9..635aeef58b 100644 --- a/specialpurpose/ebay/ofbiz-component.xml +++ b/specialpurpose/ebay/ofbiz-component.xml @@ -29,7 +29,7 @@ under the License. - + eBay Component Services OFBiz - 1.0 - - + 1.0 + + Export products to eBay @@ -55,8 +55,8 @@ under the License. - - + + Import Orders Search from eBay @@ -65,7 +65,7 @@ under the License. - + Import Order from eBay @@ -95,7 +95,7 @@ under the License. - + Complete Order to eBay diff --git a/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy b/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy index 2d9c517b39..7e1d9f7362 100644 --- a/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy +++ b/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml b/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml index 6b1c411bcc..27f3423567 100644 --- a/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml +++ b/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml @@ -20,7 +20,7 @@ under the License. - + eBay Component Site Configuration File @@ -28,31 +28,31 @@ under the License. - + - + - + - + - + @@ -60,7 +60,7 @@ under the License. - + diff --git a/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml b/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml index 8af6cf91a4..8ad64da470 100644 --- a/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml +++ b/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml @@ -22,7 +22,7 @@ under the License. Open For Business - Ebay eBay component of the Open For Business Project - + webSiteId EBAY @@ -37,7 +37,7 @@ under the License. localDispatcherName ebay A unique name used to identify/recognize the local dispatcher for the Service Engine - + mainDecoratorLocation component://ebay/widget/EbayScreens.xml @@ -63,16 +63,16 @@ under the License. redirectPath /control/main - + ContextFilter /* - + org.ofbiz.webapp.control.ControlEventListener org.ofbiz.webapp.control.LoginEventListener - + ControlServlet ControlServlet diff --git a/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl b/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl index 3c87f74ff5..792748743b 100644 --- a/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl +++ b/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl @@ -21,7 +21,7 @@ under the License. document.forms["ProductsExportToEbay"].action = "<@ofbizUrl>ProductsExportToEbay?categoryCode="+categ+""; document.forms["ProductsExportToEbay"].submit(); } - + function activateSubmitButton() { categ = document.forms["ProductsExportToEbay"].ebayCategory.value; if (categ != null && categ.substring(0, 1) == 'Y') { @@ -29,7 +29,7 @@ under the License. } else { document.forms["ProductsExportToEbay"].submitButton.disabled = true; } - } + }
    diff --git a/specialpurpose/ebay/widget/EbayForms.xml b/specialpurpose/ebay/widget/EbayForms.xml index fb457e7cff..4ba791cf8d 100644 --- a/specialpurpose/ebay/widget/EbayForms.xml +++ b/specialpurpose/ebay/widget/EbayForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - diff --git a/specialpurpose/ebay/widget/EbayScreens.xml b/specialpurpose/ebay/widget/EbayScreens.xml index 339798ef33..a45973cda9 100644 --- a/specialpurpose/ebay/widget/EbayScreens.xml +++ b/specialpurpose/ebay/widget/EbayScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -40,12 +40,12 @@ under the License. - +
    - + @@ -67,7 +67,7 @@ under the License. - + @@ -82,7 +82,7 @@ under the License.
    - + @@ -94,7 +94,7 @@ under the License.
    - +
    @@ -118,7 +118,7 @@ under the License.
    - +
    @@ -130,7 +130,7 @@ under the License. - + @@ -309,7 +309,7 @@ ${virtualJavaScript?if_exists}
    - + <#-- for prices: - if price < competitivePrice, show competitive or "Compare At" price - if price < listPrice, show list price @@ -427,9 +427,9 @@ ${virtualJavaScript?if_exists} <#list featureList as feature> <#if feature_index == 0>
    ${feature.description}: @@ -441,13 +441,13 @@ ${virtualJavaScript?if_exists} ${uiLabelMap.OrderAddToCart}   -
    +
    ${uiLabelMap.CommonQuantity}:  ${uiLabelMap.OrderAddToCart}   -
    + <#if !product.virtualVariantMethodEnum?exists || product.virtualVariantMethodEnum == "VV_VARIANTTREE"> <#if variantTree?exists && (variantTree.size() > 0)> @@ -468,7 +468,7 @@ ${virtualJavaScript?if_exists}
    ${uiLabelMap.ProductItemOutOfStock}.
    <#assign inStock = false> - + <#else> <#assign isStoreInventoryNotAvailable = !(Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryAvailable(request, product, 1.0))> @@ -497,7 +497,7 @@ ${virtualJavaScript?if_exists} <#assign hiddenStyle = "visible"> <#else> <#assign hiddenStyle = "hidden"> - +
    ${uiLabelMap.CommonAmount}:  diff --git a/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl b/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl index 848ea5b9b8..318ac38cae 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl @@ -27,7 +27,7 @@ under the License. <#else> <#assign categoryName = category.categoryName?if_exists> - <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists> + <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists> <#assign categoryDescription = catContentWrappers[category.productCategoryId].get("DESCRIPTION")> <#else> <#assign categoryDescription = category.description?if_exists> diff --git a/specialpurpose/ecommerce/webapp/ecommerce/content/ContentForms.xml b/specialpurpose/ecommerce/webapp/ecommerce/content/ContentForms.xml index 34fb909e0e..bf0695ad11 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/content/ContentForms.xml +++ b/specialpurpose/ecommerce/webapp/ecommerce/content/ContentForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -26,15 +26,15 @@ under the License. -
    - + diff --git a/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl b/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl index 1b7d47e301..1e9114c93d 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl @@ -42,7 +42,7 @@ under the License. [${content.contentId?if_exists}] <#if searchOn?has_content && searchOn?lower_case == "true">   - ${uiLabelMap.CommonSearch} + ${uiLabelMap.CommonSearch} diff --git a/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl b/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl index 4dffb9f809..0d2f656cc7 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl @@ -21,11 +21,11 @@ under the License. <#assign siteId = requestParameters.contentId?if_exists /> <@renderAncestryPath trail=ancestorList?default([]) endIndexOffset=1 siteId=siteId searchOn="true"/> - + <#if ancestorList?has_content && (0 < ancestorList?size) > <#assign lastContent=ancestorList?last />

    [${lastContent.contentId}] ${lastContent.description} - ${uiLabelMap.CommonSearch} + ${uiLabelMap.CommonSearch}

    @@ -59,16 +59,16 @@ under the License. <#macro renderCategoryBrowse contentId="" indentIndex=0 nodeTrail=[] viewSz=9999 viewIdx=0> - + <#local contentIdx = contentId?if_exists /> <#if (!contentIdx?exists || contentIdx?length == 0)> <#local contentIdx = page.contentIdx?if_exists /> <#if (!contentIdx?exists || contentIdx?length == 0)> - + <#local thisContentId=nodeTrail[indentIndex]?if_exists/> - + <#local thisNodeTrailCsv = "" /> <#local listUpper = (indentIndex - 1) /> <#if nodeTrail?size < listUpper > @@ -80,7 +80,7 @@ under the License. <#local thisNodeTrailCsv = thisNodeTrailCsv + nodeTrail[idx]> - + @@ -89,8 +89,8 @@ under the License. <#local thisCsv=thisNodeTrailCsv + "," + subContentId /> ${uiLabelMap.CommonView} ${content.description?if_exists}
    - - + + <@loopSubContent contentId=contentIdx viewIndex=viewIdx viewSize=viewSz returnAfterPickWhen="1==1" orderBy="contentName"> <#local plusMinus="+"/> diff --git a/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl b/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl index f2284b092d..852b5eb614 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl @@ -123,7 +123,7 @@ under the License. [${content.contentId?if_exists}] <#if searchOn?has_content && searchOn?lower_case == "true">   - ${uiLabelMap.CommonSearch} + ${uiLabelMap.CommonSearch} diff --git a/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl b/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl index 0339280699..567b766eb6 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl @@ -33,7 +33,7 @@ under the License.
    ${uiLabelMap.CommonDescription}
    - + <#list supplierProductList as supplierProduct> <#assign product = supplierProduct.getRelatedOneCache("Product")/> diff --git a/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl b/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl index 46f49ff82b..a868eb9adc 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl @@ -34,7 +34,7 @@ under the License.
    - +
    diff --git a/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl b/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl index 8fd0569500..e86dd4832f 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl @@ -35,7 +35,7 @@ under the License.
    - +
    diff --git a/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl b/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl index df1a9d6034..33de268cc0 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl @@ -34,7 +34,7 @@ under the License.
    - +
    @@ -73,7 +73,7 @@ under the License. - +
    <#if shipToTelecomNumber?has_content>
    @@ -91,7 +91,7 @@ under the License. - -
    -
    +
    ${uiLabelMap.EcommerceMyDefaultBillingAddress} diff --git a/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl b/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl index 0f75787838..2b9c59c15e 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl @@ -27,7 +27,7 @@ under the License. <#-- Add address --> +
    diff --git a/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl b/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl index 3a6dab60ed..0ce67533c5 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl @@ -69,26 +69,26 @@ under the License.

    -
    +
     ${uiLabelMap.OrderShippingInformation}
    -
    +
    -
    +
    -
    +
    -
    +
    @@ -111,7 +111,7 @@ under the License.
    -
    +
    @@ -129,7 +129,7 @@ under the License.
    checked/>  ${uiLabelMap.FacilityBillingAddressSameShipping}
    -
    +
    @@ -138,11 +138,11 @@ under the License.
    -
    +
    -
    +
    @@ -150,7 +150,7 @@ under the License.
    -
    +
    @@ -189,7 +189,7 @@ under the License. -
    - +
    diff --git a/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl b/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl index e1a0c393e9..5eb93628cc 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl @@ -139,7 +139,7 @@ under the License. <#else> - + <#if !cartLine.getIsPromo()> @@ -166,7 +166,7 @@ under the License. <#assign itemCount = itemCount + 1> - + @@ -209,7 +209,7 @@ under the License. - + <#-- ========================================================================================================================== -->
    ${uiLabelMap.EcommerceStep} 2: ${uiLabelMap.FacilityShipping}
    @@ -230,7 +230,7 @@ under the License.
    +
    :ERROR MESSAGE:
    <%=UtilFormatOut.replaceString(errorMsg, "\n", "
    ")%>
       
      - <#list partyContactMechValueMap.partyContactMechPurposes?if_exists as partyContactMechPurpose> + <#list partyContactMechValueMap.partyContactMechPurposes?if_exists as partyContactMechPurpose> <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
    <#if contactMechPurposeType?exists> @@ -494,7 +494,7 @@ under the License.
    - - + - + diff --git a/specialpurpose/ecommerce/webapp/ecommerce/forum/ForumForms.xml b/specialpurpose/ecommerce/webapp/ecommerce/forum/ForumForms.xml index 7c8766bdfd..4a0de19c85 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/forum/ForumForms.xml +++ b/specialpurpose/ecommerce/webapp/ecommerce/forum/ForumForms.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -172,14 +172,14 @@ under the License. -
    - + @@ -718,6 +718,6 @@ under the License.
    - +
    diff --git a/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl b/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl index 075e632f1d..e7428c1446 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl @@ -33,7 +33,7 @@ under the License. <#if counter < len> ${indent} ${pair[0]?if_exists} - ${pair[1]?if_exists} - ${uiLabelMap.CommonView}
    + ${uiLabelMap.CommonView}
    <#assign indent = indent + "    "> <#else>
    @@ -41,7 +41,7 @@ under the License. <#assign counter = counter + 1> - + <#if dataResourceId?exists>
    diff --git a/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl b/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl index c5df6f8ee3..ef6a2f0a1c 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl @@ -42,7 +42,7 @@ under the License. <#if thisNode?has_content> <#assign thisOwnerContentId=thisNode.value.ownerContentId?if_exists/> - + <#assign userLoginId=""/> <#if content?has_content && content.createdByUserLogin?has_content> <#assign userLoginId=content.createdByUserLogin/> diff --git a/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl b/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl index 094f8cb347..9df7d034ac 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl @@ -23,7 +23,7 @@ under the License. <#--
    == viewIndex: ${viewIndex} ==viewSize: ${viewSize} ==lowIndex: ${lowIndex}== highIndex: ${highIndex} == ListSize: ${listSize}--> <#if forumMessages?has_content && forumMessages?size gt 0> <#assign listSize = forumMessages?size/> - <#if highIndex gt listSize><#assign highIndex = listSize> + <#if highIndex gt listSize><#assign highIndex = listSize>
    <#assign r = listSize / viewSize /> <#assign viewIndexMax = Static["java.lang.Math"].ceil(r)> diff --git a/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl b/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl index 3a26552d3c..bd8e58d6e2 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl @@ -27,7 +27,7 @@ under the License. - +
    diff --git a/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl b/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl index f368cb5311..e65c6a6d82 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl @@ -25,7 +25,7 @@ under the License. <#assign contentId = rsp.contentId> <#else> <#assign contentId = forumMessage.contentId> - +
    ${uiLabelMap.CommonTitle}: ${forumMessage.contentName?if_exists} ${uiLabelMap.CommonBy}:${forumMessage.createdByUserLogin?if_exists} ${uiLabelMap.CommonAt}: ${forumMessage.createdDate?if_exists.toString().substring(0,16)} ${uiLabelMap.CommonView} diff --git a/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl b/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl index 836b485621..ac8cceb4fd 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl @@ -39,7 +39,7 @@ under the License.
    <@injectNodeTrailCsv subContentId=content.contentId redo="true" contentAssocTypeId="PUBLISH_LINK"> - + <#assign itemCount = 0> <#list shoppingCart.items() as cartLine> @@ -100,8 +100,8 @@ under the License.
    +
    :ERROR MESSAGE:
    <%=UtilFormatOut.replaceString(errorMsg, "\n", "
    ")%>
    ${uiLabelMap.CommonName}:${content.contentName} - ${uiLabelMap.CommonView} + ${uiLabelMap.CommonView} ${uiLabelMap.CommonSubmitted}: diff --git a/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl b/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl index fc5e0aba2d..bcabdc8510 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl @@ -75,7 +75,7 @@ under the License. <@loopSubContent contentAssocTypeId="RESPONSE" contentId=subContentId mapKey="" pickWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\") && mapKey == null" followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\")"> - <@traverseSubContentCache contentAssocTypeId="RESPONSE" + <@traverseSubContentCache contentAssocTypeId="RESPONSE" pickWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\")" followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\")" wrapTemplateId="" @@ -123,7 +123,7 @@ under the License. <#assign currentValue=currentNode.value/> <#if currentValue?exists> <@wrapSubContentCache subContentId=currentValue.contentId wrapTemplateId="WRAP_ARTICLE" > - <@traverseSubContentCache contentAssocTypeId="SUB_CONTENT" + <@traverseSubContentCache contentAssocTypeId="SUB_CONTENT" pickWhen="mapKey != null && mapKey.equals(\"ARTICLE\")" returnAfterPickWhen="mapKey != null && mapKey.equals(\"ARTICLE\")" followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"_never_\")" diff --git a/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl b/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl index 5783149126..61b9f6391a 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl @@ -70,7 +70,7 @@ under the License. <@loopSubContent contentAssocTypeId="RESPONSE" contentId=subContentId mapKey="" pickWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\") && mapKey == null" followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\")"> - <@traverseSubContentCache contentAssocTypeId="RESPONSE" + <@traverseSubContentCache contentAssocTypeId="RESPONSE" pickWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\")" followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\")" wrapTemplateId=""> @@ -121,7 +121,7 @@ under the License. <#assign currentValue=currentNode.value/> <#if currentValue?exists> <@wrapSubContentCache subContentId=currentValue.contentId wrapTemplateId="WRAP_ARTICLE" > - <@traverseSubContentCache contentAssocTypeId="SUB_CONTENT" + <@traverseSubContentCache contentAssocTypeId="SUB_CONTENT" pickWhen="mapKey != null && mapKey.equals(\"ARTICLE\")" returnAfterPickWhen="mapKey != null && mapKey.equals(\"ARTICLE\")" followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"_never_\")" diff --git a/specialpurpose/ecommerce/webapp/ecommerce/images/blog.css b/specialpurpose/ecommerce/webapp/ecommerce/images/blog.css index f028d7a344..a59dadacf4 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/images/blog.css +++ b/specialpurpose/ecommerce/webapp/ecommerce/images/blog.css @@ -118,7 +118,7 @@ font-size: 1.0em; } .blogtext:hover { -background: #fffeee; +background: #fffeee; } .blogtitle, A.blogtitle { diff --git a/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js b/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js index f969db7f32..9eba3ce7c1 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js +++ b/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -26,8 +26,8 @@ Event.observe(window, 'load', function() { var validateCart = new Validation('cartForm', {immediate: true, onSubmit: false}); var validateShip = new Validation('shippingForm', {immediate: true, onSubmit: false}); var validateShipOption = new Validation('shippingOptionForm', {immediate: true, onSubmit: false}); - var validateBill = new Validation('billingForm', {immediate: true, onSubmit: false}); - + var validateBill = new Validation('billingForm', {immediate: true, onSubmit: false}); + // Goto Edit Cart Panel Event.observe($('openCartPanel'), 'click', function() { showEditCartPanel(); @@ -43,11 +43,11 @@ Event.observe(window, 'load', function() { showEditShippingOptionPanel(); } Effect.Fade('processingShippingOptions', {duration: 0.0}); - Effect.Appear('savePartyAndShippingContact', {duration: 0.0}); + Effect.Appear('savePartyAndShippingContact', {duration: 0.0}); } }); - // Goto Edit Shipping panel + // Goto Edit Shipping panel Event.observe($('updateShoppingCart'), 'click', function() { if (validateCart.validate()) { showEditShippingPanel(); @@ -56,7 +56,7 @@ Event.observe(window, 'load', function() { // Goto Edit Shipping Panel Event.observe($('openShippingPanel'), 'click', function() { showEditShippingPanel(); - setShippingOption(); + setShippingOption(); }); // Set Shipping Method to card and goto Billing step @@ -66,8 +66,8 @@ Event.observe(window, 'load', function() { if (setShippingOption()){ showEditBillingPanel(); } - Effect.Fade('processingBilling', {duration: 0.0}); - Effect.Appear('saveShippingMethod', {duration: 0.0}); + Effect.Fade('processingBilling', {duration: 0.0}); + Effect.Appear('saveShippingMethod', {duration: 0.0}); }); Event.observe($('openShippingOptionPanel'), 'click', function() { @@ -77,7 +77,7 @@ Event.observe(window, 'load', function() { // Billing Event.observe($('openBillingPanel'), 'click', function() { - showEditBillingPanel(); + showEditBillingPanel(); }); Event.observe($('savePaymentAndBillingContact'), 'click', function() { @@ -87,17 +87,17 @@ Event.observe(window, 'load', function() { if (processBillingAndPayment()) { showOrderSubmitPanel(); } - Effect.Fade('processingOrderSubmitPanel', {duration: 0.0}); + Effect.Fade('processingOrderSubmitPanel', {duration: 0.0}); Effect.Appear('savePaymentAndBillingContact', {duration: 0.0}); } }); - + // For Billing Address Same As Shipping Event.observe('useShippingAddressForBilling', 'click', function() { useShippingAddressForBillingToggle(); validateBill.validate(); }); - + // Initiate Observing Edit Cart Events initCartProcessObservers(); @@ -139,9 +139,9 @@ function getServerError(data) { }); } if (data._ERROR_MESSAGE_ != undefined) { - serverError = data._ERROR_MESSAGE_; + serverError = data._ERROR_MESSAGE_; } - return serverError; + return serverError; } // Begin Show/Hide Step panels @@ -162,7 +162,7 @@ function hideEditShippingOptionPanel() { if ($('editShippingOptionPanel').visible()) { Effect.BlindUp('editShippingOptionPanel', {duration: 0.0}); Effect.BlindDown('shippingOptionSummaryPanel', {duration: 0.0}); - } + } } function hideEditBillingPanel() { if ($('editBillingPanel').visible()) { @@ -174,8 +174,8 @@ function hideOrderSubmitPanel() { if ($('orderSubmitPanel').visible()) { Effect.BlindUp('orderSubmitPanel', {duration: 0.0}); Effect.Fade('processingOrderButton', {duration: 0.0}); - - } + + } } function showEditCartPanel() { @@ -235,7 +235,7 @@ function showOrderSubmitPanel() { hideEditShippingPanel(); hideEditShippingOptionPanel(); hideEditBillingPanel(); - Effect.BlindDown('orderSubmitPanel', {duration: 0.0}); + Effect.BlindDown('orderSubmitPanel', {duration: 0.0}); } } @@ -244,9 +244,9 @@ function showOrderSubmitPanel() { function createUpdateCustomerAndShippingAddress() { var result = false; - + new Ajax.Request('createUpdateShippingAddress', { - asynchronous: false, + asynchronous: false, onSuccess: function(transport) { var data = transport.responseText.evalJSON(true); var serverError = getServerError(data); @@ -292,7 +292,7 @@ function getShipOptions() { if (shipOption.productStoreShipMethId){ optionList.push(""); } else { - optionList.push(""); + optionList.push(""); } }); $('shipMethod').update(optionList); @@ -326,7 +326,7 @@ function setShippingOption() { //$('shippingDescription').value = data.shippingDescription; //$('shippingTotal').value = data.shippingTotal; //$('cartGrandTotal').value = data.cartGrandTotal; - //$('totalSalesTax').value = data.totalSalesTax; + //$('totalSalesTax').value = data.totalSalesTax; result = true; } }, parameters: $('shippingOptionForm').serialize(), requestHeaders: {Accept: 'application/json'} @@ -356,7 +356,7 @@ function useShippingAddressForBillingToggle() { function processBillingAndPayment() { var result = false; new Ajax.Request('createUpdateBillingAndPayment', { - asynchronous: false, + asynchronous: false, onSuccess: function(transport) { var data = transport.responseText.evalJSON(true); var serverError = getServerError(data); @@ -376,7 +376,7 @@ function processBillingAndPayment() { }, parameters: $('billingForm').serialize(), requestHeaders: {Accept: 'application/json'} }); return result; - + } function initCartProcessObservers() { @@ -395,12 +395,12 @@ function initCartProcessObservers() { }); if ($('initializedCompletedCartDiscount') != undefined && $('initializedCompletedCartDiscount').value == 0) { $('completedCartDiscountRow').hide(); - } + } } function addPromoCode() { new Ajax.Request('silentAddPromoCode', { - asynchronous: false, + asynchronous: false, onSuccess: function(transport) { var data = transport.responseText.evalJSON(true); var serverError = getServerError(data); @@ -421,7 +421,7 @@ function getProductLineItemIndex(event, productId) { var productIdParam = "productId=" + productId; var formValues = $('cartForm').serialize() + "&" + productIdParam; new Ajax.Request('getShoppingCartItemIndex', { - asynchronous: false, + asynchronous: false, onSuccess: function(transport) { var data = transport.responseText.evalJSON(true); itemIndex = data.itemIndex; @@ -439,7 +439,7 @@ function removeItem(event) { var productId = $(productIdElementId).value; var itemIndex = getProductLineItemIndex(event,productId); var formValues = "update_" + itemIndex + "= 0"; - updateCartData(qtyId, formValues, 0, itemIndex); + updateCartData(qtyId, formValues, 0, itemIndex); } function cartItemQtyChanged(event) { @@ -453,13 +453,13 @@ function cartItemQtyChanged(event) { var formValues = $('cartForm').serialize() + '&' + qtyParam; updateCartData(elementId, formValues, qtyElement.value, itemIndex); } else { - qtyElement.value = ""; + qtyElement.value = ""; } } function updateCartData(elementId, formValues, itemQty, itemIndex) { new Ajax.Request('cartItemQtyUpdate', { - asynchronous: true, + asynchronous: true, onSuccess: function(transport) { var data = transport.responseText.evalJSON(true); if (data.totalQuantity == 0) { @@ -470,7 +470,7 @@ function updateCartData(elementId, formValues, itemQty, itemIndex) { $('quickCheckoutEnabled').hide(); $('quickCheckoutDisabled').show(); $('onePageCheckoutEnabled').hide(); - $('onePageCheckoutDisabled').show(); + $('onePageCheckoutDisabled').show(); } else { // Used for edit cart $('microCartQuantity').update(data.totalQuantity); @@ -480,7 +480,7 @@ function updateCartData(elementId, formValues, itemQty, itemIndex) { $('cartTotalSalesTax').update(data.totalSalesTaxCurrencyFormatted); $('microCartTotal').update(data.displayGrandTotalCurrencyFormatted); $('cartDisplayGrandTotal').update(data.displayGrandTotalCurrencyFormatted); - // Used for summary + // Used for summary $('completedCartSubTotal').update(data.subTotalCurrencyFormatted); $('completedCartTotalShipping').update(data.totalShippingCurrencyFormatted); $('completedCartTotalSalesTax').update(data.totalSalesTaxCurrencyFormatted); @@ -543,7 +543,7 @@ function updateShippingSummary() { if ($F('shipToExtension')) { extension = "-" + $F('shipToExtension'); } - var shippingContactPhoneNumber = $F('shipToCountryCode')+ "-" + $F('shipToAreaCode') + var shippingContactPhoneNumber = $F('shipToCountryCode')+ "-" + $F('shipToAreaCode') + "-" + $F('shipToContactNumber') + extension; $('completedShipToAttn').update("Attn: " + fullName); $('completedShippingContactNumber').update(shippingContactPhoneNumber); diff --git a/specialpurpose/ecommerce/webapp/ecommerce/images/geoAutoCompleter.js b/specialpurpose/ecommerce/webapp/ecommerce/images/geoAutoCompleter.js index 271b79be32..ca285dca5e 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/images/geoAutoCompleter.js +++ b/specialpurpose/ecommerce/webapp/ecommerce/images/geoAutoCompleter.js @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -91,7 +91,7 @@ function setKeyAsParameter(text, li) { stateHiddenTarget.value = li.id; } -//Generic function for fetching country's associated state list. +//Generic function for fetching country's associated state list. function getAssociatedStateList(countryId, stateId, errorId, divId) { var optionList = []; new Ajax.Request("getAssociatedStateList", { @@ -118,7 +118,7 @@ function getAssociatedStateList(countryId, stateId, errorId, divId) { Effect.Appear(errorId, {duration: 0.0}); } }); - } + } } }); } \ No newline at end of file diff --git a/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js b/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js index 6a5642b6c9..1117f3af69 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js +++ b/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js @@ -70,11 +70,11 @@ Event.observe(window, 'load', function() { getAssociatedStateList('billToCountryGeoId', 'billToStateProvinceGeoId', 'advice-required-billToStateProvinceGeoId', 'billToStates'); }); if($('billToStateProvinceGeoId').value == "_NA_"){ - getAssociatedStateList('billToCountryGeoId', 'billToStateProvinceGeoId', 'advice-required-billToStateProvinceGeoId', 'billToStates'); + getAssociatedStateList('billToCountryGeoId', 'billToStateProvinceGeoId', 'advice-required-billToStateProvinceGeoId', 'billToStates'); } else { stateValue = $('billToStateProvinceGeoId').value; getAssociatedStateList('billToCountryGeoId', 'billToStateProvinceGeoId', 'advice-required-billToStateProvinceGeoId', 'billToStates'); - $('billToStateProvinceGeoId').value = stateValue; + $('billToStateProvinceGeoId').value = stateValue; } } if ($('editShipToPostalAddress')) { @@ -93,17 +93,17 @@ Event.observe(window, 'load', function() { }); /* - * This function is used for validation of Phone number with only 1 error message instead of multiple (for eg: required) on label. - * It takes following parameters :- - * 1) errorDivId : div to display error, + * This function is used for validation of Phone number with only 1 error message instead of multiple (for eg: required) on label. + * It takes following parameters :- + * 1) errorDivId : div to display error, * 2) focusedTextId : Text box, last focused, * 3) textToCheck1, textToCheck2 : Other text boxes to be check. - */ + */ function validatePhoneNumber(errorDivId, focusedTextId, textToCheck1, textToCheck2) { if (($(focusedTextId).value == "")) { Effect.Appear(errorDivId, {duration: 0.5}); } else if (($(textToCheck1).value != "") && ($(textToCheck2).value != "" )) { - Effect.Fade(errorDivId, {duration: 0.5}); + Effect.Fade(errorDivId, {duration: 0.5}); } } @@ -142,7 +142,7 @@ function useShippingAddressAsBillingToggle() { getAssociatedStateList('billToCountryGeoId', 'billToStateProvinceGeoId', 'advice-required-billToStateProvinceGeoId', 'billToStates'); $('billToStateProvinceGeoId').value = $F('shipToStateProvinceGeoId'); $('billToPostalCode').value = $F('shipToPostalCode'); - + $('billToAddress1').disabled = true ; $('billToAddress2').disabled = true ; $('billToCity').disabled = true ; @@ -168,7 +168,7 @@ function getServerError(data) { var serverError = ""; if (data._ERROR_MESSAGE_LIST_ != undefined) { serverErrorHash = data._ERROR_MESSAGE_LIST_; - + serverErrorHash.each(function(error) { if (error.message != undefined) { serverError += error.message; @@ -179,9 +179,9 @@ function getServerError(data) { } } if (data._ERROR_MESSAGE_ != undefined) { - serverError += data._ERROR_MESSAGE_; + serverError += data._ERROR_MESSAGE_; } - return serverError; + return serverError; } function inPlaceEditEmail(e) { @@ -223,7 +223,7 @@ function createPartyPostalAddress(e) { popupId = 'displayCreateAddressForm'; if (validateEditPostalAddress.validate()) { new Ajax.Request('createPartyPostalAddress', { - asynchronous: false, + asynchronous: false, onSuccess: function(transport) { var data = transport.responseText.evalJSON(true); var serverError = getServerError(data); @@ -249,7 +249,7 @@ function updatePartyPostalAddress(e) { popupId = 'displayEditAddressForm_' + contactMechId; if (validateEditPostalAddress.validate()) { new Ajax.Request('updatePartyPostalAddress', { - asynchronous: false, + asynchronous: false, onSuccess: function(transport) { var data = transport.responseText.evalJSON(true); var serverError = getServerError(data); @@ -274,7 +274,7 @@ function updatePartyShipToPostalAddress(e) { popupId = 'displayEditShipToPostalAddress'; if (validateEditPostalAddress.validate()) { new Ajax.Request('updatePartyPostalAddress', { - asynchronous: false, + asynchronous: false, onSuccess: function(transport) { var data = transport.responseText.evalJSON(true); var serverError = getServerError(data); @@ -299,7 +299,7 @@ function updatePartyBillToPostalAddress(e) { popupId = 'displayEditBillToPostalAddress'; if (validateEditPostalAddress.validate()) { new Ajax.Request('updatePartyPostalAddress', { - asynchronous: false, + asynchronous: false, onSuccess: function(transport) { var data = transport.responseText.evalJSON(true); var serverError = getServerError(data); @@ -400,16 +400,16 @@ function showState(id) { getAssociatedStateList('countryGeoId_'+id, 'stateProvinceGeoId_'+id, 'advice-required-stateProvinceGeoId_'+id, 'states_'+id); }); if ($('stateProvinceGeoId_'+id).value == "_NA_") { - getAssociatedStateList('countryGeoId_'+id, 'stateProvinceGeoId_'+id, 'advice-required-stateProvinceGeoId_'+id, 'states_'+id); + getAssociatedStateList('countryGeoId_'+id, 'stateProvinceGeoId_'+id, 'advice-required-stateProvinceGeoId_'+id, 'states_'+id); } else { var stateValue = $('stateProvinceGeoId_'+id).value; getAssociatedStateList('countryGeoId_'+id, 'stateProvinceGeoId_'+id, 'advice-required-stateProvinceGeoId_'+id, 'states_'+id); - $('stateProvinceGeoId_'+id).value = stateValue; + $('stateProvinceGeoId_'+id).value = stateValue; } } } function copyShipToCountryToBillToCountry(){ $('billToCountryGeoId').value = $F('shipToCountryGeoId'); - getAssociatedStateList('billToCountryGeoId', 'billToStateProvinceGeoId', 'advice-required-billToStateProvinceGeoId', 'billToStates'); + getAssociatedStateList('billToCountryGeoId', 'billToStateProvinceGeoId', 'advice-required-billToStateProvinceGeoId', 'billToStates'); } \ No newline at end of file diff --git a/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js b/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js index 6700a810e0..25be773bf2 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js +++ b/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js @@ -3,9 +3,9 @@ Event.observe(window, 'load', isValidElement); function isValidElement(element){ var validator = new Validation('quickAnonProcessCustomer', {immediate : true}); } - + Event.observe(window, 'load', function() { - Event.observe('useShippingPostalAddressForBilling', 'click', changeText2); + Event.observe('useShippingPostalAddressForBilling', 'click', changeText2); }); function changeText2(){ if($('useShippingPostalAddressForBilling').checked) { @@ -35,4 +35,4 @@ function changeText2(){ $('billToPostalCode').disabled = false; $('billToCountryGeoId').disabled = false; } -} \ No newline at end of file +} \ No newline at end of file diff --git a/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl b/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl index a15ff84b93..0abddebcf3 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl @@ -24,7 +24,7 @@ under the License. <#if title?has_content>${title}<#elseif titleProperty?has_content>${uiLabelMap.get(titleProperty)}</#if>: ${(productStore.storeName)?if_exists} <#if layoutSettings.shortcutIcon?has_content> <#assign shortcutIcon = layoutSettings.shortcutIcon/> - <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content> + <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content> <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON.get(0)/> <#if shortcutIcon?has_content> @@ -89,10 +89,10 @@ under the License. <#if metaKeywords?exists> - + <#if requireDojo?exists> + dojo.require("dojo.widget.*"); + diff --git a/specialpurpose/ecommerce/webapp/ecommerce/login.ftl b/specialpurpose/ecommerce/webapp/ecommerce/login.ftl index 385c4d049e..43551d0d34 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/login.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/login.ftl @@ -96,7 +96,7 @@ under the License.
    -
    + diff --git a/specialpurpose/ecommerce/webapp/ecommerce/makebogodata.jsp b/specialpurpose/ecommerce/webapp/ecommerce/makebogodata.jsp index 7849e23b23..5d1031d3b1 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/makebogodata.jsp +++ b/specialpurpose/ecommerce/webapp/ecommerce/makebogodata.jsp @@ -33,7 +33,7 @@ under the License. GenericValue prod1 = (GenericValue)prods.next(); KeywordIndex.indexKeywords(prod1); } - + if(request.getParameter("makeall") == null) { %>Just added the keywords from all existing product info.
    Create a LOT of products, categories, and keywords. diff --git a/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl b/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl index 1706b9c056..31bb61fc04 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl @@ -25,8 +25,8 @@ under the License.
    <#if shoppingCart?has_content && shoppingCart.size() gt 0>
    - -<#-- ========================================================================================================================== --> + +<#-- ========================================================================================================================== -->
    ${uiLabelMap.EcommerceStep} 1: ${uiLabelMap.PageTitleShoppingCart}
    ${uiLabelMap.EcommerceItemTotal}

    - -<#-- ============================================================= --> + +<#-- ============================================================= -->
    @@ -158,7 +158,7 @@ under the License.
    <@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency()/>
    <@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency()/>
    <@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency()/>

    ${uiLabelMap.CommonSubtotal}:
    ${uiLabelMap.EcommerceLocation}: -
    +
    @@ -241,7 +241,7 @@ under the License.
    - + <#-- ============================================================= -->
    - + <#-- ============================================================= --> - + <#-- ========================================================================================================================== -->
    ${uiLabelMap.EcommerceStep} 4: ${uiLabelMap.AccountingBilling}
    @@ -444,7 +444,7 @@ under the License.
    ${uiLabelMap.EcommerceLocation}: -
    +
    @@ -459,9 +459,9 @@ under the License.
    - -<#-- ============================================================= --> - + +<#-- ============================================================= --> + <#if billToTelecomNumber?has_content>
    - - - - - - + - + - + -
    <#else>
    - - - - - - + - + - + -
    - +
      +
    checked>${uiLabelMap.FacilityBillingAddressSameShipping}
    @@ -604,7 +604,7 @@ under the License.
    -
    +
    @@ -613,7 +613,7 @@ under the License.
    - +
    @@ -636,7 +636,7 @@ under the License.
    -
    +
    -
    +
    - + <#-- ========================================================================================================================== -->
    style="display: none;">
    diff --git a/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl b/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl index 566b849a26..6429065fdd 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl @@ -48,9 +48,9 @@ under the License. ${orderHeader.orderId}  - ${uiLabelMap.CommonInformation} - <#if (orderHeader.orderId)?exists> - ${externalOrder?if_exists} [ + ${uiLabelMap.CommonInformation} + <#if (orderHeader.orderId)?exists> + ${externalOrder?if_exists} [
    PDF ] @@ -86,7 +86,7 @@ under the License.
      - <#if orderHeader?has_content> + <#if orderHeader?has_content>
    ${localOrderReadHelper.getStatusString(locale)}
    <#else>
    ${uiLabelMap.OrderNotYetOrdered}
    @@ -121,7 +121,7 @@ under the License.
    - + <#if paymentMethods?has_content || paymentMethodType?has_content || billingAccount?has_content> <#-- order payment info -->
    @@ -135,20 +135,20 @@ under the License.
    -
    ${uiLabelMap.AccountingOfflinePayment}
    - <#if orderHeader?has_content && paymentAddress?has_content> +
    ${uiLabelMap.AccountingOfflinePayment}
    + <#if orderHeader?has_content && paymentAddress?has_content>

    ${uiLabelMap.OrderSendPaymentTo}:
    <#if paymentAddress.toName?has_content>
    ${paymentAddress.toName}
    <#if paymentAddress.attnName?has_content>
    ${uiLabelMap.PartyAddrAttnName}: ${paymentAddress.attnName}
    ${paymentAddress.address1}
    - <#if paymentAddress.address2?has_content>
    ${paymentAddress.address2}
    + <#if paymentAddress.address2?has_content>
    ${paymentAddress.address2}
    ${paymentAddress.city}<#if paymentAddress.stateProvinceGeoId?has_content>, ${paymentAddress.stateProvinceGeoId} ${paymentAddress.postalCode?if_exists} -
    ${paymentAddress.countryGeoId}
    +
    ${paymentAddress.countryGeoId}

    ${uiLabelMap.EcommerceBeSureToIncludeYourOrderNb}
    - -
    @@ -340,7 +340,7 @@ under the License. <#if shippingAddress.toName?has_content>${uiLabelMap.CommonTo}: ${shippingAddress.toName}
    <#if shippingAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}: ${shippingAddress.attnName}
    ${shippingAddress.address1}
    - <#if shippingAddress.address2?has_content>${shippingAddress.address2}
    + <#if shippingAddress.address2?has_content>${shippingAddress.address2}
    ${shippingAddress.city}<#if shippingAddress.stateProvinceGeoId?has_content>, ${shippingAddress.stateProvinceGeoId} ${shippingAddress.postalCode?if_exists}
    ${shippingAddress.countryGeoId?if_exists} @@ -388,7 +388,7 @@ under the License.
    <#if (orderShipmentInfoSummaryList?size > 1)>${orderShipmentInfoSummary.shipmentPackageSeqId}: Code: ${orderShipmentInfoSummary.trackingCode?default("[Not Yet Known]")} - <#if orderShipmentInfoSummary.boxNumber?has_content>${uiLabelMap.OrderBoxNumber}${orderShipmentInfoSummary.boxNumber} + <#if orderShipmentInfoSummary.boxNumber?has_content>${uiLabelMap.OrderBoxNumber}${orderShipmentInfoSummary.boxNumber} <#if orderShipmentInfoSummary.carrierPartyId?has_content>(${uiLabelMap.ProductCarrier}: ${orderShipmentInfoSummary.carrierPartyId})
    diff --git a/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl b/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl index cf5e2f0f96..9f7809b0a7 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl @@ -23,7 +23,7 @@ under the License.
     ${uiLabelMap.AccountingPaymentInformation}
    - + <#-- initial screen show a list of options --> diff --git a/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl b/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl index 8a38414247..a54a186c68 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl @@ -50,7 +50,7 @@ under the License. - +
    @@ -225,7 +225,7 @@ under the License.
    @@ -104,7 +104,7 @@ under the License. -  -  -  * - +
    @@ -327,7 +327,7 @@ under the License. -
    +
    diff --git a/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl b/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl index f167445490..4531f71e10 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl @@ -63,7 +63,7 @@ under the License.   - <#if orderHeader?has_content> + <#if orderHeader?has_content>
    ${localOrderReadHelper.getStatusString(locale)}
    <#else>
    ${uiLabelMap.OrderNotYetOrdered}
    @@ -135,7 +135,7 @@ under the License. <#if shippingAddress.toName?has_content>${uiLabelMap.CommonTo}: ${shippingAddress.toName}
    <#if shippingAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}: ${shippingAddress.attnName}
    ${shippingAddress.address1}
    - <#if shippingAddress.address2?has_content>${shippingAddress.address2}
    + <#if shippingAddress.address2?has_content>${shippingAddress.address2}
    ${shippingAddress.city}<#if shippingAddress.stateProvinceGeoId?has_content>, ${shippingAddress.stateProvinceGeoId} ${shippingAddress.postalCode?if_exists}
    ${shippingAddress.countryGeoId?if_exists} @@ -145,7 +145,7 @@ under the License.
    - ${screens.render("component://ecommerce/widget/OrderScreens.xml#quickAnonOptionSettings")} + ${screens.render("component://ecommerce/widget/OrderScreens.xml#quickAnonOptionSettings")} diff --git a/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl b/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl index 9f7d23da50..e59af63eb2 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl @@ -38,7 +38,7 @@ function aroundSubmitOrder(invocation) { if(paymentMethodTypeOption == "none"){ document.setPaymentInformation.action = "<@ofbizUrl>quickAnonAddGiftCardToCart"; } - + dojo.io.bind({ url: formToSubmit.action, load: function(type, evaldObj){ if(type == "load"){ if(paymentMethodTypeOption == "EXT_OFFLINE"){ @@ -56,7 +56,7 @@ function aroundSubmitOrder(invocation) { return result; } } - } + } },formNode: document.setPaymentInformation}); } @@ -66,8 +66,8 @@ function getGCInfo() { load: function(type, data, evt){ if(type == "load"){ document.getElementById("giftCardSection").innerHTML = data; - } - },mimetype: "text/html"}); + } + },mimetype: "text/html"}); } else { document.getElementById("giftCardSection").innerHTML = ""; } @@ -81,14 +81,14 @@ function getPaymentInformation() { if(paymentMethodTypeOption == "CREDIT_CARD"){ dojo.io.bind({url: "<@ofbizUrl>quickAnonCcInfo", load: function(type, data, evt){ - if(type == "load"){document.getElementById("paymentInfoSection").innerHTML = data;} + if(type == "load"){document.getElementById("paymentInfoSection").innerHTML = data;} },mimetype: "text/html"}); document.setPaymentInformation.paymentMethodTypeId.value = "CREDIT_CARD"; document.setPaymentInformation.action = "<@ofbizUrl>quickAnonEnterCreditCard"; } else if(paymentMethodTypeOption == "EFT_ACCOUNT"){ dojo.io.bind({url: "<@ofbizUrl>quickAnonEftInfo", load: function(type, data, evt){ - if(type == "load"){document.getElementById("paymentInfoSection").innerHTML = data;} + if(type == "load"){document.getElementById("paymentInfoSection").innerHTML = data;} },mimetype: "text/html"}); document.setPaymentInformation.paymentMethodTypeId.value = "EFT_ACCOUNT"; document.setPaymentInformation.action = "<@ofbizUrl>quickAnonEnterEftAccount"; @@ -100,7 +100,7 @@ function getPaymentInformation() { document.setPaymentInformation.paymentMethodTypeId.value = "none"; document.getElementById("paymentInfoSection").innerHTML = ""; } - } + } }
    @@ -130,14 +130,14 @@ function getPaymentInformation() { <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists> - + <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists> <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists> - +
    diff --git a/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl b/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl index 9b11c0e912..8a3512d642 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl @@ -64,7 +64,7 @@ under the License. <#-- --> <#assign returnItemType = returnItemTypeMap.get(returnableItems.get(orderItem).get("itemTypeKey"))/> - + <#-- need some order item information --> <#assign orderHeader = orderItem.getRelatedOne("OrderHeader")> diff --git a/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl b/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl index c3df95cd99..744a59514d 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl @@ -61,7 +61,7 @@ function submitForm(form, mode, value) {
    ${uiLabelMap.CommonGroup} ${groupNumber}:
    - <#list group.getShipItems() as item> + <#list group.getShipItems() as item> <#assign groupItem = group.getShipItemInfo(item)>
       ${item.getName()} - (${groupItem.getItemQuantity()})
    diff --git a/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl b/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl index 6c5e383cd8..5ee58efd0f 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl @@ -49,7 +49,7 @@ under the License.   <#list quoteList as quote> - <#assign status = quote.getRelatedOneCache("StatusItem")> + <#assign status = quote.getRelatedOneCache("StatusItem")>
    diff --git a/specialpurpose/ecommerce/widget/CartScreens.xml b/specialpurpose/ecommerce/widget/CartScreens.xml index 8eaf59cda0..d6e97cae76 100644 --- a/specialpurpose/ecommerce/widget/CartScreens.xml +++ b/specialpurpose/ecommerce/widget/CartScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -50,7 +50,7 @@ under the License. - +
    @@ -58,7 +58,7 @@ under the License.
    - + @@ -86,7 +86,7 @@ under the License. - + diff --git a/specialpurpose/ecommerce/widget/CatalogScreens.xml b/specialpurpose/ecommerce/widget/CatalogScreens.xml index dc6a55aa50..503b01aaf1 100644 --- a/specialpurpose/ecommerce/widget/CatalogScreens.xml +++ b/specialpurpose/ecommerce/widget/CatalogScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> - @@ -81,7 +81,7 @@ under the License.
    - - \ No newline at end of file diff --git a/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl b/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl index c4495f4aba..ff98afa5f0 100644 --- a/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl +++ b/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl @@ -51,31 +51,31 @@ under the License. <#if project?has_content> ${uiLabelMap.OrderNotesPrivate} <#else> - ${uiLabelMap.OrderNotesPrivate} + ${uiLabelMap.OrderNotesPrivate} - + <#if note.internalNote?if_exists == "Y">
    ${uiLabelMap.OrderNotPrintableNote}
    <#if project?has_content> ${uiLabelMap.OrderNotesPublic} <#else> - ${uiLabelMap.OrderNotesPublic} + ${uiLabelMap.OrderNotesPublic} - + - <#if note_has_next> + <#if note_has_next>
    <#else> - <#if project?has_content> + <#if project?has_content>
     ${uiLabelMap.ProjectMgrProjectNoNotes}.
    <#else>
     ${uiLabelMap.ProjectMgrTaskNoNotes}.
    - + @@ -88,7 +88,7 @@ under the License.
    - action="<@ofbizUrl>createNewNotesForProject" <#else> action="<@ofbizUrl>createNewNotesForTask" > @@ -98,7 +98,7 @@ under the License. <#else> - +
    ${uiLabelMap.OrderNote}
    @@ -112,11 +112,11 @@ under the License. ${uiLabelMap.OrderInternalNoteMessage} - + <#if project?has_content>  ${uiLabelMap.CommonSave} - <#else> + <#else>  ${uiLabelMap.CommonSave} diff --git a/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl b/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl index 93f29f06a5..b2c049e4fd 100644 --- a/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl +++ b/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl @@ -49,7 +49,7 @@ under the License. ${custRequestItemList.custRequestItemSeqId} - <#if custRequestItemList.story?has_content> + <#if custRequestItemList.story?has_content> ${custRequestItemList.story} diff --git a/specialpurpose/projectmgr/widget/CommonScreens.xml b/specialpurpose/projectmgr/widget/CommonScreens.xml index 544a40f3d8..9ae11baa59 100644 --- a/specialpurpose/projectmgr/widget/CommonScreens.xml +++ b/specialpurpose/projectmgr/widget/CommonScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
    @@ -27,11 +27,11 @@ under the License. - + - + @@ -56,7 +56,7 @@ under the License.
    - + @@ -72,9 +72,9 @@ under the License.
    - - - + + + @@ -82,8 +82,8 @@ under the License. -
    - +
    + @@ -109,7 +109,7 @@ under the License. - + @@ -117,7 +117,7 @@ under the License. - +
    @@ -129,7 +129,7 @@ under the License.
    -
    +
    @@ -150,10 +150,10 @@ under the License.
    -
    +
    - + @@ -171,7 +171,7 @@ under the License. -
    + @@ -243,7 +243,7 @@ under the License.
    - +
    @@ -281,7 +281,7 @@ under the License.
    - +
    @@ -352,7 +352,7 @@ under the License.
    - +
    - +
    diff --git a/specialpurpose/projectmgr/widget/Menus.xml b/specialpurpose/projectmgr/widget/Menus.xml index 2dcff61c16..3f584b8e9f 100644 --- a/specialpurpose/projectmgr/widget/Menus.xml +++ b/specialpurpose/projectmgr/widget/Menus.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -21,7 +21,7 @@ - + @@ -56,18 +56,18 @@ @@ -127,7 +127,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -215,11 +215,11 @@ @@ -411,7 +411,7 @@ - + diff --git a/specialpurpose/projectmgr/widget/ProjectScreens.xml b/specialpurpose/projectmgr/widget/ProjectScreens.xml index 7b25a6b279..2410b63826 100644 --- a/specialpurpose/projectmgr/widget/ProjectScreens.xml +++ b/specialpurpose/projectmgr/widget/ProjectScreens.xml @@ -1108,12 +1108,12 @@ under the License. - + - + @@ -1128,7 +1128,7 @@ under the License. - + @@ -1152,5 +1152,5 @@ under the License. - + diff --git a/specialpurpose/projectmgr/widget/RequestScreens.xml b/specialpurpose/projectmgr/widget/RequestScreens.xml index 70333fa855..de7ab19b07 100644 --- a/specialpurpose/projectmgr/widget/RequestScreens.xml +++ b/specialpurpose/projectmgr/widget/RequestScreens.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -
    @@ -52,10 +52,10 @@ under the License. - + - + @@ -117,7 +117,7 @@ under the License. - + diff --git a/specialpurpose/projectmgr/widget/ResourceScreens.xml b/specialpurpose/projectmgr/widget/ResourceScreens.xml index f677f82d51..27356b3bde 100644 --- a/specialpurpose/projectmgr/widget/ResourceScreens.xml +++ b/specialpurpose/projectmgr/widget/ResourceScreens.xml @@ -21,7 +21,7 @@ under the License. -
    +
    @@ -35,8 +35,8 @@ under the License. - - + + @@ -49,15 +49,15 @@ under the License.
    -
    +