svn commit: r508531 - in /ofbiz/trunk/applications/product: src/org/ofbiz/shipment/packing/PackingSession.java webapp/facility/shipment/PackOrder.ftl

[sichen]

Author: sichen
Date: Fri Feb 16 10:40:22 2007
New Revision: 508531

URL: http://svn.apache.org/viewvc?view=rev&rev=508531
Log:
Layout changes for additionalShippingCharge field in PackOrder screen, and clearing the additional shipping charge from the packing session after packing completion

Modified:
    ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java
    ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?view=diff&rev=508531&r1=508530&r2=508531
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Fri Feb 16 10:40:22 2007
@@ -551,6 +551,7 @@
         this.picklistBinId = null;
         this.primaryOrderId = null;
         this.primaryShipGrp = null;
+        this.additionalShippingCharge = null;
         this.packageSeq = 1;
         this.status = 1;
         this.runEvents(PackingEvent.EVENT_CODE_CLEAR);

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl?view=diff&rev=508531&r1=508530&r2=508531
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Fri Feb 16 10:40:22 2007
@@ -264,18 +264,16 @@
           <div>&nbsp;</div>
           <table border='0' cellpadding='2' cellspacing='0' width="100%">
             <tr>
-              <td>
-                <div class="tableheadtext">${uiLabelMap.ProductAdditionalShippingCharge}</div>
+              <td width="40">
+                <div class="tableheadtext">${uiLabelMap.ProductHandlingInstructions}:</div>
                 <div>
-                  <input type="text" class="inputBox" name="additionalShippingCharge" value="${packingSession.getAdditionalShippingCharge()?if_exists}" size="10"/>
+                  <textarea name="handlingInstructions" class="inputBox" rows="2" cols="30">${packingSession.getHandlingInstructions()?if_exists}</textarea>
                 </div>
               </td>
-            </tr>
-            <tr>
-              <td>
-                <div class="tableheadtext">${uiLabelMap.ProductHandlingInstructions}:</div>
+              <td width="40" nowrap="nowrap" >
+                <div class="tableheadtext">${uiLabelMap.ProductAdditionalShippingCharge}:</div>
                 <div>
-                  <textarea name="handlingInstructions" class="inputBox" rows="2" cols="30">${packingSession.getHandlingInstructions()?if_exists}</textarea>
+                  <input type="text" class="inputBox" name="additionalShippingCharge" value="${packingSession.getAdditionalShippingCharge()?if_exists}" size="20"/>
                 </div>
               </td>
               <td align="right">