From c9a766c806714f76bc12e79b0c67d47e66e23776 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 2 Nov 2020 03:39:40 +0100 Subject: [PATCH] IDEMPIERE-4297 Improve test data (#344) Fix error reported by @hengsin Doc_Invoice.getValidCombination_ID: NO account Type=4 Make explicit the deprecation in code and hide the deprecated account fields on IDEMPIERE-362 --- .../i7.1z/oracle/202011012009_4297_362.sql | 43 +++++++++++++++++++ .../postgresql/202011012009_4297_362.sql | 40 +++++++++++++++++ .../src/org/compiere/acct/Doc.java | 8 ++-- .../src/org/compiere/acct/Doc_Invoice.java | 8 +++- 4 files changed, 93 insertions(+), 6 deletions(-) create mode 100644 migration/i7.1z/oracle/202011012009_4297_362.sql create mode 100644 migration/i7.1z/postgresql/202011012009_4297_362.sql diff --git a/migration/i7.1z/oracle/202011012009_4297_362.sql b/migration/i7.1z/oracle/202011012009_4297_362.sql new file mode 100644 index 0000000000..456450bd3b --- /dev/null +++ b/migration/i7.1z/oracle/202011012009_4297_362.sql @@ -0,0 +1,43 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-4297 Improve test data + IDEMPIERE-362 +-- Nov 1, 2020, 8:06:40 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-11-01 20:06:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12354 +; + +-- Nov 1, 2020, 8:07:11 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-11-01 20:07:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2602 +; + +-- Nov 1, 2020, 8:08:20 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-11-01 20:08:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2660 +; + +-- Nov 1, 2020, 8:08:23 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-11-01 20:08:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12349 +; + +-- Nov 1, 2020, 8:08:26 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-11-01 20:08:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5134 +; + +-- Nov 1, 2020, 8:08:28 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-11-01 20:08:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4095 +; + +-- Nov 1, 2020, 8:08:30 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-11-01 20:08:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4094 +; + +-- Nov 1, 2020, 8:08:35 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-11-01 20:08:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4093 +; + +-- Nov 1, 2020, 8:08:37 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-11-01 20:08:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4092 +; + +SELECT register_migration_script('202011012009_4297_362.sql') FROM dual +; + diff --git a/migration/i7.1z/postgresql/202011012009_4297_362.sql b/migration/i7.1z/postgresql/202011012009_4297_362.sql new file mode 100644 index 0000000000..4c7048b603 --- /dev/null +++ b/migration/i7.1z/postgresql/202011012009_4297_362.sql @@ -0,0 +1,40 @@ +-- IDEMPIERE-4297 Improve test data + IDEMPIERE-362 +-- Nov 1, 2020, 8:06:40 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-11-01 20:06:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12354 +; + +-- Nov 1, 2020, 8:07:11 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-11-01 20:07:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2602 +; + +-- Nov 1, 2020, 8:08:20 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-11-01 20:08:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2660 +; + +-- Nov 1, 2020, 8:08:23 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-11-01 20:08:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12349 +; + +-- Nov 1, 2020, 8:08:26 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-11-01 20:08:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5134 +; + +-- Nov 1, 2020, 8:08:28 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-11-01 20:08:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4095 +; + +-- Nov 1, 2020, 8:08:30 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-11-01 20:08:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4094 +; + +-- Nov 1, 2020, 8:08:35 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-11-01 20:08:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4093 +; + +-- Nov 1, 2020, 8:08:37 PM CET +UPDATE AD_Field SET IsActive='N', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-11-01 20:08:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4092 +; + +SELECT register_migration_script('202011012009_4297_362.sql') FROM dual +; + diff --git a/org.adempiere.base/src/org/compiere/acct/Doc.java b/org.adempiere.base/src/org/compiere/acct/Doc.java index aab3a6403c..80963d8673 100644 --- a/org.adempiere.base/src/org/compiere/acct/Doc.java +++ b/org.adempiere.base/src/org/compiere/acct/Doc.java @@ -1228,9 +1228,9 @@ public abstract class Doc /** Account Type - Invoice - AP */ public static final int ACCTTYPE_V_Liability = 2; /** Account Type - Invoice - AP Service */ - public static final int ACCTTYPE_V_Liability_Services = 3; + public static final int ACCTTYPE_V_Liability_Services = 3; // Deprecated IDEMPIERE-362 /** Account Type - Invoice - AR Service */ - public static final int ACCTTYPE_C_Receivable_Services = 4; + public static final int ACCTTYPE_C_Receivable_Services = 4; // Deprecated IDEMPIERE-362 /** Account Type - Payment - Unallocated */ public static final int ACCTTYPE_UnallocatedCash = 10; @@ -1313,7 +1313,7 @@ public abstract class Doc sql = "SELECT V_Liability_Acct FROM C_BP_Vendor_Acct WHERE C_BPartner_ID=? AND C_AcctSchema_ID=?"; para_1 = getC_BPartner_ID(); } - else if (AcctType == ACCTTYPE_V_Liability_Services) + else if (AcctType == ACCTTYPE_V_Liability_Services) // Deprecated IDEMPIERE-362 { sql = "SELECT V_Liability_Services_Acct FROM C_BP_Vendor_Acct WHERE C_BPartner_ID=? AND C_AcctSchema_ID=?"; para_1 = getC_BPartner_ID(); @@ -1323,7 +1323,7 @@ public abstract class Doc sql = "SELECT C_Receivable_Acct FROM C_BP_Customer_Acct WHERE C_BPartner_ID=? AND C_AcctSchema_ID=?"; para_1 = getC_BPartner_ID(); } - else if (AcctType == ACCTTYPE_C_Receivable_Services) + else if (AcctType == ACCTTYPE_C_Receivable_Services) // Deprecated IDEMPIERE-362 { sql = "SELECT C_Receivable_Services_Acct FROM C_BP_Customer_Acct WHERE C_BPartner_ID=? AND C_AcctSchema_ID=?"; para_1 = getC_BPartner_ID(); diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java b/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java index 212e839655..87d66b2bf6 100644 --- a/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java +++ b/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java @@ -418,7 +418,9 @@ public class Doc_Invoice extends Doc // Receivables DR int receivables_ID = getValidCombination_ID(Doc.ACCTTYPE_C_Receivable, as); - int receivablesServices_ID = getValidCombination_ID (Doc.ACCTTYPE_C_Receivable_Services, as); + // Deprecated IDEMPIERE-362 + // int receivablesServices_ID = getValidCombination_ID (Doc.ACCTTYPE_C_Receivable_Services, as); + int receivablesServices_ID = receivables_ID; if (m_allLinesItem || !as.isPostServices() || receivables_ID == receivablesServices_ID) { @@ -606,7 +608,9 @@ public class Doc_Invoice extends Doc // Liability CR int payables_ID = getValidCombination_ID (Doc.ACCTTYPE_V_Liability, as); - int payablesServices_ID = getValidCombination_ID (Doc.ACCTTYPE_V_Liability_Services, as); + // Deprecated IDEMPIERE-362 + // int payablesServices_ID = getValidCombination_ID (Doc.ACCTTYPE_V_Liability_Services, as); + int payablesServices_ID = payables_ID; if (m_allLinesItem || !as.isPostServices() || payables_ID == payablesServices_ID) {