Fix dbinconsistency (formal changes only)
authorStefan Hühner <stefan.huehner@openbravo.com>
Fri, 26 Aug 2016 10:16:17 +0200
changeset 30073 bec173360631
parent 30072 f90ca2639fbb
child 30189 62ec74ab9c44
Fix dbinconsistency (formal changes only)

Fixup some merge issue
- column order in ad_message
- add new rows for newly added fields in ad_column
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_COLUMN.xml
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Aug 17 09:11:18 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Aug 26 10:16:17 2016 +0200
@@ -264,6 +264,30 @@
 <!--0EAD499E981341CABE550FE951B274F7-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--0EAD499E981341CABE550FE951B274F7--></AD_MESSAGE>
 
+<!--0ECD7FB92C694251B309D4E96F3F3129--><AD_MESSAGE>
+<!--0ECD7FB92C694251B309D4E96F3F3129-->  <AD_MESSAGE_ID><![CDATA[0ECD7FB92C694251B309D4E96F3F3129]]></AD_MESSAGE_ID>
+<!--0ECD7FB92C694251B309D4E96F3F3129-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0ECD7FB92C694251B309D4E96F3F3129-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0ECD7FB92C694251B309D4E96F3F3129-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0ECD7FB92C694251B309D4E96F3F3129-->  <VALUE><![CDATA[OBUIAPP_Calendar_nextButtonHoverText]]></VALUE>
+<!--0ECD7FB92C694251B309D4E96F3F3129-->  <MSGTEXT><![CDATA[Next]]></MSGTEXT>
+<!--0ECD7FB92C694251B309D4E96F3F3129-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--0ECD7FB92C694251B309D4E96F3F3129-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--0ECD7FB92C694251B309D4E96F3F3129-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--0ECD7FB92C694251B309D4E96F3F3129--></AD_MESSAGE>
+
+<!--1158BE5FE2F740DC9D3B28E9FB326D79--><AD_MESSAGE>
+<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <AD_MESSAGE_ID><![CDATA[1158BE5FE2F740DC9D3B28E9FB326D79]]></AD_MESSAGE_ID>
+<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <VALUE><![CDATA[OBUIAPP_Calendar_eventEndDateFieldTitle]]></VALUE>
+<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <MSGTEXT><![CDATA[To]]></MSGTEXT>
+<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--1158BE5FE2F740DC9D3B28E9FB326D79--></AD_MESSAGE>
+
 <!--1337DB6FF60E49C9921D29411DC77BD1--><AD_MESSAGE>
 <!--1337DB6FF60E49C9921D29411DC77BD1-->  <AD_MESSAGE_ID><![CDATA[1337DB6FF60E49C9921D29411DC77BD1]]></AD_MESSAGE_ID>
 <!--1337DB6FF60E49C9921D29411DC77BD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -276,30 +300,6 @@
 <!--1337DB6FF60E49C9921D29411DC77BD1-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--1337DB6FF60E49C9921D29411DC77BD1--></AD_MESSAGE>
 
-<!--0ECD7FB92C694251B309D4E96F3F3129--><AD_MESSAGE>
-<!--0ECD7FB92C694251B309D4E96F3F3129-->  <AD_MESSAGE_ID><![CDATA[0ECD7FB92C694251B309D4E96F3F3129]]></AD_MESSAGE_ID>
-<!--0ECD7FB92C694251B309D4E96F3F3129-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--0ECD7FB92C694251B309D4E96F3F3129-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--0ECD7FB92C694251B309D4E96F3F3129-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--0ECD7FB92C694251B309D4E96F3F3129-->  <VALUE><![CDATA[OBUIAPP_Calendar_nextButtonHoverText]]></VALUE>
-<!--0ECD7FB92C694251B309D4E96F3F3129-->  <MSGTEXT><![CDATA[Next]]></MSGTEXT>
-<!--0ECD7FB92C694251B309D4E96F3F3129-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--0ECD7FB92C694251B309D4E96F3F3129-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--0ECD7FB92C694251B309D4E96F3F3129-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--0ECD7FB92C694251B309D4E96F3F3129--></AD_MESSAGE>
-
-<!--1158BE5FE2F740DC9D3B28E9FB326D79--><AD_MESSAGE>
-<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <AD_MESSAGE_ID><![CDATA[1158BE5FE2F740DC9D3B28E9FB326D79]]></AD_MESSAGE_ID>
-<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <VALUE><![CDATA[OBUIAPP_Calendar_eventEndDateFieldTitle]]></VALUE>
-<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <MSGTEXT><![CDATA[To]]></MSGTEXT>
-<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--1158BE5FE2F740DC9D3B28E9FB326D79-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--1158BE5FE2F740DC9D3B28E9FB326D79--></AD_MESSAGE>
-
 <!--14E32CCB062B43E78CA7CC6DEBE3CDF8--><AD_MESSAGE>
 <!--14E32CCB062B43E78CA7CC6DEBE3CDF8-->  <AD_MESSAGE_ID><![CDATA[14E32CCB062B43E78CA7CC6DEBE3CDF8]]></AD_MESSAGE_ID>
 <!--14E32CCB062B43E78CA7CC6DEBE3CDF8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1701,6 +1701,18 @@
 <!--BCA6318A99B54DB5A27D319C6569316B-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--BCA6318A99B54DB5A27D319C6569316B--></AD_MESSAGE>
 
+<!--C042034C61E444BCADE56F818FCFD88A--><AD_MESSAGE>
+<!--C042034C61E444BCADE56F818FCFD88A-->  <AD_MESSAGE_ID><![CDATA[C042034C61E444BCADE56F818FCFD88A]]></AD_MESSAGE_ID>
+<!--C042034C61E444BCADE56F818FCFD88A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C042034C61E444BCADE56F818FCFD88A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C042034C61E444BCADE56F818FCFD88A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C042034C61E444BCADE56F818FCFD88A-->  <VALUE><![CDATA[OBUIAPP_Calendar_invalidDateMessage]]></VALUE>
+<!--C042034C61E444BCADE56F818FCFD88A-->  <MSGTEXT><![CDATA[From must be before To]]></MSGTEXT>
+<!--C042034C61E444BCADE56F818FCFD88A-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--C042034C61E444BCADE56F818FCFD88A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--C042034C61E444BCADE56F818FCFD88A-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--C042034C61E444BCADE56F818FCFD88A--></AD_MESSAGE>
+
 <!--C2E68125A8E7418FA7CC0CC3779EAFD0--><AD_MESSAGE>
 <!--C2E68125A8E7418FA7CC0CC3779EAFD0-->  <AD_MESSAGE_ID><![CDATA[C2E68125A8E7418FA7CC0CC3779EAFD0]]></AD_MESSAGE_ID>
 <!--C2E68125A8E7418FA7CC0CC3779EAFD0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1713,18 +1725,6 @@
 <!--C2E68125A8E7418FA7CC0CC3779EAFD0-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--C2E68125A8E7418FA7CC0CC3779EAFD0--></AD_MESSAGE>
 
-<!--C042034C61E444BCADE56F818FCFD88A--><AD_MESSAGE>
-<!--C042034C61E444BCADE56F818FCFD88A-->  <AD_MESSAGE_ID><![CDATA[C042034C61E444BCADE56F818FCFD88A]]></AD_MESSAGE_ID>
-<!--C042034C61E444BCADE56F818FCFD88A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--C042034C61E444BCADE56F818FCFD88A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--C042034C61E444BCADE56F818FCFD88A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C042034C61E444BCADE56F818FCFD88A-->  <VALUE><![CDATA[OBUIAPP_Calendar_invalidDateMessage]]></VALUE>
-<!--C042034C61E444BCADE56F818FCFD88A-->  <MSGTEXT><![CDATA[From must be before To]]></MSGTEXT>
-<!--C042034C61E444BCADE56F818FCFD88A-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--C042034C61E444BCADE56F818FCFD88A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--C042034C61E444BCADE56F818FCFD88A-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--C042034C61E444BCADE56F818FCFD88A--></AD_MESSAGE>
-
 <!--C415C626CAE14E35A7F05C42F11DA114--><AD_MESSAGE>
 <!--C415C626CAE14E35A7F05C42F11DA114-->  <AD_MESSAGE_ID><![CDATA[C415C626CAE14E35A7F05C42F11DA114]]></AD_MESSAGE_ID>
 <!--C415C626CAE14E35A7F05C42F11DA114-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Wed Aug 17 09:11:18 2016 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Fri Aug 26 10:16:17 2016 +0200
@@ -370073,6 +370073,9 @@
 <!--E61022D568524DD78F02815F50092DB8-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--E61022D568524DD78F02815F50092DB8-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--E61022D568524DD78F02815F50092DB8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--E61022D568524DD78F02815F50092DB8-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--E61022D568524DD78F02815F50092DB8-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E61022D568524DD78F02815F50092DB8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E61022D568524DD78F02815F50092DB8--></AD_COLUMN>
 
 <!--E631C21ED303AC60E040007F01002676--><AD_COLUMN>