OFBiz › OFBiz - Commits

svn commit: r796874 [1/2] - in /ofbiz/trunk/applications/product: ./ config/ data/ entitydef/ script/org/ofbiz/shipment/shipment/ servicedef/ webapp/catalog/store/ webapp/facility/WEB-INF/ widget/catalog/ widget/facility/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
mrisaliti
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r796874 [1/2] - in /ofbiz/trunk/applications/product: ./ config/ data/ entitydef/ script/org/ofbiz/shipment/shipment/ servicedef/ webapp/catalog/store/ webapp/facility/WEB-INF/ widget/catalog/ widget/facility/

mrisaliti
Author: mrisaliti
Date: Wed Jul 22 20:39:35 2009
New Revision: 796874

URL: http://svn.apache.org/viewvc?rev=796874&view=rev
Log:
New Shipment Gateway Config entities (OFBIZ-2589)

Added:
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml   (with props)
    ofbiz/trunk/applications/product/servicedef/services_shipmentgateway.xml   (with props)
    ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigForms.xml   (with props)
    ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml   (with props)
Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/data/ShipmentTypeData.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
    ofbiz/trunk/applications/product/ofbiz-component.xml
    ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
    ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
    ofbiz/trunk/applications/product/widget/facility/Menus.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=796874&r1=796873&r2=796874&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Wed Jul 22 20:39:35 2009
@@ -67,15 +67,15 @@
         <value xml:lang="zh">场所</value>
         <value xml:lang="zh_CN">仓储设施</value>
     </property>
+    <property key="FacilityGroupByNoOfOrderItems">
+        <value xml:lang="en">Group by number of order items</value>
+    </property>
     <property key="FacilityGroupByShippingMethod">
         <value xml:lang="en">Group by shipping method</value>
     </property>
     <property key="FacilityGroupByWarehouseArea">
         <value xml:lang="en">Group by warehouse area</value>
     </property>
-    <property key="FacilityGroupByNoOfOrderItems">
-        <value xml:lang="en">Group by number of order items</value>
-    </property>
     <property key="FacilityGroupName">
         <value xml:lang="en">Group Name</value>
     </property>
@@ -95,6 +95,9 @@
         <value xml:lang="zh">库存</value>
         <value xml:lang="zh_CN">库存</value>
     </property>
+    <property key="FacilityMultipleLocations">
+        <value xml:lang="en">Multiple Locations</value>
+    </property>
     <property key="FacilityNoFacility">
         <value xml:lang="de">Kein Lager</value>
         <value xml:lang="en">No Facility</value>
@@ -130,17 +133,14 @@
     <property key="FacilityNumberOfItemsThreeOrMore">
         <value xml:lang="en">Items 3 or more</value>
     </property>
-    <property key="FacilityMultipleLocations">
-        <value xml:lang="en">Multiple Locations</value>
+    <property key="FacilitySelectOptionsToGroupBy">
+        <value xml:lang="en">Select Options To Group</value>
     </property>
     <property key="FacilitySelection">
         <value xml:lang="en">Facility Selection</value>
         <value xml:lang="fr">Choix du lieu de stockage</value>
         <value xml:lang="it">Seleziona stabilimento</value>
     </property>
-    <property key="FacilitySelectOptionsToGroupBy">
-        <value xml:lang="en">Select Options To Group</value>
-    </property>
     <property key="FacilityShip">
         <value xml:lang="en">Ship</value>
     </property>
@@ -157,9 +157,6 @@
         <value xml:lang="zh">当我订的明细有货时请送货 (你可能要支付额外的运费)。</value>
         <value xml:lang="zh_CN">当所订商品个别项可用时即刻发货（不是一起发货，你可能需要另付发货费用）。</value>
     </property>
-    <property key="FacilityShipmentCreatedAndMarkedAsPacked">
-        <value xml:lang="en">Shipment #${shipmentId} created and marked as packed</value>
-    </property>
     <property key="FacilityShipOnceOrAvailable">
         <value xml:lang="de">Alles zusammen liefern oder 'sobald etwas verfügbar'?</value>
         <value xml:lang="en">Ship all at once, or 'as available'?</value>
@@ -173,6 +170,365 @@
         <value xml:lang="zh">一次全部送货，或者“到货即送”？</value>
         <value xml:lang="zh_CN">同时货运全部商品，或单项可用即刻发货？</value>
     </property>
+    <property key="FacilityShipmentConfigProps">
+        <value xml:lang="en">Config Properties (deprecated use)</value>
+        <value xml:lang="it">Property per configurazione spedizioniere (uso deprecato)</value>
+    </property>
+    <property key="FacilityShipmentCreatedAndMarkedAsPacked">
+        <value xml:lang="en">Shipment #${shipmentId} created and marked as packed</value>
+    </property>
+    <property key="FacilityShipmentCustomMethod">
+        <value xml:lang="en">Shipment Custom Method</value>
+        <value xml:lang="it">Metodo personalizzato spedizione</value>
+    </property>
+    <property key="FacilityShipmentDhlAccessAccountNbr">
+        <value xml:lang="en">Your DHL ShipIT Account Number</value>
+        <value xml:lang="it">Il tuo numero conto DHL ShipIT</value>
+    </property>
+    <property key="FacilityShipmentDhlAccessPassword">
+        <value xml:lang="en">Your DHL ShipIT Access Password</value>
+        <value xml:lang="it">La tua password DHL ShipIT</value>
+    </property>
+    <property key="FacilityShipmentDhlAccessShippingKey">
+        <value xml:lang="en">Your DHL ShipIT Shipping Key</value>
+        <value xml:lang="it">La tua chiave spedizione DHL ShipIT</value>
+    </property>
+    <property key="FacilityShipmentDhlAccessUserId">
+        <value xml:lang="en">Your DHL ShipIT User Id</value>
+        <value xml:lang="it">Il tuo id utente DHL ShipIT</value>
+    </property>
+    <property key="FacilityShipmentDhlConnectTimeout">
+        <value xml:lang="en">Conntect Timeout</value>
+        <value xml:lang="it">Timeout connessione a DHL</value>
+    </property>
+    <property key="FacilityShipmentDhlConnectUrl">
+        <value xml:lang="en">Conntect URL</value>
+        <value xml:lang="it">URL Connessione a DHL</value>
+    </property>
+    <property key="FacilityShipmentDhlHeadAction">
+        <value xml:lang="en">Head action attribute</value>
+        <value xml:lang="it">Attributo azione</value>
+    </property>
+    <property key="FacilityShipmentDhlHeadActionRequest">
+        <value xml:lang="en">Request</value>
+        <value xml:lang="it">Richiesta</value>
+    </property>
+    <property key="FacilityShipmentDhlHeadVersion">
+        <value xml:lang="en">Head version attribute</value>
+        <value xml:lang="it">Attributo versione</value>
+    </property>
+    <property key="FacilityShipmentDhlLabelImageFormat">
+        <value xml:lang="en">Label Image Format</value>
+        <value xml:lang="it">Formato immagine etichetta</value>
+    </property>
+    <property key="FacilityShipmentDhlLabelImageFormatPng">
+        <value xml:lang="en">PNG</value>
+        <value xml:lang="it">PNG</value>
+    </property>
+    <property key="FacilityShipmentDhlRateEstimate">
+        <value xml:lang="en">Rate Estimate API schema</value>
+        <value xml:lang="it">API schema per stima spedizione</value>
+    </property>
+    <property key="FacilityShipmentFedexAccessAccountNumber">
+        <value xml:lang="en">Access Account Number</value>
+        <value xml:lang="it">Numero conto di accesso</value>
+    </property>
+    <property key="FacilityShipmentFedexAccessMeterNumber">
+        <value xml:lang="en">Access Meter Number</value>
+        <value xml:lang="it">Contatore di accesso</value>
+    </property>
+    <property key="FacilityShipmentFedexAccessUserKey">
+        <value xml:lang="en">Access User Key</value>
+        <value xml:lang="it">Chiave utente di accesso</value>
+    </property>
+    <property key="FacilityShipmentFedexAccessUserPwd">
+        <value xml:lang="en">Access User Password</value>
+        <value xml:lang="it">Password utente di accesso</value>
+    </property>
+    <property key="FacilityShipmentFedexConnectSoapUrl">
+        <value xml:lang="en">Conntect Soap URL</value>
+        <value xml:lang="it">URL Soap Connessione a FedEx</value>
+    </property>
+    <property key="FacilityShipmentFedexConnectTimeout">
+        <value xml:lang="en">Conntect Timeout</value>
+        <value xml:lang="it">Timeout connessione a FedEx</value>
+    </property>
+    <property key="FacilityShipmentFedexConnectUrl">
+        <value xml:lang="en">Conntect URL</value>
+        <value xml:lang="it">URL Connessione a FedEx</value>
+    </property>
+    <property key="FacilityShipmentFedexDropoffType">
+        <value xml:lang="en">Dropoff Type</value>
+        <value xml:lang="it">Tipo di prelievo</value>
+    </property>
+    <property key="FacilityShipmentFedexDropoffTypeBusinessService">
+        <value xml:lang="en">Business Service Center</value>
+        <value xml:lang="it">Centro servizi business</value>
+    </property>
+    <property key="FacilityShipmentFedexDropoffTypeDropBox">
+        <value xml:lang="en">Drop-Box</value>
+        <value xml:lang="it">Drop-Box</value>
+    </property>
+    <property key="FacilityShipmentFedexDropoffTypeRegularPickup">
+        <value xml:lang="en">Regular Pickup</value>
+        <value xml:lang="it">Prelievo normale</value>
+    </property>
+    <property key="FacilityShipmentFedexDropoffTypeRequestCourier">
+        <value xml:lang="en">Request Courier</value>
+        <value xml:lang="it">Richiesta Corriere</value>
+    </property>
+    <property key="FacilityShipmentFedexDropoffTypeStation">
+        <value xml:lang="en">Station</value>
+        <value xml:lang="it">Stazione</value>
+    </property>
+    <property key="FacilityShipmentFedexLabelImageType">
+        <value xml:lang="en">Label Image Type</value>
+        <value xml:lang="it">Tipo immagine etichetta</value>
+    </property>
+    <property key="FacilityShipmentFedexLabelImageTypePdf">
+        <value xml:lang="en">PDF</value>
+        <value xml:lang="it">PDF</value>
+    </property>
+    <property key="FacilityShipmentFedexLabelImageTypePng">
+        <value xml:lang="en">PNG</value>
+        <value xml:lang="it">PNG</value>
+    </property>
+    <property key="FacilityShipmentFedexPackingBox10Kg">
+        <value xml:lang="en">10KG Box</value>
+        <value xml:lang="it">Scatola 10Kg</value>
+    </property>
+    <property key="FacilityShipmentFedexPackingBox25Kg">
+        <value xml:lang="en">25KG Box</value>
+        <value xml:lang="it">Scatola 25Kg</value>
+    </property>
+    <property key="FacilityShipmentFedexPackingBoxLarge">
+        <value xml:lang="en">Box Large</value>
+        <value xml:lang="it">Scatola grande</value>
+    </property>
+    <property key="FacilityShipmentFedexPackingBoxMedium">
+        <value xml:lang="en">Box Medium</value>
+        <value xml:lang="it">Scatola media</value>
+    </property>
+    <property key="FacilityShipmentFedexPackingBoxSmall">
+        <value xml:lang="en">Box Small</value>
+        <value xml:lang="it">Scatola piccola</value>
+    </property>
+    <property key="FacilityShipmentFedexPackingEnveloper">
+        <value xml:lang="en">Enveloper</value>
+        <value xml:lang="it">Busta</value>
+    </property>
+    <property key="FacilityShipmentFedexPackingEnveloperLegal">
+        <value xml:lang="en">Enveloper Legal</value>
+        <value xml:lang="it">Busta legale</value>
+    </property>
+    <property key="FacilityShipmentFedexPackingPakLarge">
+        <value xml:lang="en">Pak Large</value>
+        <value xml:lang="it">Pacco grande</value>
+    </property>
+    <property key="FacilityShipmentFedexPackingPakSmall">
+        <value xml:lang="en">Pak Small</value>
+        <value xml:lang="it">Pacco piccolo</value>
+    </property>
+    <property key="FacilityShipmentFedexPackingTube">
+        <value xml:lang="en">Tube</value>
+        <value xml:lang="it">Tubo</value>
+    </property>
+    <property key="FacilityShipmentFedexPackingType">
+        <value xml:lang="en">Packing Type</value>
+        <value xml:lang="it">Tipo pacco</value>
+    </property>
+    <property key="FacilityShipmentFedexPackingYour">
+        <value xml:lang="en">Your Packaging</value>
+        <value xml:lang="it">Pacco personalizzato</value>
+    </property>
+    <property key="FacilityShipmentFedexRateEstimateTemplateLocation">
+        <value xml:lang="en">Rate Estimate Template Location</value>
+        <value xml:lang="it">Posizione template stima spedizione</value>
+    </property>
+    <property key="FacilityShipmentFedexShipmentTemplateLocation">
+        <value xml:lang="en">Shipment Template Location</value>
+        <value xml:lang="it">Posizione template spedizione</value>
+    </property>
+    <property key="FacilityShipmentFedexSubscriptionTemplateLocation">
+        <value xml:lang="en">Subscription Template Location</value>
+        <value xml:lang="it">Posizione template abbonamento</value>
+    </property>
+    <property key="FacilityShipmentGatewayConfig">
+        <value xml:lang="en">Shipment Gateway Config</value>
+        <value xml:lang="it">Configurazione gateway spedizione</value>
+    </property>
+    <property key="FacilityShipmentGatewayConfigDescription">
+        <value xml:lang="en">Shipment Gateway Config Description</value>
+        <value xml:lang="it">Descrizione configurazione gateway spedizione</value>
+    </property>
+    <property key="FacilityShipmentGatewayConfigId">
+        <value xml:lang="en">Shipment Gateway Config Id</value>
+        <value xml:lang="it">Codice configurazione gateway spedizione</value>
+    </property>
+    <property key="FacilityShipmentGatewayConfigTypeDescription">
+        <value xml:lang="en">Shipment Gateway Config Type Description</value>
+        <value xml:lang="it">Descrizione tipo configurazione gateway spedizione</value>
+    </property>
+    <property key="FacilityShipmentGatewayConfigTypeId">
+        <value xml:lang="en">Shipment Gateway Config Type Id</value>
+        <value xml:lang="it">Tipo configurazione gateway spedizione</value>
+    </property>
+    <property key="FacilityShipmentGatewayConfigTypes">
+        <value xml:lang="en">Shipment Gateway Config Types</value>
+        <value xml:lang="it">Tipi configurazione gateway spedizione</value>
+    </property>
+    <property key="FacilityShipmentServiceName">
+        <value xml:lang="en">Shipment Service Name (deprecated use)</value>
+        <value xml:lang="it">Nome servizio spedizione (uso deprecato)</value>
+    </property>
+    <property key="FacilityShipmentUpsAccessLicenseNumber">
+        <value xml:lang="en">Access License Number</value>
+        <value xml:lang="it">Numero licenza d'accesso</value>
+    </property>
+    <property key="FacilityShipmentUpsAccessPassword">
+        <value xml:lang="en">Access Password</value>
+        <value xml:lang="it">Password d'accesso</value>
+    </property>
+    <property key="FacilityShipmentUpsAccessUserId">
+        <value xml:lang="en">Access User Id</value>
+        <value xml:lang="it">Id utente d'accesso</value>
+    </property>
+    <property key="FacilityShipmentUpsAllowCod">
+        <value xml:lang="en">Allow Cash On Delivery</value>
+        <value xml:lang="it">Permetti pagamento in contanti alla consegna</value>
+    </property>
+    <property key="FacilityShipmentUpsBillShipperAccountNumber">
+        <value xml:lang="en">Bill Shipper Account Number</value>
+        <value xml:lang="it">Numero conto fatturazione/spedizione</value>
+    </property>
+    <property key="FacilityShipmentUpsConnectTimeout">
+        <value xml:lang="en">Conntect Timeout</value>
+        <value xml:lang="it">Timeout connessione a UPS</value>
+    </property>
+    <property key="FacilityShipmentUpsConnectUrl">
+        <value xml:lang="en">Conntect URL</value>
+        <value xml:lang="it">URL Connessione a UPS</value>
+    </property>
+    <property key="FacilityShipmentUpsDefaultReturnLabelMemo">
+        <value xml:lang="en">Default Return Label Memo</value>
+        <value xml:lang="it">Email e memo di default sull'etichetta del reso</value>
+    </property>
+    <property key="FacilityShipmentUpsDefaultReturnLabelSubject">
+        <value xml:lang="en">Default Return Label Subject</value>
+        <value xml:lang="it">Soggetto di default sull'etichetta del reso</value>
+    </property>
+    <property key="FacilityShipmentUpsFundsCode">
+        <value xml:lang="en">Funds for Cash on Delivery</value>
+        <value xml:lang="it">Fondi per il pagamento in contanti alla consegna</value>
+    </property>
+    <property key="FacilityShipmentUpsMaxEstimateWeight">
+        <value xml:lang="en">Max weight per package</value>
+        <value xml:lang="it">Peso massimo per pacco</value>
+    </property>
+    <property key="FacilityShipmentUpsMinEstimateWeight">
+        <value xml:lang="en">Minimum weight for a package</value>
+        <value xml:lang="it">Peso minimo per un pacco</value>
+    </property>
+    <property key="FacilityShipmentUpsPickupAirServiceCenter">
+        <value xml:lang="en">Air Service Center</value>
+        <value xml:lang="it">Prelievo per centro servizio aereo</value>
+    </property>
+    <property key="FacilityShipmentUpsPickupCustomerCounter">
+        <value xml:lang="en">Customer Counter</value>
+        <value xml:lang="it">Bancone del cliente</value>
+    </property>
+    <property key="FacilityShipmentUpsPickupDaily">
+        <value xml:lang="en">Daily Pickup</value>
+        <value xml:lang="it">Prelievo giornaliero</value>
+    </property>
+    <property key="FacilityShipmentUpsPickupLetterCenter">
+        <value xml:lang="en">Letter Center</value>
+        <value xml:lang="it">Centro di prelievo</value>
+    </property>
+    <property key="FacilityShipmentUpsPickupOnCallAir">
+        <value xml:lang="en">On Call Air Pickup</value>
+        <value xml:lang="it">Prelievo aereo a chiamata</value>
+    </property>
+    <property key="FacilityShipmentUpsPickupOneTime">
+        <value xml:lang="en">One Time Pickup</value>
+        <value xml:lang="it">Prelievo in una volta</value>
+    </property>
+    <property key="FacilityShipmentUpsPickupSuggestedRetailRates">
+        <value xml:lang="en">Suggested Retail Rates</value>
+        <value xml:lang="it">Costo suggerito al dettaglio</value>
+    </property>
+    <property key="FacilityShipmentUpsSaveCertInfo">
+        <value xml:lang="en">Save Cert Info</value>
+        <value xml:lang="it">Salva informazioni certificato</value>
+    </property>
+    <property key="FacilityShipmentUpsSaveCertPath">
+        <value xml:lang="en">Save Cert Path</value>
+        <value xml:lang="it">Path certificato</value>
+    </property>
+    <property key="FacilityShipmentUpsSecuredFundsOnly">
+        <value xml:lang="en">Secured Funds Only</value>
+        <value xml:lang="it">Solo fondi sicuri</value>
+    </property>
+    <property key="FacilityShipmentUpsShipperNumber">
+        <value xml:lang="en">Shipper Number</value>
+        <value xml:lang="it">Numero spedizioniere</value>
+    </property>
+    <property key="FacilityShipmentUpsShipperPickupType">
+        <value xml:lang="en">Shipper Pickup Type</value>
+        <value xml:lang="it">Tipo prelievo spedizioniere</value>
+    </property>
+    <property key="FacilityShipmentUpsSurchargeAll">
+        <value xml:lang="en">Surcharge amount will be applied to each shipment package</value>
+        <value xml:lang="it">Importo supplementare sarà applicato ad ogni pacco di spedizione</value>
+    </property>
+    <property key="FacilityShipmentUpsSurchargeAmount">
+        <value xml:lang="en">Surcharge Amount for Cash On Delivery</value>
+        <value xml:lang="it">Importo supplementare per pagamento in contanti alla consegna</value>
+    </property>
+    <property key="FacilityShipmentUpsSurchargeApplyToPackage">
+        <value xml:lang="en">Surcharge Apply to Package</value>
+        <value xml:lang="it">Applica importo supplementare al pacco</value>
+    </property>
+    <property key="FacilityShipmentUpsSurchargeCurrencyUomId">
+        <value xml:lang="en">Surcharge Currency</value>
+        <value xml:lang="it">Valuta importo supplementare</value>
+    </property>
+    <property key="FacilityShipmentUpsSurchargeFirst">
+        <value xml:lang="en">Surcharge amount will be applied to the first package in the shipment</value>
+        <value xml:lang="it">Importo supplementare sarà applicato al primo pacco di spedizione</value>
+    </property>
+    <property key="FacilityShipmentUpsSurchargeNone">
+        <value xml:lang="en">Surcharge will not be applied to any packages </value>
+        <value xml:lang="it">Importo supplementare non sarà applicato a nessun pacco della spedizione</value>
+    </property>
+    <property key="FacilityShipmentUpsSurchargeSplit">
+        <value xml:lang="en">Surcharge amount will be split between shipment packages</value>
+        <value xml:lang="it">Importo supplementare sarà suddiviso fra i pacchi della spedizione</value>
+    </property>
+    <property key="FacilityShipmentUpsUnsecuredFundsAllowed">
+        <value xml:lang="en">Unsecured Funds Allowed</value>
+        <value xml:lang="it">Consentiti fondi non sicuri</value>
+    </property>
+    <property key="FacilityShipmentUspsAccessPassword">
+        <value xml:lang="en">Access Password</value>
+        <value xml:lang="it">Password d'accesso</value>
+    </property>
+    <property key="FacilityShipmentUspsAccessUserId">
+        <value xml:lang="en">Access User Id</value>
+        <value xml:lang="it">Id utente d'accesso</value>
+    </property>
+    <property key="FacilityShipmentUspsConnectTimeout">
+        <value xml:lang="en">Conntect Timeout</value>
+        <value xml:lang="it">Timeout connessione a USPS</value>
+    </property>
+    <property key="FacilityShipmentUspsConnectUrl">
+        <value xml:lang="en">Conntect URL</value>
+        <value xml:lang="it">URL Connessione a USPS</value>
+    </property>
+    <property key="FacilityShipmentUspsMaxEstimateWeight">
+        <value xml:lang="en">Estimate split into packages</value>
+        <value xml:lang="it">Stima spezzatura pacchi</value>
+    </property>
     <property key="FacilityShipments">
         <value xml:lang="de">Auslieferungen</value>
         <value xml:lang="en">Shipments</value>
@@ -2146,6 +2502,9 @@
         <value xml:lang="th">หมายเลขนำหน้ารายการสั่งซื้อ</value>
         <value xml:lang="zh">订单编号前缀</value>
     </property>
+    <property key="FormFieldTitle_orderPickSheetPrintedDate">
+        <value xml:lang="en">Pick Sheet Printed Date</value>
+    </property>
     <property key="FormFieldTitle_orderPricePercent">
         <value xml:lang="de">Auftragspreis Prozent</value>
         <value xml:lang="en">Order Price Percent</value>
@@ -2153,7 +2512,7 @@
         <value xml:lang="fr">Pourcentage du prix de commande</value>
         <value xml:lang="it">Percentual Prezzo Ordine</value>
         <value xml:lang="ru">Процент цены заказа</value>
-        <value xml:lang="th">เปอร์เซ็นราคารายการสั่งซ‹ื้อ</value>
+        <value xml:lang="th">เปอร์เซ็นราคารายการสั่งซ&#139;ื้อ</value>
     </property>
     <property key="FormFieldTitle_orderQtyIncrements">
         <value xml:lang="de">Auftragsmenge Erhöhungen</value>
@@ -2166,9 +2525,6 @@
         <value xml:lang="th">การเพิ่มจำนวนรายการสั่งซื้อ</value>
         <value xml:lang="zh">订单数量增加</value>
     </property>
-    <property key="FormFieldTitle_orderPickSheetPrintedDate">
-        <value xml:lang="en">Pick Sheet Printed Date</value>
-    </property>
     <property key="FormFieldTitle_originatedFromPartyId">
         <value xml:lang="de">Herkunft von Akteur ID</value>
         <value xml:lang="en">Originated From Party Id</value>
@@ -2367,6 +2723,12 @@
         <value xml:lang="th">รหัสกลุ่มคลังสินค้าขั้นพื้นฐาน</value>
         <value xml:lang="zh">主要店铺组标识</value>
     </property>
+    <property key="FormFieldTitle_printPickSheet">
+        <value xml:lang="en">Print Pick Sheet</value>
+    </property>
+    <property key="FormFieldTitle_printPickSheetFirst">
+        <value xml:lang="en">Print First</value>
+    </property>
     <property key="FormFieldTitle_prodCatContentTypeId">
         <value xml:lang="de">Produktkategorie Inhalt Typ ID</value>
         <value xml:lang="en">Prod Cat Content Type Id</value>
@@ -2440,12 +2802,6 @@
         <value xml:lang="th">ประเภทรายการสร้างสินค้า</value>
         <value xml:lang="zh">产品配置明细类型</value>
     </property>
-    <property key="FormFieldTitle_printPickSheet">
-        <value xml:lang="en">Print Pick Sheet</value>
-    </property>
-    <property key="FormFieldTitle_printPickSheetFirst">
-        <value xml:lang="en">Print First</value>
-    </property>
     <property key="FormFieldTitle_productContentTypeId">
         <value xml:lang="de">Produkt Inhalt Typ ID</value>
         <value xml:lang="en">Product Content Type Id</value>
@@ -5304,6 +5660,14 @@
         <value xml:lang="fr">Inventaire d'un article</value>
         <value xml:lang="it">Ricerca prodotti in stock</value>
     </property>
+    <property key="PageTitleFindShipmentGatewayConfig">
+        <value xml:lang="en">Find Shipment Gateway Config</value>
+        <value xml:lang="it">Ricerca configurazione gateway spedizione</value>
+    </property>
+    <property key="PageTitleFindShipmentGatewayConfigTypes">
+        <value xml:lang="en">Find Shipment Gateway Config Types</value>
+        <value xml:lang="it">Ricerca tipi configurazione gateway spedizione</value>
+    </property>
     <property key="PageTitleFindSubscription">
         <value xml:lang="de">Abonnemente suchen</value>
         <value xml:lang="en">Find Subscription</value>
@@ -5693,6 +6057,30 @@
         <value xml:lang="th">การเปลี่ยนรายการสินค้าคงเหลือ</value>
         <value xml:lang="zh">转运库存明细</value>
     </property>
+    <property key="PageTitleUpdateShipmentGatewayConfig">
+        <value xml:lang="en">Update Shipment Gateway Config</value>
+        <value xml:lang="it">Aggiorna configurazione gateway spedizione</value>
+    </property>
+    <property key="PageTitleUpdateShipmentGatewayConfigDhl">
+        <value xml:lang="en">Update Shipment Gateway Config DHL</value>
+        <value xml:lang="it">Aggiorna configurazione gateway spedizione DHL</value>
+    </property>
+    <property key="PageTitleUpdateShipmentGatewayConfigFedex">
+        <value xml:lang="en">Update Shipment Gateway Config FedEx</value>
+        <value xml:lang="it">Aggiorna configurazione gateway spedizione FedEx</value>
+    </property>
+    <property key="PageTitleUpdateShipmentGatewayConfigType">
+        <value xml:lang="en">Update Shipment Gateway Config Type</value>
+        <value xml:lang="it">Aggiorna tipo configurazione gateway spedizione</value>
+    </property>
+    <property key="PageTitleUpdateShipmentGatewayConfigUps">
+        <value xml:lang="en">Update Shipment Gateway Config UPS</value>
+        <value xml:lang="it">Aggiorna configurazione gateway spedizione UPS</value>
+    </property>
+    <property key="PageTitleUpdateShipmentGatewayConfigUsps">
+        <value xml:lang="en">Update Shipment Gateway Config USPS</value>
+        <value xml:lang="it">Aggiorna configurazione gateway spedizione USPS</value>
+    </property>
     <property key="PageTitleViewFacilityContactMechanism">
         <value xml:lang="de">Einrichtungs-Kontaktmechanismus anzeigen für ${facility.facilityName} [${facility.facilityId}]</value>
         <value xml:lang="en">View Facility Contact Mechanisms for ${facility.facilityName} [${facility.facilityId}]</value>
@@ -7209,9 +7597,6 @@
         <value xml:lang="th">ราคาพื้นฐาน</value>
         <value xml:lang="zh">价格底线</value>
     </property>
-    <property key="ProductBestSellingProductsOf">
-        <value xml:lang="en">Best Selling Products of</value>
-    </property>
     <property key="ProductBeTheFirstToReviewThisProduct">
         <value xml:lang="cs">Staňte se prvním, kdo zhodnotí tetnto výrobek</value>
         <value xml:lang="de">Seien Sie der Erste, der dieses Produkt beurteilt!</value>
@@ -7227,6 +7612,9 @@
         <value xml:lang="th">กลับไปดูสินค้านี้ก่อน!</value>
         <value xml:lang="zh">做这个产品的第一个评论者</value>
     </property>
+    <property key="ProductBestSellingProductsOf">
+        <value xml:lang="en">Best Selling Products of</value>
+    </property>
     <property key="ProductBillingWeightUom">
         <value xml:lang="de">Verrechnung Gewicht Einheit</value>
         <value xml:lang="en">Billing Weight &amp; UOM</value>
@@ -8820,6 +9208,10 @@
         <value xml:lang="en">Current package sequence</value>
         <value xml:lang="fr">Séquence d'empaquetage actuelle</value>
     </property>
+    <property key="ProductCustomMethod">
+        <value xml:lang="en">Custom Method</value>
+        <value xml:lang="it">Metodo personalizzato pagamento</value>
+    </property>
     <property key="ProductCustomer">
         <value xml:lang="de">Kunde</value>
         <value xml:lang="en">Customer</value>
@@ -8830,10 +9222,6 @@
         <value xml:lang="th">ลุกค้า</value>
         <value xml:lang="zh">客户</value>
     </property>
-    <property key="ProductCustomMethod">
-        <value xml:lang="en">Custom Method</value>
-        <value xml:lang="it">Metodo personalizzato pagamento</value>
-    </property>
     <property key="ProductCustomerRating">
         <value xml:lang="de">Kundenbewertung</value>
         <value xml:lang="en">Customer Rating</value>
@@ -10882,6 +11270,17 @@
         <value xml:lang="th">สูงถึงต่ำ</value>
         <value xml:lang="zh">从高到低</value>
     </property>
+    <property key="ProductHighlightedExplanation">
+        <value xml:lang="de"> Datum/Zeit Angaben sind rot markiert wenn die aktuelle Zeit vor dem Von Datum oder nach dem Bis Datum ist. Wenn das Von Datum rot ist, ist die Zuordnung noch nicht aktiv; falls das Bis Datum rot ist, ist die Zuordnung abgelaufen (und sollte vermutlich gelöscht werden).</value>
+        <value xml:lang="en"> date/time entries denote that the current time is before the From Date or after the Thru Date. If the From Date is red, association has not started yet; if Thru Date is red, association has expired (and should probably be deleted).</value>
+        <value xml:lang="es"> entrades de fecha/hora indican que la hora actual es anterior a la Fecha de Inicio o después de la Fecha de Fin. Si la fecha de inicio es red, la asociación no ha comenzado aún; si la fecha de fin es red, la asociación ha expirado (y probablemente debe ser eliminada).</value>
+        <value xml:lang="fr"> date/heure sont notées en rouge lorsque l'heure précède la date de début ou dépasse la date de fin. Si la date de début est en rouge, l'association n'a pas pu encore débuter ; si la date de fin est en rouge, l'association a déjà expiré (et il faudra sûrement la supprimer).</value>
+        <value xml:lang="it"> voci data/ora denotano che l'ora attuale è prima della Data Da o dopo la Data A. Se la Data Da è rossa, associazione non è stata ancora iniziata; se la Data A è rosso, associazione è scaduta (e dovrebbe essere probabilmente cancellata).</value>
+        <value xml:lang="ro"> data/ora de culoare Rosie arata ca ora curenta este inainte de Data De La sau dupa Data Pina La. Daca Data De La este de culoare rosie, asocierea nu a fost inca initiata; daca Data Pina la este rosie, asocierea este expirata (si ar trebui sa fie probabil stearsa).</value>
+        <value xml:lang="ru"> цвет даты/времени означает что текущее время имеет значение более раннее чем 'От даты' или позднее 'По дату'. Если 'С даты' красного цвета, ассоциация еще не действует; если красным выделена 'По дату', ассоциация устарела (и ее вероятно можно удалить).</value>
+        <value xml:lang="th"> วัน/เวลา กรอกข้อมูลบ่งชี้ถึงแนวโน้มเวลาก่อนจากวันที่หรือหลังถึงวันที่. ถ้าก่อนวันที่คือ แดง, กลุ่มไม่เริ่ม; ถ้าถึงวันที่คือ แดง, กลุ่มหมดอายุ (แลบางทีควรจะลบ).</value>
+        <value xml:lang="zh"> 日期/时间记录表示当前时间在开始日期之前或结束日期之后。如果开始日期是红色， 那么关联还没有开始；如果结束日期是红色， 那么关联已经过期了 (并且可能应该删除)。</value>
+    </property>
     <property key="ProductHost">
         <value xml:lang="de">Server</value>
         <value xml:lang="en">Host</value>
@@ -16499,17 +16898,6 @@
         <value xml:lang="th">(คุณต้องสร้างกลุ่มถึงการเปลี่ยนแปลงนี้อีกครั้ง)</value>
         <value xml:lang="zh">(要修改这个，你必须重新创建关联。)</value>
     </property>
-    <property key="ProductHighlightedExplanation">
-        <value xml:lang="de"> Datum/Zeit Angaben sind rot markiert wenn die aktuelle Zeit vor dem Von Datum oder nach dem Bis Datum ist. Wenn das Von Datum rot ist, ist die Zuordnung noch nicht aktiv; falls das Bis Datum rot ist, ist die Zuordnung abgelaufen (und sollte vermutlich gelöscht werden).</value>
-        <value xml:lang="en"> date/time entries denote that the current time is before the From Date or after the Thru Date. If the From Date is red, association has not started yet; if Thru Date is red, association has expired (and should probably be deleted).</value>
-        <value xml:lang="es"> entrades de fecha/hora indican que la hora actual es anterior a la Fecha de Inicio o después de la Fecha de Fin. Si la fecha de inicio es red, la asociación no ha comenzado aún; si la fecha de fin es red, la asociación ha expirado (y probablemente debe ser eliminada).</value>
-        <value xml:lang="fr"> date/heure sont notées en rouge lorsque l'heure précède la date de début ou dépasse la date de fin. Si la date de début est en rouge, l'association n'a pas pu encore débuter ; si la date de fin est en rouge, l'association a déjà expiré (et il faudra sûrement la supprimer).</value>
-        <value xml:lang="it"> voci data/ora denotano che l'ora attuale è prima della Data Da o dopo la Data A. Se la Data Da è rossa, associazione non è stata ancora iniziata; se la Data A è rosso, associazione è scaduta (e dovrebbe essere probabilmente cancellata).</value>
-        <value xml:lang="ro"> data/ora de culoare Rosie arata ca ora curenta este inainte de Data De La sau dupa Data Pina La. Daca Data De La este de culoare rosie, asocierea nu a fost inca initiata; daca Data Pina la este rosie, asocierea este expirata (si ar trebui sa fie probabil stearsa).</value>
-        <value xml:lang="ru"> цвет даты/времени означает что текущее время имеет значение более раннее чем 'От даты' или позднее 'По дату'. Если 'С даты' красного цвета, ассоциация еще не действует; если красным выделена 'По дату', ассоциация устарела (и ее вероятно можно удалить).</value>
-        <value xml:lang="th"> วัน/เวลา กรอกข้อมูลบ่งชี้ถึงแนวโน้มเวลาก่อนจากวันที่หรือหลังถึงวันที่. ถ้าก่อนวันที่คือ แดง, กลุ่มไม่เริ่ม; ถ้าถึงวันที่คือ แดง, กลุ่มหมดอายุ (แลบางทีควรจะลบ).</value>
-        <value xml:lang="zh"> 日期/时间记录表示当前时间在开始日期之前或结束日期之后。如果开始日期是红色， 那么关联还没有开始；如果结束日期是红色， 那么关联已经过期了 (并且可能应该删除)。</value>
-    </property>
     <property key="ProductRefineSearch">
         <value xml:lang="cs">Detailní hledání</value>
         <value xml:lang="de">Verfeinerte Suche</value>

Modified: ofbiz/trunk/applications/product/data/ShipmentTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ShipmentTypeData.xml?rev=796874&r1=796873&r2=796874&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ShipmentTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ShipmentTypeData.xml Wed Jul 22 20:39:35 2009
@@ -112,4 +112,29 @@
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" statusId="PICKITEM_CANCELLED" statusTypeId="PICKITEM_STATUS"/>
     <StatusValidChange condition="" statusId="PICKITEM_PENDING" statusIdTo="PICKITEM_COMPLETED" transitionName="Complete"/>
     <StatusValidChange condition="" statusId="PICKITEM_PENDING" statusIdTo="PICKITEM_CANCELLED" transitionName="Cancel"/>
+    
+    <!-- Shipment Gateway Config -->
+    <ShipmentGatewayConfigType shipmentGatewayConfTypeId="DHL" hasTable="N" description="DHL Shipment Gateway"/>
+    <ShipmentGatewayConfig shipmentGatewayConfigId="DHL_CONFIG" shipmentGatewayConfTypeId="DHL" description="DHL Config"/>
+    <ShipmentGatewayDhl shipmentGatewayConfigId="DHL_CONFIG" connectUrl="https://eCommerce.airborne.com/ApiLandingTest.asp" connectTimeout="60" headVersion="1.1" headAction="Request" accessUserId="YOUR DHL ShipIT USER ID" accessPassword="YOUR DHL ShipIT ACCESS PASSWORD" accessAccountNbr="YOUR DHL ShipIT ACCOUNT NUMBER" accessShippingKey="YOUR DHL ShipIT SHIPPING KEY" labelImageFormat="PNG" rateEstimateTemplate="api.schema.DHL"/>
+    
+    <ShipmentGatewayConfigType shipmentGatewayConfTypeId="FEDEX" hasTable="N" description="Fedex Shipment Gateway"/>
+    <ShipmentGatewayConfig shipmentGatewayConfigId="FEDEX_CONFIG" shipmentGatewayConfTypeId="FEDEX" description="Fedex Config"/>
+    <ShipmentGatewayFedex shipmentGatewayConfigId="FEDEX_CONFIG" connectUrl="https://gatewaybeta.fedex.com/GatewayDC" connectSoapUrl="https://gatewaybeta.fedex.com:443/web-services" connectTimeout="60" accessAccountNbr="" accessMeterNumber="" accessUserKey="" accessUserPwd="" labelImageType="PNG" defaultDropoffType="REGULARPICKUP" defaultPackagingType="YOURPACKNG" templateShipment="component://product/templates/shipment/FedexShipRequestTemplate.xml.ftl" templateSubscription="component://product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl" rateEstimateTemplate="component://product/templates/shipment/FedexRateEstimateRequestTemplate.xml.ftl"/>
+    
+    <ShipmentGatewayConfigType shipmentGatewayConfTypeId="UPS" hasTable="N" description="UPS Shipment Gateway"/>
+    <ShipmentGatewayConfig shipmentGatewayConfigId="UPS_CONFIG" shipmentGatewayConfTypeId="UPS" description="UPS Config"/>
+    <ShipmentGatewayUps shipmentGatewayConfigId="UPS_CONFIG" connectUrl="https://wwwcie.ups.com/ups.app/xml" connectTimeout="60" shipperNumber="12345E" billShipperAccountNumber="12345E" accessLicenseNumber="TEST262223144CAT" accessUserId="REG111111" accessPassword="REG111111" saveCertInfo="true" saveCertPath="${sys:getProperty('ofbiz.home')}/runtime/output/upscert" shipperPickupType="06" maxEstimateWeight="90" minEstimateWeight="0.1" codAllowCod="true" codSurchargeAmount="9" codSurchargeCurrencyUomId="USD" codSurchargeApplyToPackage="first" codFundsCode="0" defaultReturnLabelMemo="UPS Shipment Return Memo" defaultReturnLabelSubject="UPS Shipment Return Label"/>
+    
+    <ShipmentGatewayConfigType shipmentGatewayConfTypeId="USPS" hasTable="N" description="USPS Shipment Gateway"/>
+    <ShipmentGatewayConfig shipmentGatewayConfigId="USPS_CONFIG" shipmentGatewayConfTypeId="USPS" description="USPS Config"/>
+    <ShipmentGatewayUsps shipmentGatewayConfigId="USPS_CONFIG" connectUrl="http://production.shippingapis.com/ShippingAPITest.dll" connectTimeout="60" accessUserId="000000000000" accessPassword="999999999999" maxEstimateWeight="70"/>
+    
+    <!-- Shipment Gateway custom methods by type -->
+    <CustomMethodType customMethodTypeId="SHIP_EST" parentTypeId="" hasTable="N" description="Shipment Gateway rate estimate methods"/>
+    
+    <CustomMethod customMethodId="SHIP_EST_DHL"   customMethodTypeId="SHIP_EST" customMethodName="dhlRateEstimate"   description="DHL rate estimate"/>
+    <CustomMethod customMethodId="SHIP_EST_FEDEX" customMethodTypeId="SHIP_EST" customMethodName="fedexRateEstimate" description="FedEx rate estimate"/>
+    <CustomMethod customMethodId="SHIP_EST_UPS"   customMethodTypeId="SHIP_EST" customMethodName="upsRateEstimate"   description="UPS rate estimate"/>
+    <CustomMethod customMethodId="SHIP_EST_USPS"  customMethodTypeId="SHIP_EST" customMethodName="uspsRateInquire"   description="USPS rate estimate"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=796874&r1=796873&r2=796874&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Wed Jul 22 20:39:35 2009
@@ -4073,6 +4073,8 @@
       <field name="excludeGeoId" type="id"></field>
       <field name="serviceName" type="long-varchar"></field>
       <field name="configProps" type="long-varchar"></field>
+      <field name="shipmentCustomMethodId" type="id"></field>
+      <field name="shipmentGatewayConfigId" type="id"></field>
       <field name="sequenceNumber" type="numeric"></field>
       <prim-key field="productStoreShipMethId"/>
       <relation type="one-nofk" rel-entity-name="Party">
@@ -4084,6 +4086,12 @@
       <relation type="one-nofk" title="Exclude" rel-entity-name="Geo">
         <key-map field-name="excludeGeoId" rel-field-name="geoId"/>
       </relation>
+      <relation type="one" fk-name="PRDS_SM_SGC" rel-entity-name="ShipmentGatewayConfig">
+        <key-map field-name="shipmentGatewayConfigId"/>
+      </relation>
+      <relation type="one" fk-name="PRDS_SM_CUS_MET" rel-entity-name="CustomMethod">
+        <key-map field-name="shipmentCustomMethodId" rel-field-name="customMethodId"/>
+      </relation>
     </entity>
     <view-entity entity-name="ProductStoreShipmentMethView"
             package-name="org.ofbiz.product.store"
@@ -4111,6 +4119,10 @@
       <alias entity-alias="PSSM" name="excludeGeoId"/>
       <alias entity-alias="PSSM" name="includeFeatureGroup"/>
       <alias entity-alias="PSSM" name="excludeFeatureGroup"/>
+      <alias entity-alias="PSSM" name="serviceName"/>
+      <alias entity-alias="PSSM" name="configProps"/>
+      <alias entity-alias="PSSM" name="shipmentCustomMethodId"/>
+      <alias entity-alias="PSSM" name="shipmentGatewayConfigId"/>
       <alias entity-alias="PSSM" name="sequenceNumber"/>
       <alias entity-alias="SM" name="description"/>
       <view-link entity-alias="PSSM" rel-entity-alias="SM">

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml?rev=796874&r1=796873&r2=796874&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml Wed Jul 22 20:39:35 2009
@@ -799,6 +799,115 @@
         <key-map field-name="priceBreakId" rel-field-name="quantityBreakId"/>
       </relation>
     </entity>
+    <entity entity-name="ShipmentGatewayConfigType"
+            package-name="org.ofbiz.shipment.shipment"
+            title="Shipment Gateway Config Type">
+      <field name="shipmentGatewayConfTypeId" type="id-ne"></field>
+      <field name="parentTypeId" type="id"></field>
+      <field name="hasTable" type="indicator"></field>
+      <field name="description" type="description"></field>
+      <prim-key field="shipmentGatewayConfTypeId"/>
+      <relation type="one" fk-name="SGCT_PAR" title="Parent" rel-entity-name="ShipmentGatewayConfigType">
+        <key-map field-name="parentTypeId" rel-field-name="shipmentGatewayConfTypeId"/>
+      </relation>
+      <relation type="many" title="Sibling" rel-entity-name="ShipmentGatewayConfigType">
+        <key-map field-name="parentTypeId"/>
+      </relation>
+    </entity>
+    <entity entity-name="ShipmentGatewayConfig"
+            package-name="org.ofbiz.shipment.shipment"
+            title="Shipment Gateway Config">
+      <field name="shipmentGatewayConfigId" type="id-ne"></field>
+      <field name="shipmentGatewayConfTypeId" type="id-ne"></field>
+      <field name="description" type="description"></field>
+      <prim-key field="shipmentGatewayConfigId"/>
+      <relation type="one" fk-name="SGC_SGCT" rel-entity-name="ShipmentGatewayConfigType">
+        <key-map field-name="shipmentGatewayConfTypeId" rel-field-name="shipmentGatewayConfTypeId"/>
+      </relation>
+    </entity>
+    <entity entity-name="ShipmentGatewayDhl"
+            package-name="org.ofbiz.shipment.shipment"
+            title="DHL Shipment Gateway Configuration">
+      <field name="shipmentGatewayConfigId" type="id-ne"></field>
+      <field name="connectUrl" type="value"><description>DHL Connection URL</description></field>
+      <field name="connectTimeout" type="numeric"><description>Timeout in seconds</description></field>
+      <field name="headVersion" type="short-varchar"><description>Head version attribute</description></field>
+      <field name="headAction" type="value"><description>Head action attribute</description></field>
+      <field name="accessUserId" type="value" encrypt="true"><description>Your DHL ShipIT User Id</description></field>
+      <field name="accessPassword" type="value" encrypt="true"><description>Your DHL ShipIT Access Password</description></field>
+      <field name="accessAccountNbr" type="value" encrypt="true"><description>Your DHL ShipIT Account Number</description></field>
+      <field name="accessShippingKey" type="value" encrypt="true"><description>Your DHL ShipIT Shipping Key</description></field>
+      <field name="labelImageFormat" type="short-varchar"><description>Label image format</description></field>
+      <field name="rateEstimateTemplate" type="value"><description>API Schema Templates</description></field>
+      <prim-key field="shipmentGatewayConfigId"/>
+      <relation type="one" fk-name="SGDHL_SGC" rel-entity-name="ShipmentGatewayConfig">
+        <key-map field-name="shipmentGatewayConfigId"/>
+      </relation>
+    </entity>
+    <entity entity-name="ShipmentGatewayFedex"
+            package-name="org.ofbiz.shipment.shipment"
+            title="Fedex Shipment Gateway Configuration">
+      <field name="shipmentGatewayConfigId" type="id-ne"></field>
+      <field name="connectUrl" type="value"><description>Fedex Connection URL</description></field>
+      <field name="connectSoapUrl" type="value"><description>Fedex Soap Connection URL</description></field>
+      <field name="connectTimeout" type="numeric"><description>Timeout in seconds</description></field>
+      <field name="accessAccountNbr" type="value" encrypt="true"><description>Your Fedex account number</description></field>
+      <field name="accessMeterNumber" type="value" encrypt="true"><description>Your Fedex meter number</description></field>
+      <field name="accessUserKey" type="value" encrypt="true"><description>Your Fedex user credential key</description></field>
+      <field name="accessUserPwd" type="value" encrypt="true"><description>Your Fedex user credential password</description></field>
+      <field name="labelImageType" type="short-varchar"><description>Label image type</description></field>
+      <field name="defaultDropoffType" type="value"><description>Default dropoff type</description></field>
+      <field name="defaultPackagingType" type="value"><description>Default packaging type</description></field>
+      <field name="templateShipment" type="value"><description>Shipment Template location</description></field>
+      <field name="templateSubscription" type="value"><description>Subscription Template location</description></field>
+      <field name="rateEstimateTemplate" type="value"><description>FedEx API Rate Estimate Template</description></field>
+      <prim-key field="shipmentGatewayConfigId"/>
+      <relation type="one" fk-name="SGFED_SGC" rel-entity-name="ShipmentGatewayConfig">
+        <key-map field-name="shipmentGatewayConfigId"/>
+      </relation>
+    </entity>
+    <entity entity-name="ShipmentGatewayUps"
+            package-name="org.ofbiz.shipment.shipment"
+            title="UPS Shipment Gateway Configuration">
+      <field name="shipmentGatewayConfigId" type="id-ne"></field>
+      <field name="connectUrl" type="value"><description>UPS Connection URL</description></field>
+      <field name="connectTimeout" type="numeric"><description>Timeout in seconds</description></field>
+      <field name="shipperNumber" type="value"><description>UPS Shipper Number</description></field>
+      <field name="billShipperAccountNumber" type="value"><description>UPS Bill Shipper Account Number</description></field>
+      <field name="accessLicenseNumber" type="value" encrypt="true"><description>UPS XPCI Access License Number</description></field>
+      <field name="accessUserId" type="value" encrypt="true"><description>UPS XPCI Access User ID</description></field>
+      <field name="accessPassword" type="value" encrypt="true"><description>UPS XPCI Access Password</description></field>
+      <field name="saveCertInfo" type="short-varchar"><description>Setting to save files needed for UPS certification (true|false)</description></field>
+      <field name="saveCertPath" type="value"><description>UPS file certificate path</description></field>
+      <field name="shipperPickupType" type="short-varchar"><description>Shipper Default Pickup Type</description></field>
+      <field name="maxEstimateWeight" type="fixed-point"><description>Estimate split into packages</description></field>
+      <field name="minEstimateWeight" type="fixed-point"><description>Minimum weight for a package</description></field>
+      <field name="codAllowCod" type="value"><description>All shipment package items are from orders which have been fully paid via EXT_COD</description></field>
+      <field name="codSurchargeAmount" type="fixed-point"><description>Surcharge amount</description></field>
+      <field name="codSurchargeCurrencyUomId" type="short-varchar"><description>Surcharge currency</description></field>
+      <field name="codSurchargeApplyToPackage" type="short-varchar"><description>Surcharge amount will be applied to each shipment package</description></field>
+      <field name="codFundsCode" type="short-varchar"><description>The code that indicates the type of funds used for the COD payment</description></field>
+      <field name="defaultReturnLabelMemo" type="value"><description>Return label email memo</description></field>
+      <field name="defaultReturnLabelSubject" type="value"><description>Return label subject</description></field>
+      <prim-key field="shipmentGatewayConfigId"/>
+      <relation type="one" fk-name="SGUPS_SGC" rel-entity-name="ShipmentGatewayConfig">
+        <key-map field-name="shipmentGatewayConfigId"/>
+      </relation>
+    </entity>
+    <entity entity-name="ShipmentGatewayUsps"
+            package-name="org.ofbiz.shipment.shipment"
+            title="USPS Shipment Gateway Configuration">
+      <field name="shipmentGatewayConfigId" type="id-ne"></field>
+      <field name="connectUrl" type="value"><description>USPS Connection URL</description></field>
+      <field name="connectTimeout" type="numeric"><description>Timeout in seconds</description></field>
+      <field name="accessUserId" type="value" encrypt="true"><description>USPS Access User ID</description></field>
+      <field name="accessPassword" type="value" encrypt="true"><description>USPS Access Password</description></field>
+      <field name="maxEstimateWeight" type="numeric"><description>Estimate split into packages</description></field>
+      <prim-key field="shipmentGatewayConfigId"/>
+      <relation type="one" fk-name="SGUSPS_SGC" rel-entity-name="ShipmentGatewayConfig">
+        <key-map field-name="shipmentGatewayConfigId"/>
+      </relation>
+    </entity>
     <entity entity-name="ShipmentItem"
             package-name="org.ofbiz.shipment.shipment"
             title="Shipment Item Entity">

Modified: ofbiz/trunk/applications/product/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/ofbiz-component.xml?rev=796874&r1=796873&r2=796874&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/product/ofbiz-component.xml Wed Jul 22 20:39:35 2009
@@ -46,6 +46,7 @@
     <service-resource type="model" loader="main" location="servicedef/services_maint.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_picklist.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_pricepromo.xml"/>
+    <service-resource type="model" loader="main" location="servicedef/services_shipmentgateway.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_shipment_dhl.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_shipment_fedex.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_shipment_ups.xml"/>

Added: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml?rev=796874&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml (added)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml Wed Jul 22 20:39:35 2009
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
+    <simple-method method-name="updateShipmentGatewayConfig" short-description="Update Shipment Gateway Config">
+        <entity-one entity-name="ShipmentGatewayConfig" value-field="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
+        <store-value value-field="lookedUpValue"/>
+    </simple-method>
+    
+    <simple-method method-name="updateShipmentGatewayConfigDhl" short-description="Update Shipment Gateway Config DHL">
+        <entity-one entity-name="ShipmentGatewayDhl" value-field="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
+        <store-value value-field="lookedUpValue"/>
+    </simple-method>
+    
+    <simple-method method-name="updateShipmentGatewayConfigFedex" short-description="Update Shipment Gateway Config FedEx">
+        <entity-one entity-name="ShipmentGatewayFedex" value-field="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
+        <store-value value-field="lookedUpValue"/>
+    </simple-method>
+    
+    <simple-method method-name="updateShipmentGatewayConfigUps" short-description="Update Shipment Gateway Config UPS">
+        <entity-one entity-name="ShipmentGatewayUps" value-field="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
+        <store-value value-field="lookedUpValue"/>
+    </simple-method>
+    
+    <simple-method method-name="updateShipmentGatewayConfigUsps" short-description="Update Shipment Gateway Config USPS">
+        <entity-one entity-name="ShipmentGatewayUsps" value-field="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
+        <store-value value-field="lookedUpValue"/>
+    </simple-method>
+    
+    <simple-method method-name="updateShipmentGatewayConfigType" short-description="Update Shipment Gateway Config Type">
+        <entity-one entity-name="ShipmentGatewayConfigType" value-field="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
+        <store-value value-field="lookedUpValue"/>
+    </simple-method>
+</simple-methods>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/applications/product/servicedef/services_shipmentgateway.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_shipmentgateway.xml?rev=796874&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_shipmentgateway.xml (added)
+++ ofbiz/trunk/applications/product/servicedef/services_shipmentgateway.xml Wed Jul 22 20:39:35 2009
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+    <description>Accounting Shipment Gateway Config Services</description>
+    <vendor>OFBiz</vendor>
+    <version>1.0</version>
+    
+    <!-- Shipment Gateway Config Method services -->
+    <service name="updateShipmentGatewayConfig" engine="simple" location="component://product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml" invoke="updateShipmentGatewayConfig">
+        <description>Update Shipment Gateway Config</description>
+        <auto-attributes entity-name="ShipmentGatewayConfig" include="pk" mode="IN" optional="false"/>
+        <auto-attributes entity-name="ShipmentGatewayConfig" include="nonpk" mode="IN" optional="true"/>
+    </service>
+    
+    <service name="updateShipmentGatewayConfigDhl" engine="simple" location="component://product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml" invoke="updateShipmentGatewayConfigDhl">
+        <description>Update Shipment Gateway Config DHL</description>
+        <auto-attributes entity-name="ShipmentGatewayDhl" include="pk" mode="IN" optional="false"/>
+        <auto-attributes entity-name="ShipmentGatewayDhl" include="nonpk" mode="IN" optional="true"/>
+    </service>
+    
+    <service name="updateShipmentGatewayConfigFedex" engine="simple" location="component://product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml" invoke="updateShipmentGatewayConfigFedex">
+        <description>Update Shipment Gateway Config FedEx</description>
+        <auto-attributes entity-name="ShipmentGatewayFedex" include="pk" mode="IN" optional="false"/>
+        <auto-attributes entity-name="ShipmentGatewayFedex" include="nonpk" mode="IN" optional="true"/>
+    </service>
+    
+    <service name="updateShipmentGatewayConfigUps" engine="simple" location="component://product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml" invoke="updateShipmentGatewayConfigUps">
+        <description>Update Shipment Gateway Config UPS</description>
+        <auto-attributes entity-name="ShipmentGatewayUps" include="pk" mode="IN" optional="false"/>
+        <auto-attributes entity-name="ShipmentGatewayUps" include="nonpk" mode="IN" optional="true"/>
+    </service>
+    
+    <service name="updateShipmentGatewayConfigUsps" engine="simple" location="component://product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml" invoke="updateShipmentGatewayConfigUsps">
+        <description>Update Shipment Gateway Config USPS</description>
+        <auto-attributes entity-name="ShipmentGatewayUsps" include="pk" mode="IN" optional="false"/>
+        <auto-attributes entity-name="ShipmentGatewayUsps" include="nonpk" mode="IN" optional="true"/>
+    </service>
+    
+    <service name="updateShipmentGatewayConfigType" engine="simple" location="component://product/script/org/ofbiz/shipment/shipment/ShipmentGatewayConfigServices.xml" invoke="updateShipmentGatewayConfigType">
+        <description>Update Shipment Gateway Config Type</description>
+        <auto-attributes entity-name="ShipmentGatewayConfigType" include="pk" mode="IN" optional="false"/>
+        <auto-attributes entity-name="ShipmentGatewayConfigType" include="nonpk" mode="IN" optional="true"/>
+    </service>
+</services>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/product/servicedef/services_shipmentgateway.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/product/servicedef/services_shipmentgateway.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/product/servicedef/services_shipmentgateway.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=796874&r1=796873&r2=796874&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Wed Jul 22 20:39:35 2009
@@ -602,6 +602,18 @@
         <field name="excludeGeoId">
             <display-entity entity-name="Geo" key-field-name="geoId" description="${geoName} [${geoId}]"/>
         </field>
+        <field name="serviceName" title="${uiLabelMap.FacilityShipmentServiceName}">
+            <display/>
+        </field>
+        <field name="configProps" title="${uiLabelMap.FacilityShipmentConfigProps}">
+            <display/>
+        </field>
+        <field name="shipmentCustomMethodId" title="${uiLabelMap.FacilityShipmentCustomMethod}">
+            <display-entity entity-name="CustomMethod" key-field-name="customMethodId" description="${description} (${customMethodName})"/>
+        </field>
+        <field name="shipmentGatewayConfigId" title="${uiLabelMap.FacilityShipmentGatewayConfigId}">
+            <display-entity entity-name="ShipmentGatewayConfig" key-field-name="shipmentGatewayConfigId"  description="${description}"/>
+        </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="storeRemoveShipMeth" description="${uiLabelMap.CommonRemove}" also-hidden="false">
                 <parameter param-name="productStoreId"/>
@@ -620,7 +632,6 @@
         </field>
         <field name="roleTypeId"><display/></field>
         <field name="partyId"><display/></field>
-
         <field name="minSize" tooltip="${uiLabelMap.ProductMinSizeMessage}"><text/></field>
         <field name="maxSize" tooltip="${uiLabelMap.ProductMaxSizeMessage}"><text/></field>
         <field name="minWeight" tooltip="${uiLabelMap.ProductMinWeightMessage}"><text/></field>
@@ -645,7 +656,6 @@
         <field name="includeNoChargeItems" title="${uiLabelMap.ProductIncludeFreeship}" tooltip="${uiLabelMap.ProductIncludeFreeshipMessage}">
             <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
-
         <field name="includeGeoId" title="${uiLabelMap.ProductIncludeGeo}" tooltip="${uiLabelMap.ProductIncludeGeoMessage}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
@@ -664,8 +674,24 @@
         </field>
         <field name="includeFeatureGroup" title="${uiLabelMap.ProductIncludeFeature}" tooltip="${uiLabelMap.ProductIncludeFeatureMessage}"><text/></field>
         <field name="excludeFeatureGroup" title="${uiLabelMap.ProductExcludeFeature}" tooltip="${uiLabelMap.ProductExcludeFeatureMessage}"><text/></field>
-        <field name="serviceName"><text/></field>
-        <field name="configProps"><text/></field>
+        <field name="serviceName" title="${uiLabelMap.FacilityShipmentServiceName}">
+            <text/>
+        </field>
+        <field name="configProps" title="${uiLabelMap.FacilityShipmentConfigProps}">
+            <text/>
+        </field>
+        <field name="shipmentCustomMethodId" title="${uiLabelMap.FacilityShipmentCustomMethod}">
+            <drop-down allow-empty="true">
+                <list-options key-name="customMethodId" description="${description} (${customMethodName})" list-name="shipmentCustomMethods"/>
+            </drop-down>
+        </field>
+        <field name="shipmentGatewayConfigId" title="${uiLabelMap.FacilityShipmentGatewayConfigId}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="ShipmentGatewayConfig" key-field-name="shipmentGatewayConfigId" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
         <field name="sequenceNumber" title="${uiLabelMap.FormFieldTitle_sequenceNum}" tooltip="${uiLabelMap.ProductUsedForDisplayOrdering}"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=796874&r1=796873&r2=796874&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Wed Jul 22 20:39:35 2009
@@ -1220,8 +1220,61 @@
         <response name="success" type="view" value="FacilityLocationGeoLocation"/>
         <response name="error" type="view" value="EditFacility"/>
     </request-map>
-
-
+    
+    <!-- Shipment Gateway Config -->
+    <request-map uri="FindShipmentGatewayConfig">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="FindShipmentGatewayConfig"/>
+    </request-map>
+    <request-map uri="EditShipmentGatewayConfig">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditShipmentGatewayConfig"/>
+    </request-map>
+    <request-map uri="UpdateShipmentGatewayConfig">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateShipmentGatewayConfig"/>
+        <response name="success" type="view" value="EditShipmentGatewayConfig"/>
+        <response name="error" type="view" value="EditShipmentGatewayConfig"/>
+    </request-map>
+    <request-map uri="UpdateShipmentGatewayConfigDhl">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateShipmentGatewayConfigDhl"/>
+        <response name="success" type="view" value="EditShipmentGatewayConfig"/>
+        <response name="error" type="view" value="EditShipmentGatewayConfig"/>
+    </request-map>
+    <request-map uri="UpdateShipmentGatewayConfigFedex">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateShipmentGatewayConfigFedex"/>
+        <response name="success" type="view" value="EditShipmentGatewayConfig"/>
+        <response name="error" type="view" value="EditShipmentGatewayConfig"/>
+    </request-map>
+    <request-map uri="UpdateShipmentGatewayConfigUps">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateShipmentGatewayConfigUps"/>
+        <response name="success" type="view" value="EditShipmentGatewayConfig"/>
+        <response name="error" type="view" value="EditShipmentGatewayConfig"/>
+    </request-map>
+    <request-map uri="UpdateShipmentGatewayConfigUsps">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateShipmentGatewayConfigUsps"/>
+        <response name="success" type="view" value="EditShipmentGatewayConfig"/>
+        <response name="error" type="view" value="EditShipmentGatewayConfig"/>
+    </request-map>
+    <request-map uri="FindShipmentGatewayConfigTypes">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="FindShipmentGatewayConfigTypes"/>
+    </request-map>
+    <request-map uri="EditShipmentGatewayConfigType">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditShipmentGatewayConfigType"/>
+    </request-map>
+    <request-map uri="UpdateShipmentGatewayConfigType">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateShipmentGatewayConfigType"/>
+        <response name="success" type="view" value="EditShipmentGatewayConfigType"/>
+        <response name="error" type="view" value="EditShipmentGatewayConfigType"/>
+    </request-map>
+    
     <!-- ================ Lookup Requests ================= -->
     <request-map uri="LookupOrderHeaderAndShipInfo"><security https="true" auth="true"/><response name="success" type="view" value="LookupOrderHeaderAndShipInfo"/></request-map>
     <request-map uri="LookupPurchaseOrderHeaderAndShipInfo"><security https="true" auth="true"/><response name="success" type="view" value="LookupPurchaseOrderHeaderAndShipInfo"/></request-map>
@@ -1330,5 +1383,11 @@
     <view-map name="LookupProductInventoryLocation" page="component://product/widget/facility/LookupScreens.xml#LookupProductInventoryLocation" type="screen"/>
     <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
     <view-map name="LookupInventoryItem" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupInventoryItem"/>
+    
+    <!-- Shipment Gateway Config -->
+    <view-map name="FindShipmentGatewayConfig" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#FindShipmentGatewayConfig" type="screen"/>
+    <view-map name="EditShipmentGatewayConfig" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#EditShipmentGatewayConfig" type="screen"/>
+    <view-map name="FindShipmentGatewayConfigTypes" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#FindShipmentGatewayConfigTypes" type="screen"/>
+    <view-map name="EditShipmentGatewayConfigType" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#EditShipmentGatewayConfigType" type="screen"/>
     <!-- end of view mappings -->
 </site-conf>

Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=796874&r1=796873&r2=796874&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Wed Jul 22 20:39:35 2009
@@ -305,6 +305,10 @@
                 <entity-condition entity-name="CarrierShipmentMethod" list="carrierShipmentMethods">
                     <order-by field-name="sequenceNumber"/>
                 </entity-condition>
+                <entity-condition entity-name="CustomMethod" list="shipmentCustomMethods">
+                    <condition-expr field-name="customMethodTypeId" value="SHIP_EST"/>
+                    <order-by field-name="description"/>
+                </entity-condition>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/product/widget/facility/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/Menus.xml?rev=796874&r1=796873&r2=796874&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/Menus.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/Menus.xml Wed Jul 22 20:39:35 2009
@@ -25,6 +25,12 @@
         <menu-item name="facility" title="${uiLabelMap.ProductFacilities}"><link target="FindFacility"/></menu-item>
         <menu-item name="facilityGroup" title="${uiLabelMap.ProductFacilityGroups}"><link target="FindFacilityGroup"/></menu-item>
         <menu-item name="inventoryItemLabel" title="${uiLabelMap.ProductInventoryItemLabels}"><link target="FindInventoryItemLabels"/></menu-item>
+        <menu-item name="ShipmentGatewayConfig" title="${uiLabelMap.FacilityShipmentGatewayConfig}">
+            <condition>
+                <if-has-permission permission="PAYPROC" action="_ADMIN"/>
+            </condition>
+            <link target="FindShipmentGatewayConfig"/>
+        </menu-item>
         <menu-item name="shipment" title="${uiLabelMap.ProductShipments}"><link target="FindShipment"/></menu-item>
         <menu-item name="reports" title="${uiLabelMap.CommonReports}">
             <condition>
@@ -189,4 +195,13 @@
             </link>
         </menu-item>
     </menu>
+    
+    <menu name="ShipmentGatewayConfigTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="shipmentGatewayConfigTab" title="${uiLabelMap.FacilityShipmentGatewayConfig}">
+            <link target="FindShipmentGatewayConfig"/>
+        </menu-item>
+        <menu-item name="shipmentGatewayConfigTypesTab" title="${uiLabelMap.FacilityShipmentGatewayConfigTypes}">
+            <link target="FindShipmentGatewayConfigTypes"/>
+        </menu-item>
+    </menu>
 </menus>


Free forum by Nabble Edit this page