svn commit: r598248 - in /ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order: appendorderitem.ftl orderitems.ftl shipGroups.fo.ftl

Author: jleroux
Date: Mon Nov 26 04:30:13 2007
New Revision: 598248

URL: http://svn.apache.org/viewvc?rev=598248&view=rev
Log:
A patch from Bilgin Ibryam "UI bugfixes" (https://issues.apache.org/jira/browse/OFBIZ-1416) - OFBIZ-1416

Modified:
    ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/appendorderitem.ftl
    ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderitems.ftl
    ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl

Modified: ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/appendorderitem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/appendorderitem.ftl?rev=598248&r1=598247&r2=598248&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/appendorderitem.ftl (original)
+++ ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/appendorderitem.ftl Mon Nov 26 04:30:13 2007
@@ -72,7 +72,7 @@
                   <td>
                     <div class="tabletext">
                       <input type="text" class="inputBox" size="25" maxlength="30" name="itemDesiredDeliveryDate"/>
-                      <a href="javascript:call_cal(document.quickaddform.itemDesiredDeliveryDate,'${toDayDate} 00:00:00.0');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.calendar_click_here_for_calendar}"/></a>
+                      <a href="javascript:call_cal(document.appendItemForm.itemDesiredDeliveryDate,'${toDayDate} 00:00:00.0');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.calendar_click_here_for_calendar}"/></a>
                     </div>
                   </td>
                 </tr>

Modified: ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=598248&r1=598247&r2=598248&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderitems.ftl Mon Nov 26 04:30:13 2007
@@ -223,8 +223,10 @@
                             <#if orderItem.orderItemTypeId != "RENTAL_ORDER_ITEM">
                               <b><i>${uiLabelMap.ManufacturingProductionRun}</i>:</b>
                               <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}&amp;externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${workEffort.workEffortId}</a>&nbsp;
-                            </#if>
+                              ${uiLabelMap.OrderCurrentStatus}: ${(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}: ${workEffort.reservPersons?default("")}
+                            </#if>
                           </div>
                         </td>
                       </tr>

Modified: ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl?rev=598248&r1=598247&r2=598248&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl (original)
+++ ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl Mon Nov 26 04:30:13 2007
@@ -68,7 +68,7 @@
     <fo:table-body>
       <fo:table-row>
         <fo:table-cell number-rows-spanned="4">
-          <#assign address = data.address>
+          <#assign address = data.address?if_exists>
           <fo:block>${uiLabelMap.CommonTo}: ${address.toName?if_exists}</fo:block>
           <#if address.attnName?has_content>
           <fo:block>${uiLabelMap.CommonAttn}: ${address.attnName?if_exists}</fo:block>
@@ -87,7 +87,7 @@
       </fo:table-row>
       <fo:table-row>
         <fo:table-cell><fo:block font-weight="bold">${uiLabelMap.ProductShipmentMethod}</fo:block></fo:table-cell>
-        <fo:table-cell><fo:block>${data.carrierShipmentMethod.partyId} ${data.shipmentMethodType.description}</fo:block></fo:table-cell>
+        <fo:table-cell><#if data.carrierShipmentMethod?exists><fo:block>${data.carrierShipmentMethod.partyId} ${data.shipmentMethodType.description}</fo:block></#if></fo:table-cell>
       </fo:table-row>
       <fo:table-row>
         <fo:table-cell><fo:block font-weight="bold">${uiLabelMap.OrderShipBeforeDate}</fo:block></fo:table-cell>