From c02a761dbee70448f64dcbbcf178bd1df65b76ba Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 5 Sep 2014 08:53:08 -0500 Subject: [PATCH] IDEMPIERE-2190 Virtual Column M_Product.CostStandard too heavy --- .../oracle/201409050848_IDEMPIERE-2190.sql | 18 +++++ .../201409050848_IDEMPIERE-2190.sql | 15 ++++ .../src/org/compiere/model/I_M_Product.java | 44 +++++++---- .../src/org/compiere/model/X_M_Product.java | 78 ++++++++++++++----- 4 files changed, 122 insertions(+), 33 deletions(-) create mode 100644 migration/i2.0z/oracle/201409050848_IDEMPIERE-2190.sql create mode 100644 migration/i2.0z/postgresql/201409050848_IDEMPIERE-2190.sql diff --git a/migration/i2.0z/oracle/201409050848_IDEMPIERE-2190.sql b/migration/i2.0z/oracle/201409050848_IDEMPIERE-2190.sql new file mode 100644 index 0000000000..79279f55fb --- /dev/null +++ b/migration/i2.0z/oracle/201409050848_IDEMPIERE-2190.sql @@ -0,0 +1,18 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Sep 5, 2014 8:46:44 AM COT +-- IDEMPIERE-2190 Virtual Column M_Product.CostStandard too heavy +UPDATE AD_Column SET IsActive='N',Updated=TO_DATE('2014-09-05 08:46:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=61998 +; + +-- Sep 5, 2014 8:47:19 AM COT +UPDATE AD_Field SET SeqNo=0, IsDisplayed='N', IsActive='N', IsDisplayedGrid='N', SeqNoGrid=0,Updated=TO_DATE('2014-09-05 08:47:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62009 +; + +UPDATE AD_Field SET SeqNo=0, IsDisplayed='N', IsActive='N', IsDisplayedGrid='N', SeqNoGrid=0,Updated=TO_DATE('2014-09-05 08:47:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201344 +; + +SELECT register_migration_script('201409050848_IDEMPIERE-2190.sql') FROM dual +; + diff --git a/migration/i2.0z/postgresql/201409050848_IDEMPIERE-2190.sql b/migration/i2.0z/postgresql/201409050848_IDEMPIERE-2190.sql new file mode 100644 index 0000000000..eb934994ed --- /dev/null +++ b/migration/i2.0z/postgresql/201409050848_IDEMPIERE-2190.sql @@ -0,0 +1,15 @@ +-- Sep 5, 2014 8:46:44 AM COT +-- IDEMPIERE-2190 Virtual Column M_Product.CostStandard too heavy +UPDATE AD_Column SET IsActive='N',Updated=TO_TIMESTAMP('2014-09-05 08:46:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=61998 +; + +-- Sep 5, 2014 8:47:19 AM COT +UPDATE AD_Field SET SeqNo=0, IsDisplayed='N', IsActive='N', IsDisplayedGrid='N', SeqNoGrid=0,Updated=TO_TIMESTAMP('2014-09-05 08:47:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62009 +; + +UPDATE AD_Field SET SeqNo=0, IsDisplayed='N', IsActive='N', IsDisplayedGrid='N', SeqNoGrid=0,Updated=TO_TIMESTAMP('2014-09-05 08:47:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201344 +; + +SELECT register_migration_script('201409050848_IDEMPIERE-2190.sql') FROM dual +; + diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Product.java b/org.adempiere.base/src/org/compiere/model/I_M_Product.java index 0c1fb78de4..d587905812 100644 --- a/org.adempiere.base/src/org/compiere/model/I_M_Product.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_Product.java @@ -88,19 +88,6 @@ public interface I_M_Product */ public String getCopyFrom(); - /** Column name CostStandard */ - public static final String COLUMNNAME_CostStandard = "CostStandard"; - - /** Set Standard Cost. - * Standard Costs - */ - public void setCostStandard (BigDecimal CostStandard); - - /** Get Standard Cost. - * Standard Costs - */ - public BigDecimal getCostStandard(); - /** Column name Created */ public static final String COLUMNNAME_Created = "Created"; @@ -229,6 +216,19 @@ public interface I_M_Product */ public Timestamp getDiscontinuedAt(); + /** Column name DocumentDescription */ + public static final String COLUMNNAME_DocumentDescription = "DocumentDescription"; + + /** Set DocumentDescription. + * DocumentDescription + */ + public void setDocumentDescription (String DocumentDescription); + + /** Get DocumentDescription. + * DocumentDescription + */ + public String getDocumentDescription(); + /** Column name DocumentNote */ public static final String COLUMNNAME_DocumentNote = "DocumentNote"; @@ -299,6 +299,24 @@ public interface I_M_Product */ public String getHelp(); + /** Column name ImageBig_ID */ + public static final String COLUMNNAME_ImageBig_ID = "ImageBig_ID"; + + /** Set ImageBig_ID */ + public void setImageBig_ID (int ImageBig_ID); + + /** Get ImageBig_ID */ + public int getImageBig_ID(); + + /** Column name ImageSmall_ID */ + public static final String COLUMNNAME_ImageSmall_ID = "ImageSmall_ID"; + + /** Set ImageSmall_ID */ + public void setImageSmall_ID (int ImageSmall_ID); + + /** Get ImageSmall_ID */ + public int getImageSmall_ID(); + /** Column name ImageURL */ public static final String COLUMNNAME_ImageURL = "ImageURL"; diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product.java b/org.adempiere.base/src/org/compiere/model/X_M_Product.java index 693cd58967..127b3272fe 100644 --- a/org.adempiere.base/src/org/compiere/model/X_M_Product.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_Product.java @@ -33,7 +33,7 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent /** * */ - private static final long serialVersionUID = 20131031L; + private static final long serialVersionUID = 20140905L; /** Standard Constructor */ public X_M_Product (Properties ctx, int M_Product_ID, String trxName) @@ -144,25 +144,6 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return (String)get_Value(COLUMNNAME_CopyFrom); } - /** Set Standard Cost. - @param CostStandard - Standard Costs - */ - public void setCostStandard (BigDecimal CostStandard) - { - throw new IllegalArgumentException ("CostStandard is virtual column"); } - - /** Get Standard Cost. - @return Standard Costs - */ - public BigDecimal getCostStandard () - { - BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CostStandard); - if (bd == null) - return Env.ZERO; - return bd; - } - public org.compiere.model.I_C_RevenueRecognition getC_RevenueRecognition() throws RuntimeException { return (org.compiere.model.I_C_RevenueRecognition)MTable.get(getCtx(), org.compiere.model.I_C_RevenueRecognition.Table_Name) @@ -350,6 +331,23 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return (Timestamp)get_Value(COLUMNNAME_DiscontinuedAt); } + /** Set DocumentDescription. + @param DocumentDescription + DocumentDescription + */ + public void setDocumentDescription (String DocumentDescription) + { + set_Value (COLUMNNAME_DocumentDescription, DocumentDescription); + } + + /** Get DocumentDescription. + @return DocumentDescription + */ + public String getDocumentDescription () + { + return (String)get_Value(COLUMNNAME_DocumentDescription); + } + /** Set Document Note. @param DocumentNote Additional information for a Document @@ -452,6 +450,46 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent return (String)get_Value(COLUMNNAME_Help); } + /** Set ImageBig_ID. + @param ImageBig_ID ImageBig_ID */ + public void setImageBig_ID (int ImageBig_ID) + { + if (ImageBig_ID < 1) + set_Value (COLUMNNAME_ImageBig_ID, null); + else + set_Value (COLUMNNAME_ImageBig_ID, Integer.valueOf(ImageBig_ID)); + } + + /** Get ImageBig_ID. + @return ImageBig_ID */ + public int getImageBig_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_ImageBig_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + /** Set ImageSmall_ID. + @param ImageSmall_ID ImageSmall_ID */ + public void setImageSmall_ID (int ImageSmall_ID) + { + if (ImageSmall_ID < 1) + set_Value (COLUMNNAME_ImageSmall_ID, null); + else + set_Value (COLUMNNAME_ImageSmall_ID, Integer.valueOf(ImageSmall_ID)); + } + + /** Get ImageSmall_ID. + @return ImageSmall_ID */ + public int getImageSmall_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_ImageSmall_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set Image URL. @param ImageURL URL of image