svn commit: r1642661 [1/4] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1642661 [1/4] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Mon Dec 1 10:16:27 2014 New Revision: 1642661 URL: http://svn.apache.org/r1642661 Log: Keeps in sync with OFBiz trunk HEAD Added: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/static/PartyProfileContent.js - copied unchanged from r1642659, ofbiz/trunk/applications/party/webapp/partymgr/static/PartyProfileContent.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/bi/ - copied from r1642659, ofbiz/trunk/specialpurpose/bi/ Removed: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/entitydef/entitygroup_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/entitydef/entitymodel_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/olap/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/secas_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/entitydef/entitygroup_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/entitydef/entitymodel_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/olap/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/secas_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/js/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/SecurityForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/SecurityScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/data/DimensionTypeData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/entitydef/entitygroup_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/entitydef/entitymodel_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/olap/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/secas_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/DimensionTypeData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitygroup_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/olap/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services_olap.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/olap/ Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/data/ProductStoreData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/data/ShippingData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/EmployeeScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/widget/sfa/CommonScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/data/OrderTypeData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/ofbiz-component.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/secas.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyUiLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/web.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/PartyScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/ofbiz-component.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/build.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/ofbiz-component.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/component-load.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceUtil.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/build.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/component-load.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoShipping.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/src/org/ofbiz/content/search/ProductDocument.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/src/org/ofbiz/content/search/SearchServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/src/org/ofbiz/content/search/SearchWorker.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/ResourceScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/widget/ResourceScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/data/DemoPosData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/src/org/ofbiz/webpos/search/WebPosSearch.java Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1641357-1642659 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml Mon Dec 1 10:16:27 2014 @@ -29,8 +29,6 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_reports.xml"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/> - <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_olap.xml"/> - <entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup_olap.xml"/> <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingHelpData.xml"/> @@ -66,7 +64,6 @@ under the License. <service-resource type="model" loader="main" location="servicedef/services_tax.xml"/> <service-resource type="model" loader="main" location="servicedef/services_rate.xml"/> <service-resource type="model" loader="main" location="servicedef/services_cost.xml"/> - <service-resource type="model" loader="main" location="servicedef/services_olap.xml"/> <!-- Payment Processor/Gateway Service Definitions --> <service-resource type="model" loader="main" location="servicedef/services_sagepay.xml"/> @@ -91,7 +88,6 @@ under the License. <service-resource type="eca" loader="main" location="servicedef/secas.xml"/> <service-resource type="eca" loader="main" location="servicedef/secas_payment.xml"/> <service-resource type="eca" loader="main" location="servicedef/secas_ledger.xml"/> - <service-resource type="eca" loader="main" location="servicedef/secas_olap.xml"/> <service-resource type="eca" loader="main" location="servicedef/secas_invoice.xml"/> <test-suite loader="main" location="testdef/accountingtests.xml"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/data/ProductStoreData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/data/ProductStoreData.xml?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/data/ProductStoreData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/data/ProductStoreData.xml Mon Dec 1 10:16:27 2014 @@ -57,7 +57,7 @@ <ProductStoreShipmentMeth productStoreShipMethId="9011" productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY" sequenceNumber="12"/> <ProductStoreShipmentMeth productStoreShipMethId="9012" productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_PM" sequenceNumber="13"/> <ProductStoreShipmentMeth productStoreShipMethId="9013" productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY" sequenceNumber="14"/> - <ProductStoreShipmentMeth productStoreShipMethId="9014" productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS" sequenceNumber="15"/> + <ProductStoreShipmentMeth productStoreShipMethId="9014" productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS_SAVER" sequenceNumber="15"/> <ProductStoreShipmentMeth productStoreShipMethId="9015" productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="16"/> <ProductStoreShipmentMeth productStoreShipMethId="9016" productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND_HOME" sequenceNumber="17"/> @@ -77,7 +77,7 @@ <ShipmentCostEstimate productStoreShipMethId="9011" productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="NEXT_DAY" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> <ShipmentCostEstimate productStoreShipMethId="9012" productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="NEXT_PM" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> <ShipmentCostEstimate productStoreShipMethId="9013" productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="SECOND_DAY" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> - <ShipmentCostEstimate productStoreShipMethId="9014" productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="EXPRESS" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> + <ShipmentCostEstimate productStoreShipMethId="9014" productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="EXPRESS_SAVER" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> <ShipmentCostEstimate productStoreShipMethId="9015" productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="GROUND" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> <ShipmentCostEstimate productStoreShipMethId="9016" productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="GROUND_HOME" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> </entity-engine-xml> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/data/ShippingData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/data/ShippingData.xml?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/data/ShippingData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/data/ShippingData.xml Mon Dec 1 10:16:27 2014 @@ -36,48 +36,138 @@ <PartyRole partyId="DHL" roleTypeId="CARRIER"/> <PartyRole partyId="_NA_" roleTypeId="CARRIER"/> <PartyRole partyId="FEDEX" roleTypeId="CARRIER"/> - + <ShipmentMethodType description="No Shipping" shipmentMethodTypeId="NO_SHIPPING"/> <ShipmentMethodType description="Local Delivery" shipmentMethodTypeId="LOCAL_DELIVERY"/> - <ShipmentMethodType description="Ground Home Delivery" shipmentMethodTypeId="GROUND_HOME"/> - <ShipmentMethodType description="Ground" shipmentMethodTypeId="GROUND"/> - <ShipmentMethodType description="Standard" shipmentMethodTypeId="STANDARD"/> - <ShipmentMethodType description="Air" shipmentMethodTypeId="AIR"/> - <ShipmentMethodType description="Second Day" shipmentMethodTypeId="SECOND_DAY"/> - <ShipmentMethodType description="Guaranteed Next Day" shipmentMethodTypeId="NEXT_DAY"/> - <ShipmentMethodType description="Next Afternoon" shipmentMethodTypeId="NEXT_PM"/> + <ShipmentMethodType description="Next Morning" shipmentMethodTypeId="NEXT_AM"/> - <ShipmentMethodType description="Express" shipmentMethodTypeId="EXPRESS"/> - <ShipmentMethodType description="Standard Overnight" shipmentMethodTypeId="ST_OVERNIGHT"/> + <ShipmentMethodType description="Next Afternoon" shipmentMethodTypeId="NEXT_PM"/> + <ShipmentMethodType description="Same Day" shipmentMethodTypeId="SAME_DAY"/> + <ShipmentMethodType description="Guaranteed Next Day" shipmentMethodTypeId="NEXT_DAY"/> + <ShipmentMethodType description="Air" shipmentMethodTypeId="AIR"/> + <ShipmentMethodType description="Third Day" shipmentMethodTypeId="THIRD_DAY"/> + <ShipmentMethodType description="International Express" shipmentMethodTypeId="INT_EXPRESS"/> + <ShipmentMethodType description="Priority Overnight" shipmentMethodTypeId="PR_OVERNIGHT"/> + <ShipmentMethodType description="Standard Overnight" shipmentMethodTypeId="ST_OVERNIGHT"/> <ShipmentMethodType description="First Overnight" shipmentMethodTypeId="FI_OVERNIGHT"/> - <ShipmentMethodType description="Same Day" shipmentMethodTypeId="SAME_DAY"/> + <ShipmentMethodType description="Second Day" shipmentMethodTypeId="SECOND_DAY"/> + <ShipmentMethodType description="Express Saver" shipmentMethodTypeId="EXPRESS_SAVER"/> + <ShipmentMethodType description="International Priority" shipmentMethodTypeId="INTERNAT_PRI"/> + <ShipmentMethodType description="International Economy" shipmentMethodTypeId="INTERNAT_ECON"/> + <ShipmentMethodType description="International First" shipmentMethodTypeId="INTERNAT_FI"/> + <ShipmentMethodType description="1Day Freight" shipmentMethodTypeId="FIRST_DAY_FR"/> + <ShipmentMethodType description="2Day Freight" shipmentMethodTypeId="SECOND_DAY_FR"/> + <ShipmentMethodType description="3Day Freight" shipmentMethodTypeId="THIRD_DAY_FR"/> + <ShipmentMethodType description="Ground" shipmentMethodTypeId="GROUND"/> + <ShipmentMethodType description="Ground Home Delivery" shipmentMethodTypeId="GROUND_HOME"/> + <ShipmentMethodType description="International Economy Freight" shipmentMethodTypeId="INTERNAT_ECON_FR"/> + <ShipmentMethodType description="International Priority Freight" shipmentMethodTypeId="INTERNAT_PRI_FR"/> + <ShipmentMethodType description="2Day AM" shipmentMethodTypeId="SECOND_DAY_AM"/> + <ShipmentMethodType description="Europe First Priority" shipmentMethodTypeId="EUROPE_FI_PRIORITY"/> + <ShipmentMethodType description="Smart Post" shipmentMethodTypeId="SMART_POST"/> + <ShipmentMethodType description="Fedex National Freight" shipmentMethodTypeId="FEDEX_NATIONAL_FR"/> + <ShipmentMethodType description="Fedex International Ground " shipmentMethodTypeId="FEDEX_INT_GROUND"/> + <ShipmentMethodType description="Fedex Freight" shipmentMethodTypeId="FEDEX_FREIGHT"/> + + <ShipmentMethodType description="Standard" shipmentMethodTypeId="STANDARD"/> + <ShipmentMethodType description="Three-Day Select" shipmentMethodTypeId="THIRD_DAY_AIR_SEL"/> + <ShipmentMethodType description="Second Day Air" shipmentMethodTypeId="SECOND_DAY_AIR"/> + <ShipmentMethodType description="Second Day Air Early A.M. " shipmentMethodTypeId="SECOND_DAY_AIR_AM"/> + <ShipmentMethodType description="Next Day Air Saver" shipmentMethodTypeId="NEXT_DAY_AIR_SA"/> + <ShipmentMethodType description="Next Day Air" shipmentMethodTypeId="NEXT_DAY_AIR"/> + <ShipmentMethodType description="Next Day Air Early A.M." shipmentMethodTypeId="NEXT_DAY_AIR_AM"/> + <ShipmentMethodType description="Worldwide ExpressSM" shipmentMethodTypeId="WORLDWIDE_EXPRESS"/> + <ShipmentMethodType description="Worldwide Express Plus" shipmentMethodTypeId="WORLDWIDE_EXPR_PLUS"/> + <ShipmentMethodType description="Worldwide ExpeditedSM" shipmentMethodTypeId="WORLDWIDE_EXPEDITED"/> + <ShipmentMethodType description="Saver" shipmentMethodTypeId="SAVER"/> + + <ShipmentMethodType description="First Class" shipmentMethodTypeId="FIRST_CLASS"/> + <ShipmentMethodType description="First Class International" shipmentMethodTypeId="FC_INTERNATIONAL"/> + <ShipmentMethodType description="Priority" shipmentMethodTypeId="PRIORITY"/> + <ShipmentMethodType description="Priority International" shipmentMethodTypeId="PR_INTERNATIONAL"/> + <ShipmentMethodType description="Express" shipmentMethodTypeId="EXPRESS"/> + <ShipmentMethodType description="Express International" shipmentMethodTypeId="EXP_INTERNATIONAL"/> + <ShipmentMethodType description="Media Mail" shipmentMethodTypeId="MEDIA_MAIL"/> + <ShipmentMethodType description="Standard Post" shipmentMethodTypeId="STANDARD_POST"/> + <ShipmentMethodType description="Library" shipmentMethodTypeId="LIBRARY"/> + + <ShipmentMethodType description="Express Saturday" shipmentMethodTypeId="EXP_SATURDAY"/> + <ShipmentMethodType description="Express 10.30 AM" shipmentMethodTypeId="EXP_10_30_AM"/> + <!-- Local options --> + <CarrierShipmentMethod partyId="_NA_" roleTypeId="CARRIER" shipmentMethodTypeId="STANDARD" sequenceNumber="5"/> + <CarrierShipmentMethod partyId="_NA_" roleTypeId="CARRIER" shipmentMethodTypeId="NO_SHIPPING" sequenceNumber="5"/> + + <!-- Fedex shipping options --> + <CarrierShipmentMethod shipmentMethodTypeId="PR_OVERNIGHT" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="01" carrierServiceCode="PRIORITYOVERNIGHT"/> + <CarrierShipmentMethod shipmentMethodTypeId="ST_OVERNIGHT" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="02" carrierServiceCode="STANDARDOVERNIGHT"/> + <CarrierShipmentMethod shipmentMethodTypeId="FI_OVERNIGHT" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="03" carrierServiceCode="FIRSTOVERNIGHT"/> + <CarrierShipmentMethod shipmentMethodTypeId="SECOND_DAY" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="04" carrierServiceCode="FEDEX2DAY"/> + <CarrierShipmentMethod shipmentMethodTypeId="EXPRESS_SAVER" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="05" carrierServiceCode="FEDEXEXPRESSSAVER"/> + <CarrierShipmentMethod shipmentMethodTypeId="FIRST_DAY_FR" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="06" carrierServiceCode="FEDEX1DAYFREIGHT"/> + <CarrierShipmentMethod shipmentMethodTypeId="SECOND_DAY_FR" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="07" carrierServiceCode="FEDEX2DAYFREIGHT"/> + <CarrierShipmentMethod shipmentMethodTypeId="THIRD_DAY_FR" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="08" carrierServiceCode="FEDEX3DAYFREIGHT"/> + <CarrierShipmentMethod shipmentMethodTypeId="GROUND" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="09" carrierServiceCode="FEDEXGROUND"/> + <CarrierShipmentMethod shipmentMethodTypeId="GROUND_HOME" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="10" carrierServiceCode="GROUNDHOMEDELIVERY"/> + <CarrierShipmentMethod shipmentMethodTypeId="SECOND_DAY_AM" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="11" carrierServiceCode="SECONDDAYAM"/> + <CarrierShipmentMethod shipmentMethodTypeId="SMART_POST" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="12" carrierServiceCode="SMARTPOST"/> + <CarrierShipmentMethod shipmentMethodTypeId="FEDEX_NATIONAL_FR" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="13" carrierServiceCode="FEDEXNATIONALFREIGHT"/> + <CarrierShipmentMethod shipmentMethodTypeId="FEDEX_FREIGHT" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="14" carrierServiceCode="FEDEXFREIGHT"/> + <CarrierShipmentMethod shipmentMethodTypeId="FEDEX_INT_GROUND" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="15" carrierServiceCode="INTERNATIONALGROUND"/> + <CarrierShipmentMethod shipmentMethodTypeId="INTERNAT_PRI" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="16" carrierServiceCode="INTERNATIONALPRIORITY"/> + <CarrierShipmentMethod shipmentMethodTypeId="INTERNAT_ECON" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="17" carrierServiceCode="INTERNATIONALECONOMY"/> + <CarrierShipmentMethod shipmentMethodTypeId="INTERNAT_FI" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="18" carrierServiceCode="INTERNATIONALFIRST"/> + <CarrierShipmentMethod shipmentMethodTypeId="INTERNAT_ECON_FR" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="19" carrierServiceCode="INTERNATIONALECONOMYFREIGHT"/> + <CarrierShipmentMethod shipmentMethodTypeId="INTERNAT_PRI_FR" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="20" carrierServiceCode="INTERNATIONALPRIORITYFREIGHT"/> + <CarrierShipmentMethod shipmentMethodTypeId="EUROPE_FI_PRIORITY" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="21" carrierServiceCode="EUROPEFIRSTINTERNATIONALPRIORITY"/> + <CarrierShipmentMethod shipmentMethodTypeId="NEXT_AM" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="22" carrierServiceCode="FIRSTOVERNIGHT"/> + <CarrierShipmentMethod shipmentMethodTypeId="NEXT_PM" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="23" carrierServiceCode="STANDARDOVERNIGHT"/> + <CarrierShipmentMethod shipmentMethodTypeId="SAME_DAY" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="24" carrierServiceCode="SAMEDAY"/> + <CarrierShipmentMethod shipmentMethodTypeId="NEXT_DAY" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="25" carrierServiceCode="PRIORITYOVERNIGHT"/> + + <!-- UPS shipping options --> + <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="STANDARD" sequenceNumber="01" carrierServiceCode="11"/> + <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="THIRD_DAY_AIR_SEL" sequenceNumber="02" carrierServiceCode="12"/> + <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY_AIR" sequenceNumber="03" carrierServiceCode="02"/> + <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY_AIR_AM" sequenceNumber="04" carrierServiceCode="59"/> + <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY_AIR_SA" sequenceNumber="05" carrierServiceCode="13"/> + <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY_AIR" sequenceNumber="06" carrierServiceCode="01"/> + <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY_AIR_AM" sequenceNumber="07" carrierServiceCode="14"/> + <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="WORLDWIDE_EXPRESS" sequenceNumber="08" carrierServiceCode="07"/> + <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="WORLDWIDE_EXPR_PLUS" sequenceNumber="09" carrierServiceCode="54"/> + <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="WORLDWIDE_EXPEDITED" sequenceNumber="10" carrierServiceCode="08"/> + <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="SAVER" sequenceNumber="11" carrierServiceCode="65"/> + <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="12" carrierServiceCode="03"/> + <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="AIR" sequenceNumber="13" carrierServiceCode="02"/> + <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="THIRD_DAY" sequenceNumber="14" carrierServiceCode="THIRDDAY"/> + <!-- End of UPS Data --> + + <!-- USPS Data --> <!-- For USPS, only certain container types are allowed for rate estimates of Priority or Express service codes --> <CarrierShipmentMethod partyId="USPS" roleTypeId="CARRIER" shipmentMethodTypeId="STANDARD" sequenceNumber="7" carrierServiceCode="Parcel"/> - <CarrierShipmentMethod partyId="USPS" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS" sequenceNumber="6" carrierServiceCode="Express"/> - <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="3" carrierServiceCode="03"/> - <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY" sequenceNumber="2" carrierServiceCode="02"/> - <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="AIR" sequenceNumber="2" carrierServiceCode="02"/> - <CarrierShipmentMethod partyId="UPS" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY" sequenceNumber="1" carrierServiceCode="01"/> - <CarrierShipmentMethod partyId="_NA_" roleTypeId="CARRIER" shipmentMethodTypeId="STANDARD" sequenceNumber="5"/> - <CarrierShipmentMethod partyId="_NA_" roleTypeId="CARRIER" shipmentMethodTypeId="NO_SHIPPING" sequenceNumber="8"/> - <CarrierShipmentMethod partyId="DHL" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS" sequenceNumber="9" carrierServiceCode="E"/> - <CarrierShipmentMethod partyId="DHL" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_PM" sequenceNumber="10" carrierServiceCode="N"/> - <CarrierShipmentMethod partyId="DHL" roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY" sequenceNumber="11" carrierServiceCode="S"/> - <CarrierShipmentMethod partyId="DHL" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="12" carrierServiceCode="G"/> - <CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER" shipmentMethodTypeId="SAME_DAY" sequenceNumber="12" carrierServiceCode="SAMEDAY"/> - <CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_AM" sequenceNumber="13" carrierServiceCode="FIRSTOVERNIGHT"/> - <CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER" shipmentMethodTypeId="FI_OVERNIGHT" sequenceNumber="13" carrierServiceCode="FIRSTOVERNIGHT"/> - <CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY" sequenceNumber="14" carrierServiceCode="PRIORITYOVERNIGHT"/> - <CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER" shipmentMethodTypeId="PR_OVERNIGHT" sequenceNumber="14" carrierServiceCode="PRIORITYOVERNIGHT"/> - <CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_PM" sequenceNumber="15" carrierServiceCode="STANDARDOVERNIGHT"/> - <CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER" shipmentMethodTypeId="ST_OVERNIGHT" sequenceNumber="15" carrierServiceCode="STANDARDOVERNIGHT"/> - <CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY" sequenceNumber="16" carrierServiceCode="FEDEX2DAY"/> - <CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS" sequenceNumber="17" carrierServiceCode="FEDEXEXPRESSSAVER"/> - <CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="18" carrierServiceCode="FEDEXGROUND"/> - <CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND_HOME" sequenceNumber="19" carrierServiceCode="GROUNDHOMEDELIVERY"/> - + <CarrierShipmentMethod shipmentMethodTypeId="FIRST_CLASS" partyId="USPS" roleTypeId="CARRIER" sequenceNumber="01" carrierServiceCode="FIRST CLASS"/> + <CarrierShipmentMethod shipmentMethodTypeId="FC_INTERNATIONAL" partyId="USPS" roleTypeId="CARRIER" sequenceNumber="02" carrierServiceCode="FIRST CLASS"/> + <CarrierShipmentMethod shipmentMethodTypeId="PRIORITY" partyId="USPS" roleTypeId="CARRIER" sequenceNumber="03" carrierServiceCode="PRIORITY"/> + <CarrierShipmentMethod shipmentMethodTypeId="PR_INTERNATIONAL" partyId="USPS" roleTypeId="CARRIER" sequenceNumber="04" carrierServiceCode="PRIORITY"/> + <CarrierShipmentMethod shipmentMethodTypeId="EXPRESS" partyId="USPS" roleTypeId="CARRIER" sequenceNumber="05" carrierServiceCode="EXPRESS"/> + <CarrierShipmentMethod shipmentMethodTypeId="EXP_INTERNATIONAL" partyId="USPS" roleTypeId="CARRIER" sequenceNumber="06" carrierServiceCode="EXPRESS"/> + <CarrierShipmentMethod shipmentMethodTypeId="MEDIA_MAIL" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="07" carrierServiceCode="MEDIA"/> + <CarrierShipmentMethod shipmentMethodTypeId="STANDARD_POST" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="08" carrierServiceCode="STANDARD POST"/> + <CarrierShipmentMethod shipmentMethodTypeId="LIBRARY" partyId="FEDEX" roleTypeId="CARRIER" sequenceNumber="09" carrierServiceCode="LIBRARY"/> + <CarrierShipmentMethod shipmentMethodTypeId="INT_EXPRESS" partyId="USPS" roleTypeId="CARRIER" sequenceNumber="10" carrierServiceCode="INTEXPRESS"/> + <!-- End of USPS Data--> + + <!-- DHL shipping options --> + <CarrierShipmentMethod partyId="DHL" roleTypeId="CARRIER" shipmentMethodTypeId="INT_EXPRESS" sequenceNumber="1" carrierServiceCode="IE"/> + <CarrierShipmentMethod partyId="DHL" roleTypeId="CARRIER" shipmentMethodTypeId="EXP_SATURDAY" sequenceNumber="2" carrierServiceCode="E SAT"/> + <CarrierShipmentMethod partyId="DHL" roleTypeId="CARRIER" shipmentMethodTypeId="EXP_10_30_AM" sequenceNumber="3" carrierServiceCode="E 10.30 AM"/> + <CarrierShipmentMethod partyId="DHL" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS" sequenceNumber="4" carrierServiceCode="E"/> + <CarrierShipmentMethod partyId="DHL" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_PM" sequenceNumber="5" carrierServiceCode="N"/> + <CarrierShipmentMethod partyId="DHL" roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY" sequenceNumber="6" carrierServiceCode="S"/> + <CarrierShipmentMethod partyId="DHL" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="7" carrierServiceCode="G"/> + <!-- End of DHL Data--> + <QuantityBreak fromQuantity="0.0" quantityBreakId="9000" quantityBreakTypeId="SHIP_WEIGHT" thruQuantity="0.0"/> <QuantityBreak fromQuantity="0.0" quantityBreakId="9001" quantityBreakTypeId="SHIP_WEIGHT" thruQuantity="0.0"/> <QuantityBreak fromQuantity="0.0" quantityBreakId="9002" quantityBreakTypeId="SHIP_WEIGHT" thruQuantity="0.0"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/EmployeeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/EmployeeScreens.xml?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/EmployeeScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/EmployeeScreens.xml Mon Dec 1 10:16:27 2014 @@ -84,7 +84,7 @@ under the License. <set field="tabButtonItem" value="EmployeeProfile"/> <set field="labelTitleProperty" value="PartyTaxAuthInfos"/> <set field="partyId" from-field="parameters.partyId"/> - <set field="layoutSettings.javaScripts[]" value="/partymgr/js/PartyProfileContent.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/partymgr/static/PartyProfileContent.js" global="true"/> <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/> <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/> </actions> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/widget/sfa/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/widget/sfa/CommonScreens.xml?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/widget/sfa/CommonScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/widget/sfa/CommonScreens.xml Mon Dec 1 10:16:27 2014 @@ -198,7 +198,7 @@ under the License. <set field="tabButtonItem" value="profile"/> <set field="labelTitleProperty" value="PartyTaxAuthInfos"/> - <set field="layoutSettings.javaScripts[]" value="/partymgr/js/PartyProfileContent.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/partymgr/static/PartyProfileContent.js" global="true"/> <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/> <script location="component://party/webapp/partymgr/WEB-INF/actions/party/SetRoleVars.groovy"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/data/OrderTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/data/OrderTypeData.xml?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/data/OrderTypeData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/data/OrderTypeData.xml Mon Dec 1 10:16:27 2014 @@ -301,6 +301,8 @@ under the License. <ReturnItemType description="Return Work-Effort Item" returnItemTypeId="RET_WE_ITEM" parentTypeId="RET_NPROD_ITEM"/> <ReturnItemType description="Return Time-Entry Item" returnItemTypeId="RET_TE_ITEM" parentTypeId="RET_NPROD_ITEM"/> + + <ReturnItemType description="Return Raw Material Item" returnItemTypeId="RET_MPROD_ITEM" parentTypeId="RET_PROD_ITEM"/> <!-- maps product types to return item types for product order items, order item types to return item types for other order items and order adjustment types to return adjustment types. Separate mappings for different types of returns (customer vs. vendor) --> @@ -325,6 +327,7 @@ under the License. <ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN" returnItemMapKey="RENTAL_ORDER_ITEM" returnItemTypeId="RET_FPROD_ITEM" /> <ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN" returnItemMapKey="ASSET_USAGE_OUT_IN" returnItemTypeId="RET_FPROD_ITEM" /> <ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN" returnItemMapKey="SERVICE_PRODUCT" returnItemTypeId="RET_SPROD_ITEM"/> + <ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN" returnItemMapKey="RAW_MATERIAL" returnItemTypeId="RET_MPROD_ITEM"/> <ReturnItemTypeMap returnHeaderTypeId="VENDOR_RETURN" returnItemMapKey="FINISHED_GOOD" returnItemTypeId="RET_FPROD_ITEM"/> <ReturnItemTypeMap returnHeaderTypeId="VENDOR_RETURN" returnItemMapKey="MARKETING_PKG_AUTO" returnItemTypeId="RET_FPROD_ITEM"/> <ReturnItemTypeMap returnHeaderTypeId="VENDOR_RETURN" returnItemMapKey="MARKETING_PKG_PICK" returnItemTypeId="RET_FPROD_ITEM"/> @@ -343,7 +346,7 @@ under the License. <ReturnItemTypeMap returnHeaderTypeId="VENDOR_RETURN" returnItemMapKey="SURCHARGE_ADJUSTMENT" returnItemTypeId="RET_SURCHARGE_ADJ"/> <ReturnItemTypeMap returnHeaderTypeId="VENDOR_RETURN" returnItemMapKey="ADDITIONAL_FEATURE" returnItemTypeId="RET_ADD_FEATURE_ADJ"/> <ReturnItemTypeMap returnHeaderTypeId="VENDOR_RETURN" returnItemMapKey="WARRANTY_ADJUSTMENT" returnItemTypeId="RET_WARRANTY_ADJ"/> - + <ReturnItemTypeMap returnHeaderTypeId="VENDOR_RETURN" returnItemMapKey="RAW_MATERIAL" returnItemTypeId="RET_MPROD_ITEM"/> <!-- Return Reasons --> <ReturnReason sequenceId="01" returnReasonId="RTN_NOT_WANT" description="Did Not Want Item"/> <ReturnReason sequenceId="02" returnReasonId="RTN_DEFECTIVE_ITEM" description="Defective Item"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/ofbiz-component.xml?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/ofbiz-component.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/ofbiz-component.xml Mon Dec 1 10:16:27 2014 @@ -28,8 +28,6 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/> - <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_olap.xml"/> - <entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup_olap.xml"/> <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderPortletData.xml"/> @@ -49,7 +47,6 @@ under the License. <service-resource type="model" loader="main" location="servicedef/services_return.xml"/> <service-resource type="model" loader="main" location="servicedef/services_upgrade.xml"/> <service-resource type="model" loader="main" location="servicedef/services_checkout.xml"/> - <service-resource type="model" loader="main" location="servicedef/services_olap.xml"/> <service-resource type="eca" loader="main" location="servicedef/secas.xml"/> <test-suite loader="main" location="testdef/FinAccountTests.xml"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/secas.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/secas.xml?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/secas.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/secas.xml Mon Dec 1 10:16:27 2014 @@ -436,17 +436,10 @@ under the License. <action service="createReturnStatus" mode="sync"/> </eca> - <!-- fact entities --> - <!-- Load data into the SalesOrderItemFact olap entity when a sales order is set to ready --> - <eca service="changeOrderItemStatus" event="commit"> - <condition field-name="statusId" operator="equals" value="ITEM_APPROVED"/> - <condition-field field-name="statusId" operator="not-equals" to-field-name="oldStatusId"/> - <action service="loadSalesOrderFact" mode="sync" run-as-user="system"/> - </eca> <eca service="createUpdateCustomerAndShippingAddress" event="invoke"> <action service="setAnonUserLogin" mode="sync"/> </eca> - + <!-- Use for link the payment and the invoice When Received Payment --> <eca service="createPaymentFromPreference" event="commit"> <condition field-name="paymentId" operator="is-not-empty"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml Mon Dec 1 10:16:27 2014 @@ -1069,25 +1069,6 @@ under the License. <attribute name="availabalityList" type="List" mode="OUT"/> </service> - <!-- Order Facts --> - <service name="loadSalesOrderFact" auth="true" engine="simple" - location="component://order/script/org/ofbiz/order/olap/FactServices.xml" invoke="loadSalesOrderFact"> - <description>Calls the loadSalesOrderItemFact service for all the order items.</description> - <attribute name="orderId" type="String" mode="IN" optional="false"/> - </service> - - <service name="loadSalesOrderItemFact" auth="true" engine="simple" - location="component://order/script/org/ofbiz/order/olap/FactServices.xml" invoke="loadSalesOrderItemFact"> - <description> - Pulls information from the OrderItem* entities and stores them in the SalesOrderItem entity (olap entity). - One of orderId/orderItemSeqId or order/orderItem must be passed or an error is returned. - </description> - <attribute name="orderId" type="String" mode="IN" optional="true"/> - <attribute name="orderItemSeqId" type="String" mode="IN" optional="true"/> - <attribute name="orderHeader" type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/> - <attribute name="orderItem" type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/> - <attribute name="orderAdjustment " type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/> - </service> <service name="createQuoteTerm" engine="simple" default-entity-name="QuoteTerm" location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuoteTerm"> <description> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyUiLabels.xml?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyUiLabels.xml Mon Dec 1 10:16:27 2014 @@ -11071,6 +11071,10 @@ <value xml:lang="zh">è§è²ç±»åæ¥èª</value> <value xml:lang="zh_TW">è§è²é¡åä¾èª</value> </property> + <property key="PartyRoleTypeNotFoundForTheParty"> + <value xml:lang="en">Role Type ${roleTypeId} not found for the party.</value> + <value xml:lang="fr">Le rôle ${roleTypeId} n'est pas présent pour cet acteur.</value> + </property> <property key="PartyRoleTypeId"> <value xml:lang="de">Rolle Typ ID</value> <value xml:lang="en">RoleType ID</value> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Mon Dec 1 10:16:27 2014 @@ -418,6 +418,14 @@ under the License. </simple-method> <simple-method method-name="createPostalAddressAndPurposes" short-description="Create postal address, purposes and set them defaults" login-required="false"> + <if-not-empty field="parameters.roleTypeId"> + <entity-one value-field="partyRole" entity-name="PartyRole" /> + <if-empty field="partyRole"> + <set field="roleTypeId" from-field="parameters.roleTypeId"/> + <add-error><fail-property resource="PartyUiLabels" property="PartyRoleTypeNotFoundForTheParty"/></add-error> + </if-empty> + <check-errors /> + </if-not-empty> <call-service service-name="createPartyPostalAddress" in-map-name="parameters"> <result-to-field result-name="contactMechId" field="parameters.contactMechId"/> <result-to-result result-name="contactMechId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/web.xml?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/web.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/web.xml Mon Dec 1 10:16:27 2014 @@ -39,11 +39,6 @@ under the License. <param-value>component://party/widget/partymgr/CommonScreens.xml</param-value> <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description> </context-param> - <context-param> - <param-name>scriptLocationPath</param-name> - <param-value>/WEB-INF/bsh</param-value> - <description>BeanShell Script Location</description> - </context-param> <filter> <filter-name>ContextFilter</filter-name> @@ -55,7 +50,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/static:/js</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/static</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/PartyScreens.xml?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/PartyScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/PartyScreens.xml Mon Dec 1 10:16:27 2014 @@ -63,7 +63,7 @@ under the License. <set field="tabButtonItem" value="viewprofile"/> <set field="labelTitleProperty" value="PartyTaxAuthInfos"/> <set field="partyId" from-field="parameters.partyId"/> - <set field="layoutSettings.javaScripts[]" value="/partymgr/js/PartyProfileContent.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/partymgr/static/PartyProfileContent.js" global="true"/> <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/> </actions> <widgets> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/ofbiz-component.xml?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/ofbiz-component.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/ofbiz-component.xml Mon Dec 1 10:16:27 2014 @@ -30,8 +30,6 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_shipment.xml"/> - <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_olap.xml"/> - <entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup_olap.xml"/> <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ProductScheduledServices.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductTypeData.xml"/> @@ -43,7 +41,6 @@ under the License. <entity-resource type="data" reader-name="demo" loader="main" location="data/FacilitySecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/ProductDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ApiSchemaDhl.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/DimensionTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductPortletData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> @@ -64,10 +61,8 @@ under the License. <service-resource type="model" loader="main" location="servicedef/services_view.xml"/> <service-resource type="model" loader="main" location="servicedef/services_cost.xml"/> <service-resource type="model" loader="main" location="servicedef/services_uom.xml"/> - <service-resource type="model" loader="main" location="servicedef/services_olap.xml"/> <service-resource type="eca" loader="main" location="servicedef/secas.xml"/> <service-resource type="eca" loader="main" location="servicedef/secas_shipment.xml"/> - <service-resource type="eca" loader="main" location="servicedef/secas_olap.xml"/> <service-resource type="model" loader="main" location="servicedef/services_upgrade.xml"/> <!-- test suite --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java Mon Dec 1 10:16:27 2014 @@ -94,7 +94,7 @@ public class CatalogUrlFilter extends Co if (UtilValidate.isNotEmpty(productContentInfos)) { for (GenericValue productContentInfo : productContentInfos) { String contentId = (String) productContentInfo.get("contentId"); - List<GenericValue> ContentAssocDataResourceViewTos = EntityQuery.use(delegator).where("ContentAssocDataResourceViewTo").where("contentIdStart", contentId, "caContentAssocTypeId", "ALTERNATE_LOCALE", "drDataResourceTypeId", "ELECTRONIC_TEXT").cache(true).queryList(); + List<GenericValue> ContentAssocDataResourceViewTos = EntityQuery.use(delegator).from("ContentAssocDataResourceViewTo").where("contentIdStart", contentId, "caContentAssocTypeId", "ALTERNATE_LOCALE", "drDataResourceTypeId", "ELECTRONIC_TEXT").cache(true).queryList(); if (UtilValidate.isNotEmpty(ContentAssocDataResourceViewTos)) { for (GenericValue ContentAssocDataResourceViewTo : ContentAssocDataResourceViewTos) { GenericValue ElectronicText = ContentAssocDataResourceViewTo.getRelatedOne("ElectronicText", true); @@ -115,7 +115,7 @@ public class CatalogUrlFilter extends Co } } if (UtilValidate.isEmpty(productId)) { - List<GenericValue> contentDataResourceViews = EntityQuery.use(delegator).where("ContentDataResourceView").where("contentId", contentId, "drDataResourceTypeId", "ELECTRONIC_TEXT").cache(true).queryList(); + List<GenericValue> contentDataResourceViews = EntityQuery.use(delegator).from("ContentDataResourceView").where("contentId", contentId, "drDataResourceTypeId", "ELECTRONIC_TEXT").cache(true).queryList(); for (GenericValue contentDataResourceView : contentDataResourceViews) { GenericValue ElectronicText = contentDataResourceView.getRelatedOne("ElectronicText", true); if (UtilValidate.isNotEmpty(ElectronicText)) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java Mon Dec 1 10:16:27 2014 @@ -35,6 +35,7 @@ import javax.imageio.ImageIO; import javolution.util.FastList; import javolution.util.FastMap; + import org.jdom.JDOMException; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; @@ -160,7 +161,7 @@ public class ImageManagementServices { file = checkExistsImage(file); if (UtilValidate.isNotEmpty(file)) { imageName = file.getPath(); - imageName = imageName.substring(imageName.lastIndexOf("/") + 1); + imageName = imageName.substring(imageName.lastIndexOf(File.separator) + 1); } if (UtilValidate.isEmpty(imageResize)) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java Mon Dec 1 10:16:27 2014 @@ -259,7 +259,7 @@ public class LoginEvents { // get the ProductStore email settings GenericValue productStoreEmail = null; try { - productStoreEmail = delegator.findOne("ProductStoreEmailSetting", false, "productStoreId", productStoreId, "emailType", "PRDS_PWD_RETRIEVE"); + productStoreEmail = EntityQuery.use(delegator).from("ProductStoreEmailSetting").where("productStoreId", productStoreId, "emailType", "PRDS_PWD_RETRIEVE").queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Problem getting ProductStoreEmailSetting", module); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java Mon Dec 1 10:16:27 2014 @@ -30,14 +30,12 @@ import org.ofbiz.content.content.Content import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.util.EntityQuery; -import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.entity.model.ModelUtil; import org.ofbiz.entity.model.ModelEntity; import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.GeneralRuntimeException; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.cache.UtilCache; @@ -314,8 +312,12 @@ public class WorkEffortContentWrapper im } public static List<String> getWorkEffortContentTextList(GenericValue workEffort, String workEffortContentTypeId, Locale locale, String mimeTypeId, Delegator delegator, LocalDispatcher dispatcher) throws GeneralException, IOException { - List<GenericValue> partyContentList = delegator.findByAnd("WorkEffortContent", UtilMisc.toMap("workEffortId", workEffort.getString("partyId"), "workEffortContentTypeId", workEffortContentTypeId), UtilMisc.toList("-fromDate"), true); - partyContentList = EntityUtil.filterByDate(partyContentList); + List<GenericValue> partyContentList = EntityQuery.use(delegator).from("WorkEffortContent") + .where("workEffortId", workEffort.getString("partyId"), "workEffortContentTypeId", workEffortContentTypeId) + .orderBy("-fromDate") + .cache(true) + .filterByDate() + .queryList(); List<String> contentList = FastList.newInstance(); if (partyContentList != null) { @@ -345,19 +347,18 @@ public class WorkEffortContentWrapper im throw new IllegalArgumentException("Delegator missing"); } - List<GenericValue> workEffortContentList = null; + GenericValue workEffortContent = null; try { - workEffortContentList = delegator.findByAnd("WorkEffortContent", UtilMisc.toMap("workEffortId", workEffortId, "workEffortContentTypeId", workEffortContentTypeId), UtilMisc.toList("-fromDate"), true); + workEffortContent = EntityQuery.use(delegator).from("WorkEffortContent") + .where("workEffortId", workEffortId, "workEffortContentTypeId", workEffortContentTypeId) + .orderBy("-fromDate") + .filterByDate() + .cache(true) + .queryFirst(); } catch (GeneralException e) { Debug.logError(e, module); } - - if (workEffortContentList != null) { - workEffortContentList = EntityUtil.filterByDate(workEffortContentList); - return EntityUtil.getFirst(workEffortContentList); - } else { - return null; - } + return workEffortContent; } public static WorkEffortContentWrapper makeWorkEffortContentWrapper(GenericValue workEffort, HttpServletRequest request) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java Mon Dec 1 10:16:27 2014 @@ -88,10 +88,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; -import org.ofbiz.entity.condition.EntityCondition; -import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.util.EntityQuery; -import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ModelParam; @@ -329,7 +326,7 @@ public class ICalConverter { Summary summary = new Summary(UtilProperties.getMessage("WorkEffortUiLabels", "WorkEffortEventReminder", Locale.getDefault())); Delegator delegator = workEffort.getDelegator(); String workEffortId = workEffort.getString("workEffortId"); - List<GenericValue> reminderList = delegator.findList("WorkEffortEventReminder", EntityCondition.makeCondition("workEffortId", EntityOperator.EQUALS, workEffort.get("workEffortId")), null, null, null, false); + List<GenericValue> reminderList = EntityQuery.use(delegator).from("WorkEffortEventReminder").where("workEffortId", workEffort.get("workEffortId")).queryList(); for (GenericValue reminder : reminderList) { String reminderId = workEffortId + "-" + reminder.getString("sequenceId"); VAlarm alarm = null; @@ -740,7 +737,7 @@ public class ICalConverter { if (workEffortId == null) { Property uid = component.getProperty(Uid.UID); if (uid != null) { - GenericValue workEffort = EntityUtil.getFirst(delegator.findByAnd("WorkEffort", UtilMisc.toMap("universalId", uid.getValue()), null, false)); + GenericValue workEffort = EntityQuery.use(delegator).from("WorkEffort").where("universalId", uid.getValue()).queryFirst(); if (workEffort != null) { workEffortId = workEffort.getString("workEffortId"); } @@ -807,7 +804,7 @@ public class ICalConverter { Delegator delegator = (Delegator) context.get("delegator"); List<GenericValue> assignments = null; try { - assignments = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortPartyAssignment", serviceMap, null, false)); + assignments = EntityQuery.use(delegator).from("WorkEffortPartyAssignment").where(serviceMap).filterByDate().queryList(); if (assignments.size() == 0) { serviceMap.put("statusId", "PRTYASGN_OFFERED"); serviceMap.put("fromDate", new Timestamp(System.currentTimeMillis())); @@ -905,7 +902,7 @@ public class ICalConverter { if (workEffort.get("estimatedCompletionDate") == null) { replaceProperty(componentProps, toDuration(workEffort.getDouble("estimatedMilliSeconds"))); } - List<GenericValue> relatedParties = EntityUtil.filterByDate(delegator.findList("WorkEffortPartyAssignView", EntityCondition.makeCondition("workEffortId", EntityOperator.EQUALS, workEffortId), null, null, null, true)); + List<GenericValue> relatedParties = EntityQuery.use(delegator).from("WorkEffortPartyAssignView").where("workEffortId", workEffortId).cache(true).filterByDate().queryList(); if (relatedParties.size() > 0) { loadRelatedParties(relatedParties, componentProps, context); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java Mon Dec 1 10:16:27 2014 @@ -37,6 +37,7 @@ import org.ofbiz.content.data.DataResour import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; +import org.ofbiz.entity.util.EntityQuery; import org.ofbiz.entity.util.EntityUtil; public class WorkEffortKeywordIndex { @@ -68,15 +69,15 @@ public class WorkEffortKeywordIndex { addWeightedKeywordSourceString(workEffort, "currentStatusId", strings); if (!"0".equals(UtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortNoteAndData.noteInfo", "1"))) { - List<GenericValue> workEffortNotes = delegator.findByAnd("WorkEffortNoteAndData", UtilMisc.toMap("workEffortId", workEffortId), null, false); + List<GenericValue> workEffortNotes = EntityQuery.use(delegator).from("WorkEffortNoteAndData").where("workEffortId", workEffortId).queryList(); for (GenericValue workEffortNote : workEffortNotes) { addWeightedKeywordSourceString(workEffortNote, "noteInfo", strings); - } + } } //WorkEffortAttribute if (!"0".equals(UtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortAttribute.attrName", "1")) || !"0".equals(UtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortAttribute.attrValue", "1"))) { - List<GenericValue> workEffortAttributes = delegator.findByAnd("WorkEffortAttribute", UtilMisc.toMap("workEffortId", workEffortId), null, false); + List<GenericValue> workEffortAttributes = EntityQuery.use(delegator).from("WorkEffortAttribute").where("workEffortId", workEffortId).queryList(); for (GenericValue workEffortAttribute : workEffortAttributes) { addWeightedKeywordSourceString(workEffortAttribute, "attrName", strings); addWeightedKeywordSourceString(workEffortAttribute, "attrValue", strings); @@ -92,7 +93,7 @@ public class WorkEffortKeywordIndex { Debug.logWarning("Could not parse weight number: " + e.toString(), module); } - List<GenericValue> workEffortContentAndInfos = delegator.findByAnd("WorkEffortContentAndInfo", UtilMisc.toMap("workEffortId", workEffortId, "workEffortContentTypeId", workEffortContentTypeId), null, false); + List<GenericValue> workEffortContentAndInfos = EntityQuery.use(delegator).from("WorkEffortContentAndInfo").where("workEffortId", workEffortId, "workEffortContentTypeId", workEffortContentTypeId).queryList(); for (GenericValue workEffortContentAndInfo: workEffortContentAndInfos) { addWeightedDataResourceString(workEffortContentAndInfo, weight, strings, delegator, workEffort); List<GenericValue> alternateViews = workEffortContentAndInfo.getRelated("ContentAssocDataResourceViewTo", UtilMisc.toMap("caContentAssocTypeId", "ALTERNATE_LOCALE"), UtilMisc.toList("-caFromDate"), false); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java?rev=1642661&r1=1642660&r2=1642661&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java Mon Dec 1 10:16:27 2014 @@ -40,7 +40,6 @@ import org.ofbiz.common.KeywordSearchUti import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; -import org.ofbiz.entity.condition.EntityComparisonOperator; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityConditionList; import org.ofbiz.entity.condition.EntityExpr; @@ -52,7 +51,6 @@ import org.ofbiz.entity.model.ModelViewE import org.ofbiz.entity.model.ModelViewEntity.ComplexAliasField; import org.ofbiz.entity.transaction.GenericTransactionException; import org.ofbiz.entity.transaction.TransactionUtil; -import org.ofbiz.entity.util.EntityFindOptions; import org.ofbiz.entity.util.EntityListIterator; import org.ofbiz.entity.util.EntityQuery; import org.ofbiz.entity.util.EntityUtil; @@ -103,7 +101,7 @@ public class WorkEffortSearch { // now find all sub-categories, filtered by effective dates, and call this routine for them try { // Find WorkEffortAssoc, workEffortAssocTypeId=WORK_EFF_BREAKDOWN - List<GenericValue> workEffortAssocList = delegator.findByAnd("WorkEffortAssoc", UtilMisc.toMap("workEffortIdFrom", workEffortId, "workEffortAssocTypeId", "WORK_EFF_BREAKDOWN"), null, true); + List<GenericValue> workEffortAssocList = EntityQuery.use(delegator).from("WorkEffortAssoc").where("workEffortIdFrom", workEffortId, "workEffortAssocTypeId", "WORK_EFF_BREAKDOWN").cache(true).queryList(); for (GenericValue workEffortAssoc: workEffortAssocList) { String subWorkEffortId = workEffortAssoc.getString("workEffortIdTo"); if (workEffortIdSet.contains(subWorkEffortId)) { @@ -118,8 +116,7 @@ public class WorkEffortSearch { } // Find WorkEffort where current workEffortId = workEffortParentId; only select minimal fields to keep the size low - List<GenericValue> childWorkEffortList = delegator.findList("WorkEffort", EntityCondition.makeCondition("workEffortParentId", EntityComparisonOperator.EQUALS, workEffortId), - UtilMisc.toSet("workEffortId", "workEffortParentId"), null, null, true); + List<GenericValue> childWorkEffortList = EntityQuery.use(delegator).select("workEffortId", "workEffortParentId").from("WorkEffort").where("workEffortParentId", workEffortId).cache(true).queryList(); for (GenericValue childWorkEffort: childWorkEffortList) { String subWorkEffortId = childWorkEffort.getString("workEffortId"); if (workEffortIdSet.contains(subWorkEffortId)) { @@ -306,20 +303,23 @@ public class WorkEffortSearch { resultSortOrder.setSortOrder(this); } dynamicViewEntity.addAlias("WEFF", "workEffortId", null, null, null, Boolean.valueOf(workEffortIdGroupBy), null); - EntityCondition whereCondition = EntityCondition.makeCondition(entityConditionList, EntityOperator.AND); // Debug.logInfo("WorkEffortSearch, whereCondition = " + whereCondition.toString(), module); - EntityFindOptions efo = new EntityFindOptions(); - efo.setDistinct(true); - efo.setResultSetType(EntityFindOptions.TYPE_SCROLL_INSENSITIVE); - if (maxResults != null) { - efo.setMaxRows(maxResults); - } - EntityListIterator eli = null; try { - eli = delegator.findListIteratorByCondition(dynamicViewEntity, whereCondition, null, fieldsToSelect, orderByList, efo); + int maxRows = 0; + if (maxResults != null) { + maxRows = maxResults; + } + eli = EntityQuery.use(delegator).select(UtilMisc.toSet(fieldsToSelect)) + .from(dynamicViewEntity) + .where(entityConditionList) + .orderBy(orderByList) + .distinct() + .cursorScrollInsensitive() + .maxRows(maxRows) + .queryIterator(); } catch (GenericEntityException e) { Debug.logError(e, "Error in workEffort search", module); return null; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |