Author: diveshdutta
Date: Mon Jul 4 16:41:37 2016
New Revision: 1751338
URL: http://svn.apache.org/viewvc?rev=1751338&view=rev
Log:
[OFBIZ-7577] Accounting component: Checkbox and Radio buttons should get
selected on clicking upon their labels. Thanks Devanshu Vyas for your patch.
Modified:
ofbiz/trunk/applications/accounting/template/agreement/CopyAgreement.ftl
ofbiz/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl
ofbiz/trunk/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl
ofbiz/trunk/applications/accounting/template/ar/invoice/ListInvoices.ftl
ofbiz/trunk/applications/accounting/template/ar/payment/BatchPayments.ftl
ofbiz/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl
ofbiz/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl
Modified:
ofbiz/trunk/applications/accounting/template/agreement/CopyAgreement.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/template/agreement/CopyAgreement.ftl?rev=1751338&r1=1751337&r2=1751338&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/template/agreement/CopyAgreement.ftl
(original)
+++ ofbiz/trunk/applications/accounting/template/agreement/CopyAgreement.ftl
Mon Jul 4 16:41:37 2016
@@ -29,10 +29,10 @@ 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="checked" />
- ${uiLabelMap.ProductProducts} <input type="checkbox"
name="copyAgreementProducts" value="Y" checked="checked" />
- ${uiLabelMap.Party} <input type="checkbox"
name="copyAgreementParties" value="Y" checked="checked" />
- ${uiLabelMap.ProductFacilities} <input type="checkbox"
name="copyAgreementFacilities" value="Y" checked="checked" />
+ <label>${uiLabelMap.AccountingAgreementTerms} <input
type="checkbox" name="copyAgreementTerms" value="Y" checked="checked" /></label>
+ <label>${uiLabelMap.ProductProducts} <input type="checkbox"
name="copyAgreementProducts" value="Y" checked="checked" /></label>
+ <label>${uiLabelMap.Party} <input type="checkbox"
name="copyAgreementParties" value="Y" checked="checked" /></label>
+ <label>${uiLabelMap.ProductFacilities} <input type="checkbox"
name="copyAgreementFacilities" value="Y" checked="checked" /></label>
</div>
<div class="button-bar">
<input type="submit" value="${uiLabelMap.CommonCopy}"/>
Modified:
ofbiz/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl?rev=1751338&r1=1751337&r2=1751338&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl
(original)
+++ ofbiz/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl
Mon Jul 4 16:41:37 2016
@@ -90,7 +90,7 @@ function enableSubmitButton() {
<table class="basic-table hover-bar" cellspacing="0">
<#-- Header Begins -->
<tr class="header-row-2">
- <td width="9%"><input type="checkbox" id="checkAllInvoices"
name="checkAllInvoices" onchange="javascript:toggleInvoiceId(this);"/>
${uiLabelMap.CommonSelectAll}</td>
+ <td width="9%"><label><input type="checkbox" id="checkAllInvoices"
name="checkAllInvoices" onchange="javascript:toggleInvoiceId(this);"/>
${uiLabelMap.CommonSelectAll}</label></td>
<td width="6%">${uiLabelMap.FormFieldTitle_invoiceId}</td>
<td width="10%">${uiLabelMap.AccountingFromParty}</td>
<td width="14%">${uiLabelMap.AccountingToParty}</td>
@@ -110,7 +110,7 @@ function enableSubmitButton() {
<#assign invoicePaymentInfo =
invoicePaymentInfoList.get("invoicePaymentInfoList").get(0)!>
<#assign statusItem = delegator.findOne("StatusItem", {"statusId" :
invoice.statusId}, false)!/>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
- <td><input type="checkbox" id="invoiceId_${invoice_index}"
name="invoiceIds" value="${invoice.invoiceId}"
onclick="javascript:enableSubmitButton();"/></td>
+ <td><label><input type="checkbox" id="invoiceId_${invoice_index}"
name="invoiceIds" value="${invoice.invoiceId}"
onclick="javascript:enableSubmitButton();"/></label></td>
<td><a class="buttontext"
href="<@ofbizUrl>invoiceOverview?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td>
<td><a
href="/partymgr/control/viewprofile?partyId=${invoice.partyIdFrom}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
invoice.partyIdFrom, false)!}</a></td>
<td><a
href="/partymgr/control/viewprofile?partyId=${invoice.invoiceRolePartyId}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
invoice.invoiceRolePartyId, false)!}</a></td>
Modified:
ofbiz/trunk/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl?rev=1751338&r1=1751337&r2=1751338&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl
(original)
+++
ofbiz/trunk/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl
Mon Jul 4 16:41:37 2016
@@ -185,7 +185,7 @@ function runAction() {
<td>${uiLabelMap.AccountingAmount}</td>
<td>${uiLabelMap.FormFieldTitle_paidAmount}</td>
<td>${uiLabelMap.FormFieldTitle_outstandingAmount}</td>
- <td>${uiLabelMap.CommonSelectAll} <input type="checkbox"
id="checkAllInvoices" name="checkAllInvoices"
onchange="javascript:toggleInvoiceId(this);"/></td>
+ <td><label>${uiLabelMap.CommonSelectAll} <input type="checkbox"
id="checkAllInvoices" name="checkAllInvoices"
onchange="javascript:toggleInvoiceId(this);"/></label></td>
</tr>
<#-- Header Ends-->
<#assign alt_row = false>
@@ -205,7 +205,7 @@ function runAction() {
<td><@ofbizCurrency amount=invoicePaymentInfo.amount
isoCode=defaultOrganizationPartyCurrencyUomId/></td>
<td><@ofbizCurrency amount=invoicePaymentInfo.paidAmount
isoCode=defaultOrganizationPartyCurrencyUomId/></td>
<td><@ofbizCurrency amount=invoicePaymentInfo.outstandingAmount
isoCode=defaultOrganizationPartyCurrencyUomId/></td>
- <td align="right"><input type="checkbox"
id="invoiceId_${invoice_index}" name="invoiceIds" value="${invoice.invoiceId}"
onclick="javascript:getInvoiceRunningTotal();"/></td>
+ <td align="right"><label><input type="checkbox"
id="invoiceId_${invoice_index}" name="invoiceIds" value="${invoice.invoiceId}"
onclick="javascript:getInvoiceRunningTotal();"/></label></td>
</tr>
<#-- toggle the row color -->
<#assign alt_row = !alt_row>
Modified:
ofbiz/trunk/applications/accounting/template/ar/invoice/ListInvoices.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/template/ar/invoice/ListInvoices.ftl?rev=1751338&r1=1751337&r2=1751338&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/template/ar/invoice/ListInvoices.ftl
(original)
+++ ofbiz/trunk/applications/accounting/template/ar/invoice/ListInvoices.ftl
Mon Jul 4 16:41:37 2016
@@ -156,7 +156,7 @@ under the License.
<td>${uiLabelMap.AccountingAmount}</td>
<td>${uiLabelMap.FormFieldTitle_paidAmount}</td>
<td>${uiLabelMap.FormFieldTitle_outstandingAmount}</td>
- <td align="right">${uiLabelMap.CommonSelectAll} <input
type="checkbox" id="checkAllInvoices" name="checkAllInvoices"
onchange="javascript:toggleInvoiceId(this);"/></td>
+ <td align="right"><label>${uiLabelMap.CommonSelectAll} <input
type="checkbox" id="checkAllInvoices" name="checkAllInvoices"
onchange="javascript:toggleInvoiceId(this);"/></label></td>
</tr>
</thead>
<tbody>
@@ -181,7 +181,7 @@ under the License.
<td><@ofbizCurrency amount=invoicePaymentInfo.amount
isoCode=defaultOrganizationPartyCurrencyUomId/></td>
<td><@ofbizCurrency amount=invoicePaymentInfo.paidAmount
isoCode=defaultOrganizationPartyCurrencyUomId/></td>
<td><@ofbizCurrency amount=invoicePaymentInfo.outstandingAmount
isoCode=defaultOrganizationPartyCurrencyUomId/></td>
- <td align="right"><input type="checkbox"
id="invoiceId_${invoice_index}" name="invoiceIds" value="${invoice.invoiceId}"
onclick="javascript:getInvoiceRunningTotal();"/></td>
+ <td align="right"><label><input type="checkbox"
id="invoiceId_${invoice_index}" name="invoiceIds" value="${invoice.invoiceId}"
onclick="javascript:getInvoiceRunningTotal();"/></label></td>
</tr>
<#-- toggle the row color -->
<#assign alt_row = !alt_row>
Modified:
ofbiz/trunk/applications/accounting/template/ar/payment/BatchPayments.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/template/ar/payment/BatchPayments.ftl?rev=1751338&r1=1751337&r2=1751338&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/template/ar/payment/BatchPayments.ftl
(original)
+++ ofbiz/trunk/applications/accounting/template/ar/payment/BatchPayments.ftl
Mon Jul 4 16:41:37 2016
@@ -182,8 +182,10 @@ function setServiceName(selection) {
<th>${uiLabelMap.FormFieldTitle_amountToApply}</th>
<th>${uiLabelMap.CommonPaymentMethodType}</th>
<th>
- ${uiLabelMap.CommonSelectAll}
- <input type="checkbox" id="checkAllPayments"
name="checkAllPayments" onchange="javascript:togglePaymentId(this);"/>
+ <label>
+ ${uiLabelMap.CommonSelectAll}
+ <input type="checkbox" id="checkAllPayments"
name="checkAllPayments" onchange="javascript:togglePaymentId(this);"/>
+ </label>
</th>
</tr>
</thead>
Modified:
ofbiz/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl?rev=1751338&r1=1751337&r2=1751338&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl
(original)
+++
ofbiz/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl
Mon Jul 4 16:41:37 2016
@@ -139,7 +139,7 @@ function getFinAccountTransRunningTotalA
</#if>
</#if>
<#if ((glReconciliationId?has_content && glReconciliationId ==
"_NA_") && (glReconciliations?has_content && finAccountTransList?has_content))
|| !grandTotal??>
- <th>${uiLabelMap.CommonSelectAll} <input name="selectAll"
type="checkbox" value="N" id="checkAllTransactions"
onclick="javascript:togglefinAccountTransId(this);"/></th>
+ <th><label>${uiLabelMap.CommonSelectAll} <input name="selectAll"
type="checkbox" value="N" id="checkAllTransactions"
onclick="javascript:togglefinAccountTransId(this);"/></label></th>
</#if>
</tr>
<#-- Header Ends-->
Modified:
ofbiz/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl?rev=1751338&r1=1751337&r2=1751338&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl
(original)
+++
ofbiz/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl
Mon Jul 4 16:41:37 2016
@@ -93,7 +93,7 @@ function getPaymentRunningTotal() {
<td>${uiLabelMap.AccountingToParty}</td>
<td>${uiLabelMap.CommonAmount}</td>
<td>${uiLabelMap.CommonDate}</td>
- <td align="right">${uiLabelMap.CommonSelectAll}<input
type="checkbox" id="checkAllPayments" name="checkAllPayments"
onchange="javascript:togglePaymentId(this);"/></td>
+ <td
align="right"><label>${uiLabelMap.CommonSelectAll}<input type="checkbox"
id="checkAllPayments" name="checkAllPayments"
onchange="javascript:togglePaymentId(this);"/></label></td>
</tr>
<#assign alt_row = false>
<#list paymentList as payment>
@@ -104,15 +104,15 @@ function getPaymentRunningTotal() {
<td>${(payment.partyToFirstName)!}
${(payment.partyToLastName)!} ${(payment.partyToGroupName)!}</td>
<td><@ofbizCurrency amount=payment.amount
isoCode=payment.currencyUomId/></td>
<td>${payment.effectiveDate!}</td>
- <td
align="right">${uiLabelMap.AccountingDeposit}<input type="checkbox"
id="paymentId_${payment_index}" name="paymentIds" value="${payment.paymentId}"
onclick="javascript:getPaymentRunningTotal();"/></td>
+ <td
align="right"><label>${uiLabelMap.AccountingDeposit}<input type="checkbox"
id="paymentId_${payment_index}" name="paymentIds" value="${payment.paymentId}"
onclick="javascript:getPaymentRunningTotal();"/></label></td>
</tr>
<#assign alt_row = !alt_row>
</#list>
<div align="right">
<span class="label">${uiLabelMap.AccountingPayment}
${uiLabelMap.PartyPartyGroupName}</span>
<input type="text" size='25' id="paymentGroupName"
name='paymentGroupName' />
- <span
class="label">${uiLabelMap.AccountingGroupInOneTransaction}</span>
- <input type="checkbox" name="groupInOneTransaction"
value="Y" checked="checked" />
+ <label><span
class="label">${uiLabelMap.AccountingGroupInOneTransaction}</span>
+ <input type="checkbox" name="groupInOneTransaction"
value="Y" checked="checked" /></label>
<input id="submitButton" type="button"
onclick="javascript:document.depositWithdrawPaymentsForm.submit();"
value="${uiLabelMap.AccountingDepositWithdraw}" disabled="disabled"/>
</div>
</table>
