details:   /erp/devel/int/rev/5ac6e9ea32d5
changeset: 6802:5ac6e9ea32d5
user:      Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date:      Thu Mar 25 17:00:17 2010 +0530
summary:   Fixes Issue 10487: Sales Order report throwing error while taking 
PDF(Print) report.

details:   /erp/devel/int/rev/675e8448a01a
changeset: 6803:675e8448a01a
user:      Adrián Romero <adrianromero <at> openbravo.com>
date:      Thu Mar 25 14:21:55 2010 +0100
summary:   Reverting changes for issue 0012752: Generate Invoice process gives 
Notnull error

details:   /erp/devel/int/rev/350281470706
changeset: 6804:350281470706
user:      Iván Perdomo <ivan.perdomo <at> openbravo.com>
date:      Thu Mar 25 17:54:15 2010 +0100
summary:   Fixes issue 12709: Reverted change in menuQuit. Breaks selenium 
tests.

details:   /erp/devel/int/rev/4bd9b362021b
changeset: 6805:4bd9b362021b
user:      Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date:      Thu Mar 25 19:10:15 2010 +0100
summary:   Fixed 12811.Issue in the General Ledger Report pagination with 
previous balance.

details:   /erp/devel/int/rev/3ebde3967f1c
changeset: 6806:3ebde3967f1c
user:      David Alsasua <david.alsasua <at> openbravo.com>
date:      Thu Mar 25 19:35:51 2010 +0100
summary:   Fixes bug 0012773: Not possible to cancel a manual settlement
support for multi-currency, the isreceipt value
and write off amounts

details:   /erp/devel/int/rev/b6ba5159fc3a
changeset: 6807:b6ba5159fc3a
user:      David Baz Fayos <david.baz <at> openbravo.com>
date:      Thu Mar 25 20:01:03 2010 +0100
summary:   Fixed bad implementation of 'back to previos page' implementation in 
Error windows

details:   /erp/devel/int/rev/c02f35940c3e
changeset: 6808:c02f35940c3e
user:      Iván Perdomo <ivan.perdomo <at> openbravo.com>
date:      Thu Mar 25 21:14:28 2010 +0100
summary:   Fixes issue 12756: Fixed getAppUrlFromMenu function

diffstat:

 src-db/database/model/functions/C_INVOICE_CREATE.xml                 |   6 +-
 src-db/database/model/functions/C_SETTLEMENT_POST.xml                |  11 +-
 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml               |  10 +
 src/org/openbravo/base/secureApp/Advise.html                         |   4 +-
 src/org/openbravo/base/secureApp/Error.html                          |   4 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java      |  55 
+++++----
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql |   6 +-
 src/org/openbravo/erpCommon/utility/VerticalMenu.html                |   6 +-
 web/js/utils.js                                                      |   4 +-
 9 files changed, 58 insertions(+), 48 deletions(-)

diffs (259 lines):

diff -r 2c75d71c8c16 -r c02f35940c3e 
src-db/database/model/functions/C_INVOICE_CREATE.xml
--- a/src-db/database/model/functions/C_INVOICE_CREATE.xml      Thu Mar 25 
15:55:43 2010 +0530
+++ b/src-db/database/model/functions/C_INVOICE_CREATE.xml      Thu Mar 25 
21:14:28 2010 +0100
@@ -566,7 +566,7 @@
                 END LOOP;
               END IF;
               -- Post it
-              C_INVOICE_POST(p_PInstance_ID, p_Invoice_ID) ;
+              C_INVOICE_POST(NULL, p_Invoice_ID) ;
                          --Added by p.Sarobe
                          IF(p_Invoice_ID='0') THEN
                          RAISE_APPLICATION_ERROR(-20000, 
'@InvoiceCreateFailed@');
@@ -878,7 +878,7 @@
                     SET DateInvoiced=v_DateInvoiced,
                     DateAcct=v_DateInvoiced
                   WHERE C_Invoice_ID=p_Invoice_ID;
-                  C_INVOICE_POST(p_PInstance_ID, p_Invoice_ID) ;
+                  C_INVOICE_POST(NULL, p_Invoice_ID) ;
                 END IF;
                 -- Get Document Type for Invoice
                 v_ResultStr:='GetDocumentType';
@@ -1033,7 +1033,7 @@
                   SET DateInvoiced=v_DateInvoiced,
                   DateAcct=v_DateInvoiced
                 WHERE C_Invoice_ID=p_Invoice_ID;
-                C_INVOICE_POST(p_PInstance_ID, p_Invoice_ID) ;
+                C_INVOICE_POST(NULL, p_Invoice_ID) ;
                    IF(p_Invoice_ID='0') THEN
                          RAISE_APPLICATION_ERROR(-20000, 
'@InvoiceCreateFailed@');
                            ELSE
diff -r 2c75d71c8c16 -r c02f35940c3e 
src-db/database/model/functions/C_SETTLEMENT_POST.xml
--- a/src-db/database/model/functions/C_SETTLEMENT_POST.xml     Thu Mar 25 
15:55:43 2010 +0530
+++ b/src-db/database/model/functions/C_SETTLEMENT_POST.xml     Thu Mar 25 
21:14:28 2010 +0100
@@ -315,11 +315,12 @@
        AND c.ISMANUAL = 'Y'
        AND c.ISPAID = 'N'
        AND NOT EXISTS (SELECT 1 FROM C_DEBT_PAYMENT D
-               WHERE C.C_SETTLEMENT_CANCEL_ID = D.C_SETTLEMENT_CANCEL_ID
-               AND ((C.ISRECEIPT = D.ISRECEIPT
-               AND C.AMOUNT = AMOUNT*-1) OR (C.ISRECEIPT <> D.ISRECEIPT
-               AND C.AMOUNT = AMOUNT))
-               AND d.ISPAID = 'N');
+                        WHERE C.C_SETTLEMENT_CANCEL_ID = 
D.C_SETTLEMENT_CANCEL_ID
+                          AND ((C.ISRECEIPT = D.ISRECEIPT
+                          AND 
C_Currency_Round(C_Currency_Convert((C.AMOUNT-C.WRITEOFFAMT), C.C_Currency_ID, 
v_Currency, v_Date, NULL, v_AD_Client_ID, v_AD_Org_ID), v_Currency, NULL) = 
C_Currency_Round(C_Currency_Convert(((AMOUNT-WRITEOFFAMT)*-1), D.C_Currency_ID, 
v_Currency, v_Date, NULL, v_AD_Client_ID, v_AD_Org_ID), v_Currency, NULL))
+                            OR (C.ISRECEIPT <> D.ISRECEIPT
+                          AND 
C_Currency_Round(C_Currency_Convert((C.AMOUNT-C.WRITEOFFAMT), C.C_Currency_ID, 
v_Currency, v_Date, NULL, v_AD_Client_ID, v_AD_Org_ID), v_Currency, NULL) = 
C_Currency_Round(C_Currency_Convert((AMOUNT-WRITEOFFAMT), D.C_Currency_ID, 
v_Currency, v_Date, NULL, v_AD_Client_ID, v_AD_Org_ID), v_Currency, NULL)))
+                          AND d.ISPAID = 'N');
        IF v_Aux>0 THEN
           RAISE_APPLICATION_ERROR(-20000, '@ManualDebtpayment@'||' 
"'||v_column_identifier||'" '||'@CanNotBeSplit@') ;
           END IF;
diff -r 2c75d71c8c16 -r c02f35940c3e 
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml    Thu Mar 25 
15:55:43 2010 +0530
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml    Thu Mar 25 
21:14:28 2010 +0100
@@ -25560,6 +25560,16 @@
 <!--AFEFA3ECE5E543C8BFCB049F0208577F-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--AFEFA3ECE5E543C8BFCB049F0208577F--></AD_MODEL_OBJECT_MAPPING>
 
+<!--B037C4FDF05E41B3BD6C8F95534089B8--><AD_MODEL_OBJECT_MAPPING>
+<!--B037C4FDF05E41B3BD6C8F95534089B8-->  
<AD_MODEL_OBJECT_MAPPING_ID><![CDATA[B037C4FDF05E41B3BD6C8F95534089B8]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--B037C4FDF05E41B3BD6C8F95534089B8-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B037C4FDF05E41B3BD6C8F95534089B8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B037C4FDF05E41B3BD6C8F95534089B8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B037C4FDF05E41B3BD6C8F95534089B8-->  
<AD_MODEL_OBJECT_ID><![CDATA[801706]]></AD_MODEL_OBJECT_ID>
+<!--B037C4FDF05E41B3BD6C8F95534089B8-->  
<MAPPINGNAME><![CDATA[/ad_reports/ReportSalesOrderJR.pdf]]></MAPPINGNAME>
+<!--B037C4FDF05E41B3BD6C8F95534089B8-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--B037C4FDF05E41B3BD6C8F95534089B8--></AD_MODEL_OBJECT_MAPPING>
+
 <!--B9144B0263704762A93253F219A736E7--><AD_MODEL_OBJECT_MAPPING>
 <!--B9144B0263704762A93253F219A736E7-->  
<AD_MODEL_OBJECT_MAPPING_ID><![CDATA[B9144B0263704762A93253F219A736E7]]></AD_MODEL_OBJECT_MAPPING_ID>
 <!--B9144B0263704762A93253F219A736E7-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 2c75d71c8c16 -r c02f35940c3e 
src/org/openbravo/base/secureApp/Advise.html
--- a/src/org/openbravo/base/secureApp/Advise.html      Thu Mar 25 15:55:43 
2010 +0530
+++ b/src/org/openbravo/base/secureApp/Advise.html      Thu Mar 25 21:14:28 
2010 +0100
@@ -75,7 +75,7 @@
           <table cellpadding="0" cellspacing="0" 
class="Main_ContentPane_NavBar" id="tdtopNavButtons">
             <tr class="Main_NavBar_bg">
               <td class="Main_NavBar_LeftButton_cell">
-                  <a href="#" id="botonAtras" onclick="history.back();return 
false;" onmouseover="window.status='Back';return true;" 
onmouseout="window.status='';return true;"  target="_parent"> 
+                  <a href="#" id="botonAtras" 
onclick="goToPreviousPage();return false;" 
onmouseover="window.status='Back';return true;" 
onmouseout="window.status='';return true;"  target="_parent"> 
                     <img src="../../../../../web/images/blank.gif" 
class="Main_NavBar_LeftButton_Icon Main_NavBar_LeftButton_Icon_back" border="0" 
/>
                   </a>
               </td>
@@ -205,7 +205,7 @@
                     <td colspan="6" align="center" 
class="Button_CenterAlign_ContentCell">
                       <button type="button" 
                         class="ButtonLink" 
-                        onclick="history.back();return false;" 
+                        onclick="goToPreviousPage();return false;" 
                         onfocus="buttonEvent('onfocus', this); 
window.status='Back'; return true;" 
                         onblur="buttonEvent('onblur', this);" 
                         onkeyup="buttonEvent('onkeyup', this);" 
diff -r 2c75d71c8c16 -r c02f35940c3e src/org/openbravo/base/secureApp/Error.html
--- a/src/org/openbravo/base/secureApp/Error.html       Thu Mar 25 15:55:43 
2010 +0530
+++ b/src/org/openbravo/base/secureApp/Error.html       Thu Mar 25 21:14:28 
2010 +0100
@@ -90,7 +90,7 @@
           <table cellpadding="0" cellspacing="0" 
class="Main_ContentPane_NavBar" id="tdtopNavButtons">
             <tr class="Main_NavBar_bg">
               <td class="Main_NavBar_LeftButton_cell">
-                  <a href="#" id="botonAtras" onclick="history.back();return 
false;" onmouseover="window.status='Back';return true;" 
onmouseout="window.status='';return true;"  target="_parent"> 
+                  <a href="#" id="botonAtras" 
onclick="goToPreviousPage();return false;" 
onmouseover="window.status='Back';return true;" 
onmouseout="window.status='';return true;"  target="_parent"> 
                     <img src="../../../../../web/images/blank.gif" 
class="Main_NavBar_LeftButton_Icon Main_NavBar_LeftButton_Icon_back" border="0" 
/>
                   </a>
               </td>
@@ -219,7 +219,7 @@
                     <td colspan="6" align="center" 
class="Button_CenterAlign_ContentCell">
                       <button type="button" 
                         class="ButtonLink" 
-                        onclick="history.back();return false;" 
+                        onclick="goToPreviousPage();return false;" 
                         onfocus="buttonEvent('onfocus', this); 
window.status='Back'; return true;" 
                         onblur="buttonEvent('onblur', this);" 
                         onkeyup="buttonEvent('onkeyup', this);" 
diff -r 2c75d71c8c16 -r c02f35940c3e 
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java   Thu Mar 
25 15:55:43 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java   Thu Mar 
25 21:14:28 2010 +0100
@@ -292,13 +292,13 @@
         strcelementvaluetodes = "";
         vars.setSessionValue("inpElementValueIdTo_DES", strcelementvaluetodes);
       }
-      data = ReportGeneralLedgerData.select(this, rowNum, strGroupByText, 
strGroupBy, vars.getLanguage(),strDateFrom,
-          toDatePlusOne, strAllaccounts, strcelementvaluefrom, 
strcelementvalueto, Utility
-              .getContext(this, vars, "#AccessibleOrgTree", 
"ReportGeneralLedger"), Utility
-              .getContext(this, vars, "#User_Client", "ReportGeneralLedger"), 
strHide,
-          strcAcctSchemaId, strDateFrom, toDatePlusOne, strOrgFamily, 
strcBpartnerId,
-          strmProductId, strcProjectId, strAmtFrom, strAmtTo, null, null, 
null, pgLimit, oraLimit1,
-          oraLimit2);
+      data = ReportGeneralLedgerData.select(this, rowNum, strGroupByText, 
strGroupBy, vars
+          .getLanguage(), strDateFrom, toDatePlusOne, strAllaccounts, 
strcelementvaluefrom,
+          strcelementvalueto, Utility.getContext(this, vars, 
"#AccessibleOrgTree",
+              "ReportGeneralLedger"), Utility.getContext(this, vars, 
"#User_Client",
+              "ReportGeneralLedger"), strHide, strcAcctSchemaId, strDateFrom, 
toDatePlusOne,
+          strOrgFamily, strcBpartnerId, strmProductId, strcProjectId, 
strAmtFrom, strAmtTo, null,
+          null, null, pgLimit, oraLimit1, oraLimit2);
       if (log4j.isDebugEnabled())
         log4j.debug("RecordNo: " + initRecordNumber);
       // In case this is not the first screen to show, initial balance may 
need to include amounts
@@ -306,13 +306,14 @@
 
       ReportGeneralLedgerData[] dataTotal = null;
       if (data != null && data.length > 1) {
-        dataTotal = ReportGeneralLedgerData.select(this, rowNum, 
strGroupByText, strGroupBy,
-            vars.getLanguage(),strDateFrom, toDatePlusOne, strAllaccounts, 
strcelementvaluefrom, strcelementvalueto,
-            Utility.getContext(this, vars, "#AccessibleOrgTree", 
"ReportGeneralLedger"), Utility
-                .getContext(this, vars, "#User_Client", 
"ReportGeneralLedger"), strHide,
-            strcAcctSchemaId, strYearInitialDate, 
DateTimeData.nDaysAfter(this, data[0].dateacct,
-                "1"), strOrgFamily, strcBpartnerId, strmProductId, 
strcProjectId, strAmtFrom,
-            strAmtTo, data[0].id, data[0].dateacctnumber + 
data[0].factAcctGroupId,
+        dataTotal = ReportGeneralLedgerData.select(this, rowNum, 
strGroupByText, strGroupBy, vars
+            .getLanguage(), strDateFrom, toDatePlusOne, strAllaccounts, 
strcelementvaluefrom,
+            strcelementvalueto, Utility.getContext(this, vars, 
"#AccessibleOrgTree",
+                "ReportGeneralLedger"), Utility.getContext(this, vars, 
"#User_Client",
+                "ReportGeneralLedger"), strHide, strcAcctSchemaId, 
strYearInitialDate, DateTimeData
+                .nDaysAfter(this, data[0].dateacct, "1"), strOrgFamily, 
strcBpartnerId,
+            strmProductId, strcProjectId, strAmtFrom, strAmtTo, data[0].id, 
data[0].dateacctnumber
+                + data[0].factAcctGroupId + data[0].description + 
data[0].isdebit,
             data[0].groupbyid, null, null, null);
       }
       // Now dataTotal is covered adding debit and credit amounts
@@ -504,12 +505,13 @@
           strcelementvalueto = strcelementvaluefrom;
         strAllaccounts = "N";
       }
-      data = ReportGeneralLedgerData.select(this, "0", strGroupByText, 
strGroupBy,vars.getLanguage(), strDateFrom,
-          toDatePlusOne, strAllaccounts, strcelementvaluefrom, 
strcelementvalueto, Utility
-              .getContext(this, vars, "#AccessibleOrgTree", 
"ReportGeneralLedger"), Utility
-              .getContext(this, vars, "#User_Client", "ReportGeneralLedger"), 
strHide,
-          strcAcctSchemaId, strDateFrom, toDatePlusOne, strOrgFamily, 
strcBpartnerId,
-          strmProductId, strcProjectId, strAmtFrom, strAmtTo, null, null, 
null, null, null, null);
+      data = ReportGeneralLedgerData.select(this, "0", strGroupByText, 
strGroupBy, vars
+          .getLanguage(), strDateFrom, toDatePlusOne, strAllaccounts, 
strcelementvaluefrom,
+          strcelementvalueto, Utility.getContext(this, vars, 
"#AccessibleOrgTree",
+              "ReportGeneralLedger"), Utility.getContext(this, vars, 
"#User_Client",
+              "ReportGeneralLedger"), strHide, strcAcctSchemaId, strDateFrom, 
toDatePlusOne,
+          strOrgFamily, strcBpartnerId, strmProductId, strcProjectId, 
strAmtFrom, strAmtTo, null,
+          null, null, null, null, null);
     }
     if (data == null || data.length == 0) {
       advisePopUp(request, response, "WARNING", Utility.messageBD(this, 
"NoDataFound", vars
@@ -599,13 +601,12 @@
           strcelementvalueto = strcelementvaluefrom;
         strAllaccounts = "N";
       }
-      data = ReportGeneralLedgerData.selectXLS(this, vars
-              .getLanguage(), strDateFrom, toDatePlusOne, strAllaccounts,
-          strcelementvaluefrom, strcelementvalueto, Utility.getContext(this, 
vars,
-              "#AccessibleOrgTree", "ReportGeneralLedger"), 
Utility.getContext(this, vars,
-              "#User_Client", "ReportGeneralLedger"), strHide, 
strcAcctSchemaId, strDateFrom,
-          toDatePlusOne, strOrgFamily, strcBpartnerId, strmProductId, 
strcProjectId, strAmtFrom,
-          strAmtTo);
+      data = ReportGeneralLedgerData.selectXLS(this, vars.getLanguage(), 
strDateFrom,
+          toDatePlusOne, strAllaccounts, strcelementvaluefrom, 
strcelementvalueto, Utility
+              .getContext(this, vars, "#AccessibleOrgTree", 
"ReportGeneralLedger"), Utility
+              .getContext(this, vars, "#User_Client", "ReportGeneralLedger"), 
strHide,
+          strcAcctSchemaId, strDateFrom, toDatePlusOne, strOrgFamily, 
strcBpartnerId,
+          strmProductId, strcProjectId, strAmtFrom, strAmtTo);
     }
     if (data == null || data.length == 0) {
       advisePopUp(request, response, "WARNING", Utility.messageBD(this, 
"NoDataFound", vars
diff -r 2c75d71c8c16 -r c02f35940c3e 
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql      
Thu Mar 25 15:55:43 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql      
Thu Mar 25 21:14:28 2010 +0100
@@ -30,7 +30,7 @@
           SELECT VALUE, NAME, DATEACCT,
               SUM(AMTACCTDR) AS AMTACCTDR, SUM(AMTACCTCR) AS AMTACCTCR, 
(SUM(AMTACCTDR)-SUM(AMTACCTCR)) AS TOTAL,
               FACT_ACCT_GROUP_ID, ID, groupbyid, groupbyname,
-              DESCRIPTION,
+              DESCRIPTION, ISDEBIT,
               0 AS TOTALACCTDR, 0 AS TOTALACCTCR, 0 AS TOTALACCTSUB,
               0 AS PREVIOUSDEBIT, 0 AS PREVIOUSCREDIT, 0 AS PREVIOUSTOTAL,
               0 AS FINALDEBIT, 0 AS FINALCREDIT, 0 AS FINALTOTAL,
@@ -81,7 +81,7 @@
             ORDER  BY groupbyname, groupbyid, VALUE, NAME, ID, DATEACCT,  
FACT_ACCT_GROUP_ID, DESCRIPTION, ISDEBIT
           ) C
         ) B WHERE 1=1
-      ) A ORDER BY  groupbyname, groupbyid, VALUE, DATEACCT, FACT_ACCT_GROUP_ID
+      ) A ORDER BY  groupbyname, groupbyid, VALUE, DATEACCT, 
FACT_ACCT_GROUP_ID, DESCRIPTION, ISDEBIT
       ]]></Sql>
     <Field name="rownum" value="count"/>
     <Parameter name="rownum" type="replace" optional="true" after="FROM ( 
SELECT " text="'0'" />
@@ -112,7 +112,7 @@
     <Parameter name="paramAmtFrom" optional="true" after="3=3"><![CDATA[ AND 
(FACT_ACCT.AMTACCTDR + FACT_ACCT.AMTACCTCR)>=TO_NUMBER(?) ]]></Parameter>
     <Parameter name="paramAmtTo" optional="true" after="3=3"><![CDATA[ AND 
(FACT_ACCT.AMTACCTDR + FACT_ACCT.AMTACCTCR)<=TO_NUMBER(?) ]]></Parameter>
     <Parameter name="accountId" optional="true" after="WHERE 6=6"><![CDATA[AND 
ID = ? ]]></Parameter>
-    <Parameter name="factAcctId" optional="true" after="WHERE 
6=6"><![CDATA[and to_char(DATEACCT,'J')||FACT_ACCT_GROUP_ID < ? ]]></Parameter>
+    <Parameter name="factAcctId" optional="true" after="WHERE 
6=6"><![CDATA[and 
to_char(DATEACCT,'J')||FACT_ACCT_GROUP_ID||DESCRIPTION||ISDEBIT < ? 
]]></Parameter>
     <Parameter name="cBPartner" optional="true" after="WHERE 6=6"><![CDATA[AND 
groupbyid = ? ]]></Parameter>
     <Parameter name="pgLimit" type="argument" optional="true" after=",  
FACT_ACCT_GROUP_ID, DESCRIPTION, ISDEBIT"><![CDATA[ LIMIT ]]></Parameter>
     <Parameter name="oraLimit1" type="argument" optional="true" after=") 
C"><![CDATA[ WHERE ROWNUM <= ]]></Parameter>
diff -r 2c75d71c8c16 -r c02f35940c3e 
src/org/openbravo/erpCommon/utility/VerticalMenu.html
--- a/src/org/openbravo/erpCommon/utility/VerticalMenu.html     Thu Mar 25 
15:55:43 2010 +0530
+++ b/src/org/openbravo/erpCommon/utility/VerticalMenu.html     Thu Mar 25 
21:14:28 2010 +0100
@@ -179,10 +179,8 @@
 
       function getAppUrlFromMenu() {
         var url = window.location.href;
-        url = url.replace("/utility/VerticalMenu.html","");
-        if (url.lastIndexOf("#") == url.length - 1) {
-          url = url.substring(0, url.length - 1);
-        }
+        var pos = url.lastIndexOf("/utility/VerticalMenu.html");
+        url = url.substring(0, pos);
         return url;
       }
 
diff -r 2c75d71c8c16 -r c02f35940c3e web/js/utils.js
--- a/web/js/utils.js   Thu Mar 25 15:55:43 2010 +0530
+++ b/web/js/utils.js   Thu Mar 25 21:14:28 2010 +0100
@@ -2469,8 +2469,8 @@
   } catch (e) {
     target = "_self";
   }
-  submitCommandForm('DEFAULT', false, getForm(), appUrl + 
'/security/Logout.html', target);
-  return true;
+  submitCommandForm('DEFAULT', false, null, appUrl + '/security/Logout.html', 
target);
+  return false;
 }
 
 function menuAlerts() {

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to