From 1162973504383b3807215cec0a928367a7497f75 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 7 Jan 2015 09:16:44 -0500 Subject: [PATCH] IDEMPIERE-1148 Account : Add checkboxes to identify account kind (bpartner, product) --- .../oracle/201501070858_IDEMPIERE-1148.sql | 27 ++++++- .../201501070858_IDEMPIERE-1148.sql | 26 ++++++- .../org/compiere/model/I_C_ElementValue.java | 27 +++++++ .../org/compiere/model/X_C_ElementValue.java | 71 ++++++++++++++++++- 4 files changed, 146 insertions(+), 5 deletions(-) diff --git a/migration/i2.1/oracle/201501070858_IDEMPIERE-1148.sql b/migration/i2.1/oracle/201501070858_IDEMPIERE-1148.sql index e83cd35860..22958ad06a 100644 --- a/migration/i2.1/oracle/201501070858_IDEMPIERE-1148.sql +++ b/migration/i2.1/oracle/201501070858_IDEMPIERE-1148.sql @@ -38,7 +38,7 @@ INSERT INTO AD_Ref_List (AD_Client_ID,AD_Org_ID,AD_Ref_List_ID,AD_Ref_List_UU,AD -- Oct 4, 2013 12:03:25 AM CEST -- IDEMPIERE-1148 -INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DefaultValue,EntityType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210873,'25a5098a-b000-4b5f-9432-1a1a893a418e',202614,0,20,188,'IsDetailBPartner',TO_DATE('2013-10-04 00:03:24','YYYY-MM-DD HH24:MI:SS'),100,'N','U',1,'Y','Y','Y','N','N','N','N','N','Y','N','N','N','N','N','N','Y','Manage Business Partners',0,0,TO_DATE('2013-10-04 00:03:24','YYYY-MM-DD HH24:MI:SS'),100,0) +INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DefaultValue,EntityType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210873,'25a5098a-b000-4b5f-9432-1a1a893a418e',202614,0,20,188,'IsDetailBPartner',TO_DATE('2013-10-04 00:03:24','YYYY-MM-DD HH24:MI:SS'),100,'N','D',1,'Y','Y','Y','N','N','N','N','N','Y','N','N','N','N','N','N','Y','Manage Business Partners',0,0,TO_DATE('2013-10-04 00:03:24','YYYY-MM-DD HH24:MI:SS'),100,0) ; -- Oct 4, 2013 12:03:32 AM CEST @@ -356,6 +356,29 @@ UPDATE AD_Field SET DisplayLogic='@IsDetailBPartner@=Y',Updated=TO_DATE('2013-10 UPDATE AD_Field SET IsSameLine='Y',Updated=TO_DATE('2013-10-04 00:09:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202521 ; +-- Jan 7, 2015 9:09:16 AM COT +UPDATE AD_Field SET DisplayLogic='@ElementType@=A & @IsSummary@=N',Updated=TO_DATE('2015-01-07 09:09:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202522 +; + +-- Jan 7, 2015 9:09:23 AM COT +UPDATE AD_Field SET DisplayLogic='@ElementType@=A & @IsSummary@=N',Updated=TO_DATE('2015-01-07 09:09:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202521 +; + +-- Jan 7, 2015 9:09:29 AM COT +UPDATE AD_Field SET DisplayLogic='@ElementType@=A & @IsSummary@=N & @IsDetailBPartner@=Y',Updated=TO_DATE('2015-01-07 09:09:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202523 +; + +-- Jan 7, 2015 9:10:10 AM COT +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=190, XPosition=2,Updated=TO_DATE('2015-01-07 09:10:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202521 +; + +-- Jan 7, 2015 9:10:10 AM COT +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=200, XPosition=4,Updated=TO_DATE('2015-01-07 09:10:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202523 +; + +-- Jan 7, 2015 9:10:10 AM COT +UPDATE AD_Field SET SeqNo=210,Updated=TO_DATE('2015-01-07 09:10:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202522 +; SELECT register_migration_script('201501070858_IDEMPIERE-1148.sql') FROM dual -; \ No newline at end of file +; diff --git a/migration/i2.1/postgresql/201501070858_IDEMPIERE-1148.sql b/migration/i2.1/postgresql/201501070858_IDEMPIERE-1148.sql index 29be4b0a1f..e6b44c724e 100644 --- a/migration/i2.1/postgresql/201501070858_IDEMPIERE-1148.sql +++ b/migration/i2.1/postgresql/201501070858_IDEMPIERE-1148.sql @@ -35,7 +35,7 @@ INSERT INTO AD_Ref_List (AD_Client_ID,AD_Org_ID,AD_Ref_List_ID,AD_Ref_List_UU,AD -- Oct 4, 2013 12:03:25 AM CEST -- IDEMPIERE-1148 -INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DefaultValue,EntityType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210873,'25a5098a-b000-4b5f-9432-1a1a893a418e',202614,0,20,188,'IsDetailBPartner',TO_TIMESTAMP('2013-10-04 00:03:24','YYYY-MM-DD HH24:MI:SS'),100,'N','U',1,'Y','Y','Y','N','N','N','N','N','Y','N','N','N','N','N','N','Y','Manage Business Partners',0,0,TO_TIMESTAMP('2013-10-04 00:03:24','YYYY-MM-DD HH24:MI:SS'),100,0) +INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DefaultValue,EntityType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210873,'25a5098a-b000-4b5f-9432-1a1a893a418e',202614,0,20,188,'IsDetailBPartner',TO_TIMESTAMP('2013-10-04 00:03:24','YYYY-MM-DD HH24:MI:SS'),100,'N','D',1,'Y','Y','Y','N','N','N','N','N','Y','N','N','N','N','N','N','Y','Manage Business Partners',0,0,TO_TIMESTAMP('2013-10-04 00:03:24','YYYY-MM-DD HH24:MI:SS'),100,0) ; -- Oct 4, 2013 12:03:32 AM CEST @@ -353,7 +353,29 @@ UPDATE AD_Field SET DisplayLogic='@IsDetailBPartner@=Y',Updated=TO_TIMESTAMP('20 UPDATE AD_Field SET IsSameLine='Y',Updated=TO_TIMESTAMP('2013-10-04 00:09:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202521 ; +-- Jan 7, 2015 9:09:16 AM COT +UPDATE AD_Field SET DisplayLogic='@ElementType@=A & @IsSummary@=N',Updated=TO_TIMESTAMP('2015-01-07 09:09:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202522 +; +-- Jan 7, 2015 9:09:23 AM COT +UPDATE AD_Field SET DisplayLogic='@ElementType@=A & @IsSummary@=N',Updated=TO_TIMESTAMP('2015-01-07 09:09:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202521 +; + +-- Jan 7, 2015 9:09:29 AM COT +UPDATE AD_Field SET DisplayLogic='@ElementType@=A & @IsSummary@=N & @IsDetailBPartner@=Y',Updated=TO_TIMESTAMP('2015-01-07 09:09:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202523 +; + +-- Jan 7, 2015 9:10:10 AM COT +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=190, XPosition=2,Updated=TO_TIMESTAMP('2015-01-07 09:10:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202521 +; + +-- Jan 7, 2015 9:10:10 AM COT +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=200, XPosition=4,Updated=TO_TIMESTAMP('2015-01-07 09:10:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202523 +; + +-- Jan 7, 2015 9:10:10 AM COT +UPDATE AD_Field SET SeqNo=210,Updated=TO_TIMESTAMP('2015-01-07 09:10:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202522 +; SELECT register_migration_script('201501070858_IDEMPIERE-1148.sql') FROM dual -; \ No newline at end of file +; diff --git a/org.adempiere.base/src/org/compiere/model/I_C_ElementValue.java b/org.adempiere.base/src/org/compiere/model/I_C_ElementValue.java index 7932ffaf3e..3e7fe8629f 100644 --- a/org.adempiere.base/src/org/compiere/model/I_C_ElementValue.java +++ b/org.adempiere.base/src/org/compiere/model/I_C_ElementValue.java @@ -88,6 +88,15 @@ public interface I_C_ElementValue */ public int getAD_Org_ID(); + /** Column name BPartnerType */ + public static final String COLUMNNAME_BPartnerType = "BPartnerType"; + + /** Set Business Partner Type */ + public void setBPartnerType (String BPartnerType); + + /** Get Business Partner Type */ + public String getBPartnerType(); + /** Column name C_BankAccount_ID */ public static final String COLUMNNAME_C_BankAccount_ID = "C_BankAccount_ID"; @@ -210,6 +219,24 @@ public interface I_C_ElementValue */ public boolean isBankAccount(); + /** Column name IsDetailBPartner */ + public static final String COLUMNNAME_IsDetailBPartner = "IsDetailBPartner"; + + /** Set Manage Business Partners */ + public void setIsDetailBPartner (boolean IsDetailBPartner); + + /** Get Manage Business Partners */ + public boolean isDetailBPartner(); + + /** Column name IsDetailProduct */ + public static final String COLUMNNAME_IsDetailProduct = "IsDetailProduct"; + + /** Set Manage Products */ + public void setIsDetailProduct (boolean IsDetailProduct); + + /** Get Manage Products */ + public boolean isDetailProduct(); + /** Column name IsDocControlled */ public static final String COLUMNNAME_IsDocControlled = "IsDocControlled"; diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ElementValue.java b/org.adempiere.base/src/org/compiere/model/X_C_ElementValue.java index 8aa1d37b52..1b5af75228 100644 --- a/org.adempiere.base/src/org/compiere/model/X_C_ElementValue.java +++ b/org.adempiere.base/src/org/compiere/model/X_C_ElementValue.java @@ -31,7 +31,7 @@ public class X_C_ElementValue extends PO implements I_C_ElementValue, I_Persiste /** * */ - private static final long serialVersionUID = 20141030L; + private static final long serialVersionUID = 20150107L; /** Standard Constructor */ public X_C_ElementValue (Properties ctx, int C_ElementValue_ID, String trxName) @@ -45,6 +45,10 @@ public class X_C_ElementValue extends PO implements I_C_ElementValue, I_Persiste // E setC_Element_ID (0); setC_ElementValue_ID (0); + setIsDetailBPartner (false); +// N + setIsDetailProduct (false); +// N setIsSummary (false); setName (null); setPostActual (true); @@ -145,6 +149,29 @@ public class X_C_ElementValue extends PO implements I_C_ElementValue, I_Persiste return (String)get_Value(COLUMNNAME_AccountType); } + /** BPartnerType AD_Reference_ID=200076 */ + public static final int BPARTNERTYPE_AD_Reference_ID=200076; + /** Customer = C */ + public static final String BPARTNERTYPE_Customer = "C"; + /** Vendor = V */ + public static final String BPARTNERTYPE_Vendor = "V"; + /** Employee = E */ + public static final String BPARTNERTYPE_Employee = "E"; + /** Set Business Partner Type. + @param BPartnerType Business Partner Type */ + public void setBPartnerType (String BPartnerType) + { + + set_Value (COLUMNNAME_BPartnerType, BPartnerType); + } + + /** Get Business Partner Type. + @return Business Partner Type */ + public String getBPartnerType () + { + return (String)get_Value(COLUMNNAME_BPartnerType); + } + public org.compiere.model.I_C_BankAccount getC_BankAccount() throws RuntimeException { return (org.compiere.model.I_C_BankAccount)MTable.get(getCtx(), org.compiere.model.I_C_BankAccount.Table_Name) @@ -307,6 +334,48 @@ public class X_C_ElementValue extends PO implements I_C_ElementValue, I_Persiste return false; } + /** Set Manage Business Partners. + @param IsDetailBPartner Manage Business Partners */ + public void setIsDetailBPartner (boolean IsDetailBPartner) + { + set_Value (COLUMNNAME_IsDetailBPartner, Boolean.valueOf(IsDetailBPartner)); + } + + /** Get Manage Business Partners. + @return Manage Business Partners */ + public boolean isDetailBPartner () + { + Object oo = get_Value(COLUMNNAME_IsDetailBPartner); + if (oo != null) + { + if (oo instanceof Boolean) + return ((Boolean)oo).booleanValue(); + return "Y".equals(oo); + } + return false; + } + + /** Set Manage Products. + @param IsDetailProduct Manage Products */ + public void setIsDetailProduct (boolean IsDetailProduct) + { + set_Value (COLUMNNAME_IsDetailProduct, Boolean.valueOf(IsDetailProduct)); + } + + /** Get Manage Products. + @return Manage Products */ + public boolean isDetailProduct () + { + Object oo = get_Value(COLUMNNAME_IsDetailProduct); + if (oo != null) + { + if (oo instanceof Boolean) + return ((Boolean)oo).booleanValue(); + return "Y".equals(oo); + } + return false; + } + /** Set Document Controlled. @param IsDocControlled Control account - If an account is controlled by a document, you cannot post manually to it