Fixed 25743: Remove many unused,non-public xsql-files & - methods
authorStefan Hühner <stefan.huehner@openbravo.com>
Sun, 16 Feb 2014 14:14:17 +0100
changeset 22050 c3bb94a4b13f
parent 22049 77d73fe4e6b3
child 22051 70a1852c6c64
child 22055 bf9e3b7ea60c
Fixed 25743: Remove many unused,non-public xsql-files & - methods
src-wad/src/org/openbravo/wad/CallOutsStructure.java
src-wad/src/org/openbravo/wad/KeyStructure.java
src-wad/src/org/openbravo/wad/TableDirRelation_data.xsql
src-wad/src/org/openbravo/wad/TableLink_data.xsql
src-wad/src/org/openbravo/wad/Wad_data.xsql
src-wad/src/org/openbravo/wad/controls/WADControl_data.xsql
src/org/openbravo/base/secureApp/OrgTree_data.xsql
src/org/openbravo/costing/Costing_data.xsql
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql
src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder_data.xsql
src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder_data.xsql
src/org/openbravo/erpCommon/ad_actionButton/CreateFile34_data.xsql
src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Receipt_data.xsql
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_CRemittance_data.xsql
src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql
src/org/openbravo/erpCommon/ad_actionButton/CreateVatRegisters_data.xsql
src/org/openbravo/erpCommon/ad_actionButton/EditCCPMeasureValues_Hours_data.xsql
src/org/openbravo/erpCommon/ad_actionButton/EditCCPMeasureValues_Values_data.xsql
src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder_data.xsql
src/org/openbravo/erpCommon/ad_actionButton/Posted_data.xsql
src/org/openbravo/erpCommon/ad_actionButton/TaxPayment.xsql
src/org/openbravo/erpCommon/ad_callouts/SE_ProjectLine_Value_data.xsql
src/org/openbravo/erpCommon/ad_callouts/SE_Supplier_BPartner_data.xsql
src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Product_data.xsql
src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product_data.xsql
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt_data.xsql
src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt_data.xsql
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt_data.xsql
src/org/openbravo/erpCommon/ad_callouts/SL_Payment_Amounts_data.xsql
src/org/openbravo/erpCommon/ad_callouts/SL_ProjectPlanned_Amt_data.xsql
src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_Sequence.xsql
src/org/openbravo/erpCommon/ad_forms/Account_data.xsql
src/org/openbravo/erpCommon/ad_forms/AcctSchema_data.xsql
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql
src/org/openbravo/erpCommon/ad_forms/DocCash_data.xsql
src/org/openbravo/erpCommon/ad_forms/DocInOut_data.xsql
src/org/openbravo/erpCommon/ad_forms/DocLineCash_data.xsql
src/org/openbravo/erpCommon/ad_forms/DocLinePayment_data.xsql
src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql
src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql
src/org/openbravo/erpCommon/ad_forms/FactLine_data.xsql
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql
src/org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual_data.xsql
src/org/openbravo/erpCommon/ad_forms/Heartbeat_data.xsql
src/org/openbravo/erpCommon/ad_forms/LanguageCombo_data.xsql
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPendingLines_data.xsql
src/org/openbravo/erpCommon/ad_forms/MonedaCombo_data.xsql
src/org/openbravo/erpCommon/ad_forms/Organization_data.xsql
src/org/openbravo/erpCommon/ad_forms/SQLExecutor_data.xsql
src/org/openbravo/erpCommon/ad_forms/ShowSessionVariables_data.xsql
src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql
src/org/openbravo/erpCommon/ad_forms/Warehouse_data.xsql
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_data.xsql
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_data.xsql
src/org/openbravo/erpCommon/ad_process/AlertProcess_data.xsql
src/org/openbravo/erpCommon/ad_process/ApplyModules_data.xsql
src/org/openbravo/erpCommon/ad_process/CreateAccountingReport_data.xsql
src/org/openbravo/erpCommon/ad_process/CreateCashFlowStatement_data.xsql
src/org/openbravo/erpCommon/ad_process/CreateTaxReport_data.xsql
src/org/openbravo/erpCommon/ad_process/ExpenseAPInvoice_data.xsql
src/org/openbravo/erpCommon/ad_process/PrintInvoices_data.xsql
src/org/openbravo/erpCommon/ad_process/ProcedureProcess_data.xsql
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql
src/org/openbravo/erpCommon/ad_reports/InoutEdition_data.xsql
src/org/openbravo/erpCommon/ad_reports/InvoiceCustomerEdition_data.xsql
src/org/openbravo/erpCommon/ad_reports/InvoiceEdition_data.xsql
src/org/openbravo/erpCommon/ad_reports/MInOutTraceReports_data.xsql
src/org/openbravo/erpCommon/ad_reports/Organization_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportCashFlow_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportCashJR_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournalDetail_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_legacy_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscount_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportNotPosted_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportOffer_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportPendingProductionJr_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportPricelist_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportProductionRun_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitability_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportShipper_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportTotalProductTemplate_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalanceDetail_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartner_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementJR_data.xsql
src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility_data.xsql
src/org/openbravo/erpCommon/businessUtility/TabFilter_data.xsql
src/org/openbravo/erpCommon/businessUtility/Tax_data.xsql
src/org/openbravo/erpCommon/info/AccountElementValue_data.xsql
src/org/openbravo/erpCommon/info/AttributeSetInstance_data.xsql
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_data.xsql
src/org/openbravo/erpCommon/info/BusinessPartner_data.xsql
src/org/openbravo/erpCommon/info/DebtPayment_data.xsql
src/org/openbravo/erpCommon/info/InvoiceLine_data.xsql
src/org/openbravo/erpCommon/info/Invoice_data.xsql
src/org/openbravo/erpCommon/info/Locator_data.xsql
src/org/openbravo/erpCommon/info/ProductComplete_data.xsql
src/org/openbravo/erpCommon/info/ProductMultiple_data.xsql
src/org/openbravo/erpCommon/info/Product_data.xsql
src/org/openbravo/erpCommon/info/ProjectMultiple_data.xsql
src/org/openbravo/erpCommon/info/Project_data.xsql
src/org/openbravo/erpCommon/info/SalesOrderLine_data.xsql
src/org/openbravo/erpCommon/info/SalesOrder_data.xsql
src/org/openbravo/erpCommon/info/ShipmentReceiptLine_data.xsql
src/org/openbravo/erpCommon/info/ShipmentReceipt_data.xsql
src/org/openbravo/erpCommon/utility/SystemInfo_data.xsql
src/org/openbravo/erpCommon/utility/reporting/Order_data.xsql
src/org/openbravo/erpCommon/utility/reporting/printing/Document_data.xsql
src/org/openbravo/erpCommon/utility/reporting/printing/Email_data.xsql
src/org/openbravo/erpReports/ReportRegisterLineJR_data.xsql
src/org/openbravo/erpReports/RptC_ProposalJr_data.xsql
src/org/openbravo/erpReports/RptC_Remittance_data.xsql
src/org/openbravo/erpReports/RptMA_CCP_Measures_Hours_data.xsql
src/org/openbravo/erpReports/RptMA_CCP_Measures_Values_data.xsql
src/org/openbravo/erpReports/RptM_Inout_Header_data.xsql
src/org/openbravo/erpReports/RptM_Inout_Lines_data.xsql
src/org/openbravo/erpReports/RptM_Inout_data.xsql
--- a/src-wad/src/org/openbravo/wad/CallOutsStructure.java	Tue Feb 18 14:52:51 2014 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2010 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.wad;
-
-class CallOutsStructure {
-  String name;
-  String method;
-}
--- a/src-wad/src/org/openbravo/wad/KeyStructure.java	Tue Feb 18 14:52:51 2014 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2010 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.wad;
-
-class KeyStructure {
-  String name;
-  String method;
-  String field;
-  String special;
-}
--- a/src-wad/src/org/openbravo/wad/TableDirRelation_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2010 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-
-
-<SqlClass name="TableDirRelationData" package="org.openbravo.wad">
-  <SqlMethod name="select" type="preparedStatement" return="multiple">
-    <SqlMethodComment>The table dir references</SqlMethodComment>
-    <Sql>
-      <![CDATA[
-      SELECT columnname, '' as tablename, '' as columndescriptionname, '' as code, '' as AD_VAL_RULE_ID, 
-      '' as clause, '' as parameters, '' as reference_id, '' as fromclause
-      FROM AD_column  
-      WHERE AD_reference_id='19'
-      AND columnname not in ('Node_ID')
-        GROUP BY columnname
-      ]]>
-    </Sql>
-  </SqlMethod>
-  <SqlMethod name="selectValidation" type="preparedStatement" return="multiple">
-    <SqlMethodComment>The table dir references</SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT DISTINCT A.COLUMNNAME, A.tablename, A.columndescriptionname, A.code, 
-        A.AD_VAL_RULE_ID, A.clause, A.PARAMETERS, A.reference_id, '' as fromclause 
-        FROM (
-        SELECT DISTINCT c.COLUMNNAME, '' AS tablename, '' AS columndescriptionname, v.code, 
-        v.AD_VAL_RULE_ID, '' AS clause, '' AS PARAMETERS, '' AS reference_id, '' as fromclause 
-        FROM AD_COLUMN c, AD_VAL_RULE v, AD_REFERENCE r
-        WHERE c.AD_VAL_RULE_ID = v.AD_VAL_RULE_ID 
-        AND c.AD_REFERENCE_ID = r.AD_REFERENCE_ID 
-        AND c.AD_VAL_RULE_ID IS NOT NULL 
-        AND r.AD_REFERENCE_ID = '19'
-        UNION
-        SELECT DISTINCT c.COLUMNNAME, '' AS tablename, '' AS columndescriptionname, v.code, 
-        v.AD_VAL_RULE_ID, '' AS clause, '' AS PARAMETERS, '' AS reference_id, '' as fromclause
-        FROM AD_PROCESS_PARA c, AD_VAL_RULE v, AD_REFERENCE r
-        WHERE c.AD_VAL_RULE_ID = v.AD_VAL_RULE_ID 
-        AND c.AD_REFERENCE_ID = r.AD_REFERENCE_ID 
-        AND c.AD_VAL_RULE_ID IS NOT NULL 
-        AND r.AD_REFERENCE_ID = '19') A
-      ]]>
-    </Sql>
-  </SqlMethod>
-</SqlClass>
--- a/src-wad/src/org/openbravo/wad/TableLink_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src-wad/src/org/openbravo/wad/TableLink_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -35,20 +35,6 @@
     <Parameter name="adWindowId"/>
     <Parameter name="adTableId"/>
   </SqlMethod>
-  <SqlMethod name="selectParent" type="preparedStatement" return="multiple">
-    <SqlMethodComment>Names of the columns and name of the fields of a tab</SqlMethodComment>
-    <Sql>
-      SELECT W.AD_WINDOW_ID, '' AS PO_WINDOW_ID, W.NAME AS WINDOWNAME, T.NAME AS TABNAME 
-      FROM AD_WINDOW W, AD_TAB T 
-      WHERE W.AD_WINDOW_ID = T.AD_WINDOW_ID 
-      AND W.ISACTIVE = 'Y' 
-      AND T.ISACTIVE = 'Y' 
-      AND T.tablevel = 0 
-      AND W.AD_WINDOW_ID = ?
-      ORDER BY T.SEQNO 
-    </Sql>
-    <Parameter name="adWindowId"/>
-  </SqlMethod>
   <SqlMethod name="selectWindow" type="preparedStatement" return="multiple">
     <SqlMethodComment>Names of the columns and name of the fields of a tab</SqlMethodComment>
     <Sql>
@@ -68,17 +54,6 @@
     <Parameter name="adColumnId"/>
   </SqlMethod>
   
-  <SqlMethod name="tableNameId" type="preparedStatement" return="String" default="">
-    <SqlMethodComment>Names of the columns and name of the fields of a tab</SqlMethodComment>
-    <Sql>
-      SELECT AD_TABLE_ID 
-      FROM AD_TABLE 
-      WHERE UPPER(TABLENAME) = UPPER(?)
-      AND ISACTIVE = 'Y'
-    </Sql>
-    <Parameter name="tablename"/>
-  </SqlMethod>
-  
   <SqlMethod name="columnName" type="preparedStatement" return="String" default="">
     <SqlMethodComment>Names of the columns and name of the fields of a tab</SqlMethodComment>
     <Sql>
--- a/src-wad/src/org/openbravo/wad/Wad_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src-wad/src/org/openbravo/wad/Wad_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -57,10 +57,6 @@
     </Sql>
   </SqlMethod>
 
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment>Create a registry</SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
   <SqlMethod name="selectMapping" type="preparedStatement" return="multiple">
     <SqlMethodComment>Names of the columns of the fields of a tab</SqlMethodComment>
     <Sql>
@@ -184,17 +180,6 @@
       ]]>
     </Sql>
   </SqlMethod>
-  <SqlMethod name="selectPixelSize" type="preparedStatement" return="String" default="">
-    <SqlMethodComment>Names of the columns of the fields of a tab</SqlMethodComment>
-    <Sql>
-      <![CDATA[
-      SELECT PIXELSIZE 
-      FROM AD_LANGUAGE 
-      WHERE AD_LANGUAGE = ? 
-      ]]>
-    </Sql>
-    <Parameter name="adLanguage"/>
-  </SqlMethod>
   
   <SqlMethod name="genereteWebXml" type="preparedStatement" return="boolean" default="true">
     <Sql>
--- a/src-wad/src/org/openbravo/wad/controls/WADControl_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2010 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-
-
-<SqlClass name="WADControlData" package="org.openbravo.wad.controls">
-  <SqlMethod name="getMessage" type="preparedStatement" return="String" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT COALESCE(mt.msgtext, m.msgtext) as text 
-        from ad_message m left join ad_message_trl mt on m.ad_message_id = mt.ad_message_id 
-                            and mt.ad_language = ?
-        where m.value = ?
-          ]]>
-      </Sql>
-      <Parameter name="adLanguage"/>
-      <Parameter name="value"/>
-  </SqlMethod>
-</SqlClass>
--- a/src/org/openbravo/base/secureApp/OrgTree_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/base/secureApp/OrgTree_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -29,30 +29,4 @@
     <Parameter name="adRoleId"/>
   </SqlMethod>
   
-  <SqlMethod name="selectAllClients" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      SELECT AD_CLIENT_ID
-        FROM AD_CLIENT
-    </Sql>
-  </SqlMethod>
-  
-  <SqlMethod name="selectAllOrgs" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      SELECT AD_ORG_ID
-        FROM AD_ORG
-    </Sql>
-  </SqlMethod>
-  
-  <SqlMethod name="selectRoles" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      SELECT AD_ROLE_ID, userlevel
-        FROM AD_ROLE
-       WHERE AD_CLIENT_ID = ?
-    </Sql>
-   <Parameter name="client"/>
-  </SqlMethod>
-  
 </SqlClass>
--- a/src/org/openbravo/costing/Costing_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2012 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-<SqlClass name="CostingData" package="org.openbravo.costing">
-   <SqlClassComment></SqlClassComment>
-   
-   <SqlMethod name="select" type="preparedStatement" return="multiple">
-     <Sql>
-       select 1 as output from dual
-     </Sql>
-   </SqlMethod>
-   
-   <SqlMethod name="calculateWorkEffortCost" type="callableStatement" return="object" object="CostingData" connection="true">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        CALL MA_PRODUCTION_COST(?, ?, ?)
-      ]]></Sql>
-      <Parameter name="productionId"/>
-      <Parameter name="userId"/>
-      <Parameter name="output" type="out"/>
-   </SqlMethod>
-</SqlClass>
\ No newline at end of file
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -157,17 +157,6 @@
     <Parameter name="MProductID"/>
     <Parameter name="MPriceListID"/>
   </SqlMethod>
-  <SqlMethod name="selectInvoicePricelist" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      SELECT C_Currency.StdPrecision, C_Currency.PricePrecision, M_PriceList.EnforcePriceLimit, M_PriceList.M_PriceList_ID 
-      FROM C_Invoice, M_PriceList, C_Currency 
-      WHERE C_Invoice.M_PriceList_ID = M_PriceList.M_PriceList_ID
-      AND M_PriceList.C_Currency_ID = C_Currency.C_Currency_ID
-      AND C_Invoice.C_Invoice_ID = ?
-    </Sql>
-    <Parameter name="cInvoiceId"/>
-  </SqlMethod>
   <SqlMethod name="getOffersStdPrice" type="preparedStatement" return="String" default="0">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -99,32 +99,6 @@
     <Parameter name="issotrx"/>
     <Parameter name="lastDays"/>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
-  <SqlMethod name="selectPrices" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT M_BOM_PRICELIST(P.M_PRODUCT_ID,PV.M_PRICELIST_VERSION_ID) AS PRICELIST,
-        M_BOM_PRICELIMIT(P.M_PRODUCT_ID,PV.M_PRICELIST_VERSION_ID) AS PRICELIMIT, CUR.STDPRECISION AS STDPRECISION, CUR.PRICEPRECISION AS PRICEPRECISION
-        FROM M_PRODUCT P, M_PRODUCTPRICE PP, M_PRICELIST PL, M_PRICELIST_VERSION PV, C_CURRENCY CUR  
-        WHERE P.M_PRODUCT_ID=PP.M_PRODUCT_ID
-        AND PP.M_PRICELIST_VERSION_ID=PV.M_PRICELIST_VERSION_ID
-        AND PV.M_PRICELIST_ID=PL.M_PRICELIST_ID
-        AND PL.C_CURRENCY_ID = CUR.C_CURRENCY_ID
-        AND PV.ISACTIVE='Y'
-        AND PV.VALIDFROM <= TO_DATE(?)
-        AND P.M_PRODUCT_ID = ?
-        AND PL.M_PRICELIST_ID = ?
-        ORDER BY PV.VALIDFROM DESC
-      ]]>
-    </Sql>
-    <Parameter name="dateordered"/>
-    <Parameter name="MProductID"/>
-    <Parameter name="MPriceListID"/>
-  </SqlMethod>
   <SqlMethod name="getOffersStdPrice" type="preparedStatement" return="String" default="0">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
@@ -186,15 +160,4 @@
     <Parameter name="amtGross"/>
     <Parameter name="pricestdgross"/>
   </SqlMethod>
-  <SqlMethod name="selectPrecisions" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      SELECT C_Currency.StdPrecision, C_Currency.PricePrecision 
-      FROM C_Order, M_PriceList, C_Currency 
-      WHERE C_Order.M_PriceList_ID = M_PriceList.M_PriceList_ID
-      AND M_PriceList.C_Currency_ID = C_Currency.C_Currency_ID
-      AND C_Order.C_Order_ID = ?
-    </Sql>
-    <Parameter name="cOrderId"/>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -149,18 +149,6 @@
     </Sql>
   </SqlMethod>
 
-  <SqlMethod name="selectOrderPricelist" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      SELECT C_Currency.StdPrecision, C_Currency.PricePrecision, M_PriceList.EnforcePriceLimit, M_PriceList.M_PriceList_ID
-      FROM C_Order, M_PriceList, C_Currency 
-      WHERE C_Order.M_PriceList_ID = M_PriceList.M_PriceList_ID
-      AND M_PriceList.C_Currency_ID = C_Currency.C_Currency_ID
-      AND C_Order.C_Order_ID = ?
-    </Sql>
-    <Parameter name="cOrderId"/>
-  </SqlMethod>
-
   <SqlMethod name="selectPriceForProduct" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFile34_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFile34_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -137,88 +137,4 @@
     <Parameter name="nOrdenantes"/>
     </SqlMethod>
 
-    <SqlMethod name="selectComprobacion341" type="preparedStatement" return="string">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-           select count(*)
-             from dual
-            where to_date(?,'DDMMYY') > to_date(?,'DDMMYY')
-    ]]>
-    </Sql>
-    <Parameter name="pNow"/>
-    <Parameter name="pDueDate"/>
-    </SqlMethod>
-
-<!--
-   <SqlMethod name="selectParam" type="preparedStatement" return="String">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      select Content
-        from c_Remittance           r,
-             c_Remittance_Type      rt,
-             c_Remittance_Parameter rp
-       where r.C_Remittance_Type_id = rt.C_Remittance_Type_id
-         and rp.C_Remittance_Type_Id =  rt.C_Remittance_Type_id
-         and r.C_Remittance_id = ?
-         and upper(rp.name)=upper(to_char(?))
-    ]]>
-    </Sql>
-    <Parameter name="cRemittanceId"/>
-    <Parameter name="param"/>
-    </SqlMethod>
-
-    <Parameter name="cRemittanceId"/>
-    </SqlMethod>
-  <SqlMethod name="selectComprobacion1" type="preparedStatement" return="string">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-           select count(*)
-             from dual
-            where to_date('220606','DDMMYY') > to_date('080606','DDMMYY')
-    ]]>
-    </Sql>
-    <Parameter name="cRemittanceId"/>
-    </SqlMethod>
-  <SqlMethod name="selectComprobacion2" type="preparedStatement" return="string">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT COUNT(*)
-      FROM c_remittanceLine rl
-    WHERE rl.c_remittance_id = ?
-    ]]>
-    </Sql>
-    <Parameter name="cRemittanceId"/>
-    </SqlMethod>
-  <SqlMethod name="selectComprobacion3" type="preparedStatement" return="string">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      select count(*)
-      from c_remittance
-    where processed='Y'
-     and c_remittance_id = ?
-    ]]>
-    </Sql>
-    <Parameter name="cRemittanceId"/>
-    </SqlMethod>
-  <SqlMethod name="selectComprobacion4" type="preparedStatement" return="string">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-         SELECT count(*)
-     FROM C_DEBT_PAYMENT DP,
-          c_remittanceLine rl
-    WHERE DP.C_DEBT_PAYMENT_ID = rl.C_DEBT_PAYMENT_id
-    AND DP.ISPAID = 'N'
-    AND DP.C_BPARTNER_ID IS NOT NULL
-    and rl.c_remittance_id = ?
-    ]]>
-    </Sql>
-    <Parameter name="cRemittanceId"/>
-    </SqlMethod>
-    -->
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Receipt_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Receipt_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -62,13 +62,6 @@
     ]]></Sql>
     <Parameter name="warehouse"/>
   </SqlMethod>
-  <SqlMethod name="tabName" type="preparedStatement" return="String" default="">
-    <SqlMethodComment>Ids and Names of table dir M_Locator</SqlMethodComment>
-    <Sql><![CDATA[
-      SELECT NAME FROM AD_TAB WHERE AD_TAB_ID = ?
-    ]]></Sql>
-    <Parameter name="adTabId"/>
-  </SqlMethod>
   <SqlMethod name="insert" connection="true" type="preparedStatement" return="rowCount">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_CRemittance_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_CRemittance_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -90,11 +90,6 @@
     <Parameter name="oraLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[AND RN1 <= ]]></Parameter>
     <Parameter name="pgLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[LIMIT ]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
-  
   <SqlMethod name="countRows" type="preparedStatement" return="string">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
@@ -139,26 +134,6 @@
     <Parameter name="statusFrom" optional="true" after="AND DP.C_CURRENCY_ID = C.C_CURRENCY_ID " text=" AND DP.STATUS = ? "/>
   </SqlMethod>
   
-  <SqlMethod name="bpartner" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      SELECT NAME FROM C_BPARTNER WHERE C_BPARTNER_ID=?
-    </Sql>
-    <Parameter name="cBpartnerId"/>
-  </SqlMethod>
-  <SqlMethod name="NotIsCancelled" type="preparedStatement" connection="true" return="boolean">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql><![CDATA[
-      SELECT COUNT(*) 
-      FROM C_DEBT_PAYMENT DP 
-      WHERE DP.C_DEBT_PAYMENT_ID = ? 
-      AND C_DEBT_PAYMENT_STATUS(DP.C_Settlement_Cancel_ID, DP.Cancel_Processed, DP.Generate_Processed, 
-      DP.IsPaid, DP.IsValid, DP.C_CashLine_ID, DP.C_BankStatementLine_ID)='P' 
-      AND NOT EXISTS (SELECT * FROM C_BankStatementLine l WHERE DP.C_DEBT_Payment_ID=l.C_DEBT_PAYMENT_ID) 
-      AND NOT EXISTS (SELECT * FROM C_CashLine l WHERE DP.C_DEBT_Payment_ID=l.C_DEBT_PAYMENT_ID) 
-    ]]></Sql>
-    <Parameter name="cDebtPaymentId"/>
-  </SqlMethod>
   <SqlMethod name="insert" connection="true" type="preparedStatement" return="rowCount">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -48,57 +48,6 @@
     <Parameter name="c_year_id"/>
     <Parameter name="c_year_id"/>
   </SqlMethod>
-  <SqlMethod name="getAmounts" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT (CASE SIGN(SUM(AMTACCTDR)-SUM(AMTACCTCR)) WHEN -1 THEN 0 ELSE (SUM(AMTACCTDR)-SUM(AMTACCTCR)) END) AS TOTALAMTCR,
-        (CASE SIGN(SUM(AMTACCTCR)-SUM(AMTACCTDR)) WHEN -1 THEN 0 ELSE (SUM(AMTACCTCR)-SUM(AMTACCTDR)) END) AS TOTALAMTDR, ACCOUNT_ID, ACCTDESCRIPTION, ACCTVALUE,
-        RECORD_ID2, C_BPARTNER_ID, M_PRODUCT_ID, A_ASSET_ID,C_TAX_ID,C_PROJECT_ID,C_ACTIVITY_ID,USER1_ID,USER2_ID,C_CAMPAIGN_ID,C_SALESREGION_ID
-        FROM FACT_ACCT
-        WHERE EXISTS (SELECT 1 FROM C_PERIOD P
-                      WHERE P.C_YEAR_ID = ?
-                      AND P.C_PERIOD_ID = FACT_ACCT.C_PERIOD_ID)
-        AND ACCOUNT_ID IN (SELECT C_ELEMENTVALUE_ID
-                FROM C_ELEMENTVALUE
-                WHERE C_ELEMENTVALUE.ACCOUNTTYPE = ?)
-        AND AD_ORG_ID = ?
-        AND C_ACCTSCHEMA_ID = ?
-        GROUP BY ACCOUNT_ID, ACCTDESCRIPTION, ACCTVALUE, RECORD_ID2, C_BPARTNER_ID, M_PRODUCT_ID, A_ASSET_ID,
-                 C_TAX_ID,C_PROJECT_ID,C_ACTIVITY_ID,USER1_ID,USER2_ID,C_CAMPAIGN_ID,C_SALESREGION_ID
-      ]]>
-    </Sql>
-    <Parameter name="c_year_id"/>
-    <Parameter name="accounttype"/>
-    <Parameter name="org"/>
-    <Parameter name="acctSchema"/>
-  </SqlMethod>
-  <SqlMethod name="getAmountsClose" type="preparedStatement" connection="true" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT (CASE sign(SUM(AMTACCTDR)-sum(amtacctcr)) WHEN -1 THEN 0 ELSE (SUM(AMTACCTDR)-sum(amtacctcr)) END) AS TOTALAMTCR,
-          (CASE sign(SUM(AMTACCTCR)-sum(amtacctdr)) WHEN -1 THEN 0 ELSE (SUM(AMTACCTCR)-sum(amtacctdr)) END) AS TOTALAMTDR, ACCOUNT_ID,
-          ACCTDESCRIPTION, ACCTVALUE, RECORD_ID2, C_BPARTNER_ID, M_PRODUCT_ID, A_ASSET_ID, C_TAX_ID, C_PROJECT_ID, C_ACTIVITY_ID,
-          USER1_ID, USER2_ID, C_CAMPAIGN_ID, C_SALESREGION_ID
-        FROM FACT_ACCT
-        WHERE EXISTS (SELECT 1 FROM C_PERIOD P
-                      WHERE P.C_YEAR_ID = ?
-                      AND P.C_PERIOD_ID = FACT_ACCT.C_PERIOD_ID)
-        AND ACCOUNT_ID IN (SELECT C_ELEMENTVALUE_ID
-                FROM C_ELEMENTVALUE
-                WHERE C_ELEMENTVALUE.ACCOUNTTYPE IN ('1'))
-        AND AD_ORG_ID = ?
-        AND C_ACCTSCHEMA_ID = ?
-        GROUP BY ACCOUNT_ID, ACCTDESCRIPTION, ACCTVALUE, RECORD_ID2, C_BPARTNER_ID, M_PRODUCT_ID, A_ASSET_ID, C_TAX_ID, C_PROJECT_ID,
-                 C_ACTIVITY_ID, USER1_ID, USER2_ID, C_CAMPAIGN_ID, C_SALESREGION_ID
-      ]]>
-    </Sql>
-    <Parameter name="c_year_id"/>
-    <Parameter name="accounttype" optional="true" type="replace" after="WHERE C_ELEMENTVALUE.ACCOUNTTYPE IN (" text="'1'"/>
-    <Parameter name="org"/>
-    <Parameter name="acctSchema"/>
-  </SqlMethod>
   <SqlMethod name="getTotalAmounts" type="preparedStatement" connection="true" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
@@ -529,20 +478,6 @@
     <Parameter name="cYearId"/>
     <Parameter name="adOrgId"/>
   </SqlMethod>
-   <SqlMethod name="selectOrg" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT A_O.AD_ORG_ID AS ID, A_O.NAME
-        FROM AD_ORG A_O, AD_ROLE_ORGACCESS A_R_O, AD_ROLE R
-        WHERE A_R_O.AD_ORG_ID = A_O.AD_ORG_ID
-        AND A_R_O.ISACTIVE = 'Y'
-        AND A_R_O.AD_ROLE_ID = R.AD_ROLE_ID
-        AND R.ISACTIVE = 'Y'
-        AND A_R_O.AD_ROLE_ID = ?
-        ORDER BY A_O.NAME
-      ]]></Sql>
-        <Parameter name="rol"/>
-   </SqlMethod>
    <SqlMethod name="treeOrgAcctSchemas" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
@@ -587,14 +522,6 @@
         <Parameter name="organizationId"/>
         <Parameter name="organizationId"/>
    </SqlMethod>
-  <SqlMethod name="getTreeOrg" type="preparedStatement" return="string">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-        SELECT AD_TREE_ORG_ID FROM AD_CLIENTINFO
-        WHERE AD_CLIENT_ID = ?
-    </Sql>
-    <Parameter name="client"/>
-  </SqlMethod>
    <SqlMethod name="getRegCount" type="preparedStatement" return="string">
     <SqlMethodComment></SqlMethodComment>
     <Sql><![CDATA[
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateVatRegisters_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateVatRegisters_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -63,8 +63,4 @@
         <Parameter name="parDateTo" optional="true" after="and 1=1"><![CDATA[ and coalesce(C_invoice.TaxDate, C_invoice.DateAcct) < to_date(?)]]></Parameter>
         <Parameter name="adUserOrg" type="replace" optional="true" after="and C_Invoice.AD_Org_ID IN (" text="'1'"/>
       </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_actionButton/EditCCPMeasureValues_Hours_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/EditCCPMeasureValues_Hours_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -44,8 +44,4 @@
       <Parameter name="maMeasureGroupId"/>
       <Parameter name="maMeasureGroupId"/>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_actionButton/EditCCPMeasureValues_Values_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/EditCCPMeasureValues_Values_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -52,8 +52,4 @@
       <Parameter name="maMeasureGroupId"/>
       <Parameter name="maMeasureGroupId"/>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -266,36 +266,6 @@
     ]]></Sql>
     <Parameter name="cBpartnerId"/>
   </SqlMethod>
-  <SqlMethod name="insertPInstance" connection="true" type="preparedStatement" return="rowCount">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      INSERT INTO AD_PINSTANCE
-        (AD_PINSTANCE_ID, AD_PROCESS_ID, RECORD_ID,
-         ISPROCESSING, CREATED, AD_USER_ID,
-         UPDATED, AD_CLIENT_ID, AD_ORG_ID,
-         CREATEDBY, UPDATEDBY)
-      VALUES
-        (?,?,?,
-         'N',now(),?,
-         now(), ?, ?,
-         ?, ?)
-    </Sql>
-    <Parameter name="adPinstanceId"/>
-    <Parameter name="adProcessId"/>
-    <Parameter name="recordId"/>
-    <Parameter name="adUserId"/>
-    <Parameter name="adClientId"/>
-    <Parameter name="adOrgId"/>
-    <Parameter name="adUserId"/>
-    <Parameter name="adUserId"/>
-  </SqlMethod>
-  <SqlMethod name="processOrder" type="callableStatement" connection="true" return="object" object="ExpenseSOrderData">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        CALL C_Order_Post(?)
-      ]]></Sql>
-      <Parameter name="adPinstanceId"/>
-   </SqlMethod>
   <SqlMethod name="selectPrecisions" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/ad_actionButton/Posted_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/Posted_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -35,18 +35,6 @@
     <Parameter name="record_id"/>
     <Parameter name="ad_table_id"/>
   </SqlMethod>
-  <SqlMethod name="selectClient" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT AD_CLIENT_ID FROM FACT_ACCT
-        WHERE RECORD_ID = ?
-      ]]>
-    </Sql>
-    <Parameter name="tablename" optional="true" type="replace" after="FROM " text="FACT_ACCT"/>
-    <Parameter name="tablename" optional="true" type="replace" after="WHERE " text="RECORD"/>
-    <Parameter name="ad_record_id"/>
-  </SqlMethod>
   <SqlMethod name="selectTableName" type="preparedStatement" return="String" default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_actionButton/TaxPayment.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/TaxPayment.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -34,20 +34,6 @@
   <Parameter name="parTaxPaymId" optional="false" after=" 1=1"><![CDATA[ and c_taxpayment_id in ( ? )  ]]></Parameter> 
   </SqlMethod>
 
-  <SqlMethod name="updateProcessed" type="preparedStatement" return="rowcount">
-  <SqlMethodComment>delete All Tax Register Lines Child</SqlMethodComment>
-  <Sql>
-  <![CDATA[
-  		UPDATE C_TAXPAYMENT 
-  		SET Processed = ? , UPDATED=now() , UPDATEDBY =  ?
-  		WHERE C_TaxPayment_ID = ?
-      ]]>
-  </Sql>
-  <Parameter name="processed" default='N'/>
-  <Parameter name="updateby"/>
-  <Parameter name="taxpayment_id"/>
-  </SqlMethod>
-
 <SqlMethod name="updateGeneratePayment" type="preparedStatement" return="rowcount">
   <SqlMethodComment>delete All Tax Register Lines Child</SqlMethodComment>
   <Sql>
@@ -112,22 +98,6 @@
   <Parameter name="DateTo"/>
   </SqlMethod>
  
-  <SqlMethod name="calculatePrevvatcredit" type="preparedStatement" return="String">
-  <SqlMethodComment>Update Tax Register Totals</SqlMethodComment>
-  <Sql>
-  <![CDATA[
-  	   select sum(case when  c_taxregister.C_TAXREGISTER_TYPE_ID in 
-        (select C_TAXREGISTER_TYPE_ID from c_taxregister_type where c_taxregister_type.ISSOTRX='Y')
-        then coalesce(-lastregaccumamt,0)
-        else coalesce(lastregaccumamt,0) end ) as prevvatcredit
-        from c_taxregister where c_taxregister.C_TAXPAYMENT_id = ?
-      	
-      ]]>
-  </Sql>
-  <Parameter name="taxpayment_id"/>
-  
-  </SqlMethod>
-  
   <SqlMethod name="calculateVatPayment" type="preparedStatement" return="String">
   <SqlMethodComment>Update Tax Register Totals</SqlMethodComment>
   <Sql>
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_ProjectLine_Value_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_ProjectLine_Value_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -51,15 +51,6 @@
     </Sql>
     <Parameter name="cPhaseId"/>
   </SqlMethod>
-  <SqlMethod name="selectPriceListVersion" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      SELECT M_GET_PRICELIST_VERSION(?, to_date(?)) as pricelist_version
-      FROM DUAL
-    </Sql>
-    <Parameter name="mPriceListId"/>
-    <Parameter name="date"/>
-  </SqlMethod>
   <SqlMethod name="selectPlannedPrice" type="preparedStatement" return="String" default="0">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Supplier_BPartner_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2008-2010 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<SqlClass name="SESupplierBPartnerData" package="org.openbravo.erpCommon.ad_callouts">
-  <SqlMethod name="select" type="preparedStatement" return="string" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-      SELECT p.PO_PriceList_ID
-      FROM C_BPartner p
-      WHERE p.C_BPartner_ID = ?
-      ]]>
-    </Sql>
-    <Parameter name="cBpartnerId"/>
-  </SqlMethod>
-</SqlClass>
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Product_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Product_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -31,15 +31,6 @@
       ]]>
     </Sql>
   </SqlMethod>
-  <SqlMethod name="selectProductUom" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      SELECT C_UOM_ID
-      FROM M_PRODUCT
-      WHERE M_PRODUCT_ID = ?
-    </Sql>
-    <Parameter name="mProductId"/>
-  </SqlMethod>
   <SqlMethod name="strMProductUOMID" type="preparedStatement" return="String" default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2010 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-
-
-
-
-<SqlClass name="SLInventoryProductData" package="org.openbravo.erpCommon.ad_callouts">
-<SqlMethod name="selectDump" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT * FROM DUAL
-      ]]>
-    </Sql>
-  </SqlMethod>
-  <SqlMethod name="select" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT C_UOM_ID FROM M_Product 
-        WHERE M_Product_ID=?
-      ]]>
-    </Sql>
-    <Parameter name="product"/>
-  </SqlMethod>
-</SqlClass>
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -33,15 +33,4 @@
     </Sql>
     <Parameter name="cInvoiceId"/>
   </SqlMethod>
-  <SqlMethod name="selectPriceLimit" type="preparedStatement" return="String" default="0">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      SELECT PRICELIMIT 
-      FROM M_PRODUCTPRICE 
-      WHERE M_PRICELIST_VERSION_ID = ? 
-      AND M_PRODUCT_ID=?
-    </Sql>
-    <Parameter name="mPricelistVersionId"/>
-    <Parameter name="mProductId"/>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -33,31 +33,6 @@
     </Sql>
     <Parameter name="cAcctSchemaId"/>
   </SqlMethod>
-  <SqlMethod name="currencyRate" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      select c_currency_rate(?, ?, TO_DATE(?), ?, ?, ?) from dual
-    </Sql>
-    <Parameter name="cCurrencyId"/>
-    <Parameter name="targetCurrencyId"/>
-    <Parameter name="DateAcct"/>
-    <Parameter name="currencyRateType"/>
-    <Parameter name="adCientId"/>
-    <Parameter name="adOrgId"/>
-  </SqlMethod>
-  <SqlMethod name="currencyRate2" type="preparedStatement" return="String" default="1">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-	SELECT CurrencyRate 
-	FROM GL_Journal 
-	WHERE GL_Journal_ID=? 
-	AND C_Currency_ID=? 
-	AND CurrencyRateType=?
-    </Sql>
-    <Parameter name="GLJournalId"/>
-    <Parameter name="cCurrencyId"/>
-    <Parameter name="currencyRateType"/>
-  </SqlMethod>
    <SqlMethod name="selectGeneralLedger" type="preparedStatement" return="String">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -41,15 +41,4 @@
     </Sql>
     <Parameter name="priceList"/>
   </SqlMethod>
-  <SqlMethod name="selectPriceLimit" type="preparedStatement" return="String" default="0">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      SELECT PRICELIMIT 
-      FROM M_PRODUCTPRICE 
-      WHERE M_PRICELIST_VERSION_ID = ? 
-      AND M_PRODUCT_ID=?
-    </Sql>
-    <Parameter name="mPricelistVersionId"/>
-    <Parameter name="mProductId"/>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Payment_Amounts_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Payment_Amounts_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -36,19 +36,6 @@
     <Parameter name="cInvoiceId"/>
 
   </SqlMethod>
- <SqlMethod name="selectCurrency" type="preparedStatement" return="string" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT C_CONVERSION_RATE.MULTIPLYRATE 
-        FROM C_CONVERSION_RATE
-        WHERE C_CONVERSION_RATE.C_CURRENCY_ID = ?
-        AND C_CONVERSION_RATE.C_CURRENCY_ID_TO = ?
-      ]]>
-    </Sql>
-    <Parameter name="cCurrencyId"/>
-    <Parameter name="cCurrencyIdTo"/>
-  </SqlMethod>
    <SqlMethod name="selectConversion" type="preparedStatement" return="String" default="0">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_ProjectPlanned_Amt_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_ProjectPlanned_Amt_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -35,28 +35,6 @@
     </Sql>
     <Parameter name="cProjectId"/>
   </SqlMethod>
-  <SqlMethod name="selectPriceLimit" type="preparedStatement" return="String" default="0">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      SELECT PRICELIMIT 
-      FROM M_PRODUCTPRICE 
-      WHERE M_PRICELIST_VERSION_ID = ? 
-      AND M_PRODUCT_ID=?
-    </Sql>
-    <Parameter name="mPricelistVersionId"/>
-    <Parameter name="mProductId"/>
-  </SqlMethod>
-  <SqlMethod name="update" type="preparedStatement" return="rowCount" static="true">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-        UPDATE C_PROJECTLINE SET 
-        PLANNEDAMT = TO_NUMBER(?), UPDATED = now(), UPDATEDBY = ?
-        WHERE C_PROJECTLINE_ID = ?
-      </Sql>
-      <Parameter name="plannedAmt"/>
-      <Parameter name="updatedby"/>
-      <Parameter name="cProjectlineId"/>
-   </SqlMethod>
    <SqlMethod name="selectPrecision" type="preparedStatement" return="String" default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_Sequence.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_Sequence.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -34,30 +34,4 @@
     </Sql>
     <Parameter name="maSequenceId"/>
   </SqlMethod>
-  <SqlMethod name="qty" type="preparedStatement" return="String">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT  (s.multiplier * w.quantity) AS quantity
-        FROM    MA_Sequence s, MA_WorkRequirement w
-        WHERE   s.MA_Sequence_ID = ?
-        AND     w.MA_WorkRequirement_ID = ?
-      ]]>
-    </Sql>
-    <Parameter name="maSequenceId"/>
-    <Parameter name="maWorkRequirementId"/>
-  </SqlMethod>
-  <SqlMethod name="doneqty" type="preparedStatement" return="String">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT  (s.multiplier * w.quantity) AS quantity
-        FROM    MA_Sequence s, MA_WorkRequirement w
-        WHERE   s.MA_Sequence_ID = ?
-        AND     w.MA_WorkRequirement_ID = ?
-      ]]>
-    </Sql>
-    <Parameter name="maSequenceId"/>
-    <Parameter name="maWorkRequirementId"/>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_forms/Account_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/Account_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -49,16 +49,6 @@
       </Sql>
     <Parameter name="C_AcctSchema_ID"/>
    </SqlMethod>
-   <SqlMethod name="selectAcctSchemaGL" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      SELECT UseSuspenseBalancing,SuspenseBalancing_Acct, UseSuspenseError,SuspenseError_Acct, UseCurrencyBalancing,
-      CurrencyBalancing_Acct, RetainedEarning_Acct,IncomeSummary_Acct, InterCompanyDueTo_Acct,InterCompanyDueFrom_Acct 
-      FROM C_AcctSchema_GL 
-      WHERE C_AcctSchema_ID=?
-      </Sql>
-    <Parameter name="C_AcctSchema_ID"/>
-   </SqlMethod>
    <SqlMethod name="GetValidAccountCombination" connection="true" type="callableStatement" return="object" object="RespuestaCS">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/ad_forms/AcctSchema_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctSchema_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -76,22 +76,4 @@
      <Parameter name="c_acctschema_id"/>
      <Parameter name="ad_table_id"/>
    </SqlMethod>
-   <SqlMethod name="selectAcctSchemaTable2" type="preparedStatement" return="boolean" default="false">
-    <SqlMethodComment>Deprecated. Use selectAcctSchemaTable</SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT count(C_ACCTSCHEMA_TABLE_ID) AS TOTAL FROM C_ACCTSCHEMA_TABLE
-        WHERE C_ACCTSCHEMA_ID = ?
-        AND AD_TABLE_ID = ?
-        AND ISACTIVE = 'Y'
-        AND EXISTS ( SELECT 1
-                     FROM AD_ORG_ACCTSCHEMA
-                     WHERE AD_IsOrgIncluded(?, C_ACCTSCHEMA_TABLE.AD_org_ID, C_ACCTSCHEMA_TABLE.AD_Client_ID) <> -1
-                   )
-     ]]>
-     </Sql>
-     <Parameter name="c_acctschema_id"/>
-     <Parameter name="ad_table_id"/>
-     <Parameter name="ad_org_id"/>
-   </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -556,44 +556,6 @@
       <Parameter name="dateFrom" optional="true" after="where 1=1"><![CDATA[ AND b.dateacct >= TO_DATE(?)]]></Parameter>
       <Parameter name="dateTo" optional="true" after="where 1=1"><![CDATA[ AND b.dateacct <= TO_DATE(?)]]></Parameter>
    </SqlMethod>
-   <SqlMethod name="filterDatesSelectDocuments" type="preparedStatement" return="single">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        select MIN(C_INVOICE_ID) as id
-        from c_invoice a, ad_org
-        where posted = 'N'
-        and processed = 'Y'
-        and (processing = 'N' or processing is null)
-        AND ad_org.ad_org_id=a.ad_org_id
-        AND a.ad_client_id = ?
-        AND AD_ISORGINCLUDED(ad_org.ad_org_id, ?, ad_org.ad_client_id)<>-1
-        AND EXISTS (select 1
-               from c_year, c_period, c_periodcontrol, ad_org
-               where c_year.c_year_id = c_period.c_year_id
-              and c_period.c_period_id = c_periodcontrol.c_period_id
-              and c_year.c_calendar_id = ad_org.c_calendar_id
-              and ad_org.ad_client_id = a.ad_client_id
-              and c_periodcontrol.docbasetype = ?
-              and c_periodcontrol.periodstatus = 'O'
-              and    a.dateacct >= c_period.StartDate
-              and     a.dateacct < c_period.EndDate + 1)
-        and      a.dateacct >= to_date(?)
-        and       a.dateacct <= to_date(?)
-      ]]>
-      </Sql>
-      <Parameter name="tableName" type="replace" optional="true" after="select MIN(" text="C_INVOICE"/>
-      <Parameter name="tableName" type="replace" optional="true" after="from " text="c_invoice"/>
-      <Parameter name="adClientId" />
-      <Parameter name="adOrgId"/>
-      <Parameter name="docbasetype"/>
-      <Parameter name="dateColumn" type="replace" optional="true" after="and    a." text="dateacct"/>
-      <Parameter name="dateColumn" type="replace" optional="true" after="and     a." text="dateacct"/>
-      <Parameter name="dateColumn" type="replace" optional="true" after="and      a." text="dateacct"/>
-      <Parameter name="dateColumn" type="replace" optional="true" after="and       a." text="dateacct"/>
-      <Parameter name="dateFrom"/>
-      <Parameter name="dateTo"/>
-   </SqlMethod>
    <SqlMethod name="selectDocTypes" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
@@ -629,14 +591,6 @@
       </Sql>
       <Parameter name="bpartnerId"/>
    </SqlMethod>
-   <SqlMethod name="selectOrgName" type="preparedStatement" return="string" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-        SELECT NAME FROM AD_ORG
-        WHERE AD_ORG_ID = ?
-      </Sql>
-      <Parameter name="org"/>
-   </SqlMethod>
    <SqlMethod name="selectNegate" type="preparedStatement" return="string" default="">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
@@ -716,33 +670,6 @@
      <Parameter name="acctschemaId"/>
      <Parameter name="tableId"/>
    </SqlMethod>
-   <SqlMethod name="selectFilterDates" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-          Select * from(
-        SELECT  a.C_INVOICE_ID AS ID
-        FROM C_INVOICE a, ad_org WHERE a.AD_CLIENT_ID=?
-        AND ad_org.ad_org_id=a.ad_org_id
-        AND AD_ISORGINCLUDED(ad_org.ad_org_id, ?, ad_org.ad_client_id)<>-1
-        AND PROCESSED='Y'
-        AND (PROCESSING='N' OR PROCESSING IS NULL)
-        AND POSTED='N'
-        AND a.DATEACCT >= to_date(?)
-        AND  a.DATEACCT <= to_date(?)
-        ORDER BY a.CREATED) A
-     ]]>
-     </Sql>
-     <Parameter name="tableName" type="replace" optional="true" after="SELECT  a." text="C_INVOICE"/>
-     <Parameter name="tableName" type="replace" optional="true" after="FROM " text="C_INVOICE"/>
-     <Parameter name="client"/>
-     <Parameter name="org"/>
-     <Parameter name="dateColumn" type="replace" optional="true" after="AND a." text="DATEACCT"/>
-     <Parameter name="dateColumn" type="replace" optional="true" after="AND  a." text="DATEACCT"/>
-     <Parameter name="dateFrom"/>
-     <Parameter name="dateTo"/>
-     <Parameter name="dateColumn" type="replace" optional="true" after="ORDER BY a." text="CREATED"/>
-   </SqlMethod>
    
   </SqlClass>
   
--- a/src/org/openbravo/erpCommon/ad_forms/DocCash_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/DocCash_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -37,18 +37,6 @@
      </Sql>
      <Parameter name="cash"/>
    </SqlMethod>
-  <SqlMethod name="selectBPartner" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-	SELECT O.C_BPARTNER_ID as C_BPARTNER_ID, o.ISSOTRX AS ISSOTRX 
-	FROM C_CASHLINE C, C_ORDER O
-	WHERE C.C_ORDER_ID = O.C_ORDER_ID
-	AND C.C_CASHLINE_ID = ?
-     ]]>
-     </Sql>
-     <Parameter name="cashLine"/>
-   </SqlMethod>
   <SqlMethod name="selectRegistro" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_forms/DocInOut_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInOut_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -69,16 +69,4 @@
      <Parameter name="date"/>
      <Parameter name="mProductId"/>
   </SqlMethod>
-  <SqlMethod name="selectClientCurrencyPrecission" type="preparedStatement" return="string">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-      select stdprecision 
-      from c_currency cu, ad_client cl
-       where cu.c_currency_id=cl.c_currency_id
-         and cl.ad_client_id=?
-     ]]>
-    </Sql>
-    <Parameter name="adClientId"/>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_forms/DocLineCash_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/DocLineCash_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -42,24 +42,6 @@
      </Sql>
      <Parameter name="cash"/>
    </SqlMethod>
-  <SqlMethod name="selectBank" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-      SELECT AD_Org_ID, C_Currency_ID, 0 AS C_BPARTNER_ID FROM C_BankAccount WHERE C_BankAccount_ID=?
-     ]]>
-     </Sql>
-     <Parameter name="bankAccount"/>
-   </SqlMethod>
-  <SqlMethod name="selectReferenceInfo" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-      SELECT AD_Org_ID, C_Currency_ID, C_BPartner_ID FROM C_Invoice WHERE C_Invoice_ID=?
-     ]]>
-     </Sql>
-     <Parameter name="invoice"/>
-   </SqlMethod>
   <SqlMethod name="selectOrder" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_forms/DocLinePayment_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/DocLinePayment_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -47,20 +47,6 @@
      </Sql>
      <Parameter name="C_SETTLEMENT_ID"/>
    </SqlMethod>
-  <SqlMethod name="selectManualAcct" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-      SELECT C_GLITEM_ACCT.GLITEM_CREDIT_ACCT AS CREDIT_ACCT, C_GLITEM_ACCT.GLITEM_DEBIT_ACCT AS DEBIT_ACCT
-      FROM C_DEBT_PAYMENT, C_GLITEM_ACCT
-      WHERE C_DEBT_PAYMENT.C_GLITEM_ID = C_GLITEM_ACCT.C_GLITEM_ID
-      AND C_GLITEM_ACCT.C_ACCTSCHEMA_ID = ?
-      AND C_DEBT_PAYMENT.C_SETTLEMENT_GENERATE_ID = ?
-     ]]>
-     </Sql>
-     <Parameter name="C_ACCTSCHEMA_ID"/>
-     <Parameter name="C_SETTLEMENT_ID"/>
-   </SqlMethod>
   <SqlMethod name="getDPStatus" type="preparedStatement" return="String">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -85,16 +85,6 @@
     <Parameter name="adClientId"/>
     <Parameter name="cInvoiceLineId"/>
   </SqlMethod>
-  <SqlMethod name="selectClientCurrencyPrecission" type="preparedStatement" return="string">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      select stdprecision 
-      from c_currency cu, ad_client cl
-       where cu.c_currency_id=cl.c_currency_id
-         and cl.ad_client_id=?
-    </Sql>
-    <Parameter name="adClientId"/>
-  </SqlMethod>
   <SqlMethod name="selectInvoiceLine" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -127,22 +127,6 @@
      <Parameter name="C_CASHLINE_ID"/>
      <Parameter name="C_ACCTSCHEMA_ID"/>
    </SqlMethod>
-  <SqlMethod name="selectCancelManual" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT B.AMOUNTCREDIT AS AMOUNTCREDIT, B.AMOUNTDEBIT AS AMOUNTDEBIT, GA.GLITEM_CREDIT_ACCT AS CREDIT_ACCT, GA.GLITEM_DEBIT_ACCT AS DEBIT_ACCT
-        FROM C_DEBT_PAYMENT D, C_DEBT_PAYMENT_BALANCING B, C_GLITEM G, C_GLITEM_ACCT GA
-        WHERE D.C_DEBT_PAYMENT_ID = B.C_DEBT_PAYMENT_ID
-        AND B.C_GLITEM_ID = G.C_GLITEM_ID
-        AND G.C_GLITEM_ID = GA.C_GLITEM_ID
-        AND GA.C_ACCTSCHEMA_ID = ?
-        AND B.C_DEBT_PAYMENT_ID = (SELECT C_DEBT_PAYMENT_ID FROM C_DEBT_PAYMENT WHERE C_SETTLEMENT_CANCEL_ID = ?)
-     ]]>
-     </Sql>
-     <Parameter name="C_ACCTSCHEMA_ID"/>
-     <Parameter name="C_SETTLEMENT_ID"/>
-   </SqlMethod>
   <SqlMethod name="selectManual" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_forms/FactLine_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/FactLine_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -61,22 +61,6 @@
      </Sql>
      <Parameter name="C_BPartner_Location_ID"/>
    </SqlMethod>
-  <SqlMethod name="selectUnearnedRevenue" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT ga.UnearnedRevenue_Acct as unearnedrevenue, vc.Account_ID as account
-        FROM C_BP_Group_Acct ga, C_BPartner p, C_ValidCombination vc
-        WHERE ga.C_BP_Group_ID=p.C_BP_Group_ID
-        AND ga.UnearnedRevenue_Acct=vc.C_ValidCombination_ID
-        AND ga.C_AcctSchema_ID = ?
-        AND p.C_BPartner_ID = ?
-        ]]>
-     </Sql>
-     <Parameter name="C_AcctSchema_ID"/>
-     <Parameter name="C_BPartner_ID"/>
-   </SqlMethod>
-
   <SqlMethod name="insertFactAct" type="preparedStatement" connection="true" return="rowCount">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -128,14 +128,6 @@
     </Sql>
     <Parameter name="cBpartnerId"/>
   </SqlMethod>
-  <SqlMethod name="treeOrg" type="preparedStatement" return="string">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-        SELECT AD_TREE_ORG_ID FROM AD_CLIENTINFO
-        WHERE AD_CLIENT_ID = ?
-    </Sql>
-    <Parameter name="client"/>
-  </SqlMethod>  
   <SqlMethod name="process134" type="callableStatement" return="object" object="GenerateInvoicesmanualData" connection="true">
       <SqlMethodComment>procedure C_Invoice_Create0</SqlMethodComment>
       <Sql><![CDATA[
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -80,15 +80,6 @@
       ]]></Sql>
     <Parameter name="parSalesOrders" optional="true" type="argument" after="WHERE 1=1" text="AND C_Order_ID IN"/>
   </SqlMethod>
-    <SqlMethod name="bPartnerDescription" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-    SELECT NAME FROM C_BPARTNER 
-    WHERE C_BPARTNER_ID = ?
-    ]]></Sql>
-    <Parameter name="cBpartnerId"/>
-  </SqlMethod>
   <SqlMethod name="treeOrg" type="preparedStatement" return="string">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_forms/Heartbeat_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/Heartbeat_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -24,25 +24,6 @@
       <Sql>select 1 as dummy from dual</Sql>
    </SqlMethod>
 
-   <SqlMethod name="disableHeartbeat" type="preparedStatement" return="rowCount">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        update AD_SYSTEM_INFO set ISHEARTBEATACTIVE = 'N'
-     ]]>
-     </Sql>
-   </SqlMethod>
-
-   <SqlMethod name="postpone" type="preparedStatement" return="rowCount">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        update AD_SYSTEM_INFO set POSTPONE_DATE = TO_DATE(?)
-     ]]>
-     </Sql>
-     <Parameter name="postponeDate"/>
-   </SqlMethod>
-
    <SqlMethod name="updateServletContainer" type="preparedStatement" return="rowCount">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_forms/LanguageCombo_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/LanguageCombo_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -35,24 +35,4 @@
         ORDER BY NAME
       </Sql>
    </SqlMethod>
-
-   <SqlMethod name="defaultLanguage" type="preparedStatement" return="String" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-        SELECT AD_LANGUAGE FROM AD_LANGUAGE WHERE ISACTIVE='Y' AND ISBASELANGUAGE='Y'
-      </Sql>
-   </SqlMethod>
-
-   <SqlMethod name="selectOthers" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-        SELECT AD_LANGUAGE 
-        FROM AD_LANGUAGE 
-        WHERE ISACTIVE='Y'
-        AND ISSYSTEMLANGUAGE = 'Y' 
-        AND ISBASELANGUAGE = 'N' 
-        ORDER BY NAME
-      </Sql>
-      <Parameter name="language" optional="true" after="WHERE " text=" AD_LANGUAGE = ? AND "/>
-   </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPendingLines_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPendingLines_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -50,10 +50,6 @@
 	<Field name="rownum" value="count"/>
     <Parameter name="cOrderlineId"/>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
   <SqlMethod name="insert" connection="true" type="preparedStatement" return="rowCount">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_forms/MonedaCombo_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/MonedaCombo_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -24,13 +24,6 @@
 
 <SqlClass name="MonedaComboData" package="org.openbravo.erpCommon.ad_forms">
    <SqlClassComment></SqlClassComment>
-   <SqlMethod name="select" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      SELECT C_Currency_ID as id, Description as name
-      FROM C_Currency ORDER BY 2
-      </Sql>
-   </SqlMethod>
    <SqlMethod name="selectISO" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/ad_forms/Organization_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/Organization_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -24,19 +24,6 @@
 
 <SqlClass name="OrganizationData" package="org.openbravo.erpCommon.ad_forms">
    <SqlClassComment></SqlClassComment>
-   <SqlMethod name="select" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT A_R_O.AD_ROLE_ID AS PADRE, A_O.AD_ORG_ID AS ID, A_O.NAME
-        FROM AD_ORG A_O, AD_ROLE_ORGACCESS A_R_O, AD_ROLE R 
-        WHERE A_R_O.AD_ORG_ID = A_O.AD_ORG_ID 
-        AND A_R_O.ISACTIVE = 'Y' 
-        AND A_R_O.AD_ROLE_ID = R.AD_ROLE_ID 
-        AND R.ISACTIVE = 'Y' 
-        AND (LPAD(TO_CHAR(R.USERLEVEL), 1, '1')='S' OR A_O.AD_ORG_ID <> '0')
-        ORDER BY A_R_O.AD_ROLE_ID, A_O.NAME
-      ]]></Sql>
-   </SqlMethod>
    <SqlMethod name="selectLogin" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
--- a/src/org/openbravo/erpCommon/ad_forms/SQLExecutor_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/SQLExecutor_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -31,8 +31,4 @@
       select 1 as header from dual
       ]]></Sql>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_forms/ShowSessionVariables_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/ShowSessionVariables_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -45,71 +45,4 @@
     <Parameter name="windows" optional="true" type="argument" after="WHERE AD_WINDOW.ISACTIVE='Y' " text="AND AD_WINDOW.AD_WINDOW_ID IN "/>
     <Parameter name="adLanguage"/>
   </SqlMethod>
-  <SqlMethod name="usuario" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql><![CDATA[
-      SELECT USERNAME FROM AD_USER WHERE AD_USER_ID = ?
-    ]]></Sql>
-    <Parameter name="adUserId"/>
-  </SqlMethod>
-  <SqlMethod name="rol" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql><![CDATA[
-      SELECT NAME FROM AD_ROLE WHERE AD_ROLE_ID = ?
-    ]]></Sql>
-    <Parameter name="adRoleId"/>
-  </SqlMethod>
-  <SqlMethod name="cliente" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql><![CDATA[
-      SELECT NAME FROM AD_CLIENT WHERE AD_CLIENT_ID = ?
-    ]]></Sql>
-    <Parameter name="adClientId"/>
-  </SqlMethod>
-  <SqlMethod name="organizacion" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql><![CDATA[
-      SELECT NAME FROM AD_ORG WHERE AD_ORG_ID = ?
-    ]]></Sql>
-    <Parameter name="adOrgId"/>
-  </SqlMethod>
-  <SqlMethod name="selectPreference" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql><![CDATA[
-      SELECT AD_Preference_ID 
-      FROM AD_Preference 
-      WHERE AD_Client_ID IN ('1') 
-      AND AD_Org_ID IN ('2') 
-      AND (AD_User_ID IS NULL OR AD_User_ID='0' OR AD_User_ID = ?) 
-      AND IsActive='Y' 
-      AND UPPER(Attribute) = UPPER(?)
-      ORDER BY AD_Client_ID, AD_Org_ID, AD_User_ID
-    ]]></Sql>
-    <Parameter name="adClientId" type="replace" optional="true" after="AD_Client_ID IN (" text="'1'"/>
-    <Parameter name="adOrgId" type="replace" optional="true" after="AD_Org_ID IN (" text="'2'"/>
-    <Parameter name="adUserId"/>
-    <Parameter name="columnname"/>
-  </SqlMethod>
-  <SqlMethod name="update" type="preparedStatement" return="rowCount">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql><![CDATA[
-      UPDATE AD_PREFERENCE SET UPDATED=now(), UPDATEDBY = ?, VALUE=?
-      WHERE AD_Preference_ID = ?
-    ]]></Sql>
-      <Parameter name="adUserId"/>
-      <Parameter name="value"/>
-      <Parameter name="adPreferenceId"/>
-  </SqlMethod>
-  <SqlMethod name="updateRange" type="preparedStatement" return="rowCount">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql><![CDATA[
-      UPDATE AD_SYSTEM SET UPDATED=now(), UPDATEDBY = ?, TAD_RECORDRANGE=TO_NUMBER(?), TAD_RECORDRANGE_INFO=TO_NUMBER(?), TAD_TRANSACTIONALRANGE=TO_NUMBER(?), TAD_THEME=?
-      WHERE AD_System_ID = '0'
-    ]]></Sql>
-      <Parameter name="adUserId"/>
-      <Parameter name="tadRecordrange"/>
-      <Parameter name="tadRecordrangeInfo"/>
-      <Parameter name="tadTransactionalrange"/>
-      <Parameter name="tadTheme"/>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -32,10 +32,6 @@
       ]]>
     </Sql>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql></Sql>
-  </SqlMethod>
   <SqlMethod name="selectOrganization" type="preparedStatement" return="multiple">
      <SqlMethodComment></SqlMethodComment>
      <Sql><![CDATA[
--- a/src/org/openbravo/erpCommon/ad_forms/Warehouse_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/Warehouse_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -24,18 +24,6 @@
 
 <SqlClass name="WarehouseData" package="org.openbravo.erpCommon.ad_forms">
    <SqlClassComment></SqlClassComment>
-   <SqlMethod name="select" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-        SELECT AD_ROLE_ORGACCESS.AD_ROLE_ID || '-' || M_Warehouse.AD_Client_ID as PADRE, M_Warehouse.M_WAREHOUSE_ID AS ID, 
-        M_Warehouse.Name AS Name 
-        FROM M_Warehouse, AD_ORG , AD_ROLE_ORGACCESS
-        WHERE M_Warehouse.AD_ORG_ID = AD_ORG.AD_ORG_ID
-        AND AD_ORG.AD_ORG_ID = AD_ROLE_ORGACCESS.AD_ORG_ID
-        AND M_Warehouse.IsActive='Y' 
-        ORDER BY AD_ROLE_ORGACCESS.AD_ROLE_ID, M_Warehouse.Name
-      </Sql>
-   </SqlMethod>
   <SqlMethod name="selectByRoleAndClient" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2010 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-
-
-
-
-<SqlClass name="DisplayHelpEditElementData" package="org.openbravo.erpCommon.ad_help">
-   <SqlClassComment></SqlClassComment>
-   <SqlMethod name="select" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_WINDOW_ID AS ID, NAME AS ORIGINALNAME, NAME, HELP
-        FROM AD_WINDOW
-        WHERE AD_WINDOW_ID = ?
-        AND ISACTIVE='Y'
-        ]]>
-      </Sql>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="selectTrl" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_WINDOW.AD_WINDOW_ID AS ID, AD_WINDOW.NAME AS ORIGINALNAME, 
-        (CASE WHEN AD_WINDOW_TRL.NAME IS NULL THEN '*' || AD_WINDOW.NAME ELSE AD_WINDOW_TRL.NAME END) AS NAME, AD_WINDOW_TRL.HELP
-        FROM AD_WINDOW left join AD_WINDOW_TRL on AD_WINDOW.AD_WINDOW_ID = AD_WINDOW_TRL.AD_WINDOW_ID
-                                              AND AD_WINDOW_TRL.AD_LANGUAGE = ?
-        WHERE AD_WINDOW.AD_WINDOW_ID = ?
-        AND AD_WINDOW.ISACTIVE= 'Y'        
-        ]]>
-      </Sql>
-        <Parameter name="adLanguage"/>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="selectTab" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_TAB_ID AS ID, NAME AS ORIGINALNAME, NAME, HELP
-        FROM AD_TAB
-        WHERE AD_TAB_ID = ?
-        AND ISACTIVE='Y'
-        ]]>
-      </Sql>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="selectTabTrl" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_TAB.AD_TAB_ID AS ID, AD_TAB.NAME AS ORIGINALNAME, 
-        (CASE WHEN AD_TAB_TRL.NAME IS NULL THEN '*' || AD_TAB.NAME ELSE AD_TAB_TRL.NAME END) AS NAME, AD_TAB_TRL.HELP
-        FROM AD_TAB left join AD_TAB_TRL on AD_TAB.AD_TAB_ID = AD_TAB_TRL.AD_TAB_ID 
-                                        AND AD_TAB_TRL.AD_LANGUAGE =?
-        WHERE AD_TAB.AD_TAB_ID = ?
-        AND AD_TAB.ISACTIVE = 'Y'
-        ]]>
-      </Sql>
-        <Parameter name="adLanguage"/>
-        <Parameter name="id"/>        
-   </SqlMethod>
-   <SqlMethod name="selectField" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_FIELD_ID AS ID, NAME AS ORIGINALNAME, NAME, HELP
-        FROM AD_FIELD
-        WHERE AD_FIELD_ID = ? 
-        AND ISACTIVE='Y'
-        ]]>
-      </Sql>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="selectFieldTrl" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_FIELD.AD_FIELD_ID AS ID, AD_FIELD.NAME AS ORIGINALNAME, 
-        (CASE WHEN AD_FIELD_TRL.NAME IS NULL THEN '*' || AD_FIELD.NAME ELSE AD_FIELD_TRL.NAME END) AS NAME, AD_FIELD_TRL.HELP
-        FROM AD_FIELD left join AD_FIELD_TRL on AD_FIELD.AD_FIELD_ID = AD_FIELD_TRL.AD_FIELD_ID 
-                                            AND AD_FIELD_TRL.AD_LANGUAGE = ?
-        WHERE AD_FIELD.AD_FIELD_ID = ?
-        AND AD_FIELD.ISACTIVE='Y'
-        ]]>
-      </Sql>
-        <Parameter name="adLanguage"/>
-        <Parameter name="id"/>      
-   </SqlMethod>
-   <SqlMethod name="selectElement" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_ELEMENT_ID AS ID, NAME AS ORIGINALNAME, NAME, HELP
-        FROM AD_ELEMENT
-        WHERE AD_ELEMENT_ID = ? 
-        AND ISACTIVE='Y'
-        ]]>
-      </Sql>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="selectElementTrl" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_ELEMENT.AD_ELEMENT_ID AS ID, AD_ELEMENT.NAME AS ORIGINALNAME, 
-        (CASE WHEN AD_ELEMENT_TRL.NAME IS NULL THEN '*' || AD_ELEMENT.NAME ELSE AD_ELEMENT_TRL.NAME END) AS NAME, AD_ELEMENT_TRL.HELP
-        FROM AD_ELEMENT left join AD_ELEMENT_TRL on AD_ELEMENT.AD_ELEMENT_ID = AD_ELEMENT_TRL.AD_ELEMENT_ID 
-                                                AND AD_ELEMENT_TRL.AD_LANGUAGE = ?
-        WHERE AD_ELEMENT.AD_ELEMENT_ID = ?
-        AND AD_ELEMENT.ISACTIVE='Y'
-        ]]>
-      </Sql>
-        <Parameter name="adLanguage"/>
-        <Parameter name="id"/>      
-   </SqlMethod>
-   <SqlMethod name="update" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        UPDATE AD_WINDOW SET NAME=?, HELP=? WHERE AD_WINDOW_ID=?
-        ]]>
-      </Sql>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="updateTrl" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        UPDATE AD_WINDOW_TRL SET NAME=?, HELP=?, updated=now(), updatEDBY = ? WHERE AD_WINDOW_ID=? AND AD_LANGUAGE=?
-        ]]>
-      </Sql>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-        <Parameter name="adUser"/>
-        <Parameter name="id"/>
-        <Parameter name="adLanguage"/>
-   </SqlMethod>
-   <SqlMethod name="updateTab" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        UPDATE AD_TAB SET NAME=?, HELP=? WHERE AD_TAB_ID=?
-        ]]>
-      </Sql>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="updateTabTrl" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        UPDATE AD_TAB_TRL SET NAME=?, HELP=?, updated=now(), updatEDBY = ? WHERE AD_TAB_ID=? AND AD_LANGUAGE=?
-        ]]>
-      </Sql>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-        <Parameter name="adUser"/>
-        <Parameter name="id"/>
-        <Parameter name="adLanguage"/>
-   </SqlMethod>
-   <SqlMethod name="updateField" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        UPDATE AD_FIELD SET NAME=?, HELP=? WHERE AD_FIELD_ID=?
-        ]]>
-      </Sql>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="updateFieldTrl" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        UPDATE AD_FIELD_TRL SET NAME=?, HELP=?, updated=now(), updatEDBY = ? WHERE AD_FIELD_ID=? AND AD_LANGUAGE=?
-        ]]>
-      </Sql>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-        <Parameter name="adUser"/>
-        <Parameter name="id"/>
-        <Parameter name="adLanguage"/>
-   </SqlMethod>
-
-   <SqlMethod name="updateElement" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        UPDATE AD_ELEMENT SET NAME=?, HELP=? WHERE AD_ELEMENT_ID=?
-        ]]>
-      </Sql>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="updateElementTrl" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        UPDATE AD_ELEMENT_TRL SET NAME=?, HELP=?, updated=now(), updatEDBY = ? WHERE AD_ELEMENT_ID=? AND AD_LANGUAGE=?
-        ]]>
-      </Sql>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-        <Parameter name="adUser"/>
-        <Parameter name="id"/>
-        <Parameter name="adLanguage"/>
-   </SqlMethod>
-
-
-
-
-
-
-   <SqlMethod name="insertTrl" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        INSERT INTO AD_WINDOW_TRL (AD_WINDOW_TRL_ID, AD_WINDOW_ID, AD_LANGUAGE, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, NAME, DESCRIPTION, HELP, ISTRANSLATED)
-        VALUES (get_uuid(), ?, ?, ?, ?, 'Y', now(), ?, now(), ?, ?, NULL, ?, 'Y')
-        ]]>
-      </Sql>
-        <Parameter name="adWindowId"/>
-        <Parameter name="adLanguage"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adOrgId"/>
-        <Parameter name="adUser"/>
-        <Parameter name="adUser"/>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-   </SqlMethod>
-   <SqlMethod name="insertTabTrl" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        INSERT INTO AD_TAB_TRL (AD_TAB_TRL_ID, AD_TAB_ID, AD_LANGUAGE, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, NAME, DESCRIPTION, HELP, ISTRANSLATED) 
-        VALUES (get_uuid(), ?, ?, ?, ?, 'Y', now(), ?, now(), ?, ?, NULL, ?, 'Y')
-        ]]>
-      </Sql>
-        <Parameter name="adTabId"/>
-        <Parameter name="adLanguage"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adOrgId"/>
-        <Parameter name="adUser"/>
-        <Parameter name="adUser"/>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-   </SqlMethod>
-   <SqlMethod name="insertFieldTrl" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        INSERT INTO AD_FIELD_TRL (AD_FIELD_TRL_ID, AD_FIELD_ID, AD_LANGUAGE, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, NAME, DESCRIPTION, HELP, ISTRANSLATED) 
-        VALUES (get_uuid(), ?, ?, ?, ?, 'Y', now(), ?, now(), ?, ?, NULL, ?, 'Y')
-        ]]>
-      </Sql>
-        <Parameter name="adFieldId"/>
-        <Parameter name="adLanguage"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adOrgId"/>
-        <Parameter name="adUser"/>
-        <Parameter name="adUser"/>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-   </SqlMethod>
-   <SqlMethod name="insertElementTrl" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        INSERT INTO AD_ELEMENT_TRL (AD_ELEMENT_TRL_ID, AD_ELEMENT_ID, AD_LANGUAGE, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, NAME, DESCRIPTION, HELP, ISTRANSLATED) 
-        VALUES (get_uuid(), ?, ?, ?, ?, 'Y', now(), ?, now(), ?, ?, NULL, ?, 'Y')
-        ]]>
-      </Sql>
-        <Parameter name="adFieldId"/>
-        <Parameter name="adLanguage"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adOrgId"/>
-        <Parameter name="adUser"/>
-        <Parameter name="adUser"/>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-   </SqlMethod>
-</SqlClass>
--- a/src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2010 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-
-
-
-
-<SqlClass name="DisplayHelpEditFieldData" package="org.openbravo.erpCommon.ad_help">
-   <SqlClassComment></SqlClassComment>
-   <SqlMethod name="select" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_WINDOW_ID AS ID, NAME AS ORIGINALNAME, NAME, HELP
-        FROM AD_WINDOW
-        WHERE AD_WINDOW_ID = ?
-        AND ISACTIVE='Y'
-        ]]>
-      </Sql>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="selectTrl" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_WINDOW.AD_WINDOW_ID AS ID, AD_WINDOW.NAME AS ORIGINALNAME, 
-        (CASE WHEN AD_WINDOW_TRL.NAME IS NULL THEN '*' || AD_WINDOW.NAME ELSE AD_WINDOW_TRL.NAME END) AS NAME, AD_WINDOW_TRL.HELP
-        FROM AD_WINDOW left join AD_WINDOW_TRL on AD_WINDOW.AD_WINDOW_ID = AD_WINDOW_TRL.AD_WINDOW_ID 
-                                               AND AD_WINDOW_TRL.AD_LANGUAGE = ?
-        WHERE AD_WINDOW.AD_WINDOW_ID = ?
-        AND AD_WINDOW.ISACTIVE= 'Y'        
-        ]]>
-      </Sql>
-        <Parameter name="adLanguage"/>
-        <Parameter name="id"/>     
-   </SqlMethod>
-   <SqlMethod name="selectTab" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_TAB_ID AS ID, NAME AS ORIGINALNAME, NAME, HELP
-        FROM AD_TAB
-        WHERE AD_TAB_ID = ?
-        AND ISACTIVE='Y'
-        ]]>
-      </Sql>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="selectTabTrl" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_TAB.AD_TAB_ID AS ID, AD_TAB.NAME AS ORIGINALNAME, 
-        (CASE WHEN AD_TAB_TRL.NAME IS NULL THEN '*' || AD_TAB.NAME ELSE AD_TAB_TRL.NAME END) AS NAME, AD_TAB_TRL.HELP
-        FROM AD_TAB left join AD_TAB_TRL on  AD_TAB.AD_TAB_ID = AD_TAB_TRL.AD_TAB_ID 
-                                         AND AD_TAB_TRL.AD_LANGUAGE =?
-        WHERE AD_TAB.AD_TAB_ID = ?
-        AND AD_TAB.ISACTIVE = 'Y'
-        ]]>
-      </Sql>
-        <Parameter name="adLanguage"/>
-        <Parameter name="id"/>     
-   </SqlMethod>
-   <SqlMethod name="selectField" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_FIELD_ID AS ID, NAME AS ORIGINALNAME, NAME, HELP
-        FROM AD_FIELD
-        WHERE AD_FIELD_ID = ? 
-        AND ISACTIVE='Y'
-        ]]>
-      </Sql>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="selectElement" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_COLUMN.AD_ELEMENT_ID AS ID, AD_FIELD.NAME AS ORIGINALNAME, AD_FIELD.NAME, AD_FIELD.HELP
-        FROM AD_COLUMN, AD_FIELD
-        WHERE AD_FIELD.AD_FIELD_ID = ? 
-        AND AD_FIELD.ISACTIVE='Y'
-        AND AD_FIELD.AD_COLUMN_ID = AD_COLUMN.AD_COLUMN_ID
-        ]]>
-      </Sql>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="selectElementTrl" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_ELEMENT.AD_ELEMENT_ID AS ID, AD_ELEMENT.NAME AS ORIGINALNAME, 
-        (CASE WHEN AD_ELEMENT_TRL.NAME IS NULL THEN '*' || AD_ELEMENT.NAME ELSE AD_ELEMENT_TRL.NAME END) AS NAME, AD_ELEMENT_TRL.HELP
-        FROM AD_ELEMENT left join AD_ELEMENT_TRL on AD_ELEMENT.AD_ELEMENT_ID = AD_ELEMENT_TRL.AD_ELEMENT_ID 
-                                                AND AD_ELEMENT_TRL.AD_LANGUAGE = ?
-        WHERE AD_ELEMENT.AD_ELEMENT_ID = ?
-        AND AD_ELEMENT.ISACTIVE='Y'
-        ]]>
-      </Sql>
-       <Parameter name="adLanguage"/>
-        <Parameter name="id"/>
-       </SqlMethod>
-   <SqlMethod name="selectFieldTrl" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT AD_FIELD.AD_FIELD_ID AS ID, AD_FIELD.NAME AS ORIGINALNAME, 
-        (CASE WHEN AD_FIELD_TRL.NAME IS NULL THEN '*' || AD_FIELD.NAME ELSE AD_FIELD_TRL.NAME END) AS NAME, AD_FIELD_TRL.HELP
-        FROM AD_FIELD left join AD_FIELD_TRL on AD_FIELD.AD_FIELD_ID = AD_FIELD_TRL.AD_FIELD_ID 
-                                            AND AD_FIELD_TRL.AD_LANGUAGE = ?
-        WHERE AD_FIELD.AD_FIELD_ID = ?
-        AND AD_FIELD.ISACTIVE='Y'
-        ]]>
-      </Sql>
-        <Parameter name="adLanguage"/>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="update" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        UPDATE AD_WINDOW SET NAME=?, HELP=? WHERE AD_WINDOW_ID=?
-        ]]>
-      </Sql>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="updateTrl" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        UPDATE AD_WINDOW_TRL SET NAME=?, HELP=?, updated=now(), updatEDBY = ? WHERE AD_WINDOW_ID=? AND AD_LANGUAGE=?
-        ]]>
-      </Sql>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-        <Parameter name="adUser"/>
-        <Parameter name="id"/>
-        <Parameter name="adLanguage"/>
-   </SqlMethod>
-   <SqlMethod name="updateTab" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        UPDATE AD_TAB SET NAME=?, HELP=? WHERE AD_TAB_ID=?
-        ]]>
-      </Sql>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="updateTabTrl" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        UPDATE AD_TAB_TRL SET NAME=?, HELP=?, updated=now(), updatEDBY = ? WHERE AD_TAB_ID=? AND AD_LANGUAGE=?
-        ]]>
-      </Sql>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-        <Parameter name="adUser"/>
-        <Parameter name="id"/>
-        <Parameter name="adLanguage"/>
-   </SqlMethod>
-   <SqlMethod name="updateField" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        UPDATE AD_FIELD SET NAME=?, HELP=? WHERE AD_FIELD_ID=?
-        ]]>
-      </Sql>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-        <Parameter name="id"/>
-   </SqlMethod>
-   <SqlMethod name="updateFieldTrl" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        UPDATE AD_FIELD_TRL SET NAME=?, HELP=?, updated=now(), updatEDBY = ? WHERE AD_FIELD_ID=? AND AD_LANGUAGE=?
-        ]]>
-      </Sql>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-        <Parameter name="adUser"/>
-        <Parameter name="id"/>
-        <Parameter name="adLanguage"/>
-   </SqlMethod>
-
-
-
-
-
-
-   <SqlMethod name="insertTrl" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        INSERT INTO AD_WINDOW_TRL (AD_WINDOW_TRL_ID, AD_WINDOW_ID, AD_LANGUAGE, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, NAME, DESCRIPTION, HELP, ISTRANSLATED)
-        VALUES (get_uuid(), ?, ?, ?, ?, 'Y', now(), ?, now(), ?, ?, NULL, ?, 'Y')
-        ]]>
-      </Sql>
-        <Parameter name="adWindowId"/>
-        <Parameter name="adLanguage"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adOrgId"/>
-        <Parameter name="adUser"/>
-        <Parameter name="adUser"/>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-   </SqlMethod>
-   <SqlMethod name="insertTabTrl" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        INSERT INTO AD_TAB_TRL (AD_TAB_TRL_ID, AD_TAB_ID, AD_LANGUAGE, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, NAME, DESCRIPTION, HELP, ISTRANSLATED) 
-        VALUES (get_uuid(), ?, ?, ?, ?, 'Y', now(), ?, now(), ?, ?, NULL, ?, 'Y')
-        ]]>
-      </Sql>
-        <Parameter name="adTabId"/>
-        <Parameter name="adLanguage"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adOrgId"/>
-        <Parameter name="adUser"/>
-        <Parameter name="adUser"/>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-   </SqlMethod>
-   <SqlMethod name="insertFieldTrl" type="preparedStatement" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        INSERT INTO AD_FIELD_TRL (AD_FIELD_TRL_ID, AD_FIELD_ID, AD_LANGUAGE, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, NAME, DESCRIPTION, HELP, ISTRANSLATED) 
-        VALUES (get_uuid(), ?, ?, ?, ?, 'Y', now(), ?, now(), ?, ?, NULL, ?, 'Y')
-        ]]>
-      </Sql>
-        <Parameter name="adFieldId"/>
-        <Parameter name="adLanguage"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adOrgId"/>
-        <Parameter name="adUser"/>
-        <Parameter name="adUser"/>
-        <Parameter name="name"/>
-        <Parameter name="help"/>
-   </SqlMethod>
-</SqlClass>
--- a/src/org/openbravo/erpCommon/ad_process/AlertProcess_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_process/AlertProcess_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -51,15 +51,6 @@
     ]]></Sql>
    </SqlMethod>
    
-   <SqlMethod name="selectAlert" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-          SELECT * 
-            FROM (SELECT '' AS AD_CLIENT_ID, '' AS AD_ORG_ID, TO_DATE(NULL) AS CREATED, '' AS CREATEDBY,'' AS UPDATED,'' AS UPDATEDBY,'' AS RECORD_ID, '' AS REFERENCEKEY_ID, '' AS DESCRIPTION, '' AS ISACTIVE, '' AS AD_USER_ID, '' AS AD_ROLE_ID FROM DUAL) AAA 
-      ]]></Sql>
-      <Parameter name="sql" type="replace" optional="true" after="FROM (" text="SELECT '' AS AD_CLIENT_ID, '' AS AD_ORG_ID, TO_DATE(NULL) AS CREATED, '' AS CREATEDBY,'' AS UPDATED,'' AS UPDATEDBY,'' AS RECORD_ID, '' AS REFERENCEKEY_ID, '' AS DESCRIPTION, '' AS ISACTIVE, '' AS AD_USER_ID, '' AS AD_ROLE_ID FROM DUAL"/>
-   </SqlMethod>
-   
    <SqlMethod name="selectSQL" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
@@ -80,40 +71,6 @@
     <Parameter name="adClientId"/>
    </SqlMethod>
 
-  <SqlMethod name="InsertAlert" type="preparedStatement" return="rowcount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        INSERT INTO AD_ALERT
-        (AD_ALERT_ID, AD_CLIENT_ID, AD_ORG_ID,
-         ISACTIVE, CREATED, CREATEDBY, 
-         UPDATED, UPDATEDBY, 
-         AD_ALERTRULE_ID, RECORD_ID, REFERENCEKEY_ID, 
-         DESCRIPTION, AD_USER_ID, AD_ROLE_ID,
-         STATUS)
-        VALUES
-         (?,?,?,
-          'Y',TO_DATE(?),?,
-          now(),0,
-          ?,?,?,
-          ?,?,?,
-          'NEW')
-    ]]></Sql>
-    <Parameter name="alertId"/>
-    <Parameter name="clientId"/>
-    <Parameter name="orgId"/>
-    
-    <Parameter name="created"/>
-    <Parameter name="createdBy"/>
-    
-    <Parameter name="ruleId"/>
-    <Parameter name="recordId"/>
-    <Parameter name="referenceKey"/>
-    
-    <Parameter name="description"/>
-    <Parameter name="user"/>
-    <Parameter name="role"/>
-   </SqlMethod>
-   
    <SqlMethod name="updateAlert" type="preparedStatement" return="rowcount"> 
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
--- a/src/org/openbravo/erpCommon/ad_process/ApplyModules_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2008-2010 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-
-<SqlClass name="ApplyModulesData" package="org.openbravo.erpCommon.ad_process">
-  <SqlMethod name="selectUnappliedModules" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-         SELECT JAVAPACKAGE AS NAME
-           FROM AD_MODULE M
-          WHERE ISACTIVE='Y'
-            AND (STATUS='I' OR STATUS='U' OR STATUS='P')  
-            AND NOT EXISTS (SELECT 1 
-                              FROM AD_MODULE_INSTALL
-                             WHERE AD_MODULE_ID = M.AD_MODULE_ID)
-          UNION
-          SELECT JAVAPACKAGE AS NAME
-           FROM AD_MODULE_INSTALL         
-          ]]>
-      </Sql>
-  </SqlMethod>
-  
-  <SqlMethod name="isUpdatingCoreOrTemplate" type="preparedStatement" return="boolean">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-         SELECT count(*) as NAME FROM
-            ((SELECT 1  
-                FROM AD_MODULE
-                WHERE (STATUS='I' OR STATUS='P')      
-               AND (AD_MODULE_ID = '0' OR TYPE='T'))
-            UNION
-            (SELECT 1
-                FROM AD_MODULE_INSTALL
-                WHERE (STATUS='I' OR STATUS='P')      
-               AND (AD_MODULE_ID = '0' OR TYPE='T'))) q
-          ]]>
-      </Sql>
-  </SqlMethod>
-  
-  <SqlMethod name="compileCompleteNeeded" type="preparedStatement" return="boolean">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-         SELECT count(*) as NAME
-           FROM AD_MODULE
-          WHERE ((STATUS='I' OR STATUS='P')      
-                 AND TYPE = 'T')
-             OR (STATUS='U')
-          ]]>
-      </Sql>
-  </SqlMethod>
-  
-  <SqlMethod name="selectUninstalledModules" type="preparedStatement" return="boolean">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-         SELECT count(*) as NAME
-           FROM AD_MODULE
-          WHERE STATUS='U'           
-          ]]>
-      </Sql>
-  </SqlMethod>
-  
-  <SqlMethod name="getHelp" type="preparedStatement" return="string">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-         SELECT COALESCE(T.HELP, P.HELP) AS NAME
-           FROM AD_PROCESS P LEFT JOIN AD_PROCESS_TRL T 
-                                       ON T.AD_PROCESS_ID = P.AD_PROCESS_ID
-                                      AND AD_LANGUAGE = ?
-          WHERE P.AD_PROCESS_ID = 'BDB3B6FCA0AB453DB4E83503BAB82470'
-           
-          ]]>
-      </Sql>
-      <Parameter name="adLanguage"/>
-  </SqlMethod>
-</SqlClass>
--- a/src/org/openbravo/erpCommon/ad_process/CreateAccountingReport_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_process/CreateAccountingReport_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -306,24 +306,6 @@
     <Parameter name="adAccountingrptElementId"/>
   </SqlMethod>
 
-  <SqlMethod name="selectPeriod" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-      SELECT AD_REF_LIST.AD_REF_LIST_ID AS ID, CASE ? WHEN 'en_US' THEN AD_REF_LIST.NAME ELSE AD_REF_LIST_TRL.NAME END AS NAME
-	   FROM AD_REF_LIST, AD_REF_LIST_TRL
-	   WHERE AD_REF_LIST.AD_REF_LIST_ID = AD_REF_LIST_TRL.AD_REF_LIST_ID
-	   AND AD_REF_LIST.AD_CLIENT_ID IN ('1')
-	   AND AD_REF_LIST.AD_ORG_ID IN ('1')
-	   AND AD_REF_LIST.AD_REFERENCE_ID = ?
-      ]]>
-    </Sql>
-    <Parameter name="adLanguage"/>
-    <Parameter name="adOrgClient" type="replace" optional="true" after="AND AD_REF_LIST.AD_CLIENT_ID IN (" text="'1'"/>
-    <Parameter name="adUserClient" type="replace" optional="true" after="AND AD_REF_LIST.AD_ORG_ID IN (" text="'1'"/>
-    <Parameter name="adAccountingrptElementId"/>
-  </SqlMethod>
-
   <SqlMethod name="selectCombo" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_process/CreateCashFlowStatement_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_process/CreateCashFlowStatement_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -233,11 +233,6 @@
     <Parameter name="payment"/>
   </SqlMethod>
 
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
-
   <SqlMethod name="insertStatements" type="preparedStatement" connection="true" return="rowCount">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/ad_process/CreateTaxReport_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_process/CreateTaxReport_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -112,17 +112,6 @@
     <Parameter name="processId"/>
   </SqlMethod>
 
-  <SqlMethod name="selectFormat" type="preparedStatement" return="String">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-      select TO_CHAR(TO_DATE(?), TO_CHAR(?)) from dual
-      ]]>
-    </Sql>
-    <Parameter name="quarter"/>
-    <Parameter name="dateFormat"/>
-  </SqlMethod>
-
   <SqlMethod name="selectTax" type="preparedStatement" return="String">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_process/ExpenseAPInvoice_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_process/ExpenseAPInvoice_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -50,11 +50,6 @@
     <Parameter name="cBpartnerId" optional="true" after="AND stl.C_InvoiceLine_ID IS NULL"><![CDATA[ AND st.C_BPartner_ID = ?]]></Parameter>
   </SqlMethod>
 
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment>Create a registry</SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
-
   <SqlMethod name="selectInvoiceHeader" type="preparedStatement" connection="true" return="String" default="">
     <SqlMethodComment>Select for relation</SqlMethodComment>
     <Sql><![CDATA[
@@ -192,27 +187,6 @@
     <Parameter name="adOrgId"/>
   </SqlMethod>
   
-  <SqlMethod name="cDoctypeId" type="preparedStatement" return="string" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-     SELECT C_DocTypeInvoice_ID
-     FROM C_DOCTYPE
-     WHERE C_DocType_ID = ?
-    ]]>
-    </Sql>
-  <Parameter name="cDoctypeId"/>
-  </SqlMethod>
-  <SqlMethod name="bPartnerDescription" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-     <Sql>
-     <![CDATA[
-       SELECT NAME FROM C_BPARTNER
-       WHERE C_BPARTNER_ID = ?
-    ]]></Sql>
-    <Parameter name="cBpartnerId"/>
-  </SqlMethod>
-
   <SqlMethod name="bPartnerLocation" type="preparedStatement" return="String" default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
@@ -237,17 +211,6 @@
     <Parameter name="cBpartnerId"/>
   </SqlMethod>
 
-  <SqlMethod name="salesrepId" type="preparedStatement" return="String" default="">
-    <SqlMethodComment>nt></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-      SELECT MAX(AD_USER_ID)
-      FROM AD_USER
-      WHERE C_BPARTNER_ID = ?
-     ]]></Sql>
-      <Parameter name="cBpartnerId"/>
-  </SqlMethod>
-
   <SqlMethod name="paymentrule" type="preparedStatement" return="String" default="">
     <SqlMethodComment>nt></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_process/PrintInvoices_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2010 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-
-
-
-
-<SqlClass name="PrintInvoicesData" package="org.openbravo.erpCommon.ad_process">
-  <SqlClassComment></SqlClassComment>
-  <SqlMethod name="select" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT 1 AS HELP FROM DUAL
-     ]]></Sql>
-  </SqlMethod>
-
-  <SqlMethod name="selectHelp" type="preparedStatement" return="string" default="">
-  <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT HELP
-      FROM AD_PROCESS
-      WHERE AD_PROCESS_ID = ?
-     ]]></Sql>
-    <Parameter name="adProcessId"/>
-  </SqlMethod>
-
-  <!--SqlMethod name="selectTreeNode" type="preparedStatement" return="string" default="">
-  <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT MAX(AD_TREE_ID) AS ADTREEID
-      FROM AD_TREE
-      WHERE TREETYPE = 'OO'
-      AND AD_CLIENT_ID IN ('1')
-     ]]></Sql>
-    <Parameter name="adUserClient" type="replace" optional="true" after="AND AD_CLIENT_ID IN (" text="'1'"/>
-  </SqlMethod-->
-
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
-</SqlClass>
--- a/src/org/openbravo/erpCommon/ad_process/ProcedureProcess_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2010 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-<SqlClass name="ProcedureProcessData" package="org.openbravo.erpCommon.ad_process">
-   <SqlMethod name="selectErrorMessage" type="preparedStatement" return="single">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-      	SELECT Errormsg 
-      	FROM AD_Pinstance
-      	WHERE AD_Pinstance_ID = ?
-    ]]></Sql>
-    <Parameter name="pinstanceId"/>
-   </SqlMethod>
-</SqlClass>
\ No newline at end of file
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -76,16 +76,6 @@
         <Parameter name="grp"/>
    </SqlMethod>
    
-   <SqlMethod name="groupTitle" type="preparedStatement" return="string">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT name
-        FROM C_ACCT_RPT_GROUP
-        WHERE C_ACCT_RPT_GROUP_ID = ?
-      ]]></Sql>
-        <Parameter name="grp"/>
-   </SqlMethod>
-   
    <SqlMethod name="rptTitle" type="preparedStatement" return="string">
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
@@ -96,38 +86,6 @@
         <Parameter name="rpt"/>
    </SqlMethod>
    
-   
-   
-   
-  <SqlMethod name="fieldtitle" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT m.Name 
-        FROM C_ElementValue m
-        WHERE m.C_ElementValue_ID = ?
-      ]]></Sql>
-        <Parameter name="cElementvalueId"/>
-  </SqlMethod>
-  <SqlMethod name="fieldtitleTrl" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT COALESCE(mt.Name, m.Name) AS NAME 
-        FROM C_ElementValue m left join C_ElementValue_Trl mt on m.C_ElementValue_ID = mt.C_ElementValue_ID 
-                                                             AND mt.AD_Language  = ?
-        WHERE m.C_ElementValue_ID = ? 
-      ]]></Sql>
-        <Parameter name="adLanguage"/>
-        <Parameter name="cElementvalueId"/>     
-  </SqlMethod>
-  <SqlMethod name="selectElement" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT m.AccountType 
-        FROM C_ElementValue m
-        WHERE m.C_ElementValue_ID = ?
-      ]]></Sql>
-        <Parameter name="cElementvalueId"/>
-  </SqlMethod>
   <SqlMethod name="treeOrg" type="preparedStatement" return="string">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
@@ -180,128 +138,6 @@
         <Parameter name="year" optional="true" type="replace" after="AND C_YEAR.YEAR IN (" text="'1'"/>
         <Parameter name="adOrgId" optional="true" type="replace" after="AND FACT_ACCT.AD_ORG_ID IN (" text="'1'"/>
    </SqlMethod>
-   <SqlMethod name="checkFiscalYears" type="preparedStatement" return="multiple" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT CASE WHEN C.CLOSE_FACT_ACCT_GROUP_ID IS NULL THEN 'N' ELSE 'Y' END || SELECTED.C_YEAR_ID AS ID,
-          C_YEAR.YEAR AS NAME
-        FROM C_PERIOD PREVIOUS LEFT JOIN AD_ORG_CLOSING C ON C.C_YEAR_ID = PREVIOUS.C_YEAR_ID, C_PERIOD SELECTED, C_YEAR
-        WHERE PREVIOUS.AD_CLIENT_ID = ?
-          AND SELECTED.AD_CLIENT_ID = ?
-          AND SELECTED.ISACTIVE = 'Y'
-          AND C_YEAR.ISACTIVE = 'Y'
-          AND PREVIOUS.ENDDATE = SELECTED.STARTDATE-1
-          AND PREVIOUS.ENDDATE IN (
-            SELECT MAX(P.ENDDATE) AS END
-            FROM C_PERIOD P, C_YEAR Y
-            WHERE P.AD_CLIENT_ID = ?
-              AND Y.C_YEAR_ID = P.C_YEAR_ID
-            GROUP BY Y.YEAR, P.C_YEAR_ID
-          )
-          AND C_YEAR.C_YEAR_ID = SELECTED.C_YEAR_ID
-        UNION
-        SELECT 'M'||Y.C_YEAR_ID AS ID, Y.YEAR AS NAME
-        FROM C_PERIOD P, C_YEAR Y
-        WHERE P.AD_CLIENT_ID=?
-          AND P.C_YEAR_ID = Y.C_YEAR_ID
-          AND P.ISACTIVE = 'Y'
-          AND Y.ISACTIVE = 'Y'
-          AND P.STARTDATE-1 NOT IN (
-                SELECT ENDDATE
-                FROM C_PERIOD
-                WHERE C_PERIOD.AD_CLIENT_ID = ?
-          )
-        ORDER BY NAME DESC
-        ]]></Sql>
-        <Parameter name="adClientId"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adClientId"/>
-   </SqlMethod>
-   <SqlMethod name="checkFiscalYearsGenLed" type="preparedStatement" return="multiple" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT CASE WHEN C.CLOSE_FACT_ACCT_GROUP_ID IS NULL THEN 'N' ELSE 'Y' END || SELECTED.C_YEAR_ID AS ID,
-          C_YEAR.YEAR AS NAME
-        FROM C_PERIOD PREVIOUS LEFT JOIN AD_ORG_CLOSING C ON C.C_YEAR_ID = PREVIOUS.C_YEAR_ID, C_PERIOD SELECTED, C_YEAR,
-          AD_ORG_ACCTSCHEMA OAS
-        WHERE PREVIOUS.AD_CLIENT_ID = ?
-          AND SELECTED.AD_CLIENT_ID = ?
-          AND SELECTED.ISACTIVE = 'Y'
-          AND C_YEAR.ISACTIVE = 'Y'
-          AND PREVIOUS.ENDDATE = SELECTED.STARTDATE-1
-          AND PREVIOUS.ENDDATE IN (
-            SELECT MAX(P.ENDDATE) AS END
-            FROM C_PERIOD P, C_YEAR Y
-            WHERE P.AD_CLIENT_ID = ?
-              AND Y.C_YEAR_ID = P.C_YEAR_ID
-            GROUP BY Y.YEAR, P.C_YEAR_ID
-          )
-          AND C_YEAR.C_YEAR_ID = SELECTED.C_YEAR_ID
-          AND C.AD_ORG_ACCTSCHEMA_ID = OAS.AD_ORG_ACCTSCHEMA_ID
-          AND OAS.C_ACCTSCHEMA_ID = ?
-        UNION
-        SELECT 'M'||Y.C_YEAR_ID AS ID, Y.YEAR AS NAME
-        FROM C_PERIOD P, C_YEAR Y
-        WHERE P.AD_CLIENT_ID=?
-          AND P.C_YEAR_ID = Y.C_YEAR_ID
-          AND P.ISACTIVE = 'Y'
-          AND Y.ISACTIVE = 'Y'
-          AND P.STARTDATE-1 NOT IN (
-                SELECT ENDDATE
-                FROM C_PERIOD
-                WHERE C_PERIOD.AD_CLIENT_ID = ?
-          )
-        ORDER BY NAME DESC
-        ]]></Sql>
-        <Parameter name="adClientId"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="cAcctschemaId"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adClientId"/>
-   </SqlMethod>
-   <SqlMethod name="previousYear" type="preparedStatement" return="multiple" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT A.ID, A.NAME, Y.YEAR AS PREVIOUS_YEAR, Y.C_YEAR_ID AS PREVIOUS_YEAR_ID
-        FROM (
-                SELECT MIN(P.STARTDATE) AS BEGINING, MAX(P.ENDDATE) AS END, Y.YEAR AS NAME, Y.C_YEAR_ID AS ID
-                FROM C_PERIOD P, C_YEAR Y
-                WHERE P.AD_CLIENT_ID = ?
-                  AND Y.C_YEAR_ID = P.C_YEAR_ID
-                GROUP BY Y.C_YEAR_ID, Y.YEAR
-             ) A, C_YEAR Y, C_PERIOD P
-        WHERE P.ENDDATE = A.BEGINING-1
-          AND Y.AD_CLIENT_ID = ?
-          AND P.AD_CLIENT_ID = ?
-          AND P.C_YEAR_ID = Y.C_YEAR_ID
-        ]]></Sql>
-        <Parameter name="adClientId"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adClientId"/>
-   </SqlMethod>
-   <SqlMethod name="startEndYear" type="preparedStatement" return="multiple" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-          SELECT MIN(P.STARTDATE) AS BEGINING, MAX(P.ENDDATE) AS END, Y.YEAR AS NAME, Y.C_YEAR_ID AS ID
-          FROM C_PERIOD P, C_YEAR Y
-          WHERE P.AD_CLIENT_ID=?
-            AND Y.C_YEAR_ID = P.C_YEAR_ID
-            AND Y.C_YEAR_ID IN ('1')
-          GROUP BY Y.C_YEAR_ID, Y.YEAR
-        ]]></Sql>
-        <Parameter name="adClientId"/>
-        <Parameter name="cYearId" optional="true" type="replace" after="AND Y.C_YEAR_ID IN (" text="'1'"/>
-   </SqlMethod>
-   <SqlMethod name="selectCalculateOpening" type="preparedStatement" return="String" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-          SELECT COALESCE(REPORTTYPE,'N') FROM C_ACCT_RPT WHERE C_ACCT_RPT_ID=?
-        ]]></Sql>
-        <Parameter name="cAcctRptId"/>
-   </SqlMethod>
    <SqlMethod name="selectOrgsDouble" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
--- a/src/org/openbravo/erpCommon/ad_reports/InoutEdition_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/InoutEdition_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -86,8 +86,4 @@
     <Parameter name="issotrx"/>
   </SqlMethod>
   
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/InvoiceCustomerEdition_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/InvoiceCustomerEdition_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -77,10 +77,6 @@
     <Parameter name="salesRep" optional="true" after="AND 1=1"><![CDATA[ AND C_PROJECT.SALESREP_ID = ?]]></Parameter>
     <Parameter name="productId" optional="true" type="argument" after="AND 1=1"><![CDATA[ AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment>Create a registry</SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
   <SqlMethod name="selectProject" type="preparedStatement" return="String" default="">
     <SqlMethodComment>Standard Precision</SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/InvoiceEdition_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/InvoiceEdition_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -125,8 +125,4 @@
     <Parameter name="cProjectId"/>
     <Parameter name="issotrx"/>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/MInOutTraceReports_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/MInOutTraceReports_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -50,11 +50,6 @@
     <Parameter name="adUserClient" type="replace" optional="true" after="AND t.AD_CLIENT_ID IN (" text="'1'"/>
   </SqlMethod>
 
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
-
   <SqlMethod name="selectChilds" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/Organization_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/Organization_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -43,13 +43,6 @@
     <Parameter name="adOrgClient"   type="replace" optional="true"  after="AD_OrgInfo.AD_Org_ID IN (" text="'1'"></Parameter>
   </SqlMethod>
 
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment>Create a registry</SqlMethodComment>
-      <Sql></Sql>
-    <Parameter name="adOrgId" id="paramKeyParent"></Parameter>
-<Parameter name="adClientId"></Parameter><Parameter name="isactive"></Parameter><Parameter name="cLocationId"></Parameter><Parameter name="cLocationIdr"></Parameter><Parameter name="duns"></Parameter><Parameter name="taxid"></Parameter><Parameter name="paGoalId"></Parameter><Parameter name="cBpartnerId"></Parameter><Parameter name="cBpartnerIdr"></Parameter><Parameter name="logo"></Parameter><Parameter name="referenceOrder"></Parameter>
-   </SqlMethod>
-
    <SqlMethod name="selectOrgName" type="preparedStatement" return="string" default="">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportCashFlow_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportCashFlow_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -155,41 +155,6 @@
     <Parameter name="processId"/>
   </SqlMethod>
 
-  <SqlMethod name="selectMin" type="preparedStatement" return="String">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-      SELECT MIN(VALUE) AS VALUE
-      FROM AD_MONTH
-      WHERE QUARTER = ?
-      ]]>
-    </Sql>
-    <Parameter name="quarter"/>
-  </SqlMethod>
-
-  <SqlMethod name="selectMax" type="preparedStatement" return="String">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-      SELECT MAX(VALUE) AS VALUE
-      FROM AD_MONTH
-      WHERE QUARTER = ?
-      ]]>
-    </Sql>
-    <Parameter name="quarter"/>
-  </SqlMethod>
-
-  <SqlMethod name="lastDay" type="preparedStatement" return="String">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-      select TO_CHAR(last_day(TO_DATE(?)), to_char(?)) from dual
-      ]]>
-    </Sql>
-    <Parameter name="quarter"/>
-    <Parameter name="dateFormat"/>
-  </SqlMethod>
-
   <SqlMethod name="selectFormat" type="preparedStatement" return="String">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
@@ -263,24 +228,6 @@
     <Parameter name="adAccountingrptElementId"/>
   </SqlMethod>
 
-  <SqlMethod name="selectPeriod" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-      SELECT AD_REF_LIST.AD_REF_LIST_ID AS ID, CASE ? WHEN 'en_US' THEN AD_REF_LIST.NAME ELSE AD_REF_LIST_TRL.NAME END AS NAME
-	   FROM AD_REF_LIST, AD_REF_LIST_TRL
-	   WHERE AD_REF_LIST.AD_REF_LIST_ID = AD_REF_LIST_TRL.AD_REF_LIST_ID
-	   AND AD_REF_LIST.AD_CLIENT_ID IN ('1')
-	   AND AD_REF_LIST.AD_ORG_ID IN ('1')
-	   AND AD_REF_LIST.AD_REFERENCE_ID = ?
-      ]]>
-    </Sql>
-    <Parameter name="adLanguage"/>
-    <Parameter name="adOrgClient" type="replace" optional="true" after="AND AD_REF_LIST.AD_CLIENT_ID IN (" text="'1'"/>
-    <Parameter name="adUserClient" type="replace" optional="true" after="AND AD_REF_LIST.AD_ORG_ID IN (" text="'1'"/>
-    <Parameter name="adAccountingrptElementId"/>
-  </SqlMethod>
-
   <SqlMethod name="selectCombo" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportCashJR_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportCashJR_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -76,8 +76,4 @@
     <Parameter name="parDateTo" optional="true" after="AND 2=2"><![CDATA[AND C_CASH.STATEMENTDATE < TO_DATE(?)]]></Parameter>
     <Parameter name="cashBook" optional="true" after="AND 2=2"><![CDATA[AND C_CASHBOOK.C_CASHBOOK_ID = ?]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournalDetail_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournalDetail_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -62,9 +62,4 @@
     <Parameter name="DPid"/>
     <Parameter name="acctSchema"/>
   </SqlMethod>
-  
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -185,10 +185,6 @@
     <Parameter name="producttype" optional="true" after="AND 2=2"><![CDATA[AND M_PRODUCT.PRODUCTTYPE = ?]]></Parameter>
     <Parameter name="orderby" type="replace" optional="true" after="GROUP BY NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, NIVEL6, NIVEL7, NIVEL8, NIVEL9, NIVEL10" text=", 1"/>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 
   <SqlMethod name="selectCount" type="preparedStatement" return="string" default="0">
     <SqlMethodComment></SqlMethodComment>
@@ -367,43 +363,6 @@
     <Parameter name="dateTo" optional="true" after="2=2"><![CDATA[AND C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
   </SqlMethod>
 
-  <SqlMethod name="selectTotal" type="preparedStatement" return="String" default="0">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT COALESCE(SUM(LINENETAMT), 0) AS LINENETAMT
-      FROM C_INVOICE left join AD_USER   on C_INVOICE.SALESREP_ID = AD_USER.AD_USER_ID 
-                     left join C_PROJECT on C_INVOICE.C_PROJECT_ID = C_PROJECT.C_PROJECT_ID,
-           C_INVOICELINE left join M_PRODUCT on C_INVOICELINE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
-                         left join C_UOM     on C_INVOICELINE.C_UOM_ID = C_UOM.C_UOM_ID
-                         left join M_PRODUCT_CATEGORY on M_PRODUCT.M_PRODUCT_CATEGORY_ID = M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
-                         left join M_INOUTLINE on C_INVOICELINE.M_INOUTLINE_ID = M_INOUTLINE.M_INOUTLINE_ID
-                         left join  M_INOUT ON M_INOUTLINE.M_INOUT_ID = M_INOUT.M_INOUT_ID,
-           C_BPARTNER, C_BP_GROUP, AD_ORG
-      WHERE C_INVOICE.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
-      AND C_BPARTNER.C_BP_GROUP_ID = C_BP_GROUP.C_BP_GROUP_ID
-      AND C_INVOICE.C_INVOICE_ID = C_INVOICELINE.C_INVOICE_ID
-      AND C_INVOICE.AD_ORG_ID = AD_ORG.AD_ORG_ID
-      AND C_INVOICE.ISSOTRX = 'Y'
-      AND C_INVOICE.PROCESSED = 'Y'
-      AND C_INVOICE.AD_ORG_ID IN ('1')
-      AND C_INVOICE.AD_CLIENT_ID IN ('7')
-      AND 1=1
-     ]]></Sql>
-    <Parameter name="adOrgId" optional="true" type="replace" after="AND C_INVOICE.AD_ORG_ID IN (" text="'1'"/>
-    <Parameter name="adUserClient" type="replace" optional="true" after="AND C_INVOICE.AD_CLIENT_ID IN (" text="'7'"/>
-    <Parameter name="dateFrom" optional="true" after="AND 1=1"><![CDATA[AND C_INVOICE.DATEINVOICED >= to_date(?)]]></Parameter>
-    <Parameter name="dateTo" optional="true" after="AND 1=1"><![CDATA[AND C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
-    <Parameter name="cBpartnerGroupId" optional="true" after="AND 1=1"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
-    <Parameter name="cBpartnerId" optional="true" type="argument" after="AND 1=1"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
-    <Parameter name="mProductCategoryId" optional="true" after="AND 1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
-    <Parameter name="mProductId" optional="true" type="argument" after="AND 1=1"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
-    <Parameter name="salesrepId" optional="true" after="AND 1=1"><![CDATA[AND C_INVOICE.SALESREP_ID = ?]]></Parameter>
-    <Parameter name="partnerSalesrepId" optional="true" after="AND 1=1"><![CDATA[AND C_BPARTNER.SALESREP_ID = ?]]></Parameter>
-    <Parameter name="cProjectId" optional="true" after="AND 1=1"><![CDATA[AND C_PROJECT.C_PROJECT_ID = ?]]></Parameter>
-    <Parameter name="producttype" optional="true" after="AND 1=1"><![CDATA[AND M_PRODUCT.PRODUCTTYPE = ?]]></Parameter>
-  </SqlMethod>
-
   <SqlMethod name="selectProject" type="preparedStatement" return="String" default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
@@ -448,17 +407,6 @@
     <Parameter name="mWarehouseId"/>
   </SqlMethod>
 
-  <SqlMethod name="selectEntity" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT AD_CLIENT.NAME
-      FROM AD_CLIENT
-      WHERE AD_CLIENT.AD_CLIENT_ID = ?
-     ]]></Sql>
-    <Parameter name="adClientId"/>
-  </SqlMethod>
-
   <SqlMethod name="selectProducttype" type="preparedStatement" return="String" default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_legacy_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_legacy_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -150,10 +150,6 @@
     <Parameter name="producttype" optional="true" after="AND 2=2"><![CDATA[AND M_PRODUCT.PRODUCTTYPE = ?]]></Parameter>
     <Parameter name="orderby" type="replace" optional="true" after="GROUP BY NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, NIVEL6, NIVEL7, NIVEL8, NIVEL9, NIVEL10" text=", 1"/>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 
   <SqlMethod name="selectCount" type="preparedStatement" return="string" default="0">
     <SqlMethodComment></SqlMethodComment>
@@ -316,54 +312,6 @@
     <Parameter name="dateTo" optional="true" after="2=2"><![CDATA[AND C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
   </SqlMethod>
 
-  <SqlMethod name="selectTotal" type="preparedStatement" return="String" default="0">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT COALESCE(SUM(LINENETAMT), 0) AS LINENETAMT
-      FROM C_INVOICE left join AD_USER   on C_INVOICE.SALESREP_ID = AD_USER.AD_USER_ID 
-                     left join C_PROJECT on C_INVOICE.C_PROJECT_ID = C_PROJECT.C_PROJECT_ID,
-           C_INVOICELINE left join M_PRODUCT on C_INVOICELINE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
-                         left join C_UOM     on C_INVOICELINE.C_UOM_ID = C_UOM.C_UOM_ID
-                         left join M_PRODUCT_CATEGORY on M_PRODUCT.M_PRODUCT_CATEGORY_ID = M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
-                         left join M_INOUTLINE on C_INVOICELINE.M_INOUTLINE_ID = M_INOUTLINE.M_INOUTLINE_ID
-                         left join  M_INOUT ON M_INOUTLINE.M_INOUT_ID = M_INOUT.M_INOUT_ID,
-           C_BPARTNER, C_BP_GROUP, AD_ORG
-      WHERE C_INVOICE.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
-      AND C_BPARTNER.C_BP_GROUP_ID = C_BP_GROUP.C_BP_GROUP_ID
-      AND C_INVOICE.C_INVOICE_ID = C_INVOICELINE.C_INVOICE_ID
-      AND C_INVOICE.AD_ORG_ID = AD_ORG.AD_ORG_ID
-      AND C_INVOICE.ISSOTRX = 'Y'
-      AND C_INVOICE.PROCESSED = 'Y'
-      AND C_INVOICE.AD_ORG_ID IN ('1')
-      AND C_INVOICE.AD_CLIENT_ID IN ('7')
-      AND 1=1
-     ]]></Sql>
-    <Parameter name="adOrgId" optional="true" type="replace" after="AND C_INVOICE.AD_ORG_ID IN (" text="'1'"/>
-    <Parameter name="adUserClient" type="replace" optional="true" after="AND C_INVOICE.AD_CLIENT_ID IN (" text="'7'"/>
-    <Parameter name="dateFrom" optional="true" after="AND 1=1"><![CDATA[AND C_INVOICE.DATEINVOICED >= to_date(?)]]></Parameter>
-    <Parameter name="dateTo" optional="true" after="AND 1=1"><![CDATA[AND C_INVOICE.DATEINVOICED < to_date(?)]]></Parameter>
-    <Parameter name="cBpartnerGroupId" optional="true" after="AND 1=1"><![CDATA[AND C_BP_GROUP.C_BP_GROUP_ID = ?]]></Parameter>
-    <Parameter name="cBpartnerId" optional="true" type="argument" after="AND 1=1"><![CDATA[AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
-    <Parameter name="mProductCategoryId" optional="true" after="AND 1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
-    <Parameter name="mProductId" optional="true" type="argument" after="AND 1=1"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
-    <Parameter name="salesrepId" optional="true" after="AND 1=1"><![CDATA[AND C_INVOICE.SALESREP_ID = ?]]></Parameter>
-    <Parameter name="partnerSalesrepId" optional="true" after="AND 1=1"><![CDATA[AND C_BPARTNER.SALESREP_ID = ?]]></Parameter>
-    <Parameter name="cProjectId" optional="true" after="AND 1=1"><![CDATA[AND C_PROJECT.C_PROJECT_ID = ?]]></Parameter>
-    <Parameter name="producttype" optional="true" after="AND 1=1"><![CDATA[AND M_PRODUCT.PRODUCTTYPE = ?]]></Parameter>
-  </SqlMethod>
-
-  <SqlMethod name="selectProject" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT C_PROJECT.NAME
-      FROM C_PROJECT
-      WHERE C_PROJECT_ID = ?
-     ]]></Sql>
-     <Parameter name="cProjectId"/>
-  </SqlMethod>
-
   <SqlMethod name="selectBpgroup" type="preparedStatement" return="String" default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
@@ -397,17 +345,6 @@
     <Parameter name="mWarehouseId"/>
   </SqlMethod>
 
-  <SqlMethod name="selectEntity" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT AD_CLIENT.NAME
-      FROM AD_CLIENT
-      WHERE AD_CLIENT.AD_CLIENT_ID = ?
-     ]]></Sql>
-    <Parameter name="adClientId"/>
-  </SqlMethod>
-
   <SqlMethod name="selectProducttype" type="preparedStatement" return="String" default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
@@ -437,20 +374,6 @@
      ]]></Sql>
      <Parameter name="notShown" optional="true" type="argument" after="WHERE 1=1 "><![CDATA[AND ID NOT IN]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="selectShown" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT ID, NAME
-      FROM (SELECT VALUE AS ID, NAME 
-              FROM AD_REF_LIST 
-             WHERE AD_REFERENCE_ID = '800087' 
-             AND AD_REF_LIST.VALUE IN ('1', '2', '3', '4', '5', '6', '8', '9', '10', '11')
-             ORDER BY TO_NUMBER(VALUE)) AA
-      WHERE 1=1 
-     ]]></Sql>
-     <Parameter name="shown" optional="true" type="argument" after="WHERE 1=1 "><![CDATA[AND ID IN]]></Parameter>
-  </SqlMethod>
 
   <SqlMethod name="selectNotShownTrl" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
@@ -470,22 +393,4 @@
      <Parameter name="lang"/> 
      <Parameter name="notShown" optional="true" type="argument" after="WHERE 1=1 "><![CDATA[AND ID NOT IN]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="selectShownTrl" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT ID, NAME
-      FROM (SELECT VALUE AS ID, T.NAME 
-              FROM AD_REF_LIST_trl T,
-                   AD_REF_LIST     L
-             WHERE l.AD_REFERENCE_ID = '800087'
-               AND l.AD_REF_LIST_ID  = t.AD_REF_LIST_ID
-               AND L.VALUE IN ('1', '2', '3', '4', '5', '6', '8', '9', '10', '11')
-               AND t.AD_LANGUAGE = ?
-             ORDER BY TO_NUMBER(VALUE)) AA
-      WHERE 1=1 
-     ]]></Sql>
-     <Parameter name="lang"/> 
-     <Parameter name="shown" optional="true" type="argument" after="WHERE 1=1 "><![CDATA[AND ID IN]]></Parameter>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscount_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscount_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -85,8 +85,4 @@
     <Parameter name="parBPartnerId" optional="true" type="argument" after="AND 1=1"><![CDATA[ AND C_BPARTNER.C_BPARTNER_ID IN]]></Parameter>
     <Parameter name="discount" optional="true" type="none" after="AND 2=2"><![CDATA[ AND (ROUND((ROUND(TOTALLINE/QTY,3)-ROUND(TOTALLINEDISCOUNT/QTY,3))/ROUND(TOTALLINE/QTY,3),2))*100 <>0]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -113,10 +113,6 @@
     <Parameter name="producttype" optional="true" after="AND 2=2"><![CDATA[AND M_PRODUCT.PRODUCTTYPE = ?]]></Parameter>
     <Parameter name="orderby" type="replace" optional="true" after="GROUP BY NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5" text=", 1"/>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
   <SqlMethod name="selectNoComparative" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
@@ -202,17 +198,6 @@
     <Parameter name="mProductCategoryId"/>
   </SqlMethod>
 
-  <SqlMethod name="selectEntity" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT AD_CLIENT.NAME
-      FROM AD_CLIENT
-      WHERE AD_CLIENT.AD_CLIENT_ID = ?
-     ]]></Sql>
-    <Parameter name="adClientId"/>
-  </SqlMethod>
-
   <SqlMethod name="selectNotShown" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -118,10 +118,6 @@
     <Parameter name="mProductId" optional="true" type="argument" after="AND 2=2"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
     <Parameter name="orderby" type="replace" optional="true" after="GROUP BY NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5" text=", 1"/>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
   <SqlMethod name="selectNoComparative" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
@@ -205,17 +201,6 @@
     <Parameter name="mProductCategoryId"/>
   </SqlMethod>
 
-  <SqlMethod name="selectEntity" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT AD_CLIENT.NAME
-      FROM AD_CLIENT
-      WHERE AD_CLIENT.AD_CLIENT_ID = ?
-     ]]></Sql>
-    <Parameter name="adClientId"/>
-  </SqlMethod>
-
   <SqlMethod name="selectNotShown" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportNotPosted_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportNotPosted_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -341,8 +341,4 @@
     <Parameter name="parDateFrom" optional="true" after="and 1=1"><![CDATA[AND DATEACCT >= TO_DATE(?) ]]></Parameter>
     <Parameter name="parDateTo" optional="true" after="and 1=1"><![CDATA[AND DATEACCT <= TO_DATE(?) ]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment>Create a registry</SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportOffer_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportOffer_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -58,10 +58,6 @@
     <Parameter name="dateto"/>    
     <Parameter name="parBPartnerId" optional="true" type="argument" after="AND 1=1"><![CDATA[ AND A.C_BPARTNER_ID IN]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
 
 
--- a/src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -140,10 +140,6 @@
     <Parameter name="dateFrom" optional="true" after="2=2"><![CDATA[ AND C.DATEORDERED >= to_date(?) ]]></Parameter>
     <Parameter name="dateTo" optional="true" after="2=2"><![CDATA[ AND C.DATEORDERED < to_date(?) ]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
   <SqlMethod name="bPartnerDescription" type="preparedStatement" return="String" default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportPendingProductionJr_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportPendingProductionJr_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -53,8 +53,4 @@
     <Parameter name="adUserOrg" type="replace" optional="true" after="AND C_ORDER.AD_ORG_ID IN (" text="'1'"/>
    </SqlMethod>
 
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportPricelist_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportPricelist_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -24,29 +24,6 @@
 
 <SqlClass name="ReportPricelistData" package="org.openbravo.erpCommon.ad_reports">
   <SqlClassComment></SqlClassComment>
-  <SqlMethod name="select" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT M_PRICELIST_VERSION.M_PRICELIST_VERSION_ID, M_PRICELIST_VERSION.NAME||'   '||'valid from:  '|| M_PRICELIST_VERSION.VALIDFROM AS VERSION_NAME,
-      M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID, M_PRODUCT_CATEGORY.NAME AS CATEGORY_NAME,
-      M_PRODUCT.M_PRODUCT_ID, (CASE WHEN M_PRODUCT.VALUE IS NULL THEN M_PRODUCT.NAME ELSE M_PRODUCT.VALUE||' - '||M_PRODUCT.NAME END) AS PRODUCT_NAME, M_PRODUCTPRICE.PRICELIMIT, M_PRODUCTPRICE.PRICELIST, M_PRODUCTPRICE.PRICESTD, '' as name, '' as id, '' AS VALID, '' AS UOMNAME
-      FROM M_PRICELIST_VERSION, M_PRODUCTPRICE, M_PRODUCT, M_PRODUCT_CATEGORY
-      WHERE M_PRICELIST_VERSION.M_PRICELIST_VERSION_ID = M_PRODUCTPRICE.M_PRICELIST_VERSION_ID
-      AND M_PRODUCTPRICE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
-      AND M_PRODUCT.M_PRODUCT_CATEGORY_ID = M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
-      AND M_PRICELIST_VERSION.AD_CLIENT_ID IN ('1')
-      AND M_PRICELIST_VERSION.AD_ORG_ID IN ('1')
-      AND 1=1
-      ORDER BY VERSION_NAME, CATEGORY_NAME, M_PRODUCT.NAME
-     ]]></Sql>
-    <Field name="rownum" value="count"/>
-    <Parameter name="adUserClient" type="replace" optional="true" after="AND M_PRICELIST_VERSION.AD_CLIENT_ID IN (" text="'1'"/>
-    <Parameter name="adOrgClient" type="replace" optional="true" after="AND M_PRICELIST_VERSION.AD_ORG_ID IN (" text="'1'"/>
-    <Parameter name="mPricelistVersionId" optional="true" after="AND 1=1"><![CDATA[ AND M_PRICELIST_VERSION.M_PRICELIST_VERSION_ID = ?]]></Parameter>
-    <Parameter name="mProductCategoryId" optional="true" after="AND 1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
-    <Parameter name="mProduct" optional="true" type="argument" after="AND 1=1"><![CDATA[ AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
-  </SqlMethod>
   <SqlMethod name="selectTrl" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
@@ -75,29 +52,6 @@
       <SqlMethodComment></SqlMethodComment>
       <Sql></Sql>
   </SqlMethod>
-  <SqlMethod name="selectPDF" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT M_PRICELIST_VERSION.NAME||'   '||'valid from:  '|| M_PRICELIST_VERSION.VALIDFROM AS VERSION_NAME, M_PRODUCT_CATEGORY.NAME AS CATEGORY_NAME,
-      (CASE WHEN M_PRODUCT.VALUE IS NULL THEN M_PRODUCT.NAME ELSE M_PRODUCT.VALUE||' - '||M_PRODUCT.NAME END) AS PRODUCT_NAME, M_PRODUCTPRICE.PRICESTD, C_UOM.NAME AS UOMNAME, (CASE WHEN M_PRICELIST_VERSION.VALIDFROM IS NOT NULL THEN '(Valid from : '||M_PRICELIST_VERSION.VALIDFROM||')' END) AS VALID
-      FROM M_PRODUCT left join C_UOM on M_PRODUCT.C_UOM_ID = C_UOM.C_UOM_ID,
-	  M_PRICELIST_VERSION inner join M_PRICELIST ON M_PRICELIST_VERSION.M_PRICELIST_ID = M_PRICELIST.M_PRICELIST_ID,
-      M_PRODUCTPRICE, M_PRODUCT_CATEGORY
-      WHERE M_PRICELIST_VERSION.M_PRICELIST_VERSION_ID = M_PRODUCTPRICE.M_PRICELIST_VERSION_ID
-      AND M_PRODUCTPRICE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
-      AND M_PRODUCT.M_PRODUCT_CATEGORY_ID = M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID
-      AND M_PRICELIST_VERSION.AD_CLIENT_ID IN ('1')
-      AND M_PRICELIST_VERSION.AD_ORG_ID IN ('1')
-      AND 1=1
-      ORDER BY VERSION_NAME, CATEGORY_NAME, M_PRODUCT.NAME
-     ]]></Sql>
-    <Parameter name="adUserClient" type="replace" optional="true" after="AND M_PRICELIST_VERSION.AD_CLIENT_ID IN (" text="'1'"/>
-    <Parameter name="adOrgClient" type="replace" optional="true" after="AND M_PRICELIST_VERSION.AD_ORG_ID IN (" text="'1'"/>
-    <Parameter name="mPricelistVersionId" optional="true" after="AND 1=1"><![CDATA[ AND M_PRICELIST_VERSION.M_PRICELIST_VERSION_ID = ?]]></Parameter>
-    <Parameter name="mProductCategoryId" optional="true" after="AND 1=1"><![CDATA[AND M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID = ?]]></Parameter>
-    <Parameter name="mProduct" optional="true" type="argument" after="AND 1=1"><![CDATA[ AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
-  </SqlMethod>
   <SqlMethod name="selectPDFTrl" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportProductionRun_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportProductionRun_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -55,8 +55,4 @@
     <Parameter name="parEndDateTo" optional="true" after="AND 1=1"><![CDATA[AND wr.ENDDATE < to_date(?)]]></Parameter>
     <Parameter name="parWorkRequirement" optional="true" after="AND 1=1"><![CDATA[AND wr.MA_WORKREQUIREMENT_ID = ?]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitability_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitability_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -291,15 +291,4 @@
     <Parameter name="adOrgId"/>
     <Parameter name="adClientId"/>
   </SqlMethod>
-   <SqlMethod name="selectUOM" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT COUNT(C_UOM_CONVERSION.C_UOM_ID) AS COUNT FROM C_UOM_CONVERSION,C_UOM 
-      WHERE C_UOM_CONVERSION.C_UOM_ID = ?
-      AND C_UOM_CONVERSION.C_UOM_TO_ID = C_UOM.C_UOM_ID
-      AND C_UOM.UOMSYMBOL='h'
-     ]]></Sql>
-    <Parameter name="cUomId"/>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -115,10 +115,6 @@
     <Parameter name="mProductId" optional="true" type="argument" after="AND 2=2"><![CDATA[AND M_PRODUCT.M_PRODUCT_ID IN]]></Parameter>
     <Parameter name="orderby" type="replace" optional="true" after="GROUP BY NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5" text=", 1"/>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
   <SqlMethod name="selectNoComparative" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
@@ -199,17 +195,6 @@
     <Parameter name="mProductCategoryId"/>
   </SqlMethod>
 
-  <SqlMethod name="selectEntity" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT AD_CLIENT.NAME
-      FROM AD_CLIENT
-      WHERE AD_CLIENT.AD_CLIENT_ID = ?
-     ]]></Sql>
-    <Parameter name="adClientId"/>
-  </SqlMethod>
-
   <SqlMethod name="selectNotShown" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -145,10 +145,6 @@
     <Parameter name="partnerSalesrepId" optional="true" after="AND 2=2"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
     <Parameter name="orderby" type="replace" optional="true" after="GROUP BY NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, NIVEL6, NIVEL7, NIVEL8, NIVEL9" text=", 1"/>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 
   <SqlMethod name="selectCount" type="preparedStatement" return="string" default="0">
     <SqlMethodComment></SqlMethodComment>
@@ -345,17 +341,6 @@
     <Parameter name="mWarehouseId"/>
   </SqlMethod>
 
-  <SqlMethod name="selectEntity" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT AD_CLIENT.NAME
-      FROM AD_CLIENT
-      WHERE AD_CLIENT.AD_CLIENT_ID = ?
-     ]]></Sql>
-    <Parameter name="adClientId"/>
-  </SqlMethod>
-
   <SqlMethod name="selectNotShown" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -137,10 +137,6 @@
     <Parameter name="partnerSalesrepId" optional="true" after="AND 2=2"><![CDATA[AND CB.C_BPARTNER_ID = ?]]></Parameter>
     <Parameter name="orderby" type="replace" optional="true" after="GROUP BY NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, NIVEL6, NIVEL7, NIVEL8, NIVEL9" text=", 1"/>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 
   <SqlMethod name="selectCount" type="preparedStatement" return="string" default="0">
     <SqlMethodComment></SqlMethodComment>
@@ -333,17 +329,6 @@
     <Parameter name="mWarehouseId"/>
   </SqlMethod>
 
-  <SqlMethod name="selectEntity" type="preparedStatement" return="String" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT AD_CLIENT.NAME
-      FROM AD_CLIENT
-      WHERE AD_CLIENT.AD_CLIENT_ID = ?
-     ]]></Sql>
-    <Parameter name="adClientId"/>
-  </SqlMethod>
-
   <SqlMethod name="selectNotShown" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportShipper_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportShipper_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -67,10 +67,6 @@
     <Parameter name="shipper" optional="true" after="AND 1=1" text=" AND i.M_SHIPPER_ID = ? "/>
     <Parameter name="issotrx" optional="true" after="AND 1=1" text=" AND i.IsSOTrx = ? "/>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
   <SqlMethod name="selectLine" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTotalProductTemplate_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTotalProductTemplate_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -42,8 +42,4 @@
     <Parameter name="adUserClient" type="replace" optional="true" after="AND M_PRODUCT_TEMPLATE.AD_CLIENT_ID IN (" text="'1'"/>
     <Parameter name="adUserOrg" type="replace" optional="true" after="AND M_PRODUCT_TEMPLATE.AD_ORG_ID IN (" text="'1'"/>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalanceDetail_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalanceDetail_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -132,15 +132,6 @@
     </Sql>
     <Parameter name="client"/>
   </SqlMethod>
-  <SqlMethod name="selectCompany" type="preparedStatement" return="string" default="">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-        SELECT NAME
-        FROM AD_CLIENT
-        WHERE AD_CLIENT_ID = ?
-    </Sql>
-    <Parameter name="client"/>
-  </SqlMethod>
   <SqlMethod name="selectAccountName" type="preparedStatement" return="string" default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartner_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartner_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -59,8 +59,4 @@
     <Parameter name="locatorY" optional="true" after="AND 1=1"><![CDATA[ AND UPPER(M_LOCATOR.Y) = UPPER(?)]]></Parameter>
     <Parameter name="locatorZ" optional="true" after="AND 1=1"><![CDATA[ AND UPPER(M_LOCATOR.Z) = UPPER(?)]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -51,8 +51,4 @@
     <Parameter name="parStartDateTo" optional="true" after="AND 1=1"><![CDATA[AND wr.STARTDATE <= TO_DATE(?)]]></Parameter>
     <Parameter name="parProcessPlan" optional="true" after="AND 1=1"><![CDATA[AND wr.MA_ProcessPlan_id = ?]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -60,8 +60,4 @@
     <Parameter name="parStartDateTo" optional="true" after="AND 1=1"><![CDATA[AND wr.STARTDATE <= TO_DATE(?)]]></Parameter>
     <Parameter name="parProcessPlan" optional="true" after="AND 1=1"><![CDATA[AND ppv.MA_ProcessPlan_id = ?]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementJR_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementJR_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -65,10 +65,6 @@
     <Parameter name="parEndDateTo" optional="true" after="AND 1=1"><![CDATA[AND wr.ENDDATE < TO_DATE(?)+1]]></Parameter>
     <Parameter name="parProcessPlan" optional="true" after="AND 1=1"><![CDATA[AND pp.MA_ProcessPlan_id =?]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
   <SqlMethod name="inprocess" type="preparedStatement" return="String" default="">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -49,57 +49,6 @@
     <Parameter name="c_year_id"/>
     <Parameter name="c_year_id"/>
   </SqlMethod>
-  <SqlMethod name="getAmounts" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT (CASE SIGN(SUM(AMTACCTDR)-SUM(AMTACCTCR)) WHEN -1 THEN 0 ELSE (SUM(AMTACCTDR)-SUM(AMTACCTCR)) END) AS TOTALAMTCR,
-        (CASE SIGN(SUM(AMTACCTCR)-SUM(AMTACCTDR)) WHEN -1 THEN 0 ELSE (SUM(AMTACCTCR)-SUM(AMTACCTDR)) END) AS TOTALAMTDR, ACCOUNT_ID, ACCTDESCRIPTION, ACCTVALUE,
-        RECORD_ID2, C_BPARTNER_ID, M_PRODUCT_ID, A_ASSET_ID,C_TAX_ID,C_PROJECT_ID,C_ACTIVITY_ID,USER1_ID,USER2_ID,C_CAMPAIGN_ID,C_SALESREGION_ID
-        FROM FACT_ACCT
-        WHERE EXISTS (SELECT 1 FROM C_PERIOD P
-                      WHERE P.C_YEAR_ID = ?
-                      AND P.C_PERIOD_ID = FACT_ACCT.C_PERIOD_ID)
-        AND ACCOUNT_ID IN (SELECT C_ELEMENTVALUE_ID
-                FROM C_ELEMENTVALUE
-                WHERE C_ELEMENTVALUE.ACCOUNTTYPE = ?)
-        AND AD_ORG_ID = ?
-        AND C_ACCTSCHEMA_ID = ?
-        GROUP BY ACCOUNT_ID, ACCTDESCRIPTION, ACCTVALUE, RECORD_ID2, C_BPARTNER_ID, M_PRODUCT_ID, A_ASSET_ID,
-                 C_TAX_ID,C_PROJECT_ID,C_ACTIVITY_ID,USER1_ID,USER2_ID,C_CAMPAIGN_ID,C_SALESREGION_ID
-      ]]>
-    </Sql>
-    <Parameter name="c_year_id"/>
-    <Parameter name="accounttype"/>
-    <Parameter name="org"/>
-    <Parameter name="acctSchema"/>
-  </SqlMethod>
-  <SqlMethod name="getAmountsClose" type="preparedStatement" connection="true" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-      <![CDATA[
-        SELECT (CASE sign(SUM(AMTACCTDR)-sum(amtacctcr)) WHEN -1 THEN 0 ELSE (SUM(AMTACCTDR)-sum(amtacctcr)) END) AS TOTALAMTCR,
-          (CASE sign(SUM(AMTACCTCR)-sum(amtacctdr)) WHEN -1 THEN 0 ELSE (SUM(AMTACCTCR)-sum(amtacctdr)) END) AS TOTALAMTDR, ACCOUNT_ID,
-          ACCTDESCRIPTION, ACCTVALUE, RECORD_ID2, C_BPARTNER_ID, M_PRODUCT_ID, A_ASSET_ID, C_TAX_ID, C_PROJECT_ID, C_ACTIVITY_ID,
-          USER1_ID, USER2_ID, C_CAMPAIGN_ID, C_SALESREGION_ID
-        FROM FACT_ACCT
-        WHERE EXISTS (SELECT 1 FROM C_PERIOD P
-                      WHERE P.C_YEAR_ID = ?
-                      AND P.C_PERIOD_ID = FACT_ACCT.C_PERIOD_ID)
-        AND ACCOUNT_ID IN (SELECT C_ELEMENTVALUE_ID
-                FROM C_ELEMENTVALUE
-                WHERE C_ELEMENTVALUE.ACCOUNTTYPE IN ('1'))
-        AND AD_ORG_ID = ?
-        AND C_ACCTSCHEMA_ID = ?
-        GROUP BY ACCOUNT_ID, ACCTDESCRIPTION, ACCTVALUE, RECORD_ID2, C_BPARTNER_ID, M_PRODUCT_ID, A_ASSET_ID, C_TAX_ID, C_PROJECT_ID,
-                 C_ACTIVITY_ID, USER1_ID, USER2_ID, C_CAMPAIGN_ID, C_SALESREGION_ID
-      ]]>
-    </Sql>
-    <Parameter name="c_year_id"/>
-    <Parameter name="accounttype" optional="true" type="replace" after="WHERE C_ELEMENTVALUE.ACCOUNTTYPE IN (" text="'1'"/>
-    <Parameter name="org"/>
-    <Parameter name="acctSchema"/>
-  </SqlMethod>
   <SqlMethod name="getTotalAmounts" type="preparedStatement" connection="true" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
@@ -530,20 +479,6 @@
     <Parameter name="cYearId"/>
     <Parameter name="adOrgId"/>
   </SqlMethod>
-   <SqlMethod name="selectOrg" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT A_O.AD_ORG_ID AS ID, A_O.NAME
-        FROM AD_ORG A_O, AD_ROLE_ORGACCESS A_R_O, AD_ROLE R
-        WHERE A_R_O.AD_ORG_ID = A_O.AD_ORG_ID
-        AND A_R_O.ISACTIVE = 'Y'
-        AND A_R_O.AD_ROLE_ID = R.AD_ROLE_ID
-        AND R.ISACTIVE = 'Y'
-        AND A_R_O.AD_ROLE_ID = ?
-        ORDER BY A_O.NAME
-      ]]></Sql>
-        <Parameter name="rol"/>
-   </SqlMethod>
    <SqlMethod name="treeOrgAcctSchemas" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
@@ -588,14 +523,6 @@
         <Parameter name="organizationId"/>
         <Parameter name="organizationId"/>
    </SqlMethod>
-  <SqlMethod name="getTreeOrg" type="preparedStatement" return="string">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-        SELECT AD_TREE_ORG_ID FROM AD_CLIENTINFO
-        WHERE AD_CLIENT_ID = ?
-    </Sql>
-    <Parameter name="client"/>
-  </SqlMethod>
    <SqlMethod name="getRegCount" type="preparedStatement" return="string">
     <SqlMethodComment></SqlMethodComment>
     <Sql><![CDATA[
@@ -611,17 +538,6 @@
     <Parameter name="c_acctschema_id"/>
      <Parameter name="c_period_id"/>
   </SqlMethod>
-  <SqlMethod name="numSchemasFor0Org" type="preparedStatement" return="string">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql><![CDATA[
-      SELECT COUNT(*) AS numSchemas
-      FROM AD_ORG_ACCTSCHEMA
-      WHERE AD_CLIENT_ID = ?
-        AND AD_ORG_ID = '0'
-        AND ISACTIVE='Y'
-     ]]></Sql>
-    <Parameter name="clientId"/>
-  </SqlMethod>
   <SqlMethod name="balanceAmount" type="preparedStatement" return="string">
     <SqlMethodComment>When balance is balanced this amount should be ZERO</SqlMethodComment>
     <Sql><![CDATA[
--- a/src/org/openbravo/erpCommon/businessUtility/TabFilter_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/businessUtility/TabFilter_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -37,10 +37,6 @@
         <Field name="completePosition" value="count"/>
         <Parameter name="adTabId"/>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
    <SqlMethod name="selectTrl" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql> <![CDATA[
--- a/src/org/openbravo/erpCommon/businessUtility/Tax_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/businessUtility/Tax_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -24,131 +24,6 @@
 
 <SqlClass name="TaxData" package="org.openbravo.erpCommon.businessUtility">
    <SqlClassComment></SqlClassComment>
-   <!--SqlMethod name="select" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT t.C_Tax_ID, '' AS billToC_Location_ID, '' AS IsTaxExempt, '' AS IsSpecialTax
-        FROM C_Tax t, C_Location lf, C_Location lt
-        WHERE t.Parent_Tax_ID IS NULL
-        AND t.C_TaxCategory_ID=? 
-        AND lf.C_Location_ID=? 
-        AND (t.C_Country_ID=lf.C_Country_ID OR (t.C_Country_ID IS NULL))
-        AND (t.C_Region_ID=lf.C_Region_ID OR (t.C_Region_ID IS NULL)) 
-        AND lt.C_Location_ID=? 
-        AND (t.To_Country_ID=lt.C_Country_ID OR (t.To_Country_ID IS NULL))
-        AND (t.To_Region_ID=lt.C_Region_ID OR (t.To_Region_ID IS NULL)) 
-        AND t.ValidFrom <= to_date(?) 
-        AND t.IsSpecialTax = ?
-        ORDER BY t.C_Country_ID, t.To_Country_ID, t.C_Region_ID, t.To_Region_ID, ValidFrom
-      ]]></Sql>
-      <Parameter name="cTaxcategoryId"/>
-      <Parameter name="billFromLocation"/>
-      <Parameter name="shipToLocation"/>
-      <Parameter name="dateOrdered"/>
-      <Parameter name="isspecialtax"/>
-   </SqlMethod>
-   <SqlMethod name="select2" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT t.C_Tax_ID 
-        FROM C_Tax t, C_Location lf
-        WHERE t.Parent_Tax_ID IS NULL
-        AND t.C_TaxCategory_ID = ? 
-        AND lf.C_Location_ID = ? 
-        AND (t.C_Country_ID=lf.C_Country_ID OR (t.C_Country_ID IS NULL))
-        AND (t.C_Region_ID=lf.C_Region_ID OR (t.C_Region_ID IS NULL))
-        AND t.To_Country_ID IS NULL AND t.To_Region_ID IS NULL 
-        AND t.ValidFrom <= to_date(?) 
-        AND t.IsSpecialTax = ? 
-        ORDER BY t.C_Country_ID, t.C_Region_ID, t.ValidFrom
-      ]]></Sql>
-      <Parameter name="cTaxcategoryId"/>
-      <Parameter name="billFromLocation"/>
-      <Parameter name="dateOrdered"/>
-      <Parameter name="isspecialtax"/>
-   </SqlMethod>
-   <SqlMethod name="select3" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT t.C_Tax_ID 
-        FROM C_Tax t, C_Location lf 
-        WHERE t.AD_Client_ID=lf.AD_Client_ID 
-        AND lf.C_Location_ID=? 
-        AND t.IsDefault='Y'
-        AND t.ValidFrom <= to_date(?)
-        ORDER BY t.ValidFrom
-      ]]></Sql>
-      <Parameter name="billFromLocation"/>
-      <Parameter name="dateOrdered"/>
-   </SqlMethod>
-   <SqlMethod name="billTo" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT il.C_Location_ID AS billToC_Location_ID, b.IsTaxExempt, b.IsSpecialTax
-        FROM C_BPartner_Location il, C_BPartner b
-        WHERE il.C_BPartner_ID=b.C_BPartner_ID
-        AND il.C_BPartner_Location_ID=?
-      ]]></Sql>
-      <Parameter name="cBpartnerLocationId"/>
-   </SqlMethod>
-   <SqlMethod name="taxId" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT t.C_Tax_ID
-        FROM C_Tax t
-        INNER JOIN AD_Org o ON (t.AD_Client_ID=o.AD_Client_ID)
-        WHERE t.ISTAXEXEMPT = 'Y' 
-        AND o.AD_Org_ID=?
-        ORDER BY t.VALIDFROM DESC 
-      ]]></Sql>
-      <Parameter name="adOrgId"/>
-   </SqlMethod>
-   <SqlMethod name="taxCategory" type="preparedStatement" return="String" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT C_TaxCategory_ID FROM M_Product
-        WHERE M_Product_ID=?
-      ]]></Sql>
-      <Parameter name="mProductId"/>
-   </SqlMethod>
-   <SqlMethod name="shipLocation" type="preparedStatement" return="String" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT C_Location_ID AS shipFromC_Location_ID FROM M_Warehouse
-        WHERE M_Warehouse_ID=?
-      ]]></Sql>
-      <Parameter name="mWarehouseId"/>
-   </SqlMethod>
-   <SqlMethod name="shipTo" type="preparedStatement" return="String" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT C_Location_ID AS shipToC_Location_ID FROM C_BPartner_Location
-        WHERE C_BPartner_Location_ID=? 
-      ]]></Sql>
-      <Parameter name="cBpartnerLocationId"/>
-   </SqlMethod>
-   <SqlMethod name="billLocation" type="preparedStatement" return="String" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT C_Location_ID AS billFromC_Location_ID FROM AD_OrgInfo 
-        WHERE AD_Org_ID = ?
-      ]]></Sql>
-      <Parameter name="adOrgId"/>
-   </SqlMethod-->
-   <SqlMethod name="taxGet" type="preparedStatement" return="String" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT C_GetTax(?, TO_DATE(?), ?, ?, ?, ?, ?, ?) AS TAX FROM DUAL
-      ]]></Sql>
-      <Parameter name="mProductId"/>
-      <Parameter name="shipdate"/>
-      <Parameter name="adOrgId"/>
-      <Parameter name="mWarehouseId"/>
-      <Parameter name="billPartnerLoc"/>
-      <Parameter name="shipPartnerLoc"/>
-      <Parameter name="cProjectId"/>
-      <Parameter name="issotrx"/>
-   </SqlMethod>
     <SqlMethod name="taxGet" type="preparedStatement" return="String" default="">
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
--- a/src/org/openbravo/erpCommon/info/AccountElementValue_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/AccountElementValue_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -123,14 +123,6 @@
         <Parameter name="key"/>
    </SqlMethod>
 
-   <SqlMethod name="selectname" type="preparedStatement" return="String" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        SELECT NAME FROM C_ELEMENTVALUE WHERE C_ELEMENTVALUE_ID = ?
-      ]]></Sql>
-        <Parameter name="key"/>
-   </SqlMethod>
-
    <SqlMethod name="selectschemaname" type="preparedStatement" return="String" default="">
       <SqlMethodComment></SqlMethodComment>
       <Sql> <![CDATA[
--- a/src/org/openbravo/erpCommon/info/AttributeSetInstance_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/AttributeSetInstance_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -42,10 +42,6 @@
       ]]></Sql>
         <Parameter name="mAttributesetId"/>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
    <SqlMethod name="selectInstance" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql> <![CDATA[
@@ -67,30 +63,6 @@
       ]]></Sql>
         <Parameter name="mAttributeId"/>
    </SqlMethod>
-   <SqlMethod name="existingInstance" type="preparedStatement" return="String" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        SELECT m.m_attributesetinstance_id 
-        FROM m_storage_detail m, M_AttributeSetInstance a 
-        WHERE m.M_ATTRIBUTESETINSTANCE_ID = a.M_ATTRIBUTESETINSTANCE_ID 
-        and m.M_LOCATOR_ID = ? 
-        and upper(description) = upper(?)
-      ]]></Sql>
-        <Parameter name="mLocatorId"/>
-        <Parameter name="description"/>
-   </SqlMethod>
-   <SqlMethod name="hasIdentical" type="preparedStatement" return="String" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        SELECT m_attributesetinstance_id 
-        FROM M_AttributeSetInstance 
-        WHERE (upper(description) = upper(?) OR ((description IS NULL) AND (? IS NULL)))
-        AND M_AttributeSet_ID = ?
-      ]]></Sql>
-        <Parameter name="description"/>
-        <Parameter name="description"/>
-        <Parameter name="mAttributeSet"/>
-   </SqlMethod>
    <SqlMethod name="selectDescription" type="preparedStatement" return="String" default="">
       <SqlMethodComment></SqlMethodComment>
       <Sql> <![CDATA[
@@ -117,16 +89,6 @@
         <Parameter name="mSernoctlId"/>
    </SqlMethod>
    
-   <SqlMethod name="selectNextSerNo" type="preparedStatement" return="String" connection="true" default="0">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        SELECT COALESCE(TO_CHAR(PREFIX),'') || CURRENTNEXT || COALESCE(TO_CHAR(SUFFIX),'') AS TOTAL
-        FROM M_SERNOCTL 
-        WHERE M_SERNOCTL_ID = ?
-      ]]></Sql>
-        <Parameter name="mSernoctlId"/>
-   </SqlMethod>
-   
    <SqlMethod name="selectProductAttr" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql> <![CDATA[
@@ -156,121 +118,4 @@
       ]]></Sql>
         <Parameter name="mAttributesetId"/>
    </SqlMethod>
-   <SqlMethod name="selectKey" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        SELECT A_S.M_ATTRIBUTESET_ID, A_S.NAME, A_S.DESCRIPTION, A_S.GUARANTEEDAYS, A_S.ISGUARANTEEDATE, A_S.ISLOT, A_S.ISSERNO, 
-        A_S.M_LOTCTL_ID, A_S.M_SERNOCTL_ID, A_S.ISLOCKABLE, A.ISINSTANCEATTRIBUTE, '' AS M_ATTRIBUTESETINSTANCE_ID 
-        FROM M_ATTRIBUTESET A_S left join M_ATTRIBUTEUSE A_U on a_s.M_ATTRIBUTESET_ID = a_u.M_ATTRIBUTESET_ID
-                                left join M_ATTRIBUTE A on A_U.M_ATTRIBUTE_ID = A.M_ATTRIBUTE_ID 
-                                                        and A_U.ISACTIVE = 'Y'
-        WHERE  A_S.ISACTIVE = 'Y'
-        AND A_S.M_ATTRIBUTESET_ID = ? 
-        ORDER BY A_U.SEQNO
-      ]]></Sql>
-        <Parameter name="mAttributesetId"/>
-   </SqlMethod>
-   <SqlMethod name="selectAttributeValue" type="preparedStatement" return="String" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        SELECT NAME FROM M_ATTRIBUTEVALUE WHERE M_ATTRIBUTEVALUE_ID=?
-      ]]></Sql>
-        <Parameter name="mAttributevalueId"/>
-   </SqlMethod>
-   <SqlMethod name="insert" type="preparedStatement" connection="true" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        INSERT INTO M_ATTRIBUTEINSTANCE (M_ATTRIBUTEINSTANCE_ID, M_ATTRIBUTESETINSTANCE_ID, M_ATTRIBUTE_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, 
-        CREATEDBY, UPDATED, UPDATEDBY, M_ATTRIBUTEVALUE_ID, VALUE) 
-        VALUES ( ?, ?, ?, ?, ?, 'Y', now(), ?, now(), ?, ?, ?)
-      ]]></Sql>
-        <Parameter name="mAttributeinstanceId"/>
-        <Parameter name="mAttributesetinstanceId"/>
-        <Parameter name="mAttributeId"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adOrgId"/>
-        <Parameter name="adUserId"/>
-        <Parameter name="adUserId"/>
-        <Parameter name="mAttributevalueId"/>
-        <Parameter name="value"/>
-   </SqlMethod>
-   <SqlMethod name="update" type="preparedStatement" connection="true" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        UPDATE M_ATTRIBUTEINSTANCE SET UPDATED=now(), UPDATEDBY = ?, M_ATTRIBUTEVALUE_id = ?, VALUE=? 
-        WHERE M_ATTRIBUTESETINSTANCE_ID = ? 
-        AND M_ATTRIBUTE_ID = ? 
-        AND ISACTIVE = 'Y'
-      ]]></Sql>
-        <Parameter name="adUserId"/>
-        <Parameter name="mAttributevalueId"/>
-        <Parameter name="value"/>
-        <Parameter name="mAttributesetinstanceId"/>
-        <Parameter name="mAttributeId"/>
-   </SqlMethod>
-   <SqlMethod name="insertHeader" type="preparedStatement" connection="true" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        INSERT INTO M_ATTRIBUTESETINSTANCE (M_ATTRIBUTESETINSTANCE_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, 
-        UPDATED, UPDATEDBY, M_ATTRIBUTESET_ID, SERNO, LOT, GUARANTEEDATE, M_LOT_ID, ISLOCKED, LOCK_DESCRIPTION) 
-        VALUES ( ?, ?, ?, 'Y', now(), ?, now(), ?, ?, ?, ?, TO_DATE(?), ?, ?, ?)
-      ]]></Sql>
-        <Parameter name="mAttributesetinstanceId"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adOrgId"/>
-        <Parameter name="adUserId"/>
-        <Parameter name="adUserId"/>
-        <Parameter name="mAttributesetId"/>
-        <Parameter name="serno"/>
-        <Parameter name="lot"/>
-        <Parameter name="guaranteedate"/>
-        <Parameter name="mLotId"/>
-        <Parameter name="islocked"/>
-        <Parameter name="lockDescription"/>
-   </SqlMethod>
-   <SqlMethod name="updateHeader" type="preparedStatement" connection="true" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        UPDATE M_ATTRIBUTESETINSTANCE SET UPDATED=now(), UPDATEDBY = ?, M_ATTRIBUTESET_ID = ?, SERNO=?, LOT=?, GUARANTEEDATE=TO_DATE(?), 
-        M_LOT_ID = ?, ISLOCKED = ?, LOCK_DESCRIPTION = ? 
-        WHERE M_ATTRIBUTESETINSTANCE_ID = ?
-      ]]></Sql>
-        <Parameter name="adUserId"/>
-        <Parameter name="mAttributesetId"/>
-        <Parameter name="serno"/>
-        <Parameter name="lot"/>
-        <Parameter name="guaranteedate"/>
-        <Parameter name="mLotId"/>
-        <Parameter name="islocked"/>
-        <Parameter name="lockDescription"/>
-        <Parameter name="mAttributesetinstanceId"/>
-   </SqlMethod>
-   <SqlMethod name="updateHeaderDescription" type="preparedStatement" connection="true" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        UPDATE M_ATTRIBUTESETINSTANCE SET UPDATED=now(), UPDATEDBY = ?, DESCRIPTION=? 
-        WHERE M_ATTRIBUTESETINSTANCE_ID = ?
-      ]]></Sql>
-        <Parameter name="adUserId"/>
-        <Parameter name="description"/>
-        <Parameter name="mAttributesetinstanceId"/>
-   </SqlMethod>
-   <SqlMethod name="updateLotSequence" type="preparedStatement" connection="true" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        UPDATE M_LOTCTL SET UPDATED=now(), UPDATEDBY = ?, CURRENTNEXT=(CURRENTNEXT + INCREMENTNO) 
-        WHERE M_LOTCTL_ID = ?
-      ]]></Sql>
-        <Parameter name="adUserId"/>
-        <Parameter name="mLotctlId"/>
-   </SqlMethod>
-   <SqlMethod name="updateSerNoSequence" type="preparedStatement" connection="true" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        UPDATE M_SERNOCTL SET UPDATED=now(), UPDATEDBY = ?, CURRENTNEXT=(CURRENTNEXT + INCREMENTNO) 
-        WHERE M_SERNOCTL_ID = ?
-      ]]></Sql>
-        <Parameter name="adUserId"/>
-        <Parameter name="mSernoctlId"/>
-   </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -64,11 +64,6 @@
         <Parameter name="oraLimit1" type="argument" optional="true" after=") A "><![CDATA[ WHERE ROWNUM <= ]]></Parameter>
         <Parameter name="oraLimit2" type="argument" optional="true" after="WHERE 1=1"><![CDATA[AND RN1 BETWEEN ]]></Parameter>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
-
    <SqlMethod name="countRows" type="preparedStatement" return="String">
       <Sql> <![CDATA[
             SELECT count(*) AS VALUE FROM ( SELECT '0' AS RN1, B.* FROM ( select 1
--- a/src/org/openbravo/erpCommon/info/BusinessPartner_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/BusinessPartner_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -102,10 +102,6 @@
         <Parameter name="oraLimit1" type="argument" optional="true" after=") B"><![CDATA[ WHERE ROWNUM <= ]]></Parameter>
         <Parameter name="oraLimit2" type="argument" optional="true" after=") A "><![CDATA[WHERE RN1 BETWEEN ]]></Parameter> 
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
    <SqlMethod name="selectKey" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql> <![CDATA[
--- a/src/org/openbravo/erpCommon/info/DebtPayment_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/DebtPayment_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -81,11 +81,6 @@
         <Parameter name="pgLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[LIMIT ]]></Parameter>
    </SqlMethod>
 
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
-
    <SqlMethod name="countRows" type="preparedStatement" return="String">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/info/InvoiceLine_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/InvoiceLine_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -68,11 +68,6 @@
         <Parameter name="pgLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[LIMIT ]]></Parameter>
       </SqlMethod>
 
-	<SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
-   
    <SqlMethod name="countRows" type="preparedStatement" return="String">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/info/Invoice_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/Invoice_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -78,12 +78,6 @@
         <Parameter name="pgLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[LIMIT ]]></Parameter>
    </SqlMethod>
 
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
-   
-   
    <SqlMethod name="countRows" type="preparedStatement" return="String">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/info/Locator_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/Locator_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -58,10 +58,6 @@
         <Parameter name="oraLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[AND RN1 BETWEEN ]]></Parameter>
         <Parameter name="pgLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[LIMIT ]]></Parameter>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
    <SqlMethod name="countRows" type="preparedStatement" return="String">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/info/ProductComplete_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/ProductComplete_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -80,11 +80,6 @@
         <Parameter name="oraLimit2" type="argument" optional="true" after="WHERE 1=1"><![CDATA[AND RN1 BETWEEN ]]></Parameter>
    </SqlMethod>
 
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
-
 	<SqlMethod name="countRows" type="preparedStatement" return="String">
       <SqlMethodComment></SqlMethodComment>
       <Sql> <![CDATA[
@@ -294,17 +289,4 @@
         <Parameter name="oraLimit2" type="argument" optional="true" after="WHERE 1=1"><![CDATA[AND RN1 BETWEEN ]]></Parameter>
    </SqlMethod>
 
-   <SqlMethod name="existsActualValue" type="preparedStatement" return="String" default="">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        SELECT value as value
-        FROM M_Product 
-        WHERE UPPER(AD_COLUMN_IDENTIFIER(TO_CHAR('M_Product'), TO_CHAR(M_Product_ID), TO_CHAR(?))) = UPPER(?)
-        AND M_Product_ID = ? 
-        ORDER BY value
-      ]]></Sql>
-        <Parameter name="language"/>
-        <Parameter name="description"/>
-        <Parameter name="cBpartnerId"/>
-   </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/info/ProductMultiple_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/ProductMultiple_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -53,10 +53,6 @@
         <Parameter name="oraLimit1" type="argument" optional="true" after=") A "><![CDATA[ WHERE ROWNUM <= ]]></Parameter>
         <Parameter name="oraLimit2" type="argument" optional="true" after="WHERE 1=1"><![CDATA[AND RN1 BETWEEN ]]></Parameter>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
 
    <SqlMethod name="countRows" type="preparedStatement" return="String">
       <Sql> <![CDATA[
--- a/src/org/openbravo/erpCommon/info/Product_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/Product_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -113,11 +113,6 @@
       <Parameter name="oraLimit2" type="argument" optional="true" after=") A "><![CDATA[WHERE RN1 BETWEEN ]]></Parameter>
    </SqlMethod>
   
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
-
    <SqlMethod name="priceListDefault" type="preparedStatement" return="String">
       <SqlMethodComment></SqlMethodComment>
       <Sql> <![CDATA[
--- a/src/org/openbravo/erpCommon/info/ProjectMultiple_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/ProjectMultiple_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -45,10 +45,6 @@
     <Parameter name="oraLimit1" type="argument" optional="true" after=") A "><![CDATA[ WHERE ROWNUM <= ]]></Parameter>
     <Parameter name="oraLimit2" type="argument" optional="true" after="WHERE 1=1"><![CDATA[AND RN1 BETWEEN ]]></Parameter>
   </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql></Sql>
-  </SqlMethod>
   <SqlMethod name="countRows" type="preparedStatement" return="String">
       <Sql> <![CDATA[
         SELECT count(*) as value
--- a/src/org/openbravo/erpCommon/info/Project_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/Project_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -55,10 +55,6 @@
         <Parameter name="oraLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[AND RN1 BETWEEN ]]></Parameter>
         <Parameter name="pgLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[LIMIT ]]></Parameter>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
    <SqlMethod name="countRows" type="preparedStatement" return="String">
       <SqlMethodComment></SqlMethodComment>
       <Sql> <![CDATA[
--- a/src/org/openbravo/erpCommon/info/SalesOrderLine_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/SalesOrderLine_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -68,11 +68,6 @@
         <Parameter name="pgLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[LIMIT ]]></Parameter>
    </SqlMethod>
    
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
-
    <SqlMethod name="countRows" type="preparedStatement" return="String">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/info/SalesOrder_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/SalesOrder_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -67,11 +67,6 @@
         <Parameter name="pgLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[LIMIT ]]></Parameter>
    </SqlMethod>
 
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
-   
    <SqlMethod name="countRows" type="preparedStatement" return="String">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/info/ShipmentReceiptLine_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/ShipmentReceiptLine_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -67,10 +67,6 @@
         <Parameter name="oraLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[AND RN1 BETWEEN ]]></Parameter>
         <Parameter name="pgLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[LIMIT ]]></Parameter>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
    <SqlMethod name="countRows" type="preparedStatement" return="String">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/info/ShipmentReceipt_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/info/ShipmentReceipt_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -57,10 +57,6 @@
         <Parameter name="oraLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[AND RN1 BETWEEN ]]></Parameter>
         <Parameter name="pgLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[LIMIT ]]></Parameter>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
    <SqlMethod name="countRows" type="preparedStatement" return="String">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/utility/SystemInfo_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/utility/SystemInfo_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -73,18 +73,6 @@
       	select Servlet_Container_Version from ad_system_info
     ]]></Sql>
    </SqlMethod>
-   <SqlMethod name="selectWebserver" type="preparedStatement" return="string">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-      	select Webserver from ad_system_info
-    ]]></Sql>
-   </SqlMethod>
-   <SqlMethod name="selectWebserverVersion" type="preparedStatement" return="string">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-      	select Webserver_Version from ad_system_info
-    ]]></Sql>
-   </SqlMethod>
    <SqlMethod name="selectAntVersion" type="preparedStatement" return="string">
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
--- a/src/org/openbravo/erpCommon/utility/reporting/Order_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-	*************************************************************************
-	* The contents of this file are subject to the Openbravo  Public  License
-	* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
-	* Version 1.1  with a permitted attribution clause; you may not  use this
-	* file except in compliance with the License. You  may  obtain  a copy of
-	* the License at http://www.openbravo.com/legal/license.html 
-	* Software distributed under the License  is  distributed  on  an "AS IS"
-	* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-	* License for the specific  language  governing  rights  and  limitations
-	* under the License. 
-	* The Original Code is Openbravo ERP. 
-	* The Initial Developer of the Original Code is Openbravo SLU 
-	* All portions are Copyright (C) 2001-2008 Openbravo SLU 
-	* All Rights Reserved. 
-	* Contributor(s):  ______________________________________.
-	************************************************************************
--->
-
-<SqlClass name="OrderData" package="org.openbravo.erpCommon.utility.reporting">
-	<SqlClassComment></SqlClassComment>
-
-	<!-- 
-		This definition exists only to define all the fields used in all the queries.
-		This is needed because all the variables in the generated class are based upon
-		all the fields in the first query of the xsql.
-	-->
-	<SqlMethod name="dummy" type="preparedStatement"
-		return="multiple">
-		<SqlMethodComment></SqlMethodComment>
-		<Sql>
-			<![CDATA[
-			select
-				'' as ad_Org_Id,
-				'' as document_id,
-				'' as docstatus,
-				'' as docTypeTargetId,
-				'' as ourreference,
-				'' as cusreference
-			from
-				c_order
-			where
-				1=1 
-	        ]]>
-		</Sql>
-		<Parameter name="cOrderId" optional="false" type="argument"
-			after="1=1">
-			<![CDATA[ and c_order.c_order_id in ]]>
-		</Parameter>
-
-	</SqlMethod>
-
-	<SqlMethod name="getOrderInfo" type="preparedStatement"
-		return="multiple">
-		<SqlMethodComment></SqlMethodComment>
-		<Sql>
-			<![CDATA[
-			select
-				c_order.ad_org_id,
-				c_order.c_order_id as document_id,
-				c_order.docstatus,
-				c_order.c_doctypetarget_id as docTypeTargetId,
-				c_order.documentno as ourreference,
-				c_order.poreference as cusreference
-			from
-				c_order left join c_doctype on c_order.c_doctypetarget_id = c_doctype.c_doctype_id
-			where
-				c_order.c_order_id = ?
-	        ]]>
-		</Sql>
-		<Parameter name="cOrderId" />
-
-	</SqlMethod>
-
-</SqlClass>
-
--- a/src/org/openbravo/erpCommon/utility/reporting/printing/Document_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-	*************************************************************************
-	* The contents of this file are subject to the Openbravo  Public  License
-	* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
-	* Version 1.1  with a permitted attribution clause; you may not  use this
-	* file except in compliance with the License. You  may  obtain  a copy of
-	* the License at http://www.openbravo.com/legal/license.html 
-	* Software distributed under the License  is  distributed  on  an "AS IS"
-	* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-	* License for the specific  language  governing  rights  and  limitations
-	* under the License. 
-	* The Original Code is Openbravo ERP. 
-	* The Initial Developer of the Original Code is Openbravo SLU 
-	* All portions are Copyright (C) 2001-2008 Openbravo SLU 
-	* All Rights Reserved. 
-	* Contributor(s):  ______________________________________.
-	************************************************************************
--->
-
-<SqlClass name="DocumentData" package="org.openbravo.erpCommon.utility.reporting.printing">
-	<SqlClassComment></SqlClassComment>
-
-	<SqlMethod name="getOrderStatus" type="preparedStatement" return="String">
-		<SqlMethodComment></SqlMethodComment>
-		<Sql>
-			<![CDATA[
-			select
-				c_order.docstatus
-			from
-				c_order
-			where
-				c_order.c_order_id = ?
-	        ]]>
-		</Sql>
-		<Parameter name="cOrderId" />
-	</SqlMethod>
-
-	<SqlMethod name="getInvoiceStatus" type="preparedStatement" return="String">
-		<SqlMethodComment></SqlMethodComment>
-		<Sql>
-			<![CDATA[
-			select
-				c_invoice.docstatus
-			from
-				c_invoice
-			where
-				c_invoice.c_invoice_id = ?
-	        ]]>
-		</Sql>
-		<Parameter name="cInvoiceId" />
-	</SqlMethod>
-	
-	<SqlMethod name="getInOutStatus" type="preparedStatement" return="String">
-		<SqlMethodComment></SqlMethodComment>
-		<Sql>
-			<![CDATA[
-			select
-				m_inout.docstatus
-			from
-				m_inout
-			where
-				m_inout.m_inout_id = ?
-	        ]]>
-		</Sql>
-		<Parameter name="mInoutId" />
-	</SqlMethod>
-
-</SqlClass>
-
--- a/src/org/openbravo/erpCommon/utility/reporting/printing/Email_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpCommon/utility/reporting/printing/Email_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -127,52 +127,6 @@
         <Parameter name="documentId"/>
    </SqlMethod>
    
-   <SqlMethod name="insertEmailUser" type="preparedStatement" connection="true" return="rowCount">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql> <![CDATA[
-        INSERT INTO
-        	C_POC_EMAIL_USER
-        	(
-				C_POC_EMAIL_USER_ID, 
-				AD_CLIENT_ID ,
-				AD_ORG_ID ,
-				ISACTIVE ,
-				CREATED ,
-				CREATEDBY, 
-				UPDATED ,
-				UPDATEDBY, 
-
-				ADDRESS_TYPE,
-				C_POC_EMAIL_ID ,
-				AD_USER_ID
-        	)
-        	VALUES
-        	(
-        		TO_NUMBER(?),
-        		TO_NUMBER(?),
-        		TO_NUMBER(?), 
-        		'Y', 
-        		now(), 
-        		TO_NUMBER(?),
-				now(),
-				TO_NUMBER(?),
-				
-				TO_NUMBER(?),
-				TO_NUMBER(?),
-				TO_NUMBER(?)
-			)
-      ]]></Sql>
-        <Parameter name="bmPocEmailUserId"/>
-        <Parameter name="adClientId"/>
-        <Parameter name="adOrgId"/>
-        <Parameter name="adUserId"/>
-        <Parameter name="adUserId"/>
-        
-        <Parameter name="type"/>
-        <Parameter name="bmPocEmailId"/>
-        <Parameter name="email_adUserId"/>
-   </SqlMethod>   
-
    <SqlMethod name="getSenderAddress" type="preparedStatement" return="String">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
@@ -191,4 +145,4 @@
         <Parameter name="adOrgId" />
    </SqlMethod>
 
-</SqlClass>
\ No newline at end of file
+</SqlClass>
--- a/src/org/openbravo/erpReports/ReportRegisterLineJR_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpReports/ReportRegisterLineJR_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -47,9 +47,4 @@
     <Parameter name="parTaxRegisId" optional="true" after="and 1=1"><![CDATA[ and taxreg.c_taxregister_id in ( ? )  ]]></Parameter>
   </SqlMethod>
 
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
-  
 </SqlClass>
--- a/src/org/openbravo/erpReports/RptC_ProposalJr_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpReports/RptC_ProposalJr_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -56,9 +56,5 @@
         <Parameter name="adOrgClient" type="replace" optional="true" after="table3.AD_ORG_ID IN (" text="'1'"/>
 
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
    
 </SqlClass>
--- a/src/org/openbravo/erpReports/RptC_Remittance_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpReports/RptC_Remittance_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -50,8 +50,4 @@
         <![CDATA[ AND cs.C_REMITTANCE_ID IN ]]>
         </Parameter>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpReports/RptMA_CCP_Measures_Hours_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpReports/RptMA_CCP_Measures_Hours_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -43,8 +43,4 @@
       <Parameter name="maMeasureGroupId"/>
       <Parameter name="maMeasureGroupId"/>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpReports/RptMA_CCP_Measures_Values_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpReports/RptMA_CCP_Measures_Values_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -55,8 +55,4 @@
       <Parameter name="maMeasureGroupId"/>
       <Parameter name="maMeasureGroupId"/>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpReports/RptM_Inout_Header_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpReports/RptM_Inout_Header_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -44,8 +44,4 @@
         </Sql>
         <Parameter name="mInoutId"/>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpReports/RptM_Inout_Lines_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpReports/RptM_Inout_Lines_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -44,8 +44,4 @@
         </Sql>
         <Parameter name="mInoutId"/>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpReports/RptM_Inout_data.xsql	Tue Feb 18 14:52:51 2014 +0530
+++ b/src/org/openbravo/erpReports/RptM_Inout_data.xsql	Sun Feb 16 14:14:17 2014 +0100
@@ -35,10 +35,6 @@
         <![CDATA[ AND M_INOUT.M_INOUT_ID IN ]]>
         </Parameter>
    </SqlMethod>
-   <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-   </SqlMethod>
    <SqlMethod name="selectCopies" type="preparedStatement" return="String" default="0">
       <SqlMethodComment></SqlMethodComment>
       <Sql>