From 0050e3ad72f0ef3ef8dd2078fa90409d756103fc Mon Sep 17 00:00:00 2001 From: teo_sarca Date: Sun, 6 Sep 2009 08:06:49 +0000 Subject: [PATCH] BF [ 2848435 ] Move M_Promotion* generated classes to org/compiere/model https://sourceforge.net/tracker/?func=detail&atid=879332&aid=2848435&group_id=176962 Moving M_Promotion* generated models to org.compiere.model package since a better EntityType/ModelPackage is chosen. --- base/src/org/adempiere/model/MPromotion.java | 2 ++ base/src/org/adempiere/model/MPromotionDistribution.java | 2 ++ base/src/org/adempiere/model/MPromotionGroup.java | 2 ++ base/src/org/adempiere/model/MPromotionGroupLine.java | 2 ++ base/src/org/adempiere/model/MPromotionLine.java | 2 ++ base/src/org/adempiere/model/MPromotionPreCondition.java | 2 ++ base/src/org/adempiere/model/MPromotionReward.java | 2 ++ base/src/org/adempiere/model/PromotionRule.java | 7 +++++++ .../org/{adempiere => compiere}/model/I_M_Promotion.java | 2 +- .../model/I_M_PromotionDistribution.java | 2 +- .../{adempiere => compiere}/model/I_M_PromotionGroup.java | 2 +- .../model/I_M_PromotionGroupLine.java | 2 +- .../{adempiere => compiere}/model/I_M_PromotionLine.java | 2 +- .../model/I_M_PromotionPreCondition.java | 2 +- .../{adempiere => compiere}/model/I_M_PromotionReward.java | 2 +- .../org/{adempiere => compiere}/model/X_M_Promotion.java | 2 +- .../model/X_M_PromotionDistribution.java | 2 +- .../{adempiere => compiere}/model/X_M_PromotionGroup.java | 2 +- .../model/X_M_PromotionGroupLine.java | 2 +- .../{adempiere => compiere}/model/X_M_PromotionLine.java | 2 +- .../model/X_M_PromotionPreCondition.java | 2 +- .../{adempiere => compiere}/model/X_M_PromotionReward.java | 2 +- 22 files changed, 35 insertions(+), 14 deletions(-) rename base/src/org/{adempiere => compiere}/model/I_M_Promotion.java (99%) rename base/src/org/{adempiere => compiere}/model/I_M_PromotionDistribution.java (99%) rename base/src/org/{adempiere => compiere}/model/I_M_PromotionGroup.java (99%) rename base/src/org/{adempiere => compiere}/model/I_M_PromotionGroupLine.java (99%) rename base/src/org/{adempiere => compiere}/model/I_M_PromotionLine.java (99%) rename base/src/org/{adempiere => compiere}/model/I_M_PromotionPreCondition.java (99%) rename base/src/org/{adempiere => compiere}/model/I_M_PromotionReward.java (99%) rename base/src/org/{adempiere => compiere}/model/X_M_Promotion.java (99%) rename base/src/org/{adempiere => compiere}/model/X_M_PromotionDistribution.java (99%) rename base/src/org/{adempiere => compiere}/model/X_M_PromotionGroup.java (99%) rename base/src/org/{adempiere => compiere}/model/X_M_PromotionGroupLine.java (99%) rename base/src/org/{adempiere => compiere}/model/X_M_PromotionLine.java (99%) rename base/src/org/{adempiere => compiere}/model/X_M_PromotionPreCondition.java (99%) rename base/src/org/{adempiere => compiere}/model/X_M_PromotionReward.java (99%) diff --git a/base/src/org/adempiere/model/MPromotion.java b/base/src/org/adempiere/model/MPromotion.java index 6c5e497cbd..8786cb56e5 100644 --- a/base/src/org/adempiere/model/MPromotion.java +++ b/base/src/org/adempiere/model/MPromotion.java @@ -16,6 +16,8 @@ package org.adempiere.model; import java.sql.ResultSet; import java.util.Properties; +import org.compiere.model.X_M_Promotion; + /** * * @author hengsin diff --git a/base/src/org/adempiere/model/MPromotionDistribution.java b/base/src/org/adempiere/model/MPromotionDistribution.java index 262c4dacbc..f01a1e2a32 100644 --- a/base/src/org/adempiere/model/MPromotionDistribution.java +++ b/base/src/org/adempiere/model/MPromotionDistribution.java @@ -16,6 +16,8 @@ package org.adempiere.model; import java.sql.ResultSet; import java.util.Properties; +import org.compiere.model.X_M_PromotionDistribution; + /** * * @author hengsin diff --git a/base/src/org/adempiere/model/MPromotionGroup.java b/base/src/org/adempiere/model/MPromotionGroup.java index 7397b27409..b1c26fe292 100644 --- a/base/src/org/adempiere/model/MPromotionGroup.java +++ b/base/src/org/adempiere/model/MPromotionGroup.java @@ -16,6 +16,8 @@ package org.adempiere.model; import java.sql.ResultSet; import java.util.Properties; +import org.compiere.model.X_M_PromotionGroup; + /** * * @author hengsin diff --git a/base/src/org/adempiere/model/MPromotionGroupLine.java b/base/src/org/adempiere/model/MPromotionGroupLine.java index 60a64c4e2f..778c7f9159 100644 --- a/base/src/org/adempiere/model/MPromotionGroupLine.java +++ b/base/src/org/adempiere/model/MPromotionGroupLine.java @@ -16,6 +16,8 @@ package org.adempiere.model; import java.sql.ResultSet; import java.util.Properties; +import org.compiere.model.X_M_PromotionGroupLine; + /** * * @author hengsin diff --git a/base/src/org/adempiere/model/MPromotionLine.java b/base/src/org/adempiere/model/MPromotionLine.java index 8a0f00a3b3..ebf393e74f 100644 --- a/base/src/org/adempiere/model/MPromotionLine.java +++ b/base/src/org/adempiere/model/MPromotionLine.java @@ -16,6 +16,8 @@ package org.adempiere.model; import java.sql.ResultSet; import java.util.Properties; +import org.compiere.model.X_M_PromotionLine; + public class MPromotionLine extends X_M_PromotionLine { private static final long serialVersionUID = -8284722914757724765L; diff --git a/base/src/org/adempiere/model/MPromotionPreCondition.java b/base/src/org/adempiere/model/MPromotionPreCondition.java index 58e69ba1c0..88e45aab8c 100644 --- a/base/src/org/adempiere/model/MPromotionPreCondition.java +++ b/base/src/org/adempiere/model/MPromotionPreCondition.java @@ -16,6 +16,8 @@ package org.adempiere.model; import java.sql.ResultSet; import java.util.Properties; +import org.compiere.model.X_M_PromotionPreCondition; + /** * * @author hengsin diff --git a/base/src/org/adempiere/model/MPromotionReward.java b/base/src/org/adempiere/model/MPromotionReward.java index a7081d179e..3ffc9d6f79 100644 --- a/base/src/org/adempiere/model/MPromotionReward.java +++ b/base/src/org/adempiere/model/MPromotionReward.java @@ -16,6 +16,8 @@ package org.adempiere.model; import java.sql.ResultSet; import java.util.Properties; +import org.compiere.model.X_M_PromotionReward; + /** * * @author hengsin diff --git a/base/src/org/adempiere/model/PromotionRule.java b/base/src/org/adempiere/model/PromotionRule.java index 9c7b08e620..af1aa37f0c 100644 --- a/base/src/org/adempiere/model/PromotionRule.java +++ b/base/src/org/adempiere/model/PromotionRule.java @@ -29,10 +29,17 @@ import java.util.Map; import java.util.Set; import org.adempiere.exceptions.AdempiereException; +import org.compiere.model.I_M_Promotion; +import org.compiere.model.I_M_PromotionDistribution; +import org.compiere.model.I_M_PromotionLine; +import org.compiere.model.I_M_PromotionReward; import org.compiere.model.MOrder; import org.compiere.model.MOrderLine; import org.compiere.model.MTable; import org.compiere.model.Query; +import org.compiere.model.X_M_PromotionDistribution; +import org.compiere.model.X_M_PromotionLine; +import org.compiere.model.X_M_PromotionReward; import org.compiere.util.DB; import org.compiere.util.Env; diff --git a/base/src/org/adempiere/model/I_M_Promotion.java b/base/src/org/compiere/model/I_M_Promotion.java similarity index 99% rename from base/src/org/adempiere/model/I_M_Promotion.java rename to base/src/org/compiere/model/I_M_Promotion.java index 6f9c066675..dfc784f2da 100644 --- a/base/src/org/adempiere/model/I_M_Promotion.java +++ b/base/src/org/compiere/model/I_M_Promotion.java @@ -14,7 +14,7 @@ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA * * or via info@compiere.org or http://www.compiere.org/license.html * *****************************************************************************/ -package org.adempiere.model; +package org.compiere.model; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/base/src/org/adempiere/model/I_M_PromotionDistribution.java b/base/src/org/compiere/model/I_M_PromotionDistribution.java similarity index 99% rename from base/src/org/adempiere/model/I_M_PromotionDistribution.java rename to base/src/org/compiere/model/I_M_PromotionDistribution.java index 2cbd6fcf97..efdda9066a 100644 --- a/base/src/org/adempiere/model/I_M_PromotionDistribution.java +++ b/base/src/org/compiere/model/I_M_PromotionDistribution.java @@ -14,7 +14,7 @@ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA * * or via info@compiere.org or http://www.compiere.org/license.html * *****************************************************************************/ -package org.adempiere.model; +package org.compiere.model; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/base/src/org/adempiere/model/I_M_PromotionGroup.java b/base/src/org/compiere/model/I_M_PromotionGroup.java similarity index 99% rename from base/src/org/adempiere/model/I_M_PromotionGroup.java rename to base/src/org/compiere/model/I_M_PromotionGroup.java index 077d294aa1..0f9770cbfa 100644 --- a/base/src/org/adempiere/model/I_M_PromotionGroup.java +++ b/base/src/org/compiere/model/I_M_PromotionGroup.java @@ -14,7 +14,7 @@ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA * * or via info@compiere.org or http://www.compiere.org/license.html * *****************************************************************************/ -package org.adempiere.model; +package org.compiere.model; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/base/src/org/adempiere/model/I_M_PromotionGroupLine.java b/base/src/org/compiere/model/I_M_PromotionGroupLine.java similarity index 99% rename from base/src/org/adempiere/model/I_M_PromotionGroupLine.java rename to base/src/org/compiere/model/I_M_PromotionGroupLine.java index 8cf677db21..d08f0b3037 100644 --- a/base/src/org/adempiere/model/I_M_PromotionGroupLine.java +++ b/base/src/org/compiere/model/I_M_PromotionGroupLine.java @@ -14,7 +14,7 @@ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA * * or via info@compiere.org or http://www.compiere.org/license.html * *****************************************************************************/ -package org.adempiere.model; +package org.compiere.model; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/base/src/org/adempiere/model/I_M_PromotionLine.java b/base/src/org/compiere/model/I_M_PromotionLine.java similarity index 99% rename from base/src/org/adempiere/model/I_M_PromotionLine.java rename to base/src/org/compiere/model/I_M_PromotionLine.java index 42a4230b1e..d1c051ac85 100644 --- a/base/src/org/adempiere/model/I_M_PromotionLine.java +++ b/base/src/org/compiere/model/I_M_PromotionLine.java @@ -14,7 +14,7 @@ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA * * or via info@compiere.org or http://www.compiere.org/license.html * *****************************************************************************/ -package org.adempiere.model; +package org.compiere.model; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/base/src/org/adempiere/model/I_M_PromotionPreCondition.java b/base/src/org/compiere/model/I_M_PromotionPreCondition.java similarity index 99% rename from base/src/org/adempiere/model/I_M_PromotionPreCondition.java rename to base/src/org/compiere/model/I_M_PromotionPreCondition.java index 1cb3395129..0ca3849697 100644 --- a/base/src/org/adempiere/model/I_M_PromotionPreCondition.java +++ b/base/src/org/compiere/model/I_M_PromotionPreCondition.java @@ -14,7 +14,7 @@ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA * * or via info@compiere.org or http://www.compiere.org/license.html * *****************************************************************************/ -package org.adempiere.model; +package org.compiere.model; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/base/src/org/adempiere/model/I_M_PromotionReward.java b/base/src/org/compiere/model/I_M_PromotionReward.java similarity index 99% rename from base/src/org/adempiere/model/I_M_PromotionReward.java rename to base/src/org/compiere/model/I_M_PromotionReward.java index 1ade7fc9ff..c0136a6268 100644 --- a/base/src/org/adempiere/model/I_M_PromotionReward.java +++ b/base/src/org/compiere/model/I_M_PromotionReward.java @@ -14,7 +14,7 @@ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA * * or via info@compiere.org or http://www.compiere.org/license.html * *****************************************************************************/ -package org.adempiere.model; +package org.compiere.model; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/base/src/org/adempiere/model/X_M_Promotion.java b/base/src/org/compiere/model/X_M_Promotion.java similarity index 99% rename from base/src/org/adempiere/model/X_M_Promotion.java rename to base/src/org/compiere/model/X_M_Promotion.java index 4337b7065d..32be1ad177 100644 --- a/base/src/org/adempiere/model/X_M_Promotion.java +++ b/base/src/org/compiere/model/X_M_Promotion.java @@ -15,7 +15,7 @@ * or via info@compiere.org or http://www.compiere.org/license.html * *****************************************************************************/ /** Generated Model - DO NOT CHANGE */ -package org.adempiere.model; +package org.compiere.model; import java.lang.reflect.Constructor; import java.sql.ResultSet; diff --git a/base/src/org/adempiere/model/X_M_PromotionDistribution.java b/base/src/org/compiere/model/X_M_PromotionDistribution.java similarity index 99% rename from base/src/org/adempiere/model/X_M_PromotionDistribution.java rename to base/src/org/compiere/model/X_M_PromotionDistribution.java index 65298928c8..f47e5fe124 100644 --- a/base/src/org/adempiere/model/X_M_PromotionDistribution.java +++ b/base/src/org/compiere/model/X_M_PromotionDistribution.java @@ -15,7 +15,7 @@ * or via info@compiere.org or http://www.compiere.org/license.html * *****************************************************************************/ /** Generated Model - DO NOT CHANGE */ -package org.adempiere.model; +package org.compiere.model; import java.lang.reflect.Constructor; import java.math.BigDecimal; diff --git a/base/src/org/adempiere/model/X_M_PromotionGroup.java b/base/src/org/compiere/model/X_M_PromotionGroup.java similarity index 99% rename from base/src/org/adempiere/model/X_M_PromotionGroup.java rename to base/src/org/compiere/model/X_M_PromotionGroup.java index 9fce0edd1f..ab9733c1d7 100644 --- a/base/src/org/adempiere/model/X_M_PromotionGroup.java +++ b/base/src/org/compiere/model/X_M_PromotionGroup.java @@ -15,7 +15,7 @@ * or via info@compiere.org or http://www.compiere.org/license.html * *****************************************************************************/ /** Generated Model - DO NOT CHANGE */ -package org.adempiere.model; +package org.compiere.model; import java.sql.ResultSet; import java.util.Properties; diff --git a/base/src/org/adempiere/model/X_M_PromotionGroupLine.java b/base/src/org/compiere/model/X_M_PromotionGroupLine.java similarity index 99% rename from base/src/org/adempiere/model/X_M_PromotionGroupLine.java rename to base/src/org/compiere/model/X_M_PromotionGroupLine.java index a36eaa5e4f..950ec45f59 100644 --- a/base/src/org/adempiere/model/X_M_PromotionGroupLine.java +++ b/base/src/org/compiere/model/X_M_PromotionGroupLine.java @@ -15,7 +15,7 @@ * or via info@compiere.org or http://www.compiere.org/license.html * *****************************************************************************/ /** Generated Model - DO NOT CHANGE */ -package org.adempiere.model; +package org.compiere.model; import java.lang.reflect.Constructor; import java.sql.ResultSet; diff --git a/base/src/org/adempiere/model/X_M_PromotionLine.java b/base/src/org/compiere/model/X_M_PromotionLine.java similarity index 99% rename from base/src/org/adempiere/model/X_M_PromotionLine.java rename to base/src/org/compiere/model/X_M_PromotionLine.java index 427ddf152b..6815ad79f7 100644 --- a/base/src/org/adempiere/model/X_M_PromotionLine.java +++ b/base/src/org/compiere/model/X_M_PromotionLine.java @@ -15,7 +15,7 @@ * or via info@compiere.org or http://www.compiere.org/license.html * *****************************************************************************/ /** Generated Model - DO NOT CHANGE */ -package org.adempiere.model; +package org.compiere.model; import java.lang.reflect.Constructor; import java.math.BigDecimal; diff --git a/base/src/org/adempiere/model/X_M_PromotionPreCondition.java b/base/src/org/compiere/model/X_M_PromotionPreCondition.java similarity index 99% rename from base/src/org/adempiere/model/X_M_PromotionPreCondition.java rename to base/src/org/compiere/model/X_M_PromotionPreCondition.java index 1248ddac92..d78bd49f96 100644 --- a/base/src/org/adempiere/model/X_M_PromotionPreCondition.java +++ b/base/src/org/compiere/model/X_M_PromotionPreCondition.java @@ -15,7 +15,7 @@ * or via info@compiere.org or http://www.compiere.org/license.html * *****************************************************************************/ /** Generated Model - DO NOT CHANGE */ -package org.adempiere.model; +package org.compiere.model; import java.lang.reflect.Constructor; import java.sql.ResultSet; diff --git a/base/src/org/adempiere/model/X_M_PromotionReward.java b/base/src/org/compiere/model/X_M_PromotionReward.java similarity index 99% rename from base/src/org/adempiere/model/X_M_PromotionReward.java rename to base/src/org/compiere/model/X_M_PromotionReward.java index f76179fcef..bde93b9bac 100644 --- a/base/src/org/adempiere/model/X_M_PromotionReward.java +++ b/base/src/org/compiere/model/X_M_PromotionReward.java @@ -15,7 +15,7 @@ * or via info@compiere.org or http://www.compiere.org/license.html * *****************************************************************************/ /** Generated Model - DO NOT CHANGE */ -package org.adempiere.model; +package org.compiere.model; import java.lang.reflect.Constructor; import java.math.BigDecimal;