You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/08/18 14:19:56 UTC

svn commit: r986642 [1/2] - in /ofbiz/branches/jquery: ./ applications/commonext/data/ applications/party/config/ applications/party/data/helpdata/ applications/party/script/org/ofbiz/party/party/ applications/party/servicedef/ applications/party/widge...

Author: jleroux
Date: Wed Aug 18 12:19:54 2010
New Revision: 986642

URL: http://svn.apache.org/viewvc?rev=986642&view=rev
Log:
Merge the trunk at r986592

Added:
    ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/category/OfbizCatalogUrlTransform.java
      - copied unchanged from r986606, ofbiz/trunk/applications/product/src/org/ofbiz/product/category/OfbizCatalogUrlTransform.java
    ofbiz/branches/jquery/framework/base/lib/commons/commons-fileupload-1.2.2.jar
      - copied unchanged from r986606, ofbiz/trunk/framework/base/lib/commons/commons-fileupload-1.2.2.jar
    ofbiz/branches/jquery/framework/base/lib/freemarker-2.3.10.jar
      - copied unchanged from r986606, ofbiz/trunk/framework/base/lib/freemarker-2.3.10.jar
    ofbiz/branches/jquery/framework/common/webcommon/includes/setCountryStatesEventJs.ftl
      - copied unchanged from r986606, ofbiz/trunk/framework/common/webcommon/includes/setCountryStatesEventJs.ftl
    ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl
      - copied unchanged from r986606, ofbiz/trunk/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl
    ofbiz/branches/jquery/framework/images/webapp/images/getDependentDropdownValues.js
      - copied unchanged from r986606, ofbiz/trunk/framework/images/webapp/images/getDependentDropdownValues.js
Removed:
    ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/category/CatalogUrlDirective.java
    ofbiz/branches/jquery/framework/base/lib/commons/commons-fileupload-1.2.jar
    ofbiz/branches/jquery/framework/base/lib/freemarker-2.3.15.jar
    ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/geolocation.ftl
Modified:
    ofbiz/branches/jquery/   (props changed)
    ofbiz/branches/jquery/.classpath
    ofbiz/branches/jquery/LICENSE
    ofbiz/branches/jquery/applications/commonext/data/ProductStoreData.xml
    ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml
    ofbiz/branches/jquery/applications/party/data/helpdata/HELP_PARTY.xml
    ofbiz/branches/jquery/applications/party/data/helpdata/HELP_PARTY_findparty.xml
    ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/party/PartyServices.xml
    ofbiz/branches/jquery/applications/party/servicedef/services_view.xml
    ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationForms.xml
    ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationScreens.xml
    ofbiz/branches/jquery/applications/party/widget/partymgr/PartyInvitationForms.xml
    ofbiz/branches/jquery/applications/product/config/freemarkerTransforms.properties
    ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
    ofbiz/branches/jquery/applications/product/servicedef/services_view.xml
    ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
    ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
    ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/CommonServices.xml
    ofbiz/branches/jquery/framework/common/servicedef/services.xml
    ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml
    ofbiz/branches/jquery/framework/common/webcommon/includes/geolocation.ftl
    ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml
    ofbiz/branches/jquery/framework/entity/config/entityengine.xml
    ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml
    ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml
    ofbiz/branches/jquery/framework/example/widget/example/CommonScreens.xml
    ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml
    ofbiz/branches/jquery/framework/example/widget/example/ExampleScreens.xml
    ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml
    ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml
    ofbiz/branches/jquery/framework/images/webapp/images/fieldlookup.js
    ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl
    ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoShipping.xml
    ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy   (props changed)
    ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy   (props changed)
    ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy   (props changed)
    ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css

Propchange: ofbiz/branches/jquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 18 12:19:54 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:951708-985475
+/ofbiz/trunk:951708-986606

Modified: ofbiz/branches/jquery/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/.classpath?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/.classpath (original)
+++ ofbiz/branches/jquery/.classpath Wed Aug 18 12:19:54 2010
@@ -18,7 +18,7 @@
     <classpathentry kind="lib" path="framework/base/lib/clhm-release-1.0-lru.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/hamcrest-all-1.2.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/fop-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.15.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.10.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/httpclient-4.0.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/httpcore-4.0.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/httpunit.jar"/>
@@ -61,7 +61,7 @@
     <classpathentry kind="lib" path="framework/base/lib/commons/commons-digester-1.8.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/commons/commons-discovery-0.4.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/commons/commons-el-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-fileupload-1.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-fileupload-1.2.2.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/commons/commons-io-1.3.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/commons/commons-lang-2.4.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/commons/commons-logging-1.1.jar"/>

Modified: ofbiz/branches/jquery/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/LICENSE?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/LICENSE (original)
+++ ofbiz/branches/jquery/LICENSE Wed Aug 18 12:19:54 2010
@@ -42,7 +42,7 @@ ofbiz/trunk/framework/base/lib/commons/c
 ofbiz/trunk/framework/base/lib/commons/commons-digester-1.8.jar
 ofbiz/trunk/framework/base/lib/commons/commons-discovery-0.4.jar
 ofbiz/trunk/framework/base/lib/commons/commons-el-1.0.jar
-ofbiz/trunk/framework/base/lib/commons/commons-fileupload-1.2.jar
+ofbiz/trunk/framework/base/lib/commons/commons-fileupload-1.2.2.jar
 ofbiz/trunk/framework/base/lib/commons/commons-io-1.3.1.jar
 ofbiz/trunk/framework/base/lib/commons/commons-lang-2.4.jar
 ofbiz/trunk/framework/base/lib/commons/commons-logging-1.1.jar
@@ -478,7 +478,7 @@ The JDOM License
 The following libraries distributed with Apache OFBiz are licensed under the
 BSD License:
 ofbiz/trunk/framework/base/lib/antisamy-bin.1.2.jar
-ofbiz/trunk/framework/base/lib/freemarker-2.3.15.jar
+ofbiz/trunk/framework/base/lib/freemarker-2.3.10.jar
 ofbiz/trunk/framework/base/lib/hamcrest-all-1.2.jar
 ofbiz/trunk/framework/base/lib/httpunit.jar
 ofbiz/trunk/framework/base/lib/ical4j-1.0-rc2.jar

Modified: ofbiz/branches/jquery/applications/commonext/data/ProductStoreData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/data/ProductStoreData.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/commonext/data/ProductStoreData.xml (original)
+++ ofbiz/branches/jquery/applications/commonext/data/ProductStoreData.xml Wed Aug 18 12:19:54 2010
@@ -34,41 +34,41 @@
     <ProductStorePaymentSetting productStoreId="PRODUCTSTOREID" paymentMethodTypeId="EXT_COD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
     <ProductStorePaymentSetting productStoreId="PRODUCTSTOREID" paymentMethodTypeId="EXT_BILLACT" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
     
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="_NA_" includeNoChargeItems="Y" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NO_SHIPPING" sequenceNumber="6"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="3"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="AIR" sequenceNumber="2"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY" sequenceNumber="1"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="USPS" includeNoChargeItems="N" allowUspsAddr="Y" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="STANDARD" serviceName="uspsRateInquire" sequenceNumber="5"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="USPS" includeNoChargeItems="N" allowUspsAddr="Y" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS" serviceName="uspsRateInquire" sequenceNumber="4"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS" sequenceNumber="7"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_PM" sequenceNumber="8"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY" sequenceNumber="9"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="10"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_AM" sequenceNumber="11"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY" sequenceNumber="12"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_PM" sequenceNumber="13"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY" sequenceNumber="14"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS" sequenceNumber="15"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="16"/>
-    <ProductStoreShipmentMeth productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND_HOME" sequenceNumber="17"/>
+    <ProductStoreShipmentMeth productStoreShipMethId="9000" productStoreId="PRODUCTSTOREID" partyId="_NA_" includeNoChargeItems="Y" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NO_SHIPPING" sequenceNumber="6"/>
+    <ProductStoreShipmentMeth productStoreShipMethId="9001" productStoreId="PRODUCTSTOREID" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="3"/>
+    <ProductStoreShipmentMeth productStoreShipMethId="9002" productStoreId="PRODUCTSTOREID" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="AIR" sequenceNumber="2"/>
+    <ProductStoreShipmentMeth productStoreShipMethId="9003" productStoreId="PRODUCTSTOREID" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY" sequenceNumber="1"/>
+    <ProductStoreShipmentMeth productStoreShipMethId="9004" productStoreId="PRODUCTSTOREID" partyId="USPS" includeNoChargeItems="N" allowUspsAddr="Y" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="STANDARD" serviceName="uspsRateInquire" sequenceNumber="5"/>
+    <ProductStoreShipmentMeth productStoreShipMethId="9005" productStoreId="PRODUCTSTOREID" partyId="USPS" includeNoChargeItems="N" allowUspsAddr="Y" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS" serviceName="uspsRateInquire" sequenceNumber="4"/>
+    <ProductStoreShipmentMeth productStoreShipMethId="9006" productStoreId="PRODUCTSTOREID" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS" sequenceNumber="7"/>
+    <ProductStoreShipmentMeth productStoreShipMethId="9007" productStoreId="PRODUCTSTOREID" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_PM" sequenceNumber="8"/>
+    <ProductStoreShipmentMeth productStoreShipMethId="9008" productStoreId="PRODUCTSTOREID" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY" sequenceNumber="9"/>
+    <ProductStoreShipmentMeth productStoreShipMethId="9009" productStoreId="PRODUCTSTOREID" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="10"/>
+    <ProductStoreShipmentMeth productStoreShipMethId="9010" productStoreId="PRODUCTSTOREID" partyId="FEDEX" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_AM" sequenceNumber="11"/>
+    <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="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"/>
     
     <CarrierShipmentMethod partyId="ORGPARTYID" roleTypeId="CARRIER" shipmentMethodTypeId="LOCAL_DELIVERY" sequenceNumber="4"/>
     
     <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="5.0" orderItemFlatPrice="0.0" carrierPartyId="ORGPARTYID" carrierRoleTypeId="CARRIER" orderPricePercent="0.0" shipmentMethodTypeId="LOCAL_DELIVERY"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="5.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="AIR" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9000" weightUnitPrice="0.2"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="3.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="GROUND" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9001" weightUnitPrice="0.1"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="10.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="NEXT_DAY" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9002" weightUnitPrice="0.35"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" shipmentMethodTypeId="STANDARD" carrierPartyId="_NA_" carrierRoleTypeId="CARRIER" orderFlatPrice="0.0" orderPricePercent="20.0" orderItemFlatPrice="0.0"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" shipmentMethodTypeId="NO_SHIPPING" carrierPartyId="_NA_" carrierRoleTypeId="CARRIER" orderFlatPrice="0.0" orderPricePercent="0.0" orderItemFlatPrice="0.0"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="10.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="EXPRESS" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9003" weightUnitPrice="0.2"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="9.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="NEXT_PM" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9004" weightUnitPrice="0.2"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="5.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="SECOND_DAY" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9005" weightUnitPrice="0.2"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="3.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="GROUND" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9006" weightUnitPrice="0.1"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="NEXT_AM" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="NEXT_DAY" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="NEXT_PM" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="SECOND_DAY" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="EXPRESS" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="GROUND" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/>
-    <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="GROUND_HOME" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/>
+    <ShipmentCostEstimate productStoreShipMethId="9002" productStoreId="PRODUCTSTOREID" orderFlatPrice="5.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="AIR" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9000" weightUnitPrice="0.2"/>
+    <ShipmentCostEstimate productStoreShipMethId="9001" productStoreId="PRODUCTSTOREID" orderFlatPrice="3.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="GROUND" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9001" weightUnitPrice="0.1"/>
+    <ShipmentCostEstimate productStoreShipMethId="9003" productStoreId="PRODUCTSTOREID" orderFlatPrice="10.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="NEXT_DAY" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9002" weightUnitPrice="0.35"/>
+    <ShipmentCostEstimate productStoreShipMethId="9000" productStoreId="PRODUCTSTOREID" shipmentMethodTypeId="STANDARD" carrierPartyId="_NA_" carrierRoleTypeId="CARRIER" orderFlatPrice="0.0" orderPricePercent="20.0" orderItemFlatPrice="0.0"/>
+    <ShipmentCostEstimate productStoreShipMethId="9000" productStoreId="PRODUCTSTOREID" shipmentMethodTypeId="NO_SHIPPING" carrierPartyId="_NA_" carrierRoleTypeId="CARRIER" orderFlatPrice="0.0" orderPricePercent="0.0" orderItemFlatPrice="0.0"/>
+    <ShipmentCostEstimate productStoreShipMethId="9006" productStoreId="PRODUCTSTOREID" orderFlatPrice="10.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="EXPRESS" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9003" weightUnitPrice="0.2"/>
+    <ShipmentCostEstimate productStoreShipMethId="9007" productStoreId="PRODUCTSTOREID" orderFlatPrice="9.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="NEXT_PM" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9004" weightUnitPrice="0.2"/>
+    <ShipmentCostEstimate productStoreShipMethId="9008" productStoreId="PRODUCTSTOREID" orderFlatPrice="5.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="SECOND_DAY" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9005" weightUnitPrice="0.2"/>
+    <ShipmentCostEstimate productStoreShipMethId="9009" productStoreId="PRODUCTSTOREID" orderFlatPrice="3.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="GROUND" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9006" weightUnitPrice="0.1"/>
+    <ShipmentCostEstimate productStoreShipMethId="9010" productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="NEXT_AM" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/>
+    <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="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/jquery/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml Wed Aug 18 12:19:54 2010
@@ -445,7 +445,7 @@
         <value xml:lang="es">Nombre del grupo</value>
         <value xml:lang="fr">Nom du groupe d'acteurs</value>
         <value xml:lang="hi_IN">समूह का नाम</value>
-        <value xml:lang="it">Nome Gruppo</value>
+        <value xml:lang="it">Nome gruppo</value>
         <value xml:lang="nl">Groepnaam</value>
         <value xml:lang="pt_BR">Nome do grupo</value>
         <value xml:lang="ro">Nume Grup</value>
@@ -459,7 +459,7 @@
         <value xml:lang="es">Nombre local del grupo</value>
         <value xml:lang="fr">Nom de groupe local</value>
         <value xml:lang="hi_IN">स्थानीय समूह का नाम</value>
-        <value xml:lang="it">Nome Gruppo Locale</value>
+        <value xml:lang="it">Nome gruppo locale</value>
         <value xml:lang="nl">Groepnaam lokaal</value>
         <value xml:lang="pt_BR">Nome do grupo local</value>
         <value xml:lang="ro">Nume Grup Local</value>
@@ -527,7 +527,7 @@
         <value xml:lang="es">Última fecha de invitación</value>
         <value xml:lang="fr">Date de dernière invitation</value>
         <value xml:lang="hi_IN">अंतिम आमंत्रित दिनांक</value>
-        <value xml:lang="it">Data Ultimo Invito</value>
+        <value xml:lang="it">Data ultimo invito</value>
         <value xml:lang="nl">Datum laatste uitnodiging</value>
         <value xml:lang="pt_BR">Data do último convite</value>
         <value xml:lang="th">วันที่เข้ามาครั้งสุดท้าย</value>
@@ -1031,7 +1031,7 @@
         <value xml:lang="es">Código Invitación de participante</value>
         <value xml:lang="fr">Invitation d'acteur</value>
         <value xml:lang="hi_IN">पार्टी निमंत्रण क्रमांक</value>
-        <value xml:lang="it">Invito soggetto</value>
+        <value xml:lang="it">Codice invito</value>
         <value xml:lang="nl">Uitnodigingnr. relatie</value>
         <value xml:lang="pt_BR">Id do convite do participante</value>
         <value xml:lang="th">รหัสการเชิญชวนกลุ่มผู้ใช้</value>
@@ -1588,7 +1588,7 @@
         <value xml:lang="es">Añadir asociación de grupo a invitación de participante</value>
         <value xml:lang="fr">Ajoutez le groupe d'association d'invitation de l'acteur</value>
         <value xml:lang="hi_IN">पार्टी निमंत्रण समूह एसोसिएशन जोड़ें</value>
-        <value xml:lang="it">Aggiorna Gruppo Associazioni Inviti Soggetto</value>
+        <value xml:lang="it">Aggiungi al gruppo di soggetti associati</value>
         <value xml:lang="nl">Uitnodiging relatie groep-associatie toevoegen</value>
         <value xml:lang="pt_BR">Adicionar convite de associação ao grupo para participante</value>
         <value xml:lang="th">เพิ่มการเชื่อมโยงกลุ่มผู้ใช้</value>
@@ -1600,7 +1600,7 @@
         <value xml:lang="es">Añadir asociación de rol a invitación de participante</value>
         <value xml:lang="fr">Ajoutez le rôle d'association d'invitation de l'acteur</value>
         <value xml:lang="hi_IN">पार्टी निमंत्रण भूमिका एसोसिएशन जोड़ें</value>
-        <value xml:lang="it">Aggiorna Ruolo Associazioni Inviti Soggetto</value>
+        <value xml:lang="it">Associa nuovo ruolo all'invito</value>
         <value xml:lang="nl">Uitnodiging relatie rol-associatie toevoegen</value>
         <value xml:lang="pt_BR">Adicionar convite de associação de papel ao participante</value>
         <value xml:lang="th">เพิ่มสถานะการเชิญชวนกลุ่มผู้ใช้</value>
@@ -1866,7 +1866,7 @@
         <value xml:lang="es">Editar asociación de grupo de invitación de participante</value>
         <value xml:lang="fr">Modifier l'association groupe invitation de l'acteurs</value>
         <value xml:lang="hi_IN">पार्टी निमंत्रण समूहएसोसिएशन(GroupAssoc) को संपादित करें</value>
-        <value xml:lang="it">Aggiorna associazione gruppo invito</value>
+        <value xml:lang="it">Aggiorna soggetti associati all'invito</value>
         <value xml:lang="nl">Groepassociaties relatie-uitnodigingen wijzigen</value>
         <value xml:lang="pt_BR">Editar associação de grupo de convite de participante</value>
         <value xml:lang="th">แก้ไขการเชิญชวนกลุ่มผู้ใช้</value>
@@ -3494,7 +3494,7 @@
         <value xml:lang="es">Grupo de clasificación</value>
         <value xml:lang="fr">Groupe classification</value>
         <value xml:lang="hi_IN">वर्गीकरण समूह</value>
-        <value xml:lang="it">Gruppo Classificazione</value>
+        <value xml:lang="it">Gruppo classificazione</value>
         <value xml:lang="nl">Classificatiegroep</value>
         <value xml:lang="pt_BR">Grupo de classificação</value>
         <value xml:lang="ro">Grup Clasificare</value>
@@ -4592,7 +4592,7 @@
         <value xml:lang="es">Nuevo participante</value>
         <value xml:lang="fr">Choisir un type d'acteur</value>
         <value xml:lang="hi_IN">पार्टी के नए विस्तार बनाएँ</value>
-        <value xml:lang="it">Creare nuovo soggetto</value>
+        <value xml:lang="it">Nuovo soggetto</value>
         <value xml:lang="nl">Nieuwe detail relatie</value>
         <value xml:lang="pt_BR">Criar novos dados de participante</value>
         <value xml:lang="pt_PT">CriarNovo Detalhe de Secção</value>
@@ -4607,7 +4607,7 @@
         <value xml:lang="es">Crear nuevo grupo de clasificación</value>
         <value xml:lang="fr">Créer un nouveau groupe de classification</value>
         <value xml:lang="hi_IN">पार्टी का नया वर्गीकरण समूह बनाएँ</value>
-        <value xml:lang="it">Creare nuovo gruppo classificazione cliente</value>
+        <value xml:lang="it">Nuovo gruppo classificazione soggetti</value>
         <value xml:lang="nl">Nieuw kenmerkgroep voor relatie</value>
         <value xml:lang="pt_BR">Criar novo grupo de classificação de participantes</value>
         <value xml:lang="ro">Creare un Nou Grupo Clasificare Client</value>
@@ -5698,7 +5698,7 @@
         <value xml:lang="es">Nombre del grupo</value>
         <value xml:lang="fr">Nom du groupe</value>
         <value xml:lang="hi_IN">समूह का नाम</value>
-        <value xml:lang="it">Nome Gruppo</value>
+        <value xml:lang="it">Nome gruppo</value>
         <value xml:lang="nl">Groepnaam</value>
         <value xml:lang="pt_BR">Nome do grupo</value>
         <value xml:lang="ro">Nome Grup</value>
@@ -5712,7 +5712,7 @@
         <value xml:lang="es">Falta nombre del grupo</value>
         <value xml:lang="fr">Nom du groupe absent</value>
         <value xml:lang="hi_IN">समूह का नाम गायब है</value>
-        <value xml:lang="it">Nome Gruppo mancante</value>
+        <value xml:lang="it">Nome gruppo mancante</value>
         <value xml:lang="nl">Groepnaam ontbreekt</value>
         <value xml:lang="pt_BR">Nome do grupo está faltando</value>
         <value xml:lang="ro">Nume Grup Lipsa</value>
@@ -5994,7 +5994,7 @@
         <value xml:lang="es">Invitación</value>
         <value xml:lang="fr">Invitation</value>
         <value xml:lang="hi_IN">निमंत्रण</value>
-        <value xml:lang="it">Inviti soggetti</value>
+        <value xml:lang="it">Invito</value>
         <value xml:lang="pt_BR">Convite</value>
         <value xml:lang="th">คำเชิญ</value>
         <value xml:lang="zh">邀请</value>
@@ -6029,7 +6029,7 @@
         <value xml:lang="es">Grupo de asociación</value>
         <value xml:lang="fr">Groupe d'associations</value>
         <value xml:lang="hi_IN">समूहसंघ</value>
-        <value xml:lang="it">Gruppo associazione inviti</value>
+        <value xml:lang="it">Soggetti associati</value>
         <value xml:lang="nl">Associaties</value>
         <value xml:lang="pt_BR">Grupo de associação</value>
         <value xml:lang="th">รวมกลุ่ม</value>
@@ -6065,7 +6065,7 @@
         <value xml:lang="es">Nueva invitación de participante</value>
         <value xml:lang="fr">Nouvelle invitation pour l'acteur</value>
         <value xml:lang="hi_IN">नया पार्टी निमंत्रण</value>
-        <value xml:lang="it">Nuovo invito soggetto</value>
+        <value xml:lang="it">Nuovo invito</value>
         <value xml:lang="nl">Nieuwe uitnodiging</value>
         <value xml:lang="pt_BR">Novo convite de participante</value>
         <value xml:lang="th">คำเชิญของกลุ่มผู้ใช้ใหม่</value>
@@ -6083,25 +6083,13 @@
         <value xml:lang="th">นี่ไม่ใช่คำเชิญของกลุ่มผู้ใช้</value>
         <value xml:lang="zh">这不是一个有效的会员邀请</value>
     </property>
-    <property key="PartyInvitationPartyInvitationId">
-        <value xml:lang="de">Akteur Einladung ID</value>
-        <value xml:lang="en">Party Invitation Id</value>
-        <value xml:lang="es">Código Invitación de participante</value>
-        <value xml:lang="fr">Invitation d'acteur</value>
-        <value xml:lang="hi_IN">पार्टी निमंत्रण क्रमांक</value>
-        <value xml:lang="it">Invito Soggetto</value>
-        <value xml:lang="nl">Uitnodiging</value>
-        <value xml:lang="pt_BR">Id do convite de participante</value>
-        <value xml:lang="th">รหัสคำเชิญของกลุ่มผู้ใช้</value>
-        <value xml:lang="zh">会员邀请标识</value>
-    </property>
     <property key="PartyInvitationRoleAssoc">
         <value xml:lang="de">Rolle Verbindung</value>
         <value xml:lang="en">RoleAssoc</value>
         <value xml:lang="es">Asociación Rol</value>
         <value xml:lang="fr">Association de rôle</value>
         <value xml:lang="hi_IN">भूमिकाएसोसिएशन</value>
-        <value xml:lang="it">Ruolo associazione inviti</value>
+        <value xml:lang="it">Ruolo associati</value>
         <value xml:lang="nl">Soort associatie</value>
         <value xml:lang="pt_BR">Associação de papel</value>
         <value xml:lang="th">สถานะที่เกี่ยวเนื่องกัน</value>
@@ -6484,7 +6472,7 @@
         <value xml:lang="es">Buscar participante por nombre</value>
         <value xml:lang="fr">Consultation de l'acteur par son nom</value>
         <value xml:lang="hi_IN">पार्टी के नाम से लुकअप</value>
-        <value xml:lang="it">Ricerca Soggetti per Nome</value>
+        <value xml:lang="it">Ricerca soggetti per nome</value>
         <value xml:lang="nl">Relatie op naam zoeken</value>
         <value xml:lang="pt_BR">Buscar participante por nome</value>
         <value xml:lang="ro">Cauta Subiecti pe Nume</value>
@@ -6554,7 +6542,7 @@
         <value xml:lang="es">Buscar conexión y detalles de participante</value>
         <value xml:lang="fr">Consulter l'identifiant de connexion et les détails de l'acteur</value>
         <value xml:lang="hi_IN">उपयोगकर्तालॉगिन/पार्टीविवरण लुकअप</value>
-        <value xml:lang="it">Ricerca Soggetti Utenti e Dettagli</value>
+        <value xml:lang="it">Ricerca soggetti utenti e dettagli</value>
         <value xml:lang="nl">Logingegevens zoeken</value>
         <value xml:lang="pt_BR">Buscar nome de usuário e detalhes de participante</value>
         <value xml:lang="ru">Искать подробности имени входа/участника</value>
@@ -7948,7 +7936,7 @@
         <value xml:lang="es">de participante</value>
         <value xml:lang="fr">De l'acteur</value>
         <value xml:lang="hi_IN">पार्टी से</value>
-        <value xml:lang="it">Soggetto dal</value>
+        <value xml:lang="it">Dal soggetto</value>
         <value xml:lang="nl">Relatie van</value>
         <value xml:lang="pt_BR">do participante</value>
         <value xml:lang="pt_PT">Secção de</value>
@@ -7978,7 +7966,7 @@
         <value xml:lang="es">Nombre del grupo</value>
         <value xml:lang="fr">Nom du groupe d'acteurs</value>
         <value xml:lang="hi_IN">पार्टी समूह का नाम</value>
-        <value xml:lang="it">Nome Gruppo Soggetto</value>
+        <value xml:lang="it">Nome gruppo soggetti</value>
         <value xml:lang="nl">Naam relatiegroep</value>
         <value xml:lang="pt_BR">Nome do grupo de participantes</value>
         <value xml:lang="pt_PT">Nome de Grupo de Secção</value>
@@ -9394,7 +9382,7 @@
         <value xml:lang="es">Lista de grupos de seguridad</value>
         <value xml:lang="fr">Liste des groupes de sécurité</value>
         <value xml:lang="hi_IN">सुरक्षासमूह की सूची</value>
-        <value xml:lang="it">Lista Gruppi Sicurezza</value>
+        <value xml:lang="it">Lista gruppi sicurezza</value>
         <value xml:lang="nl">Overzicht beveiligingsgroepen</value>
         <value xml:lang="pt_BR">Lista de grupos de segurança</value>
         <value xml:lang="pt_PT">Lista de Grupos de Segurança</value>
@@ -10670,7 +10658,7 @@
         <value xml:lang="es">Ver certificado</value>
         <value xml:lang="fr">Afficher le certificat</value>
         <value xml:lang="hi_IN">प्रमाणपत्र देखें</value>
-        <value xml:lang="it">Mostra Certificato</value>
+        <value xml:lang="it">Mostra certificato</value>
         <value xml:lang="nl">Certificaat bekijken</value>
         <value xml:lang="pt_BR">Ver certificado</value>
         <value xml:lang="ru">Просмотр сертификата</value>

Modified: ofbiz/branches/jquery/applications/party/data/helpdata/HELP_PARTY.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/data/helpdata/HELP_PARTY.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/data/helpdata/HELP_PARTY.xml (original)
+++ ofbiz/branches/jquery/applications/party/data/helpdata/HELP_PARTY.xml Wed Aug 18 12:19:54 2010
@@ -22,7 +22,7 @@ under the License.
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
     xmlns="http://docbook.org/ns/docbook">
-    <title>The Party Introduction</title>
+    <title>The Party Manager Application</title>
     <para>
         The Party Manager application is used to manage the parties, i.e any legal entity your company has to deal with.
     </para>

Modified: ofbiz/branches/jquery/applications/party/data/helpdata/HELP_PARTY_findparty.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/data/helpdata/HELP_PARTY_findparty.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/data/helpdata/HELP_PARTY_findparty.xml (original)
+++ ofbiz/branches/jquery/applications/party/data/helpdata/HELP_PARTY_findparty.xml Wed Aug 18 12:19:54 2010
@@ -18,15 +18,18 @@ License.
     xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
     xmlns="http://docbook.org/ns/docbook">
     <title>The Party Find help screen.</title>
-    <para>The default screen is for the Party tab is 'Find Party'. It is used to locate existing
-        parties. Various serach criteria can be used, either based on the the general party data
+    <para>The 'Find Party' is the default screen for the Party Manager application. It is used to locate existing
+        parties. Various search criteria can be used, either based on the general party data
         like name role and type but also on the postal address, telephone (Telecom) and other like
-        email address. </para>
-    <para> If the find button is pressed, a list is presented containing several columns. Most
-        colums are pretty obvious. </para>
-    <para> The &quot;Main Roletype&quot; need a little more explanation. In here the role is
-        listed which is a child of the &quot;Main role"&quot; roletype. It is currently set
-        to &quot;Organisation&amp; and &quot;SFA Role&quot;. The later to be
-        prepared to use he party in he SFA component. See the marketing application for more
-        information </para>
+        email address.</para>
+    <para>If the find button is pressed, a list is presented containing several columns.</para>
+    <para>The first column shows the Party ID. This is a string that uniquely identifies the Party in the system.</para>
+    <para>The second column shows the Party logins. This is the string the user enters when logging into the system. A single Party can have more than one login. 
+          In this case the &quot;(many)&quot; string is showed in place of the login string. The complete list of user logins can still be seen in the Party details screen.
+          If a Party has no user login associated the string &quot;(none)&quot; is shown.</para>
+    <para></para>
+    <para></para>
+    <para>In the &quot;Main Roletype&quot; column the role is listed which is a child of the &quot;Main role"&quot; roletype. It is currently set
+        to &quot;Organisation&quot; and &quot;SFA Role&quot;. The later to be prepared to use he party in he SFA component. See the marketing application for more
+        information</para>
 </section>

Modified: ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/party/PartyServices.xml Wed Aug 18 12:19:54 2010
@@ -1037,36 +1037,6 @@ under the License.
         </if-not-empty>
     </simple-method>
 
-    <simple-method method-name="getCountryList" short-description="Returns a list of country" login-required="false">
-        <call-class-method method-name="getCountryList" class-name="org.ofbiz.common.CommonWorkers" ret-field="geoList">
-            <field field="delegator" type="org.ofbiz.entity.Delegator"/>
-        </call-class-method>
-        <iterate list="geoList" entry="countryGeo">
-            <set field="countryName" value="${countryGeo.geoName}: ${countryGeo.geoId}"/>
-            <field-to-list list="countryList" field="countryName"/>
-        </iterate>
-        <field-to-result field="countryList"/>
-    </simple-method>
-
-    <simple-method method-name="getAssociatedStateList" short-description="set the state options for selected country" login-required="false">
-        <set field="countryGeoId" from-field="parameters.countryGeoId"/>
-        <set field="listOrderBy" from-field="parameters.listOrderBy"/>
-        <call-class-method method-name="getAssociatedStateList" class-name="org.ofbiz.common.CommonWorkers" ret-field="geoList">
-            <field field="delegator" type="org.ofbiz.entity.Delegator"/>
-            <field field="countryGeoId" type="String"/>
-            <field field="listOrderBy" type="String"/>
-        </call-class-method>
-        <iterate list="geoList" entry="stateGeo">
-            <set field="stateName" value="${stateGeo.geoName}: ${stateGeo.geoId}"/>
-            <field-to-list list="stateList" field="stateName"/>
-        </iterate>
-        <if-empty field="stateList">
-            <property-to-field resource="CommonUiLabels" property="CommonNoStatesProvinces" field="noOption"/>
-            <field-to-list list="stateList" field="noOption"/>
-        </if-empty>
-        <field-to-result field="stateList"/>
-    </simple-method>
-
     <simple-method method-name="createUpdatePerson" short-description="Create and update a person" login-required="false">
         <call-map-processor xml-resource="component://party/script/org/ofbiz/party/party/PartyMapProcs.xml"
                 processor-name="person" in-map-name="parameters" out-map-name="personMap"/>

Modified: ofbiz/branches/jquery/applications/party/servicedef/services_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/servicedef/services_view.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/servicedef/services_view.xml (original)
+++ ofbiz/branches/jquery/applications/party/servicedef/services_view.xml Wed Aug 18 12:19:54 2010
@@ -175,18 +175,4 @@ under the License.
         <attribute name="contactMechId" type="String" mode="IN" optional="false"/>
         <attribute name="geos" type="java.util.List" mode="OUT" optional="true"/>
     </service>
-
-    <!-- Get a list of country and associated states from Geo -->
-    <service name="getCountryList" engine="simple" auth="false"
-            location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="getCountryList">
-        <attribute name="countryList" mode="OUT" type="java.util.List"/>
-    </service>
-
-    <service name="getAssociatedStateList" engine="simple" auth="false"
-            location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="getAssociatedStateList">
-        <attribute name="countryGeoId" mode="IN" type="String" optional="false"/>
-        <attribute name="listOrderBy" mode="IN" type="String" optional="true"/>
-        <attribute name="stateList" mode="OUT" type="java.util.List"/>
-    </service>
-
 </services>

Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationForms.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationForms.xml (original)
+++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationForms.xml Wed Aug 18 12:19:54 2010
@@ -80,7 +80,7 @@ under the License.
             </drop-down>
         </field>
         <field name="parentGroupId"><lookup target-form-name="LookupPartyClassificationGroup"/></field>
-        <field name="description" title="${uiLabelMap.CommonEmptyHeader}"><text size="55"/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}"><text size="55"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
 

Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationScreens.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationScreens.xml (original)
+++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationScreens.xml Wed Aug 18 12:19:54 2010
@@ -98,7 +98,7 @@ under the License.
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PartyClassificationGroups}">
-                            <container style="button-bar"><link target="EditPartyClassificationGroup" style="buttontext" text="${uiLabelMap.PartyCreateNewPartyClassificationGroup}"/></container>
+                            <container style="button-bar"><link target="EditPartyClassificationGroup" style="buttontext create" text="${uiLabelMap.PartyCreateNewPartyClassificationGroup}"/></container>
                             <container style="screenlet-body">
                                 <include-form name="ListPartyClassificationGroups" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
                             </container>

Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyInvitationForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyInvitationForms.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyInvitationForms.xml (original)
+++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyInvitationForms.xml Wed Aug 18 12:19:54 2010
@@ -51,7 +51,7 @@ under the License.
                 <field-map field-name="viewSize" from-field="viewSize"/>
             </service>
         </actions>
-        <field name="partyInvitationId" title="${uiLabelMap.PartyInvitationPartyInvitationId}" widget-style="buttontext">
+        <field name="partyInvitationId" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${partyInvitationId}" target="editPartyInvitation">
                 <parameter param-name="partyInvitationId"/>
             </hyperlink>
@@ -100,7 +100,7 @@ under the License.
                 <order-by field-name="partyInvitationId"/>
             </entity-condition>
         </actions>
-        <field name="partyInvitationId" title="${uiLabelMap.PartyInvitationPartyInvitationId}" widget-style="buttontext">
+        <field name="partyInvitationId" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${partyInvitationId}" target="editPartyInvitation">
                 <parameter param-name="partyInvitationId"/>
             </hyperlink>
@@ -143,7 +143,7 @@ under the License.
                 <order-by field-name="partyInvitationId"/>
             </entity-condition>
         </actions>
-        <field name="partyInvitationId" title="${uiLabelMap.PartyInvitationPartyInvitationId}" widget-style="buttontext">
+        <field name="partyInvitationId" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${partyInvitationId}" target="editPartyInvitation">
                 <parameter param-name="partyInvitationId"/>
             </hyperlink>

Modified: ofbiz/branches/jquery/applications/product/config/freemarkerTransforms.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/config/freemarkerTransforms.properties?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/config/freemarkerTransforms.properties (original)
+++ ofbiz/branches/jquery/applications/product/config/freemarkerTransforms.properties Wed Aug 18 12:19:54 2010
@@ -21,4 +21,4 @@
 
 # entries are in the form: key=transform name, property=transform class name
 
-ofbizCatalogUrl=org.ofbiz.product.category.CatalogUrlDirective
+ofbizCatalogUrl=org.ofbiz.product.category.OfbizCatalogUrlTransform

Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Wed Aug 18 12:19:54 2010
@@ -843,7 +843,7 @@ under the License.
 
     <!-- To help dynamically populate a products dropdown given a product category id from a change in another dropdown, possibly sorted on sequenceNum -->    
     <simple-method method-name="getAssociatedProductsList" short-description="Set the product options for selected product category" login-required="false">
-        <set field="parameters.categoryId" from-field="parameters.mainId"/>
+        <set field="parameters.categoryId" from-field="parameters.productCategoryId"/>
         <set-service-fields service-name="getProductCategoryMembers" map="parameters" to-map="getProductCategoryMembersMap"/>        
         <call-service service-name="getProductCategoryMembers" in-map-name="getProductCategoryMembersMap">
             <result-to-field result-name="categoryMembers" field="productsList"/>
@@ -856,13 +856,13 @@ under the License.
                 <field-map field-name="productId" from-field="productMember.productId"/>
             </entity-one>
             <set field="productName" value="${product.internalName}: ${product.productId}"/>
-            <field-to-list list="valuesList" field="productName"/>
+            <field-to-list list="products" field="productName"/>
         </iterate>
-        <if-empty field="valuesList">
+        <if-empty field="products">
             <property-to-field resource="ProductUiLabels" property="ProductNoProducts" field="noOption"/>
-            <field-to-list list="valuesList" field="noOption"/>
+            <field-to-list list="products" field="noOption"/>
         </if-empty>
-        <field-to-result field="valuesList"/>
+        <field-to-result field="products"/>
     </simple-method>
     
 </simple-methods>

Modified: ofbiz/branches/jquery/applications/product/servicedef/services_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/servicedef/services_view.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/servicedef/services_view.xml (original)
+++ ofbiz/branches/jquery/applications/product/servicedef/services_view.xml Wed Aug 18 12:19:54 2010
@@ -119,8 +119,8 @@ under the License.
     
     <service name="getAssociatedProductsList" engine="simple" auth="false"
         location="component://product/script/org/ofbiz/product/category/CategoryServices.xml" invoke="getAssociatedProductsList">
-        <attribute name="mainId" mode="IN" type="String" optional="false"/>
-        <attribute name="valuesList" mode="OUT" type="java.util.List"/>
+        <attribute name="productCategoryId" mode="IN" type="String" optional="false"/>
+        <attribute name="products" mode="OUT" type="java.util.List"/>
     </service>
     
     <service name="getPreviousNextProducts" engine="java"

Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java (original)
+++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java Wed Aug 18 12:19:54 2010
@@ -73,6 +73,7 @@ public class ShipmentServices {
         GenericValue estimate = delegator.makeValue("ShipmentCostEstimate");
 
         estimate.set("shipmentCostEstimateId", delegator.getNextSeqId("ShipmentCostEstimate"));
+        estimate.set("productStoreShipMethId", productStoreShipMethId);
         estimate.set("shipmentMethodTypeId", productStoreShipMeth.getString("shipmentMethodTypeId"));
         estimate.set("carrierPartyId", productStoreShipMeth.getString("partyId"));
         estimate.set("carrierRoleTypeId", "CARRIER");

Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl Wed Aug 18 12:19:54 2010
@@ -16,7 +16,11 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductFeatureCategoryAttach}]</a>
+<form method="post" action="<@o...@ofbizUrl>" name="attachProductFeaturesToCategory">
+    <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" />
+</form>
+<a href="javascript:document.attachProductFeaturesToCategory.submit()" class="buttontext">${uiLabelMap.ProductFeatureCategoryAttach}</a>
+
 <#if productCategoryId?exists && productCategory?exists>
   <div class="screenlet">
     <div class="screenlet-title-bar">

Modified: ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/CommonServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/CommonServices.xml (original)
+++ ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/CommonServices.xml Wed Aug 18 12:19:54 2010
@@ -238,5 +238,35 @@ under the License.
         <store-value value-field="noteData"/>
         <field-to-result field="noteData.noteId" result-name="noteId"/>
     </simple-method>
+
+    <simple-method method-name="getCountryList" short-description="Returns a list of country" login-required="false">
+        <call-class-method method-name="getCountryList" class-name="org.ofbiz.common.CommonWorkers" ret-field="geoList">
+            <field field="delegator" type="org.ofbiz.entity.Delegator"/>
+        </call-class-method>
+        <iterate list="geoList" entry="countryGeo">
+            <set field="countryName" value="${countryGeo.geoName}: ${countryGeo.geoId}"/>
+            <field-to-list list="countryList" field="countryName"/>
+        </iterate>
+        <field-to-result field="countryList"/>
+    </simple-method>
     
+    <simple-method method-name="getAssociatedStateList" short-description="set the state options for selected country" login-required="false">
+        <set field="countryGeoId" from-field="parameters.countryGeoId"/>
+        <set field="listOrderBy" from-field="parameters.listOrderBy"/>
+        <call-class-method method-name="getAssociatedStateList" class-name="org.ofbiz.common.CommonWorkers" ret-field="geoList">
+            <field field="delegator" type="org.ofbiz.entity.Delegator"/>
+            <field field="countryGeoId" type="String"/>
+            <field field="listOrderBy" type="String"/>
+        </call-class-method>
+        <iterate list="geoList" entry="stateGeo">
+            <set field="stateName" value="${stateGeo.geoName}: ${stateGeo.geoId}"/>
+            <field-to-list list="stateList" field="stateName"/>
+        </iterate>
+        <if-empty field="stateList">
+            <property-to-field resource="CommonUiLabels" property="CommonNoStatesProvinces" field="noOption"/>
+            <field-to-list list="stateList" field="noOption"/>
+        </if-empty>
+        <field-to-result field="stateList"/>
+    </simple-method>
+        
 </simple-methods>

Modified: ofbiz/branches/jquery/framework/common/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/servicedef/services.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/servicedef/services.xml (original)
+++ ofbiz/branches/jquery/framework/common/servicedef/services.xml Wed Aug 18 12:19:54 2010
@@ -704,4 +704,17 @@ under the License.
         <permission-service service-name="commonGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
+    
+    <!-- Get a list of country and associated states from Geo -->
+    <service name="getCountryList" engine="simple" auth="false"
+        location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getCountryList">
+        <attribute name="countryList" mode="OUT" type="java.util.List"/>
+    </service>
+    
+    <service name="getAssociatedStateList" engine="simple" auth="false"
+        location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getAssociatedStateList">
+        <attribute name="countryGeoId" mode="IN" type="String" optional="false"/>
+        <attribute name="listOrderBy" mode="IN" type="String" optional="true"/>
+        <attribute name="stateList" mode="OUT" type="java.util.List"/>
+    </service>
 </services>

Modified: ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml Wed Aug 18 12:19:54 2010
@@ -195,6 +195,25 @@ under the License.
         <response name="success" type="view" value="main"/>
     </request-map>
     
+    <!--========================== AJAX events =====================-->
+    <!-- to dynamically get products related to a product category -->
+    <request-map uri="getAssociatedProductsList">
+        <security https="true" auth="false"/>
+        <event type="service" invoke="getAssociatedProductsList"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
+    </request-map>
+    
+    <!-- to dynamically get states related to a country -->
+    <request-map uri="getAssociatedStateList">
+        <security https="true" auth="false"/>
+        <event type="service" invoke="getAssociatedStateList"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
+    </request-map>    
+    <!--========================== AJAX events =====================-->
+    
+    
     <!-- View Mappings -->
     <view-map name="error" page="/error/error.jsp"/>
     <view-map name="main" type="none"/>

Modified: ofbiz/branches/jquery/framework/common/webcommon/includes/geolocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/includes/geolocation.ftl?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/webcommon/includes/geolocation.ftl (original)
+++ ofbiz/branches/jquery/framework/common/webcommon/includes/geolocation.ftl Wed Aug 18 12:19:54 2010
@@ -88,6 +88,30 @@ under the License.
             });
           }
         --></script>
+      <#elseif geoChart.dataSourceId == "GEOPT_OSM">
+        <div id="<#if geoChart.id?has_content>${geoChart.id}<#else>map_canvas</#if>" style="border:1px solid #979797; background-color:#e5e3df; width:${geoChart.width}; height:${geoChart.height}; margin:2em auto;">
+        </div>
+        <script src="http://www.openlayers.org/api/OpenLayers.js"></script>
+        <script>
+          map = new OpenLayers.Map("<#if geoChart.id?has_content>${geoChart.id}<#else>map_canvas</#if>");
+          map.addLayer(new OpenLayers.Layer.OSM());
+          <#if geoChart.center?has_content>
+            var zoom = ${geoChart.center.zoom};
+            var center= new OpenLayers.LonLat(${geoChart.center.lon?c},${geoChart.center.lat?c})
+              .transform(new OpenLayers.Projection("EPSG:4326"), // transform from WGS 1984
+                         map.getProjectionObject() // to Spherical Mercator Projection
+                         );
+          </#if>
+          var markers = new OpenLayers.Layer.Markers( "Markers" );
+          map.addLayer(markers);
+          <#if geoChart.points?has_content>
+            <#list geoChart.points as point>
+              markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(${point.lon?c} ,${point.lat?c}).transform(
+                new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())));
+            </#list>
+          </#if>
+          map.setCenter(center, zoom);
+        </script>
       </#if>
     </#if>
 <#else>

Modified: ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml Wed Aug 18 12:19:54 2010
@@ -124,6 +124,8 @@ under the License.
                 <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
                 <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
                 <set field="layoutSettings.javaScripts[]" value="/images/GooglemapMarkers.js" global="true"/>
+                <set field="layoutSettings.javaScripts[]" value="/images/getDependentDropdownValues.js" global="true"/>
+                
                 <set field="layoutSettings.commonHeaderImageLinkUrl" from-field="layoutSettings.commonHeaderImageLinkUrl" default-value="main" global="true"/>
                 <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" global="true"/>
                 <service service-name="getVisualThemeResources">

Modified: ofbiz/branches/jquery/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/config/entityengine.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/entity/config/entityengine.xml (original)
+++ ofbiz/branches/jquery/framework/entity/config/entityengine.xml Wed Aug 18 12:19:54 2010
@@ -140,7 +140,7 @@ access. For a detailed description see t
                 jdbc-uri="jdbc:hsqldb:data/hsqldb/ofbiz"
                 jdbc-username="sa"
                 jdbc-password=""
-                isolation-level="ReadUncommitted"
+                isolation-level="ReadCommitted"
                 pool-minsize="2"
                 pool-maxsize="250"
                 time-between-eviction-runs-millis="600000"/>

Modified: ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml Wed Aug 18 12:19:54 2010
@@ -215,6 +215,10 @@
         <value xml:lang="fr"> - voir la défintion avec la form de nom </value>
         <value xml:lang="it"> - vedi la definizione della form con il nome</value>
         <value xml:lang="zh"> - 参见表单定义，名称为</value>
+    </property>    
+    <property key="ExampleDependentDropDowns">
+        <value xml:lang="en">Dependent drop-downs</value>
+        <value xml:lang="fr">liste déroulante dépendantes</value>
     </property>
     <property key="ExampleDropDown">
         <value xml:lang="en">drop-down</value>
@@ -324,6 +328,10 @@
         <value xml:lang="it">Campi drop down</value>
         <value xml:lang="zh">下拉框数据项</value>
     </property>
+    <property key="ExampleDependentDropDownTooltip">
+        <value xml:lang="en">Needs some fields to be set, see in FormWidgetExampleScreens.xml (begins with dependentForm)</value>
+        <value xml:lang="fr">Nécessite de définir certains champs, voir dans FormWidgetExampleScreens.xml (commence avec dependentForm)</value>
+    </property>
     <property key="ExampleDropDownTooltip">
         <value xml:lang="en">First of all you have to define a drop-down element inside of the field element that you want to render as a drop down field.</value>
         <value xml:lang="fr">Pour commencer vous définissez un élément liste déroulante (drop-down) à l'intérieur de l'élément champ (field) que vous voulez créer comme liste déroulante</value>
@@ -446,9 +454,13 @@
         <value xml:lang="en">Layered lookup field (only test purp.)</value>
         <value xml:lang="fr">Lookup de type layer (only test)</value>
     </property>
+    <property key="ExampleLookupFieldsTitle">
+        <value xml:lang="en">Lookup Fields</value>
+        <value xml:lang="fr">Champs de recherche</value>
+    </property>
     <property key="ExampleLookupFields">
-        <value xml:lang="en">Examples Lookup Fields (first of type popup using also autocomplete, second layered and showing use of set_values underneath, ie returning not only Id but also another value)</value>
-        <value xml:lang="fr">Exemples de champs de recherche (le premier de type popup utilisant aussi l'autocompletion, le second de type layer avec usage sous-jacent de set_values qui permet de traiter non seulement une référence mais aussi une autre valeur)</value>
+        <value xml:lang="en">Lookup Fields: First of type popup, second layered and showing use of set_values underneath, ie returning not only Id but also another value. Both using also autocomplete</value>
+        <value xml:lang="fr">Champs de recherche: le premier de type popup, le second de type layer avec usage sous-jacent de set_values qui permet de traiter non seulement une référence mais aussi une autre valeur. Les 2 utilisent aussi l'autocompletion</value>
     </property>
     <property key="ExampleMainPage">
         <value xml:lang="en">Example Main Page</value>
@@ -550,7 +562,8 @@
         <value xml:lang="zh">这个样例文本意味着我们处于扩展表单中。</value>
     </property>
     <property key="ExampleToDo">
-        <value xml:lang="en">TODO</value>
+        <value xml:lang="en">Explanation TODO</value>
+        <value xml:lang="fr">Explication à faire</value>
         <value xml:lang="it">DA FARE</value>
         <value xml:lang="zh">待实现</value>
     </property>

Modified: ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml Wed Aug 18 12:19:54 2010
@@ -212,6 +212,10 @@ under the License.
     <request-map uri="ExampleGeoLocationPointSet3"><security https="true" auth="true"/><response name="success" type="view" value="ExampleGeoLocationPointSet3"/></request-map>
     <request-map uri="ExampleGeoLocationPointSet4"><security https="true" auth="true"/><response name="success" type="view" value="ExampleGeoLocationPointSet4"/></request-map>
     <request-map uri="ExampleGeoLocationAddress"><security https="true" auth="true"/><response name="success" type="view" value="ExampleGeoLocationAddress"/></request-map>
+    <request-map uri="ExampleOsmGeoLocationPointSet1"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet1"/></request-map>
+    <request-map uri="ExampleOsmGeoLocationPointSet2"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet2"/></request-map>
+    <request-map uri="ExampleOsmGeoLocationPointSet3"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet3"/></request-map>
+    <request-map uri="ExampleOsmGeoLocationPointSet4"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet4"/></request-map>
 
     <!-- Birt example Requests -->
     <request-map uri="BirtMain">
@@ -277,6 +281,10 @@ under the License.
     <view-map name="ExampleGeoLocationPointSet3" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleGeoLocationPointSet3"/>
     <view-map name="ExampleGeoLocationPointSet4" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleGeoLocationPointSet4"/>
     <view-map name="ExampleGeoLocationAddress" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleGeoLocationAddress"/>
+    <view-map name="ExampleOsmGeoLocationPointSet1" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleOsmGeoLocationPointSet1"/>
+    <view-map name="ExampleOsmGeoLocationPointSet2" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleOsmGeoLocationPointSet2"/>
+    <view-map name="ExampleOsmGeoLocationPointSet3" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleOsmGeoLocationPointSet3"/>
+    <view-map name="ExampleOsmGeoLocationPointSet4" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleOsmGeoLocationPointSet4"/>
 
     <!-- Birt example View Mappings -->
     <view-map name="BirtMain" type="screen" page="component://example/widget/example/BirtScreens.xml#main"/>

Modified: ofbiz/branches/jquery/framework/example/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/CommonScreens.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/branches/jquery/framework/example/widget/example/CommonScreens.xml Wed Aug 18 12:19:54 2010
@@ -60,7 +60,7 @@ under the License.
                             <container style="clear"></container>
                         </container>
                     </decorator-section>
-                </decorator-screen>                
+                </decorator-screen>
             </widgets>
         </section>
     </screen>
@@ -197,7 +197,31 @@ under the License.
                 <set field="headerItem" value="ExampleGeoLocation"/>
                 <set field="geoChart.dataSourceId" value="GEOPT_GOOGLE"/>
                 <set field="geoChart.width" value="600px"/>
-                <set field="geoChart.height" value="500px"/>                
+                <set field="geoChart.height" value="500px"/>
+                <set field="geoChart.points" from-field="geoPoints"/>
+                <set field="geoChart.center" from-field="geoCenter"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="pre-body">
+                        <include-menu name="ExampleGeoLocation" location="component://example/widget/example/ExampleMenus.xml"/>
+                    </decorator-section>
+                    <decorator-section name="body">
+                        <container style="clear" />
+                        <include-screen name="geoChart" location="component://common/widget/CommonScreens.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="CommonExampleOsmGeoLocationDecorator">
+        <section>
+            <actions>
+                <set field="headerItem" value="ExampleGeoLocation"/>
+                <set field="geoChart.dataSourceId" value="GEOPT_OSM"/>
+                <set field="geoChart.width" value="600px"/>
+                <set field="geoChart.height" value="500px"/>
                 <set field="geoChart.points" from-field="geoPoints"/>
                 <set field="geoChart.center" from-field="geoCenter"/>
             </actions>

Modified: ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml?rev=986642&r1=986641&r2=986642&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml (original)
+++ ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml Wed Aug 18 12:19:54 2010
@@ -74,6 +74,11 @@ under the License.
         <menu-item name="ExampleGeoLocationPointSet3" title="${uiLabelMap.PointSet3}"><link target="ExampleGeoLocationPointSet3"/></menu-item>
         <menu-item name="ExampleGeoLocationPointSet4" title="${uiLabelMap.PointSet4}"><link target="ExampleGeoLocationPointSet4"/></menu-item>
         <menu-item name="ExampleGeoLocationAddress" title="${uiLabelMap.ExamplePointAddress}"><link target="ExampleGeoLocationAddress"/></menu-item>
+        <!--Examples using openstreetmap -->
+        <menu-item name="ExampleOsmGeoLocationPointSet1" title="${uiLabelMap.OsmPointSet1}"><link target="ExampleOsmGeoLocationPointSet1"/></menu-item>
+        <menu-item name="ExampleOsmGeoLocationPointSet2" title="${uiLabelMap.OsmPointSet2}"><link target="ExampleOsmGeoLocationPointSet2"/></menu-item>
+        <menu-item name="ExampleOsmGeoLocationPointSet3" title="${uiLabelMap.OsmPointSet3}"><link target="ExampleOsmGeoLocationPointSet3"/></menu-item>
+        <menu-item name="ExampleOsmGeoLocationPointSet4" title="${uiLabelMap.OsmPointSet4}"><link target="ExampleOsmGeoLocationPointSet4"/></menu-item>
     </menu>
 
     <menu name="BirtTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">