svn commit: r1128865 [4/27] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/...

[sascharodekamp]

Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Sun May 29 11:02:09 2011
@@ -209,7 +209,7 @@ public class OrderReadHelper {
 
     /**
      * Returns a Map of paymentMethodId -> amount charged (BigDecimal) based on PaymentGatewayResponse.
-     * @return
+     * @return returns a Map of paymentMethodId -> amount charged (BigDecimal) based on PaymentGatewayResponse.
      */
     public Map<String, BigDecimal> getReceivedPaymentTotalsByPaymentMethod() {
         Map<String, BigDecimal> paymentMethodAmounts = FastMap.newInstance();
@@ -258,7 +258,7 @@ public class OrderReadHelper {
 
     /**
      * Returns a Map of paymentMethodId -> amount refunded
-     * @return
+     * @return returns a Map of paymentMethodId -> amount refunded
      */
     public Map<String, BigDecimal> getReturnedTotalsByPaymentMethod() {
         Map<String, BigDecimal> paymentMethodAmounts = FastMap.newInstance();
@@ -337,7 +337,8 @@ public class OrderReadHelper {
     }
 
     /**
-     * @return Long number of days from termDays of first FIN_PAYMENT_TERM
+     * Return the number of days from termDays of first FIN_PAYMENT_TERM
+     * @return number of days from termDays of first FIN_PAYMENT_TERM
      */
     public Long getOrderTermNetDays() {
         List<GenericValue> orderTerms = EntityUtil.filterByAnd(getOrderTerms(), UtilMisc.toMap("termTypeId", "FIN_PAYMENT_TERM"));
@@ -2797,7 +2798,7 @@ public class OrderReadHelper {
 
     /**
      * Get orderAdjustments that have no corresponding returnAdjustment
-     * @return orderAdjustmentList
+     * @return return the order adjustments that have no corresponding with return adjustment
      */
     public List<GenericValue> getAvailableOrderHeaderAdjustments() {
         List<GenericValue> orderHeaderAdjustments = this.getOrderHeaderAdjustments();
@@ -2822,9 +2823,9 @@ public class OrderReadHelper {
 
     /**
      * Get the total return adjustments for a set of key -> value condition pairs.  Done for code efficiency.
-     * @param delegator
-     * @param condition
-     * @return
+     * @param delegator the delegator
+     * @param condition a map of the conditions to use
+     * @return Get the total return adjustments
      */
     public static BigDecimal getReturnAdjustmentTotal(Delegator delegator, Map<String, Object> condition) {
         BigDecimal total = ZERO;

Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Sun May 29 11:02:09 2011
@@ -1016,9 +1016,9 @@ public class OrderReturnServices {
     /**
      * Helper method to get billing account balance, cannot use BillingAccountWorker.getBillingAccountBalance()
      * due to circular build dependency.
-     * @param billingAccountId
-     * @param dctx
-     * @return
+     * @param billingAccountId the billing account id
+     * @param dctx the dispatch context
+     * @return returns the billing account balance
      * @throws GenericEntityException
      */
     public static BigDecimal getBillingAccountBalance(String billingAccountId, DispatchContext dctx) throws GenericEntityException {
@@ -2273,11 +2273,12 @@ public class OrderReturnServices {
 
     /**
      * Takes a List of returnItems and returns a Map of orderId -> items and a Map of orderId -> orderTotal
-     * @param returnItems
-     * @param itemsByOrder
-     * @param totalByOrder
-     * @param delegator
-     * @param returnId
+     * @param returnItems a List of return items
+     * @param returnItemsByOrderId the return items by order id
+     * @param totalByOrder the total by order id
+     * @param delegator the delegator
+     * @param returnId the return id
+     * @param returnTypeId the return type id
      */
     public static void groupReturnItemsByOrder(List<GenericValue> returnItems, Map<String, List<GenericValue>> returnItemsByOrderId, Map<String, BigDecimal> totalByOrder, Delegator delegator, String returnId, String returnTypeId) {
         Iterator<GenericValue> itemIt = returnItems.iterator();
@@ -2638,8 +2639,8 @@ public class OrderReturnServices {
 
     /**
      * These return adjustment types need to be recalculated when the return item is updated
-     * @param returnAdjustmentTypeId
-     * @return
+     * @param returnAdjustmentTypeId the return adjustment type id
+     * @return returns if the returnn adjustment need to be recalculated
      */
     public static boolean needRecalculate(String returnAdjustmentTypeId) {
         return "RET_PROMOTION_ADJ".equals(returnAdjustmentTypeId) ||
@@ -2650,9 +2651,9 @@ public class OrderReturnServices {
 
     /**
      * Get the total return adjustments for a set of key -> value condition pairs.  Done for code efficiency.
-     * @param delegator
-     * @param condition
-     * @return
+     * @param delegator the delegator
+     * @param condition the conditions to use
+     * @return return the total return adjustments
      */
     public static BigDecimal getReturnAdjustmentTotal(Delegator delegator, Map<String, ? extends Object> condition) {
         BigDecimal total = BigDecimal.ZERO;
@@ -2678,7 +2679,7 @@ public class OrderReturnServices {
     /**
      *  Get rid of unnecessary parameters based on the given service name
      * @param dctx Service DispatchContext
-     * @param serviceName
+     * @param serviceName the service name
      * @param context   context before clean up
      * @return filtered context
      * @throws GenericServiceException

Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java Sun May 29 11:02:09 2011
@@ -4901,9 +4901,9 @@ public class OrderServices {
 
     /**
      * Generates a product requirement for the total cancelled quantity over all order items for each product
-     * @param dctx
-     * @param context
-     * @return
+     * @param dctx the dispatch context
+     * @param context the context
+     * @return the result of the service execution
      */
     public static Map<String, Object> generateReqsFromCancelledPOItems(DispatchContext dctx, Map<String, ? extends Object> context) {
         Delegator delegator = dctx.getDelegator();
@@ -4978,9 +4978,9 @@ public class OrderServices {
 
     /**
      * Cancels remaining (unreceived) quantities for items of an order. Does not consider received-but-rejected quantities.
-     * @param dctx
-     * @param context
-     * @return
+     * @param dctx the dispatch context
+     * @param context the context
+     * @return cancels remaining (unreceived) quantities for items of an order
      */
     public static Map<String, Object> cancelRemainingPurchaseOrderItems(DispatchContext dctx, Map<String, ? extends Object> context) {
         Delegator delegator = dctx.getDelegator();

Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Sun May 29 11:02:09 2011
@@ -1130,8 +1130,8 @@ public class ShoppingCart implements Ite
 
    /**
     * Get ship before date for a particular ship group
-    * @param idx
-    * @return
+    * @param idx the ship group number
+    * @return ship before date for a given ship group
     */
    public Timestamp getShipBeforeDate(int idx) {
        CartShipInfo csi = this.getShipInfo(idx);
@@ -1140,7 +1140,7 @@ public class ShoppingCart implements Ite
 
    /**
     * Get ship before date for ship group 0
-    * @return
+    * @return ship before date for the first ship group
     */
    public Timestamp getShipBeforeDate() {
        return this.getShipBeforeDate(0);
@@ -1148,8 +1148,8 @@ public class ShoppingCart implements Ite
 
    /**
     * Set ship after date for a particular ship group
-    * @param idx
-    * @param shipAfterDate
+    * @param idx the ship group number
+    * @param shipAfterDate the ship after date to be set for the given ship group
     */
    public void setShipAfterDate(int idx, Timestamp shipAfterDate) {
        CartShipInfo csi = this.getShipInfo(idx);
@@ -1158,7 +1158,7 @@ public class ShoppingCart implements Ite
 
    /**
     * Set ship after date for a particular ship group
-    * @param shipAfterDate
+    * @param shipAfterDate the ship after date to be set for the first ship group
     */
    public void setShipAfterDate(Timestamp shipAfterDate) {
        this.setShipAfterDate(0, shipAfterDate);
@@ -1166,8 +1166,8 @@ public class ShoppingCart implements Ite
 
    /**
     * Get ship after date for a particular ship group
-    * @param idx
-    * @return
+    * @param idx the ship group number
+    * @return return the ship after date for the given ship group
     */
    public Timestamp getShipAfterDate(int idx) {
        CartShipInfo csi = this.getShipInfo(idx);
@@ -1176,7 +1176,7 @@ public class ShoppingCart implements Ite
 
    /**
     * Get ship after date for ship group 0
-    * @return
+    * @return return the ship after date for the first ship group
     */
    public Timestamp getShipAfterDate() {
        return this.getShipAfterDate(0);
@@ -1906,8 +1906,8 @@ public class ShoppingCart implements Ite
 
     /**
      * Returns ProductStoreFinActSetting based on cart's productStoreId and FinAccountHelper's defined giftCertFinAcctTypeId
-     * @param delegator
-     * @return
+     * @param delegator the delegator
+     * @return returns ProductStoreFinActSetting based on cart's productStoreId
      * @throws GenericEntityException
      */
     public GenericValue getGiftCertSettingFromStore(Delegator delegator) throws GenericEntityException {
@@ -1916,7 +1916,8 @@ public class ShoppingCart implements Ite
 
     /**
      * Determines whether pin numbers are required for gift cards, based on ProductStoreFinActSetting.  Default to true.
-     * @return
+     * @param delegator the delegator
+     * @return returns true whether pin numbers are required for gift card
      */
     public boolean isPinRequiredForGC(Delegator delegator) {
         try {
@@ -1939,8 +1940,8 @@ public class ShoppingCart implements Ite
 
     /**
      * Returns whether the cart should validate gift cards against FinAccount (ie, internal gift certificates).  Defaults to false.
-     * @param delegator
-     * @return
+     * @param delegator the delegator
+     * @return returns true whether the cart should validate gift cards against FinAccount
      */
     public boolean isValidateGCFinAccount(Delegator delegator) {
         try {
@@ -3233,7 +3234,7 @@ public class ShoppingCart implements Ite
         Iterator<ShoppingCartItem> cartItemIter = this.iterator();
         while (cartItemIter.hasNext()) {
             ShoppingCartItem checkItem = cartItemIter.next();
-            if (checkItem.getIsPromo()) {
+            if (checkItem != null && checkItem.getIsPromo()) {
                 this.clearItemShipInfo(checkItem);
                 cartItemIter.remove();
             } else {
@@ -4642,7 +4643,7 @@ public class ShoppingCart implements Ite
 
         /**
          * Reset the ship group's shipBeforeDate if it is after the parameter
-         * @param newShipBeforeDate
+         * @param newShipBeforeDate the ship group's shipBeforeDate to be reset
          */
         public void resetShipBeforeDateIfAfter(Timestamp newShipBeforeDate) {
                 if (newShipBeforeDate != null) {
@@ -4654,7 +4655,7 @@ public class ShoppingCart implements Ite
 
         /**
          * Reset the ship group's shipAfterDate if it is before the parameter
-         * @param newShipBeforeDate
+         * @param newShipAfterDate the ship group's shipAfterDate to be reset
          */
         public void resetShipAfterDateIfBefore(Timestamp newShipAfterDate) {
             if (newShipAfterDate != null) {

Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Sun May 29 11:02:09 2011
@@ -584,6 +584,11 @@ public class ShoppingCartEvents {
                 shipBeforeDate, shipAfterDate, configWrapper, itemGroupNumber, paramMap, parentProductId);
         controlDirective = processResult(result, request);
 
+        Integer itemId = (Integer)result.get("itemId");
+        if (UtilValidate.isNotEmpty(itemId)) {
+            request.setAttribute("itemId", itemId);
+        }
+
         // Determine where to send the browser
         if (controlDirective.equals(ERROR)) {
             return "error";

Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java Sun May 29 11:02:09 2011
@@ -230,8 +230,8 @@ public class ShoppingCartHelper {
         }
 
         // add or increase the item to the cart
+        int itemId = -1;
         try {
-            int itemId = -1;
             if (productId != null) {
 
                        itemId = cart.addOrIncreaseItem(productId, amount, quantity, reservStart, reservLength,
@@ -263,6 +263,9 @@ public class ShoppingCartHelper {
 
         // Indicate there were no critical errors
         result = ServiceUtil.returnSuccess();
+        if (itemId != -1) {
+            result.put("itemId", new Integer(itemId));
+        }
         return result;
     }
 

Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Sun May 29 11:02:09 2011
@@ -273,12 +273,12 @@ public class ShoppingCartItem implements
      *
      * @param cartLocation The location to place this item; null will place at the end
      * @param productId The primary key of the product being added
-     * @param selectedAmountDbl Optional. Defaults to 0.0. If a selectedAmount is needed (complements the quantity value), pass it in here.
+     * @param selectedAmount Optional. Defaults to 0.0. If a selectedAmount is needed (complements the quantity value), pass it in here.
      * @param quantity Required. The quantity to add.
-     * @param unitPriceDbl Optional. Defaults to 0.0, which causes calculation of price.
+     * @param unitPrice Optional. Defaults to 0.0, which causes calculation of price.
      * @param reservStart Optional. The start of the reservation.
-     * @param reservLengthDbl Optional. The length of the reservation.
-     * @param reservPersonsDbl Optional. The number of persons taking advantage of the reservation.
+     * @param reservLength Optional. The length of the reservation.
+     * @param reservPersons Optional. The number of persons taking advantage of the reservation.
      * @param shipBeforeDate Optional. The date to ship the order by.
      * @param shipAfterDate Optional. Wait until this date to ship.
      * @param additionalProductFeatureAndAppls Optional. Product feature/appls map.
@@ -371,12 +371,12 @@ public class ShoppingCartItem implements
      *
      * @param cartLocation The location to place this item; null will place at the end
      * @param product The product entity relating to the product being added
-     * @param selectedAmountDbl Optional. Defaults to 0.0. If a selectedAmount is needed (complements the quantity value), pass it in here.
+     * @param selectedAmount Optional. Defaults to 0.0. If a selectedAmount is needed (complements the quantity value), pass it in here.
      * @param quantity Required. The quantity to add.
-     * @param unitPriceDbl Optional. Defaults to 0.0, which causes calculation of price.
+     * @param unitPrice Optional. Defaults to 0.0, which causes calculation of price.
      * @param reservStart Optional. The start of the reservation.
-     * @param reservLengthDbl Optional. The length of the reservation.
-     * @param reservPersonsDbl Optional. The number of persons taking advantage of the reservation.
+     * @param reservLength Optional. The length of the reservation.
+     * @param reservPersons Optional. The number of persons taking advantage of the reservation.
      * @param shipBeforeDate Optional. The date to ship the order by.
      * @param shipAfterDate Optional. Wait until this date to ship.
      * @param additionalProductFeatureAndAppls Optional. Product feature/appls map.
@@ -1110,7 +1110,6 @@ public class ShoppingCartItem implements
         if (_product != null && isModifiedPrice == false) {
             try {
                 Map<String, Object> priceContext = FastMap.newInstance();
-                priceContext.put("currencyUomId", cart.getCurrency());
 
                 String partyId = cart.getPartyId();
                 if (partyId != null) {
@@ -1132,6 +1131,7 @@ public class ShoppingCartItem implements
                 priceContext.put("amount", this.getSelectedAmount());
                 
                 if (cart.getOrderType().equals("PURCHASE_ORDER")) {
+                    priceContext.put("currencyUomId", cart.getCurrency());
                     Map<String, Object> priceResult = dispatcher.runSync("calculatePurchasePrice", priceContext);
                     if (ServiceUtil.isError(priceResult)) {
                         throw new CartItemModifyException("There was an error while calculating the price: " + ServiceUtil.getErrorMessage(priceResult));
@@ -1168,6 +1168,7 @@ public class ShoppingCartItem implements
                             }
                         }
                     }
+                    priceContext.put("currencyUomIdTo", cart.getCurrency());
                     priceContext.put("prodCatalogId", this.getProdCatalogId());
                     priceContext.put("webSiteId", cart.getWebSiteId());
                     priceContext.put("productStoreId", cart.getProductStoreId());

Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java Sun May 29 11:02:09 2011
@@ -411,10 +411,10 @@ public class ShoppingListServices {
     }
     /**
      * Create a new shoppingCart form a shoppingList
-     * @param dispatcher
-     * @param shoppingList
-     * @param locale
-     * @return
+     * @param dispatcher the local dispatcher
+     * @param shoppingList a GenericValue object of the shopping list
+     * @param locale the locale in use
+     * @return returns a new shopping cart form a shopping list
      */
     public static ShoppingCart makeShoppingListCart(LocalDispatcher dispatcher, GenericValue shoppingList, Locale locale) {
         return makeShoppingListCart(null, dispatcher, shoppingList, locale); }
@@ -422,11 +422,11 @@ public class ShoppingListServices {
     /**
      * Add a shoppinglist to an existing shoppingcart
      *
-     * @param shoppingCart
-     * @param dispatcher
-     * @param shoppingList
-     * @param locale
-     * @return
+     * @param listCart the shopping cart list
+     * @param dispatcher the local dispatcher
+     * @param shoppingList a GenericValue object of the shopping list
+     * @param locale the locale in use
+     * @return the modified shopping cart adding the shopping list elements
      */
     public static ShoppingCart makeShoppingListCart(ShoppingCart listCart, LocalDispatcher dispatcher, GenericValue shoppingList, Locale locale) {
         Delegator delegator = dispatcher.getDelegator();

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Sun May 29 11:02:09 2011
@@ -81,6 +81,9 @@ if (orderHeader) {
     context.currencyUomId = orderReadHelper.getCurrency();
     context.orderTerms = orderTerms;
 
+    // get sales reps
+    context.salesReps = orderHeader.getRelated("OrderRole", [orderId : orderHeader.orderId, roleTypeId : "SALES_REP"], null);
+    
     // get the order type
     orderType = orderHeader.orderTypeId;
     context.orderType = orderType;

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/cart/minicart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/cart/minicart.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/cart/minicart.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/cart/minicart.ftl Sun May 29 11:02:09 2011
@@ -59,9 +59,9 @@ under the License.
                 <td>
                   <#if cartLine.getProductId()?exists>
                       <#if cartLine.getParentProductId()?exists>
-                          <a href="<@ofbizUrl>product?product_id=${cartLine.getParentProductId()}</@ofbizUrl>" class="linktext">${cartLine.getName()}</a>
+                          <a href="<@ofbizCatalogAltUrl productId=cartLine.getParentProductId()/>" class="linktext">${cartLine.getName()}</a>
                       <#else>
-                          <a href="<@ofbizUrl>product?product_id=${cartLine.getProductId()}</@ofbizUrl>" class="linktext">${cartLine.getName()}</a>
+                          <a href="<@ofbizCatalogAltUrl productId=cartLine.getProductId()/>" class="linktext">${cartLine.getName()}</a>
                       </#if>
                   <#else>
                     <strong>${cartLine.getItemTypeDescription()?if_exists}</strong>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl Sun May 29 11:02:09 2011
@@ -29,7 +29,7 @@ under the License.
   <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?exists && curCategoryId == category.productCategoryId)>
     <li>
     <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists>
-      <a href="<@ofbizCatalogUrl currentCategoryId=category.productCategoryId previousCategoryId=previousCategoryId!""/>" class="<#if curCategoryId?exists && curCategoryId == category.productCategoryId>buttontextdisabled<#else>linktext</#if>">
+      <a href="<@ofbizCatalogAltUrl productCategoryId=category.productCategoryId previousCategoryId=previousCategoryId!""/>" class="<#if curCategoryId?exists && curCategoryId == category.productCategoryId>buttontextdisabled<#else>linktext</#if>">
         <#if catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists>
           ${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}
         <#elseif catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Sun May 29 11:02:09 2011
@@ -25,18 +25,18 @@ under the License.
             <select name="pageSelect" onchange="window.location=this[this.selectedIndex].value;">
                 <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int} ${uiLabelMap.CommonOf} ${viewIndexMax + 1}</option>
                 <#list 0..viewIndexMax as curViewNum>
-                     <option value="<@ofbizUrl>category/~category_id=${productCategoryId}/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${curViewNum?int + 1}</@ofbizUrl>">${uiLabelMap.CommonGotoPage} ${curViewNum + 1}</option>
+                     <option value="<@ofbizCatalogAltUrl productCategoryId=productCategoryId viewSize=viewSize viewIndex=(curViewNum?int + 1)/>">${uiLabelMap.CommonGotoPage} ${curViewNum + 1}</option>
                 </#list>
             </select>
             <#-- End Page Select Drop-Down -->
             <#if (viewIndex?int > 1)>
-                <a href="<@ofbizUrl>category/~category_id=${productCategoryId}/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex?int - 1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
+                <a href="<@ofbizCatalogAltUrl productCategoryId=productCategoryId viewSize=viewSize viewIndex=(viewIndex?int - 1)/>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
             </#if>
             <#if ((listSize?int - viewSize?int) > 0)>
                 <span>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
             </#if>
             <#if highIndex?int < listSize?int>
-             | <a href="<@ofbizUrl>category/~category_id=${productCategoryId}/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex?int + 1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
+             | <a href="<@ofbizCatalogAltUrl productCategoryId=productCategoryId viewSize=viewSize viewIndex=(viewIndex?int + 1)/>" class="buttontext">${uiLabelMap.CommonNext}</a>
             </#if>
         </div>
     </#if>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl Sun May 29 11:02:09 2011
@@ -24,7 +24,7 @@ under the License.
     <#assign productData = productDataMap[product.productId]/>
     <#assign productContentWrapper = productData.productContentWrapper/>
     <#assign price = productData.priceMap/>
-    <#assign productUrl><@ofbizCatalogUrl productId=product.productId currentCategoryId=categoryId/></#assign>
+    <#assign productUrl><@ofbizCatalogAltUrl productId=product.productId/></#assign>
     <#assign smallImageUrl = productContentWrapper.get("SMALL_IMAGE_URL")/>
     <#if smallImageUrl!?length == 0>
         <#assign smallImageUrl = "/images/defaultImage.jpg"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl Sun May 29 11:02:09 2011
@@ -53,7 +53,7 @@ ${virtualJavaScript?if_exists}
 </script>
 <#if product?exists>
     <#-- variable setup -->
-    <#assign productUrl><@ofbizCatalogUrl productId=product.productId currentCategoryId=categoryId/></#assign>
+    <#assign productUrl><@ofbizCatalogAltUrl productId=product.productId productCategoryId=categoryId/></#assign>
 
     <#if requestAttributes.productCategoryMember?exists>
         <#assign prodCatMem = requestAttributes.productCategoryMember>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Sun May 29 11:02:09 2011
@@ -41,7 +41,7 @@ under the License.
                 <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${uiLabelMap.OrderOrderTermType}</td>
                 <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${uiLabelMap.OrderOrderTermValue}</td>
                 <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${uiLabelMap.OrderOrderTermDays}</td>
-                <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${uiLabelMap.QuoteTermDescription}</td>
+                <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${uiLabelMap.OrderQuoteTermDescription}</td>
                 <td></td>
                 <td></td>
                 <td></td>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/OrderViewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/OrderViewScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/OrderViewScreens.xml Sun May 29 11:02:09 2011
@@ -93,6 +93,7 @@ under the License.
                     <container style="righthalf">
                         <include-screen name="ordercontactinfo"/>
                         <include-screen name="ordershippinginfo"/>
+                        <include-screen name="OrderSalesReps"/>
                     </container>
                 </container>
             </widgets>
@@ -176,6 +177,15 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <screen name="OrderSalesReps">
+        <section>
+            <widgets>
+                <platform-specific>
+                    <html><html-template location="component://order/webapp/ordermgr/order/OrderSalesReps.ftl"/></html>
+                </platform-specific>
+            </widgets>
+        </section>
+    </screen>
     <screen name="OrderHeaderListView">
         <section>
             <actions>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/QuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/QuoteForms.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/QuoteForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/QuoteForms.xml Sun May 29 11:02:09 2011
@@ -515,7 +515,7 @@ under the License.
         <alt-target use-when="quoteTerm==null" target="createQuoteTerm"/>
         <auto-fields-entity entity-name="QuoteTerm" default-field-type="edit"/>
         <field name="tabButtonItems"><hidden value="${tabButtonItem}"/></field>
-        <field name="quoteItemSeqId" tooltip="${uiLabelMap.QuoteEmpty}">
+        <field name="quoteItemSeqId" tooltip="${uiLabelMap.OrderQuoteEmpty}">
             <drop-down allow-empty="true">
                 <entity-options description="${quoteItemSeqId}" entity-name="QuoteItem">
                     <entity-constraint name="quoteId" operator="equals" value="${quoteId}"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml Sun May 29 11:02:09 2011
@@ -1632,7 +1632,7 @@
     <property key="RoleType.description.ADDRESSEE">
         <value xml:lang="en">Addressee</value>
         <value xml:lang="fr">Destinataire</value>
-        <value xml:lang="it">Indirizzi</value>
+        <value xml:lang="it">Destinatario</value>
         <value xml:lang="pt_BR">Destinatário</value>
         <value xml:lang="zh">收信人</value>
         <value xml:lang="zh_TW">收信人</value>

Modified: ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml Sun May 29 11:02:09 2011
@@ -1383,7 +1383,7 @@
         <value xml:lang="es">Asunto</value>
         <value xml:lang="fr">Sujet</value>
         <value xml:lang="hi_IN">विषय</value>
-        <value xml:lang="it">Soggetto</value>
+        <value xml:lang="it">Oggetto</value>
         <value xml:lang="nl">Onderwerp</value>
         <value xml:lang="pt_BR">Assunto</value>
         <value xml:lang="ro">Subiect</value>

Modified: ofbiz/branches/jackrabbit20100709/applications/party/data/PartyTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/data/PartyTypeData.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/data/PartyTypeData.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/data/PartyTypeData.xml Sun May 29 11:02:09 2011
@@ -182,9 +182,11 @@ under the License.
     <RoleType description="Prospect" hasTable="N" parentTypeId="" roleTypeId="PROSPECT"/>
     <RoleType description="Person" hasTable="N" parentTypeId="" roleTypeId="PERSON_ROLE"/>
     <RoleType description="Referrer" hasTable="N" parentTypeId="" roleTypeId="REFERRER"/>
-    <RoleType description="Request Manager" hasTable="N" parentTypeId="" roleTypeId="REQ_MANAGER"/>
-    <RoleType description="Requesting Party" hasTable="N" parentTypeId="" roleTypeId="REQ_REQUESTER"/>
-    <RoleType description="Request Taker" hasTable="N" parentTypeId="" roleTypeId="REQ_TAKER"/>
+    <RoleType description="Request Role" hasTable="N" parentTypeId="" roleTypeId="REQUEST_ROLE"/>
+    <RoleType description="Request Manager" hasTable="N" parentTypeId="REQUEST_ROLE" roleTypeId="REQ_MANAGER"/>
+    <RoleType description="Requesting Party" hasTable="N" parentTypeId="REQUEST_ROLE" roleTypeId="REQ_REQUESTER"/>
+    <RoleType description="Request Taker" hasTable="N" parentTypeId="REQUEST_ROLE" roleTypeId="REQ_TAKER"/>
+    <RoleType description="Request Respondent" hasTable="N" parentTypeId="REQUEST_ROLE" roleTypeId="REQ_RESPOND"/>
     <RoleType description="Sales Force Autm." hasTable="N" parentTypeId="MAIN_ROLE" roleTypeId="SFA_ROLE"/>
     <RoleType description="Shareholder" hasTable="N" parentTypeId="" roleTypeId="SHAREHOLDER"/>
     <RoleType description="Subscriber" hasTable="N" parentTypeId="" roleTypeId="SUBSCRIBER"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Sun May 29 11:02:09 2011
@@ -357,6 +357,7 @@ under the License.
                     <if-not-empty field="contents">
                         <iterate entry="content" list="contents">
                             <remove-related value-field="content" relation-name="ContentRole"/>
+                            <remove-related value-field="content" relation-name="ContentKeyword"/>
                             <remove-value value-field="content"/>
                             <!-- check first if the content is used on any other communication event if yes, only delete link-->
                             <entity-and entity-name="CommEventContentAssoc" list="commEvents">

Modified: ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Sun May 29 11:02:09 2011
@@ -128,11 +128,12 @@ under the License.
             <field-to-result field="newPartyContactMech.contactMechId" result-name="contactMechId"/>
             <field-to-request field="newPartyContactMech.contactMechId" request-name="contactMechId"/>
             <else>
-                <if-compare-field field="parameters.extension" operator="not-equals" to-field="partyContactMech.extension">
-                    <set field="partyContactMech.extension" from-field="parameters.extension"/>
+                <set field="extension" from-field="partyContactMech.extension"/>
+                <set-nonpk-fields value-field="partyContactMech" map="parameters"/>
+                <if-compare-field field="parameters.extension" operator="not-equals" to-field="extension">
                     <set field="partyContactMech.thruDate" value=""/>
-                    <store-value value-field="partyContactMech"/>
                 </if-compare-field>
+                <store-value value-field="partyContactMech"/>
                 <log level="info" message="Setting id to result: ${partyContactMech.contactMechId}"/>
                 <field-to-result field="partyContactMech.contactMechId" result-name="contactMechId"/>
                 <field-to-request field="partyContactMech.contactMechId" request-name="contactMechId"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java Sun May 29 11:02:09 2011
@@ -679,9 +679,9 @@ public class CommunicationEventServices
      * However multiparts can contain multiparts. A recursive function has been added.
      *
      * -Al Byers - Hans Bakker
-     * @param dctx
-     * @param context
-     * @return
+     * @param dctx the dispatch context
+     * @param context the context
+     * @return returns the result of the service execution
      */
     public static Map<String, Object> storeIncomingEmail(DispatchContext dctx, Map<String, ? extends Object> context) {
         Delegator delegator = dctx.getDelegator();

Modified: ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java Sun May 29 11:02:09 2011
@@ -467,10 +467,10 @@ public class ContactMechWorker {
     }
 
     /** Returns the first valid FacilityContactMech found based on the given facilityId and a prioritized list of purposes
-     * @param delegator
-     * @param facilityId
-     * @param purposeTypes A List of ContactMechPurposeType ids which will be checked one at a time until a valid contact mech is found
-     * @return
+     * @param delegator the delegator
+     * @param facilityId the facility id
+     * @param purposeTypes a List of ContactMechPurposeType ids which will be checked one at a time until a valid contact mech is found
+     * @return returns the first valid FacilityContactMech found based on the given facilityId and a prioritized list of purposes
      */
     public static GenericValue getFacilityContactMechByPurpose(Delegator delegator, String facilityId, List<String> purposeTypes) {
         if (UtilValidate.isEmpty(facilityId)) return null;

Modified: ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyServices.java Sun May 29 11:02:09 2011
@@ -1484,9 +1484,9 @@ public class PartyServices {
      * one party to another for the purpose of merging records together. Flags the from party
      * as disabled so it no longer appears in a search.
      *
-     * @param dctx
-     * @param context
-     * @return
+     * @param dctx the dispatch context
+     * @param context the context
+     * @return the result of the service execution
      */
     public static Map<String, Object> linkParty(DispatchContext dctx, Map<String, ? extends Object> context) {
         Delegator _delegator = dctx.getDelegator();
@@ -1805,9 +1805,8 @@ public class PartyServices {
 
     /**
      * Finds partyId(s) corresponding to a party reference, partyId or a GoodIdentification idValue
-     * @param dctx
-     * @param context
-     * @param context.partyId use to search with partyId or goodIdentification.idValue
+     * @param ctx the dispatch context
+     * @param context use to search with partyId or goodIdentification.idValue
      * @return a GenericValue with a partyId and a List of complementary partyId found
      */
     public static Map<String, Object> findPartyById(DispatchContext ctx, Map<String, Object> context) {

Modified: ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyWorker.java?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyWorker.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyWorker.java Sun May 29 11:02:09 2011
@@ -283,7 +283,7 @@ public class PartyWorker {
     }
 
     /**
-     * @deprecated Renamed to {@link #findMatchingPersonPartyAndPostalAddress(Delegator, String, String, String, String, String, String, String, String, String, String)}
+     * @deprecated Renamed to {@link #findMatchingPersonPostalAddresses(Delegator, String, String, String, String, String, String, String, String, String, String)}
      */
     @Deprecated
     public static List<GenericValue> findMatchingPartyAndPostalAddress(Delegator delegator, String address1, String address2, String city,
@@ -472,12 +472,12 @@ public class PartyWorker {
      * By default return the party find by partyId
      * but you can pass searchPartyFirst at false if you want search in partyIdentification before
      * or pass searchAllId at true to find apartyuct with this id (party.partyId and partyIdentification.idValue)
-     * @param delegator
-     * @param idToFind
-     * @param partyIdentificationTypeId
-     * @param searchPartyFirst
-     * @param searchAllId
-     * @return
+     * @param delegator the delegator
+     * @param idToFind the party id to find
+     * @param partyIdentificationTypeId the party identification type id to use
+     * @param searchPartyFirst search first with party id
+     * @param searchAllId search all the party ids
+     * @return returns the parties founds
      * @throws GenericEntityException
      */
     public static List<GenericValue> findPartiesById(Delegator delegator,

Propchange: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May 29 11:02:09 2011
@@ -2,4 +2,4 @@
 /ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957
 /ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489
 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
-/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:962442-1096699
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:962442-1128853

Modified: ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/CommunicationEventForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/CommunicationEventForms.xml Sun May 29 11:02:09 2011
@@ -407,7 +407,7 @@ under the License.
             <set field="subject" from-field="subject" default-value="${uiLabelMap.PartyNoSubject}"/>
         </row-actions>
         <field name="communicationEventId"><hidden/></field>
-        <field name="subject">
+        <field name="subject" sort-field="true">
             <hyperlink description="${subject}[${communicationEventId}]" target="ViewCommunicationEvent">
                 <parameter param-name="communicationEventId"/>
                 <parameter param-name="partyIdFrom" from-field="partyId"/>
@@ -415,25 +415,25 @@ under the License.
                 <parameter param-name="headerItem" from-field="parameters.headerItem"/>
             </hyperlink>
         </field>
-        <field name="communicationEventTypeId" title="${uiLabelMap.CommonType}"><display-entity description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field>
-        <field name="statusId">
+        <field name="communicationEventTypeId" title="${uiLabelMap.CommonType}" sort-field="true"><display-entity description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field>
+        <field name="statusId" sort-field="true">
             <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
         </field>
-        <field name="partyId" title="${uiLabelMap.CommonPartyId}">
+        <field name="partyId" title="${uiLabelMap.CommonPartyId}" sort-field="true">
             <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId">
                 <sub-hyperlink target="/partymgr/control/viewprofile" description="[${partyIdFrom}]" target-type="inter-app">
                     <parameter param-name="partyId" from-field="partyIdFrom"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="roleTypeId">
+        <field name="roleTypeId" sort-field="true">
             <display-entity description="${description}" entity-name="RoleType"/>
         </field>
-        <field name="roleStatusId">
+        <field name="roleStatusId" sort-field="true">
             <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
         </field>
-        <field name="entryDate" title="${uiLabelMap.CommonCreated}"><display type="date"/></field>
-        <field name="datetimeStarted" title="${uiLabelMap.CommonSent}"><display type="date"/></field>
+        <field name="entryDate" title="${uiLabelMap.CommonCreated}" sort-field="true"><display type="date"/></field>
+        <field name="datetimeStarted" title="${uiLabelMap.CommonSent}" sort-field="true"><display type="date"/></field>
     </form>
 
     <form name="FindCommunicationByOrder" type="single" target="FindCommunicationByOrder" paginate="true" focus-field-name="submitButton"
@@ -461,10 +461,10 @@ under the License.
 
     <form name="ListCommunicationByOrder" type="list" list-name="listIt" extends="ListCommEvents" header-row-style="header-row-2">
         <actions>
-            <service result-map-list="listIt" result-map="result" service-name="performFind">
-                <field-map from-field="parameters" field-name="inputFields"/>
-                <field-map from-field="entityName" field-name="entityName"/>
-                <field-map value="-entryDate" field-name="orderBy"/>
+            <service service-name="performFind" result-map="result" result-map-list="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
+                <field-map field-name="entityName" from-field="entityName"/>
+                <field-map field-name="orderBy" value="-entryDate"/>
                 <field-map field-name="viewIndex" from-field="viewIndex"/>
                 <field-map field-name="viewSize" from-field="viewSize"/>
             </service>
@@ -571,9 +571,10 @@ under the License.
     <form name="ListUnknownPartyEmails" extends="ListCommEvents" type="multi" use-row-submit="true" separate-columns="true"
            target="deleteCommunicationEvents" header-row-style="header-row-2">
         <actions>
+            <set field="parameters.sortField" from-field="parameters.sortField" default-value="-entryDate"/>
             <entity-and  list="commEvents" entity-name="CommunicationEventAndRole">
                 <field-map field-name="statusId" value="COM_UNKNOWN_PARTY"/>
-                <order-by field-name="-entryDate"/>
+                <order-by field-name="${parameters.sortField}"/>
             </entity-and>
         </actions>
         <field name="delContentDataResource"><hidden value="Y"/></field>
@@ -601,10 +602,11 @@ under the License.
 
     <form name="ListLookupCommEvents" type="list" list-name="listIt" extends="ListCommEvents" header-row-style="header-row-2" target="deleteCommunicationEvent">
         <actions>
-            <service result-map-list="listIt" result-map="result" service-name="performFind">
-                <field-map from-field="parameters" field-name="inputFields"/>
-                <field-map from-field="entityName" field-name="entityName"/>
-                <field-map value="-entryDate" field-name="orderBy"/>
+            <set field="parameters.sortField" from-field="parameters.sortField" default-value="-entryDate"/>
+            <service service-name="performFind" result-map="result" result-map-list="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
+                <field-map field-name="entityName" from-field="entityName"/>
+                <field-map field-name="orderBy" from-field="parameters.sortField"/>
                 <field-map field-name="viewIndex" from-field="viewIndex"/>
                 <field-map field-name="viewSize" from-field="viewSize"/>
             </service>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ProductErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ProductErrorUiLabels.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/config/ProductErrorUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/config/ProductErrorUiLabels.xml Sun May 29 11:02:09 2011
@@ -35,6 +35,10 @@
         <value xml:lang="en">Product not found in the current category.</value>
         <value xml:lang="it">Prodotto non trovato nell'attuale categoria.</value>
     </property>
+    <property key="ImageManagementErrorRmoveDefaultImage">
+        <value xml:lang="en">Unable to remove an image. It is the defualt image.</value>
+        <value xml:lang="th">ไม่สามารถลบรูปภาพ</value>
+    </property>
     <property key="ScaleImage.error_occurs_during_writing">
         <value xml:lang="en">An error occurs during writing</value>
         <value xml:lang="fr">Une erreur est survenue lors de l'écriture</value>