svn commit: r931700 [5/5] - in /ofbiz/trunk/applications/product/webapp: catalog/ catalog/category/ catalog/config/ catalog/feature/ catalog/find/ catalog/lookup/ catalog/price/ catalog/product/ catalog/promo/ catalog/reviews/ catalog/store/ catalog/th...

[bu...@apache.org]

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl Wed Apr  7 21:50:56 2010
@@ -44,7 +44,7 @@ under the License.
             <#list orderShipments as orderShipment>
                 <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
                     <td>&nbsp;</td>
-                    <td><span class="label">${uiLabelMap.ProductOrderItem}</span> <a href="/ordermgr/control/orderview?orderId=${orderShipment.orderId?if_exists}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${orderShipment.orderId?if_exists}</a>${orderShipment.orderItemSeqId?if_exists}</td>
+                    <td><span class="label">${uiLabelMap.ProductOrderItem}</span> <a href="/ordermgr/control/orderview?orderId=${orderShipment.orderId?if_exists}&amp;externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${orderShipment.orderId?if_exists}</a>${orderShipment.orderItemSeqId?if_exists}</td>
                     <td>&nbsp;</td>
                     <td>${orderShipment.quantity?if_exists}</td>
                     <td>&nbsp;</td>
@@ -54,7 +54,7 @@ under the License.
             <#list itemIssuances as itemIssuance>
                 <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
                     <td>&nbsp;</td>
-                    <td><span class="label">${uiLabelMap.ProductOrderItem}</span> <a href="/ordermgr/control/orderview?orderId=${itemIssuance.orderId?if_exists}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${itemIssuance.orderId?if_exists}</a>${itemIssuance.orderItemSeqId?if_exists}</td>
+                    <td><span class="label">${uiLabelMap.ProductOrderItem}</span> <a href="/ordermgr/control/orderview?orderId=${itemIssuance.orderId?if_exists}&amp;externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${itemIssuance.orderId?if_exists}</a>${itemIssuance.orderItemSeqId?if_exists}</td>
                     <td><span class="label">${uiLabelMap.ProductInventory}</span> <a href="<@o...@ofbizUrl>" class="buttontext">${itemIssuance.inventoryItemId?if_exists}</a></td>
                     <td>${itemIssuance.quantity?if_exists}</td>
                     <td>${itemIssuance.issuedDateTime?if_exists}</td>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl Wed Apr  7 21:50:56 2010
@@ -38,8 +38,8 @@ under the License.
               <ul>
                 <#list invoiceIds as invoiceId>
                   <li>
-                    #<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">${invoiceId}</a>
-                    (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">PDF</a>)
+                    #<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}&amp;externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">${invoiceId}</a>
+                    (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}&amp;externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">PDF</a>)
                   </li>
                 </#list>
               </ul>
@@ -64,7 +64,7 @@ under the License.
         <br />
         <#if !(orderId?has_content)>
           <form name="selectOrderForm" method="post" action="<@o...@ofbizUrl>">
-            <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}">
+            <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}" />
             <table cellspacing="0" class="basic-table">
               <tr>
                 <td width="25%" align="right"><span class="label">${uiLabelMap.ProductOrderId}</span></td>
@@ -88,7 +88,7 @@ under the License.
           <br />
           <!-- select picklist bin form -->
           <form name="selectPicklistBinForm" method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
-            <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}">
+            <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}" />
             <table cellspacing="0" class="basic-table">
               <tr>
                 <td width="25%" align='right'><span class="label">${uiLabelMap.FormFieldTitle_picklistBinId}</span></td>
@@ -132,7 +132,7 @@ under the License.
                       <td>
                         <span class="label">
                           ${uiLabelMap.ProductPackage} ${packedLine.getWeightPackageSeqId()}
-                          <input type="text" size="7" name="packageWeight" value="${(packedLine.getPackageWeight())?if_exists}">
+                          <input type="text" size="7" name="packageWeight" value="${(packedLine.getPackageWeight())?if_exists}" />
                         </span>
                       </td>
                       <td>
@@ -243,7 +243,7 @@ under the License.
                     <td>
                       <span class="label">
                         ${uiLabelMap.ProductPackage} ${(shipmentPackage_index + 1)}
-                        <input type="text" size="7" readonly name="packageWeight" value="${(shipmentPackage.weight)?if_exists}">
+                        <input type="text" size="7" readonly name="packageWeight" value="${(shipmentPackage.weight)?if_exists}" />
                       </span>
                     </td>
                     <td>
@@ -278,7 +278,7 @@ under the License.
       </div>
       <div class="screenlet-body">
         <div>
-          <h3>${uiLabelMap.FacilityWarningMessageThereIsMuchDifferenceInShippingCharges}&nbsp[${uiLabelMap.FacilityEstimatedShippingCharges} = <@ofbizCurrency amount=estimatedShippingCost?if_exists isoCode=shipment.currencyUomId?if_exists/>, ${uiLabelMap.FacilityActualShippingCharges} = <@ofbizCurrency amount=newEstimatedShippingCost?if_exists isoCode=shipment.currencyUomId?if_exists/>]</h3>
+          <h3>${uiLabelMap.FacilityWarningMessageThereIsMuchDifferenceInShippingCharges}&nbsp;[${uiLabelMap.FacilityEstimatedShippingCharges} = <@ofbizCurrency amount=estimatedShippingCost?if_exists isoCode=shipment.currencyUomId?if_exists/>, ${uiLabelMap.FacilityActualShippingCharges} = <@ofbizCurrency amount=newEstimatedShippingCost?if_exists isoCode=shipment.currencyUomId?if_exists/>]</h3>
         </div>
         <form name="shipNowForm" method="post" action="<@o...@ofbizUrl>">
           <input type="hidden" name="orderId" value="${orderId?if_exists}"/>