Index: E:/workspace/mifos/test/org/mifos/application/bulkentry/struts/uihelpers/BulkEntryDisplayHelperTest.java
===================================================================
--- E:/workspace/mifos/test/org/mifos/application/bulkentry/struts/uihelpers/BulkEntryDisplayHelperTest.java	(revision 12312)
+++ E:/workspace/mifos/test/org/mifos/application/bulkentry/struts/uihelpers/BulkEntryDisplayHelperTest.java	(working copy)
@@ -124,9 +124,7 @@
 		new BulkEntryDisplayHelper().buildForCenter(bulkEntry
 				.getBulkEntryParent(), bulkEntry.getLoanProducts(), bulkEntry
 				.getSavingsProducts(), new MasterDataService().getMasterData(
-				MasterConstants.ATTENDENCETYPES, (short) 1,
-				"org.mifos.application.master.business.CustomerAttendance",
-				"attendanceId").getCustomValueListElements(), builder, Methods.get
+				MasterConstants.ATTENDENCETYPES, (short) 1).getCustomValueListElements(), builder, Methods.get
 				.toString(), TestObjectFactory.getContext(), (short) 1);
 		String result = builder.toString();
 
Index: E:/workspace/mifos/test/org/mifos/application/master/persistence/TestMasterPersistence.java
===================================================================
--- E:/workspace/mifos/test/org/mifos/application/master/persistence/TestMasterPersistence.java	(revision 12312)
+++ E:/workspace/mifos/test/org/mifos/application/master/persistence/TestMasterPersistence.java	(working copy)
@@ -33,14 +33,12 @@
 	
 	public void testEntityMasterRetrieval() throws Exception {
 		MasterPersistence masterPersistence = new MasterPersistence();
-		CustomValueList paymentTypes = masterPersistence
-				.getCustomValueList(
+		CustomValueList attendanceTypes = masterPersistence
+				.getLookUpEntity(
 						MasterConstants.ATTENDENCETYPES,
-						(short)1,
-						"org.mifos.application.master.business.CustomerAttendance",
-						"attendanceId");
-		List<CustomValueListElement> paymentValues = paymentTypes.getCustomValueListElements();
-		assertEquals(4, paymentValues.size());
+						(short)1);
+		List<CustomValueListElement> attendanceValues = attendanceTypes.getCustomValueListElements();
+		assertEquals(4, attendanceValues.size());
 
 	}
 
@@ -50,11 +48,9 @@
 		TestObjectFactory.simulateInvalidConnection();
 		try {
 			masterPersistence
-					.getCustomValueList(
+					.getLookUpEntity(
 							MasterConstants.ATTENDENCETYPES,
-							(short)1,
-							"org.mifos.application.master.business.CustomerAttendance",
-							"attendanceId");
+							(short)1);
 			fail();
 		} catch (Exception e) {
 			assertTrue(true);
Index: E:/workspace/mifos/test/org/mifos/application/master/business/service/TestMasterBusinessService.java
===================================================================
--- E:/workspace/mifos/test/org/mifos/application/master/business/service/TestMasterBusinessService.java	(revision 12312)
+++ E:/workspace/mifos/test/org/mifos/application/master/business/service/TestMasterBusinessService.java	(working copy)
@@ -121,9 +121,7 @@
 		CustomValueList paymentTypes = masterService
 				.getMasterData(
 						MasterConstants.ATTENDENCETYPES,
-						(short)1,
-						"org.mifos.application.master.business.CustomerAttendance",
-						"attendanceId");
+						(short)1);
 		List<CustomValueListElement> paymentValues = paymentTypes.getCustomValueListElements();
 		assertEquals(4, paymentValues.size());
 
Index: E:/workspace/mifos/src/org/mifos/application/bulkentry/struts/uihelpers/BulkEntryDisplayHelper.java
===================================================================
--- E:/workspace/mifos/src/org/mifos/application/bulkentry/struts/uihelpers/BulkEntryDisplayHelper.java	(revision 12312)
+++ E:/workspace/mifos/src/org/mifos/application/bulkentry/struts/uihelpers/BulkEntryDisplayHelper.java	(working copy)
@@ -416,8 +416,8 @@
 			builder.append("<select name=\"attendenceSelected[" + rows
 					+ "]\"  style=\"width:40px;\" class=\"fontnormal8pt\">");
 			for (CustomValueListElement attendence : custAttTypes) {
-				builder.append("<option value=\"" + attendence.getAssociatedId() + "\"");
-                if (bulkEntryView.getAttendence() != null && (attendence.getAssociatedId().intValue()== bulkEntryView.getAttendence().intValue()))
+				builder.append("<option value=\"" + attendence.getLookUpId() + "\"");
+                if (bulkEntryView.getAttendence() != null && (attendence.getLookUpId().intValue()== bulkEntryView.getAttendence().intValue()))
                 {
                     builder.append(" selected=\"selected\"");
                 }
@@ -430,7 +430,7 @@
 			for (CustomValueListElement attendence : custAttTypes) {
 
 				if (null != bulkEntryView.getAttendence()
-						&& attendence.getAssociatedId().equals(
+						&& attendence.getLookUpId().equals(
 								Integer.valueOf(bulkEntryView.getAttendence()))) {
 					if (!bulkEntryView.getAttendence().toString().equals("1")) {
 						builder.append("<font color=\"#FF0000\">"
@@ -448,9 +448,9 @@
 			builder.append("<select name=\"attendenceSelected[" + rows
 					+ "]\"  style=\"width:40px;\" class=\"fontnormal8pt\">");
 			for (CustomValueListElement attendence : custAttTypes) {
-				builder.append("<option value=\"" + attendence.getAssociatedId() + "\"");
+				builder.append("<option value=\"" + attendence.getLookUpId() + "\"");
 				if (null != bulkEntryView.getAttendence()
-						&& attendence.getAssociatedId().equals(
+						&& attendence.getLookUpId().equals(
 								Integer.valueOf(bulkEntryView.getAttendence()))) {
 					builder.append(" selected ");
 				}
Index: E:/workspace/mifos/src/org/mifos/application/bulkentry/struts/action/BulkEntryAction.java
===================================================================
--- E:/workspace/mifos/src/org/mifos/application/bulkentry/struts/action/BulkEntryAction.java	(revision 12312)
+++ E:/workspace/mifos/src/org/mifos/application/bulkentry/struts/action/BulkEntryAction.java	(working copy)
@@ -306,11 +306,9 @@
 						masterService
 								.getMasterData(
 										MasterConstants.ATTENDENCETYPES,
-										userContext.getLocaleId(),
-										"org.mifos.application.master.business.CustomerAttendance",
-										"attendanceId").getCustomValueListElements(),
-						request);
-
+										userContext.getLocaleId()).getCustomValueListElements(),
+						request);		
+		
 		return mapping.findForward(BulkEntryConstants.GETSUCCESS);
 	}
 
Index: E:/workspace/mifos/src/org/mifos/application/master/business/service/MasterDataService.java
===================================================================
--- E:/workspace/mifos/src/org/mifos/application/master/business/service/MasterDataService.java	(revision 12312)
+++ E:/workspace/mifos/src/org/mifos/application/master/business/service/MasterDataService.java	(working copy)
@@ -3,6 +3,7 @@
 import java.sql.Date;
 import java.util.List;
 
+import org.mifos.application.bulkentry.util.helpers.BulkEntryConstants;
 import org.mifos.application.customer.business.CustomerView;
 import org.mifos.application.customer.persistence.CustomerPersistence;
 import org.mifos.application.master.business.CustomFieldDefinitionEntity;
@@ -11,6 +12,7 @@
 import org.mifos.application.master.business.PaymentTypeEntity;
 import org.mifos.application.master.business.ValueListElement;
 import org.mifos.application.master.persistence.MasterPersistence;
+import org.mifos.application.master.util.helpers.MasterConstants;
 import org.mifos.application.office.business.OfficeView;
 import org.mifos.application.office.persistence.OfficePersistence;
 import org.mifos.application.personnel.business.PersonnelView;
@@ -24,6 +26,7 @@
 import org.mifos.framework.exceptions.ServiceException;
 import org.mifos.framework.exceptions.SystemException;
 import org.mifos.framework.security.util.UserContext;
+import org.mifos.framework.util.helpers.SessionUtils;
 
 public class MasterDataService extends BusinessService {
 	private PersonnelPersistence personnelPersistence = new PersonnelPersistence();
@@ -75,15 +78,12 @@
 	/**
 	 * Only one non-test usage in BulkEntryAction.get for getting
 	 *   (MasterConstants.ATTENDENCETYPES,
-	 *   userContext.getLocaleId(),
-	 *   "org.mifos.application.master.business.CustomerAttendance",
-	 *   "attendanceId")
+	 *   userContext.getLocaleId()
 	 */
-	public CustomValueList getMasterData(String entityName, Short localeId,
-			String classPath, String column) throws ApplicationException,
+	public CustomValueList getMasterData(String entityName, Short localeId) throws ApplicationException,
 			SystemException {
-		return masterPersistence.getCustomValueList(entityName,
-				localeId, classPath, column);
+		return masterPersistence.getLookUpEntity(entityName,
+				localeId);
 	}
 
 	public List<PrdOfferingBO> getLoanProductsAsOfMeetingDate(Date meetingDate,
Index: E:/workspace/mifos/src/org/mifos/framework/persistence/DatabaseVersionPersistence.java
===================================================================
--- E:/workspace/mifos/src/org/mifos/framework/persistence/DatabaseVersionPersistence.java	(revision 12312)
+++ E:/workspace/mifos/src/org/mifos/framework/persistence/DatabaseVersionPersistence.java	(working copy)
@@ -30,7 +30,7 @@
 
 public class DatabaseVersionPersistence {
 
-	public static final int APPLICATION_VERSION = 173;
+	public static final int APPLICATION_VERSION = 174;
 	public static final int FIRST_NUMBERED_VERSION = 100;
 
 	public static void register(Map<Integer, Upgrade> register, Upgrade upgrade) {
Index: E:/workspace/mifos/src/org/mifos/framework/util/resources/hibernate.cfg.xml
===================================================================
--- E:/workspace/mifos/src/org/mifos/framework/util/resources/hibernate.cfg.xml	(revision 12312)
+++ E:/workspace/mifos/src/org/mifos/framework/util/resources/hibernate.cfg.xml	(working copy)
@@ -115,7 +115,6 @@
 		<mapping resource="org/mifos/application/accounts/financial/business/COAIDMapperEntity.hbm.xml" />
 		<mapping resource="org/mifos/application/accounts/financial/business/FinancialActionBO.hbm.xml" />
 		<mapping resource="org/mifos/application/accounts/financial/business/FinancialTransactionBO.hbm.xml" />
-		<mapping resource="org/mifos/application/master/business/CustomerAttendance.hbm.xml" />
 		<mapping resource="org/mifos/application/fees/business/CategoryTypeEntity.hbm.xml" />
 		<mapping resource="org/mifos/application/fees/business/FeeFormulaEntity.hbm.xml" />
 		<mapping resource="org/mifos/application/fees/business/FeeFrequencyEntity.hbm.xml" />
Index: E:/workspace/mifos/sql/upgrade_to_174.sql
===================================================================
--- E:/workspace/mifos/sql/upgrade_to_174.sql	(revision 0)
+++ E:/workspace/mifos/sql/upgrade_to_174.sql	(revision 0)
@@ -0,0 +1,4 @@
+
+DROP TABLE CUSTOMER_ATTENDANCE_TYPES;
+
+UPDATE DATABASE_VERSION SET DATABASE_VERSION = 174 WHERE DATABASE_VERSION = 173;
\ No newline at end of file
Index: E:/workspace/mifos/sql/mifosmasterdata.sql
===================================================================
--- E:/workspace/mifos/sql/mifosmasterdata.sql	(revision 12312)
+++ E:/workspace/mifos/sql/mifosmasterdata.sql	(working copy)
@@ -2508,16 +2508,6 @@
 INSERT INTO PERSONNEL_STATUS(PERSONNEL_STATUS_ID,LOOKUP_ID)
 VALUES(2,153);
 
-/* The table Customer Addendence Types will contain the different attendence types supported by the MFI like present,absent etc - Configuration */
-INSERT INTO CUSTOMER_ATTENDANCE_TYPES 
-VALUES(1,194,'Present');
-INSERT INTO CUSTOMER_ATTENDANCE_TYPES 
-VALUES(2,195,'Absent');
-INSERT INTO CUSTOMER_ATTENDANCE_TYPES 
-VALUES(3,196,'Approved leave');
-INSERT INTO CUSTOMER_ATTENDANCE_TYPES 
-VALUES(4,197,'Late');
-
 /* The table Customer level will contain the different levels supported by the system like center,group etc - System */
 /* Level for Centers */
 INSERT INTO CUSTOMER_LEVEL(LEVEL_ID,PARENT_LEVEL_ID,LEVEL_NAME_ID,INTERACTION_FLAG,MAX_CHILD_COUNT,MAX_INSTANCE_COUNT)
Index: E:/workspace/mifos/sql/mifosdroptables.sql
===================================================================
--- E:/workspace/mifos/sql/mifosdroptables.sql	(revision 12312)
+++ E:/workspace/mifos/sql/mifosdroptables.sql	(working copy)
@@ -112,7 +112,6 @@
 
 DROP TABLE IF EXISTS CHECKLIST;
 DROP TABLE IF EXISTS SPOUSE_FATHER_LOOKUP;
-DROP TABLE IF EXISTS CUSTOMER_ATTENDANCE_TYPES;
 DROP TABLE IF EXISTS CUSTOMER_NAME_DETAIL;
 
 DROP TABLE IF EXISTS CUSTOMER_FLAG_DETAIL;
Index: E:/workspace/mifos/sql/downgrade_from_174.sql
===================================================================
--- E:/workspace/mifos/sql/downgrade_from_174.sql	(revision 0)
+++ E:/workspace/mifos/sql/downgrade_from_174.sql	(revision 0)
@@ -0,0 +1,13 @@
+CREATE TABLE CUSTOMER_ATTENDANCE_TYPES(
+   ATTENDANCE_ID SMALLINT AUTO_INCREMENT NOT NULL,
+   ATTENDANCE_LOOKUP_ID INTEGER NOT NULL,
+   DESCRIPTION VARCHAR(50),
+   PRIMARY KEY(ATTENDANCE_ID),
+   FOREIGN KEY(ATTENDANCE_LOOKUP_ID)
+    REFERENCES LOOKUP_VALUE(LOOKUP_ID)
+      ON DELETE NO ACTION
+      ON UPDATE NO ACTION
+)
+ENGINE=InnoDB CHARACTER SET utf8;
+
+UPDATE DATABASE_VERSION SET DATABASE_VERSION = 173 WHERE DATABASE_VERSION = 174;
\ No newline at end of file
Index: E:/workspace/mifos/sql/latest-schema.sql
===================================================================
--- E:/workspace/mifos/sql/latest-schema.sql	(revision 12312)
+++ E:/workspace/mifos/sql/latest-schema.sql	(working copy)
@@ -3443,20 +3443,6 @@
       ON UPDATE NO ACTION  
 )ENGINE=InnoDB CHARACTER SET utf8;
 
-CREATE TABLE CUSTOMER_ATTENDANCE_TYPES(
-   ATTENDANCE_ID SMALLINT AUTO_INCREMENT NOT NULL,
-   ATTENDANCE_LOOKUP_ID INTEGER NOT NULL,
-   DESCRIPTION VARCHAR(50),
-   PRIMARY KEY(ATTENDANCE_ID),
-   FOREIGN KEY(ATTENDANCE_LOOKUP_ID)
-    REFERENCES LOOKUP_VALUE(LOOKUP_ID)
-      ON DELETE NO ACTION
-      ON UPDATE NO ACTION
-)
-ENGINE=InnoDB CHARACTER SET utf8;
-
-
-
 CREATE TABLE COA (
   COA_ID SMALLINT AUTO_INCREMENT NOT NULL,
   COA_Name VARCHAR(150) NOT NULL,
Index: E:/workspace/mifos/sql/latest-data.sql
===================================================================
--- E:/workspace/mifos/sql/latest-data.sql	(revision 12312)
+++ E:/workspace/mifos/sql/latest-data.sql	(working copy)
@@ -17,7 +17,7 @@
 -- apply Index.sql
 -- apply all upgrades to date
 
-INSERT INTO DATABASE_VERSION(DATABASE_VERSION) VALUES(173);
+INSERT INTO DATABASE_VERSION(DATABASE_VERSION) VALUES(174);
 
 /* The table Currency holds configuration related items for a currency like display symbol,rounding mode etc which is to be applied on a currency -- Configuration */
 /* To set the default currency, enter 1 in the default_currency field */
@@ -1713,16 +1713,6 @@
 INSERT INTO LOOKUP_VALUE_LOCALE 
 VALUES(392,1,197,'L');
 
-/* The table Customer Addendence Types will contain the different attendence types supported by the MFI like present,absent etc - Configuration */
-INSERT INTO CUSTOMER_ATTENDANCE_TYPES 
-VALUES(1,194,'Present');
-INSERT INTO CUSTOMER_ATTENDANCE_TYPES 
-VALUES(2,195,'Absent');
-INSERT INTO CUSTOMER_ATTENDANCE_TYPES 
-VALUES(3,196,'Approved leave');
-INSERT INTO CUSTOMER_ATTENDANCE_TYPES 
-VALUES(4,197,'Late');
-
 /* The table Customer level will contain the different levels supported by the system like center,group etc - System */
 /* Level for Centers */
 INSERT INTO CUSTOMER_LEVEL(LEVEL_ID,PARENT_LEVEL_ID,LEVEL_NAME_ID,INTERACTION_FLAG,MAX_CHILD_COUNT,MAX_INSTANCE_COUNT)