src/org/openbravo/erpCommon/ad_process/ImportTax_data.xsql
changeset 799 fef2c5e2feb7
parent 649 9ad1f1fc6c02
child 886 7e955b2f69df
--- a/src/org/openbravo/erpCommon/ad_process/ImportTax_data.xsql	Wed Apr 30 10:48:47 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_process/ImportTax_data.xsql	Mon May 05 06:59:24 2008 +0000
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
- ******************************************************************************
- * The contents of this file are subject to the   Compiere License  Version 1.1
- * ("License"); You may not use this file except in compliance with the License
- * You may obtain a copy of the License at http://www.compiere.org/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                  Compiere  ERP & CRM  Business Solution
- * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
- * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
- * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
- * Contributor(s): Openbravo SL
- * Contributions are Copyright (C) 2001-2008 Openbravo S.L.
- ******************************************************************************
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (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 SL 
+ * All portions are Copyright (C) 2001-2008 Openbravo SL 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
 -->
-
-
-
 <SqlClass name="ImportTaxData" package="org.openbravo.erpCommon.ad_process">
 
   <SqlMethod name="select" type="preparedStatement" return="multiple">
@@ -319,10 +318,10 @@
 			  INSERT INTO C_TaxCategory 
           (C_TaxCategory_ID, AD_Client_ID, AD_Org_ID,
           IsActive,Created,CreatedBy,Updated,UpdatedBy,
-          Name, Description, commodityCode)
+          Name, Description)
   		  SELECT TO_NUMBER(?), AD_Client_ID, AD_Org_ID,
             'Y',now(),CreatedBy,now(),UpdatedBy,
-            TC_Name, TC_Description, TC_commodityCode
+            TC_Name, TC_Description
 			  	  FROM I_Tax
 				    WHERE I_Tax_ID = TO_NUMBER(?)
       ]]>
@@ -338,14 +337,12 @@
 			  UPDATE C_TaxCategory 
            SET updated = now(),
                updatedBy = (SELECT updatedBy FROM I_Tax WHERE I_Tax_ID = TO_NUMBER(?)),
-               description = COALESCE((SELECT TC_Description FROM I_Tax WHERE I_Tax_ID = TO_NUMBER(?)),description),
-               commodityCode = COALESCE((SELECT TC_commodityCode FROM I_Tax WHERE I_Tax_ID = TO_NUMBER(?)),commodityCode)
+               description = COALESCE((SELECT TC_Description FROM I_Tax WHERE I_Tax_ID = TO_NUMBER(?)),description)
          WHERE C_TaxCategory_ID = TO_NUMBER(?)
       ]]>
     </Sql>
     <Parameter name="ITaxID"/>
     <Parameter name="ITaxID"/>
-    <Parameter name="ITaxID"/>
     <Parameter name="CTaxCategoryID"/>    
   </SqlMethod>