details:   /erp/devel/pi/rev/04f08f5684ba
changeset: 12522:04f08f5684ba
user:      Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date:      Fri May 27 14:05:16 2011 +0200
summary:   Fixed bug 17334: Reconciliation buttons are not shown together with 
the Header one

details:   /erp/devel/pi/rev/b1d467810763
changeset: 12523:b1d467810763
user:      Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date:      Fri May 27 14:48:16 2011 +0200
summary:   merge

diffstat:

 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml     
                                      |    2 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
 |    4 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
 |    2 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
  |    1 +
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
                               |    7 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java
                |    2 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
                 |    7 -
 src-db/database/model/triggers/C_PROJECTLINE_TRG.xml                           
                                      |    3 +
 src-db/database/model/triggers/C_PROJECTLINE_TRG3.xml                          
                                      |   12 +-
 src/org/openbravo/base/secureApp/Attribute_data.xsql                           
                                      |   15 -
 src/org/openbravo/base/secureApp/DefaultOptions_data.xsql                      
                                      |   54 +---
 src/org/openbravo/base/secureApp/HttpSecureAppServlet.java                     
                                      |   30 --
 src/org/openbravo/base/secureApp/OrgTree.java                                  
                                      |   60 -----
 src/org/openbravo/base/secureApp/Seguridad_data.xsql                           
                                      |   11 -
 src/org/openbravo/erpCommon/ad_callouts/LocatorCombo_data.xsql                 
                                      |   11 -
 src/org/openbravo/erpCommon/ad_forms/CallAcctServer.java                       
                                      |   37 ---
 src/org/openbravo/erpCommon/ad_forms/ProductInfo.java                          
                                      |   85 -------
 src/org/openbravo/erpCommon/ad_forms/ProductInfo_data.xsql                     
                                      |   24 --
 src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.java               
                                      |   22 -
 src/org/openbravo/erpCommon/ad_process/ApplyModulesCallServlet.java            
                                      |   14 -
 src/org/openbravo/erpCommon/ad_reports/Organization_data.xsql                  
                                      |   11 -
 src/org/openbravo/erpCommon/ad_reports/ReportCashJR_data.xsql                  
                                      |   18 -
 src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_data.xsql             
                                      |    8 -
 src/org/openbravo/erpCommon/ad_reports/ReportProductionCost_data.xsql          
                                      |    8 -
 src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql            
                                      |   21 -
 src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily_data.xsql    
                                      |   15 -
 src/org/openbravo/erpCommon/info/AccountElementValue.java                      
                                      |   10 -
 src/org/openbravo/erpCommon/info/DebtPayment.java                              
                                      |   13 -
 src/org/openbravo/erpCommon/info/WarehouseCombo_data.xsql                      
                                      |   27 --
 src/org/openbravo/erpCommon/modules/VersionUtility.java                        
                                      |    5 -
 src/org/openbravo/erpCommon/utility/ExportGrid.java                            
                                      |    5 -
 src/org/openbravo/erpCommon/utility/KeyMap.java                                
                                      |   25 --
 src/org/openbravo/erpCommon/utility/ReferencedLink_data.xsql                   
                                      |  120 ----------
 src/org/openbravo/erpCommon/utility/VerticalMenu.java                          
                                      |   19 -
 src/org/openbravo/erpCommon/utility/reporting/ReportManager.java               
                                      |    7 -
 src/org/openbravo/erpReports/RptC_ProposalJr_data.xsql                         
                                      |   34 --
 src/org/openbravo/erpReports/RptPromissoryNoteTree_data.xsql                   
                                      |   12 -
 src/org/openbravo/erpReports/TaxPayment_data.xsql                              
                                      |  108 ---------
 src/org/openbravo/scheduling/ProcessRequest_data.xsql                          
                                      |   20 -
 src/org/openbravo/scheduling/ProcessRun_data.xsql                              
                                      |    7 +-
 src/org/openbravo/scheduling/Process_data.xsql                                 
                                      |    8 -
 41 files changed, 36 insertions(+), 868 deletions(-)

diffs (truncated from 1418 to 300 lines):

diff -r 5b5954a46929 -r b1d467810763 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml    
    Fri May 27 11:36:42 2011 +0100
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml    
    Fri May 27 14:48:16 2011 +0200
@@ -194,7 +194,7 @@
 <!--C095D2CC39704DBE8B906B7CD7710968-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  
<HQLORDERBYCLAUSE><![CDATA[-transactionDate]]></HQLORDERBYCLAUSE>
-<!--C095D2CC39704DBE8B906B7CD7710968-->  
<SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--C095D2CC39704DBE8B906B7CD7710968-->  
<SHOWPARENTBUTTONS><![CDATA[N]]></SHOWPARENTBUTTONS>
 <!--C095D2CC39704DBE8B906B7CD7710968--></AD_TAB>
 
 <!--EB0466B2A22343F28773B356D292BC7E--><AD_TAB>
diff -r 5b5954a46929 -r b1d467810763 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
      Fri May 27 11:36:42 2011 +0100
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
      Fri May 27 14:48:16 2011 +0200
@@ -135,7 +135,8 @@
   if (mark==null) mark=false;
   updateReadOnly(key, mark);
   var paymentAmount = document.frmMain.elements['inpPaymentAmount'+key];
-  if (!isTrue('isReceipt')){
+  var isInheritedActualPayment = 
(document.getElementById('paramInheritedActualPayment').value === 'Y');
+  if (!isTrue('isReceipt') && !isInheritedActualPayment) {
     if (mark && paymentAmount.value=='') {
       paymentAmount.value = 
document.frmMain.elements['inpRecordAmt'+key].value;
     }
@@ -371,6 +372,7 @@
   <input type="hidden" name="inpFinBankStatementLineId" value="" 
id="paramFinBankStatementLineId"></input>
   <input type="hidden" name="isFirstLoad" value="true"/>
   <input type="hidden" name="inpadOrgId" value="" id="fieldOrg"/>
+  <input type="hidden" name="inpInheritedActualPayment" value="N" 
id="paramInheritedActualPayment"/>
   <div class="Popup_ContentPane_CircleLogo">
     <div class="Popup_WindowLogo">
       <img class="Popup_WindowLogo_Icon Popup_WindowLogo_Icon_process" 
src="../../../../../web/images/blank.gif" border=0/></img>
diff -r 5b5954a46929 -r b1d467810763 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
      Fri May 27 11:36:42 2011 +0100
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
      Fri May 27 14:48:16 2011 +0200
@@ -296,6 +296,8 @@
     xmlDocument.setParameter("isSoTrx", (isReceipt) ? "Y" : "N");
     xmlDocument.setParameter("finBankStatementLineId", 
strFinBankStatementLineId);
     xmlDocument.setParameter("orgId", 
financialAccount.getOrganization().getId());
+    xmlDocument.setParameter("inheritedActualPayment", 
strFinBankStatementLineId.isEmpty() ? "N"
+        : "Y");
 
     // get DocumentNo
     final List<Object> parameters = new ArrayList<Object>();
diff -r 5b5954a46929 -r b1d467810763 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
       Fri May 27 11:36:42 2011 +0100
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
       Fri May 27 14:48:16 2011 +0200
@@ -43,6 +43,7 @@
     <PARAMETER id="paramPrecision" name="precision" attribute="value"/>
     <PARAMETER id="paramFinBankStatementLineId" name="finBankStatementLineId" 
attribute="value" default=""/>
     <PARAMETER id="fieldOrg" name="orgId" attribute="value"/>
+    <PARAMETER id="paramInheritedActualPayment" name="inheritedActualPayment" 
attribute="value"/>
     
     <PARAMETER id="paramPaymentDate" name="paymentDate" attribute="value"/>
     <PARAMETER id="paramPaymentDate" name="dateDisplayFormat" 
attribute="displayformat" replace="xx"/>
diff -r 5b5954a46929 -r b1d467810763 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
--- 
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
    Fri May 27 11:36:42 2011 +0100
+++ 
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
    Fri May 27 14:48:16 2011 +0200
@@ -249,8 +249,10 @@
     selectDifferenceAction('none');
   } else if ( isCreditAllowed && compareWithSign(amount, '>', total) ) {
     selectDifferenceAction('credit');
-  } else if ( !isCreditAllowed && compareWithSign(expected, '>', total) ) {
+  } else if ( !isCreditAllowed || compareWithSign(expected, '>', total) ) {
     selectDifferenceAction('underpayment');
+  } else {
+    selectDifferenceAction('none');
   }
 }
 
@@ -332,7 +334,8 @@
   }
   frm.inpTotal.value = total;
   document.getElementById('paramTotal').innerHTML = frm.inpTotal.value;
-  if (!isReceipt) {
+  var inheritedActualPayment = (frm.paramInheritedActualPayment && 
frm.paramInheritedActualPayment.value === "Y");
+  if (!isReceipt && !inheritedActualPayment) {
     if (frm.inpUseCredit.checked) {
       if ( compare(total, '>',frm.inpCredit.value) ) {
         frm.inpActualPayment.value = subtract(total, frm.inpCredit.value);
diff -r 5b5954a46929 -r b1d467810763 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java
--- 
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java
     Fri May 27 11:36:42 2011 +0100
+++ 
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java
     Fri May 27 14:48:16 2011 +0200
@@ -140,7 +140,7 @@
 
     final List<RefListEntry> translatedValues = new ArrayList<RefListEntry>();
 
-    final String readReferenceHql = "select searchKey, name, sequenceNumber 
from ADList where reference.id=?";
+    final String readReferenceHql = "select searchKey, name, sequenceNumber 
from ADList rlist where reference.id=? and rlist.active=true";
     final Query readReferenceQry = 
OBDal.getInstance().getSession().createQuery(readReferenceHql);
     readReferenceQry.setString(0, referenceId);
     for (Object o : readReferenceQry.list()) {
diff -r 5b5954a46929 -r b1d467810763 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
--- 
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
      Fri May 27 11:36:42 2011 +0100
+++ 
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
      Fri May 27 14:48:16 2011 +0200
@@ -696,13 +696,6 @@
     w.close();
   }
 
-  private void writeResultCSV(HttpServletRequest request, HttpServletResponse 
response,
-      Map<String, String> parameters, String result) throws IOException, 
JSONException {
-
-    StringBuffer csv = new StringBuffer();
-
-  }
-
   private String getRequestContent(HttpServletRequest request) throws 
IOException {
     final BufferedReader reader = request.getReader();
     if (reader == null) {
diff -r 5b5954a46929 -r b1d467810763 
src-db/database/model/triggers/C_PROJECTLINE_TRG.xml
--- a/src-db/database/model/triggers/C_PROJECTLINE_TRG.xml      Fri May 27 
11:36:42 2011 +0100
+++ b/src-db/database/model/triggers/C_PROJECTLINE_TRG.xml      Fri May 27 
14:48:16 2011 +0200
@@ -69,6 +69,9 @@
     IF(v_PlannedMargin <> 0) THEN
       :new.PlannedMarginAmt:=:new.PlannedAmt * v_PlannedMargin;
     END IF;
+  ELSIF (:new.PlannedPrice = 0) THEN
+    :new.PlannedPOPrice := 0;
+    :new.PlannedMarginAmt := 0;
   END IF;
 END C_PROJECTLINE_TRG
 ]]></body>
diff -r 5b5954a46929 -r b1d467810763 
src-db/database/model/triggers/C_PROJECTLINE_TRG3.xml
--- a/src-db/database/model/triggers/C_PROJECTLINE_TRG3.xml     Fri May 27 
11:36:42 2011 +0100
+++ b/src-db/database/model/triggers/C_PROJECTLINE_TRG3.xml     Fri May 27 
14:48:16 2011 +0200
@@ -56,7 +56,11 @@
  IF(UPDATING OR DELETING) THEN
  v_oldLine_PlannedQty:= COALESCE(:old.PlannedQty,0);
  v_oldLine_PlannedAmt:=COALESCE(:old.PlannedAmt,0);
- 
v_oldLine_PlannedMarginAmt:=COALESCE((COALESCE(:old.PLANNEDPRICE,0)-COALESCE(:old.PLANNEDPOPRICE,0))*100/COALESCE(:old.PLANNEDPRICE,1),0);
+ IF (:old.PLANNEDPRICE = 0) THEN
+   v_oldLine_PlannedMarginAmt := 0;
+ ELSE
+   
v_oldLine_PlannedMarginAmt:=COALESCE((COALESCE(:old.PLANNEDPRICE,0)-COALESCE(:old.PLANNEDPOPRICE,0))*100/COALESCE(:old.PLANNEDPRICE,1),0);
+ END IF;
  v_oldLine_CommittedAmt :=COALESCE(:old.CommittedAmt,0);
  v_oldLine_CommittedQty :=COALESCE(:old.CommittedQty,0);
  v_oldLine_InvoicedAmt :=COALESCE(:old.InvoicedAmt,0);
@@ -66,7 +70,11 @@
  IF (INSERTING OR UPDATING) THEN
  v_newLine_PlannedQty := COALESCE(:new.PlannedQty,0);
   v_newLine_PlannedAmt:=COALESCE(:new.PlannedAmt,0);
-  
v_newLine_PlannedMarginAmt:=COALESCE((COALESCE(:new.PLANNEDPRICE,0)-COALESCE(:new.PLANNEDPOPRICE,0))*100/COALESCE(:new.PLANNEDPRICE,1),0);
+  IF (:new.PLANNEDPRICE = 0) THEN
+    v_newLine_PlannedMarginAmt := 0;
+  ELSE
+    
v_newLine_PlannedMarginAmt:=COALESCE((COALESCE(:new.PLANNEDPRICE,0)-COALESCE(:new.PLANNEDPOPRICE,0))*100/COALESCE(:new.PLANNEDPRICE,1),0);
+  END IF;
   v_newLine_CommittedAmt :=COALESCE(:new.CommittedAmt,0);
   v_newLine_CommittedQty :=COALESCE(:new.CommittedQty,0);
   v_newLine_InvoicedAmt :=COALESCE(:new.InvoicedAmt,0);
diff -r 5b5954a46929 -r b1d467810763 
src/org/openbravo/base/secureApp/Attribute_data.xsql
--- a/src/org/openbravo/base/secureApp/Attribute_data.xsql      Fri May 27 
11:36:42 2011 +0100
+++ b/src/org/openbravo/base/secureApp/Attribute_data.xsql      Fri May 27 
14:48:16 2011 +0200
@@ -29,21 +29,6 @@
       <Parameter name="clientlist" optional="true" type="replace" after="AND 
a.AD_CLIENT_ID IN (" text="'1'"/>
       <Parameter name="orglist" optional="true" type="replace" after="AND 
a.AD_ORG_ID IN (" text="'1'"/>
    </SqlMethod>
-   <SqlMethod name="selectAttributes" type="preparedStatement" 
return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-        SELECT Attribute, Value, AD_Window_ID 
-        FROM AD_Preference 
-        WHERE AD_Client_ID IN ('0', ?)
-        AND AD_Org_ID IN ('0', ?)
-        AND (AD_User_ID IS NULL OR AD_User_ID='0' OR AD_User_ID=?)
-        AND IsActive='Y' 
-        ORDER BY Attribute, AD_Client_ID, AD_Org_ID, AD_User_ID
-      </Sql>
-      <Parameter name="adClientId"/>
-      <Parameter name="adOrgId"/>
-      <Parameter name="adUserId"/>
-   </SqlMethod>
    <SqlMethod name="selectIsSOTrx" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
diff -r 5b5954a46929 -r b1d467810763 
src/org/openbravo/base/secureApp/DefaultOptions_data.xsql
--- a/src/org/openbravo/base/secureApp/DefaultOptions_data.xsql Fri May 27 
11:36:42 2011 +0100
+++ b/src/org/openbravo/base/secureApp/DefaultOptions_data.xsql Fri May 27 
14:48:16 2011 +0200
@@ -15,34 +15,18 @@
 
 <SqlClass name="DefaultOptionsData" package="org.openbravo.base.secureApp">
    <SqlClassComment></SqlClassComment>
-   <SqlMethod name="getDefaultOptions" type="preparedStatement" 
return="multiple">
+   <SqlMethod name="dummy" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
-        SELECT users.DEFAULT_AD_CLIENT_ID,
-               users.DEFAULT_AD_ORG_ID,
-               users.DEFAULT_AD_LANGUAGE,
-               users.DEFAULT_AD_ROLE_ID,
-               users.DEFAULT_M_WAREHOUSE_ID,
+        SELECT '' as DEFAULT_AD_CLIENT_ID,
+               '' as DEFAULT_AD_ORG_ID,
+               '' as DEFAULT_AD_LANGUAGE,
+               '' as DEFAULT_AD_ROLE_ID,
+               '' as DEFAULT_M_WAREHOUSE_ID,
                '' AS ISRTL,
-               '' AS AD_LANGUAGE,
-               '' AS LINE
-          FROM AD_USER users
-              INNER JOIN AD_CLIENT client ON users.DEFAULT_AD_CLIENT_ID = 
client.AD_CLIENT_ID
-              INNER JOIN AD_ORG org ON users.DEFAULT_AD_ORG_ID = org.AD_ORG_ID
-              INNER JOIN AD_LANGUAGE lang ON users.DEFAULT_AD_LANGUAGE = 
lang.AD_LANGUAGE
-              INNER JOIN M_WAREHOUSE warehouse ON users.DEFAULT_M_WAREHOUSE_ID 
= warehouse.M_WAREHOUSE_ID
-              INNER JOIN AD_ROLE role ON users.DEFAULT_AD_ROLE_ID = 
role.AD_ROLE_ID
-         WHERE users.AD_USER_ID = ?
-           AND (NOT users.DEFAULT_AD_ORG_ID IS NULL
-                AND org.ISACTIVE = 'Y')
-           AND (NOT users.DEFAULT_AD_LANGUAGE IS NULL
-                AND lang.ISACTIVE = 'Y')
-           AND (NOT users.DEFAULT_AD_ROLE_ID IS NULL
-                AND role.ISACTIVE = 'Y')
-           AND (NOT users.DEFAULT_M_WAREHOUSE_ID IS NULL
-                AND warehouse.ISACTIVE = 'Y')
+               '' AS AD_LANGUAGE
+          FROM dual
            ]]></Sql>
-      <Parameter name="aduserid"/>
    </SqlMethod>
    
    <SqlMethod name="defaultRole" type="preparedStatement" return="string">
@@ -199,27 +183,5 @@
            ]]></Sql>      
    </SqlMethod>
    
-   <SqlMethod name="getFirstElementsOptions" type="preparedStatement" 
return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT ro.ad_role_id AS DEFAULT_AD_ROLE_ID, 
-          ro.ad_org_id AS DEFAULT_AD_ORG_ID, 
-          ro.ad_client_id AS DEFAULT_AD_CLIENT_ID, 
-        (SELECT MAX(w.m_warehouse_id) 
-          FROM m_warehouse w, ad_role_orgaccess roa WHERE w.isActive='Y' 
-          AND roa.ad_role_id = ro.ad_role_id 
-          AND roa.isActive = 'Y'
-          AND w.ad_org_id=roa.ad_org_id 
-          AND w.ad_client_id = ro.ad_client_id)
-          AS DEFAULT_M_WAREHOUSE_ID, 
-        (SELECT MIN(ad_language) FROM ad_language WHERE isbaselanguage='Y' AND 
isactive='Y') AS DEFAULT_AD_LANGUAGE 
-        FROM ad_role_orgaccess ro
-        WHERE ro.ad_role_id = (SELECT MAX(ad_role_id) FROM ad_user_roles WHERE 
ad_user_id = ? AND isActive = 'Y')
-        AND ro.isactive = 'Y'
-        ORDER BY ro.ad_org_id, ro.ad_client_id
-      ]]></Sql>
-      <Parameter name="aduserid"/>
-   </SqlMethod>
-
 </SqlClass>
 
diff -r 5b5954a46929 -r b1d467810763 
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
--- a/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java        Fri May 
27 11:36:42 2011 +0100
+++ b/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java        Fri May 
27 14:48:16 2011 +0200
@@ -646,11 +646,6 @@
     vars.setHistoryCommand(strCommand);
   }
 
-  private void advise(HttpServletResponse response, String strTipo, String 
strTitulo,
-      String strTexto) throws IOException {
-    advise(null, response, strTipo, strTitulo, strTexto);
-  }
-
   protected void advise(HttpServletRequest request, HttpServletResponse 
response, String strTipo,
       String strTitulo, String strTexto) throws IOException {
 
@@ -715,16 +710,6 @@
     advisePopUpRefresh(request, response, "Error", strTitle, strText);
   }
 
-  private void advisePopUpRefresh(HttpServletResponse response, String 
strTitle, String strText)
-      throws IOException {
-    advisePopUpRefresh(null, response, "Error", strTitle, strText);
-  }
-
-  private void advisePopUpRefresh(HttpServletResponse response, String 
strType, String strTitle,
-      String strText) throws IOException {
-    advisePopUpRefresh(null, response, strTitle, strText);
-  }
-
   /**
    * Creates a pop up that when closed, will refresh the parent window.
    * 
@@ -760,11 +745,6 @@
     out.close();
   }
 
-  private void bdError(HttpServletResponse response, String strCode, String 
strLanguage)
-      throws IOException {
-    bdError(null, response, strCode, strLanguage);
-  }
-
   protected void bdError(HttpServletRequest request, HttpServletResponse 
response, String strCode,
       String strLanguage) throws IOException {
     final XmlDocument xmlDocument = 
xmlEngine.readXmlTemplate("org/openbravo/base/secureApp/Error")
@@ -785,11 +765,6 @@
     out.close();
   }
 
-  private void bdErrorGeneralPopUp(HttpServletResponse response, String 
strTitle, String strText)

------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery, 
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now. 
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to