From 90d164856fbe29eeeae2f6722d4a76e45bdcae6f Mon Sep 17 00:00:00 2001 From: mjudd Date: Tue, 1 Dec 2009 08:57:28 +0000 Subject: [PATCH] [ FR 2906605 ] - Add weight to base type for tax https://sourceforge.net/tracker/?func=detail&aid=2906605&group_id=176962&atid=879335 --- base/src/org/eevolution/model/I_C_TaxDefinition.java | 4 ++-- base/src/org/eevolution/model/X_C_TaxBase.java | 4 +++- base/src/org/eevolution/model/X_C_TaxDefinition.java | 6 +++--- base/src/org/eevolution/model/X_C_TaxGroup.java | 2 +- base/src/org/eevolution/model/X_C_TaxType.java | 2 +- migration/354a-trunk/oracle/616_FR2906605.sql | 9 +++++++++ migration/354a-trunk/postgresql/616_FR2906605.sql | 10 ++++++++++ 7 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 migration/354a-trunk/oracle/616_FR2906605.sql create mode 100644 migration/354a-trunk/postgresql/616_FR2906605.sql diff --git a/base/src/org/eevolution/model/I_C_TaxDefinition.java b/base/src/org/eevolution/model/I_C_TaxDefinition.java index db9e9d05a9..b0c0d4ae97 100644 --- a/base/src/org/eevolution/model/I_C_TaxDefinition.java +++ b/base/src/org/eevolution/model/I_C_TaxDefinition.java @@ -67,12 +67,12 @@ public interface I_C_TaxDefinition public static final String COLUMNNAME_AD_OrgType_ID = "AD_OrgType_ID"; /** Set Organization Type. - * Organization Type + * Organization Type allows you to categorize your organizations */ public void setAD_OrgType_ID (int AD_OrgType_ID); /** Get Organization Type. - * Organization Type + * Organization Type allows you to categorize your organizations */ public int getAD_OrgType_ID(); diff --git a/base/src/org/eevolution/model/X_C_TaxBase.java b/base/src/org/eevolution/model/X_C_TaxBase.java index 342800a18c..9a83be5728 100644 --- a/base/src/org/eevolution/model/X_C_TaxBase.java +++ b/base/src/org/eevolution/model/X_C_TaxBase.java @@ -31,7 +31,7 @@ public class X_C_TaxBase extends PO implements I_C_TaxBase, I_Persistent /** * */ - private static final long serialVersionUID = 20090915L; + private static final long serialVersionUID = 20091201L; /** Standard Constructor */ public X_C_TaxBase (Properties ctx, int C_TaxBase_ID, String trxName) @@ -81,6 +81,8 @@ public class X_C_TaxBase extends PO implements I_C_TaxBase, I_Persistent public static final String BASE_Price = "P"; /** Quantity = Q */ public static final String BASE_Quantity = "Q"; + /** Weight = W */ + public static final String BASE_Weight = "W"; /** Set Base. @param Base Calculation Base diff --git a/base/src/org/eevolution/model/X_C_TaxDefinition.java b/base/src/org/eevolution/model/X_C_TaxDefinition.java index bf58700396..1db361aead 100644 --- a/base/src/org/eevolution/model/X_C_TaxDefinition.java +++ b/base/src/org/eevolution/model/X_C_TaxDefinition.java @@ -32,7 +32,7 @@ public class X_C_TaxDefinition extends PO implements I_C_TaxDefinition, I_Persis /** * */ - private static final long serialVersionUID = 20090915L; + private static final long serialVersionUID = 20091201L; /** Standard Constructor */ public X_C_TaxDefinition (Properties ctx, int C_TaxDefinition_ID, String trxName) @@ -81,7 +81,7 @@ public class X_C_TaxDefinition extends PO implements I_C_TaxDefinition, I_Persis /** Set Organization Type. @param AD_OrgType_ID - Organization Type + Organization Type allows you to categorize your organizations */ public void setAD_OrgType_ID (int AD_OrgType_ID) { @@ -92,7 +92,7 @@ public class X_C_TaxDefinition extends PO implements I_C_TaxDefinition, I_Persis } /** Get Organization Type. - @return Organization Type + @return Organization Type allows you to categorize your organizations */ public int getAD_OrgType_ID () { diff --git a/base/src/org/eevolution/model/X_C_TaxGroup.java b/base/src/org/eevolution/model/X_C_TaxGroup.java index 4afb30e13f..823d2097f1 100644 --- a/base/src/org/eevolution/model/X_C_TaxGroup.java +++ b/base/src/org/eevolution/model/X_C_TaxGroup.java @@ -31,7 +31,7 @@ public class X_C_TaxGroup extends PO implements I_C_TaxGroup, I_Persistent /** * */ - private static final long serialVersionUID = 20090915L; + private static final long serialVersionUID = 20091201L; /** Standard Constructor */ public X_C_TaxGroup (Properties ctx, int C_TaxGroup_ID, String trxName) diff --git a/base/src/org/eevolution/model/X_C_TaxType.java b/base/src/org/eevolution/model/X_C_TaxType.java index b242230873..e5be237104 100644 --- a/base/src/org/eevolution/model/X_C_TaxType.java +++ b/base/src/org/eevolution/model/X_C_TaxType.java @@ -31,7 +31,7 @@ public class X_C_TaxType extends PO implements I_C_TaxType, I_Persistent /** * */ - private static final long serialVersionUID = 20090915L; + private static final long serialVersionUID = 20091201L; /** Standard Constructor */ public X_C_TaxType (Properties ctx, int C_TaxType_ID, String trxName) diff --git a/migration/354a-trunk/oracle/616_FR2906605.sql b/migration/354a-trunk/oracle/616_FR2906605.sql new file mode 100644 index 0000000000..12f68f509e --- /dev/null +++ b/migration/354a-trunk/oracle/616_FR2906605.sql @@ -0,0 +1,9 @@ +-- 01-Dec-2009 08:20:21 GMT +-- FR 2906605 - Add weight to tax base types +INSERT INTO AD_Ref_List (Value,AD_Ref_List_ID,Created,CreatedBy,Updated,UpdatedBy,AD_Reference_ID,Name,AD_Org_ID,IsActive,AD_Client_ID,EntityType) VALUES ('W',53559,TO_DATE('2009-12-01 08:20:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2009-12-01 08:20:20','YYYY-MM-DD HH24:MI:SS'),100,53240,'Weight',0,'Y',0,'EE04') +; + +-- 01-Dec-2009 08:20:21 GMT +-- FR 2906605 - Add weight to tax base types +INSERT INTO AD_Ref_List_Trl (AD_Language,AD_Ref_List_ID, Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Ref_List_ID, t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Ref_List t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Ref_List_ID=53559 AND EXISTS (SELECT * FROM AD_Ref_List_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Ref_List_ID!=t.AD_Ref_List_ID) +; diff --git a/migration/354a-trunk/postgresql/616_FR2906605.sql b/migration/354a-trunk/postgresql/616_FR2906605.sql new file mode 100644 index 0000000000..201d850e46 --- /dev/null +++ b/migration/354a-trunk/postgresql/616_FR2906605.sql @@ -0,0 +1,10 @@ +-- 01-Dec-2009 08:20:21 GMT +-- FR 2906605 - Add weight to tax base types +INSERT INTO AD_Ref_List (Value,AD_Ref_List_ID,Created,CreatedBy,Updated,UpdatedBy,AD_Reference_ID,Name,AD_Org_ID,IsActive,AD_Client_ID,EntityType) VALUES ('W',53559,TO_TIMESTAMP('2009-12-01 08:20:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2009-12-01 08:20:20','YYYY-MM-DD HH24:MI:SS'),100,53240,'Weight',0,'Y',0,'EE04') +; + +-- 01-Dec-2009 08:20:21 GMT +-- FR 2906605 - Add weight to tax base types +INSERT INTO AD_Ref_List_Trl (AD_Language,AD_Ref_List_ID, Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Ref_List_ID, t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Ref_List t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Ref_List_ID=53559 AND EXISTS (SELECT * FROM AD_Ref_List_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Ref_List_ID!=t.AD_Ref_List_ID) +; +