diff --git a/migration/360lts-release/oracle/834_IDEMPIERE-113.sql b/migration/360lts-release/oracle/834_IDEMPIERE-113.sql new file mode 100644 index 0000000000..752dae1e49 --- /dev/null +++ b/migration/360lts-release/oracle/834_IDEMPIERE-113.sql @@ -0,0 +1,8 @@ +-- Apr 6, 2012 4:08:25 PM CEST +-- IDEMPIERE-113 Volume and Weight are not imported in Product importer +UPDATE AD_Column SET AD_Reference_ID=12,Updated=TO_DATE('2012-04-06 16:08:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7839 +; + +-- Apr 6, 2012 4:10:02 PM CEST +UPDATE AD_Column SET AD_Reference_ID=12,Updated=TO_DATE('2012-04-06 16:10:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7832 +; diff --git a/migration/360lts-release/postgresql/834_IDEMPIERE-113.sql b/migration/360lts-release/postgresql/834_IDEMPIERE-113.sql new file mode 100644 index 0000000000..ec918426be --- /dev/null +++ b/migration/360lts-release/postgresql/834_IDEMPIERE-113.sql @@ -0,0 +1,8 @@ +-- Apr 6, 2012 4:08:25 PM CEST +-- IDEMPIERE-113 Volume and Weight are not imported in Product importer +UPDATE AD_Column SET AD_Reference_ID=12,Updated=TO_TIMESTAMP('2012-04-06 16:08:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7839 +; + +-- Apr 6, 2012 4:10:02 PM CEST +UPDATE AD_Column SET AD_Reference_ID=12,Updated=TO_TIMESTAMP('2012-04-06 16:10:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7832 +; diff --git a/org.adempiere.base/src/org/compiere/model/I_I_Product.java b/org.adempiere.base/src/org/compiere/model/I_I_Product.java index 2cad165a70..68c98e4816 100644 --- a/org.adempiere.base/src/org/compiere/model/I_I_Product.java +++ b/org.adempiere.base/src/org/compiere/model/I_I_Product.java @@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for I_Product * @author Adempiere (generated) - * @version Release 3.6.0LTS + * @version 360LTS.015 */ public interface I_I_Product { @@ -674,12 +674,12 @@ public interface I_I_Product /** Set Volume. * Volume of a product */ - public void setVolume (int Volume); + public void setVolume (BigDecimal Volume); /** Get Volume. * Volume of a product */ - public int getVolume(); + public BigDecimal getVolume(); /** Column name Weight */ public static final String COLUMNNAME_Weight = "Weight"; @@ -687,12 +687,12 @@ public interface I_I_Product /** Set Weight. * Weight of a product */ - public void setWeight (int Weight); + public void setWeight (BigDecimal Weight); /** Get Weight. * Weight of a product */ - public int getWeight(); + public BigDecimal getWeight(); /** Column name X12DE355 */ public static final String COLUMNNAME_X12DE355 = "X12DE355"; diff --git a/org.adempiere.base/src/org/compiere/model/MProduct.java b/org.adempiere.base/src/org/compiere/model/MProduct.java index 389b7b9058..cc96ddb424 100644 --- a/org.adempiere.base/src/org/compiere/model/MProduct.java +++ b/org.adempiere.base/src/org/compiere/model/MProduct.java @@ -263,6 +263,8 @@ public class MProduct extends X_M_Product setProductType(impP.getProductType()); setImageURL(impP.getImageURL()); setDescriptionURL(impP.getDescriptionURL()); + setVolume(impP.getVolume()); + setWeight(impP.getWeight()); } // MProduct /** Additional Downloads */ diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Product.java b/org.adempiere.base/src/org/compiere/model/X_I_Product.java index dffc3c3653..52c69b8b6f 100644 --- a/org.adempiere.base/src/org/compiere/model/X_I_Product.java +++ b/org.adempiere.base/src/org/compiere/model/X_I_Product.java @@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair; /** Generated Model for I_Product * @author Adempiere (generated) - * @version Release 3.6.0LTS - $Id$ */ + * @version 360LTS.015 - $Id$ */ public class X_I_Product extends PO implements I_I_Product, I_Persistent { /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120406L; /** Standard Constructor */ public X_I_Product (Properties ctx, int I_Product_ID, String trxName) @@ -952,40 +952,40 @@ public class X_I_Product extends PO implements I_I_Product, I_Persistent @param Volume Volume of a product */ - public void setVolume (int Volume) + public void setVolume (BigDecimal Volume) { - set_Value (COLUMNNAME_Volume, Integer.valueOf(Volume)); + set_Value (COLUMNNAME_Volume, Volume); } /** Get Volume. @return Volume of a product */ - public int getVolume () + public BigDecimal getVolume () { - Integer ii = (Integer)get_Value(COLUMNNAME_Volume); - if (ii == null) - return 0; - return ii.intValue(); + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Volume); + if (bd == null) + return Env.ZERO; + return bd; } /** Set Weight. @param Weight Weight of a product */ - public void setWeight (int Weight) + public void setWeight (BigDecimal Weight) { - set_Value (COLUMNNAME_Weight, Integer.valueOf(Weight)); + set_Value (COLUMNNAME_Weight, Weight); } /** Get Weight. @return Weight of a product */ - public int getWeight () + public BigDecimal getWeight () { - Integer ii = (Integer)get_Value(COLUMNNAME_Weight); - if (ii == null) - return 0; - return ii.intValue(); + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Weight); + if (bd == null) + return Env.ZERO; + return bd; } /** Set UOM Code.