svn commit: r829453 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml webapp/facility/shipment/PackingSlip.fo.ftl

[mrisaliti]

Author: mrisaliti
Date: Sat Oct 24 21:11:35 2009
New Revision: 829453

URL: http://svn.apache.org/viewvc?rev=829453&view=rev
Log:
Remove some hard-coded labels from packing slip pdf

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=829453&r1=829452&r2=829453&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sat Oct 24 
21:11:35 2009
@@ -16942,6 +16942,14 @@
         <value xml:lang="th">จำนวนรวม</value>
         <value xml:lang="zh">已包含的数量</value>
     </property>
+    <property key="ProductQuantityOfPackage">
+        <value xml:lang="en">Quantity in this package</value>
+        <value xml:lang="it">Quantità in questo pacco</value>
+    </property>
+    <property key="ProductQuantityShippedOfPackage">
+        <value xml:lang="en">Quantity in this Shipment</value>
+        <value xml:lang="it">Quantità in questo spedizione</value>
+    </property>
     <property key="ProductQuantityNotAvailable">
         <value xml:lang="de">Menge nicht verfügbar</value>
         <value xml:lang="en">Quantity Not Available</value>
@@ -16982,7 +16990,7 @@
         <value xml:lang="en">Quantity Requested</value>
         <value xml:lang="es">Cantidad solicitada</value>
         <value xml:lang="fr">Quantité demandée</value>
-        <value xml:lang="it">Quantità Richiesta</value>
+        <value xml:lang="it">Quantità richiesta</value>
         <value xml:lang="ro">Cantitate Ceruta</value>
         <value xml:lang="ru">Запрошенное 
количество</value>
         <value 
xml:lang="th">จำนวนที่เรียกร้อง</value>

Modified: 
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl?rev=829453&r1=829452&r2=829453&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl 
(original)
+++ 
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl 
Sat Oct 24 21:11:35 2009
@@ -27,7 +27,7 @@
 
             <fo:block><fo:leader/></fo:block>
 
-            <fo:block font-size="14pt">${uiLabelMap.ProductShipmentId} 
#${shipmentId} / Package ${package_index + 1}<#if (packages?size > 1)> of 
${packages?size}</#if></fo:block>
+            <fo:block font-size="14pt">${uiLabelMap.ProductShipmentId} 
#${shipmentId} / ${uiLabelMap.ProductPackage} ${package_index + 1}<#if 
(packages?size > 1)> of ${packages?size}</#if></fo:block>
             <fo:block font-size="12pt">${uiLabelMap.ProductOrderId} 
#${shipment.primaryOrderId?default("N/A")} / 
${shipment.primaryShipGroupSeqId?default("N/A")}</fo:block>
             <fo:block><fo:leader/></fo:block>
 
@@ -99,10 +99,10 @@
                 <fo:table-header>
                     <fo:table-row font-weight="bold">
                         <fo:table-cell padding="2pt" 
background-color="#D4D0C8"><fo:block>${uiLabelMap.ProductProduct}</fo:block></fo:table-cell>
-                        <fo:table-cell padding="2pt" 
background-color="#D4D0C8"><fo:block>Requested</fo:block></fo:table-cell>
-                        <fo:table-cell padding="2pt" 
background-color="#D4D0C8"><fo:block>In this Package</fo:block></fo:table-cell>
-                        <#if (packages?size > 1)><fo:table-cell padding="2pt" 
background-color="#D4D0C8"><fo:block>In this 
Shipment</fo:block></fo:table-cell></#if>
-                        <fo:table-cell padding="2pt" 
background-color="#D4D0C8"><fo:block>Total Shipped</fo:block></fo:table-cell>
+                        <fo:table-cell padding="2pt" 
background-color="#D4D0C8"><fo:block>${uiLabelMap.ProductQuantityRequested}</fo:block></fo:table-cell>
+                        <fo:table-cell padding="2pt" 
background-color="#D4D0C8"><fo:block>${uiLabelMap.ProductQuantityOfPackage}</fo:block></fo:table-cell>
+                        <#if (packages?size > 1)><fo:table-cell padding="2pt" 
background-color="#D4D0C8"><fo:block>${uiLabelMap.ProductQuantityShippedOfPackage}</fo:block></fo:table-cell></#if>
+                        <fo:table-cell padding="2pt" 
background-color="#D4D0C8"><fo:block>${uiLabelMap.ProductQuantityShipped}</fo:block></fo:table-cell>
                     </fo:table-row>
                 </fo:table-header>
                 <fo:table-body>