svn commit: r1201322 - in /ofbiz/branches/release11.04: ./ applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl

Author: jleroux
Date: Sat Nov 12 20:49:42 2011
New Revision: 1201322

URL: http://svn.apache.org/viewvc?rev=1201322&view=rev
Log:
"Applied fix from trunk for revision: 1199276"
------------------------------------------------------------------------
r1199276 | sascharodekamp | 2011-11-08 16:07:19 +0100 (mar., 08 nov. 2011) | 1 line

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/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
    ofbiz/branches/release11.04/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 20:49:42 2011
@@ -2,4 +2,4 @@
 /ofbiz/branches/dojo1.4:951708-952957
 /ofbiz/branches/jquery:952958-1044489
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199450,1200207,1201110,1201125
+/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125

Modified: ofbiz/branches/release11.04/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl?rev=1201322&r1=1201321&r2=1201322&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl (original)
+++ ofbiz/branches/release11.04/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl Sat Nov 12 20:49:42 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/branches/release11.04/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl?rev=1201322&r1=1201321&r2=1201322&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl (original)
+++ ofbiz/branches/release11.04/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl Sat Nov 12 20:49:42 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">