svn commit: r512376 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.properties webapp/ordermgr/entry/SetItemShipGroups.ftl

[sichen]

Author: sichen
Date: Tue Feb 27 12:01:38 2007
New Revision: 512376

URL: http://svn.apache.org/viewvc?view=rev&rev=512376
Log:
Small UI improvements for SetItemShipGroups checkout screen

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.properties
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?view=diff&rev=512376&r1=512375&r2=512376
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.properties Tue Feb 27 12:01:38 2007
@@ -191,6 +191,7 @@
 OrderDesiredDeliveryDate=Desired Delivery Date
 OrderDestination=Destination
 OrderDoPromotions=Run Promotions
+OrderDropShipped=Drop Shipped
 OrderEditItems=Edit Items
 OrderEditShipmentInfo=Edit Shipment Info
 OrderEnteredPromoCodes=Entered Codes
@@ -534,6 +535,7 @@
 OrderShipBeforeDateDefault=Default Ship Before Date
 OrderShipGroup=Ship Group
 OrderShipGroupSeqId=Ship Group Seq Id
+OrderShipGroupTo=To Ship Group
 OrderShipGroups=Ship Groups
 OrderShipRequest=Ship Request
 OrderShipToAnotherParty=Ship to Another Party

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl?view=diff&rev=512376&r1=512375&r2=512376
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl Tue Feb 27 12:01:38 2007
@@ -34,7 +34,7 @@
               <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0">
               <tr>
                 <td colspan="2">
-                    <div class="head1">${uiLabelMap.OrderShipGroup} # ${currIndex}<#if supplier?has_content> - ${supplier.groupName?default(supplier.partyId)}</#if></div>
+                    <div class="head1">${uiLabelMap.OrderShipGroup} # ${currIndex}<#if supplier?has_content> - ${uiLabelMap.OrderDropShipped} - ${supplier.groupName?default(supplier.partyId)}</#if></div>
                 </td>
               </tr>
               <tr>
@@ -45,10 +45,10 @@
                     <div class="tableheadtext">${uiLabelMap.CommonQuantity}</div>
                 </td>
                 <td>
-                    <div class="tableheadtext">&nbsp;</div>
+                    <div class="tableheadtext">${uiLabelMap.ProductMoveQuantity}</div>
                 </td>
                 <td>
-                    <div class="tableheadtext">${uiLabelMap.CommonTo}</div>
+                    <div class="tableheadtext">${uiLabelMap.OrderShipGroupTo}</div>
                 </td>
               </tr>
 
@@ -89,6 +89,7 @@
               </#list>
               <#if (rowCount > 0)>
               <tr>
+                <td colspan="3">&nbsp;</td>
                 <td>
                 <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonSubmit}"/>
                 </td>