From 9742c0dbc995e1aadd3ae3cfcca5da23e6fcbafa Mon Sep 17 00:00:00 2001 From: Diego Ruiz <12065321+d-ruiz@users.noreply.github.com> Date: Fri, 9 Apr 2021 04:00:45 +0200 Subject: [PATCH] IDEMPIERE-4723 - Clean up MMatch*/MMeasure*/MMenu/MMovement*/ModelVal* classes code (#645) --- org.adempiere.base/src/org/compiere/model/MMatchInv.java | 5 ----- org.adempiere.base/src/org/compiere/model/MMatchPO.java | 5 ----- org.adempiere.base/src/org/compiere/model/MMeasure.java | 1 - .../src/org/compiere/model/MMeasureCalc.java | 9 +++------ org.adempiere.base/src/org/compiere/model/MMenu.java | 1 - org.adempiere.base/src/org/compiere/model/MMovement.java | 9 +-------- .../src/org/compiere/model/MMovementConfirm.java | 8 +------- .../src/org/compiere/model/MMovementLine.java | 7 +------ .../src/org/compiere/model/MMovementLineConfirm.java | 2 -- .../src/org/compiere/model/ModelValidationEngine.java | 5 ----- 10 files changed, 6 insertions(+), 46 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MMatchInv.java b/org.adempiere.base/src/org/compiere/model/MMatchInv.java index f73101924b..ec489e89d7 100644 --- a/org.adempiere.base/src/org/compiere/model/MMatchInv.java +++ b/org.adempiere.base/src/org/compiere/model/MMatchInv.java @@ -151,12 +151,7 @@ public class MMatchInv extends X_M_MatchInv super (ctx, M_MatchInv_ID, trxName); if (M_MatchInv_ID == 0) { - // setDateTrx (new Timestamp(System.currentTimeMillis())); - // setC_InvoiceLine_ID (0); - // setM_InOutLine_ID (0); - // setM_Product_ID (0); setM_AttributeSetInstance_ID(0); - // setQty (Env.ZERO); setPosted (false); setProcessed (false); setProcessing (false); diff --git a/org.adempiere.base/src/org/compiere/model/MMatchPO.java b/org.adempiere.base/src/org/compiere/model/MMatchPO.java index fe8c721b3e..e8f479e8be 100644 --- a/org.adempiere.base/src/org/compiere/model/MMatchPO.java +++ b/org.adempiere.base/src/org/compiere/model/MMatchPO.java @@ -765,12 +765,7 @@ public class MMatchPO extends X_M_MatchPO super (ctx, M_MatchPO_ID, trxName); if (M_MatchPO_ID == 0) { - // setC_OrderLine_ID (0); - // setDateTrx (new Timestamp(System.currentTimeMillis())); - // setM_InOutLine_ID (0); - // setM_Product_ID (0); setM_AttributeSetInstance_ID(0); - // setQty (Env.ZERO); setPosted (false); setProcessed (false); setProcessing (false); diff --git a/org.adempiere.base/src/org/compiere/model/MMeasure.java b/org.adempiere.base/src/org/compiere/model/MMeasure.java index 854b32805b..f041a3a5c9 100644 --- a/org.adempiere.base/src/org/compiere/model/MMeasure.java +++ b/org.adempiere.base/src/org/compiere/model/MMeasure.java @@ -211,7 +211,6 @@ public class MMeasure extends X_PA_Measure implements ImmutablePOSupport trunc = "MM"; else if (MGoal.MEASUREDISPLAY_Week.equals(MeasureDisplay)) trunc = "W"; - // else if (MGoal.MEASUREDISPLAY_Day.equals(MeasureDisplay)) // trunc = "D"; trunc = "TRUNC(DateDoc,'" + trunc + "')"; StringBuilder sql = new StringBuilder ("SELECT SUM(ManualActual), ") diff --git a/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java b/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java index 6296c22b67..aaa4ce64c0 100644 --- a/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java +++ b/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java @@ -163,8 +163,7 @@ public class MMeasureCalc extends X_PA_MeasureCalc implements ImmutablePOSupport trunc = "MM"; else if (MGoal.MEASUREDISPLAY_Week.equals(MeasureScope)) trunc = "D"; - // else if (MGoal.MEASUREDISPLAY_Day.equals(MeasureDisplay)) - // ; + sb.append(" AND TRUNC(") .append(getDateColumn()).append(",'").append(trunc).append("')=TRUNC(") .append(DB.TO_DATE(reportDate)).append(",'").append(trunc).append("')"); @@ -203,8 +202,7 @@ public class MMeasureCalc extends X_PA_MeasureCalc implements ImmutablePOSupport trunc = "MM"; else if (MGoal.MEASUREDISPLAY_Week.equals(MeasureDisplay)) trunc = "W"; - // else if (MGoal.MEASUREDISPLAY_Day.equals(MeasureDisplay)) - // ; + dateCol = "TRUNC(" + getDateColumn() + ",'" + trunc + "') "; groupBy = dateCol; } @@ -277,8 +275,7 @@ public class MMeasureCalc extends X_PA_MeasureCalc implements ImmutablePOSupport trunc = "MM"; else if (MGoal.MEASUREDISPLAY_Week.equals(MeasureDisplay)) trunc = "W"; - // else if (MGoal.MEASUREDISPLAY_Day.equals(MeasureDisplay)) - // trunc = "D"; + sql.append(" AND TRUNC(").append(getDateColumn()).append(",'").append(trunc) .append("')=TRUNC(").append(DB.TO_DATE(date)).append(",'").append(trunc).append("')"); } diff --git a/org.adempiere.base/src/org/compiere/model/MMenu.java b/org.adempiere.base/src/org/compiere/model/MMenu.java index 4b0e40c233..91fe91cdd5 100644 --- a/org.adempiere.base/src/org/compiere/model/MMenu.java +++ b/org.adempiere.base/src/org/compiere/model/MMenu.java @@ -146,7 +146,6 @@ public class MMenu extends X_AD_Menu implements ImmutablePOSupport setIsReadOnly (false); // N setIsSOTrx (false); setIsSummary (false); - // setName (null); } } // MMenu diff --git a/org.adempiere.base/src/org/compiere/model/MMovement.java b/org.adempiere.base/src/org/compiere/model/MMovement.java index c21bf987ff..5a720e7ea2 100644 --- a/org.adempiere.base/src/org/compiere/model/MMovement.java +++ b/org.adempiere.base/src/org/compiere/model/MMovement.java @@ -67,7 +67,6 @@ public class MMovement extends X_M_Movement implements DocAction super (ctx, M_Movement_ID, trxName); if (M_Movement_ID == 0) { - // setC_DocType_ID (0); setDocAction (DOCACTION_Complete); // CO setDocStatus (DOCSTATUS_Drafted); // DR setIsApproved (false); @@ -183,10 +182,7 @@ public class MMovement extends X_M_Movement implements DocAction */ public File createPDF (File file) { - // ReportEngine re = ReportEngine.get (getCtx(), ReportEngine.INVOICE, getC_Invoice_ID()); - // if (re == null) - return null; - // return re.getPDF(file); + return null; } // createPDF @@ -352,7 +348,6 @@ public class MMovement extends X_M_Movement implements DocAction if (confirmations.length > 0) return; - // Create Confirmation MMovementConfirm.create (this, false); } // createConfirmation @@ -1014,8 +1009,6 @@ public class MMovement extends X_M_Movement implements DocAction */ public int getC_Currency_ID() { - // MPriceList pl = MPriceList.get(getCtx(), getM_PriceList_ID()); - // return pl.getC_Currency_ID(); return 0; } // getC_Currency_ID diff --git a/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java b/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java index 251281fd47..8bc94ef7a5 100644 --- a/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java +++ b/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java @@ -96,7 +96,6 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction super (ctx, M_MovementConfirm_ID, trxName); if (M_MovementConfirm_ID == 0) { - // setM_Movement_ID (0); setDocAction (DOCACTION_Complete); setDocStatus (DOCSTATUS_Drafted); setIsApproved (false); // N @@ -244,10 +243,7 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction */ public File createPDF (File file) { - // ReportEngine re = ReportEngine.get (getCtx(), ReportEngine.INVOICE, getC_Invoice_ID()); - // if (re == null) - return null; - // return re.getPDF(file); + return null; } // createPDF @@ -765,8 +761,6 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction */ public int getC_Currency_ID() { - // MPriceList pl = MPriceList.get(getCtx(), getM_PriceList_ID()); - // return pl.getC_Currency_ID(); return 0; } // getC_Currency_ID diff --git a/org.adempiere.base/src/org/compiere/model/MMovementLine.java b/org.adempiere.base/src/org/compiere/model/MMovementLine.java index b6000af147..671d99695a 100644 --- a/org.adempiere.base/src/org/compiere/model/MMovementLine.java +++ b/org.adempiere.base/src/org/compiere/model/MMovementLine.java @@ -52,11 +52,6 @@ public class MMovementLine extends X_M_MovementLine super (ctx, M_MovementLine_ID, trxName); if (M_MovementLine_ID == 0) { - // setM_LocatorTo_ID (0); // @M_LocatorTo_ID@ - // setM_Locator_ID (0); // @M_Locator_ID@ - // setM_MovementLine_ID (0); - // setLine (0); - // setM_Product_ID (0); setM_AttributeSetInstance_ID(0); // ID setMovementQty (Env.ZERO); // 1 setTargetQty (Env.ZERO); // 0 @@ -261,7 +256,7 @@ public class MMovementLine extends X_M_MovementLine { setDD_OrderLine_ID(oLine.getDD_OrderLine_ID()); setLine(oLine.getLine()); - //setC_UOM_ID(oLine.getC_UOM_ID()); + MProduct product = oLine.getProduct(); if (product == null) { diff --git a/org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java b/org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java index b0bc3dff9d..bc5e00bbe6 100644 --- a/org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java +++ b/org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java @@ -48,8 +48,6 @@ public class MMovementLineConfirm extends X_M_MovementLineConfirm super (ctx, M_MovementLineConfirm_ID, trxName); if (M_MovementLineConfirm_ID == 0) { - // setM_MovementConfirm_ID (0); Parent - // setM_MovementLine_ID (0); setConfirmedQty (Env.ZERO); setDifferenceQty (Env.ZERO); setScrappedQty (Env.ZERO); diff --git a/org.adempiere.base/src/org/compiere/model/ModelValidationEngine.java b/org.adempiere.base/src/org/compiere/model/ModelValidationEngine.java index 93e7cbb114..d052b0aef4 100644 --- a/org.adempiere.base/src/org/compiere/model/ModelValidationEngine.java +++ b/org.adempiere.base/src/org/compiere/model/ModelValidationEngine.java @@ -121,9 +121,6 @@ public class ModelValidationEngine continue; loadValidatorClasses(clients[i], classNames); } - //logging to db will try to init ModelValidationEngine again! - //log.config(toString()); - // System.out.println(toString()); } // ModelValidatorEngine private void loadValidatorClasses(MClient client, String classNames) @@ -180,8 +177,6 @@ public class ModelValidationEngine /** Logger */ private static CLogger log = CLogger.getCLogger(ModelValidationEngine.class); -// /** Change Support */ -// private VetoableChangeSupport m_changeSupport = new VetoableChangeSupport(this); /** Validators */ private ArrayList m_validators = new ArrayList();