Author: sascharodekamp
Date: Tue Nov 8 15:07:19 2011 New Revision: 1199276 URL: http://svn.apache.org/viewvc?rev=1199276&view=rev Log: Assign To Reconciliation and Deposit/Withdraw not working (https://issues.apache.org/jira/browse/OFBIZ-4552) A slightly modifiyed patch from Ankit Jain, when no checkbox is checked the submit button should be disabeled. Modified: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl 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=1199276&r1=1199275&r2=1199276&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl Tue Nov 8 15:07:19 2011 @@ -18,7 +18,6 @@ under the License. --> <script language="JavaScript" type="text/javascript"> -<!-- function togglefinAccountTransId(master) { var form = document.selectAllForm; var finAccountTransList = form.elements.length; @@ -38,7 +37,7 @@ function getFinAccountTransRunningTotalA var isAllSelected = true; for (var i = 0; i < finAccountTransList; i++) { var element = form.elements[i]; - if (element.name.startsWith("_rowSubmit_o_")) { + if (jQuery(element[name^="_rowSubmit_o_"])) { if (element.checked) { isSingle = false; } else { @@ -52,7 +51,7 @@ function getFinAccountTransRunningTotalA jQuery('#checkAllTransactions').attr('checked', false); } if (!isSingle) { - jQuery('#submitButton').attr('disabled', ''); + jQuery('#submitButton').removeAttr('disabled'); if (jQuery('#showFinAccountTransRunningTotal').length) { jQuery.ajax({ url: 'getFinAccountTransRunningTotalAndBalances', @@ -75,10 +74,9 @@ function getFinAccountTransRunningTotalA jQuery('#endingBalance').html(jQuery('#endingBalanceInput').val()); } - jQuery('#submitButton').attr('disabled', ''); + jQuery('#submitButton').attr('disabled', 'disabled'); } } ---> </script> <div class="screenlet screenlet-body"> @@ -323,7 +321,7 @@ function getFinAccountTransRunningTotalA </tr> <tr> <td> - <span id="finAccountTransRunningTotal"></span> / + <span id="finAccountTransRunningTotal"></span> / <span id="numberOfFinAccountTransaction"></span> </td> <td><@ofbizCurrency amount=glReconciliation.openingBalance?default('0')/></td> @@ -334,6 +332,6 @@ function getFinAccountTransRunningTotalA </table> </#if> <#else> - <h2>${uiLabelMap.CommonNoRecordFound}</h2> + <h2>${uiLabelMap.CommonNoRecordFound}</h2> </#if> </div> 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=1199276&r1=1199275&r2=1199276&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl Tue Nov 8 15:07:19 2011 @@ -18,7 +18,6 @@ under the License. --> <script language="JavaScript" type="text/javascript"> -<!-- // function togglePaymentId(master) { var form = document.depositWithdrawPaymentsForm; var payments = form.elements.length; @@ -45,13 +44,14 @@ function getPaymentRunningTotal() { } } } + if (isAllSelected) { jQuery('#checkAllPayments').attr('checked', true); } else { jQuery('#checkAllPayments').attr('checked', false); } if (!isSingle) { - jQuery('#submitButton').attr('disabled', ''); + jQuery('#submitButton').removeAttr('disabled'); jQuery.ajax({ url: 'getPaymentRunningTotal', async: false, @@ -63,10 +63,10 @@ function getPaymentRunningTotal() { }); } else { jQuery('#showPaymentRunningTotal').html(""); - jQuery('#submitButton').attr('disabled', ''); + jQuery('#submitButton').attr('disabled', 'disabled'); } } -// --> + </script> <div class="screenlet"> |
Free forum by Nabble | Edit this page |