From 65842a7312cd17901fce05b8b46b785d68e40d81 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 25 Mar 2011 21:05:04 -0500 Subject: [PATCH] FR [3132075] - Over/Under payment must be enabled by default https://sourceforge.net/tracker/?func=detail&aid=3132075&group_id=176962&atid=879335 --- migration/360lts-release/oracle/758_FR3132075.sql | 9 +++++++++ migration/360lts-release/postgresql/758_FR3132075.sql | 9 +++++++++ .../src/org/compiere/model/CalloutPayment.java | 2 +- org.adempiere.base/src/org/compiere/model/MPayment.java | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 migration/360lts-release/oracle/758_FR3132075.sql create mode 100644 migration/360lts-release/postgresql/758_FR3132075.sql diff --git a/migration/360lts-release/oracle/758_FR3132075.sql b/migration/360lts-release/oracle/758_FR3132075.sql new file mode 100644 index 0000000000..e8fb88a55a --- /dev/null +++ b/migration/360lts-release/oracle/758_FR3132075.sql @@ -0,0 +1,9 @@ +-- Dec 8, 2010 12:41:03 AM COT +-- FR3132075-Over/Under payment must be enabled by default +UPDATE AD_Column SET DefaultValue='Y',Updated=TO_DATE('2010-12-08 00:41:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7035 +; + +-- Dec 8, 2010 12:41:07 AM COT +ALTER TABLE C_Payment MODIFY IsOverUnderPayment CHAR(1) DEFAULT 'Y' +; + diff --git a/migration/360lts-release/postgresql/758_FR3132075.sql b/migration/360lts-release/postgresql/758_FR3132075.sql new file mode 100644 index 0000000000..c181db61c3 --- /dev/null +++ b/migration/360lts-release/postgresql/758_FR3132075.sql @@ -0,0 +1,9 @@ +-- Dec 8, 2010 12:41:03 AM COT +-- FR3132075-Over/Under payment must be enabled by default +UPDATE AD_Column SET DefaultValue='Y',Updated=TO_TIMESTAMP('2010-12-08 00:41:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7035 +; + +-- Dec 8, 2010 12:41:07 AM COT +ALTER TABLE c_payment ALTER isoverunderpayment SET DEFAULT 'Y' +; + diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java index 2fe8888255..e0275d10fd 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java @@ -63,7 +63,7 @@ public class CalloutPayment extends CalloutEngine // mTab.setValue ("DiscountAmt", Env.ZERO); mTab.setValue ("WriteOffAmt", Env.ZERO); - mTab.setValue ("IsOverUnderPayment", Boolean.FALSE); + // mTab.setValue ("IsOverUnderPayment", Boolean.FALSE); mTab.setValue ("OverUnderAmt", Env.ZERO); int C_InvoicePaySchedule_ID = 0; if (Env.getContextAsInt (ctx, WindowNo, Env.TAB_INFO, "C_Invoice_ID") == C_Invoice_ID.intValue () diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java index 826542c30c..2e543f7aa0 100644 --- a/org.adempiere.base/src/org/compiere/model/MPayment.java +++ b/org.adempiere.base/src/org/compiere/model/MPayment.java @@ -141,7 +141,7 @@ public final class MPayment extends X_C_Payment setDiscountAmt(Env.ZERO); setTaxAmt(Env.ZERO); setWriteOffAmt(Env.ZERO); - setIsOverUnderPayment (false); + setIsOverUnderPayment (true); setOverUnderAmt(Env.ZERO); // setDateTrx (new Timestamp(System.currentTimeMillis()));