diff --git a/org.adempiere.base/src/org/compiere/model/MPInstance.java b/org.adempiere.base/src/org/compiere/model/MPInstance.java index 9854566e67..a046769934 100644 --- a/org.adempiere.base/src/org/compiere/model/MPInstance.java +++ b/org.adempiere.base/src/org/compiere/model/MPInstance.java @@ -71,8 +71,6 @@ public class MPInstance extends X_AD_PInstance // New Process if (AD_PInstance_ID == 0) { - // setAD_Process_ID (0); // parent - // setRecord_ID (0); setIsProcessing (false); } } // MPInstance @@ -249,7 +247,6 @@ public class MPInstance extends X_AD_PInstance P_Date, P_ID, P_Number, P_Msg, AD_Table_ID, Record_ID); m_log.add(logEntry); // save it to DB ? - // log.saveEx(); return logEntry; } // addLog diff --git a/org.adempiere.base/src/org/compiere/model/MPOS.java b/org.adempiere.base/src/org/compiere/model/MPOS.java index 3fb8278b59..7d4e820d05 100644 --- a/org.adempiere.base/src/org/compiere/model/MPOS.java +++ b/org.adempiere.base/src/org/compiere/model/MPOS.java @@ -102,12 +102,7 @@ public class MPOS extends X_C_POS implements ImmutablePOSupport super (ctx, C_POS_ID, trxName); if (C_POS_ID == 0) { - // setName (null); - // setSalesRep_ID (0); - // setC_CashBook_ID (0); - // setM_PriceList_ID (0); setIsModifyPrice (false); // N - // setM_Warehouse_ID (0); } } // MPOS diff --git a/org.adempiere.base/src/org/compiere/model/MPeriod.java b/org.adempiere.base/src/org/compiere/model/MPeriod.java index bac3a9ef2e..da1b599821 100644 --- a/org.adempiere.base/src/org/compiere/model/MPeriod.java +++ b/org.adempiere.base/src/org/compiere/model/MPeriod.java @@ -495,11 +495,6 @@ public class MPeriod extends X_C_Period implements ImmutablePOSupport super (ctx, C_Period_ID, trxName); if (C_Period_ID == 0) { - // setC_Period_ID (0); // PK - // setC_Year_ID (0); // Parent - // setName (null); - // setPeriodNo (0); - // setStartDate (new Timestamp(System.currentTimeMillis())); setPeriodType (PERIODTYPE_StandardCalendarPeriod); } } // MPeriod @@ -623,7 +618,6 @@ public class MPeriod extends X_C_Period implements ImmutablePOSupport getPeriodControls(false); for (int i = 0; i < m_controls.length; i++) { - // log.fine("getPeriodControl - " + 1 + " - " + m_controls[i]); if (DocBaseType.equals(m_controls[i].getDocBaseType())) return m_controls[i]; } diff --git a/org.adempiere.base/src/org/compiere/model/MPeriodControl.java b/org.adempiere.base/src/org/compiere/model/MPeriodControl.java index 93074b6b84..92acce9d0d 100644 --- a/org.adempiere.base/src/org/compiere/model/MPeriodControl.java +++ b/org.adempiere.base/src/org/compiere/model/MPeriodControl.java @@ -47,8 +47,6 @@ public class MPeriodControl extends X_C_PeriodControl implements ImmutablePOSupp super(ctx, C_PeriodControl_ID, trxName); if (C_PeriodControl_ID == 0) { - // setC_Period_ID (0); - // setDocBaseType (null); setPeriodAction (PERIODACTION_NoAction); setPeriodStatus (PERIODSTATUS_NeverOpened); } diff --git a/org.adempiere.base/src/org/compiere/model/MPreference.java b/org.adempiere.base/src/org/compiere/model/MPreference.java index 6cf234e5eb..a6da2297e9 100644 --- a/org.adempiere.base/src/org/compiere/model/MPreference.java +++ b/org.adempiere.base/src/org/compiere/model/MPreference.java @@ -44,12 +44,6 @@ public class MPreference extends X_AD_Preference public MPreference(Properties ctx, int AD_Preference_ID, String trxName) { super(ctx, AD_Preference_ID, trxName); - if (AD_Preference_ID == 0) - { - // setAD_Preference_ID (0); - // setAttribute (null); - // setValue (null); - } } // MPreference /** diff --git a/org.adempiere.base/src/org/compiere/model/MPriceList.java b/org.adempiere.base/src/org/compiere/model/MPriceList.java index 409d5a43ed..633a174492 100644 --- a/org.adempiere.base/src/org/compiere/model/MPriceList.java +++ b/org.adempiere.base/src/org/compiere/model/MPriceList.java @@ -229,8 +229,6 @@ public class MPriceList extends X_M_PriceList implements ImmutablePOSupport setIsSOPriceList (false); setIsTaxIncluded (false); setPricePrecision (2); // 2 - // setName (null); - // setC_Currency_ID (0); } } // MPriceList diff --git a/org.adempiere.base/src/org/compiere/model/MPriceListVersion.java b/org.adempiere.base/src/org/compiere/model/MPriceListVersion.java index 84c3c625d1..d653bd9637 100644 --- a/org.adempiere.base/src/org/compiere/model/MPriceListVersion.java +++ b/org.adempiere.base/src/org/compiere/model/MPriceListVersion.java @@ -48,13 +48,6 @@ public class MPriceListVersion extends X_M_PriceList_Version implements Immutabl public MPriceListVersion(Properties ctx, int M_PriceList_Version_ID, String trxName) { super(ctx, M_PriceList_Version_ID, trxName); - if (M_PriceList_Version_ID == 0) - { - // setName (null); // @#Date@ - // setM_PriceList_ID (0); - // setValidFrom (TimeUtil.getDay(null)); // @#Date@ - // setM_DiscountSchema_ID (0); - } } // MPriceListVersion /** diff --git a/org.adempiere.base/src/org/compiere/model/MPrivateAccess.java b/org.adempiere.base/src/org/compiere/model/MPrivateAccess.java index 8b0fbed5d3..5c1592972d 100644 --- a/org.adempiere.base/src/org/compiere/model/MPrivateAccess.java +++ b/org.adempiere.base/src/org/compiere/model/MPrivateAccess.java @@ -82,52 +82,6 @@ public class MPrivateAccess extends X_AD_Private_Access */ public static String getLockedRecordWhere (int AD_Table_ID, int AD_User_ID) { - //[ 1644094 ] MPrivateAccess.getLockedRecordWhere inefficient - /* - ArrayList list = new ArrayList(); - PreparedStatement pstmt = null; - String sql = "SELECT Record_ID FROM AD_Private_Access WHERE AD_Table_ID=? AND AD_User_ID<>? AND IsActive='Y'"; - try - { - pstmt = DB.prepareStatement(sql, null); - pstmt.setInt(1, AD_Table_ID); - pstmt.setInt(2, AD_User_ID); - ResultSet rs = pstmt.executeQuery(); - while (rs.next()) - list.add(Integer.valueOf(rs.getInt(1))); - rs.close(); - pstmt.close(); - pstmt = null; - } - catch (Exception e) - { - s_log.log(Level.SEVERE, sql, e); - } - try - { - if (pstmt != null) - pstmt.close(); - pstmt = null; - } - catch (Exception e) - { - pstmt = null; - } - // - if (list.size() == 0) - return null; - if (list.size() == 1) - return "<>" + list.get(0); - // - StringBuilder sb = new StringBuilder(" NOT IN("); - for (int i = 0; i < list.size(); i++) - { - if (i > 0) - sb.append(","); - sb.append(list.get(i)); - } - sb.append(")"); - return sb.toString();*/ String whereClause = " NOT IN ( SELECT Record_ID FROM AD_Private_Access WHERE AD_Table_ID = " +AD_Table_ID+" AND AD_User_ID <> "+AD_User_ID+" AND IsActive = 'Y' )"; return whereClause; diff --git a/org.adempiere.base/src/org/compiere/model/MProcess.java b/org.adempiere.base/src/org/compiere/model/MProcess.java index 64a9c59d1b..a957d515e4 100644 --- a/org.adempiere.base/src/org/compiere/model/MProcess.java +++ b/org.adempiere.base/src/org/compiere/model/MProcess.java @@ -170,8 +170,6 @@ public class MProcess extends X_AD_Process implements ImmutablePOSupport super (ctx, AD_Process_ID, trxName); if (AD_Process_ID == 0) { - // setValue (null); - // setName (null); setIsReport (false); setAccessLevel (ACCESSLEVEL_All); setEntityType (ENTITYTYPE_UserMaintained); diff --git a/org.adempiere.base/src/org/compiere/model/MProcessAccess.java b/org.adempiere.base/src/org/compiere/model/MProcessAccess.java index 7e192c7016..d3f901eb1f 100644 --- a/org.adempiere.base/src/org/compiere/model/MProcessAccess.java +++ b/org.adempiere.base/src/org/compiere/model/MProcessAccess.java @@ -49,8 +49,6 @@ public class MProcessAccess extends X_AD_Process_Access throw new IllegalArgumentException("Multi-Key"); else { - // setAD_Process_ID (0); - // setAD_Role_ID (0); setIsReadWrite (true); } } // MProcessAccess diff --git a/org.adempiere.base/src/org/compiere/model/MProcessPara.java b/org.adempiere.base/src/org/compiere/model/MProcessPara.java index b23c4a501a..30a7216af2 100644 --- a/org.adempiere.base/src/org/compiere/model/MProcessPara.java +++ b/org.adempiere.base/src/org/compiere/model/MProcessPara.java @@ -89,13 +89,8 @@ public class MProcessPara extends X_AD_Process_Para implements ImmutablePOSuppor super (ctx, AD_Process_Para_ID, trxName); if (AD_Process_Para_ID == 0) { - // setAD_Process_ID (0); Parent - // setName (null); - // setColumnName (null); - setFieldLength (0); setSeqNo (0); - // setAD_Reference_ID (0); setIsCentrallyMaintained (true); setIsRange (false); setIsMandatory (false); diff --git a/org.adempiere.base/src/org/compiere/model/MProduct.java b/org.adempiere.base/src/org/compiere/model/MProduct.java index 64f3d0013c..09570e3d81 100644 --- a/org.adempiere.base/src/org/compiere/model/MProduct.java +++ b/org.adempiere.base/src/org/compiere/model/MProduct.java @@ -224,12 +224,6 @@ public class MProduct extends X_M_Product implements ImmutablePOSupport super (ctx, M_Product_ID, trxName); if (M_Product_ID == 0) { - // setValue (null); - // setName (null); - // setM_Product_Category_ID (0); - // setC_TaxCategory_ID (0); - // setC_UOM_ID (0); - // setProductType (PRODUCTTYPE_Item); // I setIsBOM (false); // N setIsInvoicePrintDetails (false); @@ -667,7 +661,6 @@ public class MProduct extends X_M_Product implements ImmutablePOSupport // Reset Stocked if not Item //AZ Goodwill: Bug Fix isStocked always return false - //if (isStocked() && !PRODUCTTYPE_Item.equals(getProductType())) if (!PRODUCTTYPE_Item.equals(getProductType())) setIsStocked(false); @@ -781,7 +774,6 @@ public class MProduct extends X_M_Product implements ImmutablePOSupport + "FROM M_Product p " + "WHERE p.M_Product_ID=a.M_Product_ID) " + "WHERE IsActive='Y'" - // + " AND GuaranteeDate > getDate()" + " AND M_Product_ID=" + getM_Product_ID(); int no = DB.executeUpdate(sql, get_TrxName()); if (log.isLoggable(Level.FINE)) log.fine("Asset Description updated #" + no); @@ -825,29 +817,6 @@ public class MProduct extends X_M_Product implements ImmutablePOSupport // delete costing MCost.delete(this); - // [ 1674225 ] Delete Product: Costing deletion error - /*MAcctSchema[] mass = MAcctSchema.getClientAcctSchema(getCtx(),getAD_Client_ID(), get_TrxName()); - for(int i=0; i