[OpenbravoERP-commits] devel/pi: Fixes issue 20540: Http error 0 matching transactions.

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/76f0c5a1026f
changeset: 16615:76f0c5a1026f
user:      Javier Etxarri <javier.echarri <at> openbravo.com>
date:      Thu May 24 12:54:43 2012 +0200
summary:   Fixes issue 20540: Http error 0 matching transactions.
Now the button save will not be enabled util all callbacks has finished

diffstat:

 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html
     |  23 +++++++++-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt
 |   2 +-
 2 files changed, 22 insertions(+), 3 deletions(-)

diffs (78 lines):

diff -r c2a4ef7a3e2f -r 76f0c5a1026f 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html
       Thu May 24 11:37:17 2012 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html
       Thu May 24 12:54:43 2012 +0200
@@ -104,6 +104,7 @@
 
 function unMatchLine(bankStatementLineId, isChecked) {
   if (!isChecked) {
+    matchTransactionCounter++;
     APRMMatchStatementIds[bankStatementLineId]=false;
     document.frmMain.inpFinBankStatementLineId.value = bankStatementLineId;
     document.getElementById("inpMatchedDocument_" + 
bankStatementLineId).innerHTML = "";
@@ -118,6 +119,7 @@
   }
   else {
     APRMMatchStatementIds[bankStatementLineId]=true;
+    document.frmMain.buttonProcess.disabled = false;
   }
   return true;
 }
@@ -189,7 +191,14 @@
                 if(data.grid.indexOf('inpCheckBox_'+i)){
                   
document.getElementById('inpCheckBox_'+i).checked=APRMMatchStatementIds[i];
                 }
-             } 
+            }
+            matchTransactionCounter--;
+            if (matchTransactionCounter === 0){
+                  document.frmMain.buttonProcess.disabled = false;
+            }
+            else if (matchTransactionCounter < 0){
+                matchTransactionCounter = 0;
+            }
             showWarning();
           } else {
             document.getElementById('sectionGrid').innerHTML = '';
@@ -224,6 +233,15 @@
         if (data.forceLoadGrid) {
           loadGrid();
         }
+        else{
+          matchTransactionCounter--;
+          if (matchTransactionCounter === 0){
+              document.frmMain.buttonProcess.disabled = false;
+          }
+          else if (matchTransactionCounter < 0){
+              matchTransactionCounter = 0;
+          }
+        }
       }
     } catch (e) {
     }
@@ -267,6 +285,7 @@
       } else initialize_MessageBox('messageBoxID');
   }
   function onLoadDo(){
+    matchTransactionCounter = 0;
     APRMMatchStatementIds = new Object();
     this.windowTables = new Array(
               new windowTableId('client_top_popup', 'buttonProcess'),
@@ -659,4 +678,4 @@
   </table>
 </form>
 </body>
-</html>
\ No newline at end of file
+</html>
diff -r c2a4ef7a3e2f -r 76f0c5a1026f 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt
   Thu May 24 11:37:17 2012 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt
   Thu May 24 12:54:43 2012 +0200
@@ -29,7 +29,7 @@
     <td class="DataGrid_Body_LineNoCell" style="background-color: xx; 
text-align: center;" id="inpMatchStyle_xx" name="inpMatchStyle_xx">
       <a href="#" onClick="openSelector('xx');" id="fieldFindLink"><img 
src="../../../../../web/org.openbravo.advpaymentmngt/images/view.png" 
style="border-style: none"/></a>
       <!--span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span-->
-      <input id="inpCheckBox_xx" type="checkbox" name="inpBankStatementLineId" 
value="" onclick="unMatchLine('xx', this.checked);"/>
+      <input id="inpCheckBox_xx" type="checkbox" name="inpBankStatementLineId" 
value="" onclick="document.frmMain.buttonProcess.disabled = 
true;unMatchLine('xx', this.checked);"/>
       <input type="hidden" name="inpFinancialTransactionId_xx" 
id="inpFinancialTransactionId_xx" value=""></input>
       <input type="hidden" name="inpMatchingType_xx" id="inpMatchingType_xx" 
value=""></input>
       <!--span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span-->

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits