diff --git a/migration/i3.1/oracle/201608071350_IDEMPIERE-2065.sql b/migration/i3.1/oracle/201608071350_IDEMPIERE-2065.sql
new file mode 100644
index 0000000000..1c8dc0559a
--- /dev/null
+++ b/migration/i3.1/oracle/201608071350_IDEMPIERE-2065.sql
@@ -0,0 +1,15 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-2065 flag Pay Schedule valid of invoice customer is not update in some case, make invoice not list in search when payment
+-- Aug 7, 2016 1:50:22 PM CEST
+UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_DATE('2016-08-07 13:50:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10326
+;
+
+-- Aug 7, 2016 1:50:27 PM CEST
+UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_DATE('2016-08-07 13:50:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=60152
+;
+
+SELECT register_migration_script('201608071350_IDEMPIERE-2065.sql') FROM dual
+;
+
diff --git a/migration/i3.1/postgresql/201608071350_IDEMPIERE-2065.sql b/migration/i3.1/postgresql/201608071350_IDEMPIERE-2065.sql
new file mode 100644
index 0000000000..7e73773864
--- /dev/null
+++ b/migration/i3.1/postgresql/201608071350_IDEMPIERE-2065.sql
@@ -0,0 +1,12 @@
+-- IDEMPIERE-2065 flag Pay Schedule valid of invoice customer is not update in some case, make invoice not list in search when payment
+-- Aug 7, 2016 1:50:22 PM CEST
+UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_TIMESTAMP('2016-08-07 13:50:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10326
+;
+
+-- Aug 7, 2016 1:50:27 PM CEST
+UPDATE AD_Column SET IsAllowCopy='N',Updated=TO_TIMESTAMP('2016-08-07 13:50:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=60152
+;
+
+SELECT register_migration_script('201608071350_IDEMPIERE-2065.sql') FROM dual
+;
+
diff --git a/org.adempiere.base/src/org/compiere/model/MInvoicePaySchedule.java b/org.adempiere.base/src/org/compiere/model/MInvoicePaySchedule.java
index d50d3ac3e9..72d58110d5 100644
--- a/org.adempiere.base/src/org/compiere/model/MInvoicePaySchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/MInvoicePaySchedule.java
@@ -40,7 +40,7 @@ public class MInvoicePaySchedule extends X_C_InvoicePaySchedule
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -1529278048406862670L;
+	private static final long serialVersionUID = 4613382619117842586L;
 
 	/**
 	 * 	Get Payment Schedule of the invoice
@@ -229,7 +229,7 @@ public class MInvoicePaySchedule extends X_C_InvoicePaySchedule
 	{
 		if (!success)
 			return success;
-		if (is_ValueChanged("DueAmt"))
+		if (is_ValueChanged("DueAmt") || is_ValueChanged("IsActive"))
 		{
 			log.fine("afterSave");
 			getParent();
@@ -239,5 +239,15 @@ public class MInvoicePaySchedule extends X_C_InvoicePaySchedule
 		return success;
 	}	//	afterSave
 
-	
+	@Override
+	protected boolean afterDelete(boolean success) {
+		if (!success)
+			return success;
+		log.fine("afterDelete");
+		getParent();
+		m_parent.validatePaySchedule();
+		m_parent.saveEx();
+		return success;
+	}	
+
 }	//	MInvoicePaySchedule
diff --git a/org.adempiere.base/src/org/compiere/model/MOrderPaySchedule.java b/org.adempiere.base/src/org/compiere/model/MOrderPaySchedule.java
index e5d85adf9d..ad9d8c3bec 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrderPaySchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrderPaySchedule.java
@@ -40,7 +40,7 @@ public class MOrderPaySchedule extends X_C_OrderPaySchedule
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -5506706349428999742L;
+	private static final long serialVersionUID = 2158181283878369676L;
 
 	/**
 	 * 	Get Payment Schedule of the Order
@@ -229,7 +229,7 @@ public class MOrderPaySchedule extends X_C_OrderPaySchedule
 	{
 		if (!success)
 			return success;
-		if (is_ValueChanged("DueAmt"))
+		if (is_ValueChanged("DueAmt") || is_ValueChanged("IsActive"))
 		{
 			log.fine("afterSave");
 			getParent();
@@ -239,5 +239,15 @@ public class MOrderPaySchedule extends X_C_OrderPaySchedule
 		return success;
 	}	//	afterSave
 
-	
+	@Override
+	protected boolean afterDelete(boolean success) {
+		if (!success)
+			return success;
+		log.fine("afterDelete");
+		getParent();
+		m_parent.validatePaySchedule();
+		m_parent.saveEx();
+		return success;
+	}	
+
 }	//	MOrderPaySchedule