svn commit: r931670 - in /ofbiz/trunk/applications/acco
Locked
svn commit: r931670 - in /ofbiz/trunk/applications/acco
 
|
Author: buscob
Date: Wed Apr 7 20:27:41 2010 New Revision: 931670 URL: http://svn.apache.org/viewvc?rev=931670&view=rev Log: A patch from Blas Rodriguez Somoza OFBIZ-3584 - XHTML validation errors (accounting) XHTML validation errors * Unclosed INPUT * attributes without values (checked, selected, disabled, etc) * attribute values without " * Uppercase tags or attributes. * Unencoded ampersands in urls. Other errors: CommisionRun.ftl Wrong markup at line 638. (td outside row and table.) <td colspan='4'><h3>${uiLabelMap.AccountingNoInvoicesFound}</h3></td> BatchPayments.ftp Wrong markup at line 675 (opened h2 and closed h3) <h2>${uiLabelMap.AccountingNoRecordFound}</h3> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl ofbiz/trunk/applications/accounting/webapp/ar/invoice/ListInvoices.ftl ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl Wed Apr 7 20:27:41 2010 @@ -29,9 +29,9 @@ under the License. <input type="hidden" name="agreementId" value="${agreementId}"/> <div> <span class="label">${uiLabelMap.AccountingCopyAgreement}</span> - ${uiLabelMap.AccountingAgreementTerms} <input type="checkbox" name="copyAgreementTerms" value="Y" checked/> - ${uiLabelMap.ProductProducts} <input type="checkbox" name="copyAgreementProducts" value="Y" checked/> - ${uiLabelMap.Party} <input type="checkbox" name="copyAgreementParties" value="Y" checked/> + ${uiLabelMap.AccountingAgreementTerms} <input type="checkbox" name="copyAgreementTerms" value="Y" checked="checked" /> + ${uiLabelMap.ProductProducts} <input type="checkbox" name="copyAgreementProducts" value="Y" checked="checked" /> + ${uiLabelMap.Party} <input type="checkbox" name="copyAgreementParties" value="Y" checked="checked" /> </div> <div class="button-bar"> <input type="submit" value="${uiLabelMap.CommonCopy}"/> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl Wed Apr 7 20:27:41 2010 @@ -38,10 +38,10 @@ under the License. <td width="74%"> <select name="titleOnCard"> <option value="">${uiLabelMap.CommonSelectOne}</option> - <option<#if ((creditCard.titleOnCard)?default("") == "${uiLabelMap.CommonTitleMr}")> selected</#if>>${uiLabelMap.CommonTitleMr}</option> - <option<#if ((creditCard.titleOnCard)?default("") == "Mrs.")> selected</#if>>${uiLabelMap.CommonTitleMrs}</option> - <option<#if ((creditCard.titleOnCard)?default("") == "Ms.")> selected</#if>>${uiLabelMap.CommonTitleMs}</option> - <option<#if ((creditCard.titleOnCard)?default("") == "Dr.")> selected</#if>>${uiLabelMap.CommonTitleDr}</option> + <option<#if ((creditCard.titleOnCard)?default("") == "${uiLabelMap.CommonTitleMr}")> selected="selected"</#if>>${uiLabelMap.CommonTitleMr}</option> + <option<#if ((creditCard.titleOnCard)?default("") == "Mrs.")> selected="selected"</#if>>${uiLabelMap.CommonTitleMrs}</option> + <option<#if ((creditCard.titleOnCard)?default("") == "Ms.")> selected="selected"</#if>>${uiLabelMap.CommonTitleMs}</option> + <option<#if ((creditCard.titleOnCard)?default("") == "Dr.")> selected="selected"</#if>>${uiLabelMap.CommonTitleDr}</option> </select> </td> </tr> @@ -72,13 +72,13 @@ under the License. <td width="74%"> <select name="suffixOnCard"> <option value="">${uiLabelMap.CommonSelectOne}</option> - <option<#if ((creditCard.suffixOnCard)?default("") == "Jr.")> selected</#if>>Jr.</option> - <option<#if ((creditCard.suffixOnCard)?default("") == "Sr.")> selected</#if>>Sr.</option> - <option<#if ((creditCard.suffixOnCard)?default("") == "I")> selected</#if>>I</option> - <option<#if ((creditCard.suffixOnCard)?default("") == "II")> selected</#if>>II</option> - <option<#if ((creditCard.suffixOnCard)?default("") == "III")> selected</#if>>III</option> - <option<#if ((creditCard.suffixOnCard)?default("") == "IV")> selected</#if>>IV</option> - <option<#if ((creditCard.suffixOnCard)?default("") == "V")> selected</#if>>V</option> + <option<#if ((creditCard.suffixOnCard)?default("") == "Jr.")> selected="selected"</#if>>Jr.</option> + <option<#if ((creditCard.suffixOnCard)?default("") == "Sr.")> selected="selected"</#if>>Sr.</option> + <option<#if ((creditCard.suffixOnCard)?default("") == "I")> selected="selected"</#if>>I</option> + <option<#if ((creditCard.suffixOnCard)?default("") == "II")> selected="selected"</#if>>II</option> + <option<#if ((creditCard.suffixOnCard)?default("") == "III")> selected="selected"</#if>>III</option> + <option<#if ((creditCard.suffixOnCard)?default("") == "IV")> selected="selected"</#if>>IV</option> + <option<#if ((creditCard.suffixOnCard)?default("") == "V")> selected="selected"</#if>>V</option> </select> </td> </tr> @@ -117,7 +117,7 @@ under the License. <#assign cardNumberDisplay = cardNumber> </#if> </#if> - <input type="text" class="required" size="20" maxlength="30" name="cardNumber" onfocus="javascript:this.value = '';" value="${cardNumberDisplay?if_exists}"> + <input type="text" class="required" size="20" maxlength="30" name="cardNumber" onfocus="javascript:this.value = '';" value="${cardNumberDisplay?if_exists}" /> <#else> <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/> </#if> @@ -130,7 +130,7 @@ under the License. <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCardSecurityCode}</td> <td width="5"> </td> <td width="74%"> - <input type="text" size="5" maxlength="10" name="cardSecurityCode" value="${creditCard.cardSecurityCode?if_exists}"> + <input type="text" size="5" maxlength="10" name="cardSecurityCode" value="${creditCard.cardSecurityCode?if_exists}" /> </td> </tr>--> <tr> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl Wed Apr 7 20:27:41 2010 @@ -106,12 +106,12 @@ function getFinAccountTransRunningTotalA <option value="${glReconciliation.glReconciliationId}">${glReconciliation.glReconciliationName?if_exists}[[${glReconciliation.glReconciliationId}] [${glReconciliation.reconciledDate?if_exists}] [${glReconciliation.reconciledBalance?if_exists}]]</option> </#list> </select> - <input id="submitButton" type="submit" onclick="javascript:document.selectAllForm.submit();" value="${uiLabelMap.AccountingAssignToReconciliation}" disabled/> + <input id="submitButton" type="submit" onclick="javascript:document.selectAllForm.submit();" value="${uiLabelMap.AccountingAssignToReconciliation}" disabled="disabled" /> <#else> <span class="tooltip">${uiLabelMap.AccountingNoGlReconciliationExists} <a href="<@ofbizUrl>EditFinAccountReconciliations?finAccountId=${parameters.finAccountId?if_exists}</@ofbizUrl>">${uiLabelMap.CommonClickHere}</a></span> </#if> <#else> - <input id="submitButton" type="submit" onclick="javascript:document.selectAllForm.submit();" value="${uiLabelMap.AccountingReconcile}" disabled/> + <input id="submitButton" type="submit" onclick="javascript:document.selectAllForm.submit();" value="${uiLabelMap.AccountingReconcile}" disabled="disabled" /> </#if> </div> </#if> @@ -231,7 +231,7 @@ function getFinAccountTransRunningTotalA </td> <td>${finAccountTransType.description?if_exists}</td> <td><#if partyName?has_content>${(partyName.firstName)!} ${(partyName.lastName)!} ${(partyName.groupName)!}<a href="/partymgr/control/viewprofile?partyId=${partyName.partyId}">[${(partyName.partyId)!}]</a></#if></td> - <td><#if glReconciliation?has_content>${glReconciliation.glReconciliationName?if_exists}<a href="ViewGlReconciliationWithTransaction?glReconciliationId=${glReconciliation.glReconciliationId?if_exists}&finAccountId=${parameters.finAccountId?if_exists}">[${glReconciliation.glReconciliationId?if_exists}]</a></#if></td> + <td><#if glReconciliation?has_content>${glReconciliation.glReconciliationName?if_exists}<a href="ViewGlReconciliationWithTransaction?glReconciliationId=${glReconciliation.glReconciliationId?if_exists}&finAccountId=${parameters.finAccountId?if_exists}">[${glReconciliation.glReconciliationId?if_exists}]</a></#if></td> <td>${finAccountTrans.transactionDate?if_exists}</td> <td>${finAccountTrans.entryDate?if_exists}</td> <td>${finAccountTrans.amount?if_exists}</td> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl Wed Apr 7 20:27:41 2010 @@ -29,7 +29,7 @@ under the License. <br class="clear"/> </div> <div class="screenlet-body"> - <a href="<@ofbizUrl>EditFinAccountReconciliations?finAccountId=${finAccountId}&glReconciliationId=${glReconciliationId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a> + <a href="<@ofbizUrl>EditFinAccountReconciliations?finAccountId=${finAccountId}&glReconciliationId=${glReconciliationId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a> <#assign finAcctTransCondList = delegator.findByAnd("FinAccountTrans", {"glReconciliationId" : glReconciliationId, "statusId" : "FINACT_TRNS_CREATED"})> <#if finAcctTransCondList?has_content> <a href="javascript:document.CancelBankReconciliationForm.submit();" class="buttontext">${uiLabelMap.AccountingCancelBankReconciliation}</a> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl Wed Apr 7 20:27:41 2010 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <form method="post" action="createInvoiceItemPayrol"> -<input type="hidden" name="invoiceId" value="${invoice.invoiceId}"> +<input type="hidden" name="invoiceId" value="${invoice.invoiceId}" /> <table class="basic-table hover-bar" cellspacing="0"> <#if PayrolGroup?has_content> @@ -65,7 +65,7 @@ under the License. </tr> <tr > <td align="right"><b>Add all values : </b></td> - <td align="center" ><input type="submit" value="Add"></td> + <td align="center" ><input type="submit" value="Add" /></td> <td> </td> <td> </td> <td> </td> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl Wed Apr 7 20:27:41 2010 @@ -21,7 +21,7 @@ under the License. <form id="costCenters" method="post" action="<@ofbizUrl>createUpdateCostCenter</@ofbizUrl>"> <div id="errorMessage" class="errorMessage" style="display : none">${uiLabelMap.AccountingTotalAmountPercentageIsNotEqualOneHundred}</div> <div id="eventMessage" class="eventMessage" style="display : none">${uiLabelMap.AccountingTotalCostCenterAmount}.</div> - <input type="hidden" name="_useRowSubmit" value="Y"> + <input type="hidden" name="_useRowSubmit" value="Y" /> <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row"> <th>${uiLabelMap.FormFieldTitle_glAccountId}</th> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl Wed Apr 7 20:27:41 2010 @@ -63,21 +63,21 @@ under the License. <tr valign="top"> <td> <ul> -<li><a href="<@ofbizUrl>findInvoices?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.AccountingShowAllInvoices}</a></li> +<li><a href="<@ofbizUrl>findInvoices?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.AccountingShowAllInvoices}</a></li> </ul> </td> <td> <ul> <#list invoiceTypes as invoiceType> -<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${invoiceType.get("description",locale)}</a></li> +<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${invoiceType.get("description",locale)}</a></li> </#list> </ul> </td> <td> <ul> <#list invoiceStatus as status> -<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${status.get("description",locale)}</a></li> +<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${status.get("description",locale)}</a></li> </#list> </ul> </td> @@ -90,14 +90,14 @@ under the License. <tr valign="top"> <td> <ul> -<li><a href="<@ofbizUrl>findPayments?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.AccountingShowAllPayments}</a></li> +<li><a href="<@ofbizUrl>findPayments?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.AccountingShowAllPayments}</a></li> </ul> </td> <td> <ul> <#list paymentTypes as paymentType> -<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentType.get("description",locale)}</a></li> +<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentType.get("description",locale)}</a></li> </#list> </ul> </td> @@ -106,7 +106,7 @@ under the License. <td> <ul> <#list paymentMethodTypes as paymentMethodType> -<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentMethodType.get("description",locale)}</a></li> +<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentMethodType.get("description",locale)}</a></li> </#list> </ul> </td> @@ -114,7 +114,7 @@ under the License. <td> <ul> <#list paymentStatus as status> -<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${status.get("description",locale)}</a></li> +<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${status.get("description",locale)}</a></li> </#list> </ul> </td> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl Wed Apr 7 20:27:41 2010 @@ -71,14 +71,14 @@ function getPaymentRunningTotal() { <div class="screenlet-body"> <form id="depositWithdrawPaymentsForm" name="depositWithdrawPaymentsForm" method="post" action="<@ofbizUrl>depositWithdrawPayments</@ofbizUrl>"> <#if paymentList?has_content> - <input type="hidden" name='organizationPartyId' value="${organizationPartyId?if_exists}"> - <input type="hidden" name='finAccountId' value="${finAccountId?if_exists}"> - <input type="hidden" name='paymentMethodTypeId' value="${paymentMethodTypeId?if_exists}"> - <input type="hidden" name='cardType' value="${cardType?if_exists}"> - <input type="hidden" name='partyIdFrom' value="${partyIdFrom?if_exists}"> - <input type="hidden" name='fromDate' value="${fromDate?if_exists}"> - <input type="hidden" name='thruDate' value="${thruDate?if_exists}"> - <input type="hidden" name='paymentGroupTypeId' value="BATCH_PAYMENT"> + <input type="hidden" name='organizationPartyId' value="${organizationPartyId?if_exists}" /> + <input type="hidden" name='finAccountId' value="${finAccountId?if_exists}" /> + <input type="hidden" name='paymentMethodTypeId' value="${paymentMethodTypeId?if_exists}" /> + <input type="hidden" name='cardType' value="${cardType?if_exists}" /> + <input type="hidden" name='partyIdFrom' value="${partyIdFrom?if_exists}" /> + <input type="hidden" name='fromDate' value="${fromDate?if_exists}" /> + <input type="hidden" name='thruDate' value="${thruDate?if_exists}" /> + <input type="hidden" name='paymentGroupTypeId' value="BATCH_PAYMENT" /> <div> <span class="label">${uiLabelMap.AccountingRunningTotal} :</span> <span class="label" id="showPaymentRunningTotal"></span> @@ -108,10 +108,10 @@ function getPaymentRunningTotal() { </#list> <div align="right"> <span class="label">${uiLabelMap.AccountingPayment} ${uiLabelMap.PartyPartyGroupName}</span> - <input type="text" size='25' id="paymentGroupName" name='paymentGroupName'> + <input type="text" size='25' id="paymentGroupName" name='paymentGroupName' /> <span class="label">${uiLabelMap.AccountingGroupInOneTransaction}</span> - <input type="checkbox" name="groupInOneTransaction" value="Y" checked/> - <input id="submitButton" type="button" onclick="javascript:document.depositWithdrawPaymentsForm.submit();" value="${uiLabelMap.AccountingDepositWithdraw}" disabled/> + <input type="checkbox" name="groupInOneTransaction" value="Y" checked="checked" /> + <input id="submitButton" type="button" onclick="javascript:document.depositWithdrawPaymentsForm.submit();" value="${uiLabelMap.AccountingDepositWithdraw}" disabled="disabled"/> </div> </table> <#else> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl Wed Apr 7 20:27:41 2010 @@ -27,7 +27,7 @@ under the License. <td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingReferenceNumber}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="referenceNum"> + <input type="text" size="30" maxlength="60" name="referenceNum" /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -35,7 +35,7 @@ under the License. <td width="26%" align="right" valign=middle><b>${uiLabelMap.FormFieldTitle_orderPaymentPreferenceId}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="20" maxlength="20" name="orderPaymentPreferenceId"> + <input type="text" size="20" maxlength="20" name="orderPaymentPreferenceId" /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -69,7 +69,7 @@ under the License. <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyFirstName}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="firstName" value="${(person.firstName)?if_exists}"> + <input type="text" size="30" maxlength="60" name="firstName" value="${(person.firstName)?if_exists}" /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -77,7 +77,7 @@ under the License. <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyLastName}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="lastName" value="${(person.lastName)?if_exists}"> + <input type="text" size="30" maxlength="60" name="lastName" value="${(person.lastName)?if_exists}" /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -85,7 +85,7 @@ under the License. <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyEmailAddress}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="infoString" value=""> + <input type="text" size="30" maxlength="60" name="infoString" value="" /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -98,7 +98,7 @@ under the License. <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyFirstName}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="30" name="firstName" value="${(person.firstName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>> + <input type="text" size="30" maxlength="30" name="firstName" value="${(person.firstName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -106,7 +106,7 @@ under the License. <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyLastName}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="30" name="lastName" value="${(person.lastName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>> + <input type="text" size="30" maxlength="30" name="lastName" value="${(person.lastName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -115,7 +115,7 @@ under the License. <td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingBillToAddress1}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="30" name="address1" value="${(postalFields.address1)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>> + <input type="text" size="30" maxlength="30" name="address1" value="${(postalFields.address1)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -123,14 +123,14 @@ under the License. <td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingBillToAddress2}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="30" name="address2" value="${(postalFields.address2)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>> + <input type="text" size="30" maxlength="30" name="address2" value="${(postalFields.address2)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> /> </td> </tr> <tr> <td width="26%" align="right" valign=middle><b>${uiLabelMap.CommonCity}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="30" name="city" value="${(postalFields.city)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>> + <input type="text" size="30" maxlength="30" name="city" value="${(postalFields.city)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -153,7 +153,7 @@ under the License. <td width="26%" align="right" valign=middle><b>${uiLabelMap.CommonZipPostalCode}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="12" maxlength="10" name="postalCode" value="${(postalFields.postalCode)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>> + <input type="text" size="12" maxlength="10" name="postalCode" value="${(postalFields.postalCode)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl Wed Apr 7 20:27:41 2010 @@ -24,7 +24,7 @@ under the License. ${setRequestAttribute("validTx", "false")} <form name="manualTxForm" method="post" action="<@ofbizUrl>manualETx</@ofbizUrl>"> <#if requestParameters.paymentMethodId?exists> - <input type="hidden" name="paymentMethodId" value="${requestParameters.paymentMethodId}"> + <input type="hidden" name="paymentMethodId" value="${requestParameters.paymentMethodId}" /> </#if> <table border='0' cellpadding='2' cellspacing='0'> @@ -34,7 +34,7 @@ under the License. <td width='74%'> <#if paymentMethodType?has_content> <div>${paymentMethodType.get("description",locale)}</div> - <input type="hidden" name="paymentMethodTypeId" value="${paymentMethodType.paymentMethodTypeId}"> + <input type="hidden" name="paymentMethodTypeId" value="${paymentMethodType.paymentMethodTypeId}" /> <#else> <select name="paymentMethodTypeId"> <option value="CREDIT_CARD">${uiLabelMap.AccountingCreditCard}</option> @@ -48,7 +48,7 @@ under the License. <td width='74%'> <#if currentStore?has_content> <div><#if currentStore.storeName?exists>${currentStore.storeName}<#else>${currentStore.productStoreId}</#if></div> - <input type="hidden" name="productStoreId" value="${currentStore.productStoreId}"> + <input type="hidden" name="productStoreId" value="${currentStore.productStoreId}" /> <#else> <select name="productStoreId"> <#list productStores as productStore> @@ -64,7 +64,7 @@ under the License. <td width='74%'> <#if currentTx?has_content> <div>${currentTx.get("description",locale)}</div> - <input type="hidden" name="transactionType" value="${currentTx.enumId}"> + <input type="hidden" name="transactionType" value="${currentTx.enumId}" /> <#else> <select name="transactionType" onchange="javascript:document.manualTxForm.submit();"> <#-- the select one option is so the list will fire on any seletion --> @@ -91,7 +91,7 @@ under the License. <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonAmount}</b></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="20" maxlength="30" name="amount"> + <input type="text" size="20" maxlength="30" name="amount" /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -100,7 +100,7 @@ under the License. <td width="26%" align="right" valign=middle> </td> <td width="5"> </td> <td width="74%"> - <input type="submit" value="${uiLabelMap.CommonSubmit}"> + <input type="submit" value="${uiLabelMap.CommonSubmit}" /> </td> </tr> <#elseif txType?has_content> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl Wed Apr 7 20:27:41 2010 @@ -28,10 +28,10 @@ under the License. <br class="clear"/> </div> <form method="post" action="<@ofbizUrl>EditCustomTimePeriod</@ofbizUrl>" name="setOrganizationPartyIdForm"> - <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}"> + <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}" /> <span class="label">${uiLabelMap.AccountingShowOnlyPeriodsWithOrganization}</span> - <input type="text" size="20" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}"> - <input type="submit" value='${uiLabelMap.CommonUpdate}'> + <input type="text" size="20" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}" /> + <input type="submit" value='${uiLabelMap.CommonUpdate}' /> </form> </div> @@ -60,8 +60,8 @@ under the License. <td> </td> </tr> <form method="post" action="<@ofbizUrl>updateCustomTimePeriod</@ofbizUrl>" name="updateCustomTimePeriodForm"> - <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}"> - <input type="hidden" name="customTimePeriodId" value="${currentCustomTimePeriodId?if_exists}"> + <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}" /> + <input type="hidden" name="customTimePeriodId" value="${currentCustomTimePeriodId?if_exists}" /> <tr> <td>${currentCustomTimePeriod.customTimePeriodId}</td> <td> @@ -84,11 +84,11 @@ under the License. </#list> </select> <#if (currentCustomTimePeriod.parentPeriodId)?exists> - <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${currentCustomTimePeriod.parentPeriodId}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'> + <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${currentCustomTimePeriod.parentPeriodId}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'> ${uiLabelMap.CommonSetAsCurrent}</a> </#if> </td> - <td><input type="text" size='12' name="currentCustomTimePeriod" value="${currentCustomTimePeriod.organizationPartyId?if_exists}"></td> + <td><input type="text" size='12' name="currentCustomTimePeriod" value="${currentCustomTimePeriod.organizationPartyId?if_exists}" /></td> <td> <select name="periodTypeId"> <#list periodTypes as periodType> @@ -104,15 +104,15 @@ under the License. </#list> </select> </td> - <td><input type="text" size='4' name="periodNum" value="${currentCustomTimePeriod.periodNum?if_exists}"></td> - <td><input type="text" size='10' name="periodName" value="${currentCustomTimePeriod.periodName?if_exists}"></td> + <td><input type="text" size='4' name="periodNum" value="${currentCustomTimePeriod.periodNum?if_exists}" /></td> + <td><input type="text" size='10' name="periodName" value="${currentCustomTimePeriod.periodName?if_exists}" /></td> <td> <#assign hasntStarted = false> <#assign compareDate = currentCustomTimePeriod.getDate("fromDate")> <#if compareDate?has_content> <#if nowTimestamp.before(compareDate)><#assign hasntStarted = true></#if> </#if> - <input type="text" size='13' name="fromDate" value="${currentCustomTimePeriod.fromDate?string("yyyy-MM-dd")}"<#if hasntStarted> class="alert"</#if>> + <input type="text" size='13' name="fromDate" value="${currentCustomTimePeriod.fromDate?string("yyyy-MM-dd")}"<#if hasntStarted> class="alert"</#if> /> </td> <td> <#assign hasExpired = false> @@ -120,10 +120,10 @@ under the License. <#if compareDate?has_content> <#if nowTimestamp.after(compareDate)><#assign hasExpired = true></#if> </#if> - <input type="text" size='13' name="thruDate" value="${currentCustomTimePeriod.thruDate?string("yyyy-MM-dd")}"<#if hasntStarted> class="alert"</#if>> + <input type="text" size='13' name="thruDate" value="${currentCustomTimePeriod.thruDate?string("yyyy-MM-dd")}"<#if hasntStarted> class="alert"</#if> /> </td> <td class="button-col"> - <input type="submit" value='${uiLabelMap.CommonUpdate}'> + <input type="submit" value='${uiLabelMap.CommonUpdate}'/> <a href='<@ofbizUrl>deleteCustomTimePeriod?customTimePeriodId=${currentCustomTimePeriod.customTimePeriodId}</@ofbizUrl>'> ${uiLabelMap.CommonDelete}</a> </td> @@ -160,9 +160,9 @@ under the License. <#assign periodType = customTimePeriod.getRelatedOneCache("PeriodType")> <tr> <form method="post" action='<@ofbizUrl>updateCustomTimePeriod</@ofbizUrl>' name='lineForm${line}'> - <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}"> - <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}"> - <input type="hidden" name="customTimePeriodId" value="${customTimePeriodId?if_exists}"> + <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}" /> + <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}" /> + <input type="hidden" name="customTimePeriodId" value="${customTimePeriodId?if_exists}" /> <td>${customTimePeriod.customTimePeriodId}</td> <td> <select name="parentPeriodId"> @@ -184,7 +184,7 @@ under the License. </#list> </select> </td> - <td><input type="text" size='12' name="organizationPartyId" value="${customTimePeriod.organizationPartyId?if_exists}"></td> + <td><input type="text" size='12' name="organizationPartyId" value="${customTimePeriod.organizationPartyId?if_exists}" /></td> <td> <select name="periodTypeId"> <#list periodTypes as periodType> @@ -198,15 +198,15 @@ under the License. </#list> </select> </td> - <td><input type="text" size='4' name="periodNum" value="${customTimePeriod.periodNum?if_exists}"></td> - <td><input type="text" size='10' name="periodName" value="${customTimePeriod.periodName?if_exists}"></td> + <td><input type="text" size='4' name="periodNum" value="${customTimePeriod.periodNum?if_exists}" /></td> + <td><input type="text" size='10' name="periodName" value="${customTimePeriod.periodName?if_exists}" /></td> <td> <#assign hasntStarted = false> <#assign compareDate = customTimePeriod.getDate("fromDate")> <#if compareDate?has_content> <#if nowTimestamp.before(compareDate)><#assign hasntStarted = true></#if> </#if> - <input type="text" size='13' name="fromDate" value="${customTimePeriod.fromDate?if_exists}"<#if hasntStarted> class="alert"</#if>> + <input type="text" size='13' name="fromDate" value="${customTimePeriod.fromDate?if_exists}"<#if hasntStarted> class="alert"</#if> /> </td> <td> <#assign hasExpired = false> @@ -214,13 +214,13 @@ under the License. <#if compareDate?has_content> <#if nowTimestamp.after(compareDate)><#assign hasExpired = true></#if> </#if> - <input type="text" size='13' name="thruDate" value="${customTimePeriod.thruDate?if_exists}"<#if hasExpired> class="alert"</#if>> + <input type="text" size='13' name="thruDate" value="${customTimePeriod.thruDate?if_exists}"<#if hasExpired> class="alert"</#if> /> </td> <td class="button-col"> - <input type="submit" value='${uiLabelMap.CommonUpdate}'> - <a href='<@ofbizUrl>deleteCustomTimePeriod?customTimePeriodId=${customTimePeriod.customTimePeriodId?if_exists}¤tCustomTimePeriodId=${currentCustomTimePeriodId?if_exists}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'> + <input type="submit" value='${uiLabelMap.CommonUpdate}'/> + <a href='<@ofbizUrl>deleteCustomTimePeriod?customTimePeriodId=${customTimePeriod.customTimePeriodId?if_exists}&currentCustomTimePeriodId=${currentCustomTimePeriodId?if_exists}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'> ${uiLabelMap.CommonDelete}</a> - <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${customTimePeriod.customTimePeriodId?if_exists}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'> + <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${customTimePeriod.customTimePeriodId?if_exists}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'> ${uiLabelMap.CommonSetAsCurrent}</a> </td> </form> @@ -240,9 +240,9 @@ under the License. </div> <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>createCustomTimePeriod</@ofbizUrl>" name="createCustomTimePeriodForm"> - <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}"> - <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}"> - <input type="hidden" name="useValues" value="true"> + <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}" /> + <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}" /> + <input type="hidden" name="useValues" value="true" /> <div> <span class="label">${uiLabelMap.CommonParent}</span> <select name="parentPeriodId"> @@ -267,7 +267,7 @@ under the License. </div> <div> <span class="label">${uiLabelMap.AccountingOrgPartyId}</span> - <input type="text" size='20' name='organizationPartyId'> + <input type="text" size='20' name='organizationPartyId' /> <span class="label">${uiLabelMap.AccountingPeriodType}</span> <select name="periodTypeId"> <#list periodTypes as periodType> @@ -281,16 +281,16 @@ under the License. </#list> </select> <span class="label">${uiLabelMap.AccountingPeriodNumber}</span> - <input type="text" size='4' name='periodNum'> + <input type="text" size='4' name='periodNum' /> <span class="label">${uiLabelMap.AccountingPeriodName}</span> - <input type="text" size='10' name='periodName'> + <input type="text" size='10' name='periodName' /> </div> <div> <span class="label">${uiLabelMap.CommonFromDate}</span> - <input type="text" size='14' name='fromDate'> + <input type="text" size='14' name='fromDate' /> <span class="label">${uiLabelMap.CommonThruDate}</span> - <input type="text" size='14' name='thruDate'> - <input type="submit" value="${uiLabelMap.CommonAdd}"> + <input type="text" size='14' name='thruDate' /> + <input type="submit" value="${uiLabelMap.CommonAdd}" /> </div> </form> </div> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl Wed Apr 7 20:27:41 2010 @@ -21,7 +21,7 @@ under the License. <div> <form name="glAccountTrialBalanceReport" id="glAccountTrialBalanceReport"> <div> - <a href="<@ofbizUrl>GlAccountTrialBalanceReportPdf.pdf?organizationPartyId=${organizationPartyId}&timePeriod=${parameters.timePeriod}&isPosted=${parameters.isPosted}&glAccountId=${parameters.glAccountId}</@ofbizUrl>" class="buttontext">${uiLabelMap.AccountingInvoicePDF}</a> + <a href="<@ofbizUrl>GlAccountTrialBalanceReportPdf.pdf?organizationPartyId=${organizationPartyId}&timePeriod=${parameters.timePeriod}&isPosted=${parameters.isPosted}&glAccountId=${parameters.glAccountId}</@ofbizUrl>" class="buttontext">${uiLabelMap.AccountingInvoicePDF}</a> </div> <h3>${uiLabelMap.AccountingSubsidiaryLedger}</h3> <h3>${uiLabelMap.FormFieldTitle_companyName} : ${(currentOrganization.groupName)!}</h3> Modified: ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl Wed Apr 7 20:27:41 2010 @@ -19,7 +19,7 @@ under the License. <#if commissionReportList?has_content> <div> - <a href="<@ofbizUrl>CommissionReport.pdf?isSearch=Y&productId=${parameters.productId!}&partyId=${parameters.partyId!}&fromDate=${parameters.fromDate!}&thruDate=${parameters.thruDate!}</@ofbizUrl>" class="buttontext">${uiLabelMap.AccountingInvoicePDF}</a> + <a href="<@ofbizUrl>CommissionReport.pdf?isSearch=Y&productId=${parameters.productId!}&partyId=${parameters.partyId!}&fromDate=${parameters.fromDate!}&thruDate=${parameters.thruDate!}</@ofbizUrl>" class="buttontext">${uiLabelMap.AccountingInvoicePDF}</a> </div> <table class="basic-table hover-bar" cellspacing="0"> <#-- Header Begins --> Modified: ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl Wed Apr 7 20:27:41 2010 @@ -84,7 +84,7 @@ function enableSubmitButton() { <option value="">${uiLabelMap.AccountingSelectAction}</options> <option value="processCommissionRun">${uiLabelMap.AccountingCommissionRun}</option> </select> - <input id="submitButton" type="button" onclick="javascript:runAction();" value="${uiLabelMap.CommonRun}" disabled/> + <input id="submitButton" type="button" onclick="javascript:runAction();" value="${uiLabelMap.CommonRun}" disabled="disabled" /> </div> <table class="basic-table hover-bar" cellspacing="0"> <#-- Header Begins --> @@ -128,5 +128,5 @@ function enableSubmitButton() { </table> </form> <#else> - <td colspan='4'><h3>${uiLabelMap.AccountingNoInvoicesFound}</h3></td> + <h3>${uiLabelMap.AccountingNoInvoicesFound}</h3> </#if> Modified: ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl Wed Apr 7 20:27:41 2010 @@ -110,7 +110,7 @@ function runAction() { <option value="massInvoicesToWriteoff">${uiLabelMap.AccountingInvoiceStatusToWriteoff}</option> <option value="massInvoicesToCancel">${uiLabelMap.AccountingInvoiceStatusToCancelled}</option> </select> - <input id="submitButton" type="button" onclick="javascript:runAction();" value="${uiLabelMap.CommonRun}" disabled/> + <input id="submitButton" type="button" onclick="javascript:runAction();" value="${uiLabelMap.CommonRun}" disabled="disabled" /> </div> <input type="hidden" name="invoiceStatusChange" id="invoiceStatusChange" value="<@ofbizUrl>massChangeInvoiceStatus</@ofbizUrl>"/> <input type="hidden" name="organizationPartyId" value="${organizationPartyId}"/> Modified: ofbiz/trunk/applications/accounting/webapp/ar/invoice/ListInvoices.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/invoice/ListInvoices.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/ar/invoice/ListInvoices.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/ar/invoice/ListInvoices.ftl Wed Apr 7 20:27:41 2010 @@ -100,7 +100,7 @@ under the License. <option value="massInvoicesToWriteoff">${uiLabelMap.AccountingInvoiceStatusToWriteoff}</option> <option value="massInvoicesToCancel">${uiLabelMap.AccountingInvoiceStatusToCancelled}</option> </select> - <input id="submitButton" type="button" onclick="javascript:$('listInvoices').submit();" value="${uiLabelMap.CommonRun}" disabled/> + <input id="submitButton" type="button" onclick="javascript:$('listInvoices').submit();" value="${uiLabelMap.CommonRun}" disabled="disabled" /> <input type="hidden" name="organizationPartyId" value="${defaultOrganizationPartyId}"/> <input type="hidden" name="partyIdFrom" value="${parameters.partyIdFrom?if_exists}"/> <input type="hidden" name="statusId" id="statusId" value="${parameters.statusId?if_exists}"/> Modified: ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl?rev=931670&r1=931669&r2=931670&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl Wed Apr 7 20:27:41 2010 @@ -190,7 +190,7 @@ function setServiceName(selection) { </tbody> </table> <#else> - <h2>${uiLabelMap.AccountingNoRecordFound}</h3> + <h3>${uiLabelMap.AccountingNoRecordFound}</h3> </#if> </form> </div> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |