details:   /erp/devel/pi/rev/e0f6b92cdfcc
changeset: 11008:e0f6b92cdfcc
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Thu Mar 03 20:14:41 2011 +0100
summary:   CI: update AD_MODULE to version 10964

details:   /erp/devel/pi/rev/5bcaf910abac
changeset: 11009:5bcaf910abac
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Thu Mar 03 20:17:27 2011 +0100
summary:   CI: promote changesets from pi to main

details:   /erp/devel/pi/rev/dec87c13b691
changeset: 11010:dec87c13b691
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Thu Mar 03 20:19:05 2011 +0100
summary:   CI: merge back from main

diffstat:

 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml  
                                                                                
                     |    2 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
            |    4 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
                                                                           |  
114 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
                                                                           |   
74 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.xml
                                                                            |   
10 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransactionGrid.srpt
                                                                       |    6 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransactionGrid.xml
                                                                        |    6 
+-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ExecutePayments.java
                                                                          |   
20 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html
                                                                         |    4 
+-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
                                                                         |   16 
+-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java
                                                                           |   
10 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
                                                                                
    |   22 +-
 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml       
                                                                                
                     |    2 +-
 
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
                 |    2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
                                                                                
                  |   57 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
                   |    2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
        |    2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
                                                                                
               |    5 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml
                                                                                
                 |   12 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-application-menu.js
                                                                             |  
  1 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-recent-utilities.js
                                                                             |  
  1 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
                                                                                
|   24 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-statusbar.js
                                                                                
    |    4 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
                                                                                
      |   27 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
                                                                                
    |   15 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
                                                                                
    |    5 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
                                                                                
    |  116 +++-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-manager.js
                                                                                
 |   16 +-
 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/toolbar/iconButton-saveclose.png
  |    0 
 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/toolbar/iconButton-savecloseX.png
 |    0 
 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-toolbar-styles.css
                    |   12 +
 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-toolbar-styles.js
                     |    2 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
                    |    2 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
         |    2 +-
 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml   
                                                                                
                     |    2 +-
 
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
             |    6 +-
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml     
                                                                                
                     |    2 +-
 
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
               |    4 +-
 
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/URLWidgetProvider.java
                                                                                
              |   17 +-
 
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
                                                                                
                |    9 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml 
                                                                                
                    |    2 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
          |    2 +-
 modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml  
                                                                                
                     |    2 +-
 
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
            |    2 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
              |    2 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
   |    2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
       |    2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                            |   
 2 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
                   |    2 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
        |   10 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java
                                                                         |    6 
+-
 modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml    
                                                                                
                     |    2 +-
 
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
              |    2 +-
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
               |    2 +-
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
    |   12 +-
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
                                                            |   13 +-
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
                                                                        |   76 
+-
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java
                                                         |    5 +-
 
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
                                                                        |   20 
+-
 
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
                                                                      |    8 +
 
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
      |    2 +-
 
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                           |    
2 +-
 
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
            |    2 +-
 
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
 |    6 +-
 
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
                                                                    |   17 +
 modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml     
                                                                                
                     |    2 +-
 
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
               |    6 +-
 modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml    
                                                                                
                     |    2 +-
 
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
              |    4 +-
 modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml              
                                                                                
                     |    2 +-
 modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml   
                                                                                
                     |    4 +-
 src-core/src/org/openbravo/database/ConnectionProviderImpl.java                
                                                                                
                     |   46 +-
 src-db/database/lib/dbsourcemanager.jar                                        
                                                                                
                     |    0 
 src-db/database/model/functions/C_CURRENCY_RATE.xml                            
                                                                                
                     |    2 +-
 src-db/database/model/functions/C_INVOICE_POST.xml                             
                                                                                
                     |    1 -
 src-db/database/model/views/M_PRODUCT_STOCK_V.xml                              
                                                                                
                     |    4 +-
 src-db/database/sourcedata/AD_COLUMN.xml                                       
                                                                                
                     |   31 +
 src-db/database/sourcedata/AD_ELEMENT.xml                                      
                                                                                
                     |   11 +
 src-db/database/sourcedata/AD_MODULE.xml                                       
                                                                                
                     |    2 +-
 src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml                          
                                                                                
                     |   26 +-
 src-test/org/openbravo/test/xml/EntityXMLImportTestSingle.java                 
                                                                                
                     |  138 ++++-
 src-test/org/openbravo/test/xml/EntityXMLImportTestWarning.java                
                                                                                
                     |   94 ++-
 src-wad/src/org/openbravo/wad/Wad.java                                         
                                                                                
                     |   20 +-
 src-wad/src/org/openbravo/wad/controls/WADGrid.java                            
                                                                                
                     |   12 +-
 src-wad/src/org/openbravo/wad/javasource.javaxml                               
                                                                                
                     |    4 +-
 src/org/openbravo/base/model/ModelProvider.java                                
                                                                                
                     |    4 +-
 src/org/openbravo/base/session/OBOracle10gDialect.java                         
                                                                                
                     |    6 +-
 src/org/openbravo/dal/service/OBDal.java                                       
                                                                                
                     |    4 +
 src/org/openbravo/dal/service/OBDao.java                                       
                                                                                
                     |  303 ++++++++++
 src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java           
                                                                                
                     |   10 +-
 src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.xml            
                                                                                
                     |    2 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java                
                                                                                
                     |    9 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.xml                 
                                                                                
                     |    2 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java         
                                                                                
                     |   13 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml          
                                                                                
                     |    2 +-
 src/org/openbravo/erpCommon/ad_reports/ReportNotPosted.java                    
                                                                                
                     |    2 +-
 src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java                 
                                                                                
                     |   11 +-
 src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.xml                  
                                                                                
                     |    2 +-
 src/org/openbravo/erpCommon/security/Login.html                                
                                                                                
                     |    2 +-
 src/org/openbravo/erpCommon/security/Login_F1.html                             
                                                                                
                     |    2 +-
 src/org/openbravo/erpCommon/utility/TableSQLData.java                          
                                                                                
                     |   10 +
 web/js/utils.js                                                                
                                                                                
                     |   10 +-
 102 files changed, 1301 insertions(+), 344 deletions(-)

diffs (truncated from 3718 to 300 lines):

diff -r fd35928b1f85 -r dec87c13b691 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml 
    Wed Mar 02 08:08:23 2011 +0100
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml 
    Thu Mar 03 20:19:05 2011 +0100
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and 
Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  
<VERSION><![CDATA[3.0.10961]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  
<VERSION><![CDATA[3.0.10964]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your 
finances with an ERP does not have to be difficult. Enjoy a radically improved 
user experience that combines the power of an enterprise grade financial 
application with the simplicity and ease of a web 2.0 personal accounting 
service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and 
Receivables Management simplifies and automates the business processes around 
the management of financial accounts, from the receipt and issue of payment, to 
the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in 
the forum discussions or register feature requests or issues in the 
corresponding (Forum and Bug Tracking) sections in the Advanced Payables and 
Receivable project in the OB Forge.]]></HELP>
diff -r fd35928b1f85 -r dec87c13b691 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  Wed Mar 02 08:08:23 2011 +0100
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  Thu Mar 03 20:19:05 2011 +0100
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<STARTVERSION><![CDATA[2.1.10961]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<STARTVERSION><![CDATA[2.1.10964]]></STARTVERSION>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDANT_MODULE_NAME><![CDATA[User 
Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--B97FC854C6DD41E692161585645A900F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B97FC854C6DD41E692161585645A900F-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B97FC854C6DD41E692161585645A900F-->  
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->  
<STARTVERSION><![CDATA[3.0.10961]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  
<STARTVERSION><![CDATA[3.0.10964]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r fd35928b1f85 -r dec87c13b691 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
 Wed Mar 02 08:08:23 2011 +0100
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
 Thu Mar 03 20:19:05 2011 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -56,64 +56,64 @@
   var frm = document.frmMain;
   var opt = frm.inpTransactionType.value;
   if (frm.inpMainDate.value==null || frm.inpMainDate.value=="") {
-       setWindowElementFocus(frm.inpMainDate);
+    setWindowElementFocus(frm.inpMainDate);
     showJSMessage(7);
     return false;
   }
   if (opt == 'P') {
     var chk = frm.inpPaymentId;
-       if (chk === undefined) {
-         showJSMessage('NoDataSelected');
+    if (chk === undefined) {
+      showJSMessage('NoDataSelected');
       return false;
-       } else if (chk.length === undefined) {
-         if (!chk.checked) {
-           showJSMessage('NoDataSelected');
-        return false;    
-         }
-       } else {
-         var isAnyChecked = false;
-         var total = chk.length;
-         for (var i=0;i<total;i++) {
-           if (chk[i].checked) {
-             isAnyChecked = true;
-           }
-         }
-         if (!isAnyChecked) {
+    } else if (chk.length === undefined) {
+      if (!chk.checked) {
+        showJSMessage('NoDataSelected');
+        return false;     
+      }
+    } else {
+      var isAnyChecked = false;
+      var total = chk.length;
+      for (var i=0;i<total;i++) {
+        if (chk[i].checked) {
+          isAnyChecked = true;
+        }
+      }
+      if (!isAnyChecked) {
         showJSMessage('NoDataSelected');
         return false;
       }
-       }
+    }
   } else if (opt == 'GL') {
     if (frm.inpGLItemId.value==null || frm.inpGLItemId.value=="") {
       setWindowElementFocus(frm.inpGLItemId);
       showJSMessage(7);
       return false;
-    } else if (frm.paramDebitAmountGLItem.value == "") {
-      setWindowElementFocus(frm.paramDebitAmountGLItem);
+    } else if (frm.paramDepositAmountGLItem.value == "") {
+      setWindowElementFocus(frm.paramDepositAmountGLItem);
       showJSMessage(7);
       return false;
-    } else if (frm.paramCreditAmountGLItem.value == "") {
-      setWindowElementFocus(frm.paramCreditAmountGLItem);
+    } else if (frm.paramPaymentAmountGLItem.value == "") {
+      setWindowElementFocus(frm.paramPaymentAmountGLItem);
       showJSMessage(7);
       return false;
-    } else if ( (compare(frm.paramDebitAmountGLItem.value, '==', 0) && 
compare(frm.paramCreditAmountGLItem.value, '==', 0)) ||
-                (compare(frm.paramDebitAmountGLItem.value, '!=', 0) && 
compare(frm.paramCreditAmountGLItem.value, '!=', 0)) ) {
-      setWindowElementFocus(frm.paramCreditAmountGLItem);
+    } else if ( (compare(frm.paramDepositAmountGLItem.value, '==', 0) && 
compare(frm.paramPaymentAmountGLItem.value, '==', 0)) ||
+                (compare(frm.paramDepositAmountGLItem.value, '!=', 0) && 
compare(frm.paramPaymentAmountGLItem.value, '!=', 0)) ) {
+      setWindowElementFocus(frm.paramPaymentAmountGLItem);
       showJSMessage('APRM_JSAMOUNTDIFFTOZERO');
       return false;
     }
   } else if (opt == 'F') {
-    if (frm.paramDebitAmount.value == "") {
-      setWindowElementFocus(frm.paramDebitAmount);
+    if (frm.paramDepositAmount.value == "") {
+      setWindowElementFocus(frm.paramDepositAmount);
       showJSMessage(7);
       return false;
-    } else if (frm.paramCreditAmount.value == "") {
-      setWindowElementFocus(frm.paramCreditAmount);
+    } else if (frm.paramPaymentAmount.value == "") {
+      setWindowElementFocus(frm.paramPaymentAmount);
       showJSMessage(7);
       return false;
-    } else if ( (compare(frm.paramDebitAmount.value, '==', 0) && 
compare(frm.paramCreditAmount.value, '==', 0)) ||
-                (compare(frm.paramDebitAmount.value, '!=', 0) && 
compare(frm.paramCreditAmount.value, '!=', 0)) ) {
-      setWindowElementFocus(frm.paramCreditAmount);
+    } else if ( (compare(frm.paramDepositAmount.value, '==', 0) && 
compare(frm.paramPaymentAmount.value, '==', 0)) ||
+                (compare(frm.paramDepositAmount.value, '!=', 0) && 
compare(frm.paramPaymentAmount.value, '!=', 0)) ) {
+      setWindowElementFocus(frm.paramPaymentAmount);
       showJSMessage('APRM_JSAMOUNTDIFFTOZERO');
       return false;
     }
@@ -514,32 +514,32 @@
                     <td class="Textbox_ContentCell">
                       <table style="border: 0px none; border-collapse: 
collapse;">
                         <tr><td style="padding-top: 0px;">
-                          <input type="text" 
onblur="numberInputEvent('onblur', this);" onfocus="numberInputEvent('onfocus', 
this);" outputformat="euroEdition" onchange="numberInputEvent('onchange', 
this); return true;" onpaste="changeToEditingMode('onpaste');" 
oncut="changeToEditingMode('oncut');" 
onkeypress="changeToEditingMode('onkeypress');" 
onkeydown="changeToEditingMode('onkeydown'); numberInputEvent('onkeydown', 
this, event);" onkeyup="" name="inpDebitAmount" maxlength="22" value="" 
required="true" class="dojoValidateValid required TextBox_btn_OneCell_width 
number" id="paramDebitAmount"/>
+                          <input type="text" 
onblur="numberInputEvent('onblur', this);" onfocus="numberInputEvent('onfocus', 
this);" outputformat="euroEdition" onchange="numberInputEvent('onchange', 
this); return true;" onpaste="changeToEditingMode('onpaste');" 
oncut="changeToEditingMode('oncut');" 
onkeypress="changeToEditingMode('onkeypress');" 
onkeydown="changeToEditingMode('onkeydown'); numberInputEvent('onkeydown', 
this, event);" onkeyup="" name="inpDepositAmount" maxlength="22" value="" 
required="true" class="dojoValidateValid required TextBox_btn_OneCell_width 
number" id="paramDepositAmount"/>
                         </td></tr>
                       </table>
-                      <span id="paramDebitAmountinvalidSpan" style="display: 
none;" class="TextBox_MsgContainer_span">
+                      <span id="paramDepositAmountinvalidSpan" style="display: 
none;" class="TextBox_MsgContainer_span">
                         <table class="TextBox_MsgContainer_table">
                           <tbody><tr class="TextBox_MsgContainer_tr">
                             <td class="TextBox_MsgContainer_td"><div 
class="TextBox_MsgContainer_div"></div></td><td></td>
                           </tr>
                           <tr>
-                            <td class="invalid" colspan="2"><div 
name="invalidText" id="paramDebitAmountinvalidSpanText" 
class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td>
+                            <td class="invalid" colspan="2"><div 
name="invalidText" id="paramDepositAmountinvalidSpanText" 
class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td>
                           </tr>
                         </tbody></table>
                       </span>
-                      <span id="paramDebitAmountmissingSpan" style="display: 
none;" class="TextBox_MsgContainer_span">
+                      <span id="paramDepositAmountmissingSpan" style="display: 
none;" class="TextBox_MsgContainer_span">
                         <table class="TextBox_MsgContainer_table">
                           <tbody><tr class="TextBox_MsgContainer_tr">
                             <td class="TextBox_MsgContainer_td"><div 
class="TextBox_MsgContainer_div"></div></td><td></td>
                           </tr>
                           <tr>
-                            <td class="missing" colspan="2"><div 
name="missingText" id="paramDebitAmountmissingSpanText" 
class="TextBox_MsgContainer_div2">* This value is required.</div></td>
+                            <td class="missing" colspan="2"><div 
name="missingText" id="paramDepositAmountmissingSpanText" 
class="TextBox_MsgContainer_div2">* This value is required.</div></td>
                           </tr>
                           </tbody></table>
                       </span>
                     </td>
                     <td class="FieldButton_ContentCell">
-                      <a class="FieldButtonLink" href="#" 
onfocus="setWindowElementFocus(this); window.status='Amount From'; return 
true;" onblur=" window.status=''; return true;" 
onkeypress="this.className='FieldButtonLink_active'; return true;" 
onkeyup="this.className='FieldButtonLink_focus'; return true;"  
onclick="calculator('frmMain.inpDebitAmount', 
document.frmMain.inpDebitAmount.value, false);return false;">
+                      <a class="FieldButtonLink" href="#" 
onfocus="setWindowElementFocus(this); window.status='Amount From'; return 
true;" onblur=" window.status=''; return true;" 
onkeypress="this.className='FieldButtonLink_active'; return true;" 
onkeyup="this.className='FieldButtonLink_focus'; return true;"  
onclick="calculator('frmMain.inpDepositAmount', 
document.frmMain.inpDepositAmount.value, false);return false;">
                       <table class="FieldButton" 
onmouseout="this.className='FieldButton';window.status='';return true;" 
onmouseover="this.className='FieldButton_hover';window.status='';return true;" 
onmousedown="this.className='FieldButton_active';return true;" 
onmouseup="this.className='FieldButton';return true;" id="NoPackageslinkCalc">
                         <tr>
                           <td class="FieldButton_bg">
@@ -560,32 +560,32 @@
                     <td class="Textbox_ContentCell">
                       <table style="border: 0px none; border-collapse: 
collapse;">
                         <tr><td style="padding-top: 0px;">
-                          <input type="text" 
onblur="numberInputEvent('onblur', this);" onfocus="numberInputEvent('onfocus', 
this);" outputformat="euroEdition" onchange="numberInputEvent('onchange', 
this); return true;" onpaste="changeToEditingMode('onpaste');" 
oncut="changeToEditingMode('oncut');" 
onkeypress="changeToEditingMode('onkeypress');" 
onkeydown="changeToEditingMode('onkeydown'); numberInputEvent('onkeydown', 
this, event);" onkeyup="" name="inpCreditAmount" maxlength="22" value="" 
required="true" class="dojoValidateValid required TextBox_btn_OneCell_width 
number" id="paramCreditAmount"/>
+                          <input type="text" 
onblur="numberInputEvent('onblur', this);" onfocus="numberInputEvent('onfocus', 
this);" outputformat="euroEdition" onchange="numberInputEvent('onchange', 
this); return true;" onpaste="changeToEditingMode('onpaste');" 
oncut="changeToEditingMode('oncut');" 
onkeypress="changeToEditingMode('onkeypress');" 
onkeydown="changeToEditingMode('onkeydown'); numberInputEvent('onkeydown', 
this, event);" onkeyup="" name="inpPaymentAmount" maxlength="22" value="" 
required="true" class="dojoValidateValid required TextBox_btn_OneCell_width 
number" id="paramPaymentAmount"/>
                         </td></tr>
                       </table>
-                      <span id="paramCreditAmountinvalidSpan" style="display: 
none;" class="TextBox_MsgContainer_span">
+                      <span id="paramPaymentAmountinvalidSpan" style="display: 
none;" class="TextBox_MsgContainer_span">
                         <table class="TextBox_MsgContainer_table">
                           <tbody><tr class="TextBox_MsgContainer_tr">
                             <td class="TextBox_MsgContainer_td"><div 
class="TextBox_MsgContainer_div"></div></td><td></td>
                           </tr>
                           <tr>
-                            <td class="invalid" colspan="2"><div 
name="invalidText" id="paramCreditAmountinvalidSpanText" 
class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td>
+                            <td class="invalid" colspan="2"><div 
name="invalidText" id="paramPaymentAmountinvalidSpanText" 
class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td>
                           </tr>
                         </tbody></table>
                       </span>
-                      <span id="paramCreditAmountmissingSpan" style="display: 
none;" class="TextBox_MsgContainer_span">
+                      <span id="paramPaymentAmountmissingSpan" style="display: 
none;" class="TextBox_MsgContainer_span">
                         <table class="TextBox_MsgContainer_table">
                           <tbody><tr class="TextBox_MsgContainer_tr">
                             <td class="TextBox_MsgContainer_td"><div 
class="TextBox_MsgContainer_div"></div></td><td></td>
                           </tr>
                           <tr>
-                            <td class="missing" colspan="2"><div 
name="missingText" id="paramCreditAmountmissingSpanText" 
class="TextBox_MsgContainer_div2">* This value is required.</div></td>
+                            <td class="missing" colspan="2"><div 
name="missingText" id="paramPaymentAmountmissingSpanText" 
class="TextBox_MsgContainer_div2">* This value is required.</div></td>
                           </tr>
                           </tbody></table>
                       </span>
                     </td>
                     <td class="FieldButton_ContentCell">
-                      <a class="FieldButtonLink" href="#" 
onfocus="setWindowElementFocus(this); window.status='Amount From'; return 
true;" onblur=" window.status=''; return true;" 
onkeypress="this.className='FieldButtonLink_active'; return true;" 
onkeyup="this.className='FieldButtonLink_focus'; return true;"  
onclick="calculator('frmMain.inpCreditAmount', 
document.frmMain.inpCreditAmount.value, false);return false;">
+                      <a class="FieldButtonLink" href="#" 
onfocus="setWindowElementFocus(this); window.status='Amount From'; return 
true;" onblur=" window.status=''; return true;" 
onkeypress="this.className='FieldButtonLink_active'; return true;" 
onkeyup="this.className='FieldButtonLink_focus'; return true;"  
onclick="calculator('frmMain.inpPaymentAmount', 
document.frmMain.inpPaymentAmount.value, false);return false;">
                       <table class="FieldButton" 
onmouseout="this.className='FieldButton';window.status='';return true;" 
onmouseover="this.className='FieldButton_hover';window.status='';return true;" 
onmousedown="this.className='FieldButton_active';return true;" 
onmouseup="this.className='FieldButton';return true;" id="NoPackageslinkCalc">
                         <tr>
                           <td class="FieldButton_bg">
@@ -646,32 +646,32 @@
                     <td class="Textbox_ContentCell">
                     <table style="border: 0px none; border-collapse: 
collapse;">
                         <tr><td style="padding-top: 0px;">
-                          <input type="text" 
onblur="numberInputEvent('onblur', this);" onfocus="numberInputEvent('onfocus', 
this);" outputformat="euroEdition" onchange="numberInputEvent('onchange', 
this); return true;" onpaste="changeToEditingMode('onpaste');" 
oncut="changeToEditingMode('oncut');" 
onkeypress="changeToEditingMode('onkeypress');" 
onkeydown="changeToEditingMode('onkeydown'); numberInputEvent('onkeydown', 
this, event);" onkeyup="" name="inpDebitAmountGLItem" maxlength="22" value="" 
required="true" class="dojoValidateValid required TextBox_btn_OneCell_width 
number" id="paramDebitAmountGLItem"/>
+                          <input type="text" 
onblur="numberInputEvent('onblur', this);" onfocus="numberInputEvent('onfocus', 
this);" outputformat="euroEdition" onchange="numberInputEvent('onchange', 
this); return true;" onpaste="changeToEditingMode('onpaste');" 
oncut="changeToEditingMode('oncut');" 
onkeypress="changeToEditingMode('onkeypress');" 
onkeydown="changeToEditingMode('onkeydown'); numberInputEvent('onkeydown', 
this, event);" onkeyup="" name="inpDepositAmountGLItem" maxlength="22" value="" 
required="true" class="dojoValidateValid required TextBox_btn_OneCell_width 
number" id="paramDepositAmountGLItem"/>
                       </td></tr>
                     </table>
-                      <span id="paramDebitAmountGLIteminvalidSpan" 
style="display: none;" class="TextBox_MsgContainer_span">
+                      <span id="paramDepositAmountGLIteminvalidSpan" 
style="display: none;" class="TextBox_MsgContainer_span">
                         <table class="TextBox_MsgContainer_table">
                           <tbody><tr class="TextBox_MsgContainer_tr">
                             <td class="TextBox_MsgContainer_td"><div 
class="TextBox_MsgContainer_div"></div></td><td></td>
                           </tr>
                           <tr>
-                            <td class="invalid" colspan="2"><div 
name="invalidText" id="paramDebitAmountGLIteminvalidSpanText" 
class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td>
+                            <td class="invalid" colspan="2"><div 
name="invalidText" id="paramDepositAmountGLIteminvalidSpanText" 
class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td>
                           </tr>
                         </tbody></table>
                       </span>
-                      <span id="paramDebitAmountGLItemmissingSpan" 
style="display: none;" class="TextBox_MsgContainer_span">
+                      <span id="paramDepositAmountGLItemmissingSpan" 
style="display: none;" class="TextBox_MsgContainer_span">
                         <table class="TextBox_MsgContainer_table">
                           <tbody><tr class="TextBox_MsgContainer_tr">
                             <td class="TextBox_MsgContainer_td"><div 
class="TextBox_MsgContainer_div"></div></td><td></td>
                           </tr>
                           <tr>
-                            <td class="missing" colspan="2"><div 
name="missingText" id="paramDebitAmountGLItemmissingSpanText" 
class="TextBox_MsgContainer_div2">* This value is required.</div></td>
+                            <td class="missing" colspan="2"><div 
name="missingText" id="paramDepositAmountGLItemmissingSpanText" 
class="TextBox_MsgContainer_div2">* This value is required.</div></td>
                           </tr>
                           </tbody></table>
                       </span>
                     </td>
                     <td class="FieldButton_ContentCell">
-                      <a class="FieldButtonLink" href="#" 
onfocus="setWindowElementFocus(this); window.status='Amount From'; return 
true;" onblur=" window.status=''; return true;" 
onkeypress="this.className='FieldButtonLink_active'; return true;" 
onkeyup="this.className='FieldButtonLink_focus'; return true;"  
onclick="calculator('frmMain.inpDebitAmountGLItem', 
document.frmMain.inpDebitAmountGLItem.value, false);return false;">
+                      <a class="FieldButtonLink" href="#" 
onfocus="setWindowElementFocus(this); window.status='Amount From'; return 
true;" onblur=" window.status=''; return true;" 
onkeypress="this.className='FieldButtonLink_active'; return true;" 
onkeyup="this.className='FieldButtonLink_focus'; return true;"  
onclick="calculator('frmMain.inpDepositAmountGLItem', 
document.frmMain.inpDepositAmountGLItem.value, false);return false;">
                       <table class="FieldButton" 
onmouseout="this.className='FieldButton';window.status='';return true;" 
onmouseover="this.className='FieldButton_hover';window.status='';return true;" 
onmousedown="this.className='FieldButton_active';return true;" 
onmouseup="this.className='FieldButton';return true;" id="NoPackageslinkCalc">
                         <tr>
                           <td class="FieldButton_bg">
@@ -692,32 +692,32 @@
                     <td class="Textbox_ContentCell">
                     <table style="border: 0px none; border-collapse: 
collapse;">
                       <tr><td style="padding-top: 0px;">
-                        <input type="text" onblur="numberInputEvent('onblur', 
this);" onfocus="numberInputEvent('onfocus', this);" outputformat="euroEdition" 
onchange="numberInputEvent('onchange', this); return true;" 
onpaste="changeToEditingMode('onpaste');" oncut="changeToEditingMode('oncut');" 
onkeypress="changeToEditingMode('onkeypress');" 
onkeydown="changeToEditingMode('onkeydown'); numberInputEvent('onkeydown', 
this, event);" onkeyup="" name="inpCreditAmountGLItem" maxlength="22" value="" 
required="true" class="dojoValidateValid required TextBox_btn_OneCell_width 
number" id="paramCreditAmountGLItem"/>
+                        <input type="text" onblur="numberInputEvent('onblur', 
this);" onfocus="numberInputEvent('onfocus', this);" outputformat="euroEdition" 
onchange="numberInputEvent('onchange', this); return true;" 
onpaste="changeToEditingMode('onpaste');" oncut="changeToEditingMode('oncut');" 
onkeypress="changeToEditingMode('onkeypress');" 
onkeydown="changeToEditingMode('onkeydown'); numberInputEvent('onkeydown', 
this, event);" onkeyup="" name="inpPaymentAmountGLItem" maxlength="22" value="" 
required="true" class="dojoValidateValid required TextBox_btn_OneCell_width 
number" id="paramPaymentAmountGLItem"/>
                       </td></tr>
                     </table>
-                      <span id="paramCreditAmountGLIteminvalidSpan" 
style="display: none;" class="TextBox_MsgContainer_span">
+                      <span id="paramPaymentAmountGLIteminvalidSpan" 
style="display: none;" class="TextBox_MsgContainer_span">
                         <table class="TextBox_MsgContainer_table">
                           <tbody><tr class="TextBox_MsgContainer_tr">
                             <td class="TextBox_MsgContainer_td"><div 
class="TextBox_MsgContainer_div"></div></td><td></td>
                           </tr>
                           <tr>
-                            <td class="invalid" colspan="2"><div 
name="invalidText" id="paramCreditAmountGLIteminvalidSpanText" 
class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td>
+                            <td class="invalid" colspan="2"><div 
name="invalidText" id="paramPaymentAmountGLIteminvalidSpanText" 
class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td>
                           </tr>
                         </tbody></table>
                       </span>
-                      <span id="paramCreditAmountGLItemmissingSpan" 
style="display: none;" class="TextBox_MsgContainer_span">
+                      <span id="paramPaymentAmountGLItemmissingSpan" 
style="display: none;" class="TextBox_MsgContainer_span">
                         <table class="TextBox_MsgContainer_table">
                           <tbody><tr class="TextBox_MsgContainer_tr">
                             <td class="TextBox_MsgContainer_td"><div 
class="TextBox_MsgContainer_div"></div></td><td></td>
                           </tr>
                           <tr>
-                            <td class="missing" colspan="2"><div 
name="missingText" id="paramCreditAmountGLItemmissingSpanText" 
class="TextBox_MsgContainer_div2">* This value is required.</div></td>
+                            <td class="missing" colspan="2"><div 
name="missingText" id="paramPaymentAmountGLItemmissingSpanText" 
class="TextBox_MsgContainer_div2">* This value is required.</div></td>
                           </tr>
                           </tbody></table>
                       </span>
                     </td>
                     <td class="FieldButton_ContentCell">
-                      <a class="FieldButtonLink" href="#" 
onfocus="setWindowElementFocus(this); window.status='Amount From'; return 
true;" onblur=" window.status=''; return true;" 
onkeypress="this.className='FieldButtonLink_active'; return true;" 
onkeyup="this.className='FieldButtonLink_focus'; return true;"  
onclick="calculator('frmMain.inpCreditAmountGLItem', 
document.frmMain.inpCreditAmountGLItem.value, false);return false;">
+                      <a class="FieldButtonLink" href="#" 
onfocus="setWindowElementFocus(this); window.status='Amount From'; return 
true;" onblur=" window.status=''; return true;" 
onkeypress="this.className='FieldButtonLink_active'; return true;" 
onkeyup="this.className='FieldButtonLink_focus'; return true;"  
onclick="calculator('frmMain.inpPaymentAmountGLItem', 
document.frmMain.inpPaymentAmountGLItem.value, false);return false;">
                       <table class="FieldButton" 
onmouseout="this.className='FieldButton';window.status='';return true;" 
onmouseover="this.className='FieldButton_hover';window.status='';return true;" 
onmousedown="this.className='FieldButton_active';return true;" 
onmouseup="this.className='FieldButton';return true;" id="NoPackageslinkCalc">
                         <tr>
                           <td class="FieldButton_bg">
diff -r fd35928b1f85 -r dec87c13b691 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
 Wed Mar 02 08:08:23 2011 +0100

------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in 
Real-Time with Splunk. Collect, index and harness all the fast moving IT data 
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business 
insights. http://p.sf.net/sfu/splunk-dev2dev 
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to