OFBiz › OFBiz - Commits

svn commit: r946315 - in /ofbiz/branches/release10.04: ./ applications/order/webapp/ordermgr/entry/cart/ applications/order/webapp/ordermgr/entry/catalog/ applications/order/webapp/ordermgr/order/ applications/order/webapp/ordermgr/return/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

erwan

svn commit: r946315 - in /ofbiz/branches/release10.04: ./ applications/order/webapp/ordermgr/entry/cart/ applications/order/webapp/ordermgr/entry/catalog/ applications/order/webapp/ordermgr/order/ applications/order/webapp/ordermgr/return/

Author: erwan
Date: Wed May 19 18:02:21 2010
New Revision: 946315

URL: http://svn.apache.org/viewvc?rev=946315&view=rev
Log:
Applied fix from trunk for revision: 946313
XHTML validation errors round 2++ (order) OFBIZ-3751 (https://issues.apache.org/jira/browse/OFBIZ-3751)

Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/return/returnItemInc.ftl
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/return/returnItems.ftl

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 18:02:21 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313

Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=946315&r1=946314&r2=946315&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Wed May 19 18:02:21 2010
@@ -256,7 +256,7 @@ under the License.
<select name="option^GIFT_WRAP_${cartLineIndex}" onchange="javascript:document.cartform.submit()">
<option value="NO^">${uiLabelMap.OrderNoGiftWrap}</option>
<#list giftWrapOption as option>
- <option value="${option.productFeatureId}" <#if ((selectedOption.productFeatureId)?exists && selectedOption.productFeatureId == option.productFeatureId)>SELECTED</#if>>${option.description} : <@ofbizCurrency amount=option.amount?default(0) isoCode=currencyUomId/></option>
+ <option value="${option.productFeatureId}" <#if ((selectedOption.productFeatureId)?exists && selectedOption.productFeatureId == option.productFeatureId)>selected="selected"</#if>>${option.description} : <@ofbizCurrency amount=option.amount?default(0) isoCode=currencyUomId/></option>
</#list>
</select>
<#elseif showNoGiftWrapOptions>

Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=946315&r1=946314&r2=946315&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Wed May 19 18:02:21 2010
@@ -72,7 +72,7 @@ under the License.
<div>
<#if categoryImageUrl?string?has_content>
<#assign height=100/>
- <img src='<@ofbizContentUrl>${categoryImageUrl}</@ofbizContentUrl>' vspace='5' hspace='5' border='1' height='${height}' align='left'/>
+ <img src='<@ofbizContentUrl>${categoryImageUrl}</@ofbizContentUrl>' vspace='5' hspace='5' border='1' height='${height}' align='left' alt="" />
</#if>
<#if longDescription?has_content>
${longDescription}

Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=946315&r1=946314&r2=946315&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Wed May 19 18:02:21 2010
@@ -211,7 +211,7 @@ function getConfigDetails(event) {
<#assign productLargeImageUrl = firstLargeImage>
</#if>
<#if productLargeImageUrl?string?has_content>
- <a href="javascript:popupDetail();"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' border='0' width='200' align='left' /></a>
+ <a href="javascript:popupDetail();"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' border='0' width='200' align='left' alt="" /></a>
</#if>
</td>
<td align="right" valign="top">
@@ -414,7 +414,7 @@ function getConfigDetails(event) {
<#assign imageUrl = "/images/defaultImage.jpg">
</#if>
<td align="center" valign="bottom">
- <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60" /></a>
+ <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60" alt="" /></a>
<br />
<a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="buttontext">${key}</a>
</td>
@@ -475,7 +475,7 @@ function getConfigDetails(event) {
</#if>
<#assign image = question.content.get("IMAGE_URL")?if_exists>
<#if image?has_content>
- <img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>' vspace='5' hspace='5' border='0' width='200' align='left' />
+ <img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>' vspace='5' hspace='5' border='0' width='200' align='left' alt="" />
</#if>
<#else>
<div><a href='#${question.getConfigItem().getString("configItemId")}' class="buttontext">Details</a></div>

Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl?rev=946315&r1=946314&r2=946315&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl Wed May 19 18:02:21 2010
@@ -264,7 +264,7 @@ ${virtualJavaScript?if_exists}
</#if>
<#if productLargeImageUrl?string?has_content>
<input type="hidden" name="detailImage${inlineCounter}" value="${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}"/>
- <a href="javascript:popupDetailInline('${inlineCounter}');"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage${inlineCounter}' vspace='5' hspace='5' border='0' width='100' align='left' /></a>
+ <a href="javascript:popupDetailInline('${inlineCounter}');"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage${inlineCounter}' vspace='5' hspace='5' border='0' width='100' align='left' alt="" /></a>
</#if>
</td>
<td align="right" valign="top" width="100%">
@@ -373,7 +373,7 @@ ${virtualJavaScript?if_exists}
<#assign imageUrl = "/images/defaultImage.jpg">
</#if>
<td align="center" valign="bottom">
- <a href="javascript:getListInline('${inlineCounter}', 'FT${inlineCounter}${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60" /></a>
+ <a href="javascript:getListInline('${inlineCounter}', 'FT${inlineCounter}${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60" alt="" /></a>
<br />
<a href="javascript:getListInline('${inlineCounter}', 'FT${inlineCounter}${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a>
</td>

Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=946315&r1=946314&r2=946315&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Wed May 19 18:02:21 2010
@@ -291,7 +291,7 @@ ${virtualJavaScript?if_exists}
<#assign productLargeImageUrl = firstLargeImage>
</#if>
<#if productLargeImageUrl?string?has_content>
- <a href="javascript:popupDetail();"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" border="0" width="200" /></a>
+ <a href="javascript:popupDetail();"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" border="0" width="200" alt="" /></a>
</#if>
</td>
<td align="right" valign="top">
@@ -578,7 +578,7 @@ ${virtualJavaScript?if_exists}
<#assign imageUrl = "/images/defaultImage.jpg">
</#if>
<td align="center" valign="bottom">
- <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60" /></a>
+ <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60" alt="" /></a>
<br />
<a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a>
</td>

Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?rev=946315&r1=946314&r2=946315&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Wed May 19 18:02:21 2010
@@ -45,7 +45,7 @@ under the License.
<td valign="top" width="0" colspan='2'>
<div>
<#if productCategory.categoryImageUrl?exists>
- <img src="<@ofbizContentUrl>${productCategory.categoryImageUrl}</@ofbizContentUrl>" vspace="5" hspace="5" border="1" height='100' />
+ <img src="<@ofbizContentUrl>${productCategory.categoryImageUrl}</@ofbizContentUrl>" vspace="5" hspace="5" border="1" height='100' alt="" />
</#if>
${productCategory.longDescription?if_exists}
</div>

Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=946315&r1=946314&r2=946315&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Wed May 19 18:02:21 2010
@@ -68,73 +68,73 @@ under the License.
<span class="label"> <#if orderHeader.orderTypeId == "PURCHASE_ORDER">${uiLabelMap.ProductDestinationFacility}</#if></span>
<#if ownedFacilities?has_content>
<#if !allShipments?has_content>
- <form action="/facility/control/quickShipPurchaseOrder?externalLoginKey=${externalLoginKey}" method="post">
- <input type="hidden" name="initialSelected" value="Y"/>
- <input type="hidden" name="orderId" value="${orderId}"/>
- <#-- destination form (/facility/control/ReceiveInventory) wants purchaseOrderId instead of orderId, so we set it here as a workaround -->
- <input type="hidden" name="purchaseOrderId" value="${orderId}"/>
<li>
- <select name="facilityId">
- <#list ownedFacilities as facility>
- <option value="${facility.facilityId}">${facility.facilityName}</option>
- </#list>
- </select>
- <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderQuickReceivePurchaseOrder}"/>
+ <form action="/facility/control/quickShipPurchaseOrder?externalLoginKey=${externalLoginKey}" method="post">
+ <input type="hidden" name="initialSelected" value="Y"/>
+ <input type="hidden" name="orderId" value="${orderId}"/>
+ <#-- destination form (/facility/control/ReceiveInventory) wants purchaseOrderId instead of orderId, so we set it here as a workaround -->
+ <input type="hidden" name="purchaseOrderId" value="${orderId}"/>
+ <select name="facilityId">
+ <#list ownedFacilities as facility>
+ <option value="${facility.facilityId}">${facility.facilityName}</option>
+ </#list>
+ </select>
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderQuickReceivePurchaseOrder}"/>
+ </form>
</li>
- </form>
- <form name="receivePurchaseOrderForm" action="/facility/control/quickShipPurchaseOrder?externalLoginKey=${externalLoginKey}" method="post">
- <input type="hidden" name="initialSelected" value="Y"/>
- <input type="hidden" name="orderId" value="${orderId}"/>
- <input type="hidden" name="purchaseOrderId" value="${orderId}"/>
- <input type="hidden" name="partialReceive" value="Y"/>
<li>
- <select name="facilityId">
- <#list ownedFacilities as facility>
- <option value="${facility.facilityId}">${facility.facilityName}</option>
- </#list>
- </select>
- <a href="javascript:document.receivePurchaseOrderForm.submit()" class="buttontext">${uiLabelMap.CommonReceive}</a>
+ <form name="receivePurchaseOrderForm" action="/facility/control/quickShipPurchaseOrder?externalLoginKey=${externalLoginKey}" method="post">
+ <input type="hidden" name="initialSelected" value="Y"/>
+ <input type="hidden" name="orderId" value="${orderId}"/>
+ <input type="hidden" name="purchaseOrderId" value="${orderId}"/>
+ <input type="hidden" name="partialReceive" value="Y"/>
+ <select name="facilityId">
+ <#list ownedFacilities as facility>
+ <option value="${facility.facilityId}">${facility.facilityName}</option>
+ </#list>
+ </select>
+ </form>
+ <a href="javascript:document.receivePurchaseOrderForm.submit()" class="buttontext">${uiLabelMap.CommonReceive}</a>
</li>
- </form>
<#else>
- <form name="receiveInventoryForm" action="/facility/control/ReceiveInventory" method="post">
- <input type="hidden" name="initialSelected" value="Y"/>
- <input type="hidden" name="purchaseOrderId" value="${orderId?if_exists}"/>
<li>
- <select name="facilityId">
- <#list ownedFacilities as facility>
- <option value="${facility.facilityId}">${facility.facilityName}</option>
- </#list>
- </select>
+ <form name="receiveInventoryForm" action="/facility/control/ReceiveInventory" method="post">
+ <input type="hidden" name="initialSelected" value="Y"/>
+ <input type="hidden" name="purchaseOrderId" value="${orderId?if_exists}"/>
+ <select name="facilityId">
+ <#list ownedFacilities as facility>
+ <option value="${facility.facilityId}">${facility.facilityName}</option>
+ </#list>
+ </select>
+ </form>
<a href="javascript:document.receiveInventoryForm.submit()" class="buttontext">${uiLabelMap.OrderQuickReceivePurchaseOrder}</a>
</li>
- </form>
- <form name="partialReceiveInventoryForm" action="/facility/control/ReceiveInventory" method="post">
- <input type="hidden" name="initialSelected" value="Y"/>
- <input type="hidden" name="purchaseOrderId" value="${orderId?if_exists}"/>
- <input type="hidden" name="partialReceive" value="Y"/>
<li>
- <select name="facilityId">
- <#list ownedFacilities as facility>
- <option value="${facility.facilityId}">${facility.facilityName}</option>
- </#list>
- </select>
+ <form name="partialReceiveInventoryForm" action="/facility/control/ReceiveInventory" method="post">
+ <input type="hidden" name="initialSelected" value="Y"/>
+ <input type="hidden" name="purchaseOrderId" value="${orderId?if_exists}"/>
+ <input type="hidden" name="partialReceive" value="Y"/>
+ <select name="facilityId">
+ <#list ownedFacilities as facility>
+ <option value="${facility.facilityId}">${facility.facilityName}</option>
+ </#list>
+ </select>
+ </form>
<a href="javascript:document.partialReceiveInventoryForm.submit()" class="buttontext">${uiLabelMap.CommonReceive}</a>
</li>
- </form>
</#if>
<#if orderHeader.statusId != "ORDER_COMPLETED">
- <form action="<@ofbizUrl>completePurchaseOrder?externalLoginKey=${externalLoginKey}</@ofbizUrl>" method="post">
- <input type="hidden" name="orderId" value="${orderId}"/>
<li>
+ <form action="<@ofbizUrl>completePurchaseOrder?externalLoginKey=${externalLoginKey}</@ofbizUrl>" method="post">
+ <input type="hidden" name="orderId" value="${orderId}"/>
<select name="facilityId">
<#list ownedFacilities as facility>
<option value="${facility.facilityId}">${facility.facilityName}</option>
</#list>
</select>
<input type="submit" class="smallSubmit" value="${uiLabelMap.OrderForceCompletePurchaseOrder}"/>
+ </form>
</li>
- </form>
</#if>
</#if>
</#if>
@@ -145,20 +145,23 @@ under the License.
</#if>
<#if security.hasEntityPermission("ORDERMGR", "_RETURN", session) && orderHeader.statusId == "ORDER_COMPLETED">
<#if returnableItems?has_content>
+ <li>
<form name="quickRefundOrder" method="post" action="<@ofbizUrl>quickRefundOrder</@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId}"/>
<input type="hidden" name="receiveReturn" value="true"/>
<input type="hidden" name="returnHeaderTypeId" value="${returnHeaderTypeId}"/>
</form>
- <li><a href="javascript:document.quickRefundOrder.submit()" class="buttontext">${uiLabelMap.OrderQuickRefundEntireOrder}</a></li>
-
+ <a href="javascript:document.quickRefundOrder.submit()" class="buttontext">${uiLabelMap.OrderQuickRefundEntireOrder}</a>
+ </li>
+ <li>
<form name="quickreturn" method="post" action="<@ofbizUrl>quickreturn</@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId}"/>
<input type="hidden" name="party_id" value="${partyId?if_exists}"/>
<input type="hidden" name="returnHeaderTypeId" value="${returnHeaderTypeId}"/>
<input type="hidden" name="needsInventoryReceive" value="${needsInventoryReceive?default("N")}"/>
</form>
- <li><a href="javascript:document.quickreturn.submit()" class="buttontext">${uiLabelMap.OrderCreateReturn}</a></li>
+ <a href="javascript:document.quickreturn.submit()" class="buttontext">${uiLabelMap.OrderCreateReturn}</a>
+ </li>
</#if>
</#if>

Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/return/returnItemInc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/return/returnItemInc.ftl?rev=946315&r1=946314&r2=946315&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/return/returnItemInc.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/return/returnItemInc.ftl Wed May 19 18:02:21 2010
@@ -18,7 +18,7 @@ under the License.
-->
<table cellspacing="0" class="basic-table">
<tr>
- <td colspan="7"><h3>${uiLabelMap.OrderReturnFromOrder} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</h3></td>
+ <td colspan="7"><h3>${uiLabelMap.OrderReturnFromOrder} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</a></h3></td>
<td colspan="2" align="right">
<span>${uiLabelMap.CommonSelectAll}</span> 
<input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, '${selectAllFormName}');highlightAllRows(this, 'returnItemId_tableRow_', 'selectAllForm');"/>
@@ -65,10 +65,10 @@ under the License.
<#assign adjustmentType = orderItem.getRelatedOne("OrderAdjustmentType")/>
<#assign description = orderItem.description?default(adjustmentType.get("description",locale))/>

- <input type="hidden" name="returnAdjustmentTypeId_o_${rowCount}" value="${returnAdjustmentType}"/>
- <input type="hidden" name="orderAdjustmentId_o_${rowCount}" value="${orderItem.orderAdjustmentId}"/>
<tr id="returnItemId_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td colspan="4">
+ <input type="hidden" name="returnAdjustmentTypeId_o_${rowCount}" value="${returnAdjustmentType}"/>
+ <input type="hidden" name="orderAdjustmentId_o_${rowCount}" value="${orderItem.orderAdjustmentId}"/>
${description?default("N/A")}
</td>
<td>
@@ -91,11 +91,6 @@ under the License.
<#else>
<#-- this is an order item -->
<#assign returnItemType = (returnItemTypeMap.get(returnableItems.get(orderItem).get("itemTypeKey")))?if_exists/>
- <input type="hidden" name="returnItemTypeId_o_${rowCount}" value="${returnItemType}"/>
- <input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/>
- <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/>
- <input type="hidden" name="description_o_${rowCount}" value="${orderItem.itemDescription?if_exists}"/>
-
<#-- need some order item information -->
<#assign orderHeader = orderItem.getRelatedOne("OrderHeader")>
<#assign itemCount = orderItem.quantity>
@@ -104,10 +99,15 @@ under the License.

<tr id="returnItemId_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td>
+ <input type="hidden" name="returnItemTypeId_o_${rowCount}" value="${returnItemType}"/>
+ <input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/>
+ <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/>
+ <input type="hidden" name="description_o_${rowCount}" value="${orderItem.itemDescription?if_exists}"/>
+
<div>
<#if orderItem.productId?exists>
${orderItem.productId} 
- <input type="hidden" name="productId_o_${rowCount}" value="${orderItem.productId}">
+ <input type="hidden" name="productId_o_${rowCount}" value="${orderItem.productId}"/>
</#if>
${orderItem.itemDescription?if_exists}
</div>
@@ -158,7 +158,7 @@ under the License.
</#list>
<tr><td colspan="9"><hr/></td></tr>
<tr>
- <td colspan="9"><h3>${uiLabelMap.OrderReturnAdjustments} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</h3></td>
+ <td colspan="9"><h3>${uiLabelMap.OrderReturnAdjustments} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</a></h3></td>
</tr>
<tr><td colspan="9"><br /></td></tr>
<#if orderHeaderAdjustments?has_content>
@@ -173,12 +173,12 @@ under the License.
<#assign adjustmentType = adj.getRelatedOne("OrderAdjustmentType")/>
<#assign description = adj.description?default(adjustmentType.get("description",locale))/>

+ <tr>
+ <td>
<input type="hidden" name="returnAdjustmentTypeId_o_${rowCount}" value="${returnAdjustmentType}"/>
<input type="hidden" name="orderAdjustmentId_o_${rowCount}" value="${adj.orderAdjustmentId}"/>
<input type="hidden" name="returnItemSeqId_o_${rowCount}" value="_NA_"/>
<input type="hidden" name="description_o_${rowCount}" value="${description}"/>
- <tr>
- <td>
<div>
${description?default("N/A")}
</div>
@@ -204,12 +204,16 @@ under the License.
</#if>

<#assign manualAdjRowNum = rowCount/>
+ <tr>
+ <td colspan="9">
<input type="hidden" name="returnItemTypeId_o_${rowCount}" value="RET_MAN_ADJ"/>
<input type="hidden" name="returnItemSeqId_o_${rowCount}" value="_NA_"/>
- <tr><td colspan="9"><hr/></td></tr>
+ <hr/>
+ </td>
+ </tr>
<tr>
<td colspan="9">
- <h3>${uiLabelMap.OrderReturnManualAdjustment} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</h3></td></div>
+ <h3>${uiLabelMap.OrderReturnManualAdjustment} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</a></h3>
</td>
</tr>
<tr>
@@ -233,9 +237,9 @@ under the License.
<#assign rowCount = rowCount + 1>


- <input type="hidden" name="_rowCount" value="${rowCount}"/>
<tr>
<td colspan="9" align="right">
+ <input type="hidden" name="_rowCount" value="${rowCount}"/>
<a href="javascript:document.${selectAllFormName}.submit()" class="buttontext">${uiLabelMap.OrderReturnSelectedItems}</a>
</td>
</tr>

Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/return/returnItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=946315&r1=946314&r2=946315&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/return/returnItems.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/return/returnItems.ftl Wed May 19 18:02:21 2010
@@ -95,6 +95,8 @@ under the License.
<div class="screenlet-body">

<#if !requestParameters.orderId?exists>
+ <form method="post" action="<@ofbizUrl>updateReturnItems</@ofbizUrl>">
+ <input type="hidden" name="_useRowSubmit" value="Y" />
<table cellspacing="0" class="basic-table">
<#if "CUSTOMER_RETURN" == returnHeader.returnHeaderTypeId>
<#assign readOnly = (returnHeader.statusId != "RETURN_REQUESTED")>
@@ -141,8 +143,6 @@ under the License.
<#assign returnTotal = 0.0>
<#assign rowCount = 0>
<#assign rowCountForAdjRemove = 0>
- <form method="post" action="<@ofbizUrl>updateReturnItems</@ofbizUrl>">
- <input type="hidden" name="_useRowSubmit" value="Y" />
<#if returnItems?has_content>
<#assign alt_row = false>
<#list returnItems as item>
@@ -159,12 +159,13 @@ under the License.
<#assign returnItemSubTotal = null > <#-- otherwise the last item's might carry over -->
</#if>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
- <td><a href="<@ofbizUrl>orderview?orderId=${item.orderId}</@ofbizUrl>" class="buttontext">${item.orderId}</a> - ${item.orderItemSeqId?default("N/A")}</td>
+ <td><a href="<@ofbizUrl>orderview?orderId=${item.orderId}</@ofbizUrl>" class="buttontext">${item.orderId}</a> - ${item.orderItemSeqId?default("N/A")}
<input name="orderId_o_${rowCount}" value="${item.orderId}" type="hidden" />
<input name="returnId_o_${rowCount}" value="${item.returnId}" type="hidden" />
<input name="returnItemTypeId_o_${rowCount}" value="${item.returnItemTypeId}" type="hidden" />
<input name="returnItemSeqId_o_${rowCount}" value="${item.returnItemSeqId}" type="hidden" />
<input type="hidden" name="_rowSubmit_o_${rowCount}" value="Y" />
+ </td>
<td><div>
<#if item.get("productId")?exists>
<a href="/catalog/control/EditProductInventoryItems?productId=${item.productId}" class="buttontext">${item.productId}</a>
@@ -270,7 +271,7 @@ under the License.
</td>
</#if>
<#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED">
- <td align='right'><a href='javascript:document.removeReturnItem_${item_index}.submit()' class='buttontext'>${uiLabelMap.CommonRemove}</a>
+ <td align='right'><a href='javascript:document.removeReturnItem_${item_index}.submit()' class='buttontext'>${uiLabelMap.CommonRemove}</a></td>
<#else>
<td> </td>
</#if>
@@ -307,15 +308,15 @@ under the License.
</tr>
<#if (!readOnly) && (rowCount > 0)>
<tr>
+ <td colspan="6" align="right">
<input name="returnId" value="${returnHeader.returnId}" type="hidden" />
<input name="_rowCount" value="${rowCount}" type="hidden" />
- <td colspan="6" align="right"><input type="submit" class="bottontext" value="${uiLabelMap.CommonUpdate}" /></td>
+ <input type="submit" class="bottontext" value="${uiLabelMap.CommonUpdate}" /></td>
</tr>
</#if>
<tr><td colspan="10"><hr/></td></tr>
- </form>
-
</table>
+ </form>
<#if returnItems?has_content>
<#list returnItems as item>
<form name="removeReturnItem_${item_index}" method="post" action="<@ofbizUrl>removeReturnItem</@ofbizUrl>">