You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2010/03/16 02:56:47 UTC
svn commit: r923545 [2/6] - in /ofbiz/trunk:
applications/accounting/webapp/accounting/
applications/accounting/webapp/accounting/payment/
applications/accounting/webapp/accounting/reports/
applications/commonext/webapp/ofbizsetup/organization/ applica...
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=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl Tue Mar 16 01:56:41 2010
@@ -107,7 +107,7 @@ function submitForm(form, mode, value) {
</td>
</tr>
<#if (shoppingCart.getTotalQuantity() > 1) && !shoppingCart.containAllWorkEffortCartItems()> <#-- no splitting when only rental items -->
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2" align="center">
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSplitIntoMultipleShipments}</a>
@@ -118,7 +118,7 @@ function submitForm(form, mode, value) {
</tr>
</#if>
<#if shippingContactMechList?has_content>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<#list shippingContactMechList as shippingContactMech>
<#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
<tr>
@@ -127,20 +127,20 @@ function submitForm(form, mode, value) {
</td>
<td valign="top" width="99%">
<div>
- <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br/></#if>
- <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${shippingAddress.attnName}<br/></#if>
- <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if>
- <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if>
+ <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if>
+ <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${shippingAddress.attnName}<br /></#if>
+ <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if>
+ <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if>
<#if shippingAddress.city?has_content>${shippingAddress.city}</#if>
- <#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>
+ <#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="javascript:submitForm(document.checkoutInfoForm, 'EA', '${shippingAddress.contactMechId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
</div>
</td>
</tr>
<#if shippingContactMech_has_next>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
</#if>
</#list>
</#if>
@@ -148,7 +148,7 @@ function submitForm(form, mode, value) {
<#-- Party Tax Info -->
<#-- commented out by default because the TaxAuthority drop-down is just too wide...
- <hr/>
+ <hr />
<div> ${uiLabelMap.PartyTaxIdentification}</div>
${screens.render("component://order/widget/ordermgr/OrderEntryOrderScreens.xml#customertaxinfo")}
-->
@@ -195,7 +195,7 @@ function submitForm(form, mode, value) {
</td>
</tr>
</#if>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.OrderShipAllAtOnce}?</h2>
@@ -217,7 +217,7 @@ function submitForm(form, mode, value) {
<div>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div>
</td>
</tr>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<#else/>
<input type="hidden" name="shipping_method" value="NO_SHIPPING@_NA_"/>
<input type="hidden" name="may_split" value="false"/>
@@ -235,7 +235,7 @@ function submitForm(form, mode, value) {
</tr>
<#if shipping == true>
<#if productStore.showCheckoutGiftOptions?if_exists != "N" && giftEnable?if_exists != "N">
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2">
<div>
@@ -245,7 +245,7 @@ function submitForm(form, mode, value) {
</div>
</td>
</tr>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.OrderGiftMessage}</h2>
@@ -260,7 +260,7 @@ function submitForm(form, mode, value) {
<input type="hidden" name="is_gift" value="false"/>
</#if>
</#if>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.PartyEmailAddresses}</h2>
@@ -278,7 +278,7 @@ function submitForm(form, mode, value) {
</div>
<div>${uiLabelMap.OrderUpdateEmailAddress} <a href="<#if customerDetailLink?exists>${customerDetailLink}${shoppingCart.getPartyId()}" target="partymgr"
<#e...@ofbizUrl>"</#if> class="buttontext">${uiLabelMap.PartyProfile}</a>.</div>
- <br/>
+ <br />
<div>${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</div>
<input type="text" size="30" name="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()?if_exists}"/>
</td>
@@ -309,13 +309,13 @@ function submitForm(form, mode, value) {
</#if>
</td>
</tr>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2" align="center">
<a href="javascript:submitForm(document.checkoutInfoForm, 'SP', '');" class="buttontext">${uiLabelMap.AccountingSplitPayment}</a>
</td>
</tr>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists>
<tr>
<td width="1%">
@@ -356,7 +356,7 @@ function submitForm(form, mode, value) {
</td>
</tr>
</#if>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<#-- financial accounts -->
<#list finAccounts as finAccount>
@@ -390,7 +390,7 @@ function submitForm(form, mode, value) {
<td width="50%">
<span>CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</span>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EC', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
- <#if paymentMethod.description?has_content><br/><span>(${paymentMethod.description})</span></#if>
+ <#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if>
${uiLabelMap.OrderCardSecurityCode} <input type="text" size="5" maxlength="10" name="securityCode_${paymentMethod.paymentMethodId}" value=""/>
</td>
</tr>
@@ -405,7 +405,7 @@ function submitForm(form, mode, value) {
<td width="50%">
<span>${uiLabelMap.AccountingEFTAccount}: ${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}</span>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EE', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
- <#if paymentMethod.description?has_content><br/><span>(${paymentMethod.description})</span></#if>
+ <#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if>
</td>
</tr>
</#if>
@@ -436,7 +436,7 @@ function submitForm(form, mode, value) {
<td width="50%">
<span>${uiLabelMap.AccountingGift}: ${giftCardNumber}</span>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EG', '${paymentMethod.paymentMethodId}');" class="buttontext">[${uiLabelMap.CommonUpdate}]</a>
- <#if paymentMethod.description?has_content><br/><span>(${paymentMethod.description})</span></#if>
+ <#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if>
</td>
</tr>
</#if>
@@ -447,7 +447,7 @@ function submitForm(form, mode, value) {
<#-- special billing account functionality to allow use w/ a payment method -->
<#if productStorePaymentMethodTypeIdMap.EXT_BILLACT?exists>
<#if billingAccountList?has_content>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td width="1%">
<select name="billingAccountId">
@@ -476,7 +476,7 @@ function submitForm(form, mode, value) {
<#-- end of special billing account functionality -->
<#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td width="1%">
<input type="checkbox" name="addGiftCard" value="Y"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl?rev=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl Tue Mar 16 01:56:41 2010
@@ -72,7 +72,7 @@ function toggleBillingAccount(box) {
</td>
</tr>
<#if shippingContactMechList?has_content>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<#list shippingContactMechList as shippingContactMech>
<#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
<#assign checkThisAddress = (shippingContactMech_index == 0 && !cart.getShippingContactMechId()?has_content) || (cart.getShippingContactMechId()?default("") == shippingAddress.contactMechId)/>
@@ -82,19 +82,19 @@ function toggleBillingAccount(box) {
</td>
<td valign="top" width="99%" nowrap>
<div>
- <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br/></#if>
- <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${shippingAddress.attnName}<br/></#if>
- <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if>
- <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if>
+ <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if>
+ <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${shippingAddress.attnName}<br /></#if>
+ <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if>
+ <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if>
<#if shippingAddress.city?has_content>${shippingAddress.city}</#if>
- <#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>
+ <#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="javascript:submitForm(document.checkoutInfoForm, 'EA', '${shippingAddress.contactMechId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
</div>
</td>
</tr>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
</#list>
</#if>
</table>
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=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl Tue Mar 16 01:56:41 2010
@@ -134,7 +134,7 @@ under the License.
</tr>
</table>
</div>
-<br/>
+<br />
<#else>
<h3>${uiLabelMap.OrderViewPermissionError}</h3>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl Tue Mar 16 01:56:41 2010
@@ -21,7 +21,7 @@ under the License.
<table border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
<tr>
<td width='100%'>
- <br/>
+ <br />
<table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
<tr>
<td>
@@ -59,7 +59,7 @@ under the License.
<#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", supplierPartyId))?if_exists />
<table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0">
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2">
<h1><b>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}</b><#if supplier?has_content> - ${supplier.groupName?default(supplier.partyId)}</#if></h1>
@@ -208,7 +208,7 @@ under the License.
</tr>
</table>
-<br/>
+<br />
<#else>
<h3>${uiLabelMap.OrderViewPermissionError}</h3>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl?rev=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl Tue Mar 16 01:56:41 2010
@@ -31,7 +31,7 @@ under the License.
${orderName}
</td>
</tr>
- <tr><td colspan="7"><hr/></td></tr>
+ <tr><td colspan="7"><hr /></td></tr>
</#if>
<#-- order for party -->
<#if (orderForParty?exists)>
@@ -44,7 +44,7 @@ under the License.
${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(orderForParty, false)} [${orderForParty.partyId}]
</td>
</tr>
- <tr><td colspan="7"><hr/></td></tr>
+ <tr><td colspan="7"><hr /></td></tr>
</#if>
<#if (cart.getPoNumber()?has_content)>
<tr>
@@ -56,7 +56,7 @@ under the License.
${cart.getPoNumber()}
</td>
</tr>
- <tr><td colspan="7"><hr/></td></tr>
+ <tr><td colspan="7"><hr /></td></tr>
</#if>
<#if orderTerms?has_content>
<tr>
@@ -72,7 +72,7 @@ under the License.
<td width="10%"><div><b>${uiLabelMap.OrderOrderTermDays}</b></div></td>
<td width="45%"><div><b>${uiLabelMap.CommonDescription}</b></div></td>
</tr>
- <tr><td colspan="4"><hr/></td></tr>
+ <tr><td colspan="4"><hr /></td></tr>
<#assign index=0/>
<#list orderTerms as orderTerm>
<tr>
@@ -82,14 +82,14 @@ under the License.
<td width="45%"><div>${orderTerm.textValue?default("")}</div></td>
</tr>
<#if orderTerms.size()<index>
- <tr><td colspan="4"><hr/></td></tr>
+ <tr><td colspan="4"><hr /></td></tr>
</#if>
<#assign index=index+1/>
</#list>
</table>
</td>
</tr>
- <tr><td colspan="7"><hr/></td></tr>
+ <tr><td colspan="7"><hr /></td></tr>
</#if>
<#-- tracking number -->
<#if trackingNumber?has_content>
@@ -103,7 +103,7 @@ under the License.
<div>${trackingNumber}</div>
</td>
</tr>
- <tr><td colspan="7"><hr/></td></tr>
+ <tr><td colspan="7"><hr /></td></tr>
</#if>
<#-- splitting preference -->
<tr>
@@ -120,7 +120,7 @@ under the License.
</tr>
<#-- shipping instructions -->
<#if shippingInstructions?has_content>
- <tr><td colspan="7"><hr/></td></tr>
+ <tr><td colspan="7"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="15%">
<div> <b>${uiLabelMap.OrderSpecialInstructions}</b></div>
@@ -131,7 +131,7 @@ under the License.
</td>
</tr>
</#if>
- <tr><td colspan="7"><hr/></td></tr>
+ <tr><td colspan="7"><hr /></td></tr>
<#if orderType != "PURCHASE_ORDER" && (productStore.showCheckoutGiftOptions)?if_exists != "N">
<#-- gift settings -->
<tr>
@@ -146,7 +146,7 @@ under the License.
</div>
</td>
</tr>
- <tr><td colspan="7"><hr/></td></tr>
+ <tr><td colspan="7"><hr /></td></tr>
<#if giftMessage?has_content>
<tr>
<td align="right" valign="top" width="15%">
@@ -157,7 +157,7 @@ under the License.
<div>${giftMessage}</div>
</td>
</tr>
- <tr><td colspan="7"><hr/></td></tr>
+ <tr><td colspan="7"><hr /></td></tr>
</#if>
</#if>
<#if shipAfterDate?has_content>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl?rev=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl Tue Mar 16 01:56:41 2010
@@ -38,7 +38,7 @@ under the License.
</tr>
<#list orderItems?if_exists as orderItem>
<#assign itemType = orderItem.getRelatedOne("OrderItemType")?if_exists>
- <tr><td colspan="6"><hr/></td></tr>
+ <tr><td colspan="6"><hr /></td></tr>
<tr>
<#if orderItem.productId?exists && orderItem.productId == "_?_">
<td colspan="1" valign="top">
@@ -127,7 +127,7 @@ under the License.
<tr><td><font color="red">${uiLabelMap.checkhelpertotalsdonotmatchordertotal}</font></td></tr>
</#if>
- <tr><td colspan="8"><hr/></td></tr>
+ <tr><td colspan="8"><hr /></td></tr>
<tr>
<td align="right" colspan="4"><div><b>${uiLabelMap.OrderSubTotal}</b></div></td>
<td align="right" nowrap><div> <#if orderSubTotal?exists><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></#if></div></td>
@@ -147,7 +147,7 @@ under the License.
<td align="right" nowrap><div><#if orderTaxTotal?exists><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/></#if></div></td>
</tr>
- <tr><td colspan=2></td><td colspan="8"><hr/></td></tr>
+ <tr><td colspan=2></td><td colspan="8"><hr /></td></tr>
<tr>
<td align="right" colspan="4"><div><b>${uiLabelMap.OrderGrandTotal}</b></div></td>
<td align="right" nowrap>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl?rev=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl Tue Mar 16 01:56:41 2010
@@ -32,7 +32,7 @@ under the License.
<td colspan="3" valign="top">
<div align="center"><b>${uiLabelMap.AccountingOfflinePayment}</b></div>
<#if orderHeader?has_content && paymentAddress?has_content>
- <div align="center"><hr/></div>
+ <div align="center"><hr /></div>
<div align="center"><b>${uiLabelMap.AccountingPleaseSendPaymentTo}:</b></div>
<#if paymentAddress.toName?has_content><div align="center">${paymentAddress.toName}</div></#if>
<#if paymentAddress.attnName?has_content><div align="center"><b>${uiLabelMap.CommonAttn}:</b> ${paymentAddress.attnName}</div></#if>
@@ -40,7 +40,7 @@ under the License.
<#if paymentAddress.address2?has_content><div align="center">${paymentAddress.address2}</div></#if>
<div align="center">${paymentAddress.city}<#if paymentAddress.stateProvinceGeoId?has_content>, ${paymentAddress.stateProvinceGeoId}</#if> ${paymentAddress.postalCode}
<div align="center">${paymentAddress.countryGeoId}</div>
- <div align="center"><hr/></div>
+ <div align="center"><hr /></div>
<div align="center"><b>${uiLabelMap.OrderBeSureIncludeOrder} #</b></div>
</#if>
</td>
@@ -63,13 +63,13 @@ under the License.
<td width="5"> </td>
<td valign="top" width="80%">
<div>
- <#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard}<br/></#if>
+ <#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard}<br /></#if>
<#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if>
${creditCard.firstNameOnCard}
<#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if>
${creditCard.lastNameOnCard}
<#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if>
- <br/>
+ <br />
${formattedCardNumber}
</div>
</td>
@@ -83,9 +83,9 @@ under the License.
<td width="5"> </td>
<td valign="top" width="80%">
<div>
- ${eftAccount.nameOnAccount}<br/>
- <#if eftAccount.companyNameOnAccount?has_content>${eftAccount.companyNameOnAccount}<br/></#if>
- Bank: ${eftAccount.bankName}, ${eftAccount.routingNumber}<br/>
+ ${eftAccount.nameOnAccount}<br />
+ <#if eftAccount.companyNameOnAccount?has_content>${eftAccount.companyNameOnAccount}<br /></#if>
+ Bank: ${eftAccount.bankName}, ${eftAccount.routingNumber}<br />
Account #: ${eftAccount.accountNumber}
</div>
</td>
@@ -95,7 +95,7 @@ under the License.
<#-- billing account info -->
<#if billingAccount?has_content>
<#if outputted?default(false)>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
</#if>
<#assign outputted = true/>
<tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl?rev=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl Tue Mar 16 01:56:41 2010
@@ -56,7 +56,7 @@ standard order confirmation page and to
<#if (numberOfItems > 0)>
<#-- spacer goes here -->
- <tr><td colspan="5"><hr/></td></tr>
+ <tr><td colspan="5"><hr /></td></tr>
<tr>
@@ -69,10 +69,10 @@ standard order confirmation page and to
</#if>
<#if address?exists>
- <#if address.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${address.toName}<br/></#if>
- <#if address.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${address.attnName}<br/></#if>
- <#if address.address1?has_content>${address.address1}<br/></#if>
- <#if address.address2?has_content>${address.address2}<br/></#if>
+ <#if address.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${address.toName}<br /></#if>
+ <#if address.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${address.attnName}<br /></#if>
+ <#if address.address1?has_content>${address.address1}<br /></#if>
+ <#if address.address2?has_content>${address.address2}<br /></#if>
<#if address.city?has_content>${address.city}</#if>
<#if address.stateProvinceGeoId?has_content> ${address.stateProvinceGeoId}</#if>
<#if address.postalCode?has_content>, ${address.postalCode?if_exists}</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl?rev=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl Tue Mar 16 01:56:41 2010
@@ -80,4 +80,4 @@ under the License.
<p><strong>${uiLabelMap.CommonTotal}</strong>: <@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=currencyUomId/></p>
</div>
</div>
-<br/>
+<br />
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl?rev=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl Tue Mar 16 01:56:41 2010
@@ -48,4 +48,4 @@ under the License.
</ul>
</div>
</div>
-<br/>
+<br />
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=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Tue Mar 16 01:56:41 2010
@@ -51,7 +51,7 @@ under the License.
<div>${uiLabelMap.FacilityFacility}: ${facility.facilityName?if_exists} [${facility.facilityId}]</div>
</td>
</tr>
- <tr><td colspan="4"><hr/></td></tr>
+ <tr><td colspan="4"><hr /></td></tr>
<#-- company postal addresses -->
@@ -66,14 +66,14 @@ under the License.
<td nowrap> </td>
<td valign="top" width="100%" 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>
- <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if>
- <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if>
+ <#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>
+ <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if>
+ <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if>
<#if shippingAddress.city?has_content>${shippingAddress.city}</#if>
- <#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>
+ <#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>
</div>
</td>
<td>
@@ -81,7 +81,7 @@ under the License.
</td>
</tr>
<#if shippingContactMech_has_next>
- <tr><td colspan="4"><hr/></td></tr>
+ <tr><td colspan="4"><hr /></td></tr>
</#if>
</#if>
<#assign i = i + 1>
@@ -123,7 +123,7 @@ under the License.
<#assign currShipContactMechId = cart.getShippingContactMechId(shipGroupIndex)?if_exists>
<#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)?if_exists>
<#assign facilityId = cart.getShipGroupFacilityId(shipGroupIndex)?if_exists>
- <hr/>
+ <hr />
<table width="100%" border="0" cellpadding="1" cellspacing="0">
<tr>
<td colspan="3">
@@ -152,7 +152,7 @@ under the License.
</td>
</tr>
<#if shippingContactMechList?has_content>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<#assign i = 0>
<#list shippingContactMechList as shippingContactMech>
<#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
@@ -175,14 +175,14 @@ under the License.
</td>
<td valign="top" width="99%" 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>
- <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if>
- <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if>
+ <#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>
+ <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if>
+ <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if>
<#if shippingAddress.city?has_content>${shippingAddress.city}</#if>
- <#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>
+ <#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>
</div>
</td>
<td>
@@ -190,15 +190,15 @@ under the License.
</td>
</tr>
<#if shippingContactMech_has_next>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
</#if>
<#assign i = i + 1>
</#list>
</#if>
<#if shipToPartyShippingContactMechList?has_content>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr><td colspan="3">${uiLabelMap.OrderShipToAnotherParty}: <b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(shipToParty)}</b></td></tr>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<#list shipToPartyShippingContactMechList as shippingContactMech>
<#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
<tr>
@@ -207,20 +207,20 @@ under the License.
</td>
<td valign="top" width="99%" 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>
- <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if>
- <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if>
+ <#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>
+ <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if>
+ <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if>
<#if shippingAddress.city?has_content>${shippingAddress.city}</#if>
- <#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>
+ <#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>
</div>
</td>
<td> </td>
</tr>
<#if shippingContactMech_has_next>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
</#if>
</#list>
</#if>
@@ -237,7 +237,7 @@ under the License.
<#-- select a party id to ship to instead -->
- <br/>
+ <br />
<form method="post" action="setShipping" name="partyshipform">
<div class="screenlet">
<div class="screenlet-title-bar">
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=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl Tue Mar 16 01:56:41 2010
@@ -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=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Tue Mar 16 01:56:41 2010
@@ -76,7 +76,7 @@ float: right;
<#list orderItemList as orderItem>
<#if orderItem.productId?exists> <#-- a null product may come from a quote -->
<#assign orderItemContentWrapper = Static["org.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem, request)>
- <tr><td colspan="8"><hr/></td></tr>
+ <tr><td colspan="8"><hr /></td></tr>
<tr>
<#assign orderItemType = orderItem.getRelatedOne("OrderItemType")?if_exists>
<#assign productId = orderItem.productId?if_exists>
@@ -108,7 +108,7 @@ float: right;
<span class="alert">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span>
</#if>
</#if>
- ${uiLabelMap.CommonDescription}<br/>
+ ${uiLabelMap.CommonDescription}<br />
<input type="text" size="20" name="idm_${orderItem.orderItemSeqId}" value="${orderItem.itemDescription?if_exists}"/>
</#if>
</div>
@@ -126,11 +126,11 @@ float: right;
<#-- now show status details per line item -->
<#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")>
<td>
- ${uiLabelMap.CommonCurrent} ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}<br/>
+ ${uiLabelMap.CommonCurrent} ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}<br />
<#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)>
<#list orderItemStatuses as orderItemStatus>
<#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem")>
- ${orderItemStatus.statusDatetime.toString()} ${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}<br/>
+ ${orderItemStatus.statusDatetime.toString()} ${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}<br />
</#list>
<#assign returns = orderItem.getRelated("ReturnItem")?if_exists>
<#if returns?has_content>
@@ -165,9 +165,9 @@ float: right;
<#else>
<#assign remainingQuantity = ((orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - shippedQuantity?double)>
</#if>
- ${uiLabelMap.OrderOrdered} ${orderItem.quantity?default(0)?string.number} <br/>
- ${uiLabelMap.OrderCancelled}: ${orderItem.cancelQuantity?default(0)?string.number} <br/>
- ${uiLabelMap.OrderRemaining}: ${remainingQuantity} <br/>
+ ${uiLabelMap.OrderOrdered} ${orderItem.quantity?default(0)?string.number} <br />
+ ${uiLabelMap.OrderCancelled}: ${orderItem.cancelQuantity?default(0)?string.number} <br />
+ ${uiLabelMap.OrderRemaining}: ${remainingQuantity} <br />
</td>
<td class="align-text" valign="top" nowrap="nowrap">
<#-- check for permission to modify price -->
@@ -282,7 +282,7 @@ float: right;
<input type="submit" value="${uiLabelMap.OrderUpdateItems}" class="buttontext"/>
</td>
</tr>
- <tr><td colspan="8"><hr/></td></tr>
+ <tr><td colspan="8"><hr /></td></tr>
</table>
</form>
</#if>
@@ -348,7 +348,7 @@ float: right;
<input type="hidden" name="comments" value="Added manually by [${userLogin.userLoginId}]"/>
<input type="hidden" name="orderId" value="${orderId?if_exists}"/>
<table class="basic-table" cellspacing="0">
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr>
<td class="align-text" width="55%">
<span class="label">${uiLabelMap.OrderAdjustment}</span>
@@ -376,7 +376,7 @@ float: right;
<#-- subtotal -->
<table class="basic-table" cellspacing="0">
- <tr><td colspan="4"><hr/></td></tr>
+ <tr><td colspan="4"><hr /></td></tr>
<tr class="align-text">
<td width="80%"><span class="label">${uiLabelMap.OrderItemsSubTotal}</span></td>
<td width="10%" nowrap="nowrap"><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></td>
@@ -413,4 +413,4 @@ float: right;
</table>
</div>
</div>
-</#if>
\ No newline at end of file
+</#if>
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=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Tue Mar 16 01:56:41 2010
@@ -461,7 +461,7 @@ function toggleOrderIdList() {
</select>
</td>
</tr>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr>
<td width='25%' align='right'> </td>
<td width='5%'> </td>
@@ -487,7 +487,7 @@ document.lookuporder.orderId.focus();
</script>
</#if>
-<br/>
+<br />
<div id="findOrdersList" class="screenlet">
<div class="screenlet-title-bar">
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=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Tue Mar 16 01:56:41 2010
@@ -74,7 +74,7 @@ under the License.
<#assign contactMech = orderContactMechValueMap.contactMech>
<#assign contactMechPurpose = orderContactMechValueMap.contactMechPurposeType>
<#--<#assign partyContactMech = orderContactMechValueMap.partyContactMech>-->
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="19%">
<span class="label"> ${contactMechPurpose.get("description",locale)}</span>
@@ -85,13 +85,13 @@ under the License.
<#assign postalAddress = orderContactMechValueMap.postalAddress>
<#if postalAddress?has_content>
<div>
- <#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>
- ${postalAddress.address1}<br/>
- <#if postalAddress.address2?has_content>${postalAddress.address2}<br/></#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>
+ ${postalAddress.address1}<br />
+ <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if>
${postalAddress.city?if_exists}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId} </#if>
- ${postalAddress.postalCode?if_exists}<br/>
- ${postalAddress.countryGeoId?if_exists}<br/>
+ ${postalAddress.postalCode?if_exists}<br />
+ ${postalAddress.countryGeoId?if_exists}<br />
<#if !postalAddress.countryGeoId?exists || postalAddress.countryGeoId == "USA">
<#assign addr1 = postalAddress.address1?if_exists>
<#if (addr1.indexOf(" ") > 0)>
@@ -106,7 +106,7 @@ under the License.
<input type="hidden" name="orderId" value="${orderId?if_exists}"/>
<input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurpose.contactMechPurposeTypeId?if_exists}"/>
<input type="hidden" name="oldContactMechId" value="${contactMech.contactMechId?if_exists}"/>
- <hr/>
+ <hr />
<div><@partyPostalAddress postalContactMechList = postalContactMechList?if_exists contactMechPurposeTypeId = contactMechPurpose.contactMechPurposeTypeId?if_exists contactPostalAddress=postalAddress?if_exists/><input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/></div>
</form>
</#if>
@@ -151,4 +151,4 @@ under the License.
</table>
</div>
</div>
-</#if>
\ No newline at end of file
+</#if>
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=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Tue Mar 16 01:56:41 2010
@@ -96,7 +96,7 @@ under the License.
<td width="5%"> </td>
<td valign="top" width="80%">${orderHeader.orderName}</td>
</tr>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
</#if>
<#-- order status history -->
<tr>
@@ -105,7 +105,7 @@ under the License.
<td valign="top" width="80%"<#if currentStatus.statusCode?has_content> class="${currentStatus.statusCode}"</#if>>
<span class="current-status">${uiLabelMap.OrderCurrentStatus}: ${currentStatus.get("description",locale)}</span>
<#if orderHeaderStatuses?has_content>
- <hr/>
+ <hr />
<#list orderHeaderStatuses as orderHeaderStatus>
<#assign loopStatusItem = orderHeaderStatus.getRelatedOne("StatusItem")>
<#assign userlogin = orderHeaderStatus.getRelatedOne("UserLogin")>
@@ -118,27 +118,27 @@ under the License.
</#if>
</td>
</tr>
- <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.OrderDateOrdered}</td>
<td width="5%"> </td>
<td valign="top" width="80%">${orderHeader.orderDate.toString()}</td>
</tr>
- <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.CommonCurrency}</td>
<td width="5%"> </td>
<td valign="top" width="80%">${orderHeader.currencyUom?default("???")}</td>
</tr>
<#if orderHeader.internalCode?has_content>
- <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.OrderInternalCode}</td>
<td width="5%"> </td>
<td valign="top" width="80%">${orderHeader.internalCode}</td>
</tr>
</#if>
- <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.OrderSalesChannel}</td>
<td width="5%"> </td>
@@ -151,7 +151,7 @@ under the License.
</#if>
</td>
</tr>
- <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.OrderProductStore}</td>
<td width="5%"> </td>
@@ -163,7 +163,7 @@ under the License.
</#if>
</td>
</tr>
- <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.OrderOriginFacility}</td>
<td width="5%"> </td>
@@ -175,7 +175,7 @@ under the License.
</#if>
</td>
</tr>
- <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.CommonCreatedBy}</td>
<td width="5%"> </td>
@@ -188,7 +188,7 @@ under the License.
</td>
</tr>
<#if orderItem.cancelBackOrderDate?exists>
- <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_cancelBackOrderDate}</td>
<td width="5%"> </td>
@@ -196,7 +196,7 @@ under the License.
</tr>
</#if>
<#if distributorId?exists>
- <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.OrderDistributor}</td>
<td width="5%"> </td>
@@ -207,7 +207,7 @@ under the License.
</tr>
</#if>
<#if affiliateId?exists>
- <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.OrderAffiliate}</td>
<td width="5%"> </td>
@@ -219,7 +219,7 @@ under the License.
</tr>
</#if>
<#if orderContentWrapper.get("IMAGE_URL")?has_content>
- <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.OrderImage}</td>
<td width="5%"> </td>
@@ -231,7 +231,7 @@ under the License.
<#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>
@@ -244,7 +244,7 @@ under the License.
<input type="submit" class="smallSubmit" value="${uiLabelMap.FormFieldTitle_reserveInventory}"/>
</td>
</tr>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
</form>
</#if>
<#if orderHeader.isViewed?has_content && orderHeader.isViewed == "Y">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Tue Mar 16 01:56:41 2010
@@ -55,7 +55,7 @@ under the License.
<#if productId?exists>
${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists}
<#if (product.salesDiscontinuationDate)?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)>
- <br/><span style="color: red;">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span>
+ <br /><span style="color: red;">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span>
</#if>
<#elseif orderItemType?exists>
${orderItemType.description} - ${orderItem.itemDescription?if_exists}
@@ -597,7 +597,7 @@ under the License.
</#list>
</#if>
- <tr><td colspan="7"><hr/></td></tr>
+ <tr><td colspan="7"><hr /></td></tr>
<#list orderHeaderAdjustments as orderHeaderAdjustment>
<#assign adjustmentType = orderHeaderAdjustment.getRelatedOne("OrderAdjustmentType")>
<#assign adjustmentAmount = Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(orderHeaderAdjustment, orderSubTotal)>
@@ -615,7 +615,7 @@ under the License.
</#list>
<#-- subtotal -->
- <tr><td colspan="1"></td><td colspan="6"><hr/></td></tr>
+ <tr><td colspan="1"></td><td colspan="6"><hr /></td></tr>
<tr>
<td align="right" colspan="5"><div><span class="label">${uiLabelMap.OrderItemsSubTotal}</span></div></td>
<td align="right" nowrap="nowrap"><div><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></div></td>
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=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Tue Mar 16 01:56:41 2010
@@ -126,7 +126,7 @@ under the License.
</tr>
<tr>
<td colspan="3" align="center">
- <br/>
+ <br />
</td>
</tr>
<tr>
@@ -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=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Tue Mar 16 01:56:41 2010
@@ -61,13 +61,13 @@ under the License.
</td>
<td width="10%"> </td>
</tr>
- <tr><td colspan="4"><hr/></td></tr>
+ <tr><td colspan="4"><hr /></td></tr>
<#if orderPaymentPreferences?has_content || billingAccount?has_content || invoices?has_content>
<#list orderPaymentPreferences as orderPaymentPreference>
<#assign pmBillingAddress = {}>
<#assign oppStatusItem = orderPaymentPreference.getRelatedOne("StatusItem")>
<#if outputted?default("false") == "true">
- <tr><td colspan="4"><hr/></td></tr>
+ <tr><td colspan="4"><hr /></td></tr>
</#if>
<#assign outputted = "true">
<#-- try the paymentMethod first; if paymentMethodId is specified it overrides paymentMethodTypeId -->
@@ -86,7 +86,7 @@ under the License.
<div>
<span class="label"> ${uiLabelMap.AccountingFinAccount}</span>
<#if orderPaymentPreference.maxAmount?has_content>
- <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
+ <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
</div>
</td>
@@ -97,9 +97,9 @@ under the License.
${finAccountType.description?default(finAccountType.finAccountTypeId)}
</#if>
#${finAccount.finAccountCode?default(finAccount.finAccountId)} (<a href="/accounting/control/EditFinAccount?finAccountId=${finAccount.finAccountId}&externalLoginKey=${externalLoginKey}" class="buttontext">${finAccount.finAccountId}</a>)
- <br/>
+ <br />
${finAccount.finAccountName?if_exists}
- <br/>
+ <br />
<#-- Authorize and Capture transactions -->
<div>
@@ -113,17 +113,17 @@ under the License.
</div>
<#if gatewayResponses?has_content>
<div>
- <hr/>
+ <hr />
<#list gatewayResponses as gatewayResponse>
<#assign transactionCode = gatewayResponse.getRelatedOne("TranCodeEnumeration")>
${(transactionCode.get("description",locale))?default("Unknown")}:
${gatewayResponse.transactionDate.toString()}
- <@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br/>
+ <@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")})
<a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.CommonDetails}</a>
- <#if gatewayResponse_has_next><hr/></#if>
+ <#if gatewayResponse_has_next><hr /></#if>
</#list>
</div>
</#if>
@@ -150,7 +150,7 @@ under the License.
<td align="right" valign="top" width="29%">
<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/>
+ <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
</div>
</td>
@@ -159,9 +159,9 @@ under the License.
<td width="60%">
<div>
<#if orderPaymentPreference.maxAmount?has_content>
- <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
+ <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
- <br/> [<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
+ <br /> [<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
</div>
<#--
<div><@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> - ${(orderPaymentPreference.authDate.toString())?if_exists}</div>
@@ -201,7 +201,7 @@ under the License.
<td align="right" valign="top" width="29%">
<div> <span class="label">${uiLabelMap.AccountingCreditCard}</span>
<#if orderPaymentPreference.maxAmount?has_content>
- <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
+ <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
</div>
</td>
@@ -209,13 +209,13 @@ under the License.
<td valign="top" width="60%">
<div>
<#if creditCard?has_content>
- <#if creditCard.companyNameOnCard?exists>${creditCard.companyNameOnCard}<br/></#if>
+ <#if creditCard.companyNameOnCard?exists>${creditCard.companyNameOnCard}<br /></#if>
<#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if>
${creditCard.firstNameOnCard}
<#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if>
${creditCard.lastNameOnCard?default("N/A")}
<#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if>
- <br/>
+ <br />
<#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)>
${creditCard.cardType}
@@ -226,7 +226,7 @@ under the License.
${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
[<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
</#if>
- <br/>
+ <br />
<#-- Authorize and Capture transactions -->
<div>
@@ -243,17 +243,17 @@ under the License.
</div>
<#if gatewayResponses?has_content>
<div>
- <hr/>
+ <hr />
<#list gatewayResponses as gatewayResponse>
<#assign transactionCode = gatewayResponse.getRelatedOne("TranCodeEnumeration")>
${(transactionCode.get("description",locale))?default("Unknown")}:
${gatewayResponse.transactionDate.toString()}
- <@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br/>
+ <@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")})
<a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.CommonDetails}</a>
- <#if gatewayResponse_has_next><hr/></#if>
+ <#if gatewayResponse_has_next><hr /></#if>
</#list>
</div>
</#if>
@@ -281,7 +281,7 @@ under the License.
<td align="right" valign="top" width="29%">
<div> <span class="label">${uiLabelMap.AccountingEFTAccount}</span>
<#if orderPaymentPreference.maxAmount?has_content>
- <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
+ <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
</div>
</td>
@@ -289,9 +289,9 @@ under the License.
<td valign="top" width="60%">
<div>
<#if eftAccount?has_content>
- ${eftAccount.nameOnAccount?if_exists}<br/>
- <#if eftAccount.companyNameOnAccount?exists>${eftAccount.companyNameOnAccount}<br/></#if>
- ${uiLabelMap.AccountingBankName}: ${eftAccount.bankName}, ${eftAccount.routingNumber}<br/>
+ ${eftAccount.nameOnAccount?if_exists}<br />
+ <#if eftAccount.companyNameOnAccount?exists>${eftAccount.companyNameOnAccount}<br /></#if>
+ ${uiLabelMap.AccountingBankName}: ${eftAccount.bankName}, ${eftAccount.routingNumber}<br />
${uiLabelMap.AccountingAccount}#: ${eftAccount.accountNumber}
<#else>
${uiLabelMap.CommonInformation} ${uiLabelMap.CommonNot} ${uiLabelMap.CommonAvailable}
@@ -321,7 +321,7 @@ under the License.
<td align="right" valign="top" width="29%">
<div> <span class="label">${uiLabelMap.OrderGiftCard}</span>
<#if orderPaymentPreference.maxAmount?has_content>
- <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
+ <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
</div>
</td>
@@ -359,18 +359,18 @@ under the License.
</#if>
</#if>
<#if pmBillingAddress?has_content>
- <tr><td> </td><td> </td><td colspan="3"><hr/></td></tr>
+ <tr><td> </td><td> </td><td colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="29%"> </td>
<td width="1%"> </td>
<td valign="top" width="60%">
<div>
- <#if pmBillingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${pmBillingAddress.toName}<br/></#if>
- <#if pmBillingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${pmBillingAddress.attnName}<br/></#if>
- ${pmBillingAddress.address1}<br/>
- <#if pmBillingAddress.address2?has_content>${pmBillingAddress.address2}<br/></#if>
+ <#if pmBillingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${pmBillingAddress.toName}<br /></#if>
+ <#if pmBillingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${pmBillingAddress.attnName}<br /></#if>
+ ${pmBillingAddress.address1}<br />
+ <#if pmBillingAddress.address2?has_content>${pmBillingAddress.address2}<br /></#if>
${pmBillingAddress.city}<#if pmBillingAddress.stateProvinceGeoId?has_content>, ${pmBillingAddress.stateProvinceGeoId} </#if>
- ${pmBillingAddress.postalCode?if_exists}<br/>
+ ${pmBillingAddress.postalCode?if_exists}<br />
${pmBillingAddress.countryGeoId?if_exists}
</div>
</td>
@@ -382,14 +382,14 @@ under the License.
<#-- billing account -->
<#if billingAccount?exists>
<#if outputted?default("false") == "true">
- <tr><td colspan="4"><hr/></td></tr>
+ <tr><td colspan="4"><hr /></td></tr>
</#if>
<tr>
<td align="right" valign="top" width="29%">
<#-- billing accounts require a special OrderPaymentPreference because it is skipped from above section of OPPs -->
<div> <span class="label">${uiLabelMap.AccountingBillingAccount}</span>
<#if billingAccountMaxAmount?has_content>
- <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=billingAccountMaxAmount?default(0.00) isoCode=currencyUomId/>
+ <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=billingAccountMaxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
</div>
</td>
@@ -401,7 +401,7 @@ under the License.
</tr>
</#if>
<#if customerPoNumber?has_content>
- <tr><td colspan="4"><hr/></td></tr>
+ <tr><td colspan="4"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="29%"><span class="label">${uiLabelMap.OrderPONumber}</span></td>
<td width="1%"> </td>
@@ -412,7 +412,7 @@ under the License.
<#-- invoices -->
<#if invoices?has_content>
- <tr><td colspan="4"><hr/></td></tr>
+ <tr><td colspan="4"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="29%"> <span class="label">${uiLabelMap.OrderInvoices}</span></td>
<td width="1%"> </td>
@@ -431,7 +431,7 @@ under the License.
</tr>
</#if>
<#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED")) && (paymentMethodValueMaps?has_content)>
- <tr><td colspan="4"><hr/></td></tr>
+ <tr><td colspan="4"><hr /></td></tr>
<tr><td colspan="4">
<form name="addPaymentMethodToOrder" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId?if_exists}"/>
@@ -487,4 +487,4 @@ under the License.
</#if>
</table>
</div>
-</div>
\ No newline at end of file
+</div>
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=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Tue Mar 16 01:56:41 2010
@@ -341,7 +341,7 @@ under the License.
<table width="100%" border="0" cellpadding="1" cellspacing="0">
<#if shipGroup.supplierPartyId?has_content>
<#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shipGroup.supplierPartyId))?if_exists />
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="15%">
<span class="label"> ${uiLabelMap.ProductDropShipment} - ${uiLabelMap.PartySupplier}</span>
@@ -357,7 +357,7 @@ under the License.
<#-- getShipGroupEstimate method of ShippingEvents class can be used for get shipping estimate from system, on the basis of new package's weight -->
<#if shippingRateList?has_content>
<#if orderReadHelper.getOrderTypeId() != "PURCHASE_ORDER">
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr>
<td colspan="3">
<table>
@@ -403,7 +403,7 @@ under the License.
<#-- tracking number -->
<#if shipGroup.trackingNumber?has_content || orderShipmentInfoSummaryList?has_content>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="15%">
<span class="label"> ${uiLabelMap.OrderTrackingNumber}</span>
@@ -430,7 +430,7 @@ under the License.
</tr>
</#if>
<#if shipGroup.maySplit?has_content && noShipment?default("false") != "true">
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="15%">
<span class="label"> ${uiLabelMap.OrderSplittingPreference}</span>
@@ -499,7 +499,7 @@ under the License.
<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>
+ <tr><td colspan="3"><hr /></td></tr>
<td align="right" valign="top" width="15%">
<span class="label"> ${uiLabelMap.OrderGiftMessage}</span>
</td>
@@ -521,7 +521,7 @@ under the License.
<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 colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="15%">
<span class="label"> ${uiLabelMap.OrderShipAfterDate}<span>
@@ -546,7 +546,7 @@ under the License.
</form>
<#assign shipGroupShipments = shipGroup.getRelated("PrimaryShipment")>
<#if shipGroupShipments?has_content>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="15%">
<span class="label"> ${uiLabelMap.FacilityShipments}<span>
@@ -582,14 +582,14 @@ under the License.
<#-- Manual shipment options -->
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
<tr>
<td colspan="3" valign="top" width="100%" align="center">
<#if orderHeader.orderTypeId == "SALES_ORDER">
<#if !shipGroup.supplierPartyId?has_content>
<#if orderHeader.statusId == "ORDER_APPROVED">
<a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup}</a>
- <br/>
+ <br />
</#if>
<a href="javascript:document.createShipment_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a>
<form name="createShipment_${shipGroup.shipGroupSeqId}" method="post" action="/facility/control/createShipment">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl?rev=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl Tue Mar 16 01:56:41 2010
@@ -34,7 +34,7 @@ under the License.
</tr>
<tr>
<td colspan="2"> </td>
- <td colspan="4"><hr/></td></tr>
+ <td colspan="4"><hr /></td></tr>
<tr>
<td class="label">${uiLabelMap.OrderOrdersTotals}</td>
<td colspan="5"> </td>
@@ -63,7 +63,7 @@ under the License.
<td align="right">${monthItemTotalPending}</td>
<td align="right">${yearItemTotalPending}</td>
</tr>
- <tr><td colspan="6"><hr/></td></tr>
+ <tr><td colspan="6"><hr /></td></tr>
<tr>
<td class="label">${uiLabelMap.OrderOrdersItemCounts}</td>
<td colspan="5"> </td>
@@ -92,7 +92,7 @@ under the License.
<td align="right">${monthItemCountPending?string.number}</td>
<td align="right">${yearItemCountPending?string.number}</td>
</tr>
- <tr><td colspan="6"><hr/></td></tr>
+ <tr><td colspan="6"><hr /></td></tr>
<tr>
<td class="label">${uiLabelMap.OrderOrdersPending}</td>
<td colspan="5"> </td>
@@ -121,7 +121,7 @@ under the License.
<td align="right">--</td>
<td align="right">--</td>
</tr>
- <tr><td colspan="6"><hr/></td></tr>
+ <tr><td colspan="6"><hr /></td></tr>
<tr>
<td class="label">${uiLabelMap.OrderStatusChanges}</td>
<td colspan="5"> </td>
@@ -171,4 +171,4 @@ under the License.
</div>
<#else>
<h3>${uiLabelMap.OrderViewPermissionError}</h3>
-</#if>
\ No newline at end of file
+</#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=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl Tue Mar 16 01:56:41 2010
@@ -57,7 +57,7 @@ under the License.
<a href="javascript:document.paysetupform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
</div>
</div>
-<br/>
+<br />
<#else>
<h3>${uiLabelMap.OrderViewPermissionError}</h3>
</#if>
\ No newline at end of file
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=923545&r1=923544&r2=923545&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl Tue Mar 16 01:56:41 2010
@@ -28,7 +28,7 @@ under the License.
<div class="screenlet-body">
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
<a href="javascript:document.sendConfirmationForm.submit()" class="buttontext">${uiLabelMap.CommonSend}</a>
- <br/>
+ <br />
<form method="post" action="<@o...@ofbizUrl>" name="sendConfirmationForm">
<#if ! productStoreEmailSetting?exists>
<#assign productStoreEmailSetting = {} />
@@ -83,7 +83,7 @@ under the License.
</tr>
</table>
</form>
- <br/>
+ <br />
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
<a href="javascript:document.sendConfirmationForm.submit()" class="buttontext">${uiLabelMap.CommonSend}</a>
</div>