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/18 00:26:45 UTC
svn commit: r935270 - in /ofbiz/trunk/applications/order/webapp/ordermgr:
entry/ entry/cart/ entry/catalog/ order/ quote/ reports/ return/
Author: buscob
Date: Sat Apr 17 22:26:44 2010
New Revision: 935270
URL: http://svn.apache.org/viewvc?rev=935270&view=rev
Log:
A slightly changed (tabs replaced with spaces) patch from Blas Rodriguez Somoza
OFBIZ-3685 - XHTML validation errors round 2 (order)
https://issues.apache.org/jira/browse/OFBIZ-3685
XHTML validation errors
* Unclosed tags
* attributes without values (checked, selected, disabled, etc)
* attribute values without "
* Uppercase tags or attributes.
* Unencoded ampersands in urls.
Other errors:
checkinits.ftl
Line 104, 171: duplicated id userLoginId
appendorderitem.ftl
Line 65: invalid a closing
editorderitems.ftl
Line 214: needed td close;
orderagreements.ftl
Line 35,55: hidden input must be inside td.
Line 37,67: attribute valign not valid for tr
orderinfo.ftl
Lines 22-88: form must be inside li.
Lines 232-248: form must be inside td.
orderpaymentinfo.ftl
LInes 122,123,124,155: wrong syntax -> class"label" should be -> class="label"
ordershippinginfo.ftl
Line 62: form must be inside li.
Line 296,297: label for attribute does not match input id
Lines 308, 310: label for attribute does not match select id
Line 318: duplicated unneeded id.
Line 319. 321: label for attribute does not match select id
Lines 499, 519: form must be inside td
Line 527: duplicated span open
Lines 521,546: form must be inside td
Line 552: duplicated span open
quoteInfo.ftl
Line 40: invalid /div
quoteRoles.ftl
Lines 24-44: avoid empty table
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/associatedProducts.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl Sat Apr 17 22:26:44 2010
@@ -57,7 +57,7 @@ function makeExpDate() {
<#else>
<#assign accountLimit = 0.00 />
</#if>
- <option value="${billingAccount.billingAccountId}" <#if billingAccount.billingAccountId == selectedBillingAccountId?default("")>selected</#if>>${billingAccount.description?default("")} [${billingAccount.billingAccountId}] Available: <@ofbizCurrency amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit: <@ofbizCurrency amount=accountLimit isoCode=billingAccount.accountCurrencyUomId/></option>
+ <option value="${billingAccount.billingAccountId}" <#if billingAccount.billingAccountId == selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")} [${billingAccount.billingAccountId}] Available: <@ofbizCurrency amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit: <@ofbizCurrency amount=accountLimit isoCode=billingAccount.accountCurrencyUomId/></option>
</#list>
</select>
</td>
@@ -174,7 +174,7 @@ function makeExpDate() {
<#if cart.getShippingContactMechId()?exists>
<tr>
<td width="26%" align="right"= valign="top">
- <input type="checkbox" name="useShipAddr" value="Y" onClick="javascript:shipBillAddr();" <#if requestParameters.useShipAddr?exists>checked="checked"</#if>/>
+ <input type="checkbox" name="useShipAddr" value="Y" onclick="javascript:shipBillAddr();" <#if requestParameters.useShipAddr?exists>checked="checked"</#if>/>
</td>
<td colspan="2" valign="center">
<div>${uiLabelMap.FacilityBillingAddressSameShipping}</div>
@@ -508,23 +508,23 @@ function makeExpDate() {
<table width="100%" border="0" cellpadding="1" cellspacing="0">
<#if !requestParameters.createNew?exists>
<tr>
- <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/></td>
+ <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td>
<td width='50%' nowrap="nowrap"><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
</tr>
<tr><td colspan="2"><hr /></td></tr>
<tr>
- <td width="1%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_COD">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/></td>
+ <td width="1%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_COD">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td>
<td width="50%" nowrap="nowrap"><div>${uiLabelMap.OrderCOD}</div></td>
</tr>
<tr><td colspan="2"><hr /></td></tr>
</#if>
<tr>
- <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="CC" onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/>
+ <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="CC" onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/>
<td width='50%' nowrap="nowrap"><div>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
</tr>
<tr><td colspan="2"><hr /></td></tr>
<tr>
- <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EFT" onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/>
+ <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EFT" onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/>
<td width='50%' nowrap="nowrap"><div>${uiLabelMap.AccountingAHCElectronicCheck}</div></td>
</tr>
</table>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/associatedProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/associatedProducts.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/associatedProducts.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/associatedProducts.ftl Sat Apr 17 22:26:44 2010
@@ -38,7 +38,7 @@ under the License.
</td>
</tr>
<#if assocProduct_has_next>
- <tr><td><hr></td></tr>
+ <tr><td><hr/></td></tr>
</#if>
</#list>
</table>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Sat Apr 17 22:26:44 2010
@@ -175,7 +175,7 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" name="bulkworkaddform" style="margin: 0;">
<div>
${uiLabelMap.OrderOrderItemType}: <select name="add_item_type"><option value="BULK_ORDER_ITEM">${uiLabelMap.ProductBulkItem}</option><option value="WORK_ORDER_ITEM">${uiLabelMap.ProductWorkItem}</option></select>
- <br>${uiLabelMap.ProductProductCategory}:
+ <br/>${uiLabelMap.ProductProductCategory}:
<@htmlTemplate.lookupField formName="bulkworkaddform" value="${requestParameters.add_category_id?if_exists}" name="add_category_id" id="add_category_id" fieldFormName="LookupProductCategory"/>
</div>
<div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Sat Apr 17 22:26:44 2010
@@ -70,7 +70,7 @@ under the License.
<#list shoppingCart.items() as cartLine>
<#assign cartLineIndex = shoppingCart.getItemIndex(cartLine)>
<#assign lineOptionalFeatures = cartLine.getOptionalProductFeatures()>
- <tr><td colspan="8"><hr></td></tr>
+ <tr><td colspan="8"><hr/></td></tr>
<tr valign="top">
<td> </td>
<td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl Sat Apr 17 22:26:44 2010
@@ -80,7 +80,7 @@ under the License.
<select name="SEARCH_SUPPLIER_ID">
<option value="">- ${uiLabelMap.CommonSelectAny} -</option>
<#list supplerPartyRoleAndPartyDetails as supplerPartyRoleAndPartyDetail>
- <option value="${supplerPartyRoleAndPartyDetail.partyId}"<#if (sessionAttributes.orderPartyId?exists & sessionAttributes.orderPartyId = supplerPartyRoleAndPartyDetail.partyId)> selected</#if>>${supplerPartyRoleAndPartyDetail.groupName?if_exists} ${supplerPartyRoleAndPartyDetail.firstName?if_exists} ${supplerPartyRoleAndPartyDetail.lastName?if_exists} [${supplerPartyRoleAndPartyDetail.partyId}]</option>
+ <option value="${supplerPartyRoleAndPartyDetail.partyId}"<#if (sessionAttributes.orderPartyId?exists & sessionAttributes.orderPartyId = supplerPartyRoleAndPartyDetail.partyId)> selected="selected"</#if>>${supplerPartyRoleAndPartyDetail.groupName?if_exists} ${supplerPartyRoleAndPartyDetail.firstName?if_exists} ${supplerPartyRoleAndPartyDetail.lastName?if_exists} [${supplerPartyRoleAndPartyDetail.partyId}]</option>
</#list>
</select>
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Sat Apr 17 22:26:44 2010
@@ -200,7 +200,7 @@ function getConfigDetails(event) {
</tr>
</#if>
- <tr><td colspan="2"><hr class='sepbar'></td></tr>
+ <tr><td colspan="2"><hr class='sepbar'/></td></tr>
<#-- Product image/name/price -->
<tr>
@@ -211,7 +211,7 @@ function getConfigDetails(event) {
<#assign productLargeImageUrl = firstLargeImage>
</#if>
<#if productLargeImageUrl?string?has_content>
- <a href="javascript:popupDetail();"><img src='<@o...@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' border='0' width='200' align='left'></a>
+ <a href="javascript:popupDetail();"><img src='<@o...@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' border='0' width='200' align='left' /></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="<@o...@ofbizContentUrl>" border="0" width="60" height="60"></a>
+ <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@o...@ofbizContentUrl>" border="0" width="60" height="60" /></a>
<br />
<a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="buttontext">${key}</a>
</td>
@@ -430,7 +430,7 @@ function getConfigDetails(event) {
</td>
</tr>
- <tr><td colspan="2"><hr class='sepbar'></td></tr>
+ <tr><td colspan="2"><hr class='sepbar'/></td></tr>
<#-- Long description of product -->
<tr>
@@ -439,7 +439,7 @@ function getConfigDetails(event) {
</td>
</tr>
- <tr><td colspan="2"><hr class='sepbar'></td></tr>
+ <tr><td colspan="2"><hr class='sepbar'/></td></tr>
<#-- Any attributes/etc may go here -->
<#-- Product Configurator -->
@@ -475,7 +475,7 @@ function getConfigDetails(event) {
</#if>
<#assign image = question.content.get("IMAGE_URL")?if_exists>
<#if image?has_content>
- <img src='<@o...@ofbizContentUrl>' vspace='5' hspace='5' border='0' width='200' align='left'>
+ <img src='<@o...@ofbizContentUrl>' vspace='5' hspace='5' border='0' width='200' align='left' />
</#if>
<#else>
<div><a href='#${question.getConfigItem().getString("configItemId")}' class="buttontext">Details</a></div>
@@ -567,7 +567,7 @@ function getConfigDetails(event) {
<#assign optionComment = option.getComments()>
<#assign optionCounter = optionCounter + 1>
</#if>
- <option value='${optionCounter}' <#if option.isSelected()>selected</#if>>
+ <option value='${optionCounter}' <#if option.isSelected()>selected="selected"</#if>>
${option.description}
<#if (shownPrice > 0)>+<@ofbizCurrency amount=shownPrice isoCode=price.currencyUsed/> </#if>
<#if (shownPrice < 0)>-<@ofbizCurrency amount=(-1*shownPrice) isoCode=price.currencyUsed/> </#if>
@@ -622,7 +622,7 @@ function getConfigDetails(event) {
</form>
</td>
</tr>
- <tr><td colspan="2"><hr class='sepbar'></td></tr>
+ <tr><td colspan="2"><hr class='sepbar'/></td></tr>
<#-- Upgrades/Up-Sell/Cross-Sell -->
<#macro associated assocProducts beforeName showName afterName formNamePrefix targetRequestName>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl Sat Apr 17 22:26:44 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='<@o...@ofbizContentUrl>' name='mainImage${inlineCounter}' vspace='5' hspace='5' border='0' width='100' align='left'></a>
+ <a href="javascript:popupDetailInline('${inlineCounter}');"><img src='<@o...@ofbizContentUrl>' name='mainImage${inlineCounter}' vspace='5' hspace='5' border='0' width='100' align='left' /></a>
</#if>
</td>
<td align="right" valign="top" width="100%">
@@ -275,7 +275,7 @@ ${virtualJavaScript?if_exists}
<#list featureLists as featureList>
<#list featureList as feature>
<#if feature_index == 0>
- <div>${feature.description}: <select id="FT${inlineCounter}${feature.productFeatureTypeId}" name="FT${inlineCounter}${feature.productFeatureTypeId}" onChange="javascript:checkRadioButtoninline${inlineCounter}('${inlineCounter}', '${product.productId}');">
+ <div>${feature.description}: <select id="FT${inlineCounter}${feature.productFeatureTypeId}" name="FT${inlineCounter}${feature.productFeatureTypeId}" onchange="javascript:checkRadioButtoninline${inlineCounter}('${inlineCounter}', '${product.productId}');">
<option value="select" selected="selected"> select option </option>
<#else>
<option value="${feature.productFeatureId}">${feature.description} <#if feature.price?exists>(+ <@ofbizCurrency amount=feature.price?string isoCode=feature.currencyUomId/>)</#if></option>
@@ -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="<@o...@ofbizContentUrl>" border="0" width="60" height="60"></a>
+ <a href="javascript:getListInline('${inlineCounter}', 'FT${inlineCounter}${featureOrderFirst}','${indexer}',1);"><img src="<@o...@ofbizContentUrl>" border="0" width="60" height="60" /></a>
<br />
<a href="javascript:getListInline('${inlineCounter}', 'FT${inlineCounter}${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a>
</td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Sat Apr 17 22:26:44 2010
@@ -291,7 +291,7 @@ ${virtualJavaScript?if_exists}
<#assign productLargeImageUrl = firstLargeImage>
</#if>
<#if productLargeImageUrl?string?has_content>
- <a href="javascript:popupDetail();"><img src="<@o...@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" border="0" width="200"></a>
+ <a href="javascript:popupDetail();"><img src="<@o...@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" border="0" width="200" /></a>
</#if>
</td>
<td align="right" valign="top">
@@ -421,7 +421,7 @@ ${virtualJavaScript?if_exists}
<#list featureLists as featureList>
<#list featureList as feature>
<#if feature_index == 0>
- <div>${feature.description}: <select id="FT${feature.productFeatureTypeId}" name="FT${feature.productFeatureTypeId}" onChange="javascript:checkRadioButton();">
+ <div>${feature.description}: <select id="FT${feature.productFeatureTypeId}" name="FT${feature.productFeatureTypeId}" onchange="javascript:checkRadioButton();">
<option value="select" selected="selected"> select option </option>
<#else>
<option value="${feature.productFeatureId}">${feature.description} <#if feature.price?exists>(+ <@ofbizCurrency amount=feature.price?string isoCode=feature.currencyUomId/>)</#if></option>
@@ -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="<@o...@ofbizContentUrl>" border="0" width="60" height="60"></a>
+ <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@o...@ofbizContentUrl>" border="0" width="60" height="60" /></a>
<br />
<a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a>
</td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Sat Apr 17 22:26:44 2010
@@ -40,12 +40,12 @@ under the License.
</td>
</tr>
<#if productCategory.categoryImageUrl?exists || productCategory.longDescription?exists>
- <tr><td colspan='2'><hr class='sepbar'></td></tr>
+ <tr><td colspan='2'><hr class='sepbar'/></td></tr>
<tr>
<td valign="top" width="0" colspan='2'>
<div>
<#if productCategory.categoryImageUrl?exists>
- <img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" border="1" height='100'>
+ <img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" border="1" height='100' />
</#if>
${productCategory.longDescription?if_exists}
</div>
@@ -79,7 +79,7 @@ under the License.
</center>
<#else>
<table border="0" cellpadding="2">
- <tr><td colspan="2"><hr class='sepbar'></td></tr>
+ <tr><td colspan="2"><hr class='sepbar'/></td></tr>
<tr>
<td>
<div class='tabletext'>${uiLabelMap.ProductNoProductsInThisCategory}.</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl Sat Apr 17 22:26:44 2010
@@ -61,7 +61,7 @@ under the License.
<option value="${defaultProductStore.productStoreId}">----</option>
</#if>
<#list productStores as productStore>
- <option value="${productStore.productStoreId}"<#if productStore.productStoreId == currentStore> selected</#if>>${productStore.storeName?if_exists}</option>
+ <option value="${productStore.productStoreId}"<#if productStore.productStoreId == currentStore> selected="selected"</#if>>${productStore.storeName?if_exists}</option>
</#list>
</select>
<#if sessionAttributes.orderMode?exists>${uiLabelMap.OrderCannotBeChanged}</#if>
@@ -83,7 +83,7 @@ under the License.
</#if>
<option value="">${uiLabelMap.OrderNoChannel}</option>
<#list salesChannels as salesChannel>
- <option value="${salesChannel.enumId}" <#if (salesChannel.enumId == currentChannel)>selected</#if>>${salesChannel.get("description",locale)}</option>
+ <option value="${salesChannel.enumId}" <#if (salesChannel.enumId == currentChannel)>selected="selected"</#if>>${salesChannel.get("description",locale)}</option>
</#list>
</select>
</div>
@@ -101,7 +101,7 @@ under the License.
<td> </td>
<td valign='middle'>
<div class='tabletext'>
- <@htmlTemplate.lookupField value="${parameters.userLogin.userLoginId}" formName="salesentryform" name="userLoginId" id="userLoginId" fieldFormName="LookupUserLoginAndPartyDetails"/>
+ <@htmlTemplate.lookupField value="${parameters.userLogin.userLoginId}" formName="salesentryform" name="userLoginId" id="userLoginId_sales" fieldFormName="LookupUserLoginAndPartyDetails"/>
</div>
</td>
</tr>
@@ -168,7 +168,7 @@ under the License.
<td> </td>
<td valign='middle'>
<div class='tabletext'>
- <@htmlTemplate.lookupField value='${parameters.userLogin.userLoginId}'formName="poentryform" name="userLoginId" id="userLoginId" fieldFormName="LookupUserLoginAndPartyDetails"/>
+ <@htmlTemplate.lookupField value='${parameters.userLogin.userLoginId}'formName="poentryform" name="userLoginId" id="userLoginId_purchase" fieldFormName="LookupUserLoginAndPartyDetails"/>
</div>
</td>
</tr>
@@ -181,7 +181,7 @@ under the License.
<select name="supplierPartyId"<#if sessionAttributes.orderMode?default("") == "SALES_ORDER"> disabled</#if>>
<option value="">${uiLabelMap.OrderSelectSupplier}</option>
<#list suppliers as supplier>
- <option value="${supplier.partyId}"<#if supplier.partyId == thisPartyId> selected</#if>>[${supplier.partyId}] - ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(supplier, true)}</option>
+ <option value="${supplier.partyId}"<#if supplier.partyId == thisPartyId> selected="selected"</#if>>[${supplier.partyId}] - ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(supplier, true)}</option>
</#list>
</select>
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl Sat Apr 17 22:26:44 2010
@@ -93,7 +93,7 @@ function submitForm(form, mode, value) {
<tr>
<td colspan="2">
<span>${uiLabelMap.OrderShipToParty}:</span>
- <select name="shipToCustomerPartyId" onChange="javascript:submitForm(document.checkoutInfoForm, 'SC', null);">
+ <select name="shipToCustomerPartyId" onchange="javascript:submitForm(document.checkoutInfoForm, 'SC', null);">
<#list cartParties as cartParty>
<option value="${cartParty}">${cartParty}</option>
</#list>
@@ -455,7 +455,7 @@ function submitForm(form, mode, value) {
<#list billingAccountList as billingAccount>
<#assign availableAmount = billingAccount.accountBalance?double>
<#assign accountLimit = billingAccount.accountLimit?double>
- <option value="${billingAccount.billingAccountId}" <#if billingAccount.billingAccountId == selectedBillingAccountId?default("")>selected</#if>>${billingAccount.description?default("")} [${billingAccount.billingAccountId}] Available: <@ofbizCurrency amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit: <@ofbizCurrency amount=accountLimit isoCode=billingAccount.accountCurrencyUomId/></option>
+ <option value="${billingAccount.billingAccountId}" <#if billingAccount.billingAccountId == selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")} [${billingAccount.billingAccountId}] Available: <@ofbizCurrency amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit: <@ofbizCurrency amount=accountLimit isoCode=billingAccount.accountCurrencyUomId/></option>
</#list>
</select>
</td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl Sat Apr 17 22:26:44 2010
@@ -65,14 +65,14 @@ under the License.
<td colspan="3"> </td>
</tr>
<tr>
- <td width="26%" align="right"><div>${uiLabelMap.PartyHomePhone}<BR>${uiLabelMap.OrderAllowSolicitation}</div></td>
+ <td width="26%" align="right"><div>${uiLabelMap.PartyHomePhone}<br/>${uiLabelMap.OrderAllowSolicitation}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" name="homeCountryCode" value="${requestParameters.homeCountryCode?if_exists}" size="4" maxlength="10"/>
- <input type="text" name="homeAreaCode" value="${requestParameters.homeAreaCode?if_exists}" size="4" maxlength="10"/>*
- <input type="text" name="homeContactNumber" value="${requestParameters.homeContactNumber?if_exists}" size="15" maxlength="15"/>*
ext <input type="text" name="homeExt" value="${requestParameters.homeExt?if_exists}" size="6" maxlength="10"/>
- <BR>
+ <br/>
<select name="homeSol">
<#if (((requestParameters.homeSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
<#if (((requestParameters.homeSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
@@ -83,14 +83,14 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right"><div>${uiLabelMap.PartyBusinessPhone}<BR>${uiLabelMap.OrderAllowSolicitation}</div></td>
+ <td width="26%" align="right"><div>${uiLabelMap.PartyBusinessPhone}<br/>${uiLabelMap.OrderAllowSolicitation}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" name="workCountryCode" value="${requestParameters.CUSTOMER_WORK_COUNTRY?if_exists}" size="4" maxlength="10"/>
- <input type="text" name="workAreaCode" value="${requestParameters.CUSTOMER_WORK_AREA?if_exists}" size="4" maxlength="10"/>
- <input type="text" name="workContactNumber" value="${requestParameters.CUSTOMER_WORK_CONTACT?if_exists}" size="15" maxlength="15"/>
ext <input type="text" name="workExt" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" size="6" maxlength="10"/>
- <BR>
+ <br/>
<select name="workSol">
<#if (((requestParameters.workSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
<#if (((requestParameters.workSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
@@ -104,11 +104,11 @@ under the License.
<td colspan="3"> </td>
</tr>
<tr>
- <td width="26%" align="right"><div>${uiLabelMap.PartyEmailAddress}<BR>${uiLabelMap.OrderAllowSolicitation}</div></td>
+ <td width="26%" align="right"><div>${uiLabelMap.PartyEmailAddress}<br/>${uiLabelMap.OrderAllowSolicitation}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" name="emailAddress" value="" size="60" maxlength="255" />
- <BR>
+ <br/>
<select name="emailSol">
<#if (((requestParameters.emailSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
<#if (((requestParameters.emailSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl Sat Apr 17 22:26:44 2010
@@ -29,10 +29,10 @@ under the License.
</div>
<div class="screenlet-body">
<table>
- <tr><td colspan="4"> </td></tr>
<#if agreements?exists>
- <input type='hidden' name='hasAgreements' value='Y'/>
+ <tr><td colspan="4"> <input type='hidden' name='hasAgreements' value='Y'/></td></tr>
+
<tr>
<td> </td>
<td align='right' valign='top' nowrap="nowrap">
@@ -52,7 +52,8 @@ under the License.
</div>
</td>
</tr>
- <#else><input type='hidden' name='hasAgreements' value='N'/>
+ <#else>
+ <tr><td colspan="4"> <input type='hidden' name='hasAgreements' value='N'/></td></tr>
</#if>
<#if agreementRoles?exists>
<tr>
@@ -64,7 +65,7 @@ under the License.
</td>
<td> </td>
<td valign='middle'>
- <div class='tabletext' valign='top'>
+ <div class='tabletext'>
<select name="agreementId">
<option value="">${uiLabelMap.CommonNone}</option>
<#list agreementRoles as agreementRole>
@@ -124,7 +125,7 @@ under the License.
</td>
<td> </td>
<td valign='middle'>
- <div class='tabletext' valign='top'>
+ <div class='tabletext'>
<select name="currencyUomId">
<option value=""></option>
<#list currencies as currency>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Sat Apr 17 22:26:44 2010
@@ -137,7 +137,7 @@ under the License.
<select name="${shipGroupIndex?default("0")}_supplierPartyId">
<option value=""></option>
<#list suppliers as supplier>
- <option value="${supplier.partyId}"<#if supplierPartyId?exists><#if supplier.partyId == supplierPartyId> selected</#if></#if>>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(supplier, true)}</option>
+ <option value="${supplier.partyId}"<#if supplierPartyId?exists><#if supplier.partyId == supplierPartyId> selected="selected"</#if></#if>>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(supplier, true)}</option>
</#list>
</select>
${uiLabelMap.ProductReserveInventoryFromFacility}:
@@ -145,7 +145,7 @@ under the License.
<option value=""></option>
<#list productStoreFacilities as productStoreFacility>
<#assign facility = productStoreFacility.getRelatedOne("Facility")>
- <option value="${productStoreFacility.facilityId}"<#if facilityId?exists><#if productStoreFacility.facilityId == facilityId> selected</#if></#if>>${facility.facilityName?if_exists} </option>
+ <option value="${productStoreFacility.facilityId}"<#if facilityId?exists><#if productStoreFacility.facilityId == facilityId> selected="selected"</#if></#if>>${facility.facilityName?if_exists} </option>
</#list>
</select>
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl Sat Apr 17 22:26:44 2010
@@ -61,8 +61,7 @@ under the License.
</#if>
<#-- FIXME Problem here: the input field is shared -->
<@htmlTemplate.lookupField formName="appendItemForm" name="productId" id="productId" fieldFormName="LookupProduct"/>
- <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
- </a>
+ <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
</td>
</tr>
<tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Sat Apr 17 22:26:44 2010
@@ -211,6 +211,7 @@ float: right;
<input type="text" name="iddm_${orderItem.orderItemSeqId}" value="${orderItem.estimatedDeliveryDate?if_exists}" size="25" maxlength="30"/>
<a href="javascript:call_cal(document.updateItemInfo.iddm_${orderItem.orderItemSeqId},'${todayDate} 00:00:00.0');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
</#if>
+ </td>
</tr>
</#if>
<#-- now show adjustment details per line item -->
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Sat Apr 17 22:26:44 2010
@@ -52,7 +52,7 @@ under the License.
</#if>
<#if partyId?exists>
(<a href="${customerDetailLink}${partyId}" target="partymgr" class="buttontext">${partyId}</a>)
- </br>
+ <br/>
<#if orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL">
<div>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNewOrder}</a>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Sat Apr 17 22:26:44 2010
@@ -26,15 +26,16 @@ under the License.
<#assign orderType = orderHeader.getRelatedOne("OrderType")/>
<li class="h3"> ${orderType?if_exists.get("description", locale)?default(uiLabelMap.OrderOrder)} #<a href="<@o...@ofbizUrl>">${orderId}</a> ${externalOrder?if_exists} [ <a href="<@o...@ofbizUrl>" target="_blank">PDF</a> ]</li>
<#if currentStatus.statusId == "ORDER_APPROVED" && orderHeader.orderTypeId == "SALES_ORDER">
- <li class="h3"><a href="javascript:document.PrintOrderPickSheet.submit()">${uiLabelMap.FormFieldTitle_printPickSheet}</a></li>
+ <li class="h3"><a href="javascript:document.PrintOrderPickSheet.submit()">${uiLabelMap.FormFieldTitle_printPickSheet}</a>
<form name="PrintOrderPickSheet" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="facilityId" value="${storeFacilityId?if_exists}"/>
<input type="hidden" name="orderId" value="${orderHeader.orderId?if_exists}"/>
<input type="hidden" name="maxNumberOfOrdersToPrint" value="1"/>
</form>
+ </li>
</#if>
<#if currentStatus.statusId == "ORDER_CREATED" || currentStatus.statusId == "ORDER_PROCESSING">
- <li><a href="javascript:document.OrderApproveOrder.submit()">${uiLabelMap.OrderApproveOrder}</a></li>
+ <li><a href="javascript:document.OrderApproveOrder.submit()">${uiLabelMap.OrderApproveOrder}</a>
<form name="OrderApproveOrder" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_APPROVED"/>
<input type="hidden" name="setItemStatus" value="Y"/>
@@ -44,8 +45,9 @@ under the License.
<input type="hidden" name="roleTypeId" value="${assignRoleTypeId?if_exists}"/>
<input type="hidden" name="fromDate" value="${fromDate?if_exists}"/>
</form>
+ </li>
<#elseif currentStatus.statusId == "ORDER_APPROVED">
- <li><a href="javascript:document.OrderHold.submit()">${uiLabelMap.OrderHold}</a></li>
+ <li><a href="javascript:document.OrderHold.submit()">${uiLabelMap.OrderHold}</a>
<form name="OrderHold" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_HOLD"/>
<input type="hidden" name="workEffortId" value="${workEffortId?if_exists}"/>
@@ -54,8 +56,9 @@ under the License.
<input type="hidden" name="roleTypeId" value="${assignRoleTypeId?if_exists}"/>
<input type="hidden" name="fromDate" value="${fromDate?if_exists}"/>
</form>
+ </li>
<#elseif currentStatus.statusId == "ORDER_HOLD">
- <li><a href="javascript:document.OrderApproveOrder.submit()">${uiLabelMap.OrderApproveOrder}</a></li>
+ <li><a href="javascript:document.OrderApproveOrder.submit()">${uiLabelMap.OrderApproveOrder}</a>
<form name="OrderApproveOrder" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_APPROVED"/>
<input type="hidden" name="setItemStatus" value="Y"/>
@@ -65,9 +68,10 @@ under the License.
<input type="hidden" name="roleTypeId" value="${assignRoleTypeId?if_exists}"/>
<input type="hidden" name="fromDate" value="${fromDate?if_exists}"/>
</form>
+ </li>
</#if>
<#if currentStatus.statusId != "ORDER_COMPLETED" && currentStatus.statusId != "ORDER_CANCELLED">
- <li><a href="javascript:document.OrderCancel.submit()">${uiLabelMap.OrderCancelOrder}</a></li>
+ <li><a href="javascript:document.OrderCancel.submit()">${uiLabelMap.OrderCancelOrder}</a>
<form name="OrderCancel" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_CANCELLED"/>
<input type="hidden" name="setItemStatus" value="Y"/>
@@ -77,13 +81,15 @@ under the License.
<input type="hidden" name="roleTypeId" value="${assignRoleTypeId?if_exists}"/>
<input type="hidden" name="fromDate" value="${fromDate?if_exists}"/>
</form>
+ </li>
</#if>
<#if setOrderCompleteOption>
- <li><a href="javascript:document.OrderCompleteOrder.submit()">${uiLabelMap.OrderCompleteOrder}</a></li>
+ <li><a href="javascript:document.OrderCompleteOrder.submit()">${uiLabelMap.OrderCompleteOrder}</a>
<form name="OrderCompleteOrder" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_COMPLETED"/>
<input type="hidden" name="orderId" value="${orderId?if_exists}"/>
</form>
+ </li>
</#if>
</ul>
<br class="clear"/>
@@ -229,23 +235,23 @@ under the License.
</tr>
</#if>
<#if "SALES_ORDER" == orderHeader.orderTypeId>
- <form action="setOrderReservationPriority" method="post" name="setOrderReservationPriority">
- <input type = "hidden" name="orderId" value="${orderId}"/>
- <tr><td colspan="3"><hr /></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.FormFieldTitle_priority}</td>
<td width="5%"> </td>
<td valign="top" width="80%">
+ <form action="setOrderReservationPriority" method="post" name="setOrderReservationPriority">
+ <input type = "hidden" name="orderId" value="${orderId}"/>
<select name="priority">
<option value="1" <#if (orderHeader.priority)?if_exists == "1">selected="selected" </#if>>${uiLabelMap.CommonHigh}</option>
<option value="2" <#if (orderHeader.priority)?if_exists == "2">selected="selected" <#elseif !(orderHeader.priority)?has_content>selected="selected"</#if>>${uiLabelMap.CommonNormal}</option>
<option value="3" <#if (orderHeader.priority)?if_exists == "3">selected="selected" </#if>>${uiLabelMap.CommonLow}</option>
</select>
<input type="submit" class="smallSubmit" value="${uiLabelMap.FormFieldTitle_reserveInventory}"/>
+ </form>
</td>
</tr>
- <tr><td colspan="3"><hr /></td></tr>
- </form>
+ <tr><td colspan="3"><hr /></td></tr>
</#if>
<#if orderHeader.isViewed?has_content && orderHeader.isViewed == "Y">
<tr>
@@ -260,7 +266,7 @@ under the License.
<td class="label">${uiLabelMap.OrderMarkViewed}</td>
<td width="5%"></td>
<td valign="top" width="80%">
- <form id="orderViewed">
+ <form id="orderViewed" action="">
<input type="checkbox" name="checkViewed" onclick="javascript:markOrderViewed();"/>
<input type="hidden" name="orderId" value="${orderId?if_exists}"/>
<input type="hidden" name="isViewed" value="Y"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl Sat Apr 17 22:26:44 2010
@@ -68,7 +68,7 @@ under the License.
</td>
</tr>
<#if note_has_next>
- <tr><td colspan="3"><hr></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
</#if>
</#list>
</table>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Sat Apr 17 22:26:44 2010
@@ -119,9 +119,9 @@ under the License.
${(transactionCode.get("description",locale))?default("Unknown")}:
${gatewayResponse.transactionDate.toString()}
<@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br />
- (<span class"label">${uiLabelMap.OrderReference}</span> ${gatewayResponse.referenceNum?if_exists}
- <span class"label">${uiLabelMap.OrderAvs}</span> ${gatewayResponse.gatewayAvsResult?default("N/A")}
- <span class"label">${uiLabelMap.OrderScore}</span> ${gatewayResponse.gatewayScoreResult?default("N/A")})
+ (<span class="label">${uiLabelMap.OrderReference}</span> ${gatewayResponse.referenceNum?if_exists}
+ <span class="label">${uiLabelMap.OrderAvs}</span> ${gatewayResponse.gatewayAvsResult?default("N/A")}
+ <span class="label">${uiLabelMap.OrderScore}</span> ${gatewayResponse.gatewayScoreResult?default("N/A")})
<a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.CommonDetails}</a>
<#if gatewayResponse_has_next><hr /></#if>
</#list>
@@ -148,7 +148,7 @@ under the License.
<#else>
<tr>
<td align="right" valign="top" width="29%">
- <div> <span class"label">${paymentMethodType.get("description",locale)?if_exists}</span>
+ <div> <span class="label">${paymentMethodType.get("description",locale)?if_exists}</span>
<#if orderPaymentPreference.maxAmount?has_content>
<br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Sat Apr 17 22:26:44 2010
@@ -59,10 +59,11 @@ under the License.
<#if security.hasEntityPermission("FACILITY", "_CREATE", session) && ((orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId == "ORDER_SENT"))>
<#-- Special shipment options -->
<#if orderHeader.orderTypeId == "SALES_ORDER">
+ <li>
<form name="quickShipOrder" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId}"/>
</form>
- <li><a href="javascript:document.quickShipOrder.submit()" class="buttontext">${uiLabelMap.OrderQuickShipEntireOrder}</a></li>
+ <a href="javascript:document.quickShipOrder.submit()" class="buttontext">${uiLabelMap.OrderQuickShipEntireOrder}</a></li>
<#else> <#-- PURCHASE_ORDER -->
<span class="label"> <#if orderHeader.orderTypeId == "PURCHASE_ORDER">${uiLabelMap.ProductDestinationFacility}</#if></span>
<#if ownedFacilities?has_content>
@@ -232,7 +233,7 @@ under the License.
<#if orderHeader.orderTypeId == "SALES_ORDER" && shipGroup.shipmentMethodTypeId?has_content>
<tr>
<td align="right" valign="top" width="15%">
- <span class="label"> <b>${uiLabelMap.CommonMethod}</span>
+ <span class="label"> <b>${uiLabelMap.CommonMethod}</b></span>
</td>
<td width="5"> </td>
<td valign="top" width="80%">
@@ -294,7 +295,7 @@ under the License.
</div>
<div class="form-row">
<label for="address2">${uiLabelMap.PartyAddressLine2}</label>
- <div class="form-field"><input type="text" name="shipToAddress2" value="" size="30" maxlength="30" /></div>
+ <div class="form-field"><input type="text" name="shipToAddress2" id="address2" value="" size="30" maxlength="30" /></div>
</div>
<div class="form-row">
<label for="city">${uiLabelMap.PartyCity}* <span id="advice-required-city" style="display: none" class="custom-advice">(required)</span></label>
@@ -307,7 +308,7 @@ under the License.
<div class="form-row">
<label for="country">${uiLabelMap.PartyCountry}* <span id="advice-required-countryGeoId" style="display: none" class="custom-advice">(required)</span></label>
<div class="form-field">
- <select name="shipToCountryGeoId" id="countryGeoId" class="required" style="width: 70%">
+ <select name="shipToCountryGeoId" id="country" class="required" style="width: 70%">
<#if countryGeoId?exists>
<option value="${countryGeoId}">${countryGeoId}</option>
</#if>
@@ -315,10 +316,10 @@ under the License.
</select>
</div>
</div>
- <div id="states" class="form-row">
+ <div class="form-row">
<label for="state">${uiLabelMap.PartyState}* <span id="advice-required-stateProvinceGeoId" style="display: none" class="custom-advice">(required)</span></label>
<div class="form-field">
- <select name="shipToStateProvinceGeoId" id="stateProvinceGeoId" style="width: 70%">
+ <select name="shipToStateProvinceGeoId" id="state" style="width: 70%">
<#if stateProvinceGeoId?has_content>
<option value="${stateProvinceGeoId}">${stateProvinceGeoId}</option>
<#else>
@@ -457,7 +458,7 @@ under the License.
</tr>
</#if>
- <tr><td colspan="7"><hr class="sepbar"></td></tr>
+ <tr><td colspan="7"><hr class="sepbar"/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
<span class="label"> ${uiLabelMap.OrderInstructions}</span>
@@ -483,7 +484,7 @@ under the License.
<a href="javascript:addInstruction();" class="buttontext" id="addInstruction">${uiLabelMap.CommonAdd}</a>
</#if>
<a href="javascript:saveInstruction();" class="buttontext" id="saveInstruction" style="display:none">${uiLabelMap.CommonSave}</a>
- <textarea name="shippingInstructions" id="shippingInstructions" style="display:none">${shipGroup.shippingInstructions?if_exists}</textarea>
+ <textarea name="shippingInstructions" id="shippingInstructions" style="display:none" rows="0" cols="0">${shipGroup.shippingInstructions?if_exists}</textarea>
</form>
<#else>
<#if shipGroup.shippingInstructions?has_content>
@@ -496,60 +497,54 @@ under the License.
</tr>
<#if shipGroup.isGift?has_content && noShipment?default("false") != "true">
- <form name="setGiftMessageForm" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="orderId" value="${orderHeader.orderId}"/>
- <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
- <tr><td colspan="3"><hr /></td></tr>
- <td align="right" valign="top" width="15%">
- <span class="label"> ${uiLabelMap.OrderGiftMessage}</span>
- </td>
- <#if shipGroup.giftMessage?has_content>
- <td> </td>
- <td id="message" colspan="3" >
+ <tr><td colspan="3"><hr /></td></tr>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <span class="label"> ${uiLabelMap.OrderGiftMessage}</span>
+ </td>
+ <td width="5"> </td>
+ <td>
+ <form name="setGiftMessageForm" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="orderId" value="${orderHeader.orderId}"/>
+ <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
+ <#if shipGroup.giftMessage?has_content>
<label>${shipGroup.giftMessage}</label>
<a href="javascript:editGiftMessage();" class="buttontext" id="editGiftMessage">${uiLabelMap.CommonEdit}</a>
- </td>
- <#else>
- <td align="right"><a href="javascript:addGiftMessage();" class="buttontext" id="addGiftMessage">${uiLabelMap.CommonAdd}</a></td>
- </#if>
- <td>
- <textarea name="giftMessage" id="giftMessage" style="display:none">${shipGroup.giftMessage?if_exists}</textarea>
+ <#else>
+ <a href="javascript:addGiftMessage();" class="buttontext" id="addGiftMessage">${uiLabelMap.CommonAdd}</a>
+ </#if>
+ <textarea name="giftMessage" id="giftMessage" style="display:none" rows="0" cols="0">${shipGroup.giftMessage?if_exists}</textarea>
<a href="javascript:saveGiftMessage();" class="buttontext" id="saveGiftMessage" style="display:none">${uiLabelMap.CommonSave}</a>
- </td>
- </form>
+ </form>
+ </td>
+ </tr>
</#if>
- <form name="setShipGroupDates_${shipGroup.shipGroupSeqId}" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="orderId" value="${orderHeader.orderId}"/>
- <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
<tr><td colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <span class="label"> ${uiLabelMap.OrderShipAfterDate}<span>
- </td>
- <td width="5"> </td>
- <td valign="top" width="80%">
- <input type="text" size="23" name="shipAfterDate" value="${shipGroup.shipAfterDate?if_exists}"/>
- <a href="javascript:call_cal(document.setShipGroupDates_${shipGroup.shipGroupSeqId}.shipAfterDate,'');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
- </td>
- </tr>
- <tr>
- <td align="right" valign="top" width="15%">
- <span class="label"> ${uiLabelMap.OrderShipBeforeDate}<span>
+ <span class="label"> ${uiLabelMap.OrderShipAfterDate}</span><br/>
+ <span class="label"> ${uiLabelMap.OrderShipBeforeDate}</span>
</td>
<td width="5"> </td>
<td valign="top" width="80%">
- <input type="text" size="23" name="shipByDate" value="${shipGroup.shipByDate?if_exists}"/>
- <a href="javascript:call_cal(document.setShipGroupDates_${shipGroup.shipGroupSeqId}.shipByDate,'');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
- <input type="submit" value="${uiLabelMap.CommonUpdate}"/>
+ <form name="setShipGroupDates_${shipGroup.shipGroupSeqId}" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="orderId" value="${orderHeader.orderId}"/>
+ <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
+ <input type="text" size="23" name="shipAfterDate" value="${shipGroup.shipAfterDate?if_exists}"/>
+ <a href="javascript:call_cal(document.setShipGroupDates_${shipGroup.shipGroupSeqId}.shipAfterDate,'');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <br/>
+ <input type="text" size="23" name="shipByDate" value="${shipGroup.shipByDate?if_exists}"/>
+ <a href="javascript:call_cal(document.setShipGroupDates_${shipGroup.shipGroupSeqId}.shipByDate,'');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a>
+ <input type="submit" value="${uiLabelMap.CommonUpdate}"/>
+ </form>
</td>
</tr>
- </form>
<#assign shipGroupShipments = shipGroup.getRelated("PrimaryShipment")>
<#if shipGroupShipments?has_content>
<tr><td colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <span class="label"> ${uiLabelMap.FacilityShipments}<span>
+ <span class="label"> ${uiLabelMap.FacilityShipments}</span>
</td>
<td width="5"> </td>
<td valign="top" width="80%">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl Sat Apr 17 22:26:44 2010
@@ -37,7 +37,7 @@ under the License.
<#-- quote Channel information -->
<tr>
<td align="right" valign="top" width="15%" class="label">
- ${uiLabelMap.OrderSalesChannel}</div>
+ ${uiLabelMap.OrderSalesChannel}
</td>
<td width="5%"> </td>
<td valign="top" width="80%">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl Sat Apr 17 22:26:44 2010
@@ -21,6 +21,7 @@ under the License.
<div class="h3">${uiLabelMap.OrderOrderQuoteRoles}</div>
</div>
<div class="screenlet-body">
+ <#if quoteRoles?has_content>
<table cellspacing="0" class="basic-table">
<#assign row = 1>
<#list quoteRoles as quoteRole>
@@ -42,5 +43,8 @@ under the License.
<#assign row = row + 1>
</#list>
</table>
+ <#else>
+
+ </#if>
</div>
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl Sat Apr 17 22:26:44 2010
@@ -30,7 +30,7 @@ these reports and helping to improve the
<td><div>From Date:</div></td>
<td><input type="text" name="fromDate" tabindex="10" size="22" maxlength="25" align="middle">
<a tabindex="10" target="_self" href="javascript:call_cal(document.orderreportform.fromDate, '${fromStr}');" onfocus="checkForChanges = true;" onblur="checkForChanges = true;">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'>
+ <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' />
</a>
</td>
</tr>
@@ -38,7 +38,7 @@ these reports and helping to improve the
<td><div>To Date:</div></td>
<td><input type="text" name="toDate" tabindex="12" size="22" maxlength="25" align="middle">
<a tabindex="12" target="_self" href="javascript:call_cal(document.orderreportform.toDate, '${toStr}');" onfocus="checkForChanges = true;" onblur="checkForChanges = true;">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'>
+ <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' />
</a>
</td>
</tr>
@@ -68,7 +68,7 @@ these reports and helping to improve the
<td><div>From Date:</div></td>
<td><input type="text" name="fromDate" tabindex="10" size="22" maxlength="25" align="middle">
<a tabindex="10" target="_self" href="javascript:call_cal(document.itemreportform.fromDate, '${fromStr}');" onfocus="checkForChanges = true;" onblur="checkForChanges = true;">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'>
+ <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' />
</a>
</td>
</tr>
@@ -76,7 +76,7 @@ these reports and helping to improve the
<td><div>To Date:</div></td>
<td><input type="text" name="toDate" tabindex="12" size="22" maxlength="25" align="middle">
<a tabindex="12" target="_self" href="javascript:call_cal(document.itemreportform.toDate, '${toStr}');" onfocus="checkForChanges = true;" onblur="checkForChanges = true;">
- <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'>
+ <img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar' />
</a>
</td>
</tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl Sat Apr 17 22:26:44 2010
@@ -67,7 +67,7 @@ under the License.
</table>
</#if>
<table cellspacing="0" class="basic-table">
- <tr><td colspan="8"><hr></td></tr>
+ <tr><td colspan="8"><hr/></td></tr>
<tr>
<td colspan="8"><h3><#if "CUSTOMER_RETURN" == returnHeaderTypeId>${uiLabelMap.OrderReturnShipFromAddress}<#else>${uiLabelMap["checkhelper.select_shipping_destination"]}</#if></h3></td>
</tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl Sat Apr 17 22:26:44 2010
@@ -78,7 +78,7 @@ under the License.
<#assign entryDate = returnInfo.get("entryDate").toString()>
</#if>
<input type='text' size='25' name='entryDate' value='${entryDate?if_exists}' />
- <a href="javascript:call_cal(document.returnhead.entryDate, '');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'></a>
+ <a href="javascript:call_cal(document.returnhead.entryDate, '');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar' /></a>
</td>
</tr>
<tr>
@@ -101,7 +101,7 @@ under the License.
</#if>
<option value="">${uiLabelMap.FacilityNoFacility}</option>
<#list facilityList as facility>
- <option value="${facility.facilityId}" <#if (facilityList?size == 1)>selected</#if>>${facility.facilityName?default(facility.facilityId)}</option>
+ <option value="${facility.facilityId}" <#if (facilityList?size == 1)>selected="selected"</#if>>${facility.facilityName?default(facility.facilityId)}</option>
</#list>
</td>
</tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl Sat Apr 17 22:26:44 2010
@@ -79,7 +79,7 @@ under the License.
<td>
<select name="returnTypeId_o_${rowCount}">
<#list returnTypes as type>
- <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
+ <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected="selected"</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
</#list>
</select>
</td>
@@ -134,7 +134,7 @@ under the License.
<td>
<select name="returnTypeId_o_${rowCount}">
<#list returnTypes as type>
- <option value="${type.returnTypeId}" <#if type.returnTypeId=="RTN_REFUND">selected</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
+ <option value="${type.returnTypeId}" <#if type.returnTypeId=="RTN_REFUND">selected="selected"</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
</#list>
</select>
</td>
@@ -156,7 +156,7 @@ under the License.
<#-- toggle the row color -->
<#assign alt_row = !alt_row>
</#list>
- <tr><td colspan="9"><hr></td></tr>
+ <tr><td colspan="9"><hr/></td></tr>
<tr>
<td colspan="9"><h3>${uiLabelMap.OrderReturnAdjustments} #<a href="<@o...@ofbizUrl>" class="buttontext">${orderId}</h3></td>
</tr>
@@ -189,7 +189,7 @@ under the License.
<td>
<select name="returnTypeId_o_${rowCount}">
<#list returnTypes as type>
- <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
+ <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected="selected"</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
</#list>
</select>
</td>
@@ -206,7 +206,7 @@ under the License.
<#assign manualAdjRowNum = rowCount/>
<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>
+ <tr><td colspan="9"><hr/></td></tr>
<tr>
<td colspan="9">
<h3>${uiLabelMap.OrderReturnManualAdjustment} #<a href="<@o...@ofbizUrl>" class="buttontext">${orderId}</h3></td></div>
@@ -222,7 +222,7 @@ under the License.
<td>
<select name="returnTypeId_o_${rowCount}">
<#list returnTypes as type>
- <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
+ <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected="selected"</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option>
</#list>
</select>
</td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=935270&r1=935269&r2=935270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Sat Apr 17 22:26:44 2010
@@ -290,7 +290,7 @@ under the License.
<td colspan="9"><div>${uiLabelMap.OrderNoReturnItemsFound}</div></td>
</tr>
</#if>
- <tr><td colspan="10"><hr></td></tr>
+ <tr><td colspan="10"><hr/></td></tr>
<#-- these are general return adjustments not associated with a particular item (itemSeqId = "_NA_" -->
<#if (returnAdjustments?has_content)>
<#list returnAdjustments as returnAdjustment>
@@ -312,7 +312,7 @@ under the License.
<td colspan="6" align="right"><input type="submit" class="bottontext" value="${uiLabelMap.CommonUpdate}" /></td>
</tr>
</#if>
- <tr><td colspan="10"><hr></td></tr>
+ <tr><td colspan="10"><hr/></td></tr>
</form>
</table>