From 2e690fdbb50fea15d71d73ce3ffa523cbe1c2f39 Mon Sep 17 00:00:00 2001 From: teo_sarca Date: Fri, 20 Feb 2009 15:35:20 +0000 Subject: [PATCH] [ 2620304 ] Fix PP_Order_Cost https://sourceforge.net/tracker/index.php?func=detail&aid=2620304&group_id=176962&atid=934929 --- .../org/eevolution/model/I_PP_Order_Cost.java | 62 ++++++- .../org/eevolution/model/X_PP_Order_Cost.java | 22 +-- .../oracle/426_004_Fix_MO_Cost_Tab.sql | 159 ++++++++++++++++++ .../postgresql/426_004_Fix_MO_Cost_Tab.sql | 159 ++++++++++++++++++ 4 files changed, 389 insertions(+), 13 deletions(-) create mode 100644 migration/353a-trunk/oracle/426_004_Fix_MO_Cost_Tab.sql create mode 100644 migration/353a-trunk/postgresql/426_004_Fix_MO_Cost_Tab.sql diff --git a/base/src/org/eevolution/model/I_PP_Order_Cost.java b/base/src/org/eevolution/model/I_PP_Order_Cost.java index 1b1c9ba9e5..58e25688da 100644 --- a/base/src/org/eevolution/model/I_PP_Order_Cost.java +++ b/base/src/org/eevolution/model/I_PP_Order_Cost.java @@ -20,6 +20,7 @@ package org.eevolution.model; import java.math.BigDecimal; +import java.sql.Timestamp; import org.compiere.model.*; import org.compiere.util.KeyNamePair; @@ -44,6 +45,14 @@ public interface I_PP_Order_Cost /** Load Meta Data */ + /** 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"; @@ -100,6 +109,22 @@ public interface I_PP_Order_Cost */ public String getCostingMethod(); + /** Column name Created */ + public static final String COLUMNNAME_Created = "Created"; + + /** Get Created. + * Date this record was created + */ + public Timestamp getCreated(); + + /** Column name CreatedBy */ + public static final String COLUMNNAME_CreatedBy = "CreatedBy"; + + /** Get Created By. + * User who created this records + */ + public int getCreatedBy(); + /** Column name CumulatedAmt */ public static final String COLUMNNAME_CumulatedAmt = "CumulatedAmt"; @@ -160,10 +185,14 @@ public interface I_PP_Order_Cost /** Column name CurrentCostPriceLL */ public static final String COLUMNNAME_CurrentCostPriceLL = "CurrentCostPriceLL"; - /** Set Current Cost Price Lower Level */ + /** Set Current Cost Price Lower Level. + * Current Price Lower Level Is the sum of the costs of the components of this product manufactured for this level. + */ public void setCurrentCostPriceLL (BigDecimal CurrentCostPriceLL); - /** Get Current Cost Price Lower Level */ + /** Get Current Cost Price Lower Level. + * Current Price Lower Level Is the sum of the costs of the components of this product manufactured for this level. + */ public BigDecimal getCurrentCostPriceLL(); /** Column name CurrentQty */ @@ -179,6 +208,19 @@ public interface I_PP_Order_Cost */ public BigDecimal getCurrentQty(); + /** Column name IsActive */ + public static final String COLUMNNAME_IsActive = "IsActive"; + + /** Set Active. + * The record is active in the system + */ + public void setIsActive (boolean IsActive); + + /** Get Active. + * The record is active in the system + */ + public boolean isActive(); + /** Column name M_AttributeSetInstance_ID */ public static final String COLUMNNAME_M_AttributeSetInstance_ID = "M_AttributeSetInstance_ID"; @@ -256,4 +298,20 @@ public interface I_PP_Order_Cost public int getPP_Order_ID(); public org.eevolution.model.I_PP_Order getPP_Order() throws RuntimeException; + + /** Column name Updated */ + public static final String COLUMNNAME_Updated = "Updated"; + + /** Get Updated. + * Date this record was updated + */ + public Timestamp getUpdated(); + + /** Column name UpdatedBy */ + public static final String COLUMNNAME_UpdatedBy = "UpdatedBy"; + + /** Get Updated By. + * User who updated this records + */ + public int getUpdatedBy(); } diff --git a/base/src/org/eevolution/model/X_PP_Order_Cost.java b/base/src/org/eevolution/model/X_PP_Order_Cost.java index 2ed393b038..d2be74eb5d 100644 --- a/base/src/org/eevolution/model/X_PP_Order_Cost.java +++ b/base/src/org/eevolution/model/X_PP_Order_Cost.java @@ -34,7 +34,7 @@ public class X_PP_Order_Cost extends PO implements I_PP_Order_Cost, I_Persistent /** * */ - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 20081221L; /** Standard Constructor */ public X_PP_Order_Cost (Properties ctx, int PP_Order_Cost_ID, String trxName) @@ -43,6 +43,7 @@ public class X_PP_Order_Cost extends PO implements I_PP_Order_Cost, I_Persistent /** if (PP_Order_Cost_ID == 0) { setC_AcctSchema_ID (0); + setM_CostType_ID (0); setM_Product_ID (0); setPP_Order_Cost_ID (0); setPP_Order_ID (0); @@ -181,10 +182,7 @@ public class X_PP_Order_Cost extends PO implements I_PP_Order_Cost, I_Persistent public void setCostingMethod (String CostingMethod) { - if (CostingMethod == null || CostingMethod.equals("S") || CostingMethod.equals("A") || CostingMethod.equals("L") || CostingMethod.equals("F") || CostingMethod.equals("p") || CostingMethod.equals("I") || CostingMethod.equals("i") || CostingMethod.equals("U") || CostingMethod.equals("x")); - else throw new IllegalArgumentException ("CostingMethod Invalid value - " + CostingMethod + " - Reference_ID=122 - S - A - L - F - p - I - i - U - x"); - - set_ValueNoCheck (COLUMNNAME_CostingMethod, CostingMethod); + if (CostingMethod == null || CostingMethod.equals("S") || CostingMethod.equals("A") || CostingMethod.equals("L") || CostingMethod.equals("F") || CostingMethod.equals("p") || CostingMethod.equals("I") || CostingMethod.equals("i") || CostingMethod.equals("U") || CostingMethod.equals("x")); else throw new IllegalArgumentException ("CostingMethod Invalid value - " + CostingMethod + " - Reference_ID=122 - S - A - L - F - p - I - i - U - x"); set_ValueNoCheck (COLUMNNAME_CostingMethod, CostingMethod); } /** Get Costing Method. @@ -290,14 +288,17 @@ public class X_PP_Order_Cost extends PO implements I_PP_Order_Cost, I_Persistent } /** Set Current Cost Price Lower Level. - @param CurrentCostPriceLL Current Cost Price Lower Level */ + @param CurrentCostPriceLL + Current Price Lower Level Is the sum of the costs of the components of this product manufactured for this level. + */ public void setCurrentCostPriceLL (BigDecimal CurrentCostPriceLL) { set_ValueNoCheck (COLUMNNAME_CurrentCostPriceLL, CurrentCostPriceLL); } /** Get Current Cost Price Lower Level. - @return Current Cost Price Lower Level */ + @return Current Price Lower Level Is the sum of the costs of the components of this product manufactured for this level. + */ public BigDecimal getCurrentCostPriceLL () { BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CurrentCostPriceLL); @@ -410,10 +411,9 @@ public class X_PP_Order_Cost extends PO implements I_PP_Order_Cost, I_Persistent */ public void setM_CostType_ID (int M_CostType_ID) { - if (M_CostType_ID < 1) - set_Value (COLUMNNAME_M_CostType_ID, null); - else - set_Value (COLUMNNAME_M_CostType_ID, Integer.valueOf(M_CostType_ID)); + if (M_CostType_ID < 1) + throw new IllegalArgumentException ("M_CostType_ID is mandatory."); + set_Value (COLUMNNAME_M_CostType_ID, Integer.valueOf(M_CostType_ID)); } /** Get Cost Type. diff --git a/migration/353a-trunk/oracle/426_004_Fix_MO_Cost_Tab.sql b/migration/353a-trunk/oracle/426_004_Fix_MO_Cost_Tab.sql new file mode 100644 index 0000000000..387dd54524 --- /dev/null +++ b/migration/353a-trunk/oracle/426_004_Fix_MO_Cost_Tab.sql @@ -0,0 +1,159 @@ +-- Feb 20, 2009 2:35:16 PM EET +-- +UPDATE AD_Tab SET TabLevel=1,Updated=TO_DATE('2009-02-20 14:35:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Tab_ID=53038 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=53744 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=53742 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=53732 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=53745 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=53743 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=53733 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=10,IsDisplayed='Y' WHERE AD_Field_ID=53734 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=20,IsDisplayed='Y' WHERE AD_Field_ID=53735 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=30,IsDisplayed='Y' WHERE AD_Field_ID=53736 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=53737 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=53738 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=53739 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=53740 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=53741 +; + +-- Feb 20, 2009 2:36:15 PM EET +-- +UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=53739 +; + +-- Feb 20, 2009 2:36:15 PM EET +-- +UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=53740 +; + +-- Feb 20, 2009 2:36:16 PM EET +-- +UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=53741 +; + +-- Feb 20, 2009 2:37:13 PM EET +-- +UPDATE AD_Column SET IsSelectionColumn='Y',Updated=TO_DATE('2009-02-20 14:37:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=53547 +; + +-- Feb 20, 2009 2:37:26 PM EET +-- +UPDATE AD_Column SET IsSelectionColumn='Y',Updated=TO_DATE('2009-02-20 14:37:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=53549 +; + +-- Feb 20, 2009 2:38:02 PM EET +-- +UPDATE AD_Field SET SortNo=1.000000000000,Updated=TO_DATE('2009-02-20 14:38:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53736 +; + +-- Feb 20, 2009 2:38:17 PM EET +-- +UPDATE AD_Field SET DisplayLength=10, SortNo=2.000000000000,Updated=TO_DATE('2009-02-20 14:38:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53737 +; + +-- Feb 20, 2009 2:38:22 PM EET +-- +UPDATE AD_Field SET DisplayLength=10,Updated=TO_DATE('2009-02-20 14:38:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53734 +; + +-- Feb 20, 2009 2:38:28 PM EET +-- +UPDATE AD_Field SET DisplayLength=10,Updated=TO_DATE('2009-02-20 14:38:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53735 +; + +-- Feb 20, 2009 2:38:33 PM EET +-- +UPDATE AD_Field SET DisplayLength=10,Updated=TO_DATE('2009-02-20 14:38:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53736 +; + +-- Feb 20, 2009 2:38:41 PM EET +-- +UPDATE AD_Field SET DisplayLength=10,Updated=TO_DATE('2009-02-20 14:38:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53738 +; + +-- Feb 20, 2009 2:38:47 PM EET +-- +UPDATE AD_Field SET DisplayLength=10,Updated=TO_DATE('2009-02-20 14:38:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53740 +; + +-- Feb 20, 2009 2:38:54 PM EET +-- +UPDATE AD_Field SET DisplayLength=10,Updated=TO_DATE('2009-02-20 14:38:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53741 +; + +update PP_Order_Cost c set +M_CostType_ID=(select mas.M_CostType_ID from C_AcctSchema mas where mas.C_AcctSchema_ID=c.C_AcctSchema_ID) +where M_CostType_ID is null; + +-- Feb 20, 2009 3:10:48 PM EET +-- +UPDATE AD_Column SET IsMandatory='Y',Updated=TO_DATE('2009-02-20 15:10:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=53548 +; + +-- Feb 20, 2009 3:10:51 PM EET +-- +ALTER TABLE PP_Order_Cost MODIFY M_CostType_ID NUMBER(10) +; + +-- Feb 20, 2009 3:10:51 PM EET +-- +ALTER TABLE PP_Order_Cost MODIFY M_CostType_ID NOT NULL +; + diff --git a/migration/353a-trunk/postgresql/426_004_Fix_MO_Cost_Tab.sql b/migration/353a-trunk/postgresql/426_004_Fix_MO_Cost_Tab.sql new file mode 100644 index 0000000000..0e813429ae --- /dev/null +++ b/migration/353a-trunk/postgresql/426_004_Fix_MO_Cost_Tab.sql @@ -0,0 +1,159 @@ +-- Feb 20, 2009 2:35:17 PM EET +-- +UPDATE AD_Tab SET TabLevel=1,Updated=TO_TIMESTAMP('2009-02-20 14:35:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Tab_ID=53038 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=53744 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=53742 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=53732 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=53745 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=53743 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=53733 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=10,IsDisplayed='Y' WHERE AD_Field_ID=53734 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=20,IsDisplayed='Y' WHERE AD_Field_ID=53735 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=30,IsDisplayed='Y' WHERE AD_Field_ID=53736 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=53737 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=53738 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=53739 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=53740 +; + +-- Feb 20, 2009 2:36:11 PM EET +-- +UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=53741 +; + +-- Feb 20, 2009 2:36:15 PM EET +-- +UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=53739 +; + +-- Feb 20, 2009 2:36:15 PM EET +-- +UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=53740 +; + +-- Feb 20, 2009 2:36:16 PM EET +-- +UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=53741 +; + +-- Feb 20, 2009 2:37:13 PM EET +-- +UPDATE AD_Column SET IsSelectionColumn='Y',Updated=TO_TIMESTAMP('2009-02-20 14:37:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=53547 +; + +-- Feb 20, 2009 2:37:26 PM EET +-- +UPDATE AD_Column SET IsSelectionColumn='Y',Updated=TO_TIMESTAMP('2009-02-20 14:37:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=53549 +; + +-- Feb 20, 2009 2:38:02 PM EET +-- +UPDATE AD_Field SET SortNo=1.000000000000,Updated=TO_TIMESTAMP('2009-02-20 14:38:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53736 +; + +-- Feb 20, 2009 2:38:17 PM EET +-- +UPDATE AD_Field SET DisplayLength=10, SortNo=2.000000000000,Updated=TO_TIMESTAMP('2009-02-20 14:38:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53737 +; + +-- Feb 20, 2009 2:38:22 PM EET +-- +UPDATE AD_Field SET DisplayLength=10,Updated=TO_TIMESTAMP('2009-02-20 14:38:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53734 +; + +-- Feb 20, 2009 2:38:28 PM EET +-- +UPDATE AD_Field SET DisplayLength=10,Updated=TO_TIMESTAMP('2009-02-20 14:38:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53735 +; + +-- Feb 20, 2009 2:38:33 PM EET +-- +UPDATE AD_Field SET DisplayLength=10,Updated=TO_TIMESTAMP('2009-02-20 14:38:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53736 +; + +-- Feb 20, 2009 2:38:41 PM EET +-- +UPDATE AD_Field SET DisplayLength=10,Updated=TO_TIMESTAMP('2009-02-20 14:38:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53738 +; + +-- Feb 20, 2009 2:38:47 PM EET +-- +UPDATE AD_Field SET DisplayLength=10,Updated=TO_TIMESTAMP('2009-02-20 14:38:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53740 +; + +-- Feb 20, 2009 2:38:54 PM EET +-- +UPDATE AD_Field SET DisplayLength=10,Updated=TO_TIMESTAMP('2009-02-20 14:38:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53741 +; + +update PP_Order_Cost c set +M_CostType_ID=(select mas.M_CostType_ID from C_AcctSchema mas where mas.C_AcctSchema_ID=c.C_AcctSchema_ID) +where M_CostType_ID is null; + +-- Feb 20, 2009 3:10:48 PM EET +-- +UPDATE AD_Column SET IsMandatory='Y',Updated=TO_TIMESTAMP('2009-02-20 15:10:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=53548 +; + +-- Feb 20, 2009 3:10:51 PM EET +-- +insert into t_alter_column values('pp_order_cost','M_CostType_ID','NUMERIC(10)',null,null) +; + +-- Feb 20, 2009 3:10:51 PM EET +-- +insert into t_alter_column values('pp_order_cost','M_CostType_ID',null,'NOT NULL',null) +; +