# HG changeset patch
# User Miguel de Juana <miguel.dejuana@openbravo.com>
# Date 1337859712 -7200
# Node ID df80a8f2e388f83406273d049a89b6fc2dd28c23
# Parent  5d862719708de4afa0df69a8371093730a21cd23
prueba

diff --git a/src-db/database/model/functions/AD_ISJAVAWORD.xml b/src-db/database/model/functions/AD_ISJAVAWORD.xml
--- a/src-db/database/model/functions/AD_ISJAVAWORD.xml
+++ b/src-db/database/model/functions/AD_ISJAVAWORD.xml
@@ -16,13 +16,13 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2009-2010 Openbravo SLU
+* All portions are Copyright (C) 2009-2012 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 BEGIN
   --Prevents column names to generate conflicts with DAL's getters and setters
-  RETURN case when lower(WORD) in ('class')
+  RETURN case when lower(WORD) in ('class', 'length')
     THEN 'Y' ELSE 'N' END;
 END AD_ISJAVAWORD
 ]]></body>
diff --git a/src-db/database/model/triggers/AD_COLUMN_TRG2.xml b/src-db/database/model/triggers/AD_COLUMN_TRG2.xml
--- a/src-db/database/model/triggers/AD_COLUMN_TRG2.xml
+++ b/src-db/database/model/triggers/AD_COLUMN_TRG2.xml
@@ -14,7 +14,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2008-2009 Openbravo SLU
+* All portions are Copyright (C) 2008-2012 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -57,6 +57,9 @@
   IF AD_IsJavaWord(:new.Name)='Y' THEN
     RAISE_APPLICATION_ERROR(-20000, '@NotAllowedColumnName@ "'||:new.name||'" @ReservedJavaWord@') ;
   END IF;
+  IF AD_IsJavaWord(:new.ColumnName)='Y' THEN
+    RAISE_APPLICATION_ERROR(-20000, '@NotAllowedDBColumnName@ "'||:new.ColumnName||'" @ReservedJavaWord@') ;
+  END IF;
   
   /**
   * Create Sequence for DocumentNo and Value columns
diff --git a/src-db/database/model/triggers/AD_ELEMENT_TRG.xml b/src-db/database/model/triggers/AD_ELEMENT_TRG.xml
--- a/src-db/database/model/triggers/AD_ELEMENT_TRG.xml
+++ b/src-db/database/model/triggers/AD_ELEMENT_TRG.xml
@@ -17,7 +17,7 @@
     * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
     * All Rights Reserved.
     * Contributor(s): Openbravo SLU
-    * Contributions are Copyright (C) 2001-2009 Openbravo, S.L.U.
+    * Contributions are Copyright (C) 2001-2012 Openbravo, S.L.U.
     *
     * Specifically, this derivative work is based upon the following Compiere
     * file and version.
@@ -35,6 +35,13 @@
     IF AD_isTriggerEnabled()='N' THEN RETURN;
     END IF;
 
+    IF AD_IsJavaWord(:new.Name)='Y' THEN
+    RAISE_APPLICATION_ERROR(-20000, '@NotAllowedElementName@ "'||:new.Name||'" @ReservedJavaWord@') ;
+    END IF;
+    IF AD_IsJavaWord(:new.ColumnName)='Y' THEN
+    RAISE_APPLICATION_ERROR(-20000, '@NotAllowedDBColumnName@ "'||:new.ColumnName||'" @ReservedJavaWord@') ;
+    END IF;
+
 
     -- Insert AD_Element Trigger
     IF INSERTING
diff --git a/src-db/database/model/triggers/AD_FIELD_TRG.xml b/src-db/database/model/triggers/AD_FIELD_TRG.xml
--- a/src-db/database/model/triggers/AD_FIELD_TRG.xml
+++ b/src-db/database/model/triggers/AD_FIELD_TRG.xml
@@ -17,7 +17,7 @@
     * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
     * All Rights Reserved.
     * Contributor(s): Openbravo SLU
-    * Contributions are Copyright (C) 2001-2008 Openbravo, S.L.U.
+    * Contributions are Copyright (C) 2001-2012 Openbravo, S.L.U.
     *
     * Specifically, this derivative work is based upon the following Compiere
     * file and version.
@@ -31,6 +31,10 @@
     IF AD_isTriggerEnabled()='N' THEN RETURN;
     END IF;
 
+    IF AD_IsJavaWord(:new.Name)='Y' THEN
+    RAISE_APPLICATION_ERROR(-20000, '@NotAllowedFieldName@ "'||:new.Name||'" @ReservedJavaWord@') ;
+    END IF;
+
   IF INSERTING
     THEN
       INSERT
diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -15550,6 +15550,17 @@
 <!--2CB71A652AB845D3A8A6477359C66451-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2CB71A652AB845D3A8A6477359C66451--></AD_MESSAGE>
 
+<!--2CC0075FE85F40F7BC29540659E993AE--><AD_MESSAGE>
+<!--2CC0075FE85F40F7BC29540659E993AE-->  <AD_MESSAGE_ID><![CDATA[2CC0075FE85F40F7BC29540659E993AE]]></AD_MESSAGE_ID>
+<!--2CC0075FE85F40F7BC29540659E993AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2CC0075FE85F40F7BC29540659E993AE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2CC0075FE85F40F7BC29540659E993AE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2CC0075FE85F40F7BC29540659E993AE-->  <VALUE><![CDATA[NotAllowedDBColumnName]]></VALUE>
+<!--2CC0075FE85F40F7BC29540659E993AE-->  <MSGTEXT><![CDATA[Not allowed DB column name]]></MSGTEXT>
+<!--2CC0075FE85F40F7BC29540659E993AE-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--2CC0075FE85F40F7BC29540659E993AE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2CC0075FE85F40F7BC29540659E993AE--></AD_MESSAGE>
+
 <!--2D16D614EF1C414F8B391F4C5BE8C74F--><AD_MESSAGE>
 <!--2D16D614EF1C414F8B391F4C5BE8C74F-->  <AD_MESSAGE_ID><![CDATA[2D16D614EF1C414F8B391F4C5BE8C74F]]></AD_MESSAGE_ID>
 <!--2D16D614EF1C414F8B391F4C5BE8C74F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17356,6 +17367,17 @@
 <!--785509D8468543F4AF2FE440D9511CF1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--785509D8468543F4AF2FE440D9511CF1--></AD_MESSAGE>
 
+<!--7872761C619E485182E19AD8B06AA2F9--><AD_MESSAGE>
+<!--7872761C619E485182E19AD8B06AA2F9-->  <AD_MESSAGE_ID><![CDATA[7872761C619E485182E19AD8B06AA2F9]]></AD_MESSAGE_ID>
+<!--7872761C619E485182E19AD8B06AA2F9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7872761C619E485182E19AD8B06AA2F9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7872761C619E485182E19AD8B06AA2F9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7872761C619E485182E19AD8B06AA2F9-->  <VALUE><![CDATA[NotAllowedFieldName]]></VALUE>
+<!--7872761C619E485182E19AD8B06AA2F9-->  <MSGTEXT><![CDATA[Not allowed field name]]></MSGTEXT>
+<!--7872761C619E485182E19AD8B06AA2F9-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--7872761C619E485182E19AD8B06AA2F9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7872761C619E485182E19AD8B06AA2F9--></AD_MESSAGE>
+
 <!--788D557BF85D47B2A8C0365C0C14B004--><AD_MESSAGE>
 <!--788D557BF85D47B2A8C0365C0C14B004-->  <AD_MESSAGE_ID><![CDATA[788D557BF85D47B2A8C0365C0C14B004]]></AD_MESSAGE_ID>
 <!--788D557BF85D47B2A8C0365C0C14B004-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -18241,6 +18263,17 @@
 <!--98A052B862994F0BB4AA32BC78434C07-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--98A052B862994F0BB4AA32BC78434C07--></AD_MESSAGE>
 
+<!--99F2343EA0D34540AEE18D182EBBCD67--><AD_MESSAGE>
+<!--99F2343EA0D34540AEE18D182EBBCD67-->  <AD_MESSAGE_ID><![CDATA[99F2343EA0D34540AEE18D182EBBCD67]]></AD_MESSAGE_ID>
+<!--99F2343EA0D34540AEE18D182EBBCD67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--99F2343EA0D34540AEE18D182EBBCD67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--99F2343EA0D34540AEE18D182EBBCD67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--99F2343EA0D34540AEE18D182EBBCD67-->  <VALUE><![CDATA[NotAllowedElementName]]></VALUE>
+<!--99F2343EA0D34540AEE18D182EBBCD67-->  <MSGTEXT><![CDATA[Not allowed element name]]></MSGTEXT>
+<!--99F2343EA0D34540AEE18D182EBBCD67-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--99F2343EA0D34540AEE18D182EBBCD67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--99F2343EA0D34540AEE18D182EBBCD67--></AD_MESSAGE>
+
 <!--9A6B5D3A2FC544C79ABB21C6029DC24D--><AD_MESSAGE>
 <!--9A6B5D3A2FC544C79ABB21C6029DC24D-->  <AD_MESSAGE_ID><![CDATA[9A6B5D3A2FC544C79ABB21C6029DC24D]]></AD_MESSAGE_ID>
 <!--9A6B5D3A2FC544C79ABB21C6029DC24D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>