You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/11/15 13:40:17 UTC

svn commit: r1202159 [3/3] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/accounting/webapp/accounting/finaccounttrans/ applications/accounting/webapp/accounting/payment/ applications/accounting/widget/ applica...

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl Tue Nov 15 12:40:15 2011
@@ -31,19 +31,19 @@ under the License.
        <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()>
          <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
        <#else>
-         <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+         <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
        </#if>
      <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content>
        <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()>
          <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
        <#else>
-         <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
+         <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
        </#if>
      <#else>
       <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()>
         <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?if_exists}</a>
       <#else>
-        <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a>
+        <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a>
       </#if>
      </#if>
     </div>
@@ -53,19 +53,19 @@ under the License.
       <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()>
         <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
       <#else>
-        <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+        <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
       </#if>
      <#elseif catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content>
       <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()>
         <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
       <#else>
-        <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
+        <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
       </#if>
      <#else>
       <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()>
         <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${category.categoryName?if_exists}</a>
       <#else>
-        <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a>
+        <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a>
       </#if>
      </#if>
     </div>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Tue Nov 15 12:40:15 2011
@@ -84,7 +84,7 @@ under the License.
                 ${displayPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")}
               </#if>
               <#if partyId?exists>
-                &nbsp;(<a href="${customerDetailLink}${partyId}" target="partymgr" class="buttontext">${partyId}</a>)
+                &nbsp;(<a href="${customerDetailLink}${partyId}${externalKeyParam}" target="partymgr" class="buttontext">${partyId}</a>)
                 <br/>
                 <#if orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL">
                 <div>
@@ -106,7 +106,6 @@ under the License.
         <#list orderContactMechValueMaps as orderContactMechValueMap>
           <#assign contactMech = orderContactMechValueMap.contactMech>
           <#assign contactMechPurpose = orderContactMechValueMap.contactMechPurposeType>
-          <#--<#assign partyContactMech = orderContactMechValueMap.partyContactMech>-->
           <tr><td colspan="3"><hr /></td></tr>
           <tr>
             <td align="right" valign="top" width="19%">

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderinfo.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderinfo.ftl Tue Nov 15 12:40:15 2011
@@ -24,7 +24,7 @@ under the License.
                <#assign externalOrder = "(" + orderHeader.externalId + ")"/>
             </#if>
             <#assign orderType = orderHeader.getRelatedOne("OrderType")/>
-            <li class="h3">&nbsp;${orderType?if_exists.get("description", locale)?default(uiLabelMap.OrderOrder)}&nbsp;${uiLabelMap.CommonNbr}<a href="<@o...@ofbizUrl>">${orderId}</a> ${externalOrder?if_exists} [&nbsp;<a href="<@o...@ofbizUrl>" target="_blank">PDF</a>&nbsp;]</li>
+            <li class="h3">&nbsp;${orderType?if_exists.get("description", locale)?default(uiLabelMap.OrderOrder)}&nbsp;${uiLabelMap.CommonNbr}&nbsp;<a href="<@o...@ofbizUrl>">${orderId}</a> ${externalOrder?if_exists} [&nbsp;<a href="<@o...@ofbizUrl>" target="_blank">PDF</a>&nbsp;]</li>
             <#if currentStatus.statusId == "ORDER_APPROVED" && orderHeader.orderTypeId == "SALES_ORDER">
               <li class="h3"><a target="_BLANK" href="javascript:document.PrintOrderPickSheet.submit()">${uiLabelMap.FormFieldTitle_printPickSheet}</a>
               <form name="PrintOrderPickSheet" method="post" action="<@o...@ofbizUrl>">
@@ -83,7 +83,7 @@ under the License.
                 <input type="hidden" name="fromDate" value="${fromDate?if_exists}"/>
               </form>
               </li>
-            </#if>             
+            </#if>
             <#if setOrderCompleteOption>
               <li><a href="javascript:document.OrderCompleteOrder.submit()">${uiLabelMap.OrderCompleteOrder}</a>
               <form name="OrderCompleteOrder" method="post" action="<@o...@ofbizUrl>">
@@ -117,7 +117,7 @@ under the License.
                     <#assign loopStatusItem = orderHeaderStatus.getRelatedOne("StatusItem")>
                     <#assign userlogin = orderHeaderStatus.getRelatedOne("UserLogin")>
                     <div>
-                      ${loopStatusItem.get("description",locale)} - ${orderHeaderStatus.statusDatetime?default("0000-00-00 00:00:00")?string}
+                      ${loopStatusItem.get("description",locale)} <#if orderHeaderStatus.statusDatetime?has_content>- ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderHeaderStatus.statusDatetime, "", locale, timeZone)?default("0000-00-00 00:00:00")}</#if>
                       &nbsp;
                       ${uiLabelMap.CommonBy} - <#--${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, userlogin.getString("partyId"), true)}--> [${orderHeaderStatus.statusUserLogin}]
                     </div>
@@ -129,7 +129,7 @@ under the License.
             <tr>
               <td align="right" valign="top" width="15%" class="label">&nbsp;${uiLabelMap.OrderDateOrdered}</td>
               <td width="5%">&nbsp;</td>
-              <td valign="top" width="80%">${orderHeader.orderDate.toString()}</td>
+              <td valign="top" width="80%"><#if orderHeader.orderDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderHeader.orderDate, "", locale, timeZone)!}</#if></td>
             </tr>
             <tr><td colspan="3"><hr /></td></tr>
             <tr>
@@ -159,18 +159,16 @@ under the License.
               </td>
             </tr>
             <tr><td colspan="3"><hr /></td></tr>
-            <tr>
-              <td align="right" valign="top" width="15%" class="label">&nbsp;${uiLabelMap.OrderProductStore}</td>
-              <td width="5%">&nbsp;</td>
-              <td valign="top" width="80%">
-                  <#if orderHeader.productStoreId?has_content>
-                    <a href="/catalog/control/EditProductStore?productStoreId=${orderHeader.productStoreId}${externalKeyParam}" target="catalogmgr" class="buttontext">${orderHeader.productStoreId}</a>
-                  <#else>
-                    ${uiLabelMap.CommonNA}
-                  </#if>
-              </td>
-            </tr>
-            <tr><td colspan="3"><hr /></td></tr>
+            <#if productStore?has_content>
+              <tr>
+                <td align="right" valign="top" width="15%" class="label">&nbsp;${uiLabelMap.OrderProductStore}</td>
+                <td width="5%">&nbsp;</td>
+                <td valign="top" width="80%">
+                  ${productStore.storeName!}&nbsp;<a href="/catalog/control/EditProductStore?productStoreId=${productStore.productStoreId}${externalKeyParam}" target="catalogmgr" class="buttontext">(${productStore.productStoreId})</a>
+                </td>
+              </tr>
+              <tr><td colspan="3"><hr /></td></tr>
+            </#if>
             <tr>
               <td align="right" valign="top" width="15%" class="label">&nbsp;${uiLabelMap.OrderOriginFacility}</td>
               <td width="5%">&nbsp;</td>
@@ -199,7 +197,7 @@ under the License.
               <tr>
                 <td align="right" valign="top" width="15%" class="label">&nbsp;${uiLabelMap.FormFieldTitle_cancelBackOrderDate}</td>
                 <td width="5%">&nbsp;</td>
-                <td valign="top" width="80%">${orderItem.cancelBackOrderDate?if_exists}</td>
+                <td valign="top" width="80%"><#if orderItem.cancelBackOrderDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderItem.cancelBackOrderDate, "", locale, timeZone)!}</#if></td>
               </tr>
             </#if>
             <#if distributorId?exists>
@@ -255,14 +253,14 @@ under the License.
             </#if>
             <tr><td colspan="3"><hr /></td></tr>
             <tr>
-              <td align="right" valign="top" width="15%" class="label">&nbsp;Invoice Per Shipment</td>
+              <td align="right" valign="top" width="15%" class="label">&nbsp;${uiLabelMap.AccountingInvoicePerShipment}</td>
               <td width="5%">&nbsp;</td>
               <td valign="top" width="80%">
                  <form name="setInvoicePerShipment" method="post" action="<@o...@ofbizUrl>">
                  <input type = "hidden" name="orderId" value="${orderId}"/>
                 <select name="invoicePerShipment">
-                  <option value="Y" <#if (orderHeader.invoicePerShipment)?if_exists == "Y">selected="selected" </#if>>Y</option>
-                  <option value="N" <#if (orderHeader.invoicePerShipment)?if_exists == "N">selected="selected" </#if>>N</option>
+                  <option value="Y" <#if (orderHeader.invoicePerShipment)?if_exists == "Y">selected="selected" </#if>>${uiLabelMap.CommonYes}</option>
+                  <option value="N" <#if (orderHeader.invoicePerShipment)?if_exists == "N">selected="selected" </#if>>${uiLabelMap.CommonNo}</option>
                 </select>
                 <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonUpdate}"/>
                 </form>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderitems.ftl Tue Nov 15 12:40:15 2011
@@ -62,7 +62,7 @@ under the License.
                                             ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists}
                                             <#if (product.salesDiscontinuationDate)?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)>
                                                 <br />
-                                                <span style="color: red;">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span>
+                                                <span style="color: red;">${uiLabelMap.OrderItemDiscontinued}: ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(product.salesDiscontinuationDate, "", locale, timeZone)!}</span>
                                             </#if>
                                         <#elseif orderItemType?exists>
                                             ${orderItemType.description} - ${orderItem.itemDescription?if_exists}
@@ -71,7 +71,7 @@ under the License.
                                         </#if>
                                     </div>
                                     <div style="float:right;">
-                                        <a href="/catalog/control/EditProduct?productId=${productId}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a>
+                                        <a href="/catalog/control/EditProduct?productId=${productId}${externalKeyParam}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a>
                                         <a href="/ecommerce/control/product?product_id=${productId}" class="buttontext" target="_blank">${uiLabelMap.OrderEcommerce}</a>
                                         <#if orderItemContentWrapper.get("IMAGE_URL")?has_content>
                                             <a href="<@o...@ofbizUrl>"
@@ -108,7 +108,7 @@ under the License.
                                                         <tr>
                                                             <td style="text-align: right; padding-bottom: 10px;">
                                                                 <a class="buttontext"
-                                                                   href="/catalog/control/EditProductInventoryItems?productId=${productId}&amp;showAllFacilities=Y&amp;externalLoginKey=${externalLoginKey}"
+                                                                   href="/catalog/control/EditProductInventoryItems?productId=${productId}&amp;showAllFacilities=Y${externalKeyParam}"
                                                                    target="_blank">${uiLabelMap.ProductInventory}</a>
                                                             </td>
                                                             <td>&nbsp;</td>
@@ -184,7 +184,7 @@ under the License.
                                             <#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)>
                                             <#list orderItemStatuses as orderItemStatus>
                                                 <#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem")>
-                                                ${(orderItemStatus.statusDatetime.toString())?if_exists}&nbsp;&nbsp;${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}
+                                                <#if orderItemStatus.statusDatetime?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderItemStatus.statusDatetime, "", locale, timeZone)!}&nbsp;&nbsp;</#if>${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}
                                             </#list>
                                         </div>
                                     </div>
@@ -317,8 +317,8 @@ under the License.
                                             ${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId"))).get("description",locale))?if_exists}
                                         <#else>
                                             ${uiLabelMap.CommonFrom}
-                                            : ${workEffort.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonTo}
-                                            : ${workEffort.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.OrderNumberOfPersons}
+                                            : <#if workEffort.estimatedStartDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(workEffort.estimatedStartDate, "", locale, timeZone)!}</#if> ${uiLabelMap.CommonTo}
+                                            : <#if workEffort.estimatedCompletionDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(workEffort.estimatedCompletionDate, "", locale, timeZone)!}</#if> ${uiLabelMap.OrderNumberOfPersons}
                                             : ${workEffort.reservPersons?default("")}
                                         </#if>
                                     </td>
@@ -474,7 +474,7 @@ under the License.
                         <#if orderItem.estimatedShipDate?exists>
                             <tr<#if itemClass == "1"> class="alternate-row"</#if>>
                                 <td align="right" colspan="2">
-                                    <span class="label">${uiLabelMap.OrderEstimatedShipDate}</span>&nbsp;${orderItem.estimatedShipDate?string.short}
+                                    <span class="label">${uiLabelMap.OrderEstimatedShipDate}</span>&nbsp;${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.estimatedShipDate, "", locale, timeZone)!}
                                 </td>
                                 <td colspan="5">&nbsp;</td>
                             </tr>
@@ -482,7 +482,7 @@ under the License.
                         <#if orderItem.estimatedDeliveryDate?exists>
                             <tr<#if itemClass == "1"> class="alternate-row"</#if>>
                                 <td align="right" colspan="2">
-                                    <span class="label">${uiLabelMap.OrderOrderQuoteEstimatedDeliveryDate}</span>&nbsp;${orderItem.estimatedDeliveryDate?string.short}
+                                    <span class="label">${uiLabelMap.OrderOrderQuoteEstimatedDeliveryDate}</span>&nbsp;${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.estimatedDeliveryDate, "", locale, timeZone)!}
                                 </td>
                                 <td colspan="5">&nbsp;</td>
                             </tr>
@@ -490,7 +490,7 @@ under the License.
                         <#if orderItem.shipAfterDate?exists>
                             <tr<#if itemClass == "1"> class="alternate-row"</#if>>
                                 <td align="right" colspan="2">
-                                    <span class="label">${uiLabelMap.OrderShipAfterDate}</span>&nbsp;${orderItem.shipAfterDate?string.short}
+                                    <span class="label">${uiLabelMap.OrderShipAfterDate}</span>&nbsp;${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.shipAfterDate, "", locale, timeZone)!}
                                 </td>
                                 <td colspan="5">&nbsp;</td>
                             </tr>
@@ -498,7 +498,7 @@ under the License.
                         <#if orderItem.shipBeforeDate?exists>
                             <tr<#if itemClass == "1"> class="alternate-row"</#if>>
                                 <td align="right" colspan="2">
-                                    <span class="label">${uiLabelMap.OrderShipBeforeDate}</span>&nbsp;${orderItem.shipBeforeDate?string.short}
+                                    <span class="label">${uiLabelMap.OrderShipBeforeDate}</span>&nbsp;${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.shipBeforeDate, "", locale, timeZone)!}
                                 </td>
                                 <td colspan="5">&nbsp;</td>
                             </tr>
@@ -623,7 +623,7 @@ under the License.
                                                href="/facility/control/ViewShipment?shipmentId=${shipmentReceipt.shipmentId}&amp;externalLoginKey=${externalLoginKey}"
                                                class="buttontext">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId?if_exists}
                                         </#if>
-                                        &nbsp;${shipmentReceipt.datetimeReceived}&nbsp;
+                                        &nbsp;<#if shipmentReceipt.datetimeReceived?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(shipmentReceipt.datetimeReceived, "", locale, timeZone)!}</#if>&nbsp;
                                         <span class="label">${uiLabelMap.CommonInventory}</span>&nbsp;
                                         <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}&amp;externalLoginKey=${externalLoginKey}"
                                            class="buttontext">${shipmentReceipt.inventoryItemId}</a>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderlist.ftl?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderlist.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderlist.ftl Tue Nov 15 12:40:15 2011
@@ -183,7 +183,7 @@ under the License.
             </#if>
             <#assign productStore = orderHeader.getRelatedOneCache("ProductStore")?if_exists />
             <tr>
-              <td>${orderHeader.orderDate.toString()}</td>
+              <td><#if orderHeader.orderDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderHeader.orderDate, "", locale, timeZone)!}</#if></td>
               <td>
                 <a href="<@o...@ofbizUrl>" class="buttontext">${orderHeader.orderId}</a>
               </td>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/ordernotes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/ordernotes.ftl?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/ordernotes.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/ordernotes.ftl Tue Nov 15 12:40:15 2011
@@ -41,7 +41,7 @@ under the License.
                     <#if note.noteParty?has_content>
                       <div>&nbsp;<span class="label">${uiLabelMap.CommonBy}</span>&nbsp;${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</div>
                     </#if>
-                    <div>&nbsp;<span class="label">${uiLabelMap.CommonAt}</span>&nbsp;${note.noteDateTime?string?if_exists}</div>
+                    <div>&nbsp;<span class="label">${uiLabelMap.CommonAt}</span>&nbsp;<#if note.noteDateTime?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(note.noteDateTime, "", locale, timeZone)!}</#if></div>
                   </td>
                   <td valign="top" width="50%">
                     ${note.noteInfo?replace("\n", "<br/>")}

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Tue Nov 15 12:40:15 2011
@@ -40,7 +40,7 @@ under the License.
   </div>
   <div class="screenlet-body">
      <table class="basic-table" cellspacing='0'>
-     <#assign orderTypeId = orderReadHelper.getOrderTypeId()> 
+     <#assign orderTypeId = orderReadHelper.getOrderTypeId()>
      <#if orderTypeId == "PURCHASE_ORDER">
        <tr>
          <th>${uiLabelMap.AccountingPaymentID}</th>
@@ -54,13 +54,13 @@ under the License.
            <#assign statusItem = payment.getRelatedOne("StatusItem")>
            <#assign partyName = delegator.findOne("PartyNameView", {"partyId" : payment.partyIdTo}, true)>
            <tr>
-             <#if security.hasPermission("PAY_INFO_VIEW", session) || security.hasPermission("PAY_INFO_ADMIN", session)> 
+             <#if security.hasPermission("PAY_INFO_VIEW", session) || security.hasPermission("PAY_INFO_ADMIN", session)>
                <td><a href="/accounting/control/paymentOverview?paymentId=${payment.paymentId}">${payment.paymentId}</a></td>
              <#else>
                <td>${payment.paymentId}</td>
              </#if>
              <td>${partyName.groupName?if_exists}${partyName.lastName?if_exists} ${partyName.firstName?if_exists} ${partyName.middleName?if_exists}
-             <#if security.hasPermission("PARTYMGR_VIEW", session) || security.hasPermission("PARTYMGR_ADMIN", session)> 
+             <#if security.hasPermission("PARTYMGR_VIEW", session) || security.hasPermission("PARTYMGR_ADMIN", session)>
                [<a href="/partymgr/control/viewprofile?partyId=${partyId}">${partyId}</a>]
              <#else>
                [${partyId}]
@@ -87,7 +87,7 @@ under the License.
          </tr>
        </#if>
      <#else>
-     
+
      <#-- order payment status -->
      <tr>
        <td align="center" valign="top" width="29%" class="label">&nbsp;${uiLabelMap.OrderStatusHistory}</td>
@@ -99,7 +99,7 @@ under the License.
              <#assign statusItem = orderPaymentStatus.getRelatedOne("StatusItem")?if_exists>
              <#if statusItem?has_content>
                 <div>
-                  ${statusItem.get("description",locale)} - ${orderPaymentStatus.statusDatetime?default("0000-00-00 00:00:00")?string}
+                  ${statusItem.get("description",locale)} <#if orderPaymentStatus.statusDatetime?has_content>- ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderPaymentStatus.statusDatetime, "", locale, timeZone)!}</#if>
                   &nbsp;
                   ${uiLabelMap.CommonBy} - [${orderPaymentStatus.statusUserLogin?if_exists}]
                 </div>
@@ -166,7 +166,7 @@ under the License.
                         <#list gatewayResponses as gatewayResponse>
                           <#assign transactionCode = gatewayResponse.getRelatedOne("TranCodeEnumeration")>
                           ${(transactionCode.get("description",locale))?default("Unknown")}:
-                          ${gatewayResponse.transactionDate.toString()}
+                          <#if gatewayResponse.transactionDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(gatewayResponse.transactionDate, "", locale, timeZone)!} </#if>
                           <@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br />
                           (<span class="label">${uiLabelMap.OrderReference}</span>&nbsp;${gatewayResponse.referenceNum?if_exists}
                           <span class="label">${uiLabelMap.OrderAvs}</span>&nbsp;${gatewayResponse.gatewayAvsResult?default("N/A")}
@@ -326,7 +326,7 @@ under the License.
                       <#list gatewayResponses as gatewayResponse>
                         <#assign transactionCode = gatewayResponse.getRelatedOne("TranCodeEnumeration")>
                         ${(transactionCode.get("description",locale))?default("Unknown")}:
-                        ${gatewayResponse.transactionDate.toString()}
+                        <#if gatewayResponse.transactionDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(gatewayResponse.transactionDate, "", locale, timeZone)!} </#if>
                         <@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br />
                         (<span class="label">${uiLabelMap.OrderReference}</span>&nbsp;${gatewayResponse.referenceNum?if_exists}
                         <span class="label">${uiLabelMap.OrderAvs}</span>&nbsp;${gatewayResponse.gatewayAvsResult?default("N/A")}

Modified: ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml Tue Nov 15 12:40:15 2011
@@ -117,6 +117,7 @@
         <value xml:lang="zh_TW">工作</value>
     </property>
     <property key="AgreementType.description.EULA">
+        <value xml:lang="de">Endbenutzer-Lizenzvertrag</value>
         <value xml:lang="en">End User License Agreement</value>
         <value xml:lang="hi_IN">उपयोगकर्ता लाइसेंस अनुबंध</value>
         <value xml:lang="it">Contratto licenza utente finale</value>
@@ -408,7 +409,7 @@
         <value xml:lang="zh_TW">網站</value>
     </property>
     <property key="ContactMechPurposeType.description.BILLING_EMAIL">
-        <value xml:lang="de">Fakturierung E-Mail-Adresse</value>
+        <value xml:lang="de">Rechnungs E-Mail-Adresse</value>
         <value xml:lang="en">Billing (AP) Email</value>
         <value xml:lang="es">Correo electrónico de facturación</value>
         <value xml:lang="fr">Adresse courriel de facturation</value>
@@ -422,7 +423,7 @@
         <value xml:lang="zh_TW">寄賬單電子郵件</value>
     </property>
     <property key="ContactMechPurposeType.description.BILLING_LOCATION">
-        <value xml:lang="de">Fakturierungsadresse</value>
+        <value xml:lang="de">Rechnungsadresse</value>
         <value xml:lang="en">Billing (AP) Address</value>
         <value xml:lang="es">Dirección de facturación</value>
         <value xml:lang="fr">Adresse de facturation</value>
@@ -437,6 +438,7 @@
         <value xml:lang="zh_TW">寄賬單地址</value>
     </property>
     <property key="ContactMechPurposeType.description.FAX_BILLING">
+        <value xml:lang="de">Rechnungs Faxnumer</value>
         <value xml:lang="en">Billing Destination Fax Number</value>
         <value xml:lang="fr">Numéro de télécopie du service comptabilité</value>
     </property>
@@ -471,6 +473,7 @@
         <value xml:lang="zh_TW">第二個傳真號碼</value>
     </property>
     <property key="ContactMechPurposeType.description.FAX_SHIPPING">
+        <value xml:lang="de">Liefer Faxnumer</value>
         <value xml:lang="en">Shipping Destination Fax Number</value>
         <value xml:lang="fr">Numéro de télécopie du service expédition</value>
     </property>

Modified: ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml Tue Nov 15 12:40:15 2011
@@ -89,7 +89,7 @@ under the License.
              <field field="formInput" type="java.util.Map"/>
         </call-class-method>
 
-        <set-service-fields service-name="createPartyContent" map="formInput.formInput" to-map="partyContentMap"/>
+        <set-service-fields service-name="uploadPartyContentFile" map="formInput.formInput" to-map="partyContentMap"/>
         <set field="partyContentMap._uploadedFile_fileName" from-field="formInput.imageFileName"/>
         <set field="partyContentMap.uploadedFile" from-field="byteWrap"/>
         <set field="partyContentMap._uploadedFile_contentType" from-field="formInput.formInput.mimeTypeId"/>
@@ -115,11 +115,8 @@ under the License.
            >
              <field field="formInput" type="java.util.Map"/>
          </call-class-method >
-         <set-service-fields service-name="updatePartyContent" map="formInput.formInput" to-map="partyContentMap"/>
-         <set field="partyContentMap._uploadedFile_fileName" from-field="formInput.imageFileName"/>
-         <set field="partyContentMap.uploadedFile" from-field="byteWrap"/>
-         <set field="partyContentMap._uploadedFile_contentType" from-field="formInput.formInput.mimeTypeId"/>
-         <call-service service-name="updatePartyContent" in-map-name="partyContentMap" break-on-error="false" >
+         <set-service-fields service-name="updateContentAndUploadedFile" map="formInput.formInput" to-map="partyContentMap"/>
+         <call-service service-name="updateContentAndUploadedFile" in-map-name="partyContentMap" break-on-error="false">
             <result-to-field result-name="contentId" field="contentId"/>
          </call-service>
         <!-- set the partyId in the request -->

Modified: ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml Tue Nov 15 12:40:15 2011
@@ -134,7 +134,7 @@ under the License.
 
     <form name="ViewPartyGroup" type="single" default-map-name="lookupGroup">
         <auto-fields-entity entity-name="PartyGroup" default-field-type="display"/>
-        <field name="logo" use-when="organizationLogoLinkURL!=null" title="${uiLabelMap.CommonOrganizationLogo}"><image alternate="${uiLabelMap.CommonOrganizationLogo}" value="${organizationLogoLinkURL}"/></field>
+        <field name="logo" use-when="partyGroupLogoLinkUrl!=null" title="${uiLabelMap.CommonOrganizationLogo}"><image alternate="${uiLabelMap.CommonOrganizationLogo}" value="${partyGroupLogoLinkUrl}"/></field>
         <field name="partyTypeId"><ignored/></field>
         <field name="comments"><ignored/></field>
         <field name="logoImageUrl"><ignored/></field>
@@ -571,6 +571,7 @@ under the License.
         <!-- <auto-fields-entity entity-name="Content"/> -->
 
         <field name="partyId" map-name="parameters"><hidden/></field>
+        <field name="dataResourceId" map-name="dataResource" use-when="content!=null"><hidden/></field>
         <field use-when="content!=null" name="contentId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
         <field name="partyContentTypeId">
             <drop-down allow-empty="false">
@@ -622,6 +623,12 @@ under the License.
                <entity-options description="${categoryName}" entity-name="DataCategory"/>
             </drop-down>
         </field>
+        <field name="isPublic" title="${uiLabelMap.PartyIsPublic}" map-name="dataResource">
+            <drop-down no-current-selected-key="N">
+                <option key="N" description="${uiLabelMap.CommonNo}"/>
+                <option key="Y" description="${uiLabelMap.CommonYes}"/>
+            </drop-down>
+        </field>
         <field name="createButton" use-when="content==null"><submit button-type="button"/></field>
         <field name="updateButton" use-when="content!=null"><submit button-type="button"/></field>
     </form>

Modified: ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/ProfileScreens.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/ProfileScreens.xml Tue Nov 15 12:40:15 2011
@@ -25,7 +25,6 @@
             <actions>
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="parameters.partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
-                <set field="organizationLogoLinkURL" from-field="layoutSettings.organizationLogoLinkUrl"/>
                 <entity-and entity-name="PartyNameHistory" list="partyNameHistoryList">
                     <field-map field-name="partyId" from-field="parameters.partyId"/>
                     <order-by field-name="-changeDate"/>
@@ -36,6 +35,14 @@
                 <entity-one entity-name="PartyAndPerson" value-field="lookupPerson">
                     <field-map field-name="partyId" from-field="parameters.partyId"/><!-- is required -->
                 </entity-one>
+                <entity-and list="partyContentList" entity-name="PartyContent">
+                    <field-map field-name="partyId" from-field="parameters.partyId"/>
+                    <field-map field-name="partyContentTypeId" value="LGOIMGURL"/>
+                    <order-by field-name="-fromDate"/>
+                </entity-and>
+                <set field="partyContentId" from-field="partyContentList[0].contentId"/>
+                <set field="partyContent" value="${groovy: partyContentId!=null?&quot;/content/control/stream?contentId=&quot; + partyContentId : &quot;&quot;}"/>
+                <set field="partyGroupLogoLinkUrl" from-field="partyContent" default-value="${lookupGroup.logoImageUrl}" global="true"/>
             </actions>
             <widgets>
                 <section>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml Tue Nov 15 12:40:15 2011
@@ -4137,6 +4137,7 @@
         <value xml:lang="zh_TW">主要商店群組ID</value>
     </property>
     <property key="FormFieldTitle_printPickSheet">
+        <value xml:lang="de">Drucke Artikelliste</value>
         <value xml:lang="en">Print Pick Sheet</value>
         <value xml:lang="fr">Liste de prélevement</value>
         <value xml:lang="it">Stampa lista di prelievo</value>
@@ -4905,7 +4906,7 @@
         <value xml:lang="zh_TW">補貨方式</value>
     </property>
     <property key="FormFieldTitle_reserveInventory">
-        <value xml:lang="de">Lagerreservation</value>
+        <value xml:lang="de">Lagerreservierung</value>
         <value xml:lang="en">Reserve Inventory</value>
         <value xml:lang="es">Reservar stock</value>
         <value xml:lang="fr">Réserver le stock</value>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CategoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CategoryServices.java?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CategoryServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CategoryServices.java Tue Nov 15 12:40:15 2011
@@ -238,11 +238,11 @@ public class CategoryServices {
 
         Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
 
-        int viewIndex = 1;
+        int viewIndex = 0;
         try {
             viewIndex = Integer.valueOf((String) context.get("viewIndexString")).intValue();
         } catch (Exception e) {
-            viewIndex = 1;
+            viewIndex = 0;
         }
 
         int viewSize = defaultViewSize;
@@ -266,8 +266,8 @@ public class CategoryServices {
 
         if (limitView) {
             // get the indexes for the partial list
-            lowIndex = (((viewIndex - 1) * viewSize) + 1);
-            highIndex = viewIndex * viewSize;
+            lowIndex = ((viewIndex * viewSize) + 1);
+            highIndex = (viewIndex + 1) * viewSize;
         } else {
             lowIndex = 0;
             highIndex = 0;

Modified: ofbiz/branches/jackrabbit20100709/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/build.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/build.xml (original)
+++ ofbiz/branches/jackrabbit20100709/build.xml Tue Nov 15 12:40:15 2011
@@ -75,7 +75,9 @@ under the License.
         <antcall target="clean-catalina"/>
         <antcall target="clean-cache"/>
         <antcall target="clean-tempfiles"/>
-        <antcall target="clean-downloads"/>
+        <!-- FIXME: clean-downloads introduces some issues: with cobertura (on Windows can't be deleted, not sure why), 
+                    but especially with postgresql drivers -->
+        <!-- antcall target="clean-downloads"/ -->   
         <antcall target="clean"/>
     </target>
 

Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilDateTime.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilDateTime.java?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilDateTime.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilDateTime.java Tue Nov 15 12:40:15 2011
@@ -969,7 +969,7 @@ public class UtilDateTime {
      */
     public static DateFormat toDateFormat(String dateFormat, TimeZone tz, Locale locale) {
         DateFormat df = null;
-        if (dateFormat == null) {
+        if (UtilValidate.isEmpty(dateFormat)) {
             df = DateFormat.getDateInstance(DateFormat.SHORT, locale);
         } else {
             df = new SimpleDateFormat(dateFormat);
@@ -987,7 +987,7 @@ public class UtilDateTime {
      */
     public static DateFormat toDateTimeFormat(String dateTimeFormat, TimeZone tz, Locale locale) {
         DateFormat df = null;
-        if (dateTimeFormat == null) {
+        if (UtilValidate.isEmpty(dateTimeFormat)) {
             df = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM, locale);
         } else {
             df = new SimpleDateFormat(dateTimeFormat);
@@ -1005,7 +1005,7 @@ public class UtilDateTime {
      */
     public static DateFormat toTimeFormat(String timeFormat, TimeZone tz, Locale locale) {
         DateFormat df = null;
-        if (timeFormat == null) {
+        if (UtilValidate.isEmpty(timeFormat)) {
             df = DateFormat.getTimeInstance(DateFormat.MEDIUM, locale);
         } else {
             df = new SimpleDateFormat(timeFormat);

Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java Tue Nov 15 12:40:15 2011
@@ -22,7 +22,9 @@ import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.ParseException;
+import java.util.Date;
 import java.util.Locale;
+import java.util.TimeZone;
 
 /**
  * General output formatting functions - mainly for helping in JSPs
@@ -303,11 +305,12 @@ public class UtilFormatOut {
         return orgBuf.toString();
     }
 
-
     // ------------------- date handlers -------------------
-    /** Formats a String timestamp into a nice string
-     * @param timestamp String timestamp to be formatted
-     * @return A String with the formatted date/time
+
+    /** Formats a <code>Timestamp</code> into a date-time <code>String</code> using the default locale and time zone.
+     * Returns an empty <code>String</code> if <code>timestamp</code> is <code>null</code>.
+     * @param timestamp The <code>Timestamp</code> to format
+     * @return A <code>String</code> with the formatted date/time, or an empty <code>String</code> if <code>timestamp</code> is <code>null</code>
      */
     public static String formatDate(java.sql.Timestamp timestamp) {
         if (timestamp == null)
@@ -317,6 +320,34 @@ public class UtilFormatOut {
         return df.format(date);
     }
 
+    /** Formats a <code>Date</code> into a date-only <code>String</code> using the specified locale and time zone,
+     * or using the specified format.
+     *
+     * @param date The date to format
+     * @param dateTimeFormat Optional format string
+     * @param locale The format locale - can be <code>null</code> if <code>dateFormat</code> is not <code>null</code>
+     * @param timeZone The format time zone
+     * @return <code>date</code> formatted as a date-only <code>String</code>
+     * @throws NullPointerException if any required parameter is <code>null</code>
+     */
+    public static String formatDate(Date date, String dateTimeFormat, Locale locale, TimeZone timeZone) {
+        return UtilDateTime.toDateFormat(dateTimeFormat, timeZone, locale).format(date);
+    }
+
+    /** Formats a <code>Date</code> into a date-time <code>String</code> using the specified locale and time zone,
+     * or using the specified format.
+     *
+     * @param date The date to format
+     * @param dateTimeFormat Optional format string
+     * @param locale The format locale - can be <code>null</code> if <code>dateFormat</code> is not <code>null</code>
+     * @param timeZone The format time zone
+     * @return <code>date</code> formatted as a date-time <code>String</code>
+     * @throws NullPointerException if any required parameter is <code>null</code>
+     */
+    public static String formatDateTime(Date date, String dateTimeFormat, Locale locale, TimeZone timeZone) {
+        return UtilDateTime.toDateTimeFormat(dateTimeFormat, timeZone, locale).format(date);
+    }
+
     // ------------------- null string handlers -------------------
     /** Checks to see if the passed Object is null, if it is returns an empty but non-null string, otherwise calls toString() on the object
      * @param obj1 The passed Object

Modified: ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml Tue Nov 15 12:40:15 2011
@@ -404,7 +404,7 @@
     </property>
     <property key="CommonAdvancedFeatures">
         <value xml:lang="en">Advanced Features</value>
-        <value xml:lang="en">Características avanzadas</value>
+        <value xml:lang="es">Características avanzadas</value>
         <value xml:lang="fr">Caractéristiques avancées</value>
         <value xml:lang="hi_IN">उन्नत सुविधाएँ</value>
         <value xml:lang="it">Caratteristiche avanzate</value>
@@ -800,7 +800,7 @@
     </property>
     <property key="CommonAt">
         <value xml:lang="ar">في</value>
-        <value xml:lang="de">Zu</value>
+        <value xml:lang="de">Am</value>
         <value xml:lang="en">At</value>
         <value xml:lang="es">En</value>
         <value xml:lang="fr">à</value>
@@ -2096,7 +2096,7 @@
     </property>
     <property key="CommonDeactivate">
         <value xml:lang="en">Deactivate, set thruDate to Now</value>
-        <value xml:lang="en">Desactivar, establecer fecha actual como fecha final</value>
+        <value xml:lang="es">Desactivar, establecer fecha actual como fecha final</value>
         <value xml:lang="fr">Désactiver, mettre la date du jour comme date de fin</value>
         <value xml:lang="pt_BR">Desativar, para definir thruDate para agora</value>
     </property>
@@ -2387,7 +2387,7 @@
     </property>
     <property key="CommonEditPortletAttributes">
         <value xml:lang="en">Edit Attributes for Portlet</value>
-        <value xml:lang="en">Modificar atributos del portlet</value>
+        <value xml:lang="es">Modificar atributos del portlet</value>
         <value xml:lang="fr">Modifier les attributs du portlet </value>
         <value xml:lang="hi_IN">Portlet के गुण संपादित करें</value>
         <value xml:lang="it">Modifica attributi portlet</value>
@@ -3911,6 +3911,7 @@
         <value xml:lang="zh_TW">隱藏域</value>
     </property>
     <property key="CommonHigh">
+        <value xml:lang="de">Hoch</value>
         <value xml:lang="en">High</value>
         <value xml:lang="fr">Haut</value>
         <value xml:lang="hi_IN">ऊँचा</value>
@@ -4673,6 +4674,7 @@
         <value xml:lang="it">http://whitepages.com/find_person_results.pl?fid=p&amp;ac=${telecomNumber.areaCode}&amp;s=&amp;p=${telecomNumber.contactNumber}&amp;pt=b&amp;x=40&amp;y=9</value>
     </property>
     <property key="CommonLow">
+        <value xml:lang="de">Niedrig</value>
         <value xml:lang="en">Low</value>
         <value xml:lang="es">Bajo</value>
         <value xml:lang="fr">Bas</value>
@@ -5646,6 +5648,7 @@
         <value xml:lang="zh_TW">無</value>
     </property>
     <property key="CommonNormal">
+        <value xml:lang="de">Normal</value>
         <value xml:lang="en">Normal</value>
         <value xml:lang="es">Normal</value>
         <value xml:lang="fr">Normal</value>
@@ -9201,7 +9204,7 @@
     <property key="CommonUpdate">
         <value xml:lang="ar">تحديث</value>
         <value xml:lang="cs">Atualizovat</value>
-        <value xml:lang="de">Aktualisierung</value>
+        <value xml:lang="de">aktualisieren</value>
         <value xml:lang="en">Update</value>
         <value xml:lang="es">Actualizar</value>
         <value xml:lang="fr">Màj</value>
@@ -10502,11 +10505,6 @@
         <value xml:lang="es">Código acción dispositivo externo</value>
         <value xml:lang="fr">Obj. de l'action</value>
     </property>
-    <property key="FormFieldTitle_deviceLocation">
-        <value xml:lang="en">Device Location</value>
-        <value xml:lang="es">Emplazamiento dispositivo</value>
-        <value xml:lang="fr">Emplacement</value>
-    </property>
     <property key="FormFieldTitle_fromDate">
         <value xml:lang="ar">تاريخ البدء</value>
         <value xml:lang="de">Von Datum</value>

Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java Tue Nov 15 12:40:15 2011
@@ -566,10 +566,10 @@ public final class JsLanguageFilesMappin
             localeFiles.put("ca", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
             localeFiles.put("ca_ES", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
             localeFiles.put("zh", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
-            localeFiles.put("zh_CN", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
-            localeFiles.put("zh_HK", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
+            localeFiles.put("zh_CN", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-CN.js");
+            localeFiles.put("zh_HK", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-HK.js");
             localeFiles.put("zh_SG", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
-            localeFiles.put("zh_TW", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
+            localeFiles.put("zh_TW", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-TW.js");
             localeFiles.put("hr", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
             localeFiles.put("hr_HR", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
             localeFiles.put("cs", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js");

Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java Tue Nov 15 12:40:15 2011
@@ -35,7 +35,6 @@ import javolution.util.FastMap;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.StringUtil;
 import org.ofbiz.base.util.UtilFormatOut;
-import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilTimer;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
@@ -1258,7 +1257,7 @@ public class ModelViewEntity extends Mod
         protected final ViewCondition whereCondition;
         protected final ViewCondition havingCondition;
 
-        // FIXME: add programatic constructor
+        // TODO: add programatic constructor
         public ViewEntityCondition(ModelViewEntity modelViewEntity, ModelViewLink modelViewLink, Element element) {
             this.modelViewEntity = modelViewEntity;
             this.modelViewLink = modelViewLink;
@@ -1328,7 +1327,7 @@ public class ModelViewEntity extends Mod
         protected final Object value;
         protected final boolean ignoreCase;
 
-        // FIXME: add programatic constructor
+        // TODO: add programatic constructor
         public ViewConditionExpr(ViewEntityCondition viewEntityCondition, Element conditionExprElement) {
             this.viewEntityCondition = viewEntityCondition;
             String entityAlias = conditionExprElement.getAttribute("entity-alias");
@@ -1341,8 +1340,18 @@ public class ModelViewEntity extends Mod
                 throw new IllegalArgumentException("[" + this.viewEntityCondition.modelViewEntity.getEntityName() + "]: Could not find an entity operator for the name: " + this.operator);
             }
             String relEntityAlias = conditionExprElement.getAttribute("rel-entity-alias");
-            this.relFieldName = conditionExprElement.getAttribute("rel-field-name");
-            this.value = conditionExprElement.getAttribute("value");
+            String relFieldNameStr = conditionExprElement.getAttribute("rel-field-name");
+            if (UtilValidate.isEmpty(relFieldNameStr)) {
+                this.relFieldName = null;
+            } else {
+                this.relFieldName = relFieldNameStr;
+            }
+            String valueStr = conditionExprElement.getAttribute("value");
+            if (UtilValidate.isEmpty(valueStr)) {
+                this.value = null;
+            } else {
+                this.value = valueStr;
+            }
             this.ignoreCase = "true".equals(conditionExprElement.getAttribute("ignore-case"));
 
             // if we are in a view-link, default to the entity-alias and rel-entity-alias there
@@ -1410,7 +1419,7 @@ public class ModelViewEntity extends Mod
                             EntityOperator.OR,
                             EntityCondition.makeCondition(lhs, EntityOperator.EQUALS, null));
                 }
-            } else if (value == null && UtilValidate.isEmpty(this.relFieldName) && (this.operator == EntityOperator.EQUALS || this.operator == EntityOperator.NOT_EQUAL)) {
+            } else if ( value == null && this.relFieldName == null && (this.operator == EntityOperator.EQUALS || this.operator == EntityOperator.NOT_EQUAL)) {
                 return EntityCondition.makeCondition(lhs, this.operator, null);
             } else {
                 if (ignoreCase) {

Modified: ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Tue Nov 15 12:40:15 2011
@@ -2637,10 +2637,12 @@ public class MacroFormRenderer implement
             alternate = description;
         }
         if (UtilValidate.isNotEmpty(value)) {
-            StringBuilder buffer = new StringBuilder();
-            ContentUrlTag.appendContentPrefix(request, buffer);
-            buffer.append(value);
-            value = buffer.toString();
+            if (!value.startsWith("http")) {
+                StringBuilder buffer = new StringBuilder();
+                ContentUrlTag.appendContentPrefix(request, buffer);
+                buffer.append(value);
+                value = buffer.toString();
+            }
         } else if (value == null) {
             value = "";
         }

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoProduct.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoProduct.xml Tue Nov 15 12:40:15 2011
@@ -708,6 +708,7 @@ under the License.
     <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRSV-1000-ALTEN" localeString="en_US"/>
     <ElectronicText dataResourceId="SERV-001-ALT" textData="services"/>
     <ElectronicText dataResourceId="SERV-001-ALT" textData="service-product"/>
+    <ElectronicText dataResourceId="SV-1000-ALT"  textData="SV 1000 ALT"/>
     <ElectronicText dataResourceId="DRSERV-001-ALTEN" textData="services"/>
     <ElectronicText dataResourceId="DRSERV-001-ALTEN" textData="service-product"/>
 

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl Tue Nov 15 12:40:15 2011
@@ -28,22 +28,6 @@ under the License.
   <#if shortcutIcon?has_content>
     <link rel="shortcut icon" href="<@o...@ofbizContentUrl>" />
   </#if>
-  <#if layoutSettings.javaScripts?has_content>
-    <#--layoutSettings.javaScripts is a list of java scripts. -->
-    <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
-    <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
-    <#list layoutSettings.javaScripts as javaScript>
-      <#if javaScriptsSet.contains(javaScript)>
-        <#assign nothing = javaScriptsSet.remove(javaScript)/>
-        <script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-      </#if>
-    </#list>
-  </#if>
-  <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
-    <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
-      <script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-    </#list>
-  </#if>
   <#if layoutSettings.styleSheets?has_content>
     <#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.-->
     <#list layoutSettings.styleSheets as styleSheet>
@@ -66,13 +50,6 @@ under the License.
       <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
     </#list>
   </#if>
-  ${layoutSettings.extraHead?if_exists}
-  <#if layoutSettings.VT_EXTRA_HEAD?has_content>
-    <#list layoutSettings.VT_EXTRA_HEAD as extraHead>
-      ${extraHead}
-    </#list>
-  </#if>
-
   <#-- Append CSS for catalog -->
   <#if catalogStyleSheet?exists>
     <link rel="stylesheet" href="${StringUtil.wrapString(catalogStyleSheet)}" type="text/css"/>
@@ -81,6 +58,29 @@ under the License.
   <#if sessionAttributes.overrideCss?exists>
     <link rel="stylesheet" href="${StringUtil.wrapString(sessionAttributes.overrideCss)}" type="text/css"/>
   </#if>
+  <#if layoutSettings.javaScripts?has_content>
+    <#--layoutSettings.javaScripts is a list of java scripts. -->
+    <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
+    <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
+    <#list layoutSettings.javaScripts as javaScript>
+      <#if javaScriptsSet.contains(javaScript)>
+        <#assign nothing = javaScriptsSet.remove(javaScript)/>
+        <script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+      </#if>
+    </#list>
+  </#if>
+  <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
+    <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
+      <script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+    </#list>
+  </#if>
+  ${layoutSettings.extraHead?if_exists}
+  <#if layoutSettings.VT_EXTRA_HEAD?has_content>
+    <#list layoutSettings.VT_EXTRA_HEAD as extraHead>
+      ${extraHead}
+    </#list>
+  </#if>
+
   <#-- Meta tags if defined by the page action -->
   <#if metaDescription?exists>
     <meta name="description" content="${metaDescription}"/>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Tue Nov 15 12:40:15 2011
@@ -420,7 +420,7 @@ under the License.
                               <input id="billToAddress1" name="billToAddress1" class="required" size="30" type="text" value="${billToAddress1?if_exists}" />
                           </div>
                           <div>
-                              <label for="billToAddress2" style="margin-top: 9px;">${uiLabelMap.PartyAddressLine2}</label>
+                              <label for="billToAddress2">${uiLabelMap.PartyAddressLine2}</label>
                               <input id="billToAddress2" name="billToAddress2" type="text" value="${billToAddress2?if_exists}" size="30" />
                           </div>
                           <div>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl Tue Nov 15 12:40:15 2011
@@ -22,7 +22,6 @@ under the License.
   ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")}
   ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")}
   <a href="<@o...@ofbizUrl>" class="buttontextbig">${uiLabelMap.EcommerceContinueShopping}</a>
-  <a href="<@o...@ofbizUrl>" class="buttontextbig">${uiLabelMap.EcommerceContinueShopping}</a>
 <#else>
   <h3>${uiLabelMap.OrderSpecifiedNotFound}.</h3>
 </#if>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml Tue Nov 15 12:40:15 2011
@@ -211,6 +211,7 @@ under the License.
                     <field-map field-name="productCategoryId" from-field="productCategoryId"/>
                     <order-by field-name="sequenceNum"/>
                 </entity-and>
+                <set field="paginateEcommerceStyle" value="Y"/>
             </actions>
             <widgets>
                 <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/categorydetail.ftl"/></html></platform-specific>

Modified: ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css Tue Nov 15 12:40:15 2011
@@ -595,7 +595,7 @@ height: 5em;
 float: right;
 margin: 0.5em;
 text-align: right;
-width: 13em;
+width: 15em;
 }
 
 .productsummary .productinfo { /* margin-left: 60px; */