You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2010/04/07 23:50:57 UTC
svn commit: r931700 [4/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...
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl Wed Apr 7 21:50:56 2010
@@ -21,22 +21,22 @@ under the License.
<div class="button-bar">
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacilityLocation}</a>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewInventoryItem}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewInventoryItem}</a>
<#assign latestGeoPoint= Static["org.ofbiz.common.geo.GeoWorker"].findLatestGeoPoint(delegator, "FacilityLocationAndGeoPoint", "facilityId", facilityId, "locationSeqId", locationSeqId)?if_exists/>
<#if latestGeoPoint?has_content>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
</#if>
</div>
</#if>
<#if facilityId?exists && !(facilityLocation?exists)>
<form action="<@o...@ofbizUrl>" method="post">
- <input type="hidden" name="facilityId" value="${facilityId}">
+ <input type="hidden" name="facilityId" value="${facilityId}" />
<table class="basic-table" cellspacing="0">
<#elseif facilityLocation?exists>
<form action="<@o...@ofbizUrl>" method="post">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
- <input type="hidden" name="locationSeqId" value="${locationSeqId}">
+ <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
+ <input type="hidden" name="locationSeqId" value="${locationSeqId}" />
<table class="basic-table" cellspacing="0">
<tr>
<td class="label">${uiLabelMap.ProductFacilityId}</td>
@@ -68,30 +68,30 @@ under the License.
</tr>
<tr>
<td class="label">${uiLabelMap.CommonArea}</td>
- <td><input type="text" name="areaId" value="${(facilityLocation.areaId)?if_exists}" size="19" maxlength="20"></td>
+ <td><input type="text" name="areaId" value="${(facilityLocation.areaId)?if_exists}" size="19" maxlength="20" /></td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductAisle}</td>
- <td><input type="text" name="aisleId" value="${(facilityLocation.aisleId)?if_exists}" size="19" maxlength="20"></td>
+ <td><input type="text" name="aisleId" value="${(facilityLocation.aisleId)?if_exists}" size="19" maxlength="20" /></td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductSection}</td>
- <td><input type="text" name="sectionId" value="${(facilityLocation.sectionId)?if_exists}" size="19" maxlength="20"></td>
+ <td><input type="text" name="sectionId" value="${(facilityLocation.sectionId)?if_exists}" size="19" maxlength="20" /></td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductLevel}</td>
- <td><input type="text" name="levelId" value="${(facilityLocation.levelId)?if_exists}" size="19" maxlength="20"></td>
+ <td><input type="text" name="levelId" value="${(facilityLocation.levelId)?if_exists}" size="19" maxlength="20" /></td>
</tr>
<tr>
<td class="label">${uiLabelMap.ProductPosition}</td>
- <td><input type="text" name="positionId" value="${(facilityLocation.positionId)?if_exists}" size="19" maxlength="20"></td>
+ <td><input type="text" name="positionId" value="${(facilityLocation.positionId)?if_exists}" size="19" maxlength="20" /></td>
</tr>
<tr>
<td> </td>
<#if locationSeqId?exists>
- <td><input type="submit" value="${uiLabelMap.CommonUpdate}"></td>
+ <td><input type="submit" value="${uiLabelMap.CommonUpdate}" /></td>
<#else>
- <td><input type="submit" value="${uiLabelMap.CommonSave}"></td>
+ <td><input type="submit" value="${uiLabelMap.CommonSave}" /></td>
</#if>
</tr>
</table>
@@ -135,13 +135,13 @@ under the License.
</div>
<div class="screenlet-body">
<form method="post" action="<@o...@ofbizUrl>" style="margin: 0;" name="createProductFacilityLocationForm">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
- <input type="hidden" name="locationSeqId" value="${locationSeqId?if_exists}">
- <input type="hidden" name="useValues" value="true">
- <span class="label">${uiLabelMap.ProductProductId}</span><input type="text" size="10" name="productId">
- <span class="label">${uiLabelMap.ProductMinimumStock}</span><input type="text" size="10" name="minimumStock">
- <span class="label">${uiLabelMap.ProductMoveQuantity}</span><input type="text" size="10" name="moveQuantity">
- <input type="submit" value="${uiLabelMap.CommonAdd}">
+ <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
+ <input type="hidden" name="locationSeqId" value="${locationSeqId?if_exists}" />
+ <input type="hidden" name="useValues" value="true" />
+ <span class="label">${uiLabelMap.ProductProductId}</span><input type="text" size="10" name="productId" />
+ <span class="label">${uiLabelMap.ProductMinimumStock}</span><input type="text" size="10" name="minimumStock" />
+ <span class="label">${uiLabelMap.ProductMoveQuantity}</span><input type="text" size="10" name="moveQuantity" />
+ <input type="submit" value="${uiLabelMap.CommonAdd}" />
</form>
</div>
</div>
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl Wed Apr 7 21:50:56 2010
@@ -22,7 +22,7 @@ under the License.
var productId = productelement.value;
var facilityId = facilityelement.value;
- var request = "LookupProductInventoryLocation?productId=" + productId + "&facilityId=" + facilityId;
+ var request = "LookupProductInventoryLocation?productId=" + productId + "&facilityId=" + facilityId;
window[func](locationelement, request);
}
</script>
@@ -38,8 +38,8 @@ under the License.
<div class="screenlet-body">
<form method="post" action="<@o...@ofbizUrl>" name='selectAllForm' style='margin: 0;'>
<#-- general request fields -->
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
- <input type="hidden" name="_useRowSubmit" value="Y">
+ <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
+ <input type="hidden" name="_useRowSubmit" value="Y" />
<#assign rowCount = 0>
<table cellspacing="0" class="basic-table hover-bar">
<tr class="header-row">
@@ -56,7 +56,7 @@ under the License.
<td>${uiLabelMap.CommonConfirm}</td>
<td align="right">
${uiLabelMap.ProductSelectAll}
- <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'moveInfoId_tableRow_', 'selectAllForm');">
+ <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'moveInfoId_tableRow_', 'selectAllForm');" />
</td>
</tr>
<#if moveByOisgirInfoList?has_content || moveByPflInfoList?has_content>
@@ -81,14 +81,14 @@ under the License.
<td>${targetProductFacilityLocation.minimumStock?if_exists}</td>
<td>${targetProductFacilityLocation.moveQuantity?if_exists}</td>
<td align="right">
- <input type="hidden" name="productId_o_${rowCount}" value="${product.productId?if_exists}">
- <input type="hidden" name="facilityId_o_${rowCount}" value="${facilityId?if_exists}">
- <input type="hidden" name="locationSeqId_o_${rowCount}" value="${facilityLocationFrom.locationSeqId?if_exists}">
- <input type="hidden" name="targetLocationSeqId_o_${rowCount}" value="${facilityLocationTo.locationSeqId?if_exists}">
- <input type="text" name="quantityMoved_o_${rowCount}" size="6" value="${totalQuantity?string.number}">
+ <input type="hidden" name="productId_o_${rowCount}" value="${product.productId?if_exists}" />
+ <input type="hidden" name="facilityId_o_${rowCount}" value="${facilityId?if_exists}" />
+ <input type="hidden" name="locationSeqId_o_${rowCount}" value="${facilityLocationFrom.locationSeqId?if_exists}" />
+ <input type="hidden" name="targetLocationSeqId_o_${rowCount}" value="${facilityLocationTo.locationSeqId?if_exists}" />
+ <input type="text" name="quantityMoved_o_${rowCount}" size="6" value="${totalQuantity?string.number}" />
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'moveInfoId_tableRow_${rowCount}');">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'moveInfoId_tableRow_${rowCount}');" />
</td>
</tr>
<#assign rowCount = rowCount + 1>
@@ -115,14 +115,14 @@ under the License.
<td>${targetProductFacilityLocation.minimumStock?if_exists}</td>
<td>${targetProductFacilityLocation.moveQuantity?if_exists}</td>
<td align="right">
- <input type="hidden" name="productId_o_${rowCount}" value="${product.productId?if_exists}">
- <input type="hidden" name="facilityId_o_${rowCount}" value="${facilityId?if_exists}">
- <input type="hidden" name="locationSeqId_o_${rowCount}" value="${facilityLocationFrom.locationSeqId?if_exists}">
- <input type="hidden" name="targetLocationSeqId_o_${rowCount}" value="${facilityLocationTo.locationSeqId?if_exists}">
- <input type="text" name="quantityMoved_o_${rowCount}" size="6" value="${totalQuantity?string.number}">
+ <input type="hidden" name="productId_o_${rowCount}" value="${product.productId?if_exists}" />
+ <input type="hidden" name="facilityId_o_${rowCount}" value="${facilityId?if_exists}" />
+ <input type="hidden" name="locationSeqId_o_${rowCount}" value="${facilityLocationFrom.locationSeqId?if_exists}" />
+ <input type="hidden" name="targetLocationSeqId_o_${rowCount}" value="${facilityLocationTo.locationSeqId?if_exists}" />
+ <input type="text" name="quantityMoved_o_${rowCount}" size="6" value="${totalQuantity?string.number}" />
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'moveInfoId_tableRow_${rowCount}');">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'moveInfoId_tableRow_${rowCount}');" />
</td>
</tr>
<#assign rowCount = rowCount + 1>
@@ -141,7 +141,7 @@ under the License.
<tr><td colspan="13"><h3>${messageCount}:${pflWarningMessage}.</h3></td></tr>
</#list>
</table>
- <input type="hidden" name="_rowCount" value="${rowCount}">
+ <input type="hidden" name="_rowCount" value="${rowCount}" />
</form>
</div>
<div class="screenlet-title-bar">
@@ -152,33 +152,33 @@ under the License.
</div>
<div class="screenlet-body">
<form method="post" action="<@o...@ofbizUrl>" name='quickStockMove'>
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
+ <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
<table cellspacing="0" class="basic-table hover-bar">
<tr class="header-row">
<td>${uiLabelMap.ProductProduct}</td>
<td>${uiLabelMap.ProductFromLocation}</td>
<td>${uiLabelMap.ProductToLocation}</td>
<td>${uiLabelMap.ProductMoveQuantity}</td>
- <td> </td>
+ <td> </td>
</tr>
<td>
- <input type="text" size="20" name="productId" maxlength="20">
+ <input type="text" size="20" name="productId" maxlength="20" />
<a href="javascript:call_fieldlookup2(document.quickStockMove.productId,'LookupProduct');">
<img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
</a>
</td>
<td>
- <input type="text" size="20" name="locationSeqId" maxlength="20">
+ <input type="text" size="20" name="locationSeqId" maxlength="20" />
<a href="javascript:quicklookup('call_fieldlookup2', document.quickStockMove.locationSeqId, document.quickStockMove.facilityId, document.quickStockMove.productId)">
<img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
</a>
<td>
- <input type="text" size="20" name="targetLocationSeqId" maxlength="20">
- <a href="javascript:call_fieldlookup2(document.quickStockMove.targetLocationSeqId,'LookupFacilityLocation?facilityId=${facilityId}&locationTypeEnumId=FLT_PICKLOC');">
+ <input type="text" size="20" name="targetLocationSeqId" maxlength="20" />
+ <a href="javascript:call_fieldlookup2(document.quickStockMove.targetLocationSeqId,'LookupFacilityLocation?facilityId=${facilityId}&locationTypeEnumId=FLT_PICKLOC');">
<img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
</a>
</td>
- <td><input type="text" name="quantityMoved" size="6"></td>
+ <td><input type="text" name="quantityMoved" size="6" /></td>
<tr>
<td colspan="13" align="right">
<a href="javascript:document.quickStockMove.submit();" class="buttontext">${uiLabelMap.ProductQuickStockMove}</a>
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl Wed Apr 7 21:50:56 2010
@@ -91,7 +91,7 @@ under the License.
<td class="button-col">
<#if security.hasEntityPermission("FACILITY", "_UPDATE", session)>
- <a href='<@o...@ofbizUrl>'>${uiLabelMap.CommonUpdate}</a>
+ <a href='<@o...@ofbizUrl>'>${uiLabelMap.CommonUpdate}</a>
</#if>
<#if security.hasEntityPermission("FACILITY", "_DELETE", session)>
<form action="<@o...@ofbizUrl>" name="deleteContactForm_${contactMechMap_index}" method="post">
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl Wed Apr 7 21:50:56 2010
@@ -26,13 +26,13 @@ under the License.
</div>
<#if !(inventoryItem?exists)>
<form method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="facilityId" value="${facilityId}">
+ <input type="hidden" name="facilityId" value="${facilityId}" />
<table cellspacing="0" class="basic-table">
<tr>
<td class="label">${uiLabelMap.ProductInventoryItemId}</td>
<td>
- <input type="text" name="inventoryItemId" size="20" maxlength="20">
- <input type="submit" value="${uiLabelMap.ProductGetItem}">
+ <input type="text" name="inventoryItemId" size="20" maxlength="20" />
+ <input type="submit" value="${uiLabelMap.ProductGetItem}" />
</td>
</tr>
</table>
@@ -42,7 +42,7 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" name="transferform" style="margin: 0;">
<#else>
<form method="post" action="<@o...@ofbizUrl>" name="transferform" style="margin: 0;">
- <input type="hidden" name="inventoryTransferId" value="${inventoryTransferId?if_exists}">
+ <input type="hidden" name="inventoryTransferId" value="${inventoryTransferId?if_exists}" />
</#if>
<script language="JavaScript" type="text/javascript">
@@ -50,9 +50,9 @@ under the License.
</script>
<table cellspacing="0" class="basic-table">
- <input type="hidden" name="inventoryItemId" value="${inventoryItemId?if_exists}">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
- <input type="hidden" name="locationSeqId" value="${(inventoryItem.locationSeqId)?if_exists}">
+ <input type="hidden" name="inventoryItemId" value="${inventoryItemId?if_exists}" />
+ <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
+ <input type="hidden" name="locationSeqId" value="${(inventoryItem.locationSeqId)?if_exists}" />
<tr>
<td width="14%"> </td>
<td width="6%"align="right"><span class="label">${uiLabelMap.ProductInventoryItemId}</span></td>
@@ -61,7 +61,7 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductInventoryItemTypeId}</td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductInventoryItemTypeId}</td>
<td width="6%"> </td>
<td width="74%">
<#if inventoryItemType?exists>
@@ -71,7 +71,7 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductProductId}</span></td>
+ <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductProductId}</span></td>
<td width="6%"> </td>
<td width="74%">
<#if inventoryItem?exists && (inventoryItem.productId)?exists>
@@ -81,21 +81,21 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.CommonStatus}</span></td>
+ <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.CommonStatus}</span></td>
<td width="6%"> </td>
<td width="74%">${(inventoryStatus.get("description",locale))?default("--")}</td>
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductComments}</span></td>
+ <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductComments}</span></td>
<td width="6%"> </td>
<td width="74%">${(inventoryItem.comments)?default("--")}</td>
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductSerialAtpQoh}</span></td>
+ <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductSerialAtpQoh}</span></td>
<td width="6%"> </td>
<#if inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")>
<td width="74%">
@@ -114,7 +114,7 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductTransferStatus}</span></td>
+ <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductTransferStatus}</span></td>
<td width="6%"> </td>
<td width="74%">
<select name="statusId">
@@ -130,17 +130,17 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductTransferSendDate}</span></td>
+ <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductTransferSendDate}</span></td>
<td width="6%"> </td>
<td width="74%">
- <input type="text" name="sendDate" value="${(inventoryTransfer.sendDate)?if_exists}" size="22">
+ <input type="text" name="sendDate" value="${(inventoryTransfer.sendDate)?if_exists}" size="22" />
<a href="#" onclick="setNow('sendDate')" class="buttontext">${uiLabelMap.CommonNow}</a>
</td>
</tr>
<#if !(inventoryTransfer?exists)>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductToFacilityContainer}</span></td>
+ <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductToFacilityContainer}</span></td>
<td width="6%"> </td>
<td width="74%">
<div>
@@ -151,17 +151,17 @@ under the License.
</select>
<span class="tooltip">${uiLabelMap.ProductSelectFacility}</span>
<br />
- <input type="text" name="containerIdTo" value="${(inventoryTransfer.containerIdTo)?if_exists}" size="20" maxlength="20">
+ <input type="text" name="containerIdTo" value="${(inventoryTransfer.containerIdTo)?if_exists}" size="20" maxlength="20" />
<span class="tooltip">${uiLabelMap.ProductOrEnterContainerId}</span>
</div>
</td>
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductToLocation}</span></td>
+ <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductToLocation}</span></td>
<td width="6%"> </td>
<td width="74%">
- <input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20">
+ <input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20" />
<a href="javascript:call_fieldlookup2(document.transferform.locationSeqIdTo,'LookupFacilityLocation');">
<img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
</a>
@@ -169,21 +169,21 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductComments}</span></td>
+ <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductComments}</span></td>
<td width="6%"> </td>
<td width="74%">
- <input type="text" name="comments" size="60" maxlength="250">
+ <input type="text" name="comments" size="60" maxlength="250" />
</td>
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductQuantityToTransfer}</span></td>
+ <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductQuantityToTransfer}</span></td>
<td width="6%"> </td>
<td width="74%">
<#if inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")>
- <input type="text" size="5" name="xferQty" value="${(inventoryItem.availableToPromiseTotal)?if_exists}">
+ <input type="text" size="5" name="xferQty" value="${(inventoryItem.availableToPromiseTotal)?if_exists}" />
<#elseif inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("SERIALIZED_INV_ITEM")>
- <input type="hidden" name="xferQty" value="1">
+ <input type="hidden" name="xferQty" value="1" />
1
<#elseif inventoryItem?exists>
<span class="alert">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSpecifyType}.</span>
@@ -193,26 +193,26 @@ under the License.
<#else>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductTransferReceiveDate}</span></td>
+ <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductTransferReceiveDate}</span></td>
<td width="6%"> </td>
<td width="74%">
- <input type="text" name="receiveDate" value="${(inventoryTransfer.receiveDate)?if_exists}" size="22">
+ <input type="text" name="receiveDate" value="${(inventoryTransfer.receiveDate)?if_exists}" size="22" />
<a href="#" onclick="setNow('receiveDate')" class="buttontext">${uiLabelMap.CommonNow}</a>
</td>
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductToFacilityContainer}</span></td>
+ <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductToFacilityContainer}</span></td>
<td width="6%"> </td>
<#assign fac = delegator.findByPrimaryKey("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", inventoryTransfer.facilityIdTo))>
<td width="74%">${(fac.facilityName)?default(" ")}</td>
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductToLocation}</span></td>
+ <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductToLocation}</span></td>
<td width="6%"> </td>
<td width="74%">
- <input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20">
+ <input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20" />
<a href="javascript:call_fieldlookup2(document.transferform.locationSeqIdTo,'LookupFacilityLocation?facilityId=${inventoryTransfer.facilityIdTo}');">
<img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
</a>
@@ -220,19 +220,19 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductComments}</span></td>
+ <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductComments}</span></td>
<td width="6%"> </td>
<td width="74%">
- <input type="text" name="comments" value="${(inventoryTransfer.comments)?if_exists}" size="60" maxlength="250">
+ <input type="text" name="comments" value="${(inventoryTransfer.comments)?if_exists}" size="60" maxlength="250" />
</td>
</tr>
</#if>
<tr>
<td colspan="2"> </td>
<#if !(inventoryTransfer?exists)>
- <td colspan="1"><input type="submit" value="${uiLabelMap.ProductTransfer}"></td>
+ <td colspan="1"><input type="submit" value="${uiLabelMap.ProductTransfer}" /></td>
<#else>
- <td colspan="1"><input type="submit" value="${uiLabelMap.CommonUpdate}"></td>
+ <td colspan="1"><input type="submit" value="${uiLabelMap.CommonUpdate}" /></td>
</#if>
</tr>
</table>
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Wed Apr 7 21:50:56 2010
@@ -86,7 +86,7 @@ under the License.
<input type="hidden" name="orderItemSeqId" value="${firstOrderItem.orderItemSeqId}"/>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductPurchaseOrder}</td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductPurchaseOrder}</td>
<td width="6%"> </td>
<td width="74%">
<b>${purchaseOrder.orderId}</b> / <b>${firstOrderItem.orderItemSeqId}</b>
@@ -100,7 +100,7 @@ under the License.
</#if>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductProductId}</td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductProductId}</td>
<td width="6%"> </td>
<td width="74%">
<b>${requestParameters.productId?if_exists}</b>
@@ -108,7 +108,7 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductProductName}</td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductProductName}</td>
<td width="6%"> </td>
<td width="74%">
<a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.internalName?if_exists}</a>
@@ -116,7 +116,7 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductProductDescription}</td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductProductDescription}</td>
<td width="6%"> </td>
<td width="74%">
${product.description?if_exists}
@@ -124,7 +124,7 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductItemDescription}</td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductItemDescription}</td>
<td width="6%"> </td>
<td width="74%">
<input type="text" name="itemDescription" size="30" maxlength="60"/>
@@ -132,7 +132,7 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductInventoryItemType}</td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductInventoryItemType}</td>
<td width="6%"> </td>
<td width="74%">
<select name="inventoryItemTypeId" size="1">
@@ -151,19 +151,19 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductFacilityOwner}</td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductFacilityOwner}</td>
<td width="6%"> </td>
<td width="74%">
- <input type="text" name="ownerPartyId" value="" size="20" maxlength="20">
+ <input type="text" name="ownerPartyId" value="" size="20" maxlength="20" />
<a href="javascript:call_fieldlookup2(document.selectAllForm.ownerPartyId, 'LookupPartyName');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a>
</td>
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductDateReceived}</td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductDateReceived}</td>
<td width="6%"> </td>
<td width="74%">
- <input type="text" name="datetimeReceived" size="24" value="${nowTimestamp}">
+ <input type="text" name="datetimeReceived" size="24" value="${nowTimestamp}" />
<#-- <a href="#" onclick="setNow("datetimeReceived")" class="buttontext">[Now]</a> -->
</td>
</tr>
@@ -172,7 +172,7 @@ under the License.
<#assign facilityLocations = (product.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists/>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductFacilityLocation}</td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductFacilityLocation}</td>
<td width="6%"> </td>
<td width="74%">
<#if facilityLocations?has_content>
@@ -195,7 +195,7 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductRejectedReason}</td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductRejectedReason}</td>
<td width="6%"> </td>
<td width="74%">
<select name="rejectionId" size="1">
@@ -208,7 +208,7 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductQuantityRejected}</td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductQuantityRejected}</td>
<td width="6%"> </td>
<td width="74%">
<input type="text" name="quantityRejected" size="5" value="0" />
@@ -216,7 +216,7 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductQuantityAccepted}</td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductQuantityAccepted}</td>
<td width="6%"> </td>
<td width="74%">
<input type="text" name="quantityAccepted" size="5" value="${defaultQuantity?default(1)?string.number}"/>
@@ -224,7 +224,7 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductPerUnitPrice}</td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductPerUnitPrice}</td>
<td width="6%"> </td>
<td width="74%">
<#-- get the default unit cost -->
@@ -234,7 +234,7 @@ under the License.
</tr>
<tr>
<td colspan="2"> </td>
- <td colspan="2"><input type="submit" value="${uiLabelMap.CommonReceive}"></td>
+ <td colspan="2"><input type="submit" value="${uiLabelMap.CommonReceive}" /></td>
</tr>
</table>
<script language="JavaScript">
@@ -265,8 +265,8 @@ under the License.
<td>
<table class="basic-table" cellspacing="0">
<tr>
- <td width="5%" nowrap><input type="radio" name="shipmentId" value="${shipment.shipmentId}"></td>
- <td width="5%" nowrap>${shipment.shipmentId}</td>
+ <td width="5%" nowrap="nowrap"><input type="radio" name="shipmentId" value="${shipment.shipmentId}" /></td>
+ <td width="5%" nowrap="nowrap">${shipment.shipmentId}</td>
<td>${shipmentType.get("description",locale)?default(shipmentType.shipmentTypeId?default(""))}</td>
<td>${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</td>
<td>${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]</td>
@@ -284,8 +284,8 @@ under the License.
<td>
<table class="basic-table" cellspacing="0">
<tr>
- <td width="5%" nowrap><input type="radio" name="shipmentId" value="_NA_"></td>
- <td width="5%" nowrap>${uiLabelMap.ProductNoSpecificShipment}</td>
+ <td width="5%" nowrap="nowrap"><input type="radio" name="shipmentId" value="_NA_" /></td>
+ <td width="5%" nowrap="nowrap">${uiLabelMap.ProductNoSpecificShipment}</td>
<td colspan="5"></td>
</tr>
</table>
@@ -431,7 +431,7 @@ under the License.
<tr>
<td colspan="4" align="right">${uiLabelMap.OrderQtyOrdered} :</td>
<td align="right">
- <input type="text" class="inputBox" name="quantityOrdered" value="${orderItem.quantity}" size="6" maxlength="20" disabled/>
+ <input type="text" class="inputBox" name="quantityOrdered" value="${orderItem.quantity}" size="6" maxlength="20" disabled="disabled" />
</td>
</tr>
</tr>
@@ -507,7 +507,7 @@ under the License.
<tr>
<td class="label">${uiLabelMap.ProductPurchaseOrderNumber}</td>
<td>
- <input type="text" name="purchaseOrderId" size="20" maxlength="20" value="${requestParameters.purchaseOrderId?if_exists}">
+ <input type="text" name="purchaseOrderId" size="20" maxlength="20" value="${requestParameters.purchaseOrderId?if_exists}" />
<a href="javascript:call_fieldlookup2(document.selectAllForm.purchaseOrderId,'LookupPurchaseOrderHeaderAndShipInfo');">
<img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
</a>
Modified: ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl Wed Apr 7 21:50:56 2010
@@ -58,9 +58,9 @@ under the License.
<#if returnHeader?has_content>
<form method="post" action="<@o...@ofbizUrl>" name='selectAllForm'>
<#-- general request fields -->
- <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}">
- <input type="hidden" name="returnId" value="${requestParameters.returnId?if_exists}">
- <input type="hidden" name="_useRowSubmit" value="Y">
+ <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}" />
+ <input type="hidden" name="returnId" value="${requestParameters.returnId?if_exists}" />
+ <input type="hidden" name="_useRowSubmit" value="Y" />
<#assign now = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()>
<#assign rowCount = 0>
<table cellspacing="0" class="basic-table">
@@ -78,7 +78,7 @@ under the License.
</td>
<td align="right">
${uiLabelMap.ProductSelectAll}
- <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');">
+ <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');" />
</td>
</tr>
@@ -87,13 +87,13 @@ under the License.
<#assign orderItem = returnItem.getRelatedOne("OrderItem")?if_exists>
<#if (orderItem?has_content && 0 < defaultQuantity)>
<#assign orderItemType = (orderItem.getRelatedOne("OrderItemType"))?if_exists>
- <input type="hidden" name="returnId_o_${rowCount}" value="${returnItem.returnId}">
- <input type="hidden" name="returnItemSeqId_o_${rowCount}" value="${returnItem.returnItemSeqId}">
- <input type="hidden" name="shipmentId_o_${rowCount}" value="${parameters.shipmentId?if_exists}">
- <input type="hidden" name="facilityId_o_${rowCount}" value="${requestParameters.facilityId?if_exists}">
- <input type="hidden" name="datetimeReceived_o_${rowCount}" value="${now}">
- <input type="hidden" name="quantityRejected_o_${rowCount}" value="0">
- <input type="hidden" name="comments_o_${rowCount}" value="Returned Item RA# ${returnItem.returnId}">
+ <input type="hidden" name="returnId_o_${rowCount}" value="${returnItem.returnId}" />
+ <input type="hidden" name="returnItemSeqId_o_${rowCount}" value="${returnItem.returnItemSeqId}" />
+ <input type="hidden" name="shipmentId_o_${rowCount}" value="${parameters.shipmentId?if_exists}" />
+ <input type="hidden" name="facilityId_o_${rowCount}" value="${requestParameters.facilityId?if_exists}" />
+ <input type="hidden" name="datetimeReceived_o_${rowCount}" value="${now}" />
+ <input type="hidden" name="quantityRejected_o_${rowCount}" value="0" />
+ <input type="hidden" name="comments_o_${rowCount}" value="Returned Item RA# ${returnItem.returnId}" />
<#assign unitCost = Static["org.ofbiz.order.order.OrderReturnServices"].getReturnItemInitialCost(delegator, returnItem.returnId, returnItem.returnItemSeqId)/>
<tr>
@@ -108,7 +108,7 @@ under the License.
<#assign product = orderItem.getRelatedOne("Product")>
<#assign productId = product.productId>
<#assign serializedInv = product.getRelatedByAnd("InventoryItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("inventoryItemTypeId", "SERIALIZED_INV_ITEM"))>
- <input type="hidden" name="productId_o_${rowCount}" value="${product.productId}">
+ <input type="hidden" name="productId_o_${rowCount}" value="${product.productId}" />
<td width="45%">
<div>
${returnItem.returnItemSeqId}: <a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.productId} - ${product.internalName?if_exists}</a> : ${product.description?if_exists}
@@ -119,7 +119,7 @@ under the License.
<td width="45%">
<div>
${returnItem.returnItemSeqId}: <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists}
- <input type="text" size="12" name="productId_o_${rowCount}">
+ <input type="text" size="12" name="productId_o_${rowCount}" />
<a href="/catalog/control/EditProduct?externalLoginKey=${externalLoginKey}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
</div>
</td>
@@ -158,9 +158,9 @@ under the License.
</#if>
</td>
- <td align="right" nowrap class="label">${uiLabelMap.ProductQtyReceived}</td>
+ <td align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductQtyReceived}</td>
<td align="right">
- <input type="text" name="quantityAccepted_o_${rowCount}" size="6" value="${defaultQuantity?string.number}">
+ <input type="text" name="quantityAccepted_o_${rowCount}" size="6" value="${defaultQuantity?string.number}" />
</td>
</tr>
<tr>
@@ -195,15 +195,15 @@ under the License.
<#else>
<td colspan="2"> </td>
</#if>
- <td align="right" nowrap class="label">${uiLabelMap.ProductPerUnitPrice}</td>
+ <td align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductPerUnitPrice}</td>
<td align="right">
- <input type='text' name='unitCost_o_${rowCount}' size='6' value='${unitCost?default(0)?string("##0.00")}'>
+ <input type='text' name='unitCost_o_${rowCount}' size='6' value='${unitCost?default(0)?string("##0.00")}' />
</td>
</tr>
</table>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');" />
</td>
</tr>
<#assign rowCount = rowCount + 1>
@@ -232,22 +232,22 @@ under the License.
</#if>
</#if>
</table>
- <input type="hidden" name="_rowCount" value="${rowCount}">
+ <input type="hidden" name="_rowCount" value="${rowCount}" />
</form>
<script language="JavaScript" type="text/javascript">selectAll('selectAllForm');</script>
<#-- Initial Screen -->
<#else>
<form name="selectAllForm" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}">
- <input type="hidden" name="initialSelected" value="Y">
+ <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}" />
+ <input type="hidden" name="initialSelected" value="Y" />
<table cellspacing="0" class="basic-table">
<tr><td colspan="4"><h3>${uiLabelMap.ProductReceiveReturn}</h3></td></tr>
<tr>
<td width="15%" align='right' class="label">${uiLabelMap.ProductReturnNumber}</td>
<td> </td>
<td width="90%">
- <input type="text" name="returnId" size="20" maxlength="20" value="${requestParameters.returnId?if_exists}">
+ <input type="text" name="returnId" size="20" maxlength="20" value="${requestParameters.returnId?if_exists}" />
</td>
<td> </td>
</tr>
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl Wed Apr 7 21:50:56 2010
@@ -83,8 +83,8 @@ under the License.
<#else>
<form action="<@o...@ofbizUrl>" method="post" name="selectAllForm">
</#if>
- <input type="hidden" name="shipmentId" value="${shipmentId}">
- <input type="hidden" name="_useRowSubmit" value="Y">
+ <input type="hidden" name="shipmentId" value="${shipmentId}" />
+ <input type="hidden" name="_useRowSubmit" value="Y" />
<table cellspacing="0" cellpadding="2" class="basic-table hover-bar">
<tr class="header-row">
<td>${uiLabelMap.ProductOrderId}<br />${uiLabelMap.ProductOrderShipGroupId}<br />${uiLabelMap.ProductOrderItem}</td>
@@ -101,7 +101,7 @@ under the License.
<td>${uiLabelMap.ProductIssue}</td>
<td align="right">
<div>${uiLabelMap.CommonSubmit} ?</div>
- <div>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'orderItemData_tableRow_', 'selectAllForm');"></div>
+ <div>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'orderItemData_tableRow_', 'selectAllForm');" /></div>
</td>
</tr>
<#assign alt_row = false>
@@ -170,7 +170,7 @@ under the License.
<input type="text" size="5" name="quantity_o_${rowCount}" value="${quantityNotIssued}"/>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'orderItemData_tableRow_${rowCount}');">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'orderItemData_tableRow_${rowCount}');" />
</td>
<#assign rowCount = rowCount + 1>
<#else>
@@ -214,7 +214,7 @@ under the License.
<input type="text" size="5" name="quantity_o_${rowCount}" value="${(orderItemShipGrpInvResData.shipmentPlanQuantity)?default(availableQuantity)}"/>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'orderItemData_tableRow_${rowCount}');">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'orderItemData_tableRow_${rowCount}');" />
</td>
<#assign rowCount = rowCount + 1>
<#else>
@@ -229,7 +229,7 @@ under the License.
</#list>
</table>
<div align="right"><input type="submit" class="smallSubmit" value="${uiLabelMap.ProductIssueAll}"/></div>
- <input type="hidden" name="_rowCount" value="${rowCount}">
+ <input type="hidden" name="_rowCount" value="${rowCount}" />
</form>
<script language="JavaScript" type="text/javascript">selectAll('selectAllForm');</script>
</#if>
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl Wed Apr 7 21:50:56 2010
@@ -64,7 +64,7 @@ under the License.
<td>${orderShipment.quantity?if_exists}</td>
<td> </td>
<td> </td>
- <td> <#-- don't allow a delete, need to implement a cancel issuance <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> --></td>
+ <td> <#-- don't allow a delete, need to implement a cancel issuance <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> --></td>
</tr>
</#list>
<#list itemIssuances as itemIssuance>
@@ -75,7 +75,7 @@ under the License.
<td>${itemIssuance.quantity?if_exists}</td>
<td>${itemIssuance.issuedDateTime?if_exists}</td>
<td class="label">${uiLabelMap.ProductFuturePartyRoleList}</td>
- <td> <#-- don't allow a delete, need to implement a cancel issuance <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> --></td>
+ <td> <#-- don't allow a delete, need to implement a cancel issuance <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> --></td>
</tr>
</#list>
<#list shipmentPackageContents as shipmentPackageContent>
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl Wed Apr 7 21:50:56 2010
@@ -175,7 +175,7 @@ under the License.
<a href="javascript:document.upsShipmentConfirm_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductConfirmShipmentUps}</a>
<br />
${uiLabelMap.ProductShipmentUpsResidential}:
- <input type="checkbox" name="homeDeliveryType" value="Y" ${(shipmentRouteSegment.homeDeliveryType?has_content)?string("checked=\"checked\"","")}>
+ <input type="checkbox" name="homeDeliveryType" value="Y" ${(shipmentRouteSegment.homeDeliveryType?has_content)?string("checked=\"checked\"","")} />
<#elseif "SHRSCS_CONFIRMED" == shipmentRouteSegment.carrierServiceStatusId?if_exists>
<a href="javascript:document.upsShipmentAccept_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductAcceptUpsShipmentConfirmation}</a>
<br />
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl Wed Apr 7 21:50:56 2010
@@ -43,12 +43,12 @@ function lookupShipments() {
</div>
<div class="screenlet-body">
<form method="post" name="lookupShipmentForm" action="<@o...@ofbizUrl>">
- <input type="hidden" name="lookupFlag" value="Y">
+ <input type="hidden" name="lookupFlag" value="Y" />
<table cellspacing="0" cellpadding="2" class="basic-table">
<tr>
<td width="25%" align="right" class="label">${uiLabelMap.ProductShipmentId}</td>
<td width="5%"> </td>
- <td><input type="text" name="shipmentId" value="${shipmentId?if_exists}"></td>
+ <td><input type="text" name="shipmentId" value="${shipmentId?if_exists}" /></td>
</tr>
<tr>
<td width="25%" align="right" class="label">${uiLabelMap.ProductShipmentType}</td>
@@ -126,15 +126,15 @@ function lookupShipments() {
<table cellspacing="0" class="basic-table">
<tr>
<td>
- <input type="text" size="25" name="minDate" value="${requestParameters.minDate?if_exists}">
- <a href="javascript:call_cal(document.lookupShipmentForm.minDate, '${fromDateStr}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <input type="text" size="25" name="minDate" value="${requestParameters.minDate?if_exists}" />
+ <a href="javascript:call_cal(document.lookupShipmentForm.minDate, '${fromDateStr}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
<span class="label">${uiLabelMap.CommonFrom}</span>
</td>
</tr>
<tr>
<td>
- <input type="text" size="25" name="maxDate" value="${requestParameters.maxDate?if_exists}">
- <a href="javascript:call_cal(document.lookupShipmentForm.maxDate, '${thruDateStr}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ <input type="text" size="25" name="maxDate" value="${requestParameters.maxDate?if_exists}" />
+ <a href="javascript:call_cal(document.lookupShipmentForm.maxDate, '${thruDateStr}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
<span class="label">${uiLabelMap.CommonThru}</span>
</td>
</tr>
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?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Wed Apr 7 21:50:56 2010
@@ -58,8 +58,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}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">${invoiceId}</a>
+ (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">PDF</a>)
</li>
</#list>
</ul>
@@ -70,7 +70,7 @@ under the License.
<!-- select order form -->
<form name="selectOrderForm" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
+ <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
<table cellspacing="0" class="basic-table">
<tr>
<td width="25%" align="right"><span class="label">${uiLabelMap.ProductOrderId}</span></td>
@@ -80,13 +80,13 @@ under the License.
/
<input type="text" name="shipGroupSeqId" size="6" maxlength="6" value="${shipGroupSeqId?default("00001")}"/>
</td>
- <td><span class="label">${uiLabelMap.ProductHideGrid}</span> <input type="checkbox" name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if>></td>
+ <td><span class="label">${uiLabelMap.ProductHideGrid}</span> <input type="checkbox" name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if> /></td>
<td> </td>
</tr>
<tr>
<td colspan="2"> </td>
<td colspan="2">
- <input type="image" src="<@o...@ofbizContentUrl>" onClick="javascript:document.selectOrderForm.submit();">
+ <input type="image" src="<@o...@ofbizContentUrl>" onClick="javascript:document.selectOrderForm.submit();" />
<a href="javascript:document.selectOrderForm.submit();" class="buttontext">${uiLabelMap.ProductPackOrder}</a>
<a href="javascript:document.selectOrderForm.action='<@o...@ofbizUrl>';document.selectOrderForm.submit();" class="buttontext">${uiLabelMap.ProductWeighPackageOnly}</a>
</td>
@@ -97,7 +97,7 @@ under the License.
<!-- select picklist bin form -->
<form name="selectPicklistBinForm" method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
+ <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
<table cellspacing="0" class="basic-table">
<tr>
<td width="25%" align='right'><span class="label">${uiLabelMap.FormFieldTitle_picklistBinId}</span></td>
@@ -105,13 +105,13 @@ under the License.
<td width="25%">
<input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId?if_exists}"/>
</td>
- <td><span class="label">${uiLabelMap.ProductHideGrid}</span> <input type="checkbox" name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if>></td>
+ <td><span class="label">${uiLabelMap.ProductHideGrid}</span> <input type="checkbox" name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if> /></td>
<td> </td>
</tr>
<tr>
<td colspan="2"> </td>
<td colspan="1">
- <input type="image" src="<@o...@ofbizContentUrl>" onClick="javascript:document.selectPicklistBinForm.submit();">
+ <input type="image" src="<@o...@ofbizContentUrl>" onClick="javascript:document.selectPicklistBinForm.submit();" />
<a href="javascript:document.selectPicklistBinForm.submit();" class="buttontext">${uiLabelMap.ProductPackOrder}</a>
<a href="javascript:document.selectPicklistBinForm.action='<@o...@ofbizUrl>';document.selectPicklistBinForm.submit();" class="buttontext">${uiLabelMap.ProductWeighPackageOnly}</a>
</td>
@@ -231,7 +231,7 @@ under the License.
<td>
<span class="label">${uiLabelMap.ProductCurrentPackageSequence}</span>
${packingSession.getCurrentPackageSeq()}
- <input type="button" value="${uiLabelMap.ProductNextPackage}" onclick="javascript:document.incPkgSeq.submit();">
+ <input type="button" value="${uiLabelMap.ProductNextPackage}" onclick="javascript:document.incPkgSeq.submit();" />
</td>
</tr>
</table>
@@ -243,10 +243,10 @@ under the License.
<#if showInput != "N" && hideGrid != "Y" && itemInfos?has_content>
<br />
<form name="multiPackForm" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
- <input type="hidden" name="orderId" value="${orderId?if_exists}">
- <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}">
- <input type="hidden" name="originFacilityId" value="${facilityId?if_exists}">
+ <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
+ <input type="hidden" name="orderId" value="${orderId?if_exists}" />
+ <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}" />
+ <input type="hidden" name="originFacilityId" value="${facilityId?if_exists}" />
<input type="hidden" name="hideGrid" value="${hideGrid}"/>
<table class="basic-table" cellspacing='0'>
@@ -302,10 +302,10 @@ under the License.
<td align="right">${packingSession.getPackedQuantity(orderId, orderItem.orderItemSeqId, shipGroupSeqId, itemInfo.productId)}</td>
<td> </td>
<td align="center">
- <input type="text" size="7" name="qty_${rowKey}" value="${inputQty}">
+ <input type="text" size="7" name="qty_${rowKey}" value="${inputQty}" />
</td>
<td align="center">
- <input type="text" size="7" name="wgt_${rowKey}" value="">
+ <input type="text" size="7" name="wgt_${rowKey}" value="" />
</td>
<td align="center">
<select name="pkg_${rowKey}">
@@ -325,7 +325,7 @@ under the License.
</select>
</td>
<td align="right">
- <input type="text" size="7" name="numPackages_${rowKey}" value="1">
+ <input type="text" size="7" name="numPackages_${rowKey}" value="1" />
</td>
<input type="hidden" name="prd_${rowKey}" value="${itemInfo.productId?if_exists}"/>
<input type="hidden" name="ite_${rowKey}" value="${orderItem.orderItemSeqId}"/>
@@ -336,7 +336,7 @@ under the License.
<tr><td colspan="10"> </td></tr>
<tr>
<td colspan="12" align="right">
- <input type="submit" value="${uiLabelMap.ProductPackItem}">
+ <input type="submit" value="${uiLabelMap.ProductPackItem}" />
<input type="button" value="${uiLabelMap.CommonClear} (${uiLabelMap.CommonAll})" onclick="javascript:document.clearPackForm.submit();"/>
</td>
@@ -365,7 +365,7 @@ under the License.
<br />
<#list packageSeqIds as packageSeqId>
${uiLabelMap.ProductPackage} ${packageSeqId}
- <input type="text" size="7" name="packageWeight_${packageSeqId}" value="${packingSession.getPackageWeight(packageSeqId?int)?if_exists}">
+ <input type="text" size="7" name="packageWeight_${packageSeqId}" value="${packingSession.getPackageWeight(packageSeqId?int)?if_exists}" />
<br />
</#list>
<#if orderItemShipGroup?has_content>
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl Wed Apr 7 21:50:56 2010
@@ -58,7 +58,7 @@ function setWeight(weight) {
<tr>
<td width="20%" align="right"><span class="label">${uiLabelMap.ProductCarrier}</span></td>
<td> </td>
- <td width="1%" nowrap>
+ <td width="1%" nowrap="nowrap">
<select name="carrierPartyId">
<#if shipmentRoute.carrierPartyId?has_content>
<option value="${shipmentRoute.carrierPartyId}">${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRoute.carrierPartyId}]</option>
@@ -79,7 +79,7 @@ function setWeight(weight) {
<tr>
<td width="20%" align="right"><span class="label">${uiLabelMap.ProductShipMethod}</span></td>
<td> </td>
- <td width="1%" nowrap>
+ <td width="1%" nowrap="nowrap">
<select name="shipmentMethodTypeId">
<#if shipmentMethodType?has_content>
<option value="${shipmentMethodType.shipmentMethodTypeId}">${shipmentMethodType.get("description",locale)}</option>
@@ -94,18 +94,18 @@ function setWeight(weight) {
</td>
<td> </td>
<td width="80%">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReWeighPackage}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReWeighPackage}</a>
</td>
</tr>
<tr>
<td width="20%" align="right"> </td>
<td> </td>
- <td width="1%" nowrap>
+ <td width="1%" nowrap="nowrap">
</td>
<td> </td>
<td width="80%">
- <input type="image" src="<@o...@ofbizContentUrl>" onClick="javascript:document.routeForm.submit();">
+ <input type="image" src="<@o...@ofbizContentUrl>" onClick="javascript:document.routeForm.submit();" />
</td>
</tr>
</table>
@@ -117,8 +117,8 @@ function setWeight(weight) {
<#-- display the links for label/packing slip -->
<#assign allDone = "yes">
<center>
- <a href="<@o...@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductShippingLabel}</a><br />
- <a href="<@o...@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPackingSlip}</a>
+ <a href="<@o...@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductShippingLabel}</a><br />
+ <a href="<@o...@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPackingSlip}</a>
</center>
</#if>
<#else>
@@ -132,7 +132,7 @@ function setWeight(weight) {
<td width="20%" align="right"><span class="label">${uiLabelMap.ProductPackage}</span> ${shipmentPackage.shipmentPackageSeqId} ${uiLabelMap.ProductWeight}</td>
<td> </td>
<td width="80%">
- <input type="text" name="weight">
+ <input type="text" name="weight" />
<select name="weightUomId">
<#if weightUom?has_content>
<option value="${weightUom.uomId}">${weightUom.get("description",locale)}</option>
@@ -176,22 +176,22 @@ function setWeight(weight) {
</#if>
<#else>
<form name="selectOrderForm" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
- <input type="hidden" name="originFacilityId" value="${facilityId?if_exists}">
- <input type="hidden" name="setPackedOnly" value="Y">
+ <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
+ <input type="hidden" name="originFacilityId" value="${facilityId?if_exists}" />
+ <input type="hidden" name="setPackedOnly" value="Y" />
<table border='0' cellpadding='2' cellspacing='0'>
<tr>
<td width="25%" align='right'><span class="label">${uiLabelMap.ProductOrderNumber}</span></td>
<td width="1"> </td>
<td width="25%">
- <input type="text" name="orderId" size="20" maxlength="20" value="${requestParameters.orderId?if_exists}">
+ <input type="text" name="orderId" size="20" maxlength="20" value="${requestParameters.orderId?if_exists}" />
</td>
<td> </td>
</tr>
<tr>
<td colspan="2"> </td>
<td colspan="2">
- <input type="image" src="<@o...@ofbizContentUrl>" onClick="javascript:document.selectOrderForm.submit();">
+ <input type="image" src="<@o...@ofbizContentUrl>" onClick="javascript:document.selectOrderForm.submit();" />
<a href="javascript:document.selectOrderForm.submit();" class="buttontext">${uiLabelMap.ProductShipOrder}</a>
</td>
</tr>
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl Wed Apr 7 21:50:56 2010
@@ -98,7 +98,7 @@ under the License.
<form action="<@o...@ofbizUrl>" method="post" name="selectAllForm">
<input type="hidden" name="facilityId" value="${facilityId}"/>
<input type="hidden" name="purchaseOrderId" value="${orderId}"/>
- <input type="hidden" name="shipmentId" value="${shipmentId}">
+ <input type="hidden" name="shipmentId" value="${shipmentId}" />
<input type="hidden" name="_useRowSubmit" value="Y"/>
<table cellspacing="0" class="basic-table">
<tr class="header-row">
@@ -116,7 +116,7 @@ under the License.
<td>${uiLabelMap.CommonReceive}</td>
<td>${uiLabelMap.ProductInventoryItemType}</td>
<td colspan="2" align="right">
- <div>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'orderItemData_tableRow_', 'selectAllForm');"></div>
+ <div>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'orderItemData_tableRow_', 'selectAllForm');" /></div>
</td>
</#if>
</tr>
@@ -193,10 +193,10 @@ under the License.
</select>
</td>
<td align="right">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClear}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClear}</a>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'orderItemData_tableRow_${rowCount}');">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'orderItemData_tableRow_${rowCount}');" />
</td>
<#assign rowCount = rowCount + 1>
</#if>
@@ -207,7 +207,7 @@ under the License.
<#if itemsAvailableToReceive>
<tr>
<td colspan="11" align="right">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClearAll}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClearAll}</a>
</td>
<td align="right">
<a class="smallSubmit" href="javascript:populateQuantities(${rowCount - 1});document.selectAllForm.submit();">${uiLabelMap.ProductReceiveItem}</a>
@@ -215,12 +215,12 @@ under the License.
</tr>
<tr>
<td colspan="12" align="right">
- <a class="smallSubmit" href="<@o...@ofbizUrl>">${uiLabelMap.OrderForceCompletePurchaseOrder}</a>
+ <a class="smallSubmit" href="<@o...@ofbizUrl>">${uiLabelMap.OrderForceCompletePurchaseOrder}</a>
</td>
</tr>
</#if>
</table>
- <input type="hidden" name="_rowCount" value="${rowCount}">
+ <input type="hidden" name="_rowCount" value="${rowCount}" />
</form>
<script language="JavaScript" type="text/javascript">selectAll('selectAllForm');</script>
</#if>
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl?rev=931700&r1=931699&r2=931700&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl Wed Apr 7 21:50:56 2010
@@ -39,8 +39,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}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">${invoiceId}</a>
+ (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">PDF</a>)
</li>
</#list>
</ul>