diff --git a/migration/331b-trunk/077_BF_1871567.sql b/migration/331b-trunk/077_BF_1871567.sql
index 85c4155eb2..a42804b7a0 100644
--- a/migration/331b-trunk/077_BF_1871567.sql
+++ b/migration/331b-trunk/077_BF_1871567.sql
@@ -1,3 +1,5 @@
+-- Review optional scripts at the end
+
 -- Jan 24, 2008 5:45:28 PM GMT-03:00
 -- BUG 1871567  -  Wrong value in Payment document
 INSERT INTO AD_ELEMENT (AD_Org_ID,UpdatedBy,Updated,PrintName,NAME,IsActive,EntityType,CreatedBy,Created,ColumnName,AD_Element_ID,AD_Client_ID) VALUES (0,100,TO_DATE('2008-01-24 17:45:27','YYYY-MM-DD HH24:MI:SS'),'Generated Draft','Generated Draft','Y','D',100,TO_DATE('2008-01-24 17:45:27','YYYY-MM-DD HH24:MI:SS'),'IsGeneratedDraft',53334,0)
@@ -14,3 +16,53 @@ INSERT INTO AD_COLUMN_TRL (AD_LANGUAGE,AD_Column_ID, NAME, IsTranslated,AD_Clien
 
 ALTER TABLE C_PAYSELECTIONCHECK ADD IsGeneratedDraft CHAR(1) DEFAULT 'N' CHECK (IsGeneratedDraft IN ('Y','N')) NOT NULL
 ;
+
+/*
+
+-- The following SQL's are not executed by default
+-- they are provided to fix C_PaySelectionCheck if you're having the problem described
+-- in BUG 1871567  -  Wrong value in Payment document
+
+-- Mark as Generated in Draft the checks from payments still not processed
+
+UPDATE C_PAYSELECTIONCHECK
+   SET isgenerateddraft = 'Y'
+ WHERE isgenerateddraft = 'N'
+   AND c_payselectioncheck_id IN (
+                 SELECT psc.c_payselectioncheck_id
+                   FROM C_PAYSELECTIONCHECK psc, C_PAYMENT p
+                  WHERE psc.c_payment_id = p.c_payment_id
+                        AND p.processed = 'N');
+						
+-- Mark as Generated in Draft the checks from payments with different amounts
+
+UPDATE C_PAYSELECTIONCHECK
+   SET isgenerateddraft = 'Y'
+ WHERE isgenerateddraft = 'N'
+   AND c_payselectioncheck_id IN (
+          SELECT psl.c_payselectioncheck_id
+            FROM C_PAYSELECTIONLINE psl, C_PAYMENT p
+           WHERE p.c_payment_id = psl.c_invoice_id
+             AND (   psl.openamt <> (p.payamt - p.discountamt)
+                  OR psl.payamt <> p.payamt
+                 )
+             AND p.c_invoice_id > 0);
+
+
+-- Mark as Generated in Draft the checks from payment allocates with different amounts
+
+UPDATE C_PAYSELECTIONCHECK
+   SET isgenerateddraft = 'Y'
+ WHERE isgenerateddraft = 'N'
+   AND c_payselectioncheck_id IN (
+          SELECT   psl.c_payselectioncheck_id
+              FROM C_PAYSELECTIONLINE psl, C_PAYMENT p, C_PAYMENTALLOCATE pa
+             WHERE p.c_payment_id = psl.c_invoice_id
+               AND (p.c_invoice_id IS NULL OR p.c_invoice_id = 0)
+               AND p.c_payment_id = pa.c_payment_id
+            HAVING (   psl.openamt <> SUM (pa.amount - pa.discountamt)
+                    OR psl.payamt <> SUM (pa.amount)
+                   )
+          GROUP BY psl.c_payselectioncheck_id, psl.openamt, psl.payamt);
+
+*/ 
\ No newline at end of file
diff --git a/migration/331b-trunk/postgresql/077_BF_1871567.sql b/migration/331b-trunk/postgresql/077_BF_1871567.sql
index 05240a9393..7644f11370 100644
--- a/migration/331b-trunk/postgresql/077_BF_1871567.sql
+++ b/migration/331b-trunk/postgresql/077_BF_1871567.sql
@@ -1,16 +1,69 @@
--- Jan 24, 2008 5:45:28 PM GMT-03:00
--- BUG 1871567  -  Wrong value in Payment document
-INSERT INTO AD_Element (AD_Org_ID,UpdatedBy,Updated,PrintName,Name,IsActive,EntityType,CreatedBy,Created,ColumnName,AD_Element_ID,AD_Client_ID) VALUES (0,100,TO_TIMESTAMP('2008-01-24 17:45:27','YYYY-MM-DD HH24:MI:SS'),'Generated Draft','Generated Draft','Y','D',100,TO_TIMESTAMP('2008-01-24 17:45:27','YYYY-MM-DD HH24:MI:SS'),'IsGeneratedDraft',53334,0)
-;
-
-INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, PrintName,PO_PrintName,PO_Name,PO_Help,PO_Description,Name,Help,Description, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Element_ID, t.PrintName,t.PO_PrintName,t.PO_Name,t.PO_Help,t.PO_Description,t.Name,t.Help,t.Description, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=53334 AND EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Element_ID!=t.AD_Element_ID)
-;
-
-INSERT INTO AD_Column (AD_Org_ID,Version,UpdatedBy,Updated,SeqNo,Name,IsUpdateable,IsTranslated,IsSyncDatabase,IsSelectionColumn,IsParent,IsMandatory,IsKey,IsIdentifier,IsEncrypted,IsAlwaysUpdateable,IsActive,FieldLength,EntityType,DefaultValue,CreatedBy,Created,ColumnName,AD_Table_ID,AD_Reference_ID,AD_Element_ID,AD_Column_ID,AD_Client_ID) VALUES (0,0,100,TO_TIMESTAMP('2008-01-24 17:46:47','YYYY-MM-DD HH24:MI:SS'),0,'Generated Draft','Y','N','N','N','N','Y','N','N','N','N','Y',1,'D','N',100,TO_TIMESTAMP('2008-01-24 17:46:47','YYYY-MM-DD HH24:MI:SS'),'IsGeneratedDraft',525,20,53334,54258,0)
-;
-
-INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=54258 AND EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Column_ID!=t.AD_Column_ID)
-;
-
-ALTER TABLE C_PaySelectionCheck ADD COLUMN IsGeneratedDraft CHAR(1) DEFAULT 'N' CHECK (IsGeneratedDraft IN ('Y','N')) NOT NULL
-;
+-- Review optional scripts at the end
+
+-- Jan 24, 2008 5:45:28 PM GMT-03:00
+-- BUG 1871567  -  Wrong value in Payment document
+INSERT INTO AD_ELEMENT (AD_Org_ID,UpdatedBy,Updated,PrintName,NAME,IsActive,EntityType,CreatedBy,Created,ColumnName,AD_Element_ID,AD_Client_ID) VALUES (0,100,TO_TIMESTAMP('2008-01-24 17:45:27','YYYY-MM-DD HH24:MI:SS'),'Generated Draft','Generated Draft','Y','D',100,TO_TIMESTAMP('2008-01-24 17:45:27','YYYY-MM-DD HH24:MI:SS'),'IsGeneratedDraft',53334,0)
+;
+
+INSERT INTO AD_ELEMENT_TRL (AD_LANGUAGE,AD_Element_ID, PrintName,PO_PrintName,PO_Name,PO_Help,PO_Description,NAME,Help,Description, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_LANGUAGE,t.AD_Element_ID, t.PrintName,t.PO_PrintName,t.PO_Name,t.PO_Help,t.PO_Description,t.NAME,t.Help,t.Description, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_LANGUAGE l, AD_ELEMENT t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=53334 AND EXISTS (SELECT * FROM AD_ELEMENT_TRL tt WHERE tt.AD_LANGUAGE!=l.AD_LANGUAGE OR tt.AD_Element_ID!=t.AD_Element_ID)
+;
+
+INSERT INTO AD_COLUMN (AD_Org_ID,VERSION,UpdatedBy,Updated,SeqNo,NAME,IsUpdateable,IsTranslated,IsSyncDatabase,IsSelectionColumn,IsParent,IsMandatory,IsKey,IsIdentifier,IsEncrypted,IsAlwaysUpdateable,IsActive,FieldLength,EntityType,DefaultValue,CreatedBy,Created,ColumnName,AD_Table_ID,AD_Reference_ID,AD_Element_ID,AD_Column_ID,AD_Client_ID) VALUES (0,0,100,TO_TIMESTAMP('2008-01-24 17:46:47','YYYY-MM-DD HH24:MI:SS'),0,'Generated Draft','Y','N','N','N','N','Y','N','N','N','N','Y',1,'D','N',100,TO_TIMESTAMP('2008-01-24 17:46:47','YYYY-MM-DD HH24:MI:SS'),'IsGeneratedDraft',525,20,53334,54258,0)
+;
+
+INSERT INTO AD_COLUMN_TRL (AD_LANGUAGE,AD_Column_ID, NAME, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_LANGUAGE,t.AD_Column_ID, t.NAME, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_LANGUAGE l, AD_COLUMN t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=54258 AND EXISTS (SELECT * FROM AD_COLUMN_TRL tt WHERE tt.AD_LANGUAGE!=l.AD_LANGUAGE OR tt.AD_Column_ID!=t.AD_Column_ID)
+;
+
+ALTER TABLE C_PAYSELECTIONCHECK ADD COLUMN IsGeneratedDraft CHAR(1) DEFAULT 'N' CHECK (IsGeneratedDraft IN ('Y','N')) NOT NULL
+;
+
+
+/*
+
+-- The following SQL's are not executed by default
+-- they are provided to fix C_PaySelectionCheck if you're having the problem described
+-- in BUG 1871567  -  Wrong value in Payment document
+
+-- Mark as Generated in Draft the checks from payments still not processed
+
+UPDATE C_PAYSELECTIONCHECK
+   SET isgenerateddraft = 'Y'
+ WHERE isgenerateddraft = 'N'
+   AND c_payselectioncheck_id IN (
+                 SELECT psc.c_payselectioncheck_id
+                   FROM C_PAYSELECTIONCHECK psc, C_PAYMENT p
+                  WHERE psc.c_payment_id = p.c_payment_id
+                        AND p.processed = 'N');
+						
+-- Mark as Generated in Draft the checks from payments with different amounts
+
+UPDATE C_PAYSELECTIONCHECK
+   SET isgenerateddraft = 'Y'
+ WHERE isgenerateddraft = 'N'
+   AND c_payselectioncheck_id IN (
+          SELECT psl.c_payselectioncheck_id
+            FROM C_PAYSELECTIONLINE psl, C_PAYMENT p
+           WHERE p.c_payment_id = psl.c_invoice_id
+             AND (   psl.openamt <> (p.payamt - p.discountamt)
+                  OR psl.payamt <> p.payamt
+                 )
+             AND p.c_invoice_id > 0);
+
+
+-- Mark as Generated in Draft the checks from payment allocates with different amounts
+
+UPDATE C_PAYSELECTIONCHECK
+   SET isgenerateddraft = 'Y'
+ WHERE isgenerateddraft = 'N'
+   AND c_payselectioncheck_id IN (
+          SELECT   psl.c_payselectioncheck_id
+              FROM C_PAYSELECTIONLINE psl, C_PAYMENT p, C_PAYMENTALLOCATE pa
+             WHERE p.c_payment_id = psl.c_invoice_id
+               AND (p.c_invoice_id IS NULL OR p.c_invoice_id = 0)
+               AND p.c_payment_id = pa.c_payment_id
+            HAVING (   psl.openamt <> SUM (pa.amount - pa.discountamt)
+                    OR psl.payamt <> SUM (pa.amount)
+                   )
+          GROUP BY psl.c_payselectioncheck_id, psl.openamt, psl.payamt);
+
+*/
\ No newline at end of file