svn commit: r931691 [2/3] - in /ofbiz/trunk/applications/orde
Locked
 
|
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=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Wed Apr 7 21:15:53 2010 @@ -60,11 +60,11 @@ under the License. <#if shippingContactMech.postalAddress?exists> <#assign shippingAddress = shippingContactMech.postalAddress> <tr> - <td valign="top" nowrap> + <td valign="top" nowrap="nowrap"> <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}" <#if i == 0>checked</#if> /> </td> - <td nowrap> </td> - <td valign="top" width="100%" nowrap> + <td nowrap="nowrap"> </td> + <td valign="top" width="100%" nowrap="nowrap"> <div> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> @@ -170,10 +170,10 @@ under the License. </#if> </#if> <tr> - <td valign="top" width="1%" nowrap> + <td valign="top" width="1%" nowrap="nowrap"> <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}" ${checkedValue} /> </td> - <td valign="top" width="99%" nowrap> + <td valign="top" width="99%" nowrap="nowrap"> <div> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> @@ -202,10 +202,10 @@ under the License. <#list shipToPartyShippingContactMechList as shippingContactMech> <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")> <tr> - <td valign="top" width="1%" nowrap> + <td valign="top" width="1%" nowrap="nowrap"> <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}"/> </td> - <td valign="top" width="99%" nowrap> + <td valign="top" width="99%" nowrap="nowrap"> <div> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> @@ -251,14 +251,14 @@ under the License. <tr><td colspan="4"> </td></tr> <tr> <td> </td> - <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.PartyPartyId}</div></td> + <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.PartyPartyId}</div></td> <td> </td> <td valign='middle'> <div class='tabletext'> <input type='text' class='inputBox' name='shipToPartyId' value='${thisPartyId?if_exists}'/> <a href="javascript:call_fieldlookup2(document.partyshipform.shipToPartyId,'LookupPartyName');"> <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a> - <input type="submit" class="smallSubmit" value="Continue"> + <input type="submit" class="smallSubmit" value="Continue" /> </div> </td> </tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl Wed Apr 7 21:15:53 2010 @@ -23,7 +23,7 @@ under the License. <li class="h3">${uiLabelMap.OrderOrderReceivedOn} ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(filterDate)}</li> <#assign listSize = state.getSize()> <#if (listSize > 10)> - <li><a href="/ordermgr/control/orderlist?viewIndex=${state.getViewIndex() + 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate?if_exists}">${uiLabelMap.CommonMore}</a></li> + <li><a href="/ordermgr/control/orderlist?viewIndex=${state.getViewIndex() + 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate?if_exists}">${uiLabelMap.CommonMore}</a></li> </#if> <#if orderHeaderList?has_content> <li>1-${orderHeaderList.size()} ${uiLabelMap.CommonOf} ${state.getSize()}</li> @@ -62,7 +62,7 @@ under the License. <#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder")> <#list trackingCodes as trackingCode> <#if trackingCode?has_content> - <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br /> + <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br /> </#if> </#list> </td> 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=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Wed Apr 7 21:15:53 2010 @@ -117,7 +117,7 @@ float: right; <a href="/catalog/control/EditProduct?productId=${productId}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a> <a href="/ecommerce/control/product?product_id=${productId}" class="buttontext" target="_blank">${uiLabelMap.OrderEcommerce}</a> <#if orderItemContentWrapper.get("IMAGE_URL")?has_content> - <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderItemSeqId=${orderItem.orderItemSeqId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> + <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderItemSeqId=${orderItem.orderItemSeqId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> </#if> </div> </#if> @@ -265,7 +265,7 @@ float: right; <td> <#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)) && ("Y" != orderItem.isPromo?if_exists))> <#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")> - <input type="checkbox" name="selectedItem" value="${orderItem.orderItemSeqId}"> + <input type="checkbox" name="selectedItem" value="${orderItem.orderItemSeqId}" /> <a href="javascript:document.updateItemInfo.action='<@ofbizUrl>cancelOrderItem</@ofbizUrl>';document.updateItemInfo.orderItemSeqId.value='${orderItem.orderItemSeqId}';document.updateItemInfo.shipGroupSeqId.value='${shipGroup.shipGroupSeqId}';document.updateItemInfo.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a> <#else> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Wed Apr 7 21:15:53 2010 @@ -365,14 +365,14 @@ function toggleOrderIdList() { <td align='left'> <table class="basic-table" cellspacing='0'> <tr> - <td nowrap> + <td nowrap="nowrap"> <input type='text' size='25' name='minDate' value='${requestParameters.minDate?if_exists}'/> <a href="javascript:call_cal(document.lookuporder.minDate,'${fromDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> <span class='label'>${uiLabelMap.CommonFrom}</span> </td> </tr> <tr> - <td nowrap> + <td nowrap="nowrap"> <input type='text' size='25' name='maxDate' value='${requestParameters.maxDate?if_exists}'/> <a href="javascript:call_cal(document.lookuporder.maxDate,'${thruDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> <span class='label'>${uiLabelMap.CommonThru}</span> @@ -387,7 +387,7 @@ function toggleOrderIdList() { <td align='left'> <table class="basic-table" cellspacing='0'> <tr> - <td nowrap> + <td nowrap="nowrap"> <input type="checkbox" name="filterInventoryProblems" value="Y" <#if requestParameters.filterInventoryProblems?default("N") == "Y">checked="checked"</#if> /> </td> @@ -401,7 +401,7 @@ function toggleOrderIdList() { <td align='left'> <table class="basic-table" cellspacing='0'> <tr> - <td nowrap> + <td nowrap="nowrap"> <input type="checkbox" name="filterPartiallyReceivedPOs" value="Y" <#if requestParameters.filterPartiallyReceivedPOs?default("N") == "Y">checked="checked"</#if> /> </td> @@ -415,7 +415,7 @@ function toggleOrderIdList() { <td align='left'> <table class="basic-table" cellspacing='0'> <tr> - <td nowrap> + <td nowrap="nowrap"> <input type="checkbox" name="filterPOsOpenPastTheirETA" value="Y" <#if requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y">checked="checked"</#if> /> </td> @@ -429,7 +429,7 @@ function toggleOrderIdList() { <td align='left'> <table class="basic-table" cellspacing='0'> <tr> - <td nowrap> + <td nowrap="nowrap"> <input type="checkbox" name="filterPOsWithRejectedItems" value="Y" <#if requestParameters.filterPOsWithRejectedItems?default("N") == "Y">checked="checked"</#if> /> </td> @@ -467,17 +467,17 @@ function toggleOrderIdList() { <td width='5%'> </td> <td align='left'> <input type="hidden" name="showAll" value="Y"/> - <input type='submit' value='${uiLabelMap.CommonFind}' onsubmit="javascript:lookupOrders(true);"/> + <input type='submit' value='${uiLabelMap.CommonFind}'/> </td> </tr> </table> </td> </tr> </table> - </#if> </div> + </#if> </div> -<input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:lookupOrders(true);"/> +<input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onclick="javascript:lookupOrders(true);"/> </form> <#if requestParameters.hideFields?default("N") != "Y"> <script language="JavaScript" type="text/javascript"> 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=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Wed Apr 7 21:15:53 2010 @@ -61,7 +61,7 @@ under the License. <form name="searchOtherOrders" method="post" action="<@ofbizUrl>searchorders</@ofbizUrl>"> <input type="hidden" name="lookupFlag" value="Y"/> <input type="hidden" name="hideFields" value="Y"/> - <input type="hidden" name="partyId" value="${partyId}"> + <input type="hidden" name="partyId" value="${partyId}" /> <input type="hidden" name="viewIndex" value="1"/> <input type="hidden" name="viewSize" value="20"/> </form> 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=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Wed Apr 7 21:15:53 2010 @@ -224,7 +224,7 @@ under the License. <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderImage}</td> <td width="5%"> </td> <td valign="top" width="80%"> - <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> + <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> </td> </tr> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Wed Apr 7 21:15:53 2010 @@ -40,12 +40,12 @@ under the License. <tr> <td> <#if state.hasPrevious()> - <a href="<@ofbizUrl>orderlist?viewIndex=${state.getViewIndex() - 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> + <a href="<@ofbizUrl>orderlist?viewIndex=${state.getViewIndex() - 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> </#if> </td> <td align="right"> <#if state.hasNext()> - <a href="<@ofbizUrl>orderlist?viewIndex=${state.getViewIndex() + 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> + <a href="<@ofbizUrl>orderlist?viewIndex=${state.getViewIndex() + 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> </#if> </td> </tr> @@ -62,12 +62,12 @@ under the License. </div> <div class="screenlet-body"> <form method="post" name="findorder" action="<@ofbizUrl>orderlist</@ofbizUrl>"> - <input type="hidden" name="changeStatusAndTypeState" value="Y"> + <input type="hidden" name="changeStatusAndTypeState" value="Y" /> <table class="basic-table" cellspacing='0'> <tr> <td align="right" class="label">${uiLabelMap.CommonStatus}</td> <td> </td> - <td nowrap> + <td nowrap="nowrap"> <div> <input type="checkbox" name="viewall" value="Y" onclick="javascript:setCheckboxes()" <#if state.hasAllStatus()>checked="checked"</#if> />${uiLabelMap.CommonAll} <input type="checkbox" name="viewcreated" value="Y" <#if state.hasStatus('viewcreated')>checked="checked"</#if> />${uiLabelMap.CommonCreated} @@ -84,7 +84,7 @@ under the License. <tr> <td align="right" class="label">${uiLabelMap.CommonType}</td> <td> </td> - <td nowrap> + <td nowrap="nowrap"> <div> <input type="checkbox" name="view_SALES_ORDER" value="Y" <#if state.hasType('view_SALES_ORDER')>checked="checked"</#if>/> ${descr_SALES_ORDER} @@ -96,7 +96,7 @@ under the License. <tr> <td align="right" class="label">${uiLabelMap.CommonFilter}</td> <td> </td> - <td nowrap> + <td nowrap="nowrap"> <div> <input type="checkbox" name="filterInventoryProblems" value="Y" <#if state.hasFilter('filterInventoryProblems')>checked="checked"</#if>/> @@ -110,7 +110,7 @@ under the License. <tr> <td align="right" class="label">${uiLabelMap.CommonFilter} (${uiLabelMap.OrderFilterPOs})</td> <td> </td> - <td nowrap> + <td nowrap="nowrap"> <div> <input type="checkbox" name="filterPartiallyReceivedPOs" value="Y" <#if state.hasFilter('filterPartiallyReceivedPOs')>checked="checked"</#if>/> @@ -196,7 +196,7 @@ under the License. <#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder")> <#list trackingCodes as trackingCode> <#if trackingCode?has_content> - <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br /> + <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br /> </#if> </#list> </td> 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=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Wed Apr 7 21:15:53 2010 @@ -104,10 +104,10 @@ under the License. <#-- Authorize and Capture transactions --> <div> <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> - <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a> + <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a> </#if> <#if orderPaymentPreference.statusId == "PAYMENT_AUTHORIZED"> - <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingCapture}</a> + <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingCapture}</a> </#if> </div> </div> @@ -134,10 +134,10 @@ under the License. <div> <a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a> <form name="CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}" method="post" action="<@ofbizUrl>updateOrderPaymentPreference</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId}"> - <input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}"> - <input type="hidden" name="statusId" value="PAYMENT_CANCELLED"> - <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}"> + <input type="hidden" name="orderId" value="${orderId}" /> + <input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}" /> + <input type="hidden" name="statusId" value="PAYMENT_CANCELLED" /> + <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}" /> </form> </div> </#if> @@ -179,10 +179,10 @@ under the License. <div> <a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a> <form name="CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}" method="post" action="<@ofbizUrl>updateOrderPaymentPreference</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId}"> - <input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}"> - <input type="hidden" name="statusId" value="PAYMENT_CANCELLED"> - <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}"> + <input type="hidden" name="orderId" value="${orderId}" /> + <input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}" /> + <input type="hidden" name="statusId" value="PAYMENT_CANCELLED" /> + <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}" /> </form> </div> </#if> @@ -210,9 +210,9 @@ under the License. <div> <#if creditCard?has_content> <#if creditCard.companyNameOnCard?exists>${creditCard.companyNameOnCard}<br /></#if> - <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if> + <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if> ${creditCard.firstNameOnCard} - <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if> + <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if> ${creditCard.lastNameOnCard?default("N/A")} <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if> <br /> @@ -231,10 +231,10 @@ under the License. <#-- Authorize and Capture transactions --> <div> <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> - <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a> + <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a> </#if> <#if orderPaymentPreference.statusId == "PAYMENT_AUTHORIZED"> - <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingCapture}</a> + <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingCapture}</a> </#if> </div> <#else> @@ -263,10 +263,10 @@ under the License. <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> <a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a> <form name="CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}" method="post" action="<@ofbizUrl>updateOrderPaymentPreference</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId}"> - <input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}"> - <input type="hidden" name="statusId" value="PAYMENT_CANCELLED"> - <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}"> + <input type="hidden" name="orderId" value="${orderId}" /> + <input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}" /> + <input type="hidden" name="statusId" value="PAYMENT_CANCELLED" /> + <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}" /> </form> </#if> </#if> @@ -303,10 +303,10 @@ under the License. <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> <a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a> <form name="CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}" method="post" action="<@ofbizUrl>updateOrderPaymentPreference</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId}"> - <input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}"> - <input type="hidden" name="statusId" value="PAYMENT_CANCELLED"> - <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}"> + <input type="hidden" name="orderId" value="${orderId}" /> + <input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}" /> + <input type="hidden" name="statusId" value="PAYMENT_CANCELLED" /> + <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}" /> </form> </#if> </#if> @@ -347,10 +347,10 @@ under the License. <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> <a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a> <form name="CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}" method="post" action="<@ofbizUrl>updateOrderPaymentPreference</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId}"> - <input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}"> - <input type="hidden" name="statusId" value="PAYMENT_CANCELLED"> - <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}"> + <input type="hidden" name="orderId" value="${orderId}" /> + <input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}" /> + <input type="hidden" name="statusId" value="PAYMENT_CANCELLED" /> + <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}" /> </form> </#if> </#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=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Wed Apr 7 21:15:53 2010 @@ -187,7 +187,7 @@ under the License. <div class="screenlet-title-bar"> <ul> <li class="h3"> ${uiLabelMap.OrderShipmentInformation} - ${shipGroup.shipGroupSeqId}</li> - <li class="expanded"><a onclick="javascript:toggleScreenlet(this, 'ShipGroupScreenletBody_${shipGroup.shipGroupSeqId}', 'true', '${uiLabelMap.CommonExpand}', '${uiLabelMap.CommonCollapse}');" title="Collapse"> </a></li> + <li class="expanded"><a onclick="javascript:toggleScreenlet(this, 'ShipGroupScreenletBody_${shipGroup.shipGroupSeqId}', 'true', '${uiLabelMap.CommonExpand}', '${uiLabelMap.CommonCollapse}');" title="Collapse"> </a></li> <li><a href="<@ofbizUrl>shipGroups.pdf?orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}</@ofbizUrl>">${uiLabelMap.OrderShipGroup} PDF</a></li> </ul> <br class="clear"/> @@ -290,19 +290,19 @@ under the License. <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> <div class="form-row"> <label for="address1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-address1" style="display: none" class="custom-advice">(required)</span></label> - <div class="form-field"><input type="text" class="required" name="shipToAddress1" id="address1" value="" size="30" maxlength="30"></div> + <div class="form-field"><input type="text" class="required" name="shipToAddress1" id="address1" value="" size="30" maxlength="30" /></div> </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" 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> - <div class="form-field"><input type="text" class="required" name="shipToCity" id="city" value="" size="30" maxlength="30"></div> + <div class="form-field"><input type="text" class="required" name="shipToCity" id="city" value="" size="30" maxlength="30" /></div> </div> <div class="form-row"> <label for="postalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-postalCode" style="display: none" class="custom-advice">(required)</span></label> - <div class="form-field"><input type="text" class="required" name="shipToPostalCode" id="postalCode" value="" size="30" maxlength="10"></div> + <div class="form-field"><input type="text" class="required" name="shipToPostalCode" id="postalCode" value="" size="30" maxlength="10" /></div> </div> <div class="form-row"> <label for="country">${uiLabelMap.PartyCountry}* <span id="advice-required-countryGeoId" style="display: none" class="custom-advice">(required)</span></label> @@ -371,7 +371,7 @@ under the License. <tr> <td> <#assign shipmentMethodAndAmount = shippingRate.shipmentMethodTypeId + "@" + "UPS" + "*" + shippingRate.rate> - <input type='radio' name='shipmentMethodAndAmount' value='${shipmentMethodAndAmount?if_exists}'> + <input type='radio' name='shipmentMethodAndAmount' value='${shipmentMethodAndAmount?if_exists}' /> UPS ${shippingRate.shipmentMethodDescription?if_exists} <#if (shippingRate.rate > -1)> <@ofbizCurrency amount=shippingRate.rate isoCode=orderReadHelper.getCurrency()/> @@ -567,7 +567,7 @@ under the License. <form name="upsEmailReturnLabel${shipment_index}" method="post" action="<@ofbizUrl>upsEmailReturnLabelOrder</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderId}"/> <input type="hidden" name="shipmentId" value="${shipment.shipmentId}"/> - <input type="hidden" name="shipmentRouteSegmentId" value=${shipmentRouteSegment.shipmentRouteSegmentId}> + <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegment.shipmentRouteSegmentId}" /> </form> </#if> </#if> @@ -595,8 +595,8 @@ under the License. <form name="createShipment_${shipGroup.shipGroupSeqId}" method="post" action="/facility/control/createShipment"> <input type="hidden" name="primaryOrderId" value="${orderId}"/> <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - <input type="hidden" name="statusId" value="SHIPMENT_INPUT"> - <input type="hidden" name="facilityId" value=${storeFacilityId?if_exists}> + <input type="hidden" name="statusId" value="SHIPMENT_INPUT" /> + <input type="hidden" name="facilityId" value="${storeFacilityId?if_exists}" /> <input type="hidden" name="estimatedShipDate" value="${shipGroup.shipByDate?if_exists}"/> </form> </#if> @@ -626,14 +626,14 @@ under the License. <form name="quickDropShipOrder_${shipGroup_index}" method="post" action="<@ofbizUrl>quickDropShipOrder</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderId}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - <input type="hidden" name="externalLoginKey" value="${externalLoginKey}"> + <input type="hidden" name="externalLoginKey" value="${externalLoginKey}" /> </form> <form name="createShipment3_${shipGroup.shipGroupSeqId}" method="post" action="/facility/control/createShipment"> <input type="hidden" name="primaryOrderId" value="${orderId}"/> <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - <input type="hidden" name="shipmentTypeId" value="DROP_SHIPMENT"> - <input type="hidden" name="statusId" value="PURCH_SHIP_CREATED"> - <input type="hidden" name="externalLoginKey" value="${externalLoginKey}"> + <input type="hidden" name="shipmentTypeId" value="DROP_SHIPMENT" /> + <input type="hidden" name="statusId" value="PURCH_SHIP_CREATED" /> + <input type="hidden" name="externalLoginKey" value="${externalLoginKey}" /> </form> </#if> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl Wed Apr 7 21:15:53 2010 @@ -31,7 +31,7 @@ under the License. <form method="post" action="<@ofbizUrl>receiveOfflinePayments/${donePage}</@ofbizUrl>" name="paysetupform"> <#if requestParameters.workEffortId?exists> - <input type="hidden" name="workEffortId" value="${requestParameters.workEffortId}"> + <input type="hidden" name="workEffortId" value="${requestParameters.workEffortId}" /> </#if> <table class="basic-table" cellspacing='0'> <tr class="header-row"> @@ -45,9 +45,9 @@ under the License. <tr> <td width="30%" align="right">${payType.get("description",locale)?default(payType.paymentMethodTypeId)}</td> <td width="1"> </td> - <td width="1"><input type="text" size="7" name="${payType.paymentMethodTypeId}_amount"></td> + <td width="1"><input type="text" size="7" name="${payType.paymentMethodTypeId}_amount" /></td> <td width="1"> </td> - <td width="70%"><input type="text" size="15" name="${payType.paymentMethodTypeId}_reference"></td> + <td width="70%"><input type="text" size="15" name="${payType.paymentMethodTypeId}_reference" /></td> </tr> </#list> </table> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl Wed Apr 7 21:15:53 2010 @@ -33,7 +33,7 @@ under the License. <#if ! productStoreEmailSetting?exists> <#assign productStoreEmailSetting = {} /> </#if> - <input type="hidden" name="partyId" value="${partyId?if_exists}"> + <input type="hidden" name="partyId" value="${partyId?if_exists}" /> <input type="hidden" name="contentType" value="${productStoreEmailSetting.contentType?default("")}" /> <table class="basic-table" cellspacing='0'> <tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl Wed Apr 7 21:15:53 2010 @@ -32,7 +32,7 @@ under the License. <!-- Suspended Processes --> <#if workEffortStatus == "WF_SUSPENDED"> <form action="<@ofbizUrl>releasehold</@ofbizUrl>" method="post" name="activityForm"> - <input type="hidden" name="workEffortId" value="${workEffortId}"> + <input type="hidden" name="workEffortId" value="${workEffortId}" /> <table class="basic-table" cellspacing='0'> <tr> <td>${uiLabelMap.OrderProcessingInHold} ${uiLabelMap.OrderProcessingInHoldNote}</td> @@ -46,7 +46,7 @@ under the License. <!-- Active Processes --> <#if workEffortStatus == "WF_RUNNING"> <form action="<@ofbizUrl>holdorder</@ofbizUrl>" method="post" name="activityForm"> - <input type="hidden" name="workEffortId" value="${workEffortId}"> + <input type="hidden" name="workEffortId" value="${workEffortId}" /> <table class="basic-table" cellspacing='0'> <tr> <td>${uiLabelMap.OrderProcessingInActive}</td> @@ -77,10 +77,10 @@ under the License. <tr> <td> <form action="<@ofbizUrl>completeassignment</@ofbizUrl>" method="post" name="transitionForm"> - <input type="hidden" name="workEffortId" value="${workEffortId}"> - <input type="hidden" name="partyId" value="${assignPartyId}"> - <input type="hidden" name="roleTypeId" value="${assignRoleTypeId}"> - <input type="hidden" name="fromDate" value="${fromDate}"> + <input type="hidden" name="workEffortId" value="${workEffortId}" /> + <input type="hidden" name="partyId" value="${assignPartyId}" /> + <input type="hidden" name="roleTypeId" value="${assignRoleTypeId}" /> + <input type="hidden" name="fromDate" value="${fromDate}" /> <table class="basic-table" cellspacing='0'> <tr> <td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl Wed Apr 7 21:15:53 2010 @@ -21,11 +21,11 @@ under the License. <input type="hidden" name="quoteId" value="${quoteId}"/> <div> <span class="label">${uiLabelMap.OrderCopyQuote}</span> - ${uiLabelMap.OrderOrderQuoteItems} <input type="checkbox" name="copyQuoteItems" value="Y" checked/> - ${uiLabelMap.OrderOrderQuoteAdjustments} <input type="checkbox" name="copyQuoteAdjustments" value="Y" checked/> - ${uiLabelMap.OrderOrderQuoteRoles} <input type="checkbox" name="copyQuoteRoles" value="Y" checked/> - ${uiLabelMap.OrderOrderQuoteAttributes} <input type="checkbox" name="copyQuoteAttributes" value="Y" checked/> - ${uiLabelMap.OrderOrderQuoteCoefficients} <input type="checkbox" name="copyQuoteCoefficients" value="Y" checked/> + ${uiLabelMap.OrderOrderQuoteItems} <input type="checkbox" name="copyQuoteItems" value="Y" checked="checked" /> + ${uiLabelMap.OrderOrderQuoteAdjustments} <input type="checkbox" name="copyQuoteAdjustments" value="Y" checked="checked" /> + ${uiLabelMap.OrderOrderQuoteRoles} <input type="checkbox" name="copyQuoteRoles" value="Y" checked="checked" /> + ${uiLabelMap.OrderOrderQuoteAttributes} <input type="checkbox" name="copyQuoteAttributes" value="Y" checked="checked" /> + ${uiLabelMap.OrderOrderQuoteCoefficients} <input type="checkbox" name="copyQuoteCoefficients" value="Y" checked="checked" /> </div> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonCopy}"/> </form> 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=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl Wed Apr 7 21:15:53 2010 @@ -24,78 +24,78 @@ control over. special thanks for Britton these reports and helping to improve them.</div> <br /> -<FORM METHOD="post" NAME="orderreportform" ACTION="<@ofbizUrl>orderreportjasper.pdf</@ofbizUrl>" TARGET="OrderReport"> -<Table> -<TR> -<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'> - </A> -</TD> -</TR> -<TR> -<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'> - </A> -</TD> -</TR> +<form method="post" name="orderreportform" action="<@ofbizUrl>orderreportjasper.pdf</@ofbizUrl>" target="OrderReport"> +<table> +<tr> +<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'> + </a> +</td> +</tr> +<tr> +<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'> + </a> +</td> +</tr> <#-- <tr> <td><div>Report:</div></td> <td> - <SELECT NAME="groupName" tabindex="14" CLASS="stateSelectBox"> - <OPTION VALUE="orderStatus"></OPTION> - <OPTION VALUE="orderStatus">Orders by Order Status</OPTION> - <OPTION VALUE="ship">Orders by Ship Method</OPTION> - <OPTION VALUE="payment">Orders by Payment Method</OPTION> - <OPTION VALUE="adjustment">Order Items by Adjustment</OPTION> - <OPTION VALUE="itemStatus">Order Items by Status</OPTION> - <OPTION VALUE="product">Order Items by Product</OPTION> - </SELECT> + <select name="groupName" tabindex="14" CLASS="stateSelectBox"> + <option value="orderStatus"></option> + <option value="orderStatus">Orders by Order Status</option> + <option value="ship">Orders by Ship Method</option> + <option value="payment">Orders by Payment Method</option> + <option value="adjustment">Order Items by Adjustment</option> + <option value="itemStatus">Order Items by Status</option> + <option value="product">Order Items by Product</option> + </select> </td> </tr> --> </table> - <INPUT TYPE="submit" TABINDEX="16" CLASS="button" NAME="GoReport" VALUE="Order Report"> + <input type="submit" tabindex="16" class="button" name="GoReport" value="Order Report"> </form> -<FORM METHOD="post" NAME="itemreportform" ACTION="<@ofbizUrl>orderitemreportjasper.pdf</@ofbizUrl>" TARGET="OrderReport"> -<Table> -<TR> -<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'> - </A> -</TD> -</TR> -<TR> -<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'> - </A> -</TD> -</TR> +<form method="post" name="itemreportform" action="<@ofbizUrl>orderitemreportjasper.pdf</@ofbizUrl>" target="OrderReport"> +<table> +<tr> +<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'> + </a> +</td> +</tr> +<tr> +<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'> + </a> +</td> +</tr> <#-- <tr> <td><div>Report:</div></td> <td> - <SELECT NAME="groupName" tabindex="14" CLASS="stateSelectBox"> - <OPTION VALUE="orderStatus"></OPTION> - <OPTION VALUE="orderStatus">Orders by Order Status</OPTION> - <OPTION VALUE="ship">Orders by Ship Method</OPTION> - <OPTION VALUE="payment">Orders by Payment Method</OPTION> - <OPTION VALUE="adjustment">Order Items by Adjustment</OPTION> - <OPTION VALUE="itemStatus">Order Items by Status</OPTION> - <OPTION VALUE="product">Order Items by Product</OPTION> - </SELECT> + <select name="groupName" tabindex="14" class="stateSelectBox"> + <option value="orderStatus"></option> + <option value="orderStatus">Orders by Order Status</option> + <option value="ship">Orders by Ship Method</option> + <option value="payment">Orders by Payment Method</option> + <option value="adjustment">Order Items by Adjustment</option> + <option value="itemStatus">Order Items by Status</option> + <option value="product">Order Items by Product</option> + </select> </td> </tr> --> </table> - <INPUT TYPE="submit" TABINDEX="16" CLASS="button" NAME="GoReport" VALUE="Item Report"> + <input type="submit" tabindex="16" class="button" name="GoReport" value="Item Report"> </form> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl Wed Apr 7 21:15:53 2010 @@ -30,7 +30,7 @@ under the License. <br /><br /> Please login to the url below and add another note as a reply if required.<br /><br /> The status and used hours can always be checked <br /> - <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here.....</a> + <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here.....</a> <br /><br /> Regards.<br /><br /> Thank you for your business. Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl Wed Apr 7 21:15:53 2010 @@ -28,7 +28,7 @@ under the License. <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been completed. <br /><br /> The status and used hours can always be checked at the url: <br /> - <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a> + <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a> <br /><br /> Regards.<br /><br /> Thank you for your business. Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl Wed Apr 7 21:15:53 2010 @@ -30,7 +30,7 @@ under the License. We will solve/implement the request as soon as possible <br /><br /> The status and used hours can always be checked <br /> - <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here....</a> + <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here....</a> <br /><br /> Regards. <br /><br /> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestitemnotes.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestitemnotes.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestitemnotes.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestitemnotes.ftl Wed Apr 7 21:15:53 2010 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <#if showAll = "false"> - <a href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequestId}&custRequestItemSeqId=${custRequestItemSeqId}&showAll=true</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderShowAllNotes}</a> + <a href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequestId}&custRequestItemSeqId=${custRequestItemSeqId}&showAll=true</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderShowAllNotes}</a> <#else> - <a href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequestId}&custRequestItemSeqId=${custRequestItemSeqId}&showAll=false</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderShowThisItemsNotes}</a> + <a href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequestId}&custRequestItemSeqId=${custRequestItemSeqId}&showAll=false</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderShowThisItemsNotes}</a> </#if> 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=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl Wed Apr 7 21:15:53 2010 @@ -58,7 +58,7 @@ under the License. </#if> </select> <#else> - <input type='text' size='20' name='paymentMethodId'> + <input type='text' size='20' name='paymentMethodId' /> </#if> <#if (party.partyId)?has_content> <a href="/partymgr/control/editcreditcard?partyId=${party.partyId}${externalKeyParam}" target="partymgr" class="smallSubmit">${uiLabelMap.AccountingCreateNewCreditCard}</a> @@ -77,10 +77,10 @@ under the License. <#list shippingContactMechList as shippingContactMech> <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")> <tr> - <td align="right" width="1%" valign="top" nowrap> - <input type="radio" name="originContactMechId" value="${shippingAddress.contactMechId}" <#if (shippingContactMechList?size == 1)>checked</#if>> + <td align="right" width="1%" valign="top" nowrap="nowrap"> + <input type="radio" name="originContactMechId" value="${shippingAddress.contactMechId}" <#if (shippingContactMechList?size == 1)>checked</#if> /> </td> - <td width="99%" valign="top" nowrap> + <td width="99%" valign="top" nowrap="nowrap"> <div> <#if shippingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${shippingAddress.toName}<br /></#if> <#if shippingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span></b> ${shippingAddress.attnName}<br /></#if> @@ -90,7 +90,7 @@ under the License. <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> - <#--<a href="<@ofbizUrl>editcontactmech?DONE_PAGE=checkoutoptions&contactMechId=${shippingAddress.contactMechId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonUpdate}]</a>--> + <#--<a href="<@ofbizUrl>editcontactmech?DONE_PAGE=checkoutoptions&contactMechId=${shippingAddress.contactMechId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonUpdate}]</a>--> </div> </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=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl Wed Apr 7 21:15:53 2010 @@ -27,9 +27,9 @@ under the License. <div class="screenlet-body"> <#if returnHeader?exists> <form name="returnhead" method="post" action="<@ofbizUrl>updateReturn</@ofbizUrl>"> - <input type="hidden" name="returnId" value="${returnHeader.returnId}"> + <input type="hidden" name="returnId" value="${returnHeader.returnId}" /> <input type="hidden" name="returnHeaderTypeId" value="CUSTOMER_RETURN"/> - <input type="hidden" name="currentStatusId" value="${returnHeader.statusId?if_exists}"> + <input type="hidden" name="currentStatusId" value="${returnHeader.statusId?if_exists}" /> <#else> <form name="returnhead" method="post" action="<@ofbizUrl>createReturn</@ofbizUrl>"> <input type="hidden" name="returnHeaderTypeId" value="CUSTOMER_RETURN"/> @@ -39,14 +39,14 @@ under the License. <#if returnHeader?exists> <tr> <td width='14%'> </td> - <td width='6%' align='right' nowrap class="label">${uiLabelMap.OrderReturnId}</td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnId}</td> <td width='6%'> </td> <td width='74%' align='left'>${returnHeader.returnId}</td> </tr> </#if> <tr> <td width='14%'> </td> - <td width='6%' align='right' nowrap class="label">${uiLabelMap.CommonCurrency}</td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.CommonCurrency}</td> <td width='6%'> </td> <td width='74%'> <#if returnHeader?exists> @@ -71,22 +71,22 @@ under the License. </tr> <tr> <td width='14%'> </td> - <td width='6%' align='right' nowrap class="label">${uiLabelMap.OrderEntryDate}</td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderEntryDate}</td> <td width='6%'> </td> <td width='74%'> <#if returnInfo.entryDate?exists> <#assign entryDate = returnInfo.get("entryDate").toString()> </#if> - <input type='text' size='25' name='entryDate' value='${entryDate?if_exists}'> + <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> </td> </tr> <tr> <td width='14%'> </td> - <td width='6%' align='right' nowrap class="label">${uiLabelMap.OrderReturnFromParty}</td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnFromParty}</td> <td width='6%'> </td> <td width='74%'> - <input type='text' size='20' name='fromPartyId' value='${returnInfo.fromPartyId?if_exists}'> + <input type='text' size='20' name='fromPartyId' value='${returnInfo.fromPartyId?if_exists}' /> <a href="javascript:call_fieldlookup2(document.returnhead.fromPartyId,'LookupPartyName');"> <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/> </a> @@ -94,7 +94,7 @@ under the License. </tr> <tr> <td width='14%'> </td> - <td width='6%' align='right' nowrap class="label">${uiLabelMap.OrderReturnToFacility}</td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnToFacility}</td> <td width='6%'> </td> <td width='74%'> <select name='destinationFacilityId'> @@ -110,7 +110,7 @@ under the License. </tr> <tr> <td width='14%'> </td> - <td width='6%' align='right' nowrap class="label">${uiLabelMap.AccountingBillingAccount}</td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.AccountingBillingAccount}</td> <td width='6%'> </td> <td width='74%'> <#if billingAccountList?has_content> @@ -125,13 +125,13 @@ under the License. </#list> </select> <#else> - <input type='text' size='20' name='billingAccountId'> + <input type='text' size='20' name='billingAccountId' /> </#if> </td> </tr> <tr> <td width='14%'> </td> - <td width='6%' align='right' nowrap class="label">${uiLabelMap.FormFieldTitle_paymentMethodId}</td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.FormFieldTitle_paymentMethodId}</td> <td width='6%'> </td> <td width='74%'> <#if creditCardList?exists || eftAccountList?exists> @@ -165,7 +165,7 @@ under the License. </tr> <tr> <td width='14%'> </td> - <td width='6%' align='right' nowrap class="label">${uiLabelMap.OrderReturnNeedsAutoReceive}</td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnNeedsAutoReceive}</td> <td width='6%'> </td> <td width='74%'> <select name='needsInventoryReceive'> @@ -185,7 +185,7 @@ under the License. <#if returnHeader?has_content> <tr> <td width='14%'> </td> - <td width='6%' align='right' nowrap class="label">${uiLabelMap.CommonReturnStatus}</td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.CommonReturnStatus}</td> <td width='6%'> </td> <td width='74%'> <select name="statusId"> @@ -201,13 +201,13 @@ under the License. </tr> <tr> <td width='14%'> </td> - <td width='6%' align='right' nowrap class="label">${uiLabelMap.FormFieldTitle_createdBy}</td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.FormFieldTitle_createdBy}</td> <td width='6%'> </td> <td width='74%'>${returnHeader.createdBy?default("Unknown")}</td> </tr> <tr> <td width='14%'> </td> - <td width='6%' align='right' valign='top' nowrap class="label">${uiLabelMap.OrderReturnFromAddress}</td> + <td width='6%' align='right' valign='top' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnFromAddress}</td> <td width='6%'> </td> <td width='74%'> <div> @@ -215,7 +215,7 @@ under the License. <#list addresses as address > <@displayAddress postalAddress = address.postalAddress editable = true/> </#list> - <input type='radio' name="originContactMechId" value="" <#if (!postalAddressFrom?has_content)> checked="checked"</#if>>${uiLabelMap.CommonNoAddress} + <input type='radio' name="originContactMechId" value="" <#if (!postalAddressFrom?has_content)> checked="checked"</#if> />${uiLabelMap.CommonNoAddress} <#else> <#if (postalAddressFrom?has_content)> <@displayAddress postalAddress = postalAddressFrom editable = false /> @@ -228,7 +228,7 @@ under the License. </tr> <tr> <td width='14%'> </td> - <td width='6%' align='right' valign='top' nowrap class="label">${uiLabelMap.OrderReturnToAddress}</td> + <td width='6%' align='right' valign='top' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnToAddress}</td> <td width='6%'> </td> <td width='74%'> <#if (postalAddressTo?has_content)> @@ -245,7 +245,7 @@ under the License. </td> </tr> <#else> - <input type="hidden" name="statusId" value="RETURN_REQUESTED"> + <input type="hidden" name="statusId" value="RETURN_REQUESTED" /> <tr> <td width='14%'> </td> <td width='6%'> </td> @@ -261,7 +261,7 @@ under the License. <div> <#if (editable)> <input type='radio' name="originContactMechId" value="${postalAddress.contactMechId?if_exists}" - <#if ( postalAddressFrom?has_content && postalAddressFrom.contactMechId?default("") == postalAddress.contactMechId)>checked="checked"</#if>> + <#if ( postalAddressFrom?has_content && postalAddressFrom.contactMechId?default("") == postalAddress.contactMechId)>checked="checked"</#if> /> </#if> <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${postalAddress.toName}<br /></#if> <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${postalAddress.attnName}<br /></#if> 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=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl Wed Apr 7 21:15:53 2010 @@ -214,7 +214,7 @@ under the License. </tr> <tr> <td> - <input type="text" size="30" name="description_o_${rowCount}"> + <input type="text" size="30" name="description_o_${rowCount}" /> </td> <td> <input type="text" size="8" name="amount_o_${rowCount}" value="${0.00?string("##0.00")}"/> 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=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Wed Apr 7 21:15:53 2010 @@ -72,7 +72,7 @@ under the License. <#if returnHeader.destinationFacilityId?has_content && returnHeader.statusId == "RETURN_ACCEPTED" && returnHeader.returnHeaderTypeId == "CUSTOMER_RETURN"> <#list returnShipmentIds as returnShipmentId> <a href="/facility/control/ViewShipment?shipmentId=${returnShipmentId.shipmentId}${externalKeyParam}" class="buttontext">${uiLabelMap.ProductShipmentId} ${returnShipmentId.shipmentId}</a> - <a href="/facility/control/ReceiveReturn?facilityId=${returnHeader.destinationFacilityId}&returnId=${returnHeader.returnId?if_exists}&shipmentId=${returnShipmentId.shipmentId}${externalKeyParam}" class="buttontext">${uiLabelMap.OrderReceiveReturn}</a> + <a href="/facility/control/ReceiveReturn?facilityId=${returnHeader.destinationFacilityId}&returnId=${returnHeader.returnId?if_exists}&shipmentId=${returnShipmentId.shipmentId}${externalKeyParam}" class="buttontext">${uiLabelMap.OrderReceiveReturn}</a> </#list> <#elseif returnHeader.statusId == "SUP_RETURN_ACCEPTED" && returnHeader.returnHeaderTypeId == "VENDOR_RETURN"> <#if returnShipmentIds?has_content> @@ -80,7 +80,7 @@ under the License. <a href="/facility/control/ViewShipment?shipmentId=${returnShipmentId.shipmentId}${externalKeyParam}" class="buttontext">${uiLabelMap.ProductShipmentId} ${returnShipmentId.shipmentId}</a> </#list> <#else> - <a href="/facility/control/EditShipment?primaryReturnId=${returnHeader.returnId}&partyIdTo=${toPartyId}&statusId=SHIPMENT_INPUT&shipmentTypeId=PURCHASE_RETURN" class="buttontext">${uiLabelMap.OrderCreateReturnShipment}</a> + <a href="/facility/control/EditShipment?primaryReturnId=${returnHeader.returnId}&partyIdTo=${toPartyId}&statusId=SHIPMENT_INPUT&shipmentTypeId=PURCHASE_RETURN" class="buttontext">${uiLabelMap.OrderCreateReturnShipment}</a> </#if> </#if> </#if> @@ -142,7 +142,7 @@ under the License. <#assign rowCount = 0> <#assign rowCountForAdjRemove = 0> <form method="post" action="<@ofbizUrl>updateReturnItems</@ofbizUrl>"> - <input type="hidden" name="_useRowSubmit" value="Y"> + <input type="hidden" name="_useRowSubmit" value="Y" /> <#if returnItems?has_content> <#assign alt_row = false> <#list returnItems as item> @@ -160,10 +160,10 @@ under the License. </#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> - <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 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><div> <#if item.get("productId")?exists> @@ -175,14 +175,14 @@ under the License. <#if readOnly> ${item.description?default("N/A")} <#else> - <input name="description_o_${rowCount}" value="${item.description?if_exists}" type="text" size="15"> + <input name="description_o_${rowCount}" value="${item.description?if_exists}" type="text" size="15" /> </#if> </div></td> <td><div> <#if readOnly> ${item.returnQuantity?string.number} <#else> - <input name="returnQuantity_o_${rowCount}" value="${item.returnQuantity}" type="text" size="8" align="right"> + <input name="returnQuantity_o_${rowCount}" value="${item.returnQuantity}" type="text" size="8" align="right" /> </#if> <#if item.receivedQuantity?exists> <br />${uiLabelMap.OrderTotalQuantityReceive}: ${item.receivedQuantity} @@ -195,7 +195,7 @@ under the License. <#if readOnly> <@ofbizCurrency amount=item.returnPrice isoCode=orderHeader.currencyUom/> <#else> - <input name="returnPrice_o_${rowCount}" value="${item.returnPrice}" type="text" size="8" align="right"> + <input name="returnPrice_o_${rowCount}" value="${item.returnPrice}" type="text" size="8" align="right" /> </#if> </div></td> <td> @@ -307,9 +307,9 @@ under the License. </tr> <#if (!readOnly) && (rowCount > 0)> <tr> - <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 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> </tr> </#if> <tr><td colspan="10"><hr></td></tr> @@ -340,21 +340,21 @@ under the License. <#else> <#assign statusId = "SUP_RETURN_ACCEPTED"> </#if> - <input type="hidden" name="returnId" value="${returnId}"> - <input type="hidden" name="statusId" value="${statusId}"> - <div align="right"><input type="submit" value="${uiLabelMap.OrderReturnAccept}"></div> + <input type="hidden" name="returnId" value="${returnId}" /> + <input type="hidden" name="statusId" value="${statusId}" /> + <div align="right"><input type="submit" value="${uiLabelMap.OrderReturnAccept}" /></div> </form> </#if> <#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED"> <br /> <form name="returnItems" method="post" action="<@ofbizUrl>returnItems</@ofbizUrl>"> - <input type="hidden" name="returnId" value="${returnId}"> + <input type="hidden" name="returnId" value="${returnId}" /> <table border='0' cellpadding='2' cellspacing='0'> <tr><td colspan="4"><h3>${uiLabelMap.OrderReturnItems}</h3></td></tr> <#if partyOrders?has_content> <tr> - <td width='25%' align='right' nowrap class="label">${uiLabelMap.OrderOrderId}</td> + <td width='25%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderOrderId}</td> <td> </td> <td width='25%'> <select name="orderId"> @@ -367,13 +367,13 @@ under the License. </tr> <#else> <tr> - <td colspan="4" nowrap><div>${uiLabelMap.OrderNoOrderFoundForParty}: <a href="${customerDetailLink}${partyId?default('_NA_')}" class="buttontext">${partyId?default('[null]')}</a></div></td> + <td colspan="4" nowrap="nowrap"><div>${uiLabelMap.OrderNoOrderFoundForParty}: <a href="${customerDetailLink}${partyId?default('_NA_')}" class="buttontext">${partyId?default('[null]')}</a></div></td> </tr> <tr> - <td width='25%' align='right' nowrap><div>${uiLabelMap.OrderOrderId}</div></td> + <td width='25%' align='right' nowrap="nowrap"><div>${uiLabelMap.OrderOrderId}</div></td> <td> </td> <td width='25%'> - <input type='text' name='orderId' size='20' maxlength='20'> + <input type='text' name='orderId' size='20' maxlength='20' /> </td> <td><div class="tooltip">${uiLabelMap.OrderReturnLoadItems}</div></td> </tr> @@ -391,8 +391,8 @@ under the License. <#else> <#assign selectAllFormName = "returnItems"/> <form name="returnItems" method="post" action="<@ofbizUrl>createReturnItems</@ofbizUrl>"> - <input type="hidden" name="returnId" value="${returnId}"> - <input type="hidden" name="_useRowSubmit" value="Y"> + <input type="hidden" name="returnId" value="${returnId}" /> + <input type="hidden" name="_useRowSubmit" value="Y" /> <#include "returnItemInc.ftl"/> </form> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl?rev=931691&r1=931690&r2=931691&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl Wed Apr 7 21:15:53 2010 @@ -34,7 +34,7 @@ under the License. <#if returnItems?has_content> <#assign orderId = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(returnItems)).getString("orderId")/> <#assign partyId = "${(returnHeader.fromPartyId)?if_exists}"/> - <a href="<@ofbizUrl>setOrderCurrencyAgreementShipDates?partyId=${partyId?if_exists}&originOrderId=${orderId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateExchangeOrder} ${uiLabelMap.CommonFor} ${orderId?if_exists}</a> + <a href="<@ofbizUrl>setOrderCurrencyAgreementShipDates?partyId=${partyId?if_exists}&originOrderId=${orderId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateExchangeOrder} ${uiLabelMap.CommonFor} ${orderId?if_exists}</a> </#if> <#if "RETURN_ACCEPTED" == returnHeader.statusId> <#assign returnItems = delegator.findByAnd("ReturnItem", {"returnId" : returnId})/> @@ -52,7 +52,7 @@ under the License. <form name="upsEmailReturnLabel" method="post" action="<@ofbizUrl>upsEmailReturnLabelReturn</@ofbizUrl>"> <input type="hidden" name="returnId" value="${returnId}"/> <input type="hidden" name="shipmentId" value="${shipGroupShipment.shipmentId}"/> - <input type="hidden" name="shipmentRouteSegmentId" value=${shipmentRouteSegment.shipmentRouteSegmentId}> + <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegment.shipmentRouteSegmentId}" /> </form> </#if> </#if> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |