From fef106746ad880bc02c7418e849a1dde7db43766 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 5 Jan 2015 18:33:53 -0500 Subject: [PATCH] IDEMPIERE-448 Add CopyFrom on Bank Statement / fix problem copying lines without charges - throwing error about Charge is mandatory --- .../i2.1/oracle/201501051826_IDEMPIERE-448.sql | 15 +++++++++++++++ .../postgresql/201501051826_IDEMPIERE-448.sql | 12 ++++++++++++ .../org/compiere/model/MBankStatementLine.java | 14 +++++++------- 3 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 migration/i2.1/oracle/201501051826_IDEMPIERE-448.sql create mode 100644 migration/i2.1/postgresql/201501051826_IDEMPIERE-448.sql diff --git a/migration/i2.1/oracle/201501051826_IDEMPIERE-448.sql b/migration/i2.1/oracle/201501051826_IDEMPIERE-448.sql new file mode 100644 index 0000000000..a1b24e0d6e --- /dev/null +++ b/migration/i2.1/oracle/201501051826_IDEMPIERE-448.sql @@ -0,0 +1,15 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Jan 5, 2015 6:14:51 PM COT +-- IDEMPIERE-448 Add CopyFrom on Bank Statement +UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2015-01-05 18:14:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=4939 +; + +-- Jan 5, 2015 6:14:59 PM COT +UPDATE AD_Field SET IsMandatory='Y',Updated=TO_DATE('2015-01-05 18:14:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4009 +; + +SELECT register_migration_script('201501051826_IDEMPIERE-448.sql') FROM dual +; + diff --git a/migration/i2.1/postgresql/201501051826_IDEMPIERE-448.sql b/migration/i2.1/postgresql/201501051826_IDEMPIERE-448.sql new file mode 100644 index 0000000000..9ff19bfb61 --- /dev/null +++ b/migration/i2.1/postgresql/201501051826_IDEMPIERE-448.sql @@ -0,0 +1,12 @@ +-- Jan 5, 2015 6:14:51 PM COT +-- IDEMPIERE-448 Add CopyFrom on Bank Statement +UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2015-01-05 18:14:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=4939 +; + +-- Jan 5, 2015 6:14:59 PM COT +UPDATE AD_Field SET IsMandatory='Y',Updated=TO_TIMESTAMP('2015-01-05 18:14:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4009 +; + +SELECT register_migration_script('201501051826_IDEMPIERE-448.sql') FROM dual +; + diff --git a/org.adempiere.base/src/org/compiere/model/MBankStatementLine.java b/org.adempiere.base/src/org/compiere/model/MBankStatementLine.java index 445f53a848..91447408f6 100644 --- a/org.adempiere.base/src/org/compiere/model/MBankStatementLine.java +++ b/org.adempiere.base/src/org/compiere/model/MBankStatementLine.java @@ -166,6 +166,13 @@ import org.compiere.util.Msg; log.saveError("ParentComplete", Msg.translate(getCtx(), "C_BankStatementLine")); return false; } + // Calculate Charge = Statement - trx - Interest + BigDecimal amt = getStmtAmt(); + amt = amt.subtract(getTrxAmt()); + amt = amt.subtract(getInterestAmt()); + if (amt.compareTo(getChargeAmt()) != 0) + setChargeAmt (amt); + // if (getChargeAmt().signum() != 0 && getC_Charge_ID() == 0) { log.saveError("FillMandatory", Msg.getElement(getCtx(), "C_Charge_ID")); @@ -199,13 +206,6 @@ import org.compiere.util.Msg; setC_BPartner_ID(invoice.getC_BPartner_ID()); } - // Calculate Charge = Statement - trx - Interest - BigDecimal amt = getStmtAmt(); - amt = amt.subtract(getTrxAmt()); - amt = amt.subtract(getInterestAmt()); - if (amt.compareTo(getChargeAmt()) != 0) - setChargeAmt (amt); - // return true; } // beforeSave