diff --git a/base/src/org/compiere/process/NoteDelete.java b/base/src/org/compiere/process/NoteDelete.java
index 2eea3f2e40..4c229cf5b6 100644
--- a/base/src/org/compiere/process/NoteDelete.java
+++ b/base/src/org/compiere/process/NoteDelete.java
@@ -22,15 +22,21 @@ import java.util.logging.*;
 import org.compiere.util.*;
 
 /**
- *	Delere Notes (Notice)
+ *	Delete Notes (Notice)
  *	
  *  @author Jorg Janke
  *  @version $Id: NoteDelete.java,v 1.2 2006/07/30 00:51:01 jjanke Exp $
+ *  
+ *  CarlosRuiz - globalqss
+ *  [ 1639204 ] Delete Old Notes is deleting all notes
+ *  Add parameter KeepLogDays
  */
 public class NoteDelete extends SvrProcess
 {
 	private int		p_AD_User_ID = -1;
 	
+	private int		p_KeepLogDays = 0;
+	
 	/**
 	 *  Prepare - e.g., get Parameters.
 	 */
@@ -44,13 +50,15 @@ public class NoteDelete extends SvrProcess
 				;
 			else if (name.equals("AD_User_ID"))
 				p_AD_User_ID = ((BigDecimal)para[i].getParameter()).intValue();
+			else if (name.equals("KeepLogDays"))
+				p_KeepLogDays = ((BigDecimal)para[i].getParameter()).intValue();
 			else
 				log.log(Level.SEVERE, "prepare - Unknown Parameter: " + name);
 		}
 	}	//	prepare
 
 	/**
-	 *  Perrform process.
+	 *  Perform process.
 	 *  @return Message (clear text)
 	 *  @throws Exception if not successful
 	 */
@@ -61,6 +69,8 @@ public class NoteDelete extends SvrProcess
 		String sql = "DELETE FROM AD_Note WHERE AD_Client_ID=" + getAD_Client_ID();
 		if (p_AD_User_ID > 0)
 			sql += " AND AD_User_ID=" + p_AD_User_ID;
+		if (p_KeepLogDays > 0)
+			sql += " AND (Created+" + p_KeepLogDays + ") < SysDate";
 		//
 		int no = DB.executeUpdate(sql, get_TrxName());
 		return "@Deleted@ = " + no;
diff --git a/migration/331b-trunk/102_FR1639204.sql b/migration/331b-trunk/102_FR1639204.sql
new file mode 100644
index 0000000000..b357142af6
--- /dev/null
+++ b/migration/331b-trunk/102_FR1639204.sql
@@ -0,0 +1,13 @@
+-- Feb 14, 2008 11:57:23 PM COT
+-- 1639204 - Delete Old Notes is deleting all notes
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,DefaultValue,Description,EntityType,FieldLength,Help,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,2407,0,241,53130,11,'KeepLogDays',TO_DATE('2008-02-14 23:57:19','YYYY-MM-DD HH24:MI:SS'),100,'7','Number of days to keep the log entries','U',0,'Older Log entries may be deleted','Y','Y','N','N','Days to keep Log',20,TO_DATE('2008-02-14 23:57:19','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53130 AND EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Process_Para_ID!=t.AD_Process_Para_ID)
+;
+
+INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53130,100,TO_DATE('2008-02-14 23:57:39','YYYY-MM-DD HH24:MI:SS'),100,'Y','7',TO_DATE('2008-02-14 23:57:39','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+UPDATE AD_Column SET IsParent='Y', IsUpdateable='N',Updated=TO_DATE('2008-02-14 23:59:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=11396
+;
\ No newline at end of file
diff --git a/migration/331b-trunk/postgresql/102_FR1639204.sql b/migration/331b-trunk/postgresql/102_FR1639204.sql
new file mode 100644
index 0000000000..ee7c3ebad7
--- /dev/null
+++ b/migration/331b-trunk/postgresql/102_FR1639204.sql
@@ -0,0 +1,13 @@
+-- Feb 14, 2008 11:57:23 PM COT
+-- 1639204 - Delete Old Notes is deleting all notes
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,DefaultValue,Description,EntityType,FieldLength,Help,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,2407,0,241,53130,11,'KeepLogDays',TO_TIMESTAMP('2008-02-14 23:57:19','YYYY-MM-DD HH24:MI:SS'),100,'7','Number of days to keep the log entries','U',0,'Older Log entries may be deleted','Y','Y','N','N','Days to keep Log',20,TO_TIMESTAMP('2008-02-14 23:57:19','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53130 AND EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Process_Para_ID!=t.AD_Process_Para_ID)
+;
+
+INSERT INTO AD_Scheduler_Para (AD_Client_ID,AD_Org_ID,AD_Process_Para_ID,AD_Scheduler_ID,Created,CreatedBy,IsActive,ParameterDefault,Updated,UpdatedBy) VALUES (0,0,53130,100,TO_TIMESTAMP('2008-02-14 23:57:39','YYYY-MM-DD HH24:MI:SS'),100,'Y','7',TO_TIMESTAMP('2008-02-14 23:57:39','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+UPDATE AD_Column SET IsParent='Y', IsUpdateable='N',Updated=TO_TIMESTAMP('2008-02-14 23:59:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=11396
+;
\ No newline at end of file