svn commit: r598247 - in /ofbiz/branches/release4.0/applications: order/config/ order/webapp/ordermgr/entry/ order/webapp/ordermgr/entry/order/ order/webapp/ordermgr/order/ product/config/

Author: jleroux
Date: Mon Nov 26 04:24:20 2007
New Revision: 598247

URL: http://svn.apache.org/viewvc?rev=598247&view=rev
Log:
undoing changes committed in rev. 598201

Modified:
    ofbiz/branches/release4.0/applications/order/config/OrderUiLabels.properties
    ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/billsettings.ftl
    ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
    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
    ofbiz/branches/release4.0/applications/product/config/ProductUiLabels.properties

Modified: ofbiz/branches/release4.0/applications/order/config/OrderUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/config/OrderUiLabels.properties?rev=598247&r1=598246&r2=598247&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/config/OrderUiLabels.properties (original)
+++ ofbiz/branches/release4.0/applications/order/config/OrderUiLabels.properties Mon Nov 26 04:24:20 2007
@@ -582,7 +582,6 @@
 OrderValuePurchase=Value Purch
 OrderValueSold=Value Sold
 OrderVendorRequirementCount=# Products
-OrderVerifyConfiguration=Verify Configuration
 OrderViewEditDeliveryScheduleInfo=View/Edit Delivery Schedule Info
 OrderViewImage=View Image
 OrderViewOrder=View Order

Modified: ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/billsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=598247&r1=598246&r2=598247&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/billsettings.ftl (original)
+++ ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/billsettings.ftl Mon Nov 26 04:24:20 2007
@@ -507,7 +507,7 @@
               <tr><td colspan="2"><hr class="sepbar"/></td></tr>
               <tr>
                 <td width="1%" nowrap><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_COD">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/></td>
-                <td width="50%"nowrap><div class="tabletext">${uiLabelMap.FormFieldTitle_paymentCOD}</div></td>
+                <td width="50%"nowrap><div class="tabletext">${uiLabelMap.OrderCOD}</div></td>
               </tr>
               <tr><td colspan="2"><hr class="sepbar"/></td></tr>
               </#if>

Modified: ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl?rev=598247&r1=598246&r2=598247&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (original)
+++ ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl Mon Nov 26 04:24:20 2007
@@ -49,7 +49,7 @@
         <#if (cart.getPoNumber()?has_content)>
             <tr>
                 <td align="right" valign="top" width="15%">
-                    <span class="tabletext">&nbsp;<b>${uiLabelMap.OrderPONumber}</b> </span>
+                    <span class="tabletext">&nbsp;<b>${uiLabelMap.OrderPoNumber}</b> </span>
                 </td>
                 <td width="5">&nbsp;</td>
                 <td align="left" valign="top" width="80%" class="tabletext">

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=598247&r1=598246&r2=598247&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:24:20 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.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>
+                      <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>
                     </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=598247&r1=598246&r2=598247&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:24:20 2007
@@ -223,10 +223,8 @@
                             <#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;
-                              ${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>
+                            ${uiLabelMap.CommonFrom}: ${workEffort.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonTo}: ${workEffort.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.OrderNumberOfPersons}: ${workEffort.reservPersons?default("")}
                           </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=598247&r1=598246&r2=598247&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:24:20 2007
@@ -68,7 +68,7 @@
     <fo:table-body>
       <fo:table-row>
         <fo:table-cell number-rows-spanned="4">
-          <#assign address = data.address?if_exists>
+          <#assign address = data.address>
           <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><#if data.carrierShipmentMethod?exists><fo:block>${data.carrierShipmentMethod.partyId} ${data.shipmentMethodType.description}</fo:block></#if></fo:table-cell>
+        <fo:table-cell><fo:block>${data.carrierShipmentMethod.partyId} ${data.shipmentMethodType.description}</fo:block></fo:table-cell>
       </fo:table-row>
       <fo:table-row>
         <fo:table-cell><fo:block font-weight="bold">${uiLabelMap.OrderShipBeforeDate}</fo:block></fo:table-cell>

Modified: ofbiz/branches/release4.0/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/config/ProductUiLabels.properties?rev=598247&r1=598246&r2=598247&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/branches/release4.0/applications/product/config/ProductUiLabels.properties Mon Nov 26 04:24:20 2007
@@ -342,7 +342,6 @@
 ProductBarcode=Barcode
 ProductBase=Base
 ProductBasePrc=Base Prc
-ProductBeTheFirstToReviewThisProduct=Be The First To Review This Product!
 ProductBillingWeightUom=Billing Weight &amp; UOM
 ProductBinNum=Bin Num
 ProductBinNumber=Bin Number