Merge 9982:e8f87fe85f34

migration/i2.0/oracle/201311201053_IDEMPIERE-1541.sql

@@ -0,0 +1,11 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- 20/11/2013 10:53:00 AM COT
+-- IDEMPIERE-1541 missing translation - mini calendar - more
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','more',200239,'D','ce211d63-ece3-4ac8-bd30-c2d3456527c0','more','Y',TO_DATE('2013-11-20 10:52:59','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-11-20 10:52:59','YYYY-MM-DD HH24:MI:SS'),0)
+;
+
+SELECT register_migration_script('201311201053_IDEMPIERE-1541.sql') FROM dual
+;
+

migration/i2.0/oracle/201311221611_IDEMPIERE-325.sql

@@ -0,0 +1,23 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Nov 22, 2013 3:55:16 PM COT
+-- IDEMPIERE-325 Complete AD based info window
+INSERT INTO AD_Tab (ImportFields,Processing,IsSingleRow,AD_Window_ID,SeqNo,IsTranslationTab,IsSortTab,AD_Table_ID,HasTree,IsInfoTab,IsReadOnly,AD_Column_ID,IsInsertRecord,IsAdvancedTab,TabLevel,AD_Tab_UU,EntityType,Name,AD_Tab_ID,AD_Org_ID,Created,CreatedBy,Updated,UpdatedBy,IsActive,AD_Client_ID) VALUES ('N','N','Y',151,50,'N','N',897,'N','N','Y',15790,'N','N',1,'9bad0b5e-9dc9-421f-9156-c6ee736f6f46','D','Used in Info Column',200113,0,TO_DATE('2013-11-22 15:55:06','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-11-22 15:55:06','YYYY-MM-DD HH24:MI:SS'),100,'Y',0)
+;
+
+-- Nov 22, 2013 3:58:20 PM COT
+INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField) VALUES (0,'N',200113,14,'N','N',15784,10,'Y',202536,'Y','The Info window is used to search and select records as well as display information relevant to the selection.','D','Info and search/select Window','Info Window','6ca76b42-60e2-42fd-b0da-d1139bcc2dbf','Y','N',100,0,TO_DATE('2013-11-22 15:58:11','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-11-22 15:58:11','YYYY-MM-DD HH24:MI:SS'),'Y','Y',10,1,'N',0,2,1,'N')
+;
+
+-- Nov 22, 2013 4:00:15 PM COT
+INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,AD_Reference_ID,EntityType,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField) VALUES (0,'N',200113,10,'N','N',15773,20,'Y',202537,'Y','Column in the Info Window for display and/or selection.  If used for selection, the column cannot be a SQL expression. The SQL clause must be fully qualified based on the FROM clause in the Info Window definition',19,'D','Info Window Column','Info Column','77dbd70f-6abb-4853-8d4d-f500e69d6bf6','Y','N',100,0,TO_DATE('2013-11-22 16:00:07','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-11-22 16:00:07','YYYY-MM-DD HH24:MI:SS'),'Y','Y',20,1,'N',0,2,1,'N')
+;
+
+-- Nov 22, 2013 4:01:08 PM COT
+INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField) VALUES (0,'N',200113,10,'N','N',208350,30,'Y',202538,'N','The Column Name indicates the name of a column on a table as defined in the database.','D','Name of the column in the database','DB Column Name','fbf25dc2-a23a-481b-8578-73d6e3ed4fcb','Y','N',100,0,TO_DATE('2013-11-22 16:01:00','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-11-22 16:01:00','YYYY-MM-DD HH24:MI:SS'),'Y','Y',30,4,'N',0,2,1,'N')
+;
+
+SELECT register_migration_script('201311221611_IDEMPIERE-325.sql') FROM dual
+;
+

migration/i2.0/oracle/201311261943_IDEMPIERE-594.sql

@@ -0,0 +1,47 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Nov 26, 2013 7:43:01 PM COT
+-- IDEMPIERE-594 Improve positioning on windows / Fix Relation Type window layout
+UPDATE AD_Field SET SeqNo=20, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-11-26 19:43:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58069
+;
+
+-- Nov 26, 2013 7:43:01 PM COT
+UPDATE AD_Field SET SeqNo=40,Updated=TO_DATE('2013-11-26 19:43:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58066
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=50,Updated=TO_DATE('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58067
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=60,Updated=TO_DATE('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58075
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=70,Updated=TO_DATE('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58071
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=80, IsDisplayed='Y', XPosition=4, ColumnSpan=2,Updated=TO_DATE('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58072
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=90, IsDisplayed='Y', XPosition=1,Updated=TO_DATE('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58073
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=100, IsDisplayed='Y', XPosition=4, ColumnSpan=2,Updated=TO_DATE('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58074
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=110, IsDisplayed='Y', XPosition=2,Updated=TO_DATE('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58064
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=0,Updated=TO_DATE('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58070
+;
+
+SELECT register_migration_script('201311261943_IDEMPIERE-594.sql') FROM dual
+;
+

migration/i2.0/postgresql/201311201053_IDEMPIERE-1541.sql

@@ -0,0 +1,8 @@
+-- 20/11/2013 10:53:00 AM COT
+-- IDEMPIERE-1541 missing translation - mini calendar - more
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','more',200239,'D','ce211d63-ece3-4ac8-bd30-c2d3456527c0','more','Y',TO_TIMESTAMP('2013-11-20 10:52:59','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-11-20 10:52:59','YYYY-MM-DD HH24:MI:SS'),0)
+;
+
+SELECT register_migration_script('201311201053_IDEMPIERE-1541.sql') FROM dual
+;
+

migration/i2.0/postgresql/201311221611_IDEMPIERE-325.sql

@@ -0,0 +1,20 @@
+-- Nov 22, 2013 3:55:16 PM COT
+-- IDEMPIERE-325 Complete AD based info window
+INSERT INTO AD_Tab (ImportFields,Processing,IsSingleRow,AD_Window_ID,SeqNo,IsTranslationTab,IsSortTab,AD_Table_ID,HasTree,IsInfoTab,IsReadOnly,AD_Column_ID,IsInsertRecord,IsAdvancedTab,TabLevel,AD_Tab_UU,EntityType,Name,AD_Tab_ID,AD_Org_ID,Created,CreatedBy,Updated,UpdatedBy,IsActive,AD_Client_ID) VALUES ('N','N','Y',151,50,'N','N',897,'N','N','Y',15790,'N','N',1,'9bad0b5e-9dc9-421f-9156-c6ee736f6f46','D','Used in Info Column',200113,0,TO_TIMESTAMP('2013-11-22 15:55:06','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-11-22 15:55:06','YYYY-MM-DD HH24:MI:SS'),100,'Y',0)
+;
+
+-- Nov 22, 2013 3:58:20 PM COT
+INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField) VALUES (0,'N',200113,14,'N','N',15784,10,'Y',202536,'Y','The Info window is used to search and select records as well as display information relevant to the selection.','D','Info and search/select Window','Info Window','6ca76b42-60e2-42fd-b0da-d1139bcc2dbf','Y','N',100,0,TO_TIMESTAMP('2013-11-22 15:58:11','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-11-22 15:58:11','YYYY-MM-DD HH24:MI:SS'),'Y','Y',10,1,'N',0,2,1,'N')
+;
+
+-- Nov 22, 2013 4:00:15 PM COT
+INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,AD_Reference_ID,EntityType,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField) VALUES (0,'N',200113,10,'N','N',15773,20,'Y',202537,'Y','Column in the Info Window for display and/or selection.  If used for selection, the column cannot be a SQL expression. The SQL clause must be fully qualified based on the FROM clause in the Info Window definition',19,'D','Info Window Column','Info Column','77dbd70f-6abb-4853-8d4d-f500e69d6bf6','Y','N',100,0,TO_TIMESTAMP('2013-11-22 16:00:07','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-11-22 16:00:07','YYYY-MM-DD HH24:MI:SS'),'Y','Y',20,1,'N',0,2,1,'N')
+;
+
+-- Nov 22, 2013 4:01:08 PM COT
+INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField) VALUES (0,'N',200113,10,'N','N',208350,30,'Y',202538,'N','The Column Name indicates the name of a column on a table as defined in the database.','D','Name of the column in the database','DB Column Name','fbf25dc2-a23a-481b-8578-73d6e3ed4fcb','Y','N',100,0,TO_TIMESTAMP('2013-11-22 16:01:00','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-11-22 16:01:00','YYYY-MM-DD HH24:MI:SS'),'Y','Y',30,4,'N',0,2,1,'N')
+;
+
+SELECT register_migration_script('201311221611_IDEMPIERE-325.sql') FROM dual
+;
+

migration/i2.0/postgresql/201311261943_IDEMPIERE-594.sql

@@ -0,0 +1,44 @@
+-- Nov 26, 2013 7:43:01 PM COT
+-- IDEMPIERE-594 Improve positioning on windows / Fix Relation Type window layout
+UPDATE AD_Field SET SeqNo=20, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-11-26 19:43:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58069
+;
+
+-- Nov 26, 2013 7:43:01 PM COT
+UPDATE AD_Field SET SeqNo=40,Updated=TO_TIMESTAMP('2013-11-26 19:43:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58066
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=50,Updated=TO_TIMESTAMP('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58067
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=60,Updated=TO_TIMESTAMP('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58075
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=70,Updated=TO_TIMESTAMP('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58071
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=80, IsDisplayed='Y', XPosition=4, ColumnSpan=2,Updated=TO_TIMESTAMP('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58072
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=90, IsDisplayed='Y', XPosition=1,Updated=TO_TIMESTAMP('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58073
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=100, IsDisplayed='Y', XPosition=4, ColumnSpan=2,Updated=TO_TIMESTAMP('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58074
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=110, IsDisplayed='Y', XPosition=2,Updated=TO_TIMESTAMP('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58064
+;
+
+-- Nov 26, 2013 7:43:02 PM COT
+UPDATE AD_Field SET SeqNo=0,Updated=TO_TIMESTAMP('2013-11-26 19:43:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58070
+;
+
+SELECT register_migration_script('201311261943_IDEMPIERE-594.sql') FROM dual
+;
+

migration/processes_post_migration/oracle/02_SynchronizeTerminology.sql

@@ -6,10 +6,10 @@ INSERT INTO AD_ELEMENT_TRL (AD_Element_ID, AD_LANGUAGE, AD_Client_ID, AD_Org_ID,
 UPDATE AD_COLUMN c SET AD_Element_id = (SELECT AD_Element_ID FROM AD_ELEMENT e WHERE UPPER(c.ColumnName)=UPPER(e.ColumnName)) WHERE AD_Element_ID IS NULL
 ;
 
-DELETE AD_ELEMENT_TRL WHERE AD_Element_ID >= 1000000 AND AD_Element_ID IN (SELECT AD_Element_ID FROM AD_ELEMENT e WHERE NOT EXISTS (SELECT 1 FROM AD_COLUMN c WHERE UPPER(e.ColumnName)=UPPER(c.ColumnName)) AND NOT EXISTS (SELECT 1 FROM AD_PROCESS_PARA p WHERE UPPER(e.ColumnName)=UPPER(p.ColumnName)))
+DELETE AD_ELEMENT_TRL WHERE AD_Element_ID >= 1000000 AND AD_Element_ID IN (SELECT AD_Element_ID FROM AD_ELEMENT e WHERE NOT EXISTS (SELECT 1 FROM AD_COLUMN c WHERE UPPER(e.ColumnName)=UPPER(c.ColumnName)) AND NOT EXISTS (SELECT 1 FROM AD_PROCESS_PARA p WHERE UPPER(e.ColumnName)=UPPER(p.ColumnName)) AND NOT EXISTS (SELECT 1 FROM AD_INFOCOLUMN i WHERE UPPER(e.ColumnName)=UPPER(i.ColumnName)))
 ;
 
-DELETE AD_ELEMENT e WHERE AD_Element_ID >= 1000000 AND NOT EXISTS (SELECT 1 FROM AD_COLUMN c WHERE UPPER(e.ColumnName)=UPPER(c.ColumnName)) AND NOT EXISTS (SELECT 1 FROM AD_PROCESS_PARA p WHERE UPPER(e.ColumnName)=UPPER(p.ColumnName))
+DELETE AD_ELEMENT e WHERE AD_Element_ID >= 1000000 AND NOT EXISTS (SELECT 1 FROM AD_COLUMN c WHERE UPPER(e.ColumnName)=UPPER(c.ColumnName)) AND NOT EXISTS (SELECT 1 FROM AD_PROCESS_PARA p WHERE UPPER(e.ColumnName)=UPPER(p.ColumnName)) AND NOT EXISTS (SELECT 1 FROM AD_INFOCOLUMN i WHERE UPPER(e.ColumnName)=UPPER(i.ColumnName))
 ;
 
 UPDATE AD_COLUMN c SET (ColumnName, Name, Description, Help) = (SELECT ColumnName, Name, Description, Help FROM AD_ELEMENT e WHERE c.AD_Element_ID=e.AD_Element_ID), Updated = SYSDATE WHERE EXISTS (SELECT 1 FROM AD_ELEMENT e WHERE c.AD_Element_ID=e.AD_Element_ID AND (c.ColumnName <> e.ColumnName OR c.Name <> e.Name OR NVL(c.Description,' ') <> NVL(e.Description,' ') OR NVL(c.Help,' ') <> NVL(e.Help,' ')))

migration/processes_post_migration/postgresql/02_SynchronizeTerminology.sql

@@ -6,10 +6,10 @@ INSERT INTO AD_ELEMENT_TRL (AD_Element_ID, AD_LANGUAGE, AD_Client_ID, AD_Org_ID,
 UPDATE AD_COLUMN SET AD_Element_id = (SELECT AD_Element_ID FROM AD_ELEMENT e WHERE UPPER(AD_COLUMN.ColumnName)=UPPER(e.ColumnName)) WHERE AD_Element_ID IS NULL
 ;
 
-DELETE FROM AD_ELEMENT_TRL WHERE AD_Element_ID >= 1000000 AND AD_Element_ID IN (SELECT AD_Element_ID FROM AD_ELEMENT e WHERE NOT EXISTS (SELECT 1 FROM AD_COLUMN c WHERE UPPER(e.ColumnName)=UPPER(c.ColumnName)) AND NOT EXISTS (SELECT 1 FROM AD_PROCESS_PARA p WHERE UPPER(e.ColumnName)=UPPER(p.ColumnName)))
+DELETE FROM AD_ELEMENT_TRL WHERE AD_Element_ID >= 1000000 AND AD_Element_ID IN (SELECT AD_Element_ID FROM AD_ELEMENT e WHERE NOT EXISTS (SELECT 1 FROM AD_COLUMN c WHERE UPPER(e.ColumnName)=UPPER(c.ColumnName)) AND NOT EXISTS (SELECT 1 FROM AD_PROCESS_PARA p WHERE UPPER(e.ColumnName)=UPPER(p.ColumnName)) AND NOT EXISTS (SELECT 1 FROM AD_INFOCOLUMN i WHERE UPPER(e.ColumnName)=UPPER(i.ColumnName)))
 ;
 
-DELETE FROM AD_ELEMENT WHERE AD_Element_ID >= 1000000 AND NOT EXISTS (SELECT 1 FROM AD_COLUMN c WHERE UPPER(AD_ELEMENT.ColumnName)=UPPER(c.ColumnName)) AND NOT EXISTS (SELECT 1 FROM AD_PROCESS_PARA p WHERE UPPER(AD_ELEMENT.ColumnName)=UPPER(p.ColumnName))
+DELETE FROM AD_ELEMENT WHERE AD_Element_ID >= 1000000 AND NOT EXISTS (SELECT 1 FROM AD_COLUMN c WHERE UPPER(AD_ELEMENT.ColumnName)=UPPER(c.ColumnName)) AND NOT EXISTS (SELECT 1 FROM AD_PROCESS_PARA p WHERE UPPER(AD_ELEMENT.ColumnName)=UPPER(p.ColumnName)) AND NOT EXISTS (SELECT 1 FROM AD_INFOCOLUMN i WHERE UPPER(AD_ELEMENT.ColumnName)=UPPER(i.ColumnName))
 ;
 
 UPDATE AD_COLUMN SET ColumnName=e.ColumnName,Name=e.Name,Description=e.Description,Help=e.Help, Updated = statement_timestamp() FROM AD_ELEMENT e WHERE AD_COLUMN.AD_Element_ID=e.AD_Element_ID AND EXISTS (SELECT 1 FROM AD_ELEMENT e WHERE AD_COLUMN.AD_Element_ID=e.AD_Element_ID AND (AD_COLUMN.ColumnName <> e.ColumnName OR AD_COLUMN.Name <> e.Name OR COALESCE(AD_COLUMN.Description,' ') <> COALESCE(e.Description,' ') OR COALESCE(AD_COLUMN.Help,' ') <> COALESCE(e.Help,' ')))

org.adempiere.base.process/src/org/compiere/process/SynchronizeTerminology.java

@@ -138,7 +138,9 @@ public class SynchronizeTerminology extends SvrProcess
 				+" 	WHERE NOT EXISTS"
 				+" 	(SELECT 1 FROM AD_COLUMN c WHERE UPPER(e.ColumnName)=UPPER(c.ColumnName))"
 				+" 	AND NOT EXISTS"
-				+" 	(SELECT 1 FROM AD_PROCESS_PARA p WHERE UPPER(e.ColumnName)=UPPER(p.ColumnName)))";
+				+" 	(SELECT 1 FROM AD_PROCESS_PARA p WHERE UPPER(e.ColumnName)=UPPER(p.ColumnName))"
+				+" 	AND NOT EXISTS"
+				+" 	(SELECT 1 FROM AD_INFOCOLUMN i WHERE UPPER(e.ColumnName)=UPPER(i.ColumnName)))";
 			no = DB.executeUpdate(sql, false, get_TrxName());	  	
 			if (log.isLoggable(Level.INFO)) log.info("  rows deleted: "+no);
 			trx.commit(true);
@@ -147,7 +149,9 @@ public class SynchronizeTerminology extends SvrProcess
 				+" 	WHERE AD_Element_ID >= 1000000 AND NOT EXISTS"
 				+" 	(SELECT 1 FROM AD_COLUMN c WHERE UPPER(e.ColumnName)=UPPER(c.ColumnName))"
 				+" 	AND NOT EXISTS"
-				+" 	(SELECT 1 FROM AD_PROCESS_PARA p WHERE UPPER(e.ColumnName)=UPPER(p.ColumnName))";
+				+" 	(SELECT 1 FROM AD_PROCESS_PARA p WHERE UPPER(e.ColumnName)=UPPER(p.ColumnName))"
+				+" 	AND NOT EXISTS"
+				+" 	(SELECT 1 FROM AD_INFOCOLUMN i WHERE UPPER(e.ColumnName)=UPPER(i.ColumnName))";
 			no = DB.executeUpdate(sql, false, get_TrxName());	  	
 			if (log.isLoggable(Level.INFO)) log.info("  rows deleted: "+no);
 			trx.commit(true);

org.adempiere.base/src/org/adempiere/impexp/GridTabCSVExporter.java

@@ -16,9 +16,11 @@ package org.adempiere.impexp;
 
 import static org.compiere.model.SystemIDs.REFERENCE_PAYMENTRULE;
 
+import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,6 +49,7 @@ import org.compiere.util.DB;
 import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
 import org.compiere.util.Evaluator;
+import org.compiere.util.Ini;
 import org.compiere.util.Msg;
 import org.compiere.util.Util;
 import org.supercsv.cellprocessor.FmtBool;
@@ -76,7 +79,10 @@ public class GridTabCSVExporter implements IGridTabExporter
 		MTable table= null;
 		MTable tableDetail = null;
 		try {
-			mapWriter = new CsvMapWriter(new FileWriter(file), CsvPreference.STANDARD_PREFERENCE);
+			FileOutputStream fileOut = new FileOutputStream (file); 			
+			OutputStreamWriter oStrW = new OutputStreamWriter(fileOut, Ini.getCharset());
+			BufferedWriter bw = new BufferedWriter(oStrW); 
+			mapWriter = new CsvMapWriter(bw, CsvPreference.STANDARD_PREFERENCE);
 			String isValidTab = isValidTabToExport(gridTab);
 			if(isValidTab!=null){
 			   throw new AdempiereException(isValidTab);

org.adempiere.base/src/org/compiere/impexp/ImpFormatRow.java

@@ -24,10 +24,12 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.logging.Level;
 
+import org.adempiere.exceptions.AdempiereException;
 import org.compiere.model.Callout;
 import org.compiere.model.X_AD_ImpFormat_Row;
 import org.compiere.util.CLogger;
 import org.compiere.util.Env;
+import org.compiere.util.Util;
 
 /**
  *	Import Format Row with parsing capability
@@ -390,7 +392,7 @@ public final class ImpFormatRow
 
 	
 	/**
-	 *	Return date as YYYY-MM-DD HH24:MI:SS	(JDBC Timestamp format w/o miliseconds)
+	 *	Return date as YYYY-MM-DD HH24:MI:SS	(JDBC Timestamp format w/o milliseconds)
 	 *  @param info data
 	 *  @return date as JDBC format String
 	 */
@@ -400,7 +402,8 @@ public final class ImpFormatRow
 		{
 			try
 			{
-				m_dformat = new SimpleDateFormat(m_dataFormat);
+				if (!Util.isEmpty(m_dataFormat))
+					m_dformat = new SimpleDateFormat(m_dataFormat);
 			}
 			catch (Exception e)
 			{
@@ -418,13 +421,12 @@ public final class ImpFormatRow
 		}
 		catch (ParseException pe)
 		{
-			log.log(Level.SEVERE, "ImpFormatRow.parseDate - " + info, pe);
+			String msg = pe.getLocalizedMessage() + ": Pattern[" + m_dformat.toPattern() + "]  Data[" + info + "]";
+			throw new AdempiereException(msg);
 		}
-		if (ts == null)
-			ts = new Timestamp (System.currentTimeMillis());
 		//
 		String dateString = ts.toString();
-		return dateString.substring(0, dateString.indexOf('.'));	//	cut off miliseconds
+		return dateString.substring(0, dateString.indexOf('.'));	//	cut off milliseconds
 	}	//	parseNumber
 
 	/**

org.adempiere.report.jasper.library/META-INF/MANIFEST.MF

@@ -302,7 +302,7 @@ Import-Package: com.lowagie.text,
  groovyjarjarasm.asm.signature,
  groovyjarjarasm.asm.tree,
  groovyjarjarcommonscli,
- org.apache.batik;version="17.0.0",
+ org.apache.batik;version="1.7.0",
  org.apache.batik.anim;version="1.7.0",
  org.apache.batik.anim.timing;version="1.7.0",
  org.apache.batik.anim.values;version="1.7.0",

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java

@@ -47,6 +47,7 @@ import org.compiere.model.MUser;
 import org.compiere.util.CLogger;
 import org.compiere.util.Env;
 import org.compiere.util.Language;
+import org.compiere.util.Msg;
 import org.zkforge.keylistener.Keylistener;
 import org.zkoss.web.Attributes;
 import org.zkoss.web.servlet.Servlets;
@@ -197,6 +198,16 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
     	Env.verifyLanguage(ctx, language);
     	Env.setContext(ctx, Env.LANGUAGE, language.getAD_Language()); //Bug
 
+    	StringBuilder calendarMsgScript = new StringBuilder();
+		String monthMore = Msg.getMsg(ctx,"more");
+		String dayMore = Msg.getMsg(ctx,"more");
+		calendarMsgScript.append("function _overrideMsgCal() { msgcal.monthMORE = '+{0} ")
+			.append(monthMore).append("';");
+		calendarMsgScript.append("msgcal.dayMORE = '+{0} ")
+			.append(dayMore).append("'; }");
+		AuScript auscript = new AuScript(calendarMsgScript.toString());
+		Clients.response(auscript);
+
 		//	Create adempiere Session - user id in ctx
         Session currSess = Executions.getCurrent().getDesktop().getSession();
         HttpSession httpSess = (HttpSession) currSess.getNativeSession();

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java

@@ -411,79 +411,122 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 			if (field.getColumnName().equalsIgnoreCase(query.getZoomColumnName()))
 			{
 				gridWindow.initTab(tabIndex);
-				int parentId = DB.getSQLValue(null, "SELECT " + gTab.getLinkColumnName() + " FROM " + gTab.getTableName() + " WHERE " + query.getWhereClause());
+				int[] parentIds = DB.getIDsEx(null, "SELECT " + gTab.getLinkColumnName() + " FROM " + gTab.getTableName() + " WHERE " + query.getWhereClause());
-				if (parentId > 0)
+				if (parentIds.length > 0)
 				{
-					Map<Integer, Object[]>parentMap = new TreeMap<Integer, Object[]>();
+					GridTab parentTab = null;
-					int index = tabIndex;
+					Map<Integer, MQuery>queryMap = new TreeMap<Integer, MQuery>();
-					int oldpid = parentId;
+
-					GridTab currentTab = gTab;
+					for (int parentId : parentIds)
-					while (index > 0)
 					{
-						index--;
+						Map<Integer, Object[]>parentMap = new TreeMap<Integer, Object[]>();
-						GridTab pTab = gridWindow.getTab(index);
+						int index = tabIndex;
-						if (pTab.getTabLevel() < currentTab.getTabLevel())
+						int oldpid = parentId;
+						GridTab currentTab = gTab;
+						while (index > 0)
 						{
-							gridWindow.initTab(index);
+							index--;
-							if (index > 0)
+							GridTab pTab = gridWindow.getTab(index);
+							if (pTab.getTabLevel() < currentTab.getTabLevel())
 							{
-								if (pTab.getLinkColumnName() != null && pTab.getLinkColumnName().trim().length() > 0)
+								if (parentTab == null)
+									parentTab = pTab;
+								gridWindow.initTab(index);
+								if (index > 0)
 								{
-									int pid = DB.getSQLValue(null, "SELECT " + pTab.getLinkColumnName() + " FROM " + pTab.getTableName() + " WHERE " + currentTab.getLinkColumnName() + " = ?", oldpid);
+									if (pTab.getLinkColumnName() != null && pTab.getLinkColumnName().trim().length() > 0)
-									if (pid > 0)
 									{
-										parentMap.put(index, new Object[]{currentTab.getLinkColumnName(), oldpid});
+										int pid = DB.getSQLValue(null, "SELECT " + pTab.getLinkColumnName() + " FROM " + pTab.getTableName() + " WHERE " + currentTab.getLinkColumnName() + " = ?", oldpid);
-										oldpid = pid;
+										if (pid > 0)
-										currentTab = pTab;
+										{
-									}
+											parentMap.put(index, new Object[]{currentTab.getLinkColumnName(), oldpid});
-									else
+											oldpid = pid;
-									{
+											currentTab = pTab;
-										parentMap.clear();
+										}
-										break;
+										else
+										{
+											parentMap.clear();
+											break;
+										}
 									}
 								}
+								else
+								{
+									parentMap.put(index, new Object[]{currentTab.getLinkColumnName(), oldpid});
+								}
+							}
+						}
+	
+						for(Map.Entry<Integer, Object[]> entry : parentMap.entrySet())
+						{
+							GridTab pTab = gridWindow.getTab(entry.getKey());
+							Object[] value = entry.getValue();
+							MQuery pquery = queryMap.get(entry.getKey());
+							if (pquery == null) 
+							{
+								pquery = new MQuery(pTab.getAD_Table_ID());
+								queryMap.put(entry.getKey(), pquery);
+								pquery.addRestriction((String)value[0], "=", value[1]);
 							}
 							else
 							{
-								parentMap.put(index, new Object[]{currentTab.getLinkColumnName(), oldpid});
+								pquery.addRestriction((String)value[0], "=", value[1], null, null, false, 0);
 							}
 						}
 					}
 
-					for(Map.Entry<Integer, Object[]> entry : parentMap.entrySet())
+					for (Map.Entry<Integer, MQuery> entry : queryMap.entrySet())
 					{
 						GridTab pTab = gridWindow.getTab(entry.getKey());
-						Object[] value = entry.getValue();
-						MQuery pquery = new MQuery(pTab.getAD_Table_ID());
-						pquery.addRestriction((String)value[0], "=", value[1]);						
 						IADTabpanel tp = adTabbox.findADTabpanel(pTab);
         				tp.createUI();
         				if (tp.getTabLevel() == 0)
         				{
-        					pTab.setQuery(pquery);
+        					pTab.setQuery(entry.getValue());
         					tp.query();
         				}
         				else 
         				{
         					tp.query();
-        					pTab.setQuery(pquery);
+        					pTab.setQuery(entry.getValue());
         					tp.query();
-        				}        				
+        				}
 					}
 
 					MQuery targetQuery = new MQuery(gTab.getAD_Table_ID());
-					targetQuery.addRestriction(gTab.getLinkColumnName(), "=", parentId);
+					targetQuery.addRestriction(gTab.getLinkColumnName(), "=", parentTab.getRecord_ID());
 					gTab.setQuery(targetQuery);
 					IADTabpanel gc = null;
 					gc = adTabbox.findADTabpanel(gTab);
 					gc.createUI();
 					gc.query(false, 0, 0);
 
+					int zoomColumnIndex = -1;
 					GridTable table = gTab.getTableModel();
+					for (int i = 0; i < table.getColumnCount(); i++)
+					{
+						if (table.getColumnName(i).equalsIgnoreCase(query.getZoomColumnName()))
+						{
+							zoomColumnIndex = i;
+							break;
+						}
+					}
     				int count = table.getRowCount();
     				for(int i = 0; i < count; i++)
     				{
-    					int id = table.getKeyID(i);
+    					int id = -1;
+    					if (zoomColumnIndex >= 0) 
+    					{
+    						Object zoomValue = table.getValueAt(i, zoomColumnIndex);
+    						if (zoomValue != null && zoomValue instanceof Number)
+    						{
+    							id = ((Number)zoomValue).intValue();
+    						}
+    					}
+    					else
+    					{
+    						id = table.getKeyID(i);
+    					}
     					if (id == ((Integer)query.getZoomValue()).intValue())
     					{
     						setActiveTab(gridWindow.getTabIndex(gTab), null);

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java

@@ -37,6 +37,7 @@ import org.adempiere.webui.session.SessionManager;
 import org.adempiere.webui.theme.ThemeManager;
 import org.compiere.model.MSysConfig;
 import org.compiere.model.X_R_RequestType;
+import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.compiere.util.Util;
@@ -52,7 +53,6 @@ import org.zkoss.calendar.event.CalendarsEvent;
 import org.zkoss.calendar.impl.SimpleCalendarEvent;
 import org.zkoss.calendar.impl.SimpleCalendarModel;
 import org.zkoss.image.AImage;
-import org.zkoss.util.Locales;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.Event;
@@ -410,7 +410,7 @@ public class CalendarWindow extends Window implements EventListener<Event>, ITab
 	private void updateDateLabel() {
 		Date b = calendars.getBeginDate();
 		Date e = calendars.getEndDate();
-		SimpleDateFormat sdfV = new SimpleDateFormat("yyyy/MMM/dd", Locales.getCurrent());
+		SimpleDateFormat sdfV = DisplayType.getDateFormat();
 		sdfV.setTimeZone(calendars.getDefaultTimeZone());
 		lblDate.setValue(sdfV.format(b) + " - " + sdfV.format(e));
 	}

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java

@@ -38,6 +38,7 @@ import org.compiere.model.PO;
 import org.compiere.model.X_R_RequestType;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
 import org.compiere.util.Trx;
 import org.compiere.util.TrxEventListener;
@@ -49,7 +50,6 @@ import org.zkoss.calendar.Calendars;
 import org.zkoss.calendar.api.CalendarEvent;
 import org.zkoss.calendar.event.CalendarsEvent;
 import org.zkoss.calendar.impl.SimpleCalendarModel;
-import org.zkoss.util.Locales;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Desktop;
 import org.zkoss.zk.ui.Executions;
@@ -397,7 +397,7 @@ public class DPCalendar extends DashboardPanel implements EventListener<Event>,
 	private void updateDateLabel() {
 		Date b = calendars.getBeginDate();
 		Date e = calendars.getEndDate();
-		SimpleDateFormat sdfV = new SimpleDateFormat("yyyy/MMM/dd", Locales.getCurrent());
+		SimpleDateFormat sdfV = DisplayType.getDateFormat();
 		sdfV.setTimeZone(calendars.getDefaultTimeZone());
 		lblDate.setValue(sdfV.format(b) + " - " + sdfV.format(e));
 	}

org.adempiere.ui.zk/theme/default/zul/calendar/calendar.zul

@@ -21,7 +21,7 @@
 <style src="/theme/default/zul/calendar/calendar.css"/>
 <borderlayout id="main">
 <center border="none">
-<calendars firstDayOfWeek="Monday" mold="month" id="cal">
+<calendars firstDayOfWeek="Monday" mold="month" id="cal" xmlns:w="client" w:onBind="try{_overrideMsgCal(); var me=this; setTimeout(function(){me.onSize();},50); }catch(error){} ">
 	<toolbar sclass="calendar-toolbar">
 		<div class="float-left">
 			<hbox>

org.adempiere.ui.zk/theme/default/zul/calendar/calendar_mini.zul

@@ -10,7 +10,7 @@
 	var refresh = Util.cleanAmp(Msg.getMsg(Env.getCtx(),"Refresh"));
 ]]></zscript>
 <style src="/theme/default/zul/calendar/calendar.css"/>
-<calendars firstDayOfWeek="Monday" mold="month" id="cal">
+<calendars firstDayOfWeek="Monday" mold="month" id="cal" xmlns:w="client" w:onBind="try{_overrideMsgCal(); var me=this; setTimeout(function(){me.onSize();},50); }catch(error){} ">
 	<toolbar sclass="calendar-toolbar">
 		<div class="float-left">
 			<hbox>

org.adempiere.ui/META-INF/MANIFEST.MF

@@ -4,7 +4,8 @@ Bundle-Name: UI base
 Bundle-SymbolicName: org.adempiere.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
+ org.apache.xerces;bundle-version="2.9.0"
 Export-Package: org.compiere.apps,
  org.compiere.apps.form,
  org.compiere.apps.wf,