You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/09/26 18:59:00 UTC
svn commit: r1001480 - in /ofbiz/branches/jquery/applications/accounting:
webapp/accounting/finaccounttrans/ webapp/accounting/payment/
webapp/ap/invoices/ webapp/ar/invoice/ webapp/ar/payment/ widget/
Author: jleroux
Date: Sun Sep 26 16:59:00 2010
New Revision: 1001480
URL: http://svn.apache.org/viewvc?rev=1001480&view=rev
Log:
A patch from Sascha Rodekamp "jQuery - Accounting Application Migration" (https://issues.apache.org/jira/browse/OFBIZ-3953) - OFBIZ-3953
Complete migration of the accounting application. See my comments in Jira (minor).
Modified:
ofbiz/branches/jquery/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
ofbiz/branches/jquery/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl
ofbiz/branches/jquery/applications/accounting/webapp/ap/invoices/CommissionRun.ftl
ofbiz/branches/jquery/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl
ofbiz/branches/jquery/applications/accounting/webapp/ar/invoice/ListInvoices.ftl
ofbiz/branches/jquery/applications/accounting/webapp/ar/payment/batchPayments.ftl
ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml
Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl?rev=1001480&r1=1001479&r2=1001480&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl Sun Sep 26 16:59:00 2010
@@ -47,33 +47,35 @@ function getFinAccountTransRunningTotalA
}
}
if (isAllSelected) {
- $('checkAllTransactions').checked = true;
+ jQuery('#checkAllTransactions').attr('checked', true);
} else {
- $('checkAllTransactions').checked = false;
+ jQuery('#checkAllTransactions').attr('checked', false);
}
if (!isSingle) {
- $('submitButton').disabled = false;
- if ($('showFinAccountTransRunningTotal')) {
- new Ajax.Request('getFinAccountTransRunningTotalAndBalances', {
- asynchronous: false,
- onSuccess: function(transport) {
- var data = transport.responseText.evalJSON(true);
- $('showFinAccountTransRunningTotal').update(data.finAccountTransRunningTotal);
- $('finAccountTransRunningTotal').update(data.finAccountTransRunningTotal);
- $('numberOfFinAccountTransaction').update(data.numberOfTransactions);
- $('endingBalance').update(data.endingBalance);
- }, parameters: $('listFinAccTra').serialize(), requestHeaders: {Accept: 'application/json'}
+ jQuery('#submitButton').attr('disabled', '');
+ if (jQuery('#showFinAccountTransRunningTotal').length) {
+ jQuery.ajax({
+ url: 'getFinAccountTransRunningTotalAndBalances',
+ async: false,
+ type: 'POST',
+ data: jQuery('#listFinAccTra').serialize(),
+ success: function(data) {
+ jQuery('#showFinAccountTransRunningTotal').html(data.finAccountTransRunningTotal);
+ jQuery('#finAccountTransRunningTotal').html(data.finAccountTransRunningTotal);
+ jQuery('#numberOfFinAccountTransaction').html(data.numberOfTransactions);
+ jQuery('#endingBalance').html(data.endingBalance);
+ }
});
}
} else {
- if ($('showFinAccountTransRunningTotal')) {
- $('showFinAccountTransRunningTotal').update("");
- $('finAccountTransRunningTotal').update("");
- $('numberOfFinAccountTransaction').update("");
- $('endingBalance').update($('endingBalanceInput').value);
-
+ if (jQuery('#showFinAccountTransRunningTotal').length) {
+ jQuery('#showFinAccountTransRunningTotal').html("");
+ jQuery('#finAccountTransRunningTotal').html("");
+ jQuery('#numberOfFinAccountTransaction').html("");
+ jQuery('#endingBalance').html(jQuery('#endingBalanceInput').val());
+
}
- $('submitButton').disabled = true;
+ jQuery('#submitButton').attr('disabled', '');
}
}
-->
Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl?rev=1001480&r1=1001479&r2=1001480&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl Sun Sep 26 16:59:00 2010
@@ -46,22 +46,24 @@ function getPaymentRunningTotal() {
}
}
if (isAllSelected) {
- $('checkAllPayments').checked = true;
+ jQuery('#checkAllPayments').attr('checked', true);
} else {
- $('checkAllPayments').checked = false;
+ jQuery('#checkAllPayments').attr('checked', false);
}
if (!isSingle) {
- $('submitButton').disabled = false;
- new Ajax.Request('getPaymentRunningTotal', {
- asynchronous: false,
- onSuccess: function(transport) {
- var data = transport.responseText.evalJSON(true);
- $('showPaymentRunningTotal').update(data.paymentRunningTotal);
- }, parameters: $('depositWithdrawPaymentsForm').serialize(), requestHeaders: {Accept: 'application/json'}
+ jQuery('#submitButton').attr('disabled', '');
+ jQuery.ajax({
+ url: 'getPaymentRunningTotal',
+ async: false,
+ type: 'POST',
+ data: jQuery('#depositWithdrawPaymentsForm').serialize(),
+ success: function(data) {
+ jQuery('#showPaymentRunningTotal').html(data.paymentRunningTotal);
+ }
});
} else {
- $('showPaymentRunningTotal').update("");
- $('submitButton').disabled = true;
+ jQuery('#showPaymentRunningTotal').html("");
+ jQuery('#submitButton').attr('disabled', '');
}
}
// -->
Modified: ofbiz/branches/jquery/applications/accounting/webapp/ap/invoices/CommissionRun.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/ap/invoices/CommissionRun.ftl?rev=1001480&r1=1001479&r2=1001480&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/ap/invoices/CommissionRun.ftl (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/ap/invoices/CommissionRun.ftl Sun Sep 26 16:59:00 2010
@@ -61,14 +61,14 @@ function enableSubmitButton() {
}
}
if (isAllSelected) {
- $('checkAllInvoices').checked = true;
+ jQuery('#checkAllInvoices').attr('checked', true);
} else {
- $('checkAllInvoices').checked = false;
+ jQuery('#checkAllInvoices').attr('checked', false);
}
- if (!isSingle && $('serviceName').value != "")
- $('submitButton').disabled = false;
+ if (!isSingle && jQuery('#serviceName').val() != "")
+ jQuery('#submitButton').attr('disabled', '');
else
- $('submitButton').disabled = true;
+ jQuery('#submitButton').attr('disabled', 'disabled');
}
-->
Modified: ofbiz/branches/jquery/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl?rev=1001480&r1=1001479&r2=1001480&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl Sun Sep 26 16:59:00 2010
@@ -19,73 +19,106 @@ under the License.
<script language="JavaScript" type="text/javascript">
<!--
function toggleInvoiceId(master) {
- var invoices = $('listPurchaseInvoices').getInputs('checkbox','invoiceIds');
- invoices.each(function(invoice){
- invoice.checked = master.checked;
+ var invoices = jQuery("#listPurchaseInvoices :checkbox[name='invoiceIds']");
+
+ jQuery.each(invoices, function() {
+ // this a normal html object (not a jquery object)
+ this.checked = master.checked;
});
getInvoiceRunningTotal();
}
function getInvoiceRunningTotal() {
- var invoices = $('listPurchaseInvoices').getInputs('checkbox','invoiceIds');
- if(invoices.pluck('checked').all()) {
- $('checkAllInvoices').checked = true;
+ var invoices = jQuery("#listPurchaseInvoices: checkbox[name='invoiceIds']");
+
+ //test if all checkboxes are checked
+ var allChecked = true;
+ jQuery.each(invoices, function() {
+ if (!jQuery(this).is(':checked')) {
+ allChecked = false;
+ return false;
+ }
+ });
+
+ if(allChecked) {
+ jQuery('#checkAllInvoices').attr('checked', true);
} else {
- $('checkAllInvoices').checked = false;
+ jQuery('#checkAllInvoices').attr('checked', false);
}
- if(invoices.pluck('checked').any()) {
- new Ajax.Request('getInvoiceRunningTotal', {
- asynchronous: false,
- onSuccess: function(transport) {
- var data = transport.responseText.evalJSON(true);
- $('showInvoiceRunningTotal').update(data.invoiceRunningTotal);
- },
- parameters: $('listPurchaseInvoices').serialize(),
- requestHeaders: {Accept: 'application/json'}
+
+ // check if any checkbox is checked
+ var anyChecked = false;
+ jQuery.each(invoices, function() {
+ if (jQuery(this).is(':checked')) {
+ anyChecked = true;
+ return false;
+ }
+ });
+
+ if(anyChecked) {
+ jQuery.ajax({
+ url: 'getInvoiceRunningTotal',
+ type: 'POST',
+ data: jQuery('#listPurchaseInvoices').serialize(),
+ async: false,
+ succes: function(data) {
+ jQuery('#showInvoiceRunningTotal').html(data.invoiceRunningTotal);
+ }
});
- if($F('serviceName') != "") {
- $('submitButton').disabled = false;
+
+ if(jQuery('#serviceName').val() != "") {
+ jQuery('#submitButton').attr('disabled', '');
}
-
+
} else {
- $('submitButton').disabled = true;
- $('showInvoiceRunningTotal').update("");
+ jQuery('#submitButton').attr('disabled', 'disabled');
+ jQuery('#showInvoiceRunningTotal').html("");
}
}
function setServiceName(selection) {
if ( selection.value == 'massInvoicesToApprove' || selection.value == 'massInvoicesToReceive' || selection.value == 'massInvoicesToReady' || selection.value == 'massInvoicesToPaid' || selection.value == 'massInvoicesToWriteoff' || selection.value == 'massInvoicesToCancel') {
- document.listPurchaseInvoices.action = $('invoiceStatusChange').value;
+ document.listPurchaseInvoices.action = jQuery('#invoiceStatusChange').value;
}
else {
document.listPurchaseInvoices.action = selection.value;
}
if (selection.value == 'massInvoicesToApprove') {
- $('statusId').value = "INVOICE_APPROVED";
+ jQuery('#statusId').val("INVOICE_APPROVED");
} else if (selection.value == 'massInvoicesToReceive') {
- $('statusId').value = "INVOICE_RECEIVED";
+ jQuery('#statusId').val("INVOICE_RECEIVED");
}else if (selection.value == 'massInvoicesToReady') {
- $('statusId').value = "INVOICE_READY";
+ jQuery('#statusId').val("INVOICE_READY");
}else if (selection.value == 'massInvoicesToPaid') {
- $('statusId').value = "INVOICE_PAID";
+ jQuery('#statusId').val("INVOICE_PAID");
}else if (selection.value == 'massInvoicesToWriteoff') {
- $('statusId').value = "INVOICE_WRITEOFF";
+ jQuery('#statusId').val("INVOICE_WRITEOFF");
}else if (selection.value == 'massInvoicesToCancel') {
- $('statusId').value = "INVOICE_CANCELLED";
+ jQuery('#statusId').val("INVOICE_CANCELLED");
}
- if ($('processMassCheckRun').selected) {
- Effect.BlindDown('issueChecks');
+ if (jQuery('#processMassCheckRun').is(':selected')) {
+ jQuery('#issueChecks').fadeOut('slow');
} else {
- Effect.BlindUp('issueChecks');
- }
- if($('listPurchaseInvoices').getInputs('checkbox','invoiceIds').pluck('checked').any() && ($F('serviceName') != "")) {
- $('submitButton').disabled = false;
+ jQuery('#issueChecks').fadeIn('slow');
}
+ var invoices = jQuery("#listPurchaseInvoices :checkbox[name='invoiceIds']");
+ // check if any checkbox is checked
+ var anyChecked = false;
+ jQuery.each(invoices, function() {
+ if (jQuery(this).is(':checked')) {
+ anyChecked = true;
+ return false;
+ }
+ });
+
+ if(anyChecked && (jQuery('#serviceName').val() != "")) {
+ jQuery('#submitButton').attr('disabled', '');
+ }
}
function runAction() {
- $('listPurchaseInvoices').submit();
+ jQuery('#listPurchaseInvoices').submit();
}
-->
Modified: ofbiz/branches/jquery/applications/accounting/webapp/ar/invoice/ListInvoices.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/ar/invoice/ListInvoices.ftl?rev=1001480&r1=1001479&r2=1001480&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/ar/invoice/ListInvoices.ftl (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/ar/invoice/ListInvoices.ftl Sun Sep 26 16:59:00 2010
@@ -20,61 +20,91 @@ under the License.
//<![CDATA[
function toggleInvoiceId(master) {
- var invoices = $('listInvoices').getInputs('checkbox','invoiceIds');
- invoices.each(function(invoice){
- invoice.checked = master.checked;
+ var invoices = jQuery("#listInvoices :checkbox[name='invoiceIds']");
+
+ jQuery.each(invoices, function() {
+ this.checked = master.checked;
});
getInvoiceRunningTotal();
}
function getInvoiceRunningTotal() {
- var invoices = $('listInvoices').getInputs('checkbox','invoiceIds');
- if(invoices.pluck('checked').all()) {
- $('checkAllInvoices').checked = true;
+ var invoices = jQuery("#listInvoices :checkbox[name='invoiceIds']");
+
+ //test if all checkboxes are checked
+ var allChecked = true;
+ jQuery.each(invoices, function() {
+ if (!jQuery(this).is(':checked')) {
+ allChecked = false;
+ return false;
+ }
+ });
+
+ if(allChecked) {
+ jQuery('#checkAllInvoices').attr('checked', true);
} else {
- $('checkAllInvoices').checked = false;
+ jQuery('#checkAllInvoices').attr('checked', false);
}
- if(invoices.pluck('checked').any()) {
- new Ajax.Request('getInvoiceRunningTotal', {
- asynchronous: false,
- onSuccess: function(transport) {
- var data = transport.responseText.evalJSON(true);
- $('showInvoiceRunningTotal').update(data.invoiceRunningTotal);
- },
- parameters: $('listInvoices').serialize(),
- requestHeaders: {Accept: 'application/json'}
+
+ // check if any checkbox is checked
+ var anyChecked = false;
+ jQuery.each(invoices, function() {
+ if (jQuery(this).is(':checked')) {
+ anyChecked = true;
+ return false;
+ }
+ });
+ if(anyChecked) {
+ jQuery.ajax({
+ url: 'getInvoiceRunningTotal',
+ type: 'POST',
+ async: true,
+ data: jQuery('#listInvoices').serialize(),
+ success: function(data) { jQuery('#showInvoiceRunningTotal').html(data.invoiceRunningTotal) }
});
- if($F('serviceName') != "") {
- $('submitButton').disabled = false;
+
+ if(jQuery('#serviceName').val() != "") {
+ jQuery('#submitButton').attr('disabled', '');
}
-
+
} else {
- $('submitButton').disabled = true;
- $('showInvoiceRunningTotal').update("");
+ jQuery('#submitButton').attr('disabled', 'disabled');
+ jQuery('#showInvoiceRunningTotal').html("");
}
}
function setServiceName(selection) {
if ( selection.value == 'massInvoicesToApprove' || selection.value == 'massInvoicesToSent' || selection.value == 'massInvoicesToReady' || selection.value == 'massInvoicesToPaid' || selection.value == 'massInvoicesToWriteoff' || selection.value == 'massInvoicesToCancel') {
- $('listInvoices').action = $('invoiceStatusChange').value;
+ jQuery('#listInvoices').attr('action', jQuery('#invoiceStatusChange').val());
} else {
- $('listInvoices').action = selection.value;
+ $jQuery('#listInvoices').attr('action', selection.value);
}
if (selection.value == 'massInvoicesToApprove') {
- $('statusId').value = "INVOICE_APPROVED";
+ jQuery('#statusId').val("INVOICE_APPROVED");
} else if (selection.value == 'massInvoicesToSent') {
- $('statusId').value = "INVOICE_SENT";
+ jQuery('#statusId').val("INVOICE_SENT");
} else if (selection.value == 'massInvoicesToReady') {
- $('statusId').value = "INVOICE_READY";
+ jQuery('#statusId').val("INVOICE_READY");
} else if (selection.value == 'massInvoicesToPaid') {
- $('statusId').value = "INVOICE_PAID";
+ jQuery('#statusId').val("INVOICE_PAID");
} else if (selection.value == 'massInvoicesToWriteoff') {
- $('statusId').value = "INVOICE_WRITEOFF";
+ jQuery('#statusId').val("INVOICE_WRITEOFF");
} else if (selection.value == 'massInvoicesToCancel') {
- $('statusId').value = "INVOICE_CANCELLED";
+ jQuery('#statusId').val("INVOICE_CANCELLED");
}
- if($('listInvoices').getInputs('checkbox','invoiceIds').pluck('checked').any() && ($F('serviceName') != "")) {
- $('submitButton').disabled = false;
+
+ var invoices = jQuery("#listInvoices :checkbox[name='invoiceIds']");
+ // check if any checkbox is checked
+ var anyChecked = false;
+ jQuery.each(invoices, function() {
+ if (jQuery(this).is(':checked')) {
+ anyChecked = true;
+ return false;
+ }
+ });
+
+ if(anyChecked && (jQuery('#serviceName').val() != "")) {
+ jQuery('#submitButton').attr('disabled' , '');
}
}
//]]>
@@ -100,7 +130,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="disabled" />
+ <input id="submitButton" type="button" onclick="javascript:jQuery('#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/branches/jquery/applications/accounting/webapp/ar/payment/batchPayments.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/ar/payment/batchPayments.ftl?rev=1001480&r1=1001479&r2=1001480&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/ar/payment/batchPayments.ftl (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/ar/payment/batchPayments.ftl Sun Sep 26 16:59:00 2010
@@ -20,66 +20,97 @@ under the License.
<script type="text/javascript">
//<![CDATA[
function togglePaymentId(master) {
- var payments = $('paymentBatchForm').getInputs('checkbox','paymentIds');
- payments.each(function(payment){
- payment.checked = master.checked;
+ var payments = jQuery("#paymentBatchForm :checkbox[name='paymentIds']");
+
+ jQuery.each(payments, function() {
+ this.checked = master.checked;
});
getPaymentRunningTotal();
}
function getPaymentRunningTotal() {
- var payments = $('paymentBatchForm').getInputs('checkbox','paymentIds');
- if(payments.pluck('checked').all()) {
- $('checkAllPayments').checked = true;
+ var payments = jQuery("#paymentBatchForm :checkbox[name='paymentIds']");
+
+ //test if all checkboxes are checked
+ var allChecked = true;
+ jQuery.each(payments, function() {
+ if (!jQuery(this).is(':checked')) {
+ allChecked = false;
+ return false;
+ }
+ });
+
+ if(allChecked) {
+ jQuery('#checkAllPayments').attr('checked', true);
} else {
- $('checkAllPayments').checked = false;
+ jQuery('#checkAllPayments').attr('checked', false);
}
- if(payments.pluck('checked').any()) {
- new Ajax.Request('getPaymentRunningTotal', {
- asynchronous: false,
- onSuccess: function(transport) {
- var data = transport.responseText.evalJSON(true);
- $('showPaymentRunningTotal').update(data.paymentRunningTotal);
- },
- parameters: $('paymentBatchForm').serialize(),
- requestHeaders: {Accept: 'application/json'}
+ // check if any checkbox is checked
+ var anyChecked = false;
+ jQuery.each(payments, function() {
+ if (jQuery(this).is(':checked')) {
+ anyChecked = true;
+ return false;
+ }
+ });
+
+ if(anyChecked) {
+ jQuery({
+ url: 'getPaymentRunningTotal',
+ async: true,
+ data: jQuery('#paymentBatchForm').serialize(),
+ success: function(data) {
+ jQuery('#showPaymentRunningTotal').html(data.paymentRunningTotal);
+ }
});
- if($F('serviceName') != "") {
- $('submitButton').disabled = false;
+
+ if(jQuery('#serviceName').val() != "") {
+ jQuery('#submitButton').attr('disabled', '');
}
-
+
} else {
- $('submitButton').disabled = true;
- $('showPaymentRunningTotal').update("");
+ jQuery('#submitButton').attr('disabled', 'disabled');
+ jQuery('#showPaymentRunningTotal').html("");
}
}
function setServiceName(selection) {
if (selection.value == 'massPaymentsToNotPaid' || selection.value == 'massPaymentsToReceived' || selection.value == 'massPaymentsToConfirmed' || selection.value == 'massPaymentsToCancelled' || selection.value == 'massPaymentsToVoid') {
- $('paymentBatchForm').action = $('paymentStatusChange').value;
+ jQuery('#paymentBatchForm').attr('action', jQuery('#paymentStatusChange').val());
}
else {
- $('paymentBatchForm').action = selection.value;
+ jQuery('#paymentBatchForm').attr('action', selection.value);
}
if (selection.value == 'massPaymentsToNotPaid') {
- $('statusId').value = "PMNT_NOT_PAID";
+ jQuery('#statusId').val("PMNT_NOT_PAID");
} else if (selection.value == 'massPaymentsToReceived') {
- $('statusId').value = "PMNT_RECEIVED";
+ jQuery('#statusId').val("PMNT_RECEIVED");
}else if (selection.value == 'massPaymentsToConfirmed') {
- $('statusId').value = "PMNT_CONFIRMED";
+ jQuery('#statusId').value("PMNT_CONFIRMED");
}else if (selection.value == 'massPaymentsToCancelled') {
- $('statusId').value = "PMNT_CANCELLED";
+ jQuery('#statusId').val("PMNT_CANCELLED");
}else if (selection.value == 'massPaymentsToVoid') {
- $('statusId').value = "PMNT_VOID";
+ jQuery('#statusId').val("PMNT_VOID");
}
- if ($('processBatchPayment').selected) {
- Effect.BlindDown('createPaymentBatch');
+ if (jQuery('#processBatchPayment').is(':selected')) {
+ jQuery('#createPaymentBatch').fadeOut('slow');
} else {
- Effect.BlindUp('createPaymentBatch');
+ jQuery('#createPaymentBatch').fadeIn('slow');
}
- if($('paymentBatchForm').getInputs('checkbox','paymentIds').pluck('checked').any() && ($F('serviceName') != "")) {
- $('submitButton').disabled = false;
+
+ var payments = jQuery("#paymentBatchForm :checkbox[name='paymentIds']");
+ // check if any checkbox is checked
+ var anyChecked = false;
+ jQuery.each(payments, function() {
+ if (jQuery(this).is(':checked')) {
+ anyChecked = true;
+ return false;
+ }
+ });
+
+ if(anyChecked && (jQuery('#serviceName').val() != "")) {
+ jQuery('#submitButton').attr('disabled' , '');
} else {
- $('submitButton').disabled = true;
+ jQuery('#submitButton').attr('disabled' , 'disabled');
}
}
@@ -105,7 +136,7 @@ function setServiceName(selection) {
<option value="massPaymentsToCancelled">${uiLabelMap.AccountingPaymentTabStatusToCancelled}</option>
<option value="massPaymentsToVoid">${uiLabelMap.AccountingPaymentTabStatusToVoid}</option>
</select>
- <input id="submitButton" type="button" onclick="javascript:$('paymentBatchForm').submit();" value="${uiLabelMap.CommonRun}" disabled="disabled" />
+ <input id="submitButton" type="button" onclick="javascript:jQuery('#paymentBatchForm').submit();" value="${uiLabelMap.CommonRun}" disabled="disabled" />
<input type="hidden" name='organizationPartyId' value="${organizationPartyId?if_exists}" />
<input type="hidden" name='paymentGroupTypeId' value="BATCH_PAYMENT" />
<input type="hidden" name="groupInOneTransaction" value="Y" />
Modified: ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml?rev=1001480&r1=1001479&r2=1001480&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml Sun Sep 26 16:59:00 2010
@@ -419,8 +419,6 @@ under the License.
<actions>
<set field="titleProperty" value="PageTitleFindFinAccountTrans"/>
<set field="tabButtonItem" value="FinAccountTrans"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/popup.js" global="true"/>
- <set field="layoutSettings.styleSheets[+0]" value="/images/prototypejs/popup.css" global="true"/>
<service service-name="getFinAccountTransListAndTotals" result-map="finAccountTransListAndTotals" auto-field-map="true"/>
<set field="finAccountTransList" type="List" from-field="finAccountTransListAndTotals.finAccountTransList"/>
<set field="searchedNumberOfRecords" type="Integer" from-field="finAccountTransListAndTotals.searchedNumberOfRecords"/>
@@ -473,8 +471,6 @@ under the License.
<actions>
<set field="titleProperty" value="AccountingBankReconciliation"/>
<set field="tabButtonItem" value="FinAccountTrans"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/popup.js" global="true"/>
- <set field="layoutSettings.styleSheets[+0]" value="/images/prototypejs/popup.css" global="true"/>
<set field="finAccountId" from-field="parameters.finAccountId"/>
<entity-one entity-name="FinAccount" value-field="finAccount"/>
</actions>
@@ -620,8 +616,6 @@ under the License.
<section>
<actions>
<set field="tabButtonItem" value="FindFinAccountReconciliations"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/popup.js" global="true"/>
- <set field="layoutSettings.styleSheets[+0]" value="/images/prototypejs/popup.css" global="true"/>
<set field="titleProperty" value="AccountingEditFinAccountReconciliations"/>
<set field="finAccountId" from-field="parameters.finAccountId"/>
<set field="glReconciliationId" from-field="parameters.glReconciliationId"/>