svn commit: r470165 - in /incubator/ofbiz/trunk/applications/product: config/ProductUiLabels.properties entitydef/entitymodel_shipment.xml webapp/facility/shipment/ShipmentForms.xml webapp/facility/shipment/ViewShipmentInfo.ftl

[sichen]

Author: sichen
Date: Wed Nov  1 17:26:27 2006
New Revision: 470165

URL: http://svn.apache.org/viewvc?view=rev&rev=470165
Log:
An additionalShippingCharge entity for Shipment entity to track additional shipping charges on top of order shipping charges to be invoiced for the shipment.  This can be accessed from the shipment screens, not from the pack order page

Modified:
    incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    incubator/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
    incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml
    incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl

Modified: incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?view=diff&rev=470165&r1=470164&r2=470165
==============================================================================
--- incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties Wed Nov  1 17:26:27 2006
@@ -271,6 +271,7 @@
 ProductAddFeatureToResults=Add Feature to Results
 ProductAddToCategory=Add to Category
 ProductAddToPackage=Add to Package
+ProductAdditionalShippingCharge=Additional Shipping Charge
 ProductAddresses=Addresses
 ProductAdvancedSearch=Advanced Search
 ProductAdvancedSearchIn=Advanced Search in

Modified: incubator/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml?view=diff&rev=470165&r1=470164&r2=470165
==============================================================================
--- incubator/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml (original)
+++ incubator/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml Wed Nov  1 17:26:27 2006
@@ -516,6 +516,7 @@
       <field name="destinationTelecomNumberId" type="id"></field>
       <field name="partyIdTo" type="id"></field>
       <field name="partyIdFrom" type="id"></field>
+      <field name="additionalShippingCharge" type="currency-amount"></field>
       <field name="createdDate" type="date-time"></field>
       <field name="createdByUserLogin" type="id-vlong"></field>
       <field name="lastModifiedDate" type="date-time"></field>

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml?view=diff&rev=470165&r1=470164&r2=470165
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml Wed Nov  1 17:26:27 2006
@@ -110,6 +110,8 @@
 
         <field name="partyIdTo" title="${uiLabelMap.ProductToParty}" tooltip="${toPerson.firstName} ${toPerson.middleName} ${toPerson.lastName} ${toPartyGroup.groupName}" tooltip-style="tabletext"/>
         <field name="partyIdFrom" title="${uiLabelMap.ProductFromParty}" tooltip="${fromPerson.firstName} ${fromPerson.middleName} ${fromPerson.lastName} ${fromPartyGroup.groupName}" tooltip-style="tabletext"/>
+
+        <field name="additionalShippingCharge" title="${uiLabelMap.ProductAdditionalShippingCharge}"><text/></field>
         
         <field use-when="shipment!=null" name="createdDate" title="${uiLabelMap.ProductCreatedDate}" widget-style="tabletext"><display also-hidden="false" description="${shipment.createdDate}"/></field>
         <field use-when="shipment!=null" name="createdByUserLogin" title="${uiLabelMap.ProductCreatedByUserLogin}" widget-style="tabletext"><display also-hidden="false" description="${shipment.createdByUserLogin}"/></field>

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl?view=diff&rev=470165&r1=470164&r2=470165
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl Wed Nov  1 17:26:27 2006
@@ -63,6 +63,15 @@
         <td width="80%" align="left"><span class="tabletext">${(shipment.estimatedShipCost)?if_exists}</span></td>
       </tr>
       <tr>
+        <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductAdditionalShippingCharge}</span></td>
+        <td><span class="tabletext">&nbsp;</span></td>
+        <td width="80%" align="left">
+            <#if shipment.additionalShippingCharge?exists>
+                <span class="tabletext"><@ofbizCurrency amount=shipment.additionalShippingCharge isoCode=shipment.currencyUomId?if_exists /></span>
+            </#if>
+        </td>
+      </tr>
+      <tr>
         <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductHandlingInstructions}</span></td>
         <td><span class="tabletext">&nbsp;</span></td>
         <td width="80%" align="left"><span class="tabletext">${shipment.handlingInstructions?if_exists}</span></td>