diff --git a/base/src/org/compiere/FA/CreateGLAsset.java b/base/src/org/compiere/FA/CreateGLAsset.java index 9fe1044d9a..903e49b74b 100644 --- a/base/src/org/compiere/FA/CreateGLAsset.java +++ b/base/src/org/compiere/FA/CreateGLAsset.java @@ -237,7 +237,7 @@ public class CreateGLAsset extends SvrProcess change.setC_BPartner_ID(asset.getC_BPartner_ID()); change.setAssetValueAmt(JVLine.getAmtAcctDr().subtract(JVLine.getAmtAcctCr())); change.setA_Asset_CreateDate(asset.getA_Asset_CreateDate()); - change.setAd_User_ID(asset.getAD_User_ID()); + change.setAD_User_ID(asset.getAD_User_ID()); change.setC_Location_ID(asset.getC_Location_ID()); change.save(); } diff --git a/base/src/org/compiere/FA/CreateInvoicedAsset.java b/base/src/org/compiere/FA/CreateInvoicedAsset.java index fc75c9dda4..eb1f4d4c09 100644 --- a/base/src/org/compiere/FA/CreateInvoicedAsset.java +++ b/base/src/org/compiere/FA/CreateInvoicedAsset.java @@ -259,7 +259,7 @@ public class CreateInvoicedAsset extends SvrProcess change.setA_QTY_Current(InvoiceLine.getQtyEntered()); change.setA_QTY_Original(InvoiceLine.getQtyEntered()); change.setA_Asset_CreateDate(asset.getA_Asset_CreateDate()); - change.setAd_User_ID(asset.getAD_User_ID()); + change.setAD_User_ID(asset.getAD_User_ID()); change.setC_Location_ID(asset.getC_Location_ID()); change.save(); } diff --git a/base/src/org/compiere/model/I_A_Asset_Change.java b/base/src/org/compiere/model/I_A_Asset_Change.java index eb37cccbff..87b6000799 100644 --- a/base/src/org/compiere/model/I_A_Asset_Change.java +++ b/base/src/org/compiere/model/I_A_Asset_Change.java @@ -139,14 +139,6 @@ public interface I_A_Asset_Change /** Get A_Asset_Spread_Type */ public int getA_Asset_Spread_Type(); - /** Column name AD_Client_ID */ - public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID"; - - /** Get Client. - * Client/Tenant for this installation. - */ - public int getAD_Client_ID(); - /** Column name A_Depreciation_Acct */ public static final String COLUMNNAME_A_Depreciation_Acct = "A_Depreciation_Acct"; @@ -219,28 +211,6 @@ public interface I_A_Asset_Change /** Get Disposal Revenue */ public int getA_Disposal_Revenue(); - /** Column name AD_Org_ID */ - public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID"; - - /** Set Organization. - * Organizational entity within client - */ - public void setAD_Org_ID (int AD_Org_ID); - - /** Get Organization. - * Organizational entity within client - */ - public int getAD_Org_ID(); - - /** Column name Ad_User_ID */ - public static final String COLUMNNAME_Ad_User_ID = "Ad_User_ID"; - - /** Set Ad_User_ID */ - public void setAd_User_ID (int Ad_User_ID); - - /** Get Ad_User_ID */ - public int getAd_User_ID(); - /** Column name A_Parent_Asset_ID */ public static final String COLUMNNAME_A_Parent_Asset_ID = "A_Parent_Asset_ID"; @@ -358,6 +328,40 @@ public interface I_A_Asset_Change /** Get Split Percentage */ public BigDecimal getA_Split_Percent(); + /** Column name AD_Client_ID */ + public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID"; + + /** Get Client. + * Client/Tenant for this installation. + */ + public int getAD_Client_ID(); + + /** Column name AD_Org_ID */ + public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID"; + + /** Set Organization. + * Organizational entity within client + */ + public void setAD_Org_ID (int AD_Org_ID); + + /** Get Organization. + * Organizational entity within client + */ + public int getAD_Org_ID(); + + /** Column name AD_User_ID */ + public static final String COLUMNNAME_AD_User_ID = "AD_User_ID"; + + /** Set User/Contact. + * User within the system - Internal or Business Partner Contact + */ + public void setAD_User_ID (int AD_User_ID); + + /** Get User/Contact. + * User within the system - Internal or Business Partner Contact + */ + public int getAD_User_ID(); + /** Column name AssetAccumDepreciationAmt */ public static final String COLUMNNAME_AssetAccumDepreciationAmt = "AssetAccumDepreciationAmt"; @@ -482,6 +486,32 @@ public interface I_A_Asset_Change */ public int getC_BPartner_Location_ID(); + /** Column name C_Location_ID */ + public static final String COLUMNNAME_C_Location_ID = "C_Location_ID"; + + /** Set Address. + * Location or Address + */ + public void setC_Location_ID (int C_Location_ID); + + /** Get Address. + * Location or Address + */ + public int getC_Location_ID(); + + /** Column name C_ValidCombination_ID */ + public static final String COLUMNNAME_C_ValidCombination_ID = "C_ValidCombination_ID"; + + /** Set Combination. + * Valid Account Combination + */ + public void setC_ValidCombination_ID (int C_ValidCombination_ID); + + /** Get Combination. + * Valid Account Combination + */ + public int getC_ValidCombination_ID(); + /** Column name ChangeAmt */ public static final String COLUMNNAME_ChangeAmt = "ChangeAmt"; @@ -509,19 +539,6 @@ public interface I_A_Asset_Change /** Get ChangeType */ public String getChangeType(); - /** Column name C_Location_ID */ - public static final String COLUMNNAME_C_Location_ID = "C_Location_ID"; - - /** Set Address. - * Location or Address - */ - public void setC_Location_ID (int C_Location_ID); - - /** Get Address. - * Location or Address - */ - public int getC_Location_ID(); - /** Column name ConventionType */ public static final String COLUMNNAME_ConventionType = "ConventionType"; @@ -547,19 +564,6 @@ public interface I_A_Asset_Change */ public int getCreatedBy(); - /** Column name C_ValidCombination_ID */ - public static final String COLUMNNAME_C_ValidCombination_ID = "C_ValidCombination_ID"; - - /** Set Combination. - * Valid Account Combination - */ - public void setC_ValidCombination_ID (int C_ValidCombination_ID); - - /** Get Combination. - * Valid Account Combination - */ - public int getC_ValidCombination_ID(); - /** Column name DateAcct */ public static final String COLUMNNAME_DateAcct = "DateAcct"; diff --git a/base/src/org/compiere/model/MAsset.java b/base/src/org/compiere/model/MAsset.java index 761bb88853..e976da21b5 100644 --- a/base/src/org/compiere/model/MAsset.java +++ b/base/src/org/compiere/model/MAsset.java @@ -611,7 +611,7 @@ public class MAsset extends X_A_Asset change.setA_QTY_Current(getA_QTY_Current()); change.setA_QTY_Original(getA_QTY_Original()); change.setA_Asset_CreateDate(getA_Asset_CreateDate()); - change.setAd_User_ID(getAD_User_ID()); + change.setAD_User_ID(getAD_User_ID()); change.setC_Location_ID(getC_Location_ID()); change.save(); @@ -732,7 +732,7 @@ public class MAsset extends X_A_Asset change.setA_QTY_Current(getA_QTY_Current()); change.setA_QTY_Original(getA_QTY_Original()); change.setA_Asset_CreateDate(getA_Asset_CreateDate()); - change.setAd_User_ID(getAD_User_ID()); + change.setAD_User_ID(getAD_User_ID()); change.setC_Location_ID(getC_Location_ID()); change.save(); } diff --git a/base/src/org/compiere/model/X_A_Asset_Change.java b/base/src/org/compiere/model/X_A_Asset_Change.java index 3ea58c9861..2c873ab796 100644 --- a/base/src/org/compiere/model/X_A_Asset_Change.java +++ b/base/src/org/compiere/model/X_A_Asset_Change.java @@ -414,26 +414,6 @@ public class X_A_Asset_Change extends PO implements I_A_Asset_Change, I_Persiste return ii.intValue(); } - /** Set Ad_User_ID. - @param Ad_User_ID Ad_User_ID */ - public void setAd_User_ID (int Ad_User_ID) - { - if (Ad_User_ID < 1) - set_Value (COLUMNNAME_Ad_User_ID, null); - else - set_Value (COLUMNNAME_Ad_User_ID, Integer.valueOf(Ad_User_ID)); - } - - /** Get Ad_User_ID. - @return Ad_User_ID */ - public int getAd_User_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_Ad_User_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - /** Set Asset ID. @param A_Parent_Asset_ID Asset ID */ public void setA_Parent_Asset_ID (int A_Parent_Asset_ID) @@ -664,6 +644,29 @@ public class X_A_Asset_Change extends PO implements I_A_Asset_Change, I_Persiste return bd; } + /** Set User/Contact. + @param AD_User_ID + User within the system - Internal or Business Partner Contact + */ + public void setAD_User_ID (int AD_User_ID) + { + if (AD_User_ID < 1) + set_Value (COLUMNNAME_AD_User_ID, null); + else + set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID)); + } + + /** Get User/Contact. + @return User within the system - Internal or Business Partner Contact + */ + public int getAD_User_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_AD_User_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set AssetAccumDepreciationAmt. @param AssetAccumDepreciationAmt AssetAccumDepreciationAmt */ public void setAssetAccumDepreciationAmt (BigDecimal AssetAccumDepreciationAmt) @@ -874,6 +877,52 @@ public class X_A_Asset_Change extends PO implements I_A_Asset_Change, I_Persiste return ii.intValue(); } + /** Set Address. + @param C_Location_ID + Location or Address + */ + public void setC_Location_ID (int C_Location_ID) + { + if (C_Location_ID < 1) + set_Value (COLUMNNAME_C_Location_ID, null); + else + set_Value (COLUMNNAME_C_Location_ID, Integer.valueOf(C_Location_ID)); + } + + /** Get Address. + @return Location or Address + */ + public int getC_Location_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_C_Location_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + /** Set Combination. + @param C_ValidCombination_ID + Valid Account Combination + */ + public void setC_ValidCombination_ID (int C_ValidCombination_ID) + { + if (C_ValidCombination_ID < 1) + set_Value (COLUMNNAME_C_ValidCombination_ID, null); + else + set_Value (COLUMNNAME_C_ValidCombination_ID, Integer.valueOf(C_ValidCombination_ID)); + } + + /** Get Combination. + @return Valid Account Combination + */ + public int getC_ValidCombination_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_C_ValidCombination_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set ChangeAmt. @param ChangeAmt ChangeAmt */ public void setChangeAmt (BigDecimal ChangeAmt) @@ -950,29 +999,6 @@ public class X_A_Asset_Change extends PO implements I_A_Asset_Change, I_Persiste return (String)get_Value(COLUMNNAME_ChangeType); } - /** Set Address. - @param C_Location_ID - Location or Address - */ - public void setC_Location_ID (int C_Location_ID) - { - if (C_Location_ID < 1) - set_Value (COLUMNNAME_C_Location_ID, null); - else - set_Value (COLUMNNAME_C_Location_ID, Integer.valueOf(C_Location_ID)); - } - - /** Get Address. - @return Location or Address - */ - public int getC_Location_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_C_Location_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - /** Set ConventionType. @param ConventionType ConventionType */ public void setConventionType (int ConventionType) @@ -990,29 +1016,6 @@ public class X_A_Asset_Change extends PO implements I_A_Asset_Change, I_Persiste return ii.intValue(); } - /** Set Combination. - @param C_ValidCombination_ID - Valid Account Combination - */ - public void setC_ValidCombination_ID (int C_ValidCombination_ID) - { - if (C_ValidCombination_ID < 1) - set_Value (COLUMNNAME_C_ValidCombination_ID, null); - else - set_Value (COLUMNNAME_C_ValidCombination_ID, Integer.valueOf(C_ValidCombination_ID)); - } - - /** Get Combination. - @return Valid Account Combination - */ - public int getC_ValidCombination_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_C_ValidCombination_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - /** Set Account Date. @param DateAcct Accounting Date diff --git a/migration/353a-trunk/oracle/549_Delete_duplicate_AD_User_ID_element.sql b/migration/353a-trunk/oracle/549_Delete_duplicate_AD_User_ID_element.sql new file mode 100644 index 0000000000..a2ba43523b --- /dev/null +++ b/migration/353a-trunk/oracle/549_Delete_duplicate_AD_User_ID_element.sql @@ -0,0 +1,25 @@ +-- Aug 28, 2009 8:29:11 PM EEST +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +UPDATE AD_Column SET AD_Element_ID=138, ColumnName='AD_User_ID', Description='User within the system - Internal or Business Partner Contact', Help='The User identifies a unique user in the system. This could be an internal user or a business partner contact', Name='User/Contact',Updated=TO_DATE('2009-08-28 20:29:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=55851 +; + +-- Aug 28, 2009 8:29:11 PM EEST +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +UPDATE AD_Column_Trl SET IsTranslated='N' WHERE AD_Column_ID=55851 +; + +-- Aug 28, 2009 8:29:11 PM EEST +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +UPDATE AD_Field SET Name='User/Contact', Description='User within the system - Internal or Business Partner Contact', Help='The User identifies a unique user in the system. This could be an internal user or a business partner contact' WHERE AD_Column_ID=55851 AND IsCentrallyMaintained='Y' +; + +-- Aug 28, 2009 8:29:30 PM EEST +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +DELETE FROM AD_Element_Trl WHERE AD_Element_ID=53606 +; + +-- Aug 28, 2009 8:29:30 PM EEST +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +DELETE FROM AD_Element WHERE AD_Element_ID=53606 +; + diff --git a/migration/353a-trunk/postgresql/549_Delete_duplicate_AD_User_ID_element.sql b/migration/353a-trunk/postgresql/549_Delete_duplicate_AD_User_ID_element.sql new file mode 100644 index 0000000000..63320cf74e --- /dev/null +++ b/migration/353a-trunk/postgresql/549_Delete_duplicate_AD_User_ID_element.sql @@ -0,0 +1,25 @@ +-- Aug 28, 2009 8:29:11 PM EEST +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +UPDATE AD_Column SET AD_Element_ID=138, ColumnName='AD_User_ID', Description='User within the system - Internal or Business Partner Contact', Help='The User identifies a unique user in the system. This could be an internal user or a business partner contact', Name='User/Contact',Updated=TO_TIMESTAMP('2009-08-28 20:29:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=55851 +; + +-- Aug 28, 2009 8:29:11 PM EEST +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +UPDATE AD_Column_Trl SET IsTranslated='N' WHERE AD_Column_ID=55851 +; + +-- Aug 28, 2009 8:29:11 PM EEST +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +UPDATE AD_Field SET Name='User/Contact', Description='User within the system - Internal or Business Partner Contact', Help='The User identifies a unique user in the system. This could be an internal user or a business partner contact' WHERE AD_Column_ID=55851 AND IsCentrallyMaintained='Y' +; + +-- Aug 28, 2009 8:29:30 PM EEST +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +DELETE FROM AD_Element_Trl WHERE AD_Element_ID=53606 +; + +-- Aug 28, 2009 8:29:30 PM EEST +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +DELETE FROM AD_Element WHERE AD_Element_ID=53606 +; +