From a74694f81ee82f5e7c92417055fcb1dc2ca97c4f Mon Sep 17 00:00:00 2001
From: Diego Ruiz <12065321+d-ruiz@users.noreply.github.com>
Date: Mon, 5 Jul 2021 13:51:58 +0200
Subject: [PATCH] IDEMPIERE-4723 - Clean up dead code -> MC* classes (#762)

---
 .../src/org/compiere/model/MCash.java         |   7 +-
 .../src/org/compiere/model/MCashLine.java     |   2 -
 .../src/org/compiere/model/MCashPlan.java     |  24 --
 .../src/org/compiere/model/MCashPlanLine.java |  11 -
 .../src/org/compiere/model/MChangeLog.java    |   3 -
 .../src/org/compiere/model/MChangeNotice.java |   1 -
 .../org/compiere/model/MChangeRequest.java    |   2 -
 .../src/org/compiere/model/MCharge.java       |   2 -
 .../src/org/compiere/model/MChat.java         |   4 -
 .../src/org/compiere/model/MClient.java       |   3 -
 .../src/org/compiere/model/MColorSchema.java  |   8 -
 .../src/org/compiere/model/MColumn.java       |  81 ------
 .../src/org/compiere/model/MCommission.java   |   6 -
 .../org/compiere/model/MCommissionAmt.java    |   2 -
 .../org/compiere/model/MCommissionLine.java   |   1 -
 .../org/compiere/model/MCommissionRun.java    |   3 -
 .../org/compiere/model/MConversionRate.java   |   3 -
 .../compiere/model/MConversionRateUtil.java   |   1 -
 .../src/org/compiere/model/MCost.java         |  24 --
 .../src/org/compiere/model/MCostDetail.java   |  25 --
 .../src/org/compiere/model/MCostElement.java  |  23 --
 .../src/org/compiere/model/MCostQueue.java    |   5 -
 .../src/org/compiere/model/MCountry.java      |  60 ----
 .../src/org/compiere/model/MCurrency.java     | 274 ------------------
 24 files changed, 1 insertion(+), 574 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/model/MCash.java b/org.adempiere.base/src/org/compiere/model/MCash.java
index 4e05479f29..d7739bf0c3 100644
--- a/org.adempiere.base/src/org/compiere/model/MCash.java
+++ b/org.adempiere.base/src/org/compiere/model/MCash.java
@@ -150,7 +150,6 @@ public class MCash extends X_C_Cash implements DocAction
 		super (ctx, C_Cash_ID, trxName);
 		if (C_Cash_ID == 0)
 		{
-		//	setC_CashBook_ID (0);		//	FK
 			setBeginningBalance (Env.ZERO);
 			setEndingBalance (Env.ZERO);
 			setStatementDifference(Env.ZERO);
@@ -286,10 +285,7 @@ public class MCash extends X_C_Cash 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
 
 	/**
@@ -397,7 +393,6 @@ public class MCash extends X_C_Cash implements DocAction
 			}
 		}
 		setStatementDifference(difference);
-	//	setEndingBalance(getBeginningBalance().add(getStatementDifference()));
 
 		m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_PREPARE);
 		if (m_processMsg != null)
diff --git a/org.adempiere.base/src/org/compiere/model/MCashLine.java b/org.adempiere.base/src/org/compiere/model/MCashLine.java
index 541f9610f8..58b23b5cb9 100644
--- a/org.adempiere.base/src/org/compiere/model/MCashLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MCashLine.java
@@ -56,8 +56,6 @@ public class MCashLine extends X_C_CashLine
 		super (ctx, C_CashLine_ID, trxName);
 		if (C_CashLine_ID == 0)
 		{
-		//	setLine (0);
-		//	setCashType (CASHTYPE_GeneralExpense);
 			setAmount (Env.ZERO);
 			setDiscountAmt(Env.ZERO);
 			setWriteOffAmt(Env.ZERO);
diff --git a/org.adempiere.base/src/org/compiere/model/MCashPlan.java b/org.adempiere.base/src/org/compiere/model/MCashPlan.java
index 69650cbeef..d455abc57b 100644
--- a/org.adempiere.base/src/org/compiere/model/MCashPlan.java
+++ b/org.adempiere.base/src/org/compiere/model/MCashPlan.java
@@ -50,20 +50,6 @@ public class MCashPlan extends X_C_CashPlan
 	public MCashPlan (Properties ctx, int C_CashPlan_ID, String trxName)
 	{
 	      super (ctx, C_CashPlan_ID, trxName);
-	      /** if (C_CashPlan_ID == 0)
-	        {
-				setC_Activity_ID (0);
-				setC_CashPlan_ID (0);
-				setC_Project_ID (0);
-				setDateDoc (new Timestamp(System.currentTimeMillis()));
-	// @#Date@
-				setDocumentNo (null);
-				setGrandTotal (Env.ZERO);
-				setIsApproved (false);
-	// @IsApproved@
-				setIsSOTrx (false);
-				setProcessed (false);
-	        } */
 	}	//	MCashPlan
 
 	/**
@@ -83,16 +69,6 @@ public class MCashPlan extends X_C_CashPlan
 	 */
 	protected boolean beforeDelete ()
 	{
-		/*
-		// delete the lines using model classes
-		boolean success = true;
-		for (MCashPlanLine cpl : getLines()) {
-			success = cpl.delete(true, get_TrxName());
-			if (! success)
-				break;
-		}
-		return success;
-		*/
 		// delete the lines using direct SQL (to avoid logging and updating of header on every step) - same as cascade foreign key
 		int nodel = DB.executeUpdate("DELETE FROM C_CashPlanLine WHERE C_CashPlan_ID=?", getC_CashPlan_ID(), get_TrxName());
 		return (nodel >= 0);
diff --git a/org.adempiere.base/src/org/compiere/model/MCashPlanLine.java b/org.adempiere.base/src/org/compiere/model/MCashPlanLine.java
index 046e8a8f39..53d5b736c8 100644
--- a/org.adempiere.base/src/org/compiere/model/MCashPlanLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MCashPlanLine.java
@@ -47,17 +47,6 @@ public class MCashPlanLine extends X_C_CashPlanLine
 	public MCashPlanLine (Properties ctx, int C_CashPlanLine_ID, String trxName)
 	{
 	      super (ctx, C_CashPlanLine_ID, trxName);
-	      /** if (C_CashPlanLine_ID == 0)
-	        {
-				setC_CashPlan_ID (0);
-				setC_CashPlanLine_ID (0);
-				setDateTrx (new Timestamp(System.currentTimeMillis()));
-				setLine (0);
-	// @SQL=SELECT NVL(MAX(Line),0)+10 AS DefaultValue FROM C_CashPlanLine WHERE C_CashPlanLine_ID=@C_CashPlanLine_ID@
-				setProcessed (false);
-				setQtyEntered (Env.ZERO);
-	// 1
-	        } */
 	}	//	MCashPlanLine
 
 	/**
diff --git a/org.adempiere.base/src/org/compiere/model/MChangeLog.java b/org.adempiere.base/src/org/compiere/model/MChangeLog.java
index 7cde84a141..c716e07a8f 100644
--- a/org.adempiere.base/src/org/compiere/model/MChangeLog.java
+++ b/org.adempiere.base/src/org/compiere/model/MChangeLog.java
@@ -181,9 +181,6 @@ public class MChangeLog extends X_AD_ChangeLog
 		setOldValue (OldValue);
 		setNewValue (NewValue);
 		setEventChangeLog(event);
-		//	EVENT / Release 3.3.1t_2007-12-05 ADempiere
-		// Drop description from AD_ChangeLog - pass it to AD_Session to save disk space
-		// setDescription(Adempiere.MAIN_VERSION + "_" + Adempiere.DATE_VERSION + " " + Adempiere.getImplementationVersion());
 	}	//	MChangeLog
 
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MChangeNotice.java b/org.adempiere.base/src/org/compiere/model/MChangeNotice.java
index 58053979e5..e42c2e8ee1 100644
--- a/org.adempiere.base/src/org/compiere/model/MChangeNotice.java
+++ b/org.adempiere.base/src/org/compiere/model/MChangeNotice.java
@@ -42,7 +42,6 @@ public class MChangeNotice extends X_M_ChangeNotice
 		super (ctx, M_ChangeNotice_ID, trxName);
 		if (M_ChangeNotice_ID == 0)
 		{
-		//	setName (null);
 			setIsApproved (false);	// N
 			setProcessed (false);
 		}	
diff --git a/org.adempiere.base/src/org/compiere/model/MChangeRequest.java b/org.adempiere.base/src/org/compiere/model/MChangeRequest.java
index 78468ea331..7e3f71b67a 100644
--- a/org.adempiere.base/src/org/compiere/model/MChangeRequest.java
+++ b/org.adempiere.base/src/org/compiere/model/MChangeRequest.java
@@ -46,7 +46,6 @@ public class MChangeRequest extends X_M_ChangeRequest
 		super (ctx, M_ChangeRequest_ID, trxName);
 		if (M_ChangeRequest_ID == 0)
 		{
-		//	setName (null);
 			setIsApproved(false);
 			setProcessed(false);
 		}
@@ -87,7 +86,6 @@ public class MChangeRequest extends X_M_ChangeRequest
 	 */
 	public MRequest[] getRequests()
 	{
-//		String sql = "SELECT * FROM R_Request WHERE M_ChangeRequest_ID=?";
 		return null;
 	}	//	getRequests
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MCharge.java b/org.adempiere.base/src/org/compiere/model/MCharge.java
index dc29995547..eda590f27f 100644
--- a/org.adempiere.base/src/org/compiere/model/MCharge.java
+++ b/org.adempiere.base/src/org/compiere/model/MCharge.java
@@ -149,8 +149,6 @@ public class MCharge extends X_C_Charge implements ImmutablePOSupport
 			setIsSameCurrency (false);
 			setIsSameTax (false);
 			setIsTaxIncluded (false);	// N
-		//	setName (null);
-		//	setC_TaxCategory_ID (0);
 		}
 	}	//	MCharge
 
diff --git a/org.adempiere.base/src/org/compiere/model/MChat.java b/org.adempiere.base/src/org/compiere/model/MChat.java
index 0127076a39..09c33299cc 100644
--- a/org.adempiere.base/src/org/compiere/model/MChat.java
+++ b/org.adempiere.base/src/org/compiere/model/MChat.java
@@ -103,11 +103,8 @@ public class MChat extends X_CM_Chat
 		super (ctx, CM_Chat_ID, trxName);
 		if (CM_Chat_ID == 0)
 		{
-		//	setAD_Table_ID (0);
-		//	setRecord_ID (0);
 			setConfidentialType (CONFIDENTIALTYPE_PublicInformation);
 			setModerationType (MODERATIONTYPE_NotModerated);
-		//	setDescription (null);
 		}
 	}	//	MChat
 
@@ -229,7 +226,6 @@ public class MChat extends X_CM_Chat
 				m_format = DisplayType.getDateFormat(DisplayType.DateTime);
 			b.addElement(m_format.format(created));
 			history.addElement(b);
-		//	history.addElement(new br());
 			//
 			p p = new p();
 			String data = entry.getCharacterData();
diff --git a/org.adempiere.base/src/org/compiere/model/MClient.java b/org.adempiere.base/src/org/compiere/model/MClient.java
index 1e11940762..c4db59c614 100644
--- a/org.adempiere.base/src/org/compiere/model/MClient.java
+++ b/org.adempiere.base/src/org/compiere/model/MClient.java
@@ -153,8 +153,6 @@ public class MClient extends X_AD_Client implements ImmutablePOSupport
 		{
 			if (m_createNew)
 			{
-			//	setValue (null);
-			//	setName (null);
 				setAD_Org_ID(0);
 				setIsMultiLingualDocument (false);
 				setIsSmtpAuthorization (false);
@@ -1015,7 +1013,6 @@ public class MClient extends X_AD_Client implements ImmutablePOSupport
 	 *
 	 *	@return boolean representing if client accounting is enabled and it's on a client
 	 */
-	//private static final String CLIENT_ACCOUNTING_DISABLED = "D";
 	private static final String CLIENT_ACCOUNTING_QUEUE = "Q";
 	private static final String CLIENT_ACCOUNTING_IMMEDIATE = "I";
 
diff --git a/org.adempiere.base/src/org/compiere/model/MColorSchema.java b/org.adempiere.base/src/org/compiere/model/MColorSchema.java
index 0d0d0a4930..d807495947 100644
--- a/org.adempiere.base/src/org/compiere/model/MColorSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/MColorSchema.java
@@ -140,14 +140,6 @@ public class MColorSchema extends X_PA_ColorSchema implements ImmutablePOSupport
 	public MColorSchema (Properties ctx, int PA_ColorSchema_ID, String trxName)
 	{
 		super (ctx, PA_ColorSchema_ID, trxName);
-		if (PA_ColorSchema_ID == 0)
-		{
-		//	setName (null);
-		//	setMark1Percent (50);
-		//	setAD_PrintColor1_ID (102);		//	red
-		//	setMark2Percent (100);
-		//	setAD_PrintColor2_ID (113);		//	yellow
-		}
 	}	//	MColorSchema
 
 	/**
diff --git a/org.adempiere.base/src/org/compiere/model/MColumn.java b/org.adempiere.base/src/org/compiere/model/MColumn.java
index 7e78b46a8c..9b1c5f559f 100644
--- a/org.adempiere.base/src/org/compiere/model/MColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/MColumn.java
@@ -181,11 +181,6 @@ public class MColumn extends X_AD_Column implements ImmutablePOSupport
 		super (ctx, AD_Column_ID, trxName);
 		if (AD_Column_ID == 0)
 		{
-		//	setAD_Element_ID (0);
-		//	setAD_Reference_ID (0);
-		//	setColumnName (null);
-		//	setName (null);
-		//	setEntityType (null);	// U
 			setIsAlwaysUpdateable (false);	// N
 			setIsEncrypted (false);
 			setIsIdentifier (false);
@@ -381,22 +376,6 @@ public class MColumn extends X_AD_Column implements ImmutablePOSupport
 			}
 		}
 
-		/* IDEMPIERE-3509, IDEMPIERE-3902
-		 * removing this validation
-		 * it affects adversely PackIn process that can create the table later
-		if ( displayType == DisplayType.TableDir ||
-			(displayType == DisplayType.Search && getAD_Reference_Value_ID() <= 0))
-		{
-			// verify the foreign table exists
-			String foreignTableName = getReferenceTableName();
-			MTable foreignTable = MTable.get(getCtx(), foreignTableName);
-			if (foreignTable == null || foreignTable.getAD_Table_ID() <= 0) {
-				log.saveError("Error", Msg.getMsg(getCtx(), "NotReferenceTable", new Object[] {getColumnName()}));
-				return false;
-			}
-		}
-		*/
-
 		if (displayType == DisplayType.Table && getAD_Reference_Value_ID() <= 0)
 		{
 			log.saveError("FillMandatory", Msg.getElement(getCtx(), "AD_Reference_Value_ID"));
@@ -424,13 +403,6 @@ public class MColumn extends X_AD_Column implements ImmutablePOSupport
 			} catch (Exception e){}
 		}
 		
-		/** Views are not updateable
-		UPDATE AD_Column c
-		SET IsUpdateable='N', IsAlwaysUpdateable='N'
-		WHERE AD_Table_ID IN (SELECT AD_Table_ID FROM AD_Table WHERE IsView='Y')
-		**/
-		
-		/* Diego Ruiz - globalqss - BF [1651899] - AD_Column: Avoid dup. SeqNo for IsIdentifier='Y' */
 		if (isIdentifier())
 		{
 			int cnt = DB.getSQLValue(get_TrxName(),"SELECT COUNT(*) FROM AD_Column "+
@@ -566,28 +538,6 @@ public class MColumn extends X_AD_Column implements ImmutablePOSupport
 		if (!success)
 			return success;
 
-		/* Fields must inherit translation from element, not from column
-		 * changing it here is useless as SynchronizeTerminology get trl from column */
-		/*
-		//	Update Fields
-		if (!newRecord)
-		{
-			if (   is_ValueChanged(MColumn.COLUMNNAME_Name)
-				|| is_ValueChanged(MColumn.COLUMNNAME_Description)
-				|| is_ValueChanged(MColumn.COLUMNNAME_Help)
-				) {
-				StringBuilder sql = new StringBuilder("UPDATE AD_Field SET Name=")
-					.append(DB.TO_STRING(getName()))
-					.append(", Description=").append(DB.TO_STRING(getDescription()))
-					.append(", Help=").append(DB.TO_STRING(getHelp()))
-					.append(" WHERE AD_Column_ID=").append(get_ID())
-					.append(" AND IsCentrallyMaintained='Y'");
-				int no = DB.executeUpdate(sql.toString(), get_TrxName());
-				if (log.isLoggable(Level.FINE)) log.fine("afterSave - Fields updated #" + no);
-			}
-		}
-		*/
-
 		if ((newRecord || is_ValueChanged(COLUMNNAME_ColumnName))
 			&& (   "EntityType".equals(getColumnName())
 				|| "EntityType".equals(get_ValueOld(COLUMNNAME_ColumnName).toString()))) {
@@ -653,37 +603,6 @@ public class MColumn extends X_AD_Column implements ImmutablePOSupport
 		return DisplayType.getSQLDataType (dt, columnName, getFieldLength());
 	}	//	getSQLDataType
 	
-	/**
-	 * 	Get SQL Data Type
-	 *	@return e.g. NVARCHAR2(60)
-	 */
-	/*
-	private String getSQLDataType()
-	{
-		int dt = getAD_Reference_ID();
-		if (DisplayType.isID(dt) || dt == DisplayType.Integer)
-			return "NUMBER(10)";
-		if (DisplayType.isDate(dt))
-			return "DATE";
-		if (DisplayType.isNumeric(dt))
-			return "NUMBER";
-		if (dt == DisplayType.Binary)
-			return "BLOB";
-		if (dt == DisplayType.TextLong)
-			return "CLOB";
-		if (dt == DisplayType.YesNo)
-			return "CHAR(1)";
-		if (dt == DisplayType.List)
-			return "NVARCHAR2(" + getFieldLength() + ")";
-		if (dt == DisplayType.Button)
-			return "CHAR(" + getFieldLength() + ")";
-		else if (!DisplayType.isText(dt))
-			log.severe("Unhandled Data Type = " + dt);
-			
-		return "NVARCHAR2(" + getFieldLength() + ")";
-	}	//	getSQLDataType
-	*/
-	
 	/**
 	 * 	Get Table Constraint
 	 *	@param tableName table name
diff --git a/org.adempiere.base/src/org/compiere/model/MCommission.java b/org.adempiere.base/src/org/compiere/model/MCommission.java
index 034dac6f9a..51e3ac2552 100644
--- a/org.adempiere.base/src/org/compiere/model/MCommission.java
+++ b/org.adempiere.base/src/org/compiere/model/MCommission.java
@@ -49,12 +49,6 @@ public class MCommission extends X_C_Commission
 		super(ctx, C_Commission_ID, trxName);
 		if (C_Commission_ID == 0)
 		{
-		//	setName (null);
-		//	setC_BPartner_ID (0);
-		//	setC_Charge_ID (0);
-		//	setC_Commission_ID (0);
-		//	setC_Currency_ID (0);
-			//
 			setDocBasisType (DOCBASISTYPE_Invoice);	// I
 			setFrequencyType (FREQUENCYTYPE_Monthly);	// M
 			setListDetails (false);
diff --git a/org.adempiere.base/src/org/compiere/model/MCommissionAmt.java b/org.adempiere.base/src/org/compiere/model/MCommissionAmt.java
index 5a2173f688..7808619450 100644
--- a/org.adempiere.base/src/org/compiere/model/MCommissionAmt.java
+++ b/org.adempiere.base/src/org/compiere/model/MCommissionAmt.java
@@ -47,8 +47,6 @@ public class MCommissionAmt extends X_C_CommissionAmt
 		super(ctx, C_CommissionAmt_ID, trxName);
 		if (C_CommissionAmt_ID == 0)
 		{
-		//	setC_CommissionRun_ID (0);
-		//	setC_CommissionLine_ID (0);
 			setActualQty (Env.ZERO);
 			setCommissionAmt (Env.ZERO);
 			setConvertedAmt (Env.ZERO);
diff --git a/org.adempiere.base/src/org/compiere/model/MCommissionLine.java b/org.adempiere.base/src/org/compiere/model/MCommissionLine.java
index 9ee0e381d4..ae681c1959 100644
--- a/org.adempiere.base/src/org/compiere/model/MCommissionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MCommissionLine.java
@@ -46,7 +46,6 @@ public class MCommissionLine extends X_C_CommissionLine
 		super(ctx, C_CommissionLine_ID, trxName);
 		if (C_CommissionLine_ID == 0)
 		{
-		//	setC_Commission_ID (0);
 			setLine (0);	// @SQL=SELECT NVL(MAX(Line),0)+10 AS DefaultValue FROM C_CommissionLine WHERE C_Commission_ID=@C_Commission_ID@
 			setAmtMultiplier (Env.ZERO);
 			setAmtSubtract (Env.ZERO);
diff --git a/org.adempiere.base/src/org/compiere/model/MCommissionRun.java b/org.adempiere.base/src/org/compiere/model/MCommissionRun.java
index 4de9652bd1..35ebc23dce 100644
--- a/org.adempiere.base/src/org/compiere/model/MCommissionRun.java
+++ b/org.adempiere.base/src/org/compiere/model/MCommissionRun.java
@@ -49,9 +49,6 @@ public class MCommissionRun extends X_C_CommissionRun
 		super(ctx, C_CommissionRun_ID, trxName);
 		if (C_CommissionRun_ID == 0)
 		{
-		//	setC_Commission_ID (0);
-		//	setDocumentNo (null);
-		//	setStartDate (new Timestamp(System.currentTimeMillis()));
 			setGrandTotal (Env.ZERO);
 			setProcessed (false);
 		}
diff --git a/org.adempiere.base/src/org/compiere/model/MConversionRate.java b/org.adempiere.base/src/org/compiere/model/MConversionRate.java
index 53cef6b1f3..129d130ad3 100644
--- a/org.adempiere.base/src/org/compiere/model/MConversionRate.java
+++ b/org.adempiere.base/src/org/compiere/model/MConversionRate.java
@@ -298,9 +298,6 @@ public class MConversionRate extends X_C_Conversion_Rate
 		super(ctx, C_Conversion_Rate_ID, trxName);
 		if (C_Conversion_Rate_ID == 0)
 		{
-		//	setC_Conversion_Rate_ID (0);
-		//	setC_Currency_ID (0);
-		//	setC_Currency_ID_To (null);
 			super.setDivideRate (Env.ZERO);
 			super.setMultiplyRate (Env.ZERO);
 			setValidFrom (new Timestamp(System.currentTimeMillis()));
diff --git a/org.adempiere.base/src/org/compiere/model/MConversionRateUtil.java b/org.adempiere.base/src/org/compiere/model/MConversionRateUtil.java
index a034fab118..77be19d8d8 100644
--- a/org.adempiere.base/src/org/compiere/model/MConversionRateUtil.java
+++ b/org.adempiere.base/src/org/compiere/model/MConversionRateUtil.java
@@ -61,7 +61,6 @@ public final class MConversionRateUtil
 
 		// Currency To
 		int C_Currency_ID_To = MClient.get(model.getCtx(), AD_Client_ID).getAcctSchema().getC_Currency_ID();
-		//~ model.set_AttrValue("C_Currency_ID_To", Integer.valueOf(C_Currency_ID_To));
 		
 		// Get Rate
 		BigDecimal rate = SetGetUtil.get_AttrValueAsBigDecimal(model, "CurrencyRate");
diff --git a/org.adempiere.base/src/org/compiere/model/MCost.java b/org.adempiere.base/src/org/compiere/model/MCost.java
index c2127e714c..dfe717922b 100644
--- a/org.adempiere.base/src/org/compiere/model/MCost.java
+++ b/org.adempiere.base/src/org/compiere/model/MCost.java
@@ -170,7 +170,6 @@ public class MCost extends X_M_Cost
 				costElementType = rs.getString(2);
 				String cm = rs.getString(3);
 				percent = rs.getBigDecimal(4);
-				//M_CostElement_ID = rs.getInt(5);
 				if (s_log.isLoggable(Level.FINEST)) s_log.finest("CurrentCostPrice=" + currentCostPrice
 					+ ", CurrentCostPriceLL=" + currentCostPriceLL
 					+ ", CostElementType=" + costElementType
@@ -1435,10 +1434,6 @@ public class MCost extends X_M_Cost
 		super (ctx, ignored, trxName);
 		if (ignored == 0)
 		{
-		//	setC_AcctSchema_ID (0);
-		//	setM_CostElement_ID (0);
-		//	setM_CostType_ID (0);
-		//	setM_Product_ID (0);
 			setM_AttributeSetInstance_ID(0);
 			//
 			setCurrentCostPrice (Env.ZERO);
@@ -1619,8 +1614,6 @@ public class MCost extends X_M_Cost
 		sb.append (",M_Product_ID=").append (getM_Product_ID());
 		if (getM_AttributeSetInstance_ID() != 0)
 			sb.append (",AD_ASI_ID=").append (getM_AttributeSetInstance_ID());
-	//	sb.append (",C_AcctSchema_ID=").append (getC_AcctSchema_ID());
-	//	sb.append (",M_CostType_ID=").append (getM_CostType_ID());
 		sb.append (",M_CostElement_ID=").append (getM_CostElement_ID());
 		//
 		sb.append (", CurrentCost=").append (getCurrentCostPrice())
@@ -1650,7 +1643,6 @@ public class MCost extends X_M_Cost
 	protected boolean beforeSave (boolean newRecord)
 	{
 		//The method getCostElement() not should be cached because is a transaction
-		//MCostElement ce = getCostElement();
 		MCostElement ce = (MCostElement)getM_CostElement();
 		//	Check if data entry makes sense
 		if (m_manual)
@@ -1749,22 +1741,6 @@ public class MCost extends X_M_Cost
 	 */
 	public static void main (String[] args)
 	{
-		/**
-		DELETE M_Cost c
-		WHERE EXISTS (SELECT * FROM M_CostElement ce
-		    WHERE c.M_CostElement_ID=ce.M_CostElement_ID AND ce.IsCalculated='Y')
-		/
-		UPDATE M_Cost
-		  SET CumulatedAmt=0, CumulatedQty=0
-		/
-		UPDATE M_CostDetail
-		  SET Processed='N'
-		WHERE Processed='Y'
-		/
-		COMMIT
-		/
-		**/
-
 		Adempiere.startup(true);
 		MClient client = MClient.get(Env.getCtx(), 11);	//	GardenWorld
 		create(client);
diff --git a/org.adempiere.base/src/org/compiere/model/MCostDetail.java b/org.adempiere.base/src/org/compiere/model/MCostDetail.java
index ffab76c4e5..3f8f604e07 100644
--- a/org.adempiere.base/src/org/compiere/model/MCostDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/MCostDetail.java
@@ -704,12 +704,7 @@ public class MCostDetail extends X_M_CostDetail
 		super (ctx, M_CostDetail_ID, trxName);
 		if (M_CostDetail_ID == 0)
 		{
-		//	setC_AcctSchema_ID (0);
-		//	setM_Product_ID (0);
 			setM_AttributeSetInstance_ID (0);
-		//	setC_OrderLine_ID (0);
-		//	setM_InOutLine_ID(0);
-		//	setC_InvoiceLine_ID (0);
 			setProcessed (false);
 			setAmt (Env.ZERO);
 			setQty (Env.ZERO);
@@ -1000,10 +995,6 @@ public class MCostDetail extends X_M_CostDetail
 		
 		DB.getDatabase().forUpdate(cost, 120);
 		
-	//	if (cost == null)
-	//		cost = new MCost(product, M_ASI_ID, 
-	//			as, Org_ID, ce.getM_CostElement_ID());
-		
 		//save history for m_cost
 		X_M_CostHistory history = new X_M_CostHistory(getCtx(), 0, get_TrxName());
 		history.setM_AttributeSetInstance_ID(cost.getM_AttributeSetInstance_ID());
@@ -1049,18 +1040,6 @@ public class MCostDetail extends X_M_CostDetail
 		if (qty.signum() != 0)
 			price = amt.divide(qty, precision, RoundingMode.HALF_UP);
 		
-		/** All Costing Methods
-		if (ce.isAverageInvoice())
-		else if (ce.isAveragePO())
-		else if (ce.isFifo())
-		else if (ce.isLifo())
-		else if (ce.isLastInvoice())
-		else if (ce.isLastPOPrice())
-		else if (ce.isStandardCosting())
-		else if (ce.isUserDefined())
-		else if (!ce.isCostingMethod())
-		**/
-		
 		//	*** Purchase Order Detail Record ***
 		if (getC_OrderLine_ID() != 0)
 		{		
@@ -1112,8 +1091,6 @@ public class MCostDetail extends X_M_CostDetail
 			{
 				if (log.isLoggable(Level.FINER)) log.finer("PO - " + ce + " - " + cost);
 			}
-		//	else
-		//		log.warning("PO - " + ce + " - " + cost);
 		}
 		
 		//	*** AP Invoice Detail Record ***
@@ -1185,8 +1162,6 @@ public class MCostDetail extends X_M_CostDetail
 				cost.add(amt, qty);
 				if (log.isLoggable(Level.FINER)) log.finer("Inv - UserDef - " + cost);
 			}			
-		//	else
-		//		log.warning("Inv - " + ce + " - " + cost);
 		}
 		else if (getM_InOutLine_ID() != 0 && costAdjustment)
 		{
diff --git a/org.adempiere.base/src/org/compiere/model/MCostElement.java b/org.adempiere.base/src/org/compiere/model/MCostElement.java
index 0809ca5f6d..1b95930a67 100644
--- a/org.adempiere.base/src/org/compiere/model/MCostElement.java
+++ b/org.adempiere.base/src/org/compiere/model/MCostElement.java
@@ -275,7 +275,6 @@ public class MCostElement extends X_M_CostElement implements ImmutablePOSupport
 		super (ctx, M_CostElement_ID, trxName);
 		if (M_CostElement_ID == 0)
 		{
-		//	setName (null);
 			setCostElementType (COSTELEMENTTYPE_Material);
 			setIsCalculated (false);
 		}
@@ -333,9 +332,6 @@ public class MCostElement extends X_M_CostElement implements ImmutablePOSupport
 		//	Check Unique Costing Method
 		if (
 			(  COSTELEMENTTYPE_Material.equals(getCostElementType())
-//			|| COSTELEMENTTYPE_Resource.equals(getCostElementType())
-//			|| COSTELEMENTTYPE_BurdenMOverhead.equals(getCostElementType())
-//			|| COSTELEMENTTYPE_Overhead.equals(getCostElementType())
 			|| COSTELEMENTTYPE_OutsideProcessing.equals(getCostElementType())
 			)
 			&& (newRecord || is_ValueChanged(COLUMNNAME_CostingMethod)))
@@ -349,25 +345,6 @@ public class MCostElement extends X_M_CostElement implements ImmutablePOSupport
 				return false;
 			}
 		}
-
-		//	Maintain Calculated
-		/*
-		if (COSTELEMENTTYPE_Material.equals(getCostElementType()))
-		{
-			String cm = getCostingMethod();
-			if (cm == null || cm.length() == 0
-				|| COSTINGMETHOD_StandardCosting.equals(cm))
-				setIsCalculated(false);
-			else
-				setIsCalculated(true);
-		}
-		else
-		{
-			if (isCalculated())
-				setIsCalculated(false);
-			if (getCostingMethod() != null)
-				setCostingMethod(null);
-		}*/
 		
 		if (getAD_Org_ID() != 0)
 			setAD_Org_ID(0);
diff --git a/org.adempiere.base/src/org/compiere/model/MCostQueue.java b/org.adempiere.base/src/org/compiere/model/MCostQueue.java
index 93972b1c01..7d2b811713 100644
--- a/org.adempiere.base/src/org/compiere/model/MCostQueue.java
+++ b/org.adempiere.base/src/org/compiere/model/MCostQueue.java
@@ -323,11 +323,6 @@ public class MCostQueue extends X_M_CostQueue
 		super (ctx, ignored, trxName);
 		if (ignored == 0)
 		{
-		//	setC_AcctSchema_ID (0);
-		//	setM_AttributeSetInstance_ID (0);
-		//	setM_CostElement_ID (0);
-		//	setM_CostType_ID (0);
-		//	setM_Product_ID (0);
 			setCurrentCostPrice (Env.ZERO);
 			setCurrentQty (Env.ZERO);
 		}
diff --git a/org.adempiere.base/src/org/compiere/model/MCountry.java b/org.adempiere.base/src/org/compiere/model/MCountry.java
index 16941357e5..ca425fb074 100644
--- a/org.adempiere.base/src/org/compiere/model/MCountry.java
+++ b/org.adempiere.base/src/org/compiere/model/MCountry.java
@@ -236,8 +236,6 @@ public class MCountry extends X_C_Country
 		super (ctx, C_Country_ID, trxName);
 		if (C_Country_ID == 0)
 		{
-		//	setName (null);
-		//	setCountryCode (null);
 			setDisplaySequence(DISPLAYSEQUENCE);
 			setHasRegion(false);
 			setHasPostal_Add(false);
@@ -389,62 +387,4 @@ public class MCountry extends X_C_Country
 		return this;
 	}
 
-	/**************************************************************************
-	 * 	Insert Countries
-	 * 	@param args none
-	 */
-	public static void main (String[] args)
-	{
-		/**	Migration before
-		UPDATE C_Country SET AD_Client_ID=0, AD_Org_ID=0 WHERE AD_Client_ID<>0 OR AD_Org_ID<>0;
-		UPDATE C_Region SET AD_Client_ID=0, AD_Org_ID=0 WHERE AD_Client_ID<>0 OR AD_Org_ID<>0;
-		IDs migration for C_Location, C_City, C_Tax (C_Country, C_Region)
-		**
-		//	from http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1-semic.txt
-		String countries = "AFGHANISTAN;AF, ALBANIA;AL, ALGERIA;DZ, AMERICAN SAMOA;AS, ANDORRA;AD, ANGOLA;AO, ANGUILLA;AI, ANTARCTICA;AQ, ANTIGUA AND BARBUDA;AG, ARGENTINA;AR,"
-			+ "ARMENIA;AM, ARUBA;AW, AUSTRALIA;AU, AUSTRIA;AT, AZERBAIJAN;AZ, BAHAMAS;BS, BAHRAIN;BH, BANGLADESH;BD, BARBADOS;BB, BELARUS;BY, BELGIUM;BE, BELIZE;BZ,"
-			+ "BENIN;BJ, BERMUDA;BM, BHUTAN;BT, BOLIVIA;BO, BOSNIA AND HERZEGOVINA;BA, BOTSWANA;BW, BOUVET ISLAND;BV, BRAZIL;BR, BRITISH INDIAN OCEAN TERRITORY;IO, BRUNEI DARUSSALAM;BN,"
-			+ "BULGARIA;BG, BURKINA FASO;BF, BURUNDI;BI, CAMBODIA;KH, CAMEROON;CM, CANADA;CA, CAPE VERDE;CV, CAYMAN ISLANDS;KY, CENTRAL AFRICAN REPUBLIC;CF, CHAD;TD, CHILE;CL,"
-			+ "CHINA;CN, CHRISTMAS ISLAND;CX, COCOS (KEELING) ISLANDS;CC, COLOMBIA;CO, COMOROS;KM, CONGO;CG, CONGO THE DEMOCRATIC REPUBLIC OF THE;CD, COOK ISLANDS;CK,"
-			+ "COSTA RICA;CR, COTE D'IVOIRE;CI, CROATIA;HR, CUBA;CU, CYPRUS;CY, CZECH REPUBLIC;CZ, DENMARK;DK, DJIBOUTI;DJ, DOMINICA;DM, DOMINICAN REPUBLIC;DO, ECUADOR;EC,"
-			+ "EGYPT;EG, EL SALVADOR;SV, EQUATORIAL GUINEA;GQ, ERITREA;ER, ESTONIA;EE, ETHIOPIA;ET, FALKLAND ISLANDS (MALVINAS);FK, FAROE ISLANDS;FO, FIJI;FJ,"
-			+ "FINLAND;FI, FRANCE;FR, FRENCH GUIANA;GF, FRENCH POLYNESIA;PF, FRENCH SOUTHERN TERRITORIES;TF, GABON;GA, GAMBIA;GM, GEORGIA;GE, GERMANY;DE, GHANA;GH,"
-			+ "GIBRALTAR;GI, GREECE;GR, GREENLAND;GL, GRENADA;GD, GUADELOUPE;GP, GUAM;GU, GUATEMALA;GT, GUINEA;GN, GUINEA-BISSAU;GW, GUYANA;GY, HAITI;HT,"
-			+ "HEARD ISLAND AND MCDONALD ISLANDS;HM, HOLY SEE (VATICAN CITY STATE);VA, HONDURAS;HN, HONG KONG;HK, HUNGARY;HU, ICELAND;IS, INDIA;IN, INDONESIA;ID,"
-			+ "IRAN ISLAMIC REPUBLIC OF;IR, IRAQ;IQ, IRELAND;IE, ISRAEL;IL, ITALY;IT, JAMAICA;JM, JAPAN;JP, JORDAN;JO, KAZAKHSTAN;KZ, KENYA;KE, KIRIBATI;KI, KOREA DEMOCRATIC PEOPLE'S REPUBLIC OF;KP,"
-			+ "KOREA REPUBLIC OF;KR, KUWAIT;KW, KYRGYZSTAN;KG, LAO PEOPLE'S DEMOCRATIC REPUBLIC;LA, LATVIA;LV, LEBANON;LB, LESOTHO;LS, LIBERIA;LR, LIBYAN ARAB JAMAHIRIYA;LY,"
-			+ "LIECHTENSTEIN;LI, LITHUANIA;LT, LUXEMBOURG;LU, MACAO;MO, MACEDONIA FORMER YUGOSLAV REPUBLIC OF;MK, MADAGASCAR;MG, MALAWI;MW, MALAYSIA;MY, MALDIVES;MV, "
-			+ "MALI;ML, MALTA;MT, MARSHALL ISLANDS;MH, MARTINIQUE;MQ, MAURITANIA;MR, MAURITIUS;MU, MAYOTTE;YT, MEXICO;MX, MICRONESIA FEDERATED STATES OF;FM,"
-			+ "MOLDOVA REPUBLIC OF;MD, MONACO;MC, MONGOLIA;MN, MONTSERRAT;MS, MOROCCO;MA, MOZAMBIQUE;MZ, MYANMAR;MM, NAMIBIA;NA, NAURU;NR, NEPAL;NP,"
-			+ "NETHERLANDS;NL, NETHERLANDS ANTILLES;AN, NEW CALEDONIA;NC, NEW ZEALAND;NZ, NICARAGUA;NI, NIGER;NE, NIGERIA;NG, NIUE;NU, NORFOLK ISLAND;NF,"
-			+ "NORTHERN MARIANA ISLANDS;MP, NORWAY;NO, OMAN;OM, PAKISTAN;PK, PALAU;PW, PALESTINIAN TERRITORY OCCUPIED;PS, PANAMA;PA, PAPUA NEW GUINEA;PG,"
-			+ "PARAGUAY;PY, PERU;PE, PHILIPPINES;PH, PITCAIRN;PN, POLAND;PL, PORTUGAL;PT, PUERTO RICO;PR, QATAR;QA, REUNION;RE, ROMANIA;RO, RUSSIAN FEDERATION;RU,"
-			+ "RWANDA;RW, SAINT HELENA;SH, SAINT KITTS AND NEVIS;KN, SAINT LUCIA;LC, SAINT PIERRE AND MIQUELON;PM, SAINT VINCENT AND THE GRENADINES;VC,"
-			+ "SAMOA;WS, SAN MARINO;SM, SAO TOME AND PRINCIPE;ST, SAUDI ARABIA;SA, SENEGAL;SN, SEYCHELLES;SC, SIERRA LEONE;SL, SINGAPORE;SG, SLOVAKIA;SK,"
-			+ "SLOVENIA;SI, SOLOMON ISLANDS;SB, SOMALIA;SO, SOUTH AFRICA;ZA, SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS;GS, SPAIN;ES, SRI LANKA;LK,"
-			+ "SUDAN;SD, SURINAME;SR, SVALBARD AND JAN MAYEN;SJ, SWAZILAND;SZ, SWEDEN;SE, SWITZERLAND;CH, SYRIAN ARAB REPUBLIC;SY, TAIWAN;TW,"
-			+ "TAJIKISTAN;TJ, TANZANIA UNITED REPUBLIC OF;TZ, THAILAND;TH, TIMOR-LESTE;TL, TOGO;TG, TOKELAU;TK, TONGA;TO, TRINIDAD AND TOBAGO;TT,"
-			+ "TUNISIA;TN, TURKEY;TR, TURKMENISTAN;TM, TURKS AND CAICOS ISLANDS;TC, TUVALU;TV, UGANDA;UG, UKRAINE;UA, UNITED ARAB EMIRATES;AE, UNITED KINGDOM;GB,"
-			+ "UNITED STATES;US, UNITED STATES MINOR OUTLYING ISLANDS;UM, URUGUAY;UY, UZBEKISTAN;UZ, VANUATU;VU, VENEZUELA;VE, VIET NAM;VN, VIRGIN ISLANDS BRITISH;VG,"
-			+ "VIRGIN ISLANDS U.S.;VI, WALLIS AND FUTUNA;WF, WESTERN SAHARA;EH, YEMEN;YE, YUGOSLAVIA;YU, ZAMBIA;ZM, ZIMBABWE;ZW";
-		//
-		org.compiere.Adempiere.startupClient();
-		StringTokenizer st = new StringTokenizer(countries, ",", false);
-		while (st.hasMoreTokens())
-		{
-			String s = st.nextToken().trim();
-			int pos = s.indexOf(';');
-			String name = Util.initCap(s.substring(0,pos));
-			String cc = s.substring(pos+1);
-			System.out.println(cc + " - " + name);
-			//
-			MCountry mc = new MCountry(Env.getCtx(), 0);
-			mc.setCountryCode(cc);
-			mc.setName(name);
-			mc.setDescription(name);
-			mc.saveEx();
-		}
-		**/
-	}	//	main
-
 }	//	MCountry
diff --git a/org.adempiere.base/src/org/compiere/model/MCurrency.java b/org.adempiere.base/src/org/compiere/model/MCurrency.java
index 3a973abcdb..a58198826a 100644
--- a/org.adempiere.base/src/org/compiere/model/MCurrency.java
+++ b/org.adempiere.base/src/org/compiere/model/MCurrency.java
@@ -260,278 +260,4 @@ public class MCurrency extends X_C_Currency implements ImmutablePOSupport
 		return this;
 	}
 
-
-	/*************************************************************************/
-
-	/**
-	 * 	Load/link Currencies
-	 * 	@param args args
-	 *
-	public static void main (String[] args)
-	{
-		System.out.println("Currency");
-		Adempiere.startupClient();
-		//	Loop through
-		for (int i = 0; i < s_table.length; i++)
-		{
-			/**
-			System.out.println(s_table[i][I_Currency] + " - " + s_table[i][I_Name]);
-			int prec = Integer.parseInt(s_table[i][I_Precision]);
-			MCurrency cur = new MCurrency(Env.getCtx(), s_table[i][I_Currency],
-				s_table[i][I_Name], s_table[i][I_Symbol], prec, prec+2);
-			cur.saveEx();
-			System.out.println(cur);
-			**
-			String ISO = s_table[i][I_Currency];
-			String Country = s_table[i][I_Country];
-			String sql = "UPDATE C_Country SET C_Currency_ID="
-				+ "(SELECT C_Currency_ID FROM C_Currency WHERE ISO_Code='" + ISO + "') "
-				+ "WHERE CountryCode='" + Country + "'";
-			int no = DB.executeUpdate(sql);
-			System.out.println(ISO + " - " + Country + " - " + no);
-			System.out.println("");
-		}
-
-	}	//	main
-
-
-	static int	I_Country = 0;
-	static int	I_Currency = 1;
-	static int	I_Precision = 2;
-	static int	I_Symbol = 3;
-	static int	I_DecimalPoint = 4;
-	static int	I_FormatIndex = 5;
-	static int	I_Name = 6;
-	static String[][] s_table = new String[][] {
-		new String[]{"US","USD","2","$",".","0", "US Dollar"},
-		new String[]{"AR","ARS","2","$",",","0", "Argentine Peso"},
-		new String[]{"AS","USD","2","$",".","0","US Dollar"},
-		new String[]{"CC","AUD","2","$",".","0","Australian Dollar"},
-		new String[]{"CK","NZD","2","$",".","0","New Zealand Dollar"},
-		new String[]{"CX","AUD","2","$",".","0","Australian Dollar"},
-		new String[]{"EC","USD","2","$",".","0","US Dollar"},
-		new String[]{"FM","USD","2","$",".","0","US Dollar"},
-		new String[]{"GU","USD","2","$",".","0","US Dollar"},
-		new String[]{"KI","AUD","2","$",".","0","Australian Dollar"},
-		new String[]{"LR","LRD","2","$",".","0","Liberian Dollar"},
-		new String[]{"MH","USD","2","$",".","0","US Dollar"},
-		new String[]{"MP","USD","2","$",".","0","US Dollar"},
-		new String[]{"MX","MXN","2","$",".","0","Mexican Peso"},
-		new String[]{"NF","AUD","2","$",".","0","Australian Dollar"},
-		new String[]{"NR","AUD","2","$",".","0","Australian Dollar"},
-		new String[]{"NU","NZD","2","$",".","0","New Zealand Dollar"},
-		new String[]{"NZ","NZD","2","$",".","0","New Zealand Dollar"},
-		new String[]{"PR","USD","2","$",".","0","US Dollar"},
-		new String[]{"PW","USD","2","$",".","0","US Dollar"},
-		new String[]{"TC","USD","2","$",".","0","US Dollar"},
-		new String[]{"TK","NZD","2","$",".","0","New Zealand Dollar"},
-		new String[]{"TV","AUD","2","$",".","0","Australian Dollar"},
-		new String[]{"VG","USD","2","$",".","0","US Dollar"},
-		new String[]{"VI","USD","2","$",".","0","US Dollar"},
-		new String[]{"UY","UYU","2","$U",",","2","Peso Uruguayo"},
-		new String[]{"AM","AMD","2","",".","0","Armenian Dram"},
-		new String[]{"AO","AOA","2","",".","0","Kwanza"},
-		new String[]{"AZ","AZM","2","",".","0","Azerbaijanian Manat"},
-		new String[]{"BO","BOB","2","",".","0","Boliviano"},
-		new String[]{"CD","CDF","2","",".","0","Franc Congolais"},
-		new String[]{"CZ","CZK","2","",",","3","Czech Koruna"},
-		new String[]{"GE","GEL","2","",".","0","Lari"},
-		new String[]{"IR","IRR","2","",".","2","Iranian Rial"},
-		new String[]{"LT","LTL","2","",",","3","Lithuanian Litus"},
-		new String[]{"MD","MDL","2","",".","0","Moldovan Leu"},
-		new String[]{"PH","PHP","2","",".","0","Philippine Peso"},
-		new String[]{"PL","PLN","2","",",","3","Zloty"},
-		new String[]{"RU","RUR","2","",",","1","Russian Ruble"},
-		new String[]{"SD","SDD","2","",".","0","Sudanese Dinar"},
-		new String[]{"TJ","TJS","2","",".","0","Somoni"},
-		new String[]{"TM","TMM","2","",".","0","Manat"},
-		new String[]{"TP","TPE","0","",".","0","Timor Escudo"},
-		new String[]{"UA","UAH","2","",",","3","Hryvnia"},
-		new String[]{"UZ","UZS","2","",".","0","Uzbekistan Sum"},
-		new String[]{"GB","GBP","2","�",".","0","Pound Sterling"},
-		new String[]{"CY","CYP","2","�C",".","0","Cyprus Pound"},
-		new String[]{"EG","EGP","2","�E",".","2","Egyptian Pound"},
-		new String[]{"FK","FKP","2","�F",".","0","Falkland Islands Pound"},
-		new String[]{"GI","GIP","2","�G",".","0","Gibraltar Pound"},
-		new String[]{"SH","SHP","2","�S",".","0","Saint Helena Pound"},
-		new String[]{"SY","SYP","2","�S",".","2","Syrian Pound"},
-		new String[]{"JP","JPY","0","�",".","0","Yen"},
-		new String[]{"GH","GHC","2","�",".","0","Cedi"},
-		new String[]{"SV","SVC","2","�",".","0","El Salvador Colon"},
-		new String[]{"AD","EUR","2","�",".","0","euro"},
-		new String[]{"AT","EUR","2","�",",","2","euro"},
-		new String[]{"BE","EUR","2","�",",","3","euro"},
-		new String[]{"DE","EUR","2","�",",","3","euro"},
-		new String[]{"ES","EUR","2","�",",","3","euro"},
-		new String[]{"FI","EUR","2","�",",","3","euro"},
-		new String[]{"FR","EUR","2","�",",","3","euro"},
-		new String[]{"GF","EUR","2","�",".","0","euro"},
-		new String[]{"GP","EUR","2","�",".","0","euro"},
-		new String[]{"GR","EUR","2","�",",","3","euro"},
-		new String[]{"IE","EUR","2","�",".","0","euro"},
-		new String[]{"IT","EUR","2","�",",","2","euro"},
-		new String[]{"LU","EUR","2","�",",","3","euro"},
-		new String[]{"MC","EUR","2","�",".","0","euro"},
-		new String[]{"MQ","EUR","2","�",".","0","euro"},
-		new String[]{"NL","EUR","2","�",",","2","euro"},
-		new String[]{"PM","EUR","2","�",".","0","euro"},
-		new String[]{"PT","EUR","2","�","$","3","euro"},
-		new String[]{"RE","EUR","2","�",".","0","euro"},
-		new String[]{"SM","EUR","2","�",".","0","euro"},
-		new String[]{"VA","EUR","2","�",".","0","euro"},
-		new String[]{"YT","EUR","2","�",".","0","euro"},
-		new String[]{"AU","AUD","2","A$",".","0","Australian Dollar"},
-		new String[]{"AF","AFA","2","Af",".","0","Afghani"},
-		new String[]{"AW","AWG","2","Af.",".","0","Aruban Guilder"},
-		new String[]{"PA","PAB","2","B",".","0","Balboa"},
-		new String[]{"BN","BND","2","B$",".","0","Brunei Dollar"},
-		new String[]{"BS","BSD","2","B$",".","0","Bahamian Dollar"},
-		new String[]{"BH","BHD","3","BD",".","2","Bahraini Dinar"},
-		new String[]{"BM","BMD","2","Bd$",".","0","Bermudian Dollar"},
-		new String[]{"BB","BBD","2","Bds$",".","0","Barbados Dollar"},
-		new String[]{"BY","BYR","0","BR",",","3","Belarussian Ruble"},
-		new String[]{"ET","ETB","2","Br",".","0","Ethiopian Birr"},
-		new String[]{"VE","VEB","2","Bs",",","0","Bolivar"},
-		new String[]{"TH","THB","2","Bt",".","0","Baht"},
-		new String[]{"BZ","BZD","2","BZ$",".","0","Belize Dollar"},
-		new String[]{"CA","CAD","2","C$",".","0","Canadian Dollar"},
-		new String[]{"NI","NIO","2","C$",".","0","Cordoba Oro"},
-		new String[]{"CV","CVE","2","C.V.Esc.",".","0","Cape Verde Escudo"},
-		new String[]{"KM","KMF","0","CF",".","0","Comoro Franc"},
-		new String[]{"BF","XOF","0","CFAF",".","0","CFA Franc BCEAO"},
-		new String[]{"BJ","XOF","0","CFAF",".","0","CFA Franc BCEAO"},
-		new String[]{"CF","XAF","0","CFAF",".","0","CFA Franc BEAC"},
-		new String[]{"CG","XAF","0","CFAF",".","0","CFA Franc BEAC"},
-		new String[]{"CI","XOF","0","CFAF",".","0","CFA Franc BCEA"},
-		new String[]{"CM","XAF","0","CFAF",".","0","CFA Franc BEAC"},
-		new String[]{"GA","XAF","0","CFAF",".","0","CFA Franc BEAC"},
-		new String[]{"GQ","XAF","0","CFAF",".","0","CFA Franc BEAC"},
-		new String[]{"ML","XOF","0","CFAF",".","0","CFA Franc BCEAO"},
-		new String[]{"NE","XOF","0","CFAF",".","0","CFA Franc BCEAO"},
-		new String[]{"SN","XOF","0","CFAF",".","0","CFA Franc BCEAO"},
-		new String[]{"TD","XAF","0","CFAF",".","0","CFA Franc BEAC"},
-		new String[]{"TG","XOF","0","CFAF",".","0","CFA Franc BCEAO"},
-		new String[]{"NC","XPF","0","CFPF",".","0","CFP Franc"},
-		new String[]{"PF","XPF","0","CFPF",".","0","CFP Franc"},
-		new String[]{"WF","XPF","0","CFPF",".","0","CFP Franc"},
-		new String[]{"CL","CLP","0","Ch$",",","0","Chilean Peso"},
-		new String[]{"KY","KYD","2","CI$",".","0","Cayman Islands Dollar"},
-		new String[]{"CO","COP","2","Col$",".","0","Colombian Peso"},
-		new String[]{"KH","KHR","2","CR",".","0","Riel"},
-		new String[]{"CU","CUP","2","Cu$",".","0","Cuban Peso"},
-		new String[]{"GM","GMD","2","D",".","0","Dalasi"},
-		new String[]{"VN","VND","2","D",",","3","Dong"},
-		new String[]{"DZ","DZD","2","DA",".","2","Algerian Dinar"},
-		new String[]{"ST","STD","2","Db",".","0","Dobra"},
-		new String[]{"DJ","DJF","0","DF",".","0","Djibouti Franc"},
-		new String[]{"AE","AED","2","Dh",".","2","UAE Dirham"},
-		new String[]{"MA","MAD","2","DH",".","2","Moroccan Dirham"},
-		new String[]{"YU","YUM","2","Din",".","0","Yugoslavian Dinar"},
-		new String[]{"DK","DKK","2","Dkr",",","2","Danish Krone"},
-		new String[]{"FO","DKK","2","Dkr",",","2","Danish Krone"},
-		new String[]{"GL","DKK","2","Dkr",".","0","Danish Krone"},
-		new String[]{"AG","XCD","2","EC$",".","0","East Caribbean Dollar"},
-		new String[]{"AI","XCD","2","EC$",".","0","East Caribbean Dollar"},
-		new String[]{"DM","XCD","2","EC$",".","0","East Caribbean Dollar"},
-		new String[]{"GD","XCD","2","EC$",".","0","East Caribbean Dollar"},
-		new String[]{"KN","XCD","2","EC$",".","0","East Caribbean Dollar"},
-		new String[]{"LC","XCD","2","EC$",".","0","East Caribbean Dollar"},
-		new String[]{"MS","XCD","2","EC$",".","0","East Caribbean Dollar"},
-		new String[]{"VC","XCD","2","EC$",".","0","East Caribbean Dollar"},
-		new String[]{"FJ","FJD","2","F$",".","0","Fiji Dollar"},
-		new String[]{"BI","BIF","0","FBu",".","0","Burundi Franc"},
-		new String[]{"MG","MGF","0","FMG",".","0","Malagasy Franc"},
-		new String[]{"HU","HUF","2","Ft",",","3","Forint"},
-		new String[]{"HT","HTG","2","G",".","0","Gourde"},
-		new String[]{"GY","GYD","2","G$",".","0","Guyana Dollar"},
-		new String[]{"HK","HKD","2","HK$",".","0","Hong Kong Dollar"},
-		new String[]{"HR","HRK","2","HRK",",","2","Croatian Kuna"},
-		new String[]{"IQ","IQD","3","ID",".","2","Iraqi Dinar"},
-		new String[]{"IS","ISK","2","IKr",",","3","Iceland Krona"},
-		new String[]{"JM","JMD","2","J$",".","0","Jamaican Dollar"},
-		new String[]{"JO","JOD","3","JD",".","2","Jordanian Dinar"},
-		new String[]{"MM","MMK","2","K",".","0","Kyat"},
-		new String[]{"PG","PGK","2","K",".","0","Kina"},
-		new String[]{"KE","KES","2","K Sh",".","0","Kenyan Shilling"},
-		new String[]{"KW","KWD","3","KD",".","2","Kuwaiti Dinar"},
-		new String[]{"BA","BAM","2","KM",".","0","Convertible Marks"},
-		new String[]{"LA","LAK","2","KN",".","0","Kip"},
-		new String[]{"ER","ERN","2","KR",".","0","Nakfa"},
-		new String[]{"AL","ALL","2","L",",","1","Lek"},
-		new String[]{"HN","HNL","2","L",".","0","Lempira"},
-		new String[]{"RO","ROL","2","L",",","3","Leu"},
-		new String[]{"SZ","SZL","2","L",".","0","Lilangeni"},
-		new String[]{"LY","LYD","3","LD",".","2","Libyan Dinar"},
-		new String[]{"SL","SLL","2","Le",".","0","Leone"},
-		new String[]{"MT","MTL","2","Lm",".","0","Maltese Lira"},
-		new String[]{"LV","LVL","2","Ls",",","3","Latvian Lats"},
-		new String[]{"BG","BGL","2","Lv",",","3","Lev"},
-		new String[]{"MU","MUR","2","Mau Rs",".","0","Mauritius Rupee"},
-		new String[]{"MW","MWK","2","MK",".","0","Kwacha"},
-		new String[]{"MK","MKD","2","MKD",".","0","Denar"},
-		new String[]{"MZ","MZM","2","Mt",".","0","Metical"},
-		new String[]{"AN","ANG","2","NAf.",".","0","Netherlands Antillian Guilder"},
-		new String[]{"EE","EEK","2","Nfa",",","3","Kroon"},
-		new String[]{"IL","ILS","2","NIS",".","2","New Israeli Sheqel"},
-		new String[]{"NO","NOK","2","NKr",",","2","Norwegian Krone"},
-		new String[]{"NP","NPR","2","NRs",".","0","Nepalese Rupee"},
-		new String[]{"TW","TWD","2","NT$",".","0","New Taiwan Dollar"},
-		new String[]{"BW","BWP","2","P",".","0","Pula"},
-		new String[]{"MO","MOP","2","P",".","0","Pataca"},
-		new String[]{"GT","GTQ","2","Q",".","0","Quetzal"},
-		new String[]{"QA","QAR","2","QR",".","2","Qatari Rial"},
-		new String[]{"LS","ZAR","2","R",".","0","Rand"},
-		new String[]{"NA","ZAR","2","R",".","0","Rand"},
-		new String[]{"ZA","ZAR","2","R",".","2","Rand"},
-		new String[]{"BR","BRL","2","R$",",","0","Brazilian Real"},
-		new String[]{"DO","DOP","2","RD$",".","0","Dominican Peso"},
-		new String[]{"MV","MVR","2","Rf",".","0","Rufiyaa"},
-		new String[]{"RW","RWF","0","RF",".","0","Rwanda Franc"},
-		new String[]{"MY","MYR","2","RM",".","0","Malaysian Ringgit"},
-		new String[]{"OM","OMR","3","RO",".","2","Rial Omani"},
-		new String[]{"ID","IDR","2","Rp",",","0","Rupiah"},
-		new String[]{"BT","INR","2","Rs",".","0","Indian Rupee"},
-		new String[]{"IN","INR","2","Rs",".","0","Indian Rupee"},
-		new String[]{"PK","PKR","2","Rs",".","0","Pakistan Rupee"},
-		new String[]{"SG","SGD","2","S$",".","0","Singapore Dollar"},
-		new String[]{"PE","PEN","2","S/.",",","0","Nuevo Sol"},
-		new String[]{"SR","SRG","2","Sf.",".","0","Suriname Guilder"},
-		new String[]{"SB","SBD","2","SI$",".","0","Solomon Islands Dollar"},
-		new String[]{"SE","SEK","2","Sk",",","3","Swedish Krona"},
-		new String[]{"SK","SKK","2","Sk",",","3","Slovak Koruna"},
-		new String[]{"LK","LKR","2","SLRs",".","0","Sri Lanka Rupee"},
-		new String[]{"SI","SIT","2","SlT",",","3","Tolar"},
-		new String[]{"SO","SOS","2","So. Sh.",".","0","Somali Shilling"},
-		new String[]{"SC","SCR","2","SR",".","0","Seychelles Rupee"},
-		new String[]{"SA","SAR","2","SRls",".","2","Saudi Riyal"},
-		new String[]{"CH","CHF","2","SwF",".","2","Swiss Franc"},
-		new String[]{"LI","CHF","2","SwF",".","2","Swiss Franc"},
-		new String[]{"TO","TOP","2","T$",".","0","Pa�anga"},
-		new String[]{"TN","TND","3","TD",".","2","Tunisian Dinar"},
-		new String[]{"BD","BDT","2","Tk",".","0","Taka"},
-		new String[]{"TR","TRL","0","TL",",","3","Turkish Lira"},
-		new String[]{"TZ","TZS","2","TSh",".","0","Tanzanian Shilling"},
-		new String[]{"TT","TTD","2","TT$",".","0","Trinidad and Tobago Dollar"},
-		new String[]{"MN","MNT","2","Tug",".","0","Tugrik"},
-		new String[]{"MR","MRO","2","UM",".","0","Ouguiya"},
-		new String[]{"UG","UGX","2","USh",".","0","Uganda Shilling"},
-		new String[]{"VU","VUV","0","VT",".","0","Vatu"},
-		new String[]{"KR","KRW","0","W",".","0","Won"},
-		new String[]{"WS","WST","2","WS$",".","0","Tala"},
-		new String[]{"CN","CNY","2","Y",".","0","Yuan Renminbi"},
-		new String[]{"YE","YER","2","YRls",".","2","Yemeni Rial"},
-		new String[]{"ZW","ZWD","2","Z$",".","0","Zimbabwe Dollar"},
-		new String[]{"ZM","ZMK","2","ZK",".","0","Kwacha"},
-		new String[]{"CR","CRC","2","",".","0","Costa Rican Colon"},
-		new String[]{"GN","GNF","0","",".","0","Guinea Franc"},
-		new String[]{"GW","GWP","2","",".","0","Guinea-Bissau Peso"},
-		new String[]{"KG","KGS","2","",".","0","Som"},
-		new String[]{"KP","KPW","2","",".","0","North Korean Won"},
-		new String[]{"KZ","KZT","2","",".","0","Tenge"},
-		new String[]{"LB","LBP","2","",".","2","Lebanese Pound"},
-		new String[]{"NG","NGN","2","",".","0","Naira"},
-		new String[]{"PY","PYG","0","",",","0","Guarani"}
-	};
-	**/
-
 }	//	MCurrency