svn commit: r1781219 [1/14] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/groovy
Locked
svn commit: r1781219 [1/14] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/groovy
 
|
Author: jleroux
Date: Wed Feb 1 10:58:46 2017 New Revision: 1781219 URL: http://svn.apache.org/viewvc?rev=1781219&view=rev Log: No functional changes At http://markmail.org/message/ffmyw773p65fndey I wrote: I'd like to follow the suggestion I made in the last message of the linked thread. In other words, use http://subversion.apache.org/docs/release-notes/1.8.html#repos-dictated-config http://blogs.collab.net/subversion/the-road-to-repository-dictated-configuration-day-2-autoprops Then this problem would be over. No longer need to check from time to time that concerned files, have svn:eol-style=native property set This imply that all OFBiz users use svn > 1.7, but we can inform them, et voilà Then at markmail.org/message/h3q2yvj4db544ro7 I wrote: Actually, since we get new committers now and then and their are able to create new files I have a warning every 6 months which says "Check Java files, have all svn:eol-style=native" (I totally forgot that because I assume the machine knows it and warns me ;)) I could extend that to all files (at least the most prominent types), I'll see... This does what the last sentence said for Groovy, XML and few new Birt Java files. I'll see if I can implement the svn 1.8 repos-dictated-config ASAP! Modified: ofbiz/trunk/applications/accounting/data/DemoAccountingUserData.xml (props changed) ofbiz/trunk/applications/accounting/data/PaymentGatewayConfData.xml (props changed) ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionReport.groovy (props changed) ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionRun.groovy (props changed) ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy (props changed) ofbiz/trunk/applications/accounting/groovyScripts/invoice/InvoiceReport.groovy (props changed) ofbiz/trunk/applications/accounting/groovyScripts/invoice/PrintInvoices.groovy (props changed) ofbiz/trunk/applications/accounting/groovyScripts/reports/CostCenters.groovy (props changed) ofbiz/trunk/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy (props changed) ofbiz/trunk/applications/accounting/groovyScripts/reports/MonthSelection.groovy (props changed) ofbiz/trunk/applications/accounting/groovyScripts/reports/TrialBalance.groovy (props changed) ofbiz/trunk/applications/accounting/minilang/permissions/PermissionServices.xml (props changed) ofbiz/trunk/applications/accounting/servicedef/services_securepay.xml (props changed) ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/agreement/GetPartyNameForDate.groovy (props changed) ofbiz/trunk/applications/accounting/widget/ap/ApMenus.xml (props changed) ofbiz/trunk/applications/accounting/widget/ap/LookupScreens.xml (props changed) ofbiz/trunk/applications/accounting/widget/ap/forms/LookupForms.xml (props changed) ofbiz/trunk/applications/accounting/widget/ar/LookupScreens.xml (props changed) ofbiz/trunk/applications/accounting/widget/ar/forms/LookupForms.xml (props changed) ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml (props changed) ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml (props changed) ofbiz/trunk/applications/content/data/BlogSeedData.xml (props changed) ofbiz/trunk/applications/content/data/ContentHttpErrorData.xml (props changed) ofbiz/trunk/applications/content/data/ContentPortletData.xml (props changed) ofbiz/trunk/applications/content/data/DemoBlogEntryData.xml (props changed) ofbiz/trunk/applications/content/data/DemoBlogPubPtData.xml (props changed) ofbiz/trunk/applications/content/data/DemoBlogUsersData.xml (props changed) ofbiz/trunk/applications/content/minilang/blog/BlogServices.xml (props changed) ofbiz/trunk/applications/content/servicedef/services_document.xml (props changed) ofbiz/trunk/applications/datamodel/ofbiz-component.xml (props changed) ofbiz/trunk/applications/humanres/config/HumanResEntityLabels.xml (props changed) ofbiz/trunk/applications/humanres/config/HumanResErrorUiLabels.xml (props changed) ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmplPosition.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeLeaves.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeQuals.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeSkills.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeTrainings.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployment.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EmplPositionView.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EmployeeProfile.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_FindEmplPositions.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_FindEmployments.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_ListEmplPositions.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_ListEmployments.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_NewEmployee.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_PayrollHistory.xml (props changed) ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_findEmployees.xml (props changed) ofbiz/trunk/applications/humanres/documents/Humanres.xml (contents, props changed) ofbiz/trunk/applications/humanres/servicedef/services_ability.xml (props changed) ofbiz/trunk/applications/humanres/servicedef/services_employment.xml (props changed) ofbiz/trunk/applications/humanres/servicedef/services_position.xml (props changed) ofbiz/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunComponents.groovy (props changed) ofbiz/trunk/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml (props changed) ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_ImportContactListParties.xml (props changed) ofbiz/trunk/applications/marketing/data/sfaDemoData.xml (props changed) ofbiz/trunk/applications/marketing/groovyScripts/marketing/contact/GetContactListMarketingEmail.groovy (props changed) ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListEvents.xml (props changed) ofbiz/trunk/applications/marketing/servicedef/services_contact.xml (props changed) ofbiz/trunk/applications/order/data/OrderDemoUser.xml (props changed) ofbiz/trunk/applications/order/groovyScripts/entry/catalog/ProductUomDropDownOnly.groovy (props changed) ofbiz/trunk/applications/order/groovyScripts/order/ShipGroups.groovy (props changed) ofbiz/trunk/applications/order/groovyScripts/requirement/ApprovedProductRequirements.groovy (props changed) ofbiz/trunk/applications/order/groovyScripts/requirement/ApprovedProductRequirementsByVendor.groovy (props changed) ofbiz/trunk/applications/order/groovyScripts/requirement/SelectCreatedProposed.groovy (props changed) ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadDateEvent.xml (props changed) ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadEvent.xml (props changed) ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml (props changed) ofbiz/trunk/applications/order/minilang/reports/ProductDemandReportEvent.xml (props changed) ofbiz/trunk/applications/order/minilang/test/CustRequestTests.xml (props changed) ofbiz/trunk/applications/order/minilang/test/ShoppingCartTests.xml (props changed) ofbiz/trunk/applications/order/servicedef/services_order.xml (props changed) ofbiz/trunk/applications/order/servicedef/services_reservations.xml (props changed) ofbiz/trunk/applications/order/testdef/CustRequestTests.xml (props changed) ofbiz/trunk/applications/order/testdef/FinAccountTests.xml (props changed) ofbiz/trunk/applications/order/testdef/ShoppingCartTests.xml (props changed) ofbiz/trunk/applications/party/data/PartyGeoPointData.xml (props changed) ofbiz/trunk/applications/party/entitydef/entitymodel_old.xml (props changed) ofbiz/trunk/applications/party/groovyScripts/party/PartyGeoLocation.groovy (props changed) ofbiz/trunk/applications/party/groovyScripts/party/SetRoleVars.groovy (props changed) ofbiz/trunk/applications/party/groovyScripts/party/StatusCondition.groovy (contents, props changed) ofbiz/trunk/applications/party/minilang/party/PartyInvitationServices.xml (props changed) ofbiz/trunk/applications/party/minilang/party/PartyPermissionServices.xml (props changed) ofbiz/trunk/applications/party/servicedef/mcas.xml (props changed) ofbiz/trunk/applications/party/servicedef/services_agreement.xml (props changed) ofbiz/trunk/applications/party/servicedef/services_communication.xml (props changed) ofbiz/trunk/applications/party/servicedef/services_contact.xml (props changed) ofbiz/trunk/applications/party/servicedef/services_party.xml (props changed) ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml (props changed) ofbiz/trunk/applications/party/widget/partymgr/PartyVisitForms.xml (props changed) ofbiz/trunk/applications/product/config/ProductPromoUiLabels.xml (props changed) ofbiz/trunk/applications/product/data/ProductDemoData.xml (props changed) ofbiz/trunk/applications/product/data/helpdata/HELP_IMAGEMANAGEMENT.xml (props changed) ofbiz/trunk/applications/product/entitydef/entitymodel_view.xml (props changed) ofbiz/trunk/applications/product/groovyScripts/catalog/GetSupplierInventories.groovy (props changed) ofbiz/trunk/applications/product/groovyScripts/catalog/category/CategoryTree.groovy (props changed) ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/CheckAction.groovy (props changed) ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/CheckRejected.groovy (props changed) ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageFrame.groovy (props changed) ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageRecentlyApproved.groovy (props changed) ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageUpload.groovy (props changed) ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/SeoLocales.groovy (props changed) ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/SortSequenceNum.groovy (props changed) ofbiz/trunk/applications/product/groovyScripts/facility/facility/FacilityLocationGeoLocation.groovy (contents, props changed) ofbiz/trunk/applications/product/groovyScripts/facility/inventory/FindFacilityPhysicalInventory.groovy (props changed) ofbiz/trunk/applications/product/groovyScripts/facility/inventory/InventoryItemTotals.groovy (props changed) ofbiz/trunk/applications/product/groovyScripts/facility/shipment/PackingSlip.groovy (props changed) ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml (props changed) ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml (props changed) ofbiz/trunk/applications/product/servicedef/groups.xml (props changed) ofbiz/trunk/applications/product/servicedef/services_config.xml (props changed) ofbiz/trunk/applications/product/servicedef/services_inventory.xml (props changed) ofbiz/trunk/applications/product/servicedef/services_price.xml (props changed) ofbiz/trunk/applications/product/servicedef/services_supplier.xml (props changed) ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml (props changed) ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml (contents, props changed) ofbiz/trunk/applications/workeffort/servicedef/services_workeffort.xml (props changed) ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml (props changed) ofbiz/trunk/framework/base/ant-scripts/if-script.groovy (props changed) ofbiz/trunk/framework/common/data/GeoData_CN.xml (props changed) ofbiz/trunk/framework/common/groovyScripts/GeoLocation.groovy (contents, props changed) ofbiz/trunk/framework/common/minilang/GroovyServiceTest.groovy (props changed) ofbiz/trunk/framework/common/servicedef/services_enum.xml (props changed) ofbiz/trunk/framework/common/servicedef/services_geo.xml (props changed) ofbiz/trunk/framework/common/servicedef/services_method.xml (props changed) ofbiz/trunk/framework/common/webcommon/WEB-INF/handlers-controller.xml (props changed) ofbiz/trunk/framework/documents/DataFiles.xml (props changed) ofbiz/trunk/framework/entityext/servicedef/services_group.xml (props changed) ofbiz/trunk/framework/entityext/servicedef/services_synchronization.xml (props changed) ofbiz/trunk/framework/entityext/servicedef/services_tenant.xml (props changed) ofbiz/trunk/framework/minilang/testdef/MinilangTests.xml (contents, props changed) ofbiz/trunk/framework/service/config/ServiceUiLabels.xml (props changed) ofbiz/trunk/framework/webtools/groovyScripts/datafile/ViewDataFile.groovy (props changed) ofbiz/trunk/framework/webtools/groovyScripts/log/FetchLogs.groovy (props changed) ofbiz/trunk/framework/webtools/groovyScripts/service/JobDetails.groovy (props changed) ofbiz/trunk/framework/webtools/widget/CacheForms.xml (props changed) ofbiz/trunk/framework/webtools/widget/Menus.xml (props changed) ofbiz/trunk/framework/webtools/widget/StatsForms.xml (contents, props changed) ofbiz/trunk/plugins/birt/data/BirtMasterData.xml (contents, props changed) ofbiz/trunk/plugins/birt/data/BirtSecurityGroupDemoData.xml (props changed) ofbiz/trunk/plugins/birt/data/BirtTypeData.xml (props changed) ofbiz/trunk/plugins/birt/data/OrderPortletData.xml (props changed) ofbiz/trunk/plugins/birt/documents/Birt.xml (props changed) ofbiz/trunk/plugins/birt/groovyScripts/accounting/AcctgTransEntriesSearchResultsParameters.groovy (props changed) ofbiz/trunk/plugins/birt/groovyScripts/accounting/BalanceSheetParameters.groovy (props changed) ofbiz/trunk/plugins/birt/groovyScripts/accounting/IncomeStatementParameters.groovy (props changed) ofbiz/trunk/plugins/birt/groovyScripts/accounting/InvoiceAcctgTransEntryParameters.groovy (props changed) ofbiz/trunk/plugins/birt/groovyScripts/accounting/PaymentAcctgTransEntryParameters.groovy (props changed) ofbiz/trunk/plugins/birt/groovyScripts/accounting/TrialBalanceParameters.groovy (props changed) ofbiz/trunk/plugins/birt/groovyScripts/order/CheckReportBy.groovy (props changed) ofbiz/trunk/plugins/birt/groovyScripts/order/NetBeforeOverheadReport.groovy (props changed) ofbiz/trunk/plugins/birt/groovyScripts/order/ProductDemandReport.groovy (props changed) ofbiz/trunk/plugins/birt/minilang/BirtPermissionServices.xml (props changed) ofbiz/trunk/plugins/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtMasterReportServices.java (props changed) ofbiz/trunk/plugins/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java (contents, props changed) ofbiz/trunk/plugins/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtUtil.java (props changed) ofbiz/trunk/plugins/birt/src/main/java/org/apache/ofbiz/birt/flexible/ReportDesignGenerator.java (props changed) ofbiz/trunk/plugins/birt/webapp/accounting/WEB-INF/controller.xml (props changed) ofbiz/trunk/plugins/birt/webapp/accounting/WEB-INF/web.xml (props changed) ofbiz/trunk/plugins/birt/webapp/birt/WEB-INF/web.xml (contents, props changed) ofbiz/trunk/plugins/birt/webapp/facility/WEB-INF/controller.xml (props changed) ofbiz/trunk/plugins/birt/webapp/ordermgr/WEB-INF/controller.xml (props changed) ofbiz/trunk/plugins/birt/webapp/ordermgr/WEB-INF/web.xml (props changed) ofbiz/trunk/plugins/birt/widget/accounting/AccountingForms.xml (props changed) ofbiz/trunk/plugins/birt/widget/accounting/AccountingScreens.xml (props changed) ofbiz/trunk/plugins/birt/widget/birt/BirtForms.xml (contents, props changed) ofbiz/trunk/plugins/birt/widget/birt/BirtMasterForms.xml (props changed) ofbiz/trunk/plugins/birt/widget/birt/BirtMenus.xml (props changed) ofbiz/trunk/plugins/birt/widget/birt/BirtScreens.xml (contents, props changed) ofbiz/trunk/plugins/birt/widget/facility/FacilityForms.xml (props changed) ofbiz/trunk/plugins/birt/widget/facility/FacilityScreens.xml (props changed) ofbiz/trunk/plugins/birt/widget/order/OrderForms.xml (props changed) ofbiz/trunk/plugins/birt/widget/order/OrderScreens.xml (props changed) ofbiz/trunk/plugins/cmssite/data/CmsMultiSiteDemoData.xml (props changed) ofbiz/trunk/plugins/ebaystore/config/EbayStoreUiLabels.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/DemoEbayStoreData.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/EbayStoreHelpData.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/EbayStorePortletData.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/EbayStoreSecurityGroupDemoData.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/EbayStoreTypeData.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_AutoPref.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_BlockItemOutStock.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_EbayStore.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_ExportCategoriesToEbay.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_Feedback.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_LeaveFeedback.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_NewEbayAccount.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_ProductInventory.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_ReserveProduct.xml (props changed) ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_StoreSetting.xml (props changed) ofbiz/trunk/plugins/ebaystore/documents/EbayStore.xml (props changed) ofbiz/trunk/plugins/ebaystore/entitydef/entitymodel.xml (props changed) ofbiz/trunk/plugins/ebaystore/groovyScripts/automationPreferences/GetDisputeInfo.groovy (props changed) ofbiz/trunk/plugins/ebaystore/groovyScripts/automationPreferences/GetEbayJobsandbox.groovy (props changed) ofbiz/trunk/plugins/ebaystore/groovyScripts/email/GetProductStoreEmailTemplate.groovy (props changed) ofbiz/trunk/plugins/ebaystore/groovyScripts/feedback/FeedbackList.groovy (props changed) ofbiz/trunk/plugins/ebaystore/groovyScripts/store/CheckOrderStatus.groovy (props changed) ofbiz/trunk/plugins/ebaystore/groovyScripts/store/OrderListParameters.groovy (props changed) ofbiz/trunk/plugins/ebaystore/groovyScripts/store/OrderListPrepare.groovy (props changed) ofbiz/trunk/plugins/ebaystore/groovyScripts/store/PrepareProductListing.groovy (props changed) ofbiz/trunk/plugins/ebaystore/groovyScripts/store/RetrieveStoreOptions.groovy (props changed) ofbiz/trunk/plugins/ebaystore/groovyScripts/store/SoldAction.groovy (props changed) ofbiz/trunk/plugins/ebaystore/groovyScripts/store/StoreAccount.groovy (props changed) ofbiz/trunk/plugins/ebaystore/minilang/EbayServices.xml (props changed) ofbiz/trunk/plugins/ebaystore/minilang/EbayStoreEvents.xml (props changed) ofbiz/trunk/plugins/ebaystore/ofbiz-component.xml (props changed) ofbiz/trunk/plugins/ebaystore/servicedef/secas.xml (props changed) ofbiz/trunk/plugins/ebaystore/servicedef/services.xml (props changed) ofbiz/trunk/plugins/ebaystore/servicedef/services_store.xml (props changed) ofbiz/trunk/plugins/ebaystore/webapp/ebaystore/WEB-INF/controller.xml (props changed) ofbiz/trunk/plugins/ebaystore/webapp/ebaystore/WEB-INF/web.xml (props changed) ofbiz/trunk/plugins/ebaystore/widget/CommonScreens.xml (props changed) ofbiz/trunk/plugins/ebaystore/widget/EbayAccountForms.xml (props changed) ofbiz/trunk/plugins/ebaystore/widget/EbayAccountScreens.xml (contents, props changed) ofbiz/trunk/plugins/ebaystore/widget/EbayEmailScreens.xml (props changed) ofbiz/trunk/plugins/ebaystore/widget/EbaySellingManagerForms.xml (props changed) ofbiz/trunk/plugins/ebaystore/widget/EbaySellingManagerScreens.xml (contents, props changed) ofbiz/trunk/plugins/ebaystore/widget/EbayStoreForms.xml (props changed) ofbiz/trunk/plugins/ebaystore/widget/EbayStoreMenus.xml (props changed) ofbiz/trunk/plugins/ebaystore/widget/EbayStoreScreens.xml (contents, props changed) ofbiz/trunk/plugins/ecommerce/data/DemoPopularCategoriesData.xml (props changed) ofbiz/trunk/plugins/ecommerce/data/DemoProductI18nData.xml (props changed) ofbiz/trunk/plugins/ecommerce/groovyScripts/catalog/BestSellingCategory.groovy (props changed) ofbiz/trunk/plugins/ecommerce/groovyScripts/customer/ContactList.groovy (contents, props changed) ofbiz/trunk/plugins/ecommerce/widget/ForumForms.xml (props changed) ofbiz/trunk/plugins/ecommerce/widget/ForumTrees.xml (props changed) ofbiz/trunk/plugins/ecommerce/widget/blog/BlogForms.xml (props changed) ofbiz/trunk/plugins/ecommerce/widget/blog/BlogMenus.xml (props changed) ofbiz/trunk/plugins/ecommerce/widget/blog/BlogScreens.xml (contents, props changed) ofbiz/trunk/plugins/ecommerce/widget/blog/BlogTemplates.xml (props changed) ofbiz/trunk/plugins/ecommerce/widget/blog/BlogTrees.xml (props changed) ofbiz/trunk/plugins/example/data/ExampleHelpData.xml (contents, props changed) ofbiz/trunk/plugins/example/data/helpdata/HELP_EXAMPLE.xml (props changed) ofbiz/trunk/plugins/example/data/helpdata/HELP_EXAMPLE_main.xml (props changed) ofbiz/trunk/plugins/example/groovyScripts/PrepareLocalesForDropDown.groovy (contents, props changed) ofbiz/trunk/plugins/example/widget/example/ExampleAjaxScreens.xml (props changed) ofbiz/trunk/plugins/exampleext/ofbiz-component.xml (props changed) ofbiz/trunk/plugins/lucene/testdef/data/LuceneTestsData.xml (props changed) ofbiz/trunk/plugins/lucene/testdef/lucenetests.xml (props changed) ofbiz/trunk/plugins/pricat/config/PricatUiLabels.xml (props changed) ofbiz/trunk/plugins/pricat/data/PricatData.xml (props changed) ofbiz/trunk/plugins/pricat/entitydef/entitymodel.xml (props changed) ofbiz/trunk/plugins/pricat/groovyScripts/pricat/FindMyExcelImport.groovy (contents, props changed) ofbiz/trunk/plugins/pricat/groovyScripts/pricat/FindMyExcelImportLog.groovy (contents, props changed) ofbiz/trunk/plugins/pricat/ofbiz-component.xml (props changed) ofbiz/trunk/plugins/pricat/webapp/pricat/WEB-INF/controller.xml (props changed) ofbiz/trunk/plugins/pricat/webapp/pricat/WEB-INF/web.xml (props changed) ofbiz/trunk/plugins/pricat/webapp/pricatdemo/WEB-INF/controller.xml (props changed) ofbiz/trunk/plugins/pricat/webapp/pricatdemo/WEB-INF/web.xml (props changed) ofbiz/trunk/plugins/pricat/widget/CommonScreens.xml (props changed) ofbiz/trunk/plugins/pricat/widget/PriCatDemoMenus.xml (contents, props changed) ofbiz/trunk/plugins/pricat/widget/PriCatMenus.xml (contents, props changed) ofbiz/trunk/plugins/pricat/widget/SampleScreens.xml (props changed) ofbiz/trunk/plugins/projectmgr/data/ProjectMgrHelpData.xml (props changed) ofbiz/trunk/plugins/projectmgr/data/helpdata/HELP_PROJECTMGR.xml (props changed) ofbiz/trunk/plugins/projectmgr/data/helpdata/HELP_PROJECTMGR_main.xml (props changed) ofbiz/trunk/plugins/projectmgr/documents/ProjectMgr.xml (props changed) ofbiz/trunk/plugins/solr/home/solrdefault/conf/clustering/carrot2/kmeans-attributes.xml (contents, props changed) ofbiz/trunk/plugins/solr/home/solrdefault/conf/clustering/carrot2/lingo-attributes.xml (contents, props changed) ofbiz/trunk/plugins/solr/home/solrdefault/conf/clustering/carrot2/stc-attributes.xml (contents, props changed) ofbiz/trunk/plugins/solr/home/solrdefault/conf/currency.xml (contents, props changed) ofbiz/trunk/plugins/solr/home/solrdefault/conf/elevate.xml (contents, props changed) ofbiz/trunk/plugins/solr/home/solrdefault/conf/schema.xml (contents, props changed) ofbiz/trunk/plugins/solr/home/solrdefault/conf/solrconfig.xml (contents, props changed) ofbiz/trunk/themes/multiflex/data/MultiflexThemeData.xml (contents, props changed) ofbiz/trunk/themes/multiflex/ofbiz-component.xml (contents, props changed) ofbiz/trunk/themes/multiflex/webapp/multiflex/WEB-INF/web.xml (contents, props changed) ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml (contents, props changed) ofbiz/trunk/themes/tomahawk/ofbiz-component.xml (props changed) ofbiz/trunk/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml (props changed) Propchange: ofbiz/trunk/applications/accounting/data/DemoAccountingUserData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/data/PaymentGatewayConfData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionReport.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionRun.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/groovyScripts/invoice/InvoiceReport.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/groovyScripts/invoice/PrintInvoices.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/groovyScripts/reports/CostCenters.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/groovyScripts/reports/MonthSelection.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/groovyScripts/reports/TrialBalance.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/minilang/permissions/PermissionServices.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/servicedef/services_securepay.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/agreement/GetPartyNameForDate.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/widget/ap/ApMenus.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/widget/ap/LookupScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/widget/ap/forms/LookupForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/widget/ar/LookupScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/widget/ar/forms/LookupForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/data/BlogSeedData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/data/ContentHttpErrorData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/data/ContentPortletData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/data/DemoBlogEntryData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/data/DemoBlogPubPtData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/data/DemoBlogUsersData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/minilang/blog/BlogServices.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/content/servicedef/services_document.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/datamodel/ofbiz-component.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/config/HumanResEntityLabels.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/config/HumanResErrorUiLabels.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmplPosition.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeLeaves.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeQuals.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeSkills.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeTrainings.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployment.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EmplPositionView.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EmployeeProfile.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_FindEmplPositions.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_FindEmployments.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_ListEmplPositions.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_ListEmployments.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_NewEmployee.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_PayrollHistory.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_findEmployees.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/trunk/applications/humanres/documents/Humanres.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/documents/Humanres.xml?rev=1781219&r1=1781218&r2=1781219&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/documents/Humanres.xml (original) +++ ofbiz/trunk/applications/humanres/documents/Humanres.xml Wed Feb 1 10:58:46 2017 @@ -1,51 +1,51 @@ -<?xml version="1.0"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -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. ---> -<chapter xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Human Resource Application.</title> - <para> - The human resource application is supporting you to ...WIP, to be completed... - </para> - - <section> - <title>Human resource in Apache OFBiz, an overview.</title> - <para> - WIP, to be completed... - </para> - - </section> - - <xi:include href="../data/helpdata/HELP_HR.xml" /> - <xi:include href="../data/helpdata/HELP_HR_main.xml" /> - <xi:include href="../data/helpdata/HELP_HR_training.xml" /> - - <!-- xi:include href="../data/helpdata/HELP_HUMANRES_employees.xml" /> - <xi:include href="../data/helpdata/HELP_HUMANRES_employees_positions.xml" /> - <xi:include href="../data/helpdata/HELP_HUMANRES_performance_review.xml" /> - <xi:include href="../data/helpdata/HELP_HUMANRES_skills.xml" /> - <xi:include href="../data/helpdata/HELP_HUMANRES_recruitment.xml" /--> - <!--xi:include href="../data/helpdata/HELP_HUMANRES_employment_applications.xml" /> - <xi:include href="../data/helpdata/HELP_HUMANRES_resumes.xml" /> - <xi:include href="../data/helpdata/HELP_HUMANRES_leave.xml" /> - <xi:include href="../data/helpdata/HELP_HUMANRES_global_HR_settings.xml" /--> -</chapter> +<?xml version="1.0"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +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. +--> +<chapter xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + <title>The Human Resource Application.</title> + <para> + The human resource application is supporting you to ...WIP, to be completed... + </para> + + <section> + <title>Human resource in Apache OFBiz, an overview.</title> + <para> + WIP, to be completed... + </para> + + </section> + + <xi:include href="../data/helpdata/HELP_HR.xml" /> + <xi:include href="../data/helpdata/HELP_HR_main.xml" /> + <xi:include href="../data/helpdata/HELP_HR_training.xml" /> + + <!-- xi:include href="../data/helpdata/HELP_HUMANRES_employees.xml" /> + <xi:include href="../data/helpdata/HELP_HUMANRES_employees_positions.xml" /> + <xi:include href="../data/helpdata/HELP_HUMANRES_performance_review.xml" /> + <xi:include href="../data/helpdata/HELP_HUMANRES_skills.xml" /> + <xi:include href="../data/helpdata/HELP_HUMANRES_recruitment.xml" /--> + <!--xi:include href="../data/helpdata/HELP_HUMANRES_employment_applications.xml" /> + <xi:include href="../data/helpdata/HELP_HUMANRES_resumes.xml" /> + <xi:include href="../data/helpdata/HELP_HUMANRES_leave.xml" /> + <xi:include href="../data/helpdata/HELP_HUMANRES_global_HR_settings.xml" /--> +</chapter> Propchange: ofbiz/trunk/applications/humanres/documents/Humanres.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/servicedef/services_ability.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/servicedef/services_employment.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/servicedef/services_position.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunComponents.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_ImportContactListParties.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/marketing/data/sfaDemoData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/marketing/groovyScripts/marketing/contact/GetContactListMarketingEmail.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListEvents.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/marketing/servicedef/services_contact.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/data/OrderDemoUser.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/groovyScripts/entry/catalog/ProductUomDropDownOnly.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/groovyScripts/order/ShipGroups.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/groovyScripts/requirement/ApprovedProductRequirements.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/groovyScripts/requirement/ApprovedProductRequirementsByVendor.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/groovyScripts/requirement/SelectCreatedProposed.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadDateEvent.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadEvent.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/minilang/reports/ProductDemandReportEvent.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/minilang/test/CustRequestTests.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/minilang/test/ShoppingCartTests.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/servicedef/services_order.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/servicedef/services_reservations.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/testdef/CustRequestTests.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/testdef/FinAccountTests.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/testdef/ShoppingCartTests.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/party/data/PartyGeoPointData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/party/entitydef/entitymodel_old.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/party/groovyScripts/party/PartyGeoLocation.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/party/groovyScripts/party/SetRoleVars.groovy ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/trunk/applications/party/groovyScripts/party/StatusCondition.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/groovyScripts/party/StatusCondition.groovy?rev=1781219&r1=1781218&r2=1781219&view=diff ============================================================================== --- ofbiz/trunk/applications/party/groovyScripts/party/StatusCondition.groovy (original) +++ ofbiz/trunk/applications/party/groovyScripts/party/StatusCondition.groovy Wed Feb 1 10:58:46 2017 @@ -1,27 +1,27 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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. - */ - -import org.apache.ofbiz.entity.condition.EntityCondition -import org.apache.ofbiz.entity.condition.EntityOperator - -exprList = [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PARTY_DISABLED"), - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, null)] -condList = EntityCondition.makeCondition(exprList, EntityOperator.AND) -context.andCondition = EntityCondition.makeCondition([condList, EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, null)], EntityOperator.OR) - +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * 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. + */ + +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator + +exprList = [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PARTY_DISABLED"), + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, null)] +condList = EntityCondition.makeCondition(exprList, EntityOperator.AND) +context.andCondition = EntityCondition.makeCondition([condList, EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, null)], EntityOperator.OR) + Propchange: ofbiz/trunk/applications/party/groovyScripts/party/StatusCondition.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/party/minilang/party/PartyInvitationServices.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/party/minilang/party/PartyPermissionServices.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/party/servicedef/mcas.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/party/servicedef/services_agreement.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/party/servicedef/services_communication.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/party/servicedef/services_contact.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/party/servicedef/services_party.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/party/widget/partymgr/PartyVisitForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/config/ProductPromoUiLabels.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/data/ProductDemoData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/data/helpdata/HELP_IMAGEMANAGEMENT.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/entitydef/entitymodel_view.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/groovyScripts/catalog/GetSupplierInventories.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/groovyScripts/catalog/category/CategoryTree.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/CheckAction.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/CheckRejected.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageFrame.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageRecentlyApproved.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageUpload.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/SeoLocales.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/SortSequenceNum.groovy ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/trunk/applications/product/groovyScripts/facility/facility/FacilityLocationGeoLocation.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/groovyScripts/facility/facility/FacilityLocationGeoLocation.groovy?rev=1781219&r1=1781218&r2=1781219&view=diff ============================================================================== --- ofbiz/trunk/applications/product/groovyScripts/facility/facility/FacilityLocationGeoLocation.groovy (original) +++ ofbiz/trunk/applications/product/groovyScripts/facility/facility/FacilityLocationGeoLocation.groovy Wed Feb 1 10:58:46 2017 @@ -1,48 +1,48 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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. - */ - - import org.apache.ofbiz.base.util.* - import org.apache.ofbiz.common.geo.* - import org.apache.ofbiz.entity.* - -facilityId = parameters.facilityId -locationSeqId = parameters.locationSeqId - -uiLabelMap = UtilProperties.getResourceBundleMap("ProductUiLabels", locale) -uiLabelMap.addBottomResourceBundle("CommonUiLabels") - -if (facilityId && locationSeqId) { - latestGeoPoint = GeoWorker.findLatestGeoPoint(delegator, "FacilityLocationAndGeoPoint", "facilityId", facilityId, "locationSeqId", locationSeqId) - context.latestGeoPoint = latestGeoPoint - - List geoCenter = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "zoom", "13")) - - if (UtilValidate.isNotEmpty(latestGeoPoint) && latestGeoPoint.containsKey("latitude") && latestGeoPoint.containsKey("longitude")) { - List geoPoints = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "facilityId", facilityId, - "link", UtilMisc.toMap("url", "EditFacilityLocation?facilityId="+ facilityId + "&locationSeqId=" + locationSeqId, - "label", uiLabelMap.ProductFacilityLocation + " " + uiLabelMap.CommonOf + " " + facilityId + "/" + locationSeqId))) - - Map geoChart = UtilMisc.toMap("width", "500px", "height", "450px", "controlUI" , "small", "dataSourceId", latestGeoPoint.dataSourceId, "points", geoPoints) - context.geoChart = geoChart - } - if (latestGeoPoint && latestGeoPoint.elevationUomId) { - elevationUom = from("Uom").where("uomId", latestGeoPoint.elevationUomId).queryOne() - context.elevationUomAbbr = elevationUom.abbreviation - } +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * 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. + */ + + import org.apache.ofbiz.base.util.* + import org.apache.ofbiz.common.geo.* + import org.apache.ofbiz.entity.* + +facilityId = parameters.facilityId +locationSeqId = parameters.locationSeqId + +uiLabelMap = UtilProperties.getResourceBundleMap("ProductUiLabels", locale) +uiLabelMap.addBottomResourceBundle("CommonUiLabels") + +if (facilityId && locationSeqId) { + latestGeoPoint = GeoWorker.findLatestGeoPoint(delegator, "FacilityLocationAndGeoPoint", "facilityId", facilityId, "locationSeqId", locationSeqId) + context.latestGeoPoint = latestGeoPoint + + List geoCenter = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "zoom", "13")) + + if (UtilValidate.isNotEmpty(latestGeoPoint) && latestGeoPoint.containsKey("latitude") && latestGeoPoint.containsKey("longitude")) { + List geoPoints = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "facilityId", facilityId, + "link", UtilMisc.toMap("url", "EditFacilityLocation?facilityId="+ facilityId + "&locationSeqId=" + locationSeqId, + "label", uiLabelMap.ProductFacilityLocation + " " + uiLabelMap.CommonOf + " " + facilityId + "/" + locationSeqId))) + + Map geoChart = UtilMisc.toMap("width", "500px", "height", "450px", "controlUI" , "small", "dataSourceId", latestGeoPoint.dataSourceId, "points", geoPoints) + context.geoChart = geoChart + } + if (latestGeoPoint && latestGeoPoint.elevationUomId) { + elevationUom = from("Uom").where("uomId", latestGeoPoint.elevationUomId).queryOne() + context.elevationUomAbbr = elevationUom.abbreviation + } } Propchange: ofbiz/trunk/applications/product/groovyScripts/facility/facility/FacilityLocationGeoLocation.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/groovyScripts/facility/inventory/FindFacilityPhysicalInventory.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/groovyScripts/facility/inventory/InventoryItemTotals.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/groovyScripts/facility/shipment/PackingSlip.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/servicedef/groups.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/servicedef/services_config.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/servicedef/services_inventory.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/servicedef/services_price.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/servicedef/services_supplier.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml ------------------------------------------------------------------------------ svn:eol-style = native |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |