HRM.BO/Common/SetupManager.cs

@@ -1,4 +1,5 @@
 
+using DocumentFormat.OpenXml.Office2010.Excel;
 using Ease.Core.Model;
 
 using System;
@@ -300,5 +301,32 @@ namespace HRM.BO
                 return m_oReader.Types;
             }
         }
+        public static List<int> ApplicableParametersForReportOptimized(Employee oEmp, List<EnmSetupManagerTranType> setupTypes, List<SetupDetail> details)
+        {
+            List<int> parametersID = new List<int>();
+
+
+            if (setupTypes == null) return parametersID;
+
+
+            foreach (EnmSetupManagerTranType type in setupTypes)
+            {
+                int nTranID = SetupDetail.GetTranID(oEmp, type);
+
+                if (nTranID == null || nTranID < 0) continue;
+
+                List<int> setupIds = details.Where(detail => detail.TranType == type
+                                                            && detail.TranID == nTranID)
+                                            .Select(x => x.SetupID)
+                                            .Distinct().ToList();
+
+                foreach (int id in setupIds)
+                {
+                    parametersID.Add(id);
+                }
+
+            }
+            return parametersID;
+        }
     }
 }

HRM.BO/HRBasic/Enums.cs

@@ -2279,6 +2279,11 @@ namespace HRM.BO
         EmployeeBasicInfoEcho = 721,
         EmployeeEvaluationSheet = 722,
         LifeCycleDeletedHistor = 723,
+        SingleEmpLeaveBalance = 724,
+        MultipleEmpLeaveBalanceEcho = 725,
+        LeaveReportEcho = 726,
+        LeaveRegisterBangla = 727,
+        LeaveEncashment = 728,
         //Hnm(801-900)
         OtBankDisbursementHnm = 801,
         BonusRegisterHnm = 802,
@@ -3463,15 +3468,32 @@ namespace HRM.BO
 
     public enum EnumLeaveCalculationType
     {
-        Hourly = 0,
+        //Hourly = 0,
-        Yearly = 1,
+        //Yearly = 1,
-        Monthly_Earn = 2,
+        //Monthly_Earn = 2,
-        Hourly_365Day = 3,
+        //Hourly_365Day = 3,
-        Hourly_Monthly = 4,
+        //Hourly_Monthly = 4,
-        OneDay_On_18Day_Present = 5,
+        //OneDay_On_18Day_Present = 5,
-        Hourly_Prorated = 6,
+        //Hourly_Prorated = 6,
-        Days_365 = 7,
+        //Days_365 = 7,
-        Yearly_without_Prorated = 8
+        //Yearly_without_Prorated = 8
+
+        Daily = 0,
+        Monthly = 1,
+        Yearly = 2,
+        //Prorated=3,
+        Not_Applicable = 4,
+        Not_Applicable_With_Prorated = 5,
+
+        Hourly = 6,
+        //Yearly = 7,
+        Monthly_Earn = 8,
+        Hourly_365Day = 9,
+        Hourly_Monthly = 10,
+        OneDay_On_18Day_Present = 11,
+        Hourly_Prorated = 12,
+        Days_365 = 13,
+        Yearly_without_Prorated = 14
     }
 
     public enum EnumLeaveparamOn

HRM.DA/DA/Fund/Basic/GlobalFunctionDA.cs

@@ -1,9 +1,11 @@
-using HRM.BO;
+using Ease.Core.DataAccess;
-using Ease.Core.DataAccess;
+using Ease.Core.Model;
-using System;
+using Ease.Core.Utility;
-using System.Data;
+using HRM.BO;
 using HRM.BO.Fund;
 using Microsoft.Data.SqlClient;
+using System;
+using System.Data;
 
 namespace HRM.DA
 {
@@ -92,5 +94,43 @@ namespace HRM.DA
                 return "";
             return sCode.ToString();
         }
+
+        public static DateTime GetOperationDate()
+        {
+            DateTime opDate = DateTime.MinValue;
+
+            TransactionContext tc = null;
+            try
+            {
+                tc = TransactionContext.Begin();
+
+                
+                SqlParameter[] p = new SqlParameter[1];
+                p[0] = new SqlParameter("@OperationDate", SqlDbType.DateTime);
+                p[0].Direction = ParameterDirection.Output;
+                p[0].Value = DateTime.MinValue;
+
+                tc.ExecuteNonQuery(CommandType.StoredProcedure, "[dbo].[GetOperationDate]", p);
+
+                if (p[0].Value != null && p[0].Value != DBNull.Value)
+                    opDate = Convert.ToDateTime(p[0].Value);
+
+                //opDate = GlobalFunctionDA.GetOperationDate(tc);
+
+                tc.End();
+            }
+            catch (Exception e)
+            {
+                #region Handle Exception
+                if (tc != null)
+                    tc.HandleError();
+                ExceptionLog.Write(e);
+
+                throw new ServiceException(e.Message, e);
+                #endregion
+            }
+
+            return opDate;
+        }
     }
 }

HRM.DA/DA/Leave/LeaveDA.cs

@@ -135,7 +135,32 @@ namespace HRM.DA
         {
             return tc.ExecuteReader("SELECT * FROM Leave WHERE CODE=%s AND PayrollTypeID=%n", sLeave, payrollTypeID);
         }
-
+        internal static DataSet GetELInfo(TransactionContext tc, int empID, DateTime JoinDate, DateTime toDate, DateTime availedTo)
+        {
+            string sSQL = SQLParser.MakeSQL(@"select 'Leave Availed' Item,isnull(sum(APRTOTALDAYS),0)[Value] from LEAVEENTRY
+                                            where LEAVEID=5
+                                            and EmpID=%n
+                                            and APRFROMDATE>=%d and APRTODATE<=%d
+                                            union
+                                            select 'Present Days' Item, isnull(count(*),0)[Value] from DailyAttnProcess 
+                                            where  EmployeeID=%n
+                                            and AttnDate between %d and %d
+                                            and ATTENTYPE in(1,3,12)
+                                            union
+                                            select  'Encash Days' Item,isnull(sum(EncashmentDays),0)[Value] from LeaveEncashment 
+                                            where  EmployeeID=%n
+                                            and EncashmentFromDate >=%d and EncashmentToDate <=%d
+                                            Union
+                                            select 'Leave Availed this' Item,isnull(sum(APRTOTALDAYS),0)[Value] from LEAVEENTRY
+                                            where LEAVEID=5
+                                            and EmpID=%n
+                                            and APRFROMDATE>=%d and APRTODATE<=%d",
+                                            empID, JoinDate, availedTo.AddDays(-1),
+                                            empID, JoinDate, toDate,
+                                            empID, JoinDate, availedTo.AddDays(-1),
+                                            empID, availedTo, toDate);
+            return tc.ExecuteDataSet(sSQL);
+        }
         #endregion
 
         #region Delete function

HRM.DA/DA/Leave/LeaveEncashmentDA.cs

@@ -60,6 +60,11 @@ namespace HRM.Service
             //return tc.ExecuteReader("SELECT * FROM LEAVEEncashment WHERE EmployeeID IN (%q) AND Encashmentfromdate >= %d AND Encashmenttodate<=%d", empIDs, FirstDateOfYear, LastDateOfYear);
             return tc.ExecuteReader("SELECT * FROM LEAVEEncashment WHERE EmployeeID IN (%q) AND Encashmentfromdate >= %d ", empIDs, FirstDateOfYear);
         }
+        internal static IDataReader GetByEmpIDs(TransactionContext tc, string empIDs, int leaveyearid, DateTime EncashMonth)
+        {
+            string sql = SQLParser.MakeSQL(@"SELECT * FROM LEAVEEncashment WHERE EmployeeID IN (%q) and LeaveYearID = %n  and EncashMonth Between %d and %d", empIDs, leaveyearid, EncashMonth.FirstDateOfMonth(), EncashMonth.LastDateOfMonth());//
+            return tc.ExecuteReader(sql);
+        }
         internal static DataSet GetData(TransactionContext tc,  int nYearID)
         {
             DataSet rawData = new DataSet();

HRM.DA/Service/Leave/EmpLeaveStatusService.cs

@@ -88,32 +88,70 @@ namespace HRM.DA
 
                     if (oItem.LeaveId == 5)
                     {
-                        DateTime SelectedMonth = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1).LastDateOfMonth();
+                        #region old code
-                        from_Date = new DateTime(to_Date.Year - 2, oEmployee.JoiningDate.Month, oEmployee.JoiningDate.Day);
+                        //DateTime SelectedMonth = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1).LastDateOfMonth();
-                        DataSet ds = new DailyAttnProcessService().GetEarnedLeaveOpening(oEmployee.ID, oItem.LeaveId, from_Date, to_Date);
+                        //from_Date = new DateTime(to_Date.Year - 2, oEmployee.JoiningDate.Month, oEmployee.JoiningDate.Day);
-                        int dCurrectedDay = 0;
+                        //DataSet ds = new DailyAttnProcessService().GetEarnedLeaveOpening(oEmployee.ID, oItem.LeaveId, from_Date, to_Date);
-                        if (DateTime.DaysInMonth(SelectedMonth.Year, SelectedMonth.Month) < oEmployee.JoiningDate.Day)
+                        //int dCurrectedDay = 0;
-                            dCurrectedDay = DateTime.DaysInMonth(SelectedMonth.Year, SelectedMonth.Month);
+                        //if (DateTime.DaysInMonth(SelectedMonth.Year, SelectedMonth.Month) < oEmployee.JoiningDate.Day)
-                        else
+                        //    dCurrectedDay = DateTime.DaysInMonth(SelectedMonth.Year, SelectedMonth.Month);
-                            dCurrectedDay = oEmployee.JoiningDate.Day;
+                        //else
-                        DateTime JoiningDateBefore2YearsFromCurrentYear = new DateTime(SelectedMonth.Year, SelectedMonth.Month, dCurrectedDay).AddYears(-2);// new DateTime(DateTime.Today.Year- 2, item.JoiningDate.Month, item.JoiningDate.Day);// SelectedMonth.FirstDateOfMonth().AddYears(-2);
+                        //    dCurrectedDay = oEmployee.JoiningDate.Day;
-                        DateTime FirstYearStartDate = JoiningDateBefore2YearsFromCurrentYear;
+                        //DateTime JoiningDateBefore2YearsFromCurrentYear = new DateTime(SelectedMonth.Year, SelectedMonth.Month, dCurrectedDay).AddYears(-2);// new DateTime(DateTime.Today.Year- 2, item.JoiningDate.Month, item.JoiningDate.Day);// SelectedMonth.FirstDateOfMonth().AddYears(-2);
-                        DateTime FirstYearEndDate = JoiningDateBefore2YearsFromCurrentYear.AddYears(1).AddDays(-1);
+                        //DateTime FirstYearStartDate = JoiningDateBefore2YearsFromCurrentYear;
-                        DateTime LastYearStartDate = JoiningDateBefore2YearsFromCurrentYear.AddYears(1);
+                        //DateTime FirstYearEndDate = JoiningDateBefore2YearsFromCurrentYear.AddYears(1).AddDays(-1);
-                        DateTime LastYearEndDate = JoiningDateBefore2YearsFromCurrentYear.AddYears(2).AddDays(-1);
+                        //DateTime LastYearStartDate = JoiningDateBefore2YearsFromCurrentYear.AddYears(1);
+                        //DateTime LastYearEndDate = JoiningDateBefore2YearsFromCurrentYear.AddYears(2).AddDays(-1);
 
-                        double secondYearLeaveAvailed = new LeaveEntryService().Get(oEmployee.ID, LastYearStartDate, LastYearEndDate, EnumLeaveStatus.Approved).Sum(x => x.ApprovedTotalDays);
+                        //double secondYearLeaveAvailed = new LeaveEntryService().Get(oEmployee.ID, LastYearStartDate, LastYearEndDate, EnumLeaveStatus.Approved).Sum(x => x.ApprovedTotalDays);
-                        //ObjectsTemplate<LeaveEncashment> les = LeaveEncashment.GetByEmpIDs(oEmployee.ID.Integer.ToString(), FirstYearStartDate, FirstYearEndDate);
+                        ////List<LeaveEncashment> les = LeaveEncashment.GetByEmpIDs(oEmployee.ID.Integer.ToString(), FirstYearStartDate, FirstYearEndDate);
 
-                        if (ds != null && ds.Tables.Count > 0)
+                        //if (ds != null && ds.Tables.Count > 0)
+                        //{
+                        //    foreach (DataRow dr in ds.Tables[0].Rows)
+                        //    {
+                        //        oCurrStatus.OpeningBalance = Convert.ToDouble(dr[0].ToString());
+                        //        oCurrStatus.LeaveAvailed = Convert.ToDouble(dr[1].ToString()); //secondYearLeaveAvailed;                                
+                        //        oCurrStatus.EncashDays = 0;// les==null?0:les.Sum(x=> Math.Round(x.EncashmentDays));
+                        //        oCurrStatus.YearEndBalance = oCurrStatus.OpeningBalance - (oCurrStatus.LeaveAvailed + oCurrStatus.EncashDays);
+                        //    }
+                        //}
+                        #endregion
+                        
+                        DateTime dtTo = oCurrYear.EndDate < DateTime.Today ? oCurrYear.EndDate : DateTime.Today;
+                        DateTime dtAvailed = oEmployee.JoiningDate;
+                        LeaveYear ly = new LeaveYearService().LastLeaveYear(oCurrYear);
+                        while (dtAvailed < ly.StartDate)
                         {
-                            foreach (DataRow dr in ds.Tables[0].Rows)
+                            dtAvailed = dtAvailed.AddYears(1);
+                        }
+                        DataTable dt = new LeaveService().GetELInfo(oEmployee.ID, oEmployee.JoiningDate, dtTo, dtAvailed);
+                        if (dt != null)
+                        {
+                            foreach (DataRow dr in dt.Rows)
                             {
-                                oCurrStatus.OpeningBalance = Convert.ToDouble(dr[0].ToString());
+                                if (dr[0].ToString() == "Leave Availed this")
-                                oCurrStatus.LeaveAvailed = Convert.ToDouble(dr[1].ToString()); //secondYearLeaveAvailed;                                
+                                {
-                                oCurrStatus.EncashDays = 0;// les==null?0:les.Sum(x=> Math.Round(x.EncashmentDays));
+                                    oCurrStatus.LeaveAvailed = Convert.ToDouble(dr[1].ToString());
-                                oCurrStatus.YearEndBalance = oCurrStatus.OpeningBalance - (oCurrStatus.LeaveAvailed + oCurrStatus.EncashDays);
+                                }
+                                else if (dr[0].ToString() == "Present Days")
+                                {
+                                    oCurrStatus.OpeningBalance = Convert.ToDouble(dr[1].ToString());
+                                    oCurrStatus.OpeningBalance = oCurrStatus.OpeningBalance == 0 ? 0 : oCurrStatus.OpeningBalance / 18;
+                                }
+                                else if (dr[0].ToString() == "Encash Days")
+                                {
+                                    oCurrStatus.OpeningBalance -= Convert.ToDouble(dr[1].ToString());
+                                }
+                                else if (dr[0].ToString() == "Leave Availed")
+                                {
+                                    oCurrStatus.NormalLeaveDays = Convert.ToDouble(dr[1].ToString());
+                                }
                             }
+                            oCurrStatus.OpeningBalance -= oCurrStatus.NormalLeaveDays;
+                            oCurrStatus.OpeningBalance = Math.Round(oCurrStatus.OpeningBalance, 2);
+                            oCurrStatus.OpeningBalance = oItem.MaxAccumulatedDays < oCurrStatus.OpeningBalance ? oItem.MaxAccumulatedDays : oCurrStatus.OpeningBalance;
+                            oCurrStatus.YearEndBalance = Math.Round(oCurrStatus.OpeningBalance - oCurrStatus.LeaveAvailed, 2);
                         }
 
                         oCurrYearBalance.Add(oCurrStatus);
@@ -121,7 +159,7 @@ namespace HRM.DA
                     else
                     {
 
-                        //ObjectsTemplate<LeaveEntry> les = LeaveEntry.GetByLeaveID(oItem.LeaveId, empId, from_Date, to_Date);
+                        //List<LeaveEntry> les = LeaveEntry.GetByLeaveID(oItem.LeaveId, empId, from_Date, to_Date);
                         List<LeaveEntry> les = oLeaveEntries.Where(le => le.LeaveID == oItem.LeaveId
                                                                                   && le.EmpID == empId
                                                                                   && le.ApprovedFromDate >= from_Date && le.ApprovedFromDate <= to_Date
@@ -164,9 +202,11 @@ namespace HRM.DA
                         }
                         else
                         {
+                            #region From Master
+
                             if (oDetail != null) oCurrStatus.NormalLeaveDays = 0;
                             else continue;
-                            //oItem.Details = new ObjectsTemplate<LeaveParameterDetail>();
+                            //oItem.Details = new List<LeaveParameterDetail>();
                             //oItem.Details.Add(oDetail);
 
                             #region calculate the current year balance
@@ -249,6 +289,12 @@ namespace HRM.DA
                             }
 
 
+                            #endregion
+
+                            #endregion
+
+                            #region From Echotex desktop App
+
                             #endregion
                         }
 
@@ -276,14 +322,14 @@ namespace HRM.DA
         {
             double nTotalDays = 0;
             TimeSpan ts = new TimeSpan();
-            if (eType == EnumLeaveCalculationType.Yearly)
+            if (eType == EnumLeaveCalculationType.Daily)
             {
                 if (presentAttnCount > 0)
                 {
                     nTotalDays = (double)presentAttnCount / 18;
                 }
             }
-            else if (eType == EnumLeaveCalculationType.Yearly)
+            else if (eType == EnumLeaveCalculationType.Monthly)
             {
                 ts = (dCurrentDate - ((emp.JoiningDate > oCurrentYear.StartDate) ?
                                       emp.JoiningDate : Global.DateFunctions.FirstDateOfYear(dCurrentDate)))
@@ -301,12 +347,12 @@ namespace HRM.DA
                 }
                 // Else '0' , What??????????????????
             }
-            else if (eType == EnumLeaveCalculationType.Yearly)
+            else if (eType == EnumLeaveCalculationType.Not_Applicable)
             {
                 ts = (Global.DateFunctions.LastDateOfYear(dCurrentDate) - Global.DateFunctions.FirstDateOfYear(dCurrentDate)).Add(TimeSpan.FromDays(1));
                 nTotalDays = (oDetail.MaxDays * ts.Days) / 365;
             }
-            else if (eType == EnumLeaveCalculationType.Yearly)
+            else if (eType == EnumLeaveCalculationType.Not_Applicable_With_Prorated)
             {
                 ts = (Global.DateFunctions.LastDateOfYear(dCurrentDate) - ((emp.JoiningDate > oCurrentYear.StartDate) ?
                                                        emp.JoiningDate : Global.DateFunctions.FirstDateOfYear(dCurrentDate)))
@@ -691,6 +737,333 @@ namespace HRM.DA
         //#endregion
 
 
+        public DataTable CurrentYearStatusOptimized(string sEmpIDs, LeaveYear lYear, EnumLeaveStatus eStatus, DateTime NextPayProcessDate)
+        {
+            DataTable dTEmpLeave = new DataTable();
+            dTEmpLeave.Columns.Add("Leave", typeof(System.String));
+            dTEmpLeave.Columns.Add("Opening", typeof(System.String));
+            dTEmpLeave.Columns.Add("Availed", typeof(System.String));
+            dTEmpLeave.Columns.Add("Balance", typeof(System.String));
+            dTEmpLeave.Columns.Add("EmpNo", typeof(System.String));
+            dTEmpLeave.Columns.Add("Name", typeof(System.String));
+            dTEmpLeave.Columns.Add("Designation", typeof(System.String));
+            dTEmpLeave.Columns.Add("Division", typeof(System.String));
+            dTEmpLeave.Columns.Add("Department", typeof(System.String));
+            dTEmpLeave.Columns.Add("Unit", typeof(System.String));
+            dTEmpLeave.Columns.Add("CFDays", typeof(System.String));
+            dTEmpLeave.Columns.Add("Floor", typeof(System.String));
+            dTEmpLeave.Columns.Add("Section", typeof(System.String));
+            dTEmpLeave.Columns.Add("Line", typeof(System.String));
+
+            try
+            {
+
+                DataTable dtEmpBasicInfo = new EmployeeService().GetAllEmpBasicInfo(sEmpIDs)
+                                                .Tables[0]
+                                                .AsEnumerable()
+                                                .OrderBy(x => Convert.ToInt32(x["EmployeeID"].ToString()))
+                                                .CopyToDataTable();
+
+                List<EmpLeaveStatus> oCurrYearBalance = null;
+                List<EmpLeaveStatus> oAllEmpsCurrYearBalance = new List<EmpLeaveStatus>();
+                DateTime operationDate = GlobalFunctionDA.GetOperationDate();
+                if (operationDate.Date > lYear.EndDate.Date)
+                {
+                    operationDate = lYear.EndDate.Date;
+                }
+                DateTime oEmpOperationDate;
+                DataTable oYearlyDailyAttnProcess = new DailyAttnProcessService().GetTypeWiseAttnCount(sEmpIDs, Global.DateFunctions.FirstDateOfYear(operationDate), Global.DateFunctions.LastDateOfYear(operationDate), EnumAttendanceType.Present, EnumAttendanceType.Early, EnumAttendanceType.Late, EnumAttendanceType.Delay, EnumAttendanceType.HalfDay, EnumAttendanceType.OutSideDuty)
+                                                                    .AsEnumerable()
+                                                                    .OrderBy(x => Convert.ToInt32(x["EmployeeID"].ToString()))
+                                                                    .CopyToDataTable();
+
+
+                LeaveYear oCurrYear = lYear;
+                LeaveYear oPrvYear = new LeaveYearService().LastLeaveYear(oCurrYear);
+                List<EnmSetupManagerTranType> setupTypes = new SetupDetailService().GetTypes(EnumParameterSetup.Leave);
+                List<SetupDetail> setupDetails = new SetupDetailService().GetParameters(EnumParameterSetup.Leave);
+                List<LeaveParameter> leaveParamss = new LeaveParameterService().Get();
+                List<LeaveParameterDetail> leaveParamDetails = new LeaveParameterService().GetDetails();
+                List<LeaveEntry> oLs = new LeaveEntryService().GetByLeaveYear(oCurrYear.ID);
+                List<EmpLeaveStatus> oPrevStatuses = new LeaveProcessService().GetByYear(oPrvYear.ID);
+                List<LeaveException> oExceptions = new LeaveExceptionService().Get(lYear.StartDate, lYear.EndDate);
+                Queue<Employee> oEmployees = new Queue<Employee>(new EmployeeService().GetByEmpIDs(sEmpIDs).OrderBy(x => x.ID));
+                List<AttnNationalHoliday> oNationalHolidays = new AttnNationalHolidayService().GetByMonth(oCurrYear.StartDate, oCurrYear.EndDate);
+
+                List<Leave> leaveTypes = new LeaveService().GetAll();
+
+                foreach (DataRow drBasic in dtEmpBasicInfo.Rows)
+                {
+                    Employee oEmp = null;
+                    int presentCount = 0;
+
+                    if (oEmployees.Any() && oEmployees.Peek().ID == Convert.ToInt32(drBasic["EmployeeID"].ToString()))
+                    {
+                        oEmp = oEmployees.Dequeue();
+                    }
+                    else
+                    {
+                        continue;
+                    }
+
+                    oEmpOperationDate = operationDate;
+
+                    if (oEmp.EndOfContractDate != null)
+                    {
+                        if (oEmp.EndOfContractDate < lYear.StartDate)
+                            continue;
+
+                        if (oEmp.EndOfContractDate.Value < operationDate)
+                        {
+                            oEmpOperationDate = oEmp.EndOfContractDate.Value;
+                        }
+
+                    }
+                    DataRow dRow = oYearlyDailyAttnProcess.AsEnumerable().FirstOrDefault(x => Convert.ToInt32(x["EmployeeID"].ToString()) == Convert.ToInt32(drBasic["EmployeeID"].ToString()));
+                    presentCount = dRow != null ? Convert.ToInt32(dRow["Count"].ToString()) : 0;
+
+
+                    List<LeaveParameter> oAppLeaveParams = new LeaveParameterService().ApplicableParamsForReportOptimized(oEmp, setupTypes, setupDetails, leaveParamss, leaveTypes);
+                    oCurrYearBalance = new EmpLeaveStatusService().CurrentYearStatusOptimized(oEmp, oEmpOperationDate, presentCount, oAppLeaveParams, oCurrYear, oLs, eStatus, oPrevStatuses, leaveParamDetails, oExceptions, oNationalHolidays, NextPayProcessDate);
+
+                    DataRow oRow = null;
+                    foreach (EmpLeaveStatus eSts in oCurrYearBalance)
+                    {
+                        eSts.Leave = leaveTypes.Find(l => l.ID == eSts.LeaveId);
+                        oRow = dTEmpLeave.NewRow();
+                        if (drBasic != null)
+                        {
+                            oRow["EmpNo"] = drBasic["EmployeeNo"];
+                            oRow["Name"] = drBasic["Name"];
+                            oRow["Designation"] = drBasic["Designation"];
+                            oRow["Department"] = drBasic["Department"];
+                            oRow["Floor"] = drBasic["Floor"];
+                            oRow["Section"] = drBasic["Section"];
+                            oRow["Line"] = drBasic["Line"];
+                            oRow["Unit"] = string.Empty;
+                        }
+
+                        oRow["Leave"] = eSts.Leave.Description;
+                        oRow["Opening"] = eSts.OpeningBalance.ToString();
+                        oRow["Availed"] = eSts.LeaveAvailed.ToString();
+                        oRow["Balance"] = eSts.ClosingBalance.ToString();
+
+                        dTEmpLeave.Rows.Add(oRow);
+
+                    }
+                }
+
+                return dTEmpLeave;
+            }
+            catch (Exception)
+            {
+
+            }
+            return dTEmpLeave;
+        }
+
+
+
+        public DataTable CurrentYearStatusForEncashment(string sEmpIDs, LeaveYear lYear, EnumLeaveStatus eStatus, DateTime EncashMonth)
+        {
+            DataTable dTEmpLeave = new DataTable();
+            dTEmpLeave.Columns.Add("EmpName", typeof(System.String));
+            dTEmpLeave.Columns.Add("JoiningDate", typeof(System.String));
+            dTEmpLeave.Columns.Add("EmpNo", typeof(System.String));
+            dTEmpLeave.Columns.Add("Designation", typeof(System.String));
+            dTEmpLeave.Columns.Add("AccountNo", typeof(System.String));
+            dTEmpLeave.Columns.Add("TINNo", typeof(System.String));
+            dTEmpLeave.Columns.Add("Department", typeof(System.String));
+            dTEmpLeave.Columns.Add("Floor", typeof(System.String));
+            dTEmpLeave.Columns.Add("Section", typeof(System.String));
+            dTEmpLeave.Columns.Add("Line", typeof(System.String));
+            dTEmpLeave.Columns.Add("CC", typeof(System.String));
+            dTEmpLeave.Columns.Add("CCCode", typeof(System.String));
+            dTEmpLeave.Columns.Add("Grade", typeof(System.String));
+            dTEmpLeave.Columns.Add("Gross", typeof(System.String));
+
+            dTEmpLeave.Columns.Add("Present", typeof(System.String));
+            dTEmpLeave.Columns.Add("Holiday", typeof(System.String));
+            dTEmpLeave.Columns.Add("Abcent", typeof(System.String));
+            dTEmpLeave.Columns.Add("CL", typeof(System.String));
+            dTEmpLeave.Columns.Add("SL", typeof(System.String));
+            dTEmpLeave.Columns.Add("SPL", typeof(System.String));
+            dTEmpLeave.Columns.Add("COM", typeof(System.String));
+            dTEmpLeave.Columns.Add("PL", typeof(System.String));
+            dTEmpLeave.Columns.Add("ML", typeof(System.String));
+            dTEmpLeave.Columns.Add("LWOP", typeof(System.String));
+            dTEmpLeave.Columns.Add("EL", typeof(System.String));
+            dTEmpLeave.Columns.Add("ELDays", typeof(System.String));
+            dTEmpLeave.Columns.Add("ELPayment", typeof(System.String));
+            dTEmpLeave.Columns.Add("TDSAIT", typeof(System.String));
+            dTEmpLeave.Columns.Add("Net", typeof(double));
+            dTEmpLeave.Columns.Add("Remarks", typeof(System.String));
+            dTEmpLeave.Columns.Add("Signature", typeof(System.String));
+            dTEmpLeave.Columns.Add("NetSum", typeof(string));
+
+            dTEmpLeave.Columns.Add("EnjoyedLeave", typeof(double));
+            dTEmpLeave.Columns.Add("EncashmentFromDate", typeof(System.DateTime));
+            dTEmpLeave.Columns.Add("EncashmentToDate", typeof(System.DateTime));
+            dTEmpLeave.Columns.Add("LeaveBalance", typeof(double));
+
+            try
+            {
+
+                DataTable dtEmpBasicInfo = new EmployeeService().GetAllEmpBasicInfo(sEmpIDs)
+                                                .Tables[0]
+                                                .AsEnumerable()
+                                                .OrderBy(x => Convert.ToInt32(x["EmployeeID"].ToString()))
+                                                .CopyToDataTable();
+
+                List<LeaveEncashment> leaveEncashments = new LeaveEncashmentService().GetByEmpIDs(sEmpIDs, lYear.ID, EncashMonth);
+
+                //List<EmpLeaveStatus> oCurrYearBalance = null;
+                //List<EmpLeaveStatus> oAllEmpsCurrYearBalance = new List<EmpLeaveStatus>();
+                //DateTime operationDate = GlobalFunctions.GetOperationDate();
+                //if (operationDate.Date > lYear.EndDate.Date)
+                //{
+                //    operationDate = lYear.EndDate.Date;
+                //}
+                //DateTime oEmpOperationDate;
+                //DataTable oYearlyDailyAttnProcess = DailyAttnProcess.GetTypeWiseAttnCount(sEmpIDs, operationDate.FirstDateOfYear(), operationDate.LastDateOfYear(), EnumAttendanceType.Present, EnumAttendanceType.Early, EnumAttendanceType.Late, EnumAttendanceType.Delay, EnumAttendanceType.HalfDay, EnumAttendanceType.OutSideDuty)
+                //                                                    .AsEnumerable()
+                //                                                    .OrderBy(x => Convert.ToInt32(x["EmployeeID"].ToString()))
+                //                                                    .CopyToDataTable();
+                LeaveYear oCurrYear = lYear;
+                //LeaveYear oPrvYear = LeaveYear.LastLeaveYear(oCurrYear);
+                //List<EnmSetupManagerTranType> setupTypes = SetupDetail.GetTypes(EnumParameterSetup.Leave);
+                //List<SetupDetail> setupDetails = SetupDetail.GetParameters(EnumParameterSetup.Leave);
+                //List<LeaveParameter> leaveParamss = LeaveParameter.Get();
+                //List<LeaveParameterDetail> leaveParamDetails = new LeaveParameter().GetAllDetails();
+                //List<LeaveEntry> oLs = LeaveEntry.GetByLeaveYear(oCurrYear.ID.Integer);
+                //List<EmpLeaveStatus> oPrevStatuses = EmpLeaveStatus.GetAllPrvYearStatus(oCurrYear.ID.Integer);
+                //List<LeaveException> oExceptions = LeaveException.Get(lYear.StartDate, lYear.EndDate);
+                Queue<Employee> oEmployees = new Queue<Employee>(new EmployeeService().GetByEmpIDs(sEmpIDs).OrderBy(x => x.ID));
+                double net = 0;
+
+                foreach (DataRow drBasic in dtEmpBasicInfo.Rows)
+                {
+                    //Employee oEmp = null;
+                    ////int presentCount = 0;
+
+                    //if (oEmployees.Any() && oEmployees.Peek().ID.Integer == Convert.ToInt32(drBasic["EmployeeID"].ToString()))
+                    //{
+                    //    oEmp = oEmployees.Dequeue();
+                    //}
+                    //else
+                    //{
+                    //    continue;
+                    //}
+                    LeaveEncashment le = leaveEncashments.Where(x => x.EmployeeID == Convert.ToInt32(drBasic["EmployeeID"].ToString())).FirstOrDefault();
+                    if (le == null)
+                    {
+                        continue;
+                    }
+                    //oEmpOperationDate = operationDate;
+
+                    //if (oEmp.EndOfContractDate != null)
+                    //{
+                    //    if (oEmp.EndOfContractDate < lYear.StartDate)
+                    //        continue;
+
+                    //    if (oEmp.EndOfContractDate.Value < operationDate)
+                    //    {
+                    //        oEmpOperationDate = oEmp.EndOfContractDate.Value;
+                    //    }
+
+                    //}
+                    //DataRow dRow = oYearlyDailyAttnProcess.AsEnumerable().FirstOrDefault(x => Convert.ToInt32(x["EmployeeID"].ToString()) == Convert.ToInt32(drBasic["EmployeeID"].ToString()));
+                    //presentCount = dRow != null ? Convert.ToInt32(dRow["Count"].ToString()) : 0;
+                    //List<LeaveParameter> oAppLeaveParams = LeaveParameter.ApplicableParamsForReportOptimized(oEmp, setupTypes, setupDetails, leaveParamss);
+                    //oCurrYearBalance = EmpLeaveStatus.CurrentYearStatusOptimized(oEmp, oEmpOperationDate, presentCount, oAppLeaveParams, oCurrYear, oLs, eStatus, oPrevStatuses, leaveParamDetails, oExceptions);
+
+                    DataRow oRow = null;
+                    oRow = dTEmpLeave.NewRow();
+                    net = 0;
+                    if (drBasic != null)
+                    {
+                        oRow["EmpNo"] = drBasic["EmployeeNo"];
+                        oRow["EmpName"] = drBasic["Name"];
+                        oRow["Designation"] = drBasic["Designation"];
+                        oRow["Department"] = drBasic["Department"];
+                        oRow["Floor"] = drBasic["Floor"];
+                        oRow["Section"] = drBasic["Section"];
+                        oRow["Line"] = drBasic["Line"];
+                        //oRow["Unit"] = string.Empty;
+                        oRow["JoiningDate"] = Convert.ToDateTime(drBasic["JoiningDate"].ToString()).ToString("dd MMM yyyy");
+                        oRow["AccountNo"] = drBasic["ACCOUNTNO"];
+                        oRow["TINNo"] = drBasic["TINNO"];
+                        oRow["CC"] = "";
+                        oRow["CCCode"] = "";
+                        oRow["Grade"] = drBasic["GradeName"];
+                        oRow["Gross"] = le.GrossSalary.ToString("N2"); //Convert.ToDouble(drBasic["GROSSSALARY"].ToString()).ToString("N2");
+
+                        oRow["Present"] = le.presentDays.ToString();/*le.PresentDays.ToString();*/
+                        oRow["Holiday"] = le.holiDays.ToString();/*le.HoliDays.ToString();*/
+                        oRow["Abcent"] = le.absentDays.ToString();/*le.AbsentDays.ToString();*/
+                        oRow["ELDays"] = le.EncashmentDays.ToString("N2");
+                        oRow["ELPayment"] = le.Amount.ToString("N2");
+                        oRow["TDSAIT"] = le.TaxAmount.ToString("N2");
+                        oRow["CL"] = "0";
+                        oRow["SL"] = "0";
+                        oRow["SPL"] = "0";
+                        oRow["COM"] = "0";
+                        oRow["PL"] = "0";
+                        oRow["ML"] = "0";
+                        oRow["LWOP"] = "0";
+                        oRow["EL"] = "0";
+                        oRow["Net"] = le.Amount;
+                        oRow["EnjoyedLeave"] = le.enjoyedLeave;/*le.EnjoyedLeave;*/
+                        oRow["EncashmentFromDate"] = le.EncashmentFromDate;
+                        oRow["EncashmentToDate"] = le.EncashmentToDate;
+                        oRow["LeaveBalance"] = le.LeaveBalance;
+                    }
+                    //foreach (EmpLeaveStatus eSts in oCurrYearBalance)
+                    //{
+
+                    //    switch (eSts.Leave.Code)
+                    //    {
+                    //        case "CL":
+                    //            oRow["CL"] = eSts.ClosingBalance.ToString();
+                    //            break;
+                    //        case "SL":
+                    //            oRow["SL"] = eSts.ClosingBalance.ToString();
+                    //            break;
+                    //        case "SPL":
+                    //            oRow["SPL"] = eSts.ClosingBalance.ToString();
+                    //            break;
+                    //        case "COM":
+                    //            oRow["COM"] = eSts.ClosingBalance.ToString();
+                    //            break;
+                    //        case "PL":
+                    //            oRow["PL"] = eSts.ClosingBalance.ToString();
+                    //            break;
+                    //        case "ML":
+                    //            oRow["ML"] = eSts.ClosingBalance.ToString();
+                    //            break;
+                    //        case "LWOP":
+                    //            oRow["LWOP"] = eSts.ClosingBalance.ToString();
+                    //            break;
+                    //        case "EL":
+                    //            oRow["EL"] = eSts.ClosingBalance.ToString();
+                    //            break;
+                    //        default:
+                    //            break;
+                    //    }
+
+                    //}
+
+                    dTEmpLeave.Rows.Add(oRow);
+                }
+
+                return dTEmpLeave;
+            }
+            catch (Exception ex)
+            {
+
+            }
+            return dTEmpLeave;
+        }
 
     }
 

HRM.DA/Service/Leave/LeaveEncashmentService.cs

@@ -41,6 +41,10 @@ namespace HRM.Service
             oLeaveEncashment.ModifiedDate = oReader.GetDateTime("ModifiedDate");
             oLeaveEncashment.BasicSalary = oReader.GetDouble("BasicSalary").Value;
             oLeaveEncashment.ESSSubmittedDays = oReader.GetDouble("ESSSubmittedDays").Value;
+            oLeaveEncashment.presentDays = oReader.GetDouble("PresentDays").Value;
+            oLeaveEncashment.absentDays = oReader.GetDouble("AbsentDays").Value;
+            oLeaveEncashment.enjoyedLeave = oReader.GetDouble("EnjoyedLeave").Value;
+            oLeaveEncashment.holiDays = oReader.GetDouble("HoliDays").Value;
             this.SetObjectState(oLeaveEncashment, Ease.Core.ObjectState.Saved);
         }
         protected override T CreateObject<T>(DataReader oReader)
@@ -605,6 +609,37 @@ namespace HRM.Service
                 (((end.Month > start.Month) ||
                 ((end.Month == start.Month) && (end.Day >= start.Day))) ? 1 : 0);
         }
+
+        public List<LeaveEncashment> GetByEmpIDs(string empIDs, int leaveyearid, DateTime EncashMonth)
+        {
+            List<LeaveEncashment> employees = new List<LeaveEncashment>();
+            TransactionContext tc = null;
+            try
+            {
+                tc = TransactionContext.Begin();
+
+                DataReader dr = new DataReader(LeaveEncashmentDA.GetByEmpIDs(tc, empIDs, leaveyearid, EncashMonth));
+                employees = this.CreateObjects<LeaveEncashment>(dr);
+                dr.Close();
+
+                tc.End();
+            }
+            catch (Exception e)
+            {
+                #region Handle Exception
+
+                if (tc != null)
+                    tc.HandleError();
+                ExceptionLog.Write(e);
+
+                throw new ServiceException(e.Message, e);
+
+                #endregion
+            }
+
+
+            return employees;
+        }
     }
     #endregion
 }

HRM.DA/Service/Leave/LeaveEntryService.cs

@@ -2558,18 +2558,18 @@ namespace HRM.DA
                     }
                 }
 
-                if (lp.CalculationType == EnumLeaveCalculationType.Hourly_365Day)
+                //if (lp.CalculationType == EnumLeaveCalculationType.Hourly_365Day)
-                {
+                //{
-                    nDays = (nDiff - nDays) > 0 ? (nDiff - nDays) * 8 : 0;
+                //    nDays = (nDiff - nDays) > 0 ? (nDiff - nDays) * 8 : 0;
-                }
+                //}
-                else if (lp.CalculationType == EnumLeaveCalculationType.Days_365)
+                //else if (lp.CalculationType == EnumLeaveCalculationType.Days_365)
-                {
+                //{
+                //    nDays = (nDiff - nDays) > 0 ? nDiff - nDays : 0;
+                //}
+                //else
+                //{
                     nDays = (nDiff - nDays) > 0 ? nDiff - nDays : 0;
-                }
+                //}
-                else
-                {
-                    nDays = (nDiff - nDays) > 0 ? nDiff - nDays : 0;
-                }
 
                 nDays -= totalDayOff;
                 ThrowMessageForMinimumDays(leaveType, IsHalfDay && nDays == 1 ? nDays - 0.5 : nDays);

HRM.DA/Service/Leave/LeaveParameterService.cs

@@ -696,7 +696,7 @@ namespace HRM.DA
             //List<EnmSetupManagerTranType> setupTypes = SetupDetail.GetTypes(setup);
             if (setupTypes == null) return parametersID;
 
-            //ObjectsTemplate<SetupDetail> details = SetupDetail.GetParameters(setup);
+            //List<SetupDetail> details = SetupDetail.GetParameters(setup);
 
             foreach (EnmSetupManagerTranType type in setupTypes)
             {
@@ -766,7 +766,7 @@ namespace HRM.DA
         public List<LeaveParameter> ApplicableParamsForReport(Employee oEmp, List<EnmSetupManagerTranType> setupTypes, List<SetupDetail> details, List<LeaveParameter> leaveParamss)
         {
             List<int> leaveParamIds = ApplicableParametersForReport(oEmp, setupTypes, details);
-            //ObjectsTemplate<LeaveParameter> leaveParamss = LeaveParameter.Get();
+            //List<LeaveParameter> leaveParamss = LeaveParameter.Get();
             List<LeaveParameter> leaveParams = new List<LeaveParameter>();
             foreach (LeaveParameter lparam in leaveParamss)
             {
@@ -846,6 +846,48 @@ namespace HRM.DA
             return dtl;
 
         }
+        public List<LeaveParameter> ApplicableParamsForReportOptimized(Employee oEmp, List<EnmSetupManagerTranType> setupTypes, List<SetupDetail> details, List<LeaveParameter> leaveParamss, List<Leave> leaveTypes)
+        {
+            List<int> leaveParamIds = SetupManager.ApplicableParametersForReportOptimized(oEmp, setupTypes, details);
+            //List<LeaveParameter> leaveParamss = LeaveParameter.Get();
+            List<LeaveParameter> leaveParams = new List<LeaveParameter>();
+            foreach (LeaveParameter lparam in leaveParamss)
+            {
+                lparam.Leave = leaveTypes.Find(l => l.ID == lparam.LeaveId);
+                if (lparam.Leave.ApplicableFor != (EnumGender)oEmp.Gender &&
+                    lparam.Leave.ApplicableFor != EnumGender.Other &&
+                    lparam.Leave.ApplicableFor != EnumGender.None)
+                {
+                    continue;
+                }
+
+                if (leaveParamIds.Contains(lparam.ID))
+                {
+                    switch (lparam.ApplicableFor)
+                    {
+                        case LeaveApplicableType.Probetionary:
+                            if (!oEmp.IsConfirmed)
+                            {
+                                leaveParams.Add(lparam);
+                            }
+                            break;
+                        case LeaveApplicableType.Confirmed:
+                            if (oEmp.IsConfirmed)
+                            {
+                                leaveParams.Add(lparam);
+                            }
+                            break;
+                        case LeaveApplicableType.Regardless:
+                            leaveParams.Add(lparam);
+                            break;
+                        default:
+                            break;
+                    }
+
+                }
+            }
+            return leaveParams;
+        }
         #endregion
     }
 

HRM.DA/Service/Leave/LeaveProcessService.cs

@@ -288,7 +288,7 @@ namespace HRM.DA
                     {
 
                     }
-                    if (oItem.LeaveParameter.CalculationType == EnumLeaveCalculationType.Monthly_Earn
+                    if (oItem.LeaveParameter.CalculationType == EnumLeaveCalculationType.Monthly//EnumLeaveCalculationType.Monthly_Earn
                          && oItem.EligibleParamDetail == null) // considering joining current year and will eligible next year.
                     {
                         Employee emp = new EmployeeService().Get(oItem.EmpId);
@@ -1444,7 +1444,7 @@ namespace HRM.DA
                         //  + current month (0, because current month not yet completed)= 19, but as per policy he will get 20 days from one year completion.   
                         // so folloiwng loic is needed to that
 
-                        if (oItem.CalculationType == EnumLeaveCalculationType.Monthly_Earn)
+                        if (oItem.CalculationType == EnumLeaveCalculationType.Monthly)//EnumLeaveCalculationType.Monthly_Earn)
                         {
                             double months = Global.DateFunctions.DateDiff("M", oEmployee.JoiningDate, dCurrentDate);
                             if (oDetail.Year == 1 && months == 12)
@@ -1900,7 +1900,7 @@ namespace HRM.DA
 
                 nTotalDays = Math.Floor(nTotalDays);
             }
-            else if (eType == EnumLeaveCalculationType.Monthly_Earn)
+            else if (eType == EnumLeaveCalculationType.Monthly)/*EnumLeaveCalculationType.Monthly_Earn)*/
             {
                 if (emp.ID == 1807)
                 {
@@ -2095,7 +2095,7 @@ namespace HRM.DA
                         //  + current month (0, because current month not yet completed)= 19, but as per policy he will get 20 days from one year completion.   
                         // so folloiwng loic is needed to that
 
-                        if (oItem.CalculationType == EnumLeaveCalculationType.Monthly_Earn)
+                        if (oItem.CalculationType == EnumLeaveCalculationType.Monthly)/*EnumLeaveCalculationType.Monthly_Earn)*/
                         {
                             double months = Global.DateFunctions.DateDiff("M", oEmployee.JoiningDate, dCurrentDate);
                             if (oDetail.Year == 1 && months == 12)

HRM.DA/Service/Leave/LeaveService.cs

@@ -1,9 +1,10 @@
-using HRM.BO;
+using Ease.Core.DataAccess;
-using Ease.Core.DataAccess;
 using Ease.Core.Model;
 using Ease.Core.Utility;
+using HRM.BO;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Text;
 
 namespace HRM.DA
@@ -427,6 +428,31 @@ namespace HRM.DA
                 return false;
         }
         #endregion
+        public DataTable GetELInfo(int empID, DateTime JoinDate, DateTime toDate, DateTime availedTo)
+        {
+
+            TransactionContext tc = null;
+            try
+            {
+                tc = TransactionContext.Begin();
+                DataSet dSet = LeaveDA.GetELInfo(tc, empID, JoinDate, toDate, availedTo);
+                return dSet.Tables[0];
+            }
+            catch (Exception e)
+            {
+                #region Handle Exception
+                if (tc != null)
+                    tc.HandleError();
+                ExceptionLog.Write(e);
+                throw new ServiceException(e.Message, e);
+                #endregion
+            }
+            finally
+            {
+                if (tc != null)
+                    tc.End();
+            }
+        }
     }
 
     #endregion

HRM.Report/Class/rptBonus.cs

@@ -1,20 +1,21 @@
-using System;
+using Ease.Core.Model;
+using Ease.Core.Utility;
+using Ease.CoreV35;
+using HRM.BO;
+using HRM.DA;
+using Microsoft.Reporting.NETCore;
+using Org.BouncyCastle.Ocsp;
+using Payroll.BO;
+using Payroll.Service;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Drawing;
+using System.IO;
 using System.Linq;
 using System.Text;
-using Payroll.BO;
-using Ease.CoreV35;
-using Ease.Core.Model;
-using Ease.Core.Utility;
 using System.Windows.Forms;
-using HRM.BO;
-using HRM.DA;
-using System.IO;
-using Microsoft.Reporting.NETCore;
-using Payroll.Service;
 using static HRM.Report.PayrollDataSet.dsBonusDataSet;
 using static HRM.Report.PayrollDataSet.PayrollDataSet;
 using static NPOI.POIFS.Crypt.Dsig.SignatureInfo;
@@ -339,7 +340,8 @@ namespace HRM.Report
             DateTime? bonusIntime = DateTime.MinValue;
             DateTime? bonusOuttime = DateTime.MinValue;
             List<ProdBonusAttn> prodAttn = new ProdBonusAttnService().GetBySetupID(designId);
-            if (prodAttn.Count <= 0) return null;
+            if (prodAttn.Count <= 0)
+                throw new Exception("No data found");
             string empIds = string.Empty;
             empIds = prodAttn.Select(x => x.EmployeeID).Distinct().Aggregate(new StringBuilder(), (sb, empid) => sb.Append(empid + ","), sb => sb.ToString().Trim(','));
 
@@ -347,6 +349,7 @@ namespace HRM.Report
             List<DailyAttnProcess> oDailyAttnProsess = new DailyAttnProcessService().Get(empIds, design.FromDate.Date, design.ToDate.Date);
             //List<DailyAttnProcess> oDailyAttnProsess = DailyAttnProcess.Get(empIds,GlobalFunctions.FirstDateOfMonth(design.SalaryMonth.AddMonths(-1)), GlobalFunctions.LastDateOfMonth(design.SalaryMonth));
             List<Employee> emps = new EmployeeService().GetByEmpIDs(empIds);
+            DataTable dTblEmps = new EmployeeService().GetAllEmpBasicInfo(empIds).Tables[0];
             List<Employee> attnEmp = new List<Employee>();
             PayrollDataSet.PayrollDataSet.dtProdAttendanceDataTable dTable = new PayrollDataSet.PayrollDataSet.dtProdAttendanceDataTable();
             foreach (ProdBonusAttn item in prodAttn)
@@ -366,6 +369,8 @@ namespace HRM.Report
                     List<ProdBonusAttn> tempAttn = prodAttn.Where(o => o.EmployeeID == item.ID).ToList();//.Sum(x => x.BonusHour);
                     double hour = 0;
 
+                    DataRow drEmp = dTblEmps.AsEnumerable().FirstOrDefault(x => item.ID == x.Field<int>("EmployeeID"));
+
                     foreach (ProdBonusAttn tAtt in tempAttn)
                     {
                       
@@ -426,6 +431,12 @@ namespace HRM.Report
                                 oDR["Date"] = dailyAtt.InTime.Value.Date.ToString("dd-MMM-yyyy");
                                 oDR["WorkingHour"] = hour.ToString("0.00");
 
+                                oDR["Designation"] = drEmp["Designation"].ToString();
+                                oDR["Department"] = drEmp["Department"].ToString();
+                                oDR["Floor"] = drEmp["Floor"].ToString();
+                                oDR["Line"] = drEmp["Line"].ToString();
+                                oDR["Section"] = drEmp["Section"].ToString();
+
                                 dTable.Rows.Add(oDR);
                                 count++;
                             }

HRM.Report/Class/rptEcho.cs

@@ -1,22 +1,24 @@
-using System;
+using DocumentFormat.OpenXml.Office2010.Excel;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Ease.Core.Model;
 using Ease.Core.Utility;
 using HRM.BO;
 using HRM.BO.Configuration;
 using HRM.DA;
 using HRM.Report.Attendence.AttendenceDataSet;
+using Microsoft.AspNetCore.JsonPatch.Operations;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Reporting.NETCore;
 using NPOI.SS.Formula.Functions;
 using NPOI.XSSF.Streaming.Values;
 using Org.BouncyCastle.Ocsp;
 using Org.BouncyCastle.Utilities.Collections;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace HRM.Report
 {
@@ -3221,5 +3223,454 @@ namespace HRM.Report
 
         }
         #endregion
+
+        #region Leave Reports
+
+        public byte[] ShowEmployeeIndvLeaveBalance(string sEmpID, DateTime fromDate, DateTime toDate, int leaveType, int payrollTypeID, DateTime nextPayProcessDate, string reportType)
+        {
+            try
+            {
+                ReportProcessor form = new ReportProcessor();
+
+                DataRow oRow = null;
+                LeaveYear ly = new LeaveYear();
+                List<Leave> leaveTypes = new LeaveService().Get();
+                List<LeaveYear> _leaveYear = new LeaveYearService().Get();
+                DataSet dsEmpBasicInfo = new EmployeeService().GetAllEmpBasicInfo(sEmpID);
+                DataRow drBasic = null;
+
+                if (dsEmpBasicInfo.Tables[0].Rows.Count > 0)
+                {
+                    drBasic = dsEmpBasicInfo.Tables[0].Rows[0];
+                }
+
+                if (drBasic == null) throw new Exception("Employee Information not found");
+
+                List<LeaveEntry> oLeaveEntrys = new List<LeaveEntry>();
+                DataTable oBody = new HRM.Report.PayrollDataSet.dsEmpLeaveLedger.EmpLeaveLedgerDataTable();
+                DataTable oBody2 = new HRM.Report.PayrollDataSet.dsEmpLeaveLedger.EmpInformationDataTable();
+                DataTable oBody3 = new HRM.Report.PayrollDataSet.dsEmpLeaveLedger.LeaveYearDataTable();
+                DataTable oBody4 = new HRM.Report.PayrollDataSet.dsEmpLeaveLedger.LeaveBalanceDataTable();
+                oLeaveEntrys = new LeaveEntryService().GetEmployeeWiseLeaveDetailReport(Convert.ToInt32(sEmpID), fromDate, toDate, leaveType);
+                List<Employee> oEmps = new List<Employee>();
+                Employee oEmp = new EmployeeService().Get(Convert.ToInt32(sEmpID));
+                oEmps.Add(oEmp);
+
+
+                LeaveYear lyy = new LeaveYearService().GetCurrentYear(payrollTypeID);
+                DateTime operationDate = new GlobalFunctionService().GetOperationDate();
+                if (operationDate.Date > lyy.EndDate.Date)
+                {
+                    operationDate = lyy.EndDate.Date;
+                }
+                List<EmpLeaveStatus> oCurrYearStatus = new EmpLeaveStatusService().CurrentYearStatus(oEmps, lyy, operationDate, EnumLeaveStatus.Approved, nextPayProcessDate);
+                foreach (EmpLeaveStatus oItem in oCurrYearStatus)
+                {
+                    ly = _leaveYear.Where(x => x.ID == oItem.LeaveYearID).FirstOrDefault();
+                    oItem.Leave = leaveTypes.Find(lt => lt.ID == oItem.LeaveId);
+                    oBody4.Rows.Add(oItem.Leave.Description, oItem.OpeningBalance.ToString(), oItem.LeaveAvailed.ToString(), oItem.ClosingBalance.ToString(), oItem.CFDays.ToString());
+                }
+                oRow = oBody2.NewRow();
+                oRow["EmpNo"] = drBasic["EmployeeNo"];
+                oRow["EmpName"] = drBasic["Name"];
+                oRow["Designation"] = drBasic["Designation"];
+                oRow["JoiningDate"] = Convert.ToDateTime(drBasic["JoiningDate"].ToString()).ToString("dd MMM yyyy");
+                oRow["LeaveNotifier"] = string.Empty;
+                oRow["Department"] = drBasic["Department"];
+                oRow["Floor"] = drBasic["Floor"];
+                oRow["Section"] = drBasic["Section"];
+                oRow["Line"] = drBasic["Line"];
+
+                DataSet LineManager = new EmployeeService().GetLineManagerFromOrg(Convert.ToInt32(drBasic["EmployeeID"]));
+
+                foreach (DataRow or in LineManager.Tables[0].Rows)
+                {
+                    oRow["LeaveApprover"] = or["Name"];
+                }
+
+                oRow["LeavePeriod"] = ly.Name;
+
+                oBody2.Rows.Add(oRow);
+
+                if (oLeaveEntrys != null)
+                {
+                    foreach (LeaveEntry le in oLeaveEntrys)
+                    {
+                        oRow = oBody.NewRow();
+                        oRow["LeaveType"] = le.Leave.Description;
+                        oRow["FromDate"] = le.ApprovedFromDate.ToString("dd MMM yyyy");
+                        oRow["ToDate"] = le.ApprovedToDate.ToString("dd MMM yyyy");
+                        oRow["TotalDays"] = le.ApprovedTotalDays;
+                        oRow["LeaveReason"] = le.ErnLeaveRemarks;
+                        oRow["ApplyDate"] = le.AppliedLeaveDate.ToString("dd MMM yyyy");
+                        oRow["ApproveDate"] = le.ApprovedLeaveDate.ToString("dd MMM yyyy");
+                        oRow["LeaveStatus"] = le.LeaveStatus.ToString();
+                        oRow["Remarks"] = le.Remarks;
+
+                        oBody.Rows.Add(oRow);
+                    }
+                }
+                DataSet dSet = new DataSet();
+                oBody.TableName = "dsEmpLeaveLedger_EmpLeaveLedger";
+                dSet.Tables.Add(oBody);
+                oBody4.TableName = "dsEmpLeaveLedger_LeaveBalance";
+                dSet.Tables.Add(oBody4);
+                oBody2.TableName = "dsEmpLeaveLedger_EmpInformation";
+                dSet.Tables.Add(oBody2);
+
+
+                string RDLC = "LeaveLedgerEcho.rdlc";
+
+                return form.CommonReportViewForReports(null, dSet, null, RDLC, null, true, payrollTypeID, reportType);
+            }
+            catch (Exception ex)
+            {
+                throw new Exception(ex.Message, ex);
+            }
+        }
+
+
+        public byte[] ShowMultipleEmployeeLeaveReport(string sEmpIDs, int lyyid, int payrollTypeID, DateTime nextPayProcessDate, string reportType)
+        {
+            try
+            {
+                ReportProcessor form = new ReportProcessor();
+                DataTable dTEmpLeave = new HRM.Report.PayrollDataSet.dsEmpLeaveLedger.LeaveBalanceDataTable();
+
+                LeaveYear lyy = new LeaveYearService().Get(lyyid);
+
+                dTEmpLeave = new EmpLeaveStatusService().CurrentYearStatusOptimized(sEmpIDs, lyy, EnumLeaveStatus.Approved, nextPayProcessDate);
+
+                DataSet dSet = new DataSet();
+                dTEmpLeave.TableName = "dsEmpLeaveLedger_LeaveBalance";
+
+                if (dTEmpLeave.Rows.Count > 0)
+                {
+                    dSet.Tables.Add(dTEmpLeave);
+                    List<ReportParameter> oParameters = new List<ReportParameter>();
+                    ReportParameter rParam = new ReportParameter("LeaveYear", string.Format("{0} - {1}", lyy.StartDate.ToString("dd MMM yyyy"), lyy.EndDate.ToString("dd MMM yyyy")));
+                    oParameters.Add(rParam);
+                    string RDLC = "MultipleEmpLeaveBalance.rdlc";
+                    return form.CommonReportViewForReports(null, dSet, null, RDLC, oParameters, true, payrollTypeID, reportType);
+                    //form.CommonReportViewForReports(null, ds, RDLC, oParameters);
+                }
+                else
+                {
+                    throw new Exception("Leave balance not found");
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new Exception(ex.Message, ex);
+            }
+           
+        }
+
+        public byte[] ShowLeaveReport(string sEmpIDs, int lyyid, int payrollTypeID, DateTime nextPayProcessDate, string reportType)
+        {
+
+            ReportProcessor form = new ReportProcessor();
+            DataTable dTEmpLeave = new HRM.Report.PayrollDataSet.dsEmpLeaveLedger.LeaveBalanceDataTable();
+
+            LeaveYear lyy = new LeaveYearService().Get(lyyid);
+
+            dTEmpLeave = new EmpLeaveStatusService().CurrentYearStatusOptimized(sEmpIDs, lyy, EnumLeaveStatus.Approved, nextPayProcessDate);
+
+            if (dTEmpLeave.Rows.Count > 0)
+            {
+                DataSet ds = new DataSet();
+                dTEmpLeave.TableName = "dsEmpLeaveLedger_LeaveBalance";
+                ds.Tables.Add(dTEmpLeave);
+
+                List<ReportParameter> oParameters = new List<ReportParameter>();
+                ReportParameter rParam = new ReportParameter("FromDate", lyy.StartDate.ToString("dd MMM yyyy"));
+                oParameters.Add(rParam);
+                rParam = new ReportParameter("ToDate", lyy.EndDate.ToString("dd MMM yyyy"));
+                oParameters.Add(rParam);
+
+                string RDLC = "LeaveReportEcho.rdlc";
+                return form.CommonReportViewForReports(null, ds, null, RDLC, oParameters, true, payrollTypeID, reportType);
+            }
+            else
+            {
+                throw new Exception("Leave balance not found");
+            }
+        }
+
+        public byte[] ShowLeaveRegisterBanglaReport(string sEmpID, int authPersonID, int payrollTypeID, DateTime nextPayProcessDate, string reportType)
+        {
+            try
+            {
+                ReportProcessor fViewer = new ReportProcessor();
+                int CL, SL, ML, PL, EL, SPL, COM, LWOP, OpeningEL;
+                bool ELVisible, CLVisible, SLVisible, MLVisible, PLVisible, SPLVisible, COMVisible, LWOPVisible;
+                CLVisible = MLVisible = ELVisible = SLVisible = PLVisible = SPLVisible = COMVisible = LWOPVisible = false;
+                CL = SL = ML = PL = EL = SPL = COM = LWOP = OpeningEL = 0;
+                List<Leave> oLeaves = new LeaveService().Get();
+                Leave oLeave = null;
+                LeaveYear lyy = new LeaveYearService().GetCurrentYear(payrollTypeID);
+
+                //_rImageManager = new RemoteImageManager();
+                string signaturePath = string.Empty;
+                AuthorizedPerson oAuthPerson = null;
+                int employeeID = Convert.ToInt32(sEmpID);
+                Employee employee = new EmployeeService().Get(employeeID);
+                HREmployee oEmployee = new HREmployeeService().Get(employeeID);
+
+                if (authPersonID != null)
+                {
+                    oAuthPerson = new AuthorizedPersonService().Get(authPersonID);
+                    //signaturePath = _rImageManager.GetImage(oAuthPerson.GetImage(authPersonID), "AuthSign.jpg");
+                }
+
+                string TargetFolder = System.IO.Path.Combine(System.Environment.CurrentDirectory + @"\Documents\EMPPHOTO\");
+
+
+
+                DateTime operationDate = new GlobalFunctionService().GetOperationDate();
+                if (operationDate.Date > lyy.EndDate.Date)
+                {
+                    operationDate = lyy.EndDate.Date;
+                }
+                List<EmpLeaveStatus> dcurrentStatus = new EmpLeaveStatusService().CurrentYearStatus(new List<Employee> { employee }, lyy, operationDate, EnumLeaveStatus.Approved, nextPayProcessDate);
+
+                List<LeaveEntry> TempLeaveEntry = new LeaveEntryService().Get(employee.ID, lyy.ID)
+                                                                    .Where(x => x.LeaveStatus == EnumLeaveStatus.Approved || x.LeaveStatus == EnumLeaveStatus.Availed)
+                                                                    .OrderBy(x => x.ApprovedFromDate)
+                                                                    .ToList();
+
+
+                List<LeaveEntry> leaveEntrys = oLeaves.Where(l => l.Code == "CL" || l.Code == "SL" || l.Code == "EL")
+                                                                 .Join(TempLeaveEntry,
+                                                                       l => l.ID,
+                                                                       le => le.LeaveID,
+                                                                       (l, le) => le)
+                                                                  .ToList();
+
+
+
+                DataTable dEmpLeaveApplication = new HRM.Report.PayrollDataSet.dsEmpLeaveLedger.LeaveRegisterBanglaDataTable();
+
+                if (dcurrentStatus.Count > 0)
+                {
+
+                    for (int i = 0; i < dcurrentStatus.Count; i++)
+                    {
+                        oLeave = oLeaves.FirstOrDefault(x => x.ID == dcurrentStatus[i].LeaveId);
+                        if (oLeave != null)
+                            switch (oLeave.Code)
+                            {
+                                case "CL":
+                                    CL = (int)dcurrentStatus[i].OpeningBalance;
+                                    CLVisible = true;
+                                    break;
+                                case "SL":
+                                    SL = (int)dcurrentStatus[i].OpeningBalance;
+                                    SLVisible = true;
+                                    break;
+                                case "ML":
+                                    // ML = (int)dcurrentStatus[i].OpeningBalance;
+                                    //MLVisible = true;
+                                    break;
+                                case "PL":
+                                    //PL = (int)dcurrentStatus[i].OpeningBalance;
+                                    //PLVisible = true;
+                                    break;
+                                case "EL":
+                                    EL = (int)dcurrentStatus[i].OpeningBalance;
+                                    OpeningEL = (int)dcurrentStatus[i].OpeningBalance;
+                                    ELVisible = true;
+                                    break;
+                                case "SPL":
+                                    //SPL = (int)dcurrentStatus[i].OpeningBalance;
+                                    //SPLVisible = true;
+                                    break;
+                                case "COM":
+                                    //COM = (int)dcurrentStatus[i].OpeningBalance;
+                                    //COMVisible = true;
+                                    break;
+                                case "LWOP":
+                                    //LWOP = (int)dcurrentStatus[i].OpeningBalance;
+                                    //LWOPVisible = true;
+                                    break;
+                                default:
+                                    break;
+                            }
+                    }
+
+
+                    DataSet ds = new DataSet();
+                    DataRow dr = dEmpLeaveApplication.NewRow();
+                    DataTable dtEmpBasicInfo = new EmployeeService().GetAllEmpBasicInfo(employee.ID.ToString())
+                                               .Tables[0]
+                                               .AsEnumerable()
+                                               .CopyToDataTable();
+
+
+                    foreach (DataRow drBasic in dtEmpBasicInfo.Rows)
+                    {
+                        dr["EmpName"] = drBasic["BanglaName"];
+                        dr["Designation"] = drBasic["BanglaDesignation"];
+                        dr["CardNo"] = drBasic["EmployeeNo"];
+                        //AccessCard acc = AccessCard.Get(drBasic["CardID"] is DBNull ? ID.FromInteger(0) : ID.FromInteger(Convert.ToInt32(drBasic["CardID"].ToString())));
+                        //if (acc != null)
+                        //{
+                        //    dr["CardNo"] = acc.CardNumber;
+                        //}
+                        dr["JoiningDate"] = Convert.ToDateTime(drBasic["JoiningDate"].ToString()).ToString("dd-MM-yyyy");
+                        dr["Department"] = drBasic["DepartmentBangla"];
+                        dr["Section"] = drBasic["SectionBangla"];
+                    }
+
+                    dr["OpeningEL"] = OpeningEL.ToString();
+                    dr["RemainingEL"] = EL.ToString();
+                    dr["RemainingCL"] = CL.ToString();
+                    dr["RemainingSL"] = SL.ToString();
+                    dr["RemainingML"] = ML.ToString();
+                    dr["RemainingPL"] = PL.ToString();
+                    dr["RemainingSPL"] = SPL.ToString();
+                    dr["RemainingCOM"] = COM.ToString();
+                    dr["RemainingLWOP"] = LWOP.ToString();
+
+
+                    dr["EmployeeSignature"] = System.IO.Path.Combine(TargetFolder + string.Format("Signature-{0}.jpg", employee.EmployeeNo));
+                    if (oAuthPerson != null)
+                        dr["EmployerSignature"] = oAuthPerson.Signature;
+                    dEmpLeaveApplication.Rows.Add(dr);
+
+                    foreach (var entry in leaveEntrys)
+                    {
+                        oLeave = oLeaves.FirstOrDefault(x => x.ID == entry.LeaveID);
+                        if (oLeave != null)
+                        {
+                            dr = dEmpLeaveApplication.NewRow();
+                            string description = string.Format("{0} ‡_‡K {1}",
+                                                                entry.ApprovedFromDate.ToString("dd-MM-yyyy"),
+                                                                entry.ApprovedToDate.ToString("dd-MM-yyyy"));
+                            switch (oLeave.Code)
+                            {
+                                case "CL":
+                                    dr["DesCL"] = description;
+                                    CL -= (int)entry.ApprovedTotalDays;
+                                    break;
+                                case "SL":
+                                    dr["DesSL"] = description;
+                                    SL -= (int)entry.ApprovedTotalDays;
+                                    break;
+                                case "ML":
+                                    dr["DesML"] = description;
+                                    ML -= (int)entry.ApprovedTotalDays;
+                                    break;
+                                case "PL":
+                                    dr["DesPL"] = description;
+                                    PL -= (int)entry.ApprovedTotalDays;
+                                    break;
+                                case "EL":
+                                    dr["DesEL"] = description;
+                                    EL -= (int)entry.ApprovedTotalDays;
+                                    break;
+                                case "SPL":
+                                    dr["DesSPL"] = description;
+                                    SPL -= (int)entry.ApprovedTotalDays;
+                                    break;
+                                case "COM":
+                                    dr["DesCOM"] = description;
+                                    COM -= (int)entry.ApprovedTotalDays;
+                                    break;
+                                case "LWOP":
+                                    dr["DesLWOP"] = description;
+                                    LWOP -= (int)entry.ApprovedTotalDays;
+                                    break;
+                                default:
+                                    break;
+                            }
+                            dr["LeaveGrantedDate"] = entry.ApprovedLeaveDate.ToString("dd-MM-yyyy");
+                            dr["TotalGrantedDays"] = entry.ApprovedTotalDays.ToString("N0");
+
+                            dr["RemainingEL"] = EL.ToString();
+                            dr["RemainingCL"] = CL.ToString();
+                            dr["RemainingSL"] = SL.ToString();
+                            dr["RemainingML"] = ML.ToString();
+                            dr["RemainingPL"] = PL.ToString();
+                            dr["RemainingSPL"] = SPL.ToString();
+                            dr["RemainingCOM"] = COM.ToString();
+                            dr["RemainingLWOP"] = LWOP.ToString();
+
+
+                            dr["EmployeeSignature"] = System.IO.Path.Combine(TargetFolder + string.Format("Signature-{0}.jpg", employee.EmployeeNo));
+                            if (oAuthPerson != null)
+                                dr["EmployerSignature"] = oAuthPerson.Signature;
+                            dEmpLeaveApplication.Rows.Add(dr);
+
+                        }
+
+
+                    }
+
+                    dEmpLeaveApplication.TableName = "dsEmpLeaveLedger_LeaveRegisterBangla";
+                    ds.Tables.Add(dEmpLeaveApplication);
+                    List<ReportParameter> oParameters = new List<ReportParameter>();
+
+                    oParameters.Add(new ReportParameter("CompanyNameBangla", System.Configuration.ConfigurationManager.AppSettings["CompanyNameBangla"]));
+                    oParameters.Add(new ReportParameter("CompanyAddressBangla", System.Configuration.ConfigurationManager.AppSettings["CAddress"]));
+
+                    oParameters.Add(new ReportParameter("CLVisible", CLVisible.ToString()));
+                    oParameters.Add(new ReportParameter("MLVisible", MLVisible.ToString()));
+                    oParameters.Add(new ReportParameter("ELVisible", ELVisible.ToString()));
+                    oParameters.Add(new ReportParameter("SLVisible", SLVisible.ToString()));
+                    oParameters.Add(new ReportParameter("PLVisible", PLVisible.ToString()));
+                    oParameters.Add(new ReportParameter("SPLVisible", SPLVisible.ToString()));
+                    oParameters.Add(new ReportParameter("COMVisible", COMVisible.ToString()));
+                    oParameters.Add(new ReportParameter("LWOPVisible", LWOPVisible.ToString()));
+                    oParameters.Add(new ReportParameter("SignPath", signaturePath));
+                    oParameters.Add(new ReportParameter("EmpSignature", string.Empty));//_rImageManager.GetImage(oEmployee.Signature)));
+
+                    //ReportParameter rParam = new ReportParameter("LeaveYear", string.Format("{0} - {1}", lyy.StartDate.ToString("dd MMM yyyy"), lyy.EndDate.ToString("dd MMM yyyy")));
+                    //oParameters.Add(rParam);
+
+                    //fViewer.CommonReportView(null, ds, "Payroll.Report.RDLC.BanglaLeaveRegister.rdlc", oParameters);
+
+                    string RDLC = "BanglaLeaveRegister.rdlc";
+                    return fViewer.CommonReportViewForReports(null, ds, null, RDLC, oParameters, true, payrollTypeID, reportType);
+                }
+
+                else
+                {
+                    throw new Exception("data not found");
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new Exception(ex.Message, ex);
+            }
+            
+        }
+
+        public byte[] ShowLeaveEncashmentReport(string sEmpIDs, DateTime fromMonth, int lyyid, int payrollTypeID, DateTime nextPayProcessDate, string reportType)
+        {
+
+            ReportProcessor form = new ReportProcessor();
+
+            LeaveYear oLeaveYear = new LeaveYearService().Get(lyyid);
+            string leaveYear = fromMonth.ToString("MMMM yyyy") + " - " + fromMonth.AddYears(1).ToString("MMMM yyyy");//cboLeaveYear.Text;
+
+            //DataTable dTEmpLeave = new HRM.Report.PayrollDataSet.dsEmpLeaveLedger.LeaveBalanceDataTable();
+            DataTable dt = new EmpLeaveStatusService().CurrentYearStatusForEncashment(sEmpIDs, oLeaveYear, EnumLeaveStatus.Approved, fromMonth);
+
+
+            DataSet dSet = new DataSet();
+            dt.TableName = "PayrollDataSet_dtEncashmentReportNew";
+            dSet.Tables.Add(dt); ;
+
+            List<ReportParameter> oParameters = new List<ReportParameter>();
+            ReportParameter rParam = new ReportParameter("LeaveYear", leaveYear);
+            oParameters.Add(rParam);
+            rParam = new ReportParameter("EncashMonth", fromMonth.ToString("MMMM yyyy"));
+            oParameters.Add(rParam);
+
+            string RDLC = "EncashmentReportEcho.rdlc";
+            return form.CommonReportViewForReports(null, dSet, null, RDLC, oParameters, true, payrollTypeID, reportType);
+        }
+        #endregion
     }
 }

HRM.Report/HRM.Report.csproj

@@ -56,6 +56,7 @@
     <None Remove="RDLC\AttendanceBenefit.rdlc" />
     <None Remove="RDLC\AttnMonthlyBenefit.rdlc" />
     <None Remove="RDLC\BadliBill.rdlc" />
+    <None Remove="RDLC\BanglaLeaveRegister.rdlc" />
     <None Remove="RDLC\BanglaPayslip.rdlc" />
     <None Remove="RDLC\BanglaPSlip.rdlc" />
     <None Remove="RDLC\BanglaPSlipBonus.rdlc" />
@@ -123,6 +124,7 @@
     <None Remove="RDLC\EmpPostingDetails.rdlc" />
     <None Remove="RDLC\EmpSalaryRevisionNew.rdlc" />
     <None Remove="RDLC\EncashmentReport.rdlc" />
+    <None Remove="RDLC\EncashmentReportEcho.rdlc" />
     <None Remove="RDLC\EncashPaySlip.rdlc" />
     <None Remove="RDLC\ExtendedSalarySheet.rdlc" />
     <None Remove="RDLC\GrandFatherInfo.rdlc" />
@@ -146,6 +148,7 @@
     <None Remove="RDLC\LeaveApplication.rdlc" />
     <None Remove="RDLC\LeaveCashAdvice.rdlc" />
     <None Remove="RDLC\LeaveLedger.rdlc" />
+    <None Remove="RDLC\LeaveLedgerEcho.rdlc" />
     <None Remove="RDLC\LeaveLedgerForLateAttn.rdlc" />
     <None Remove="RDLC\LeaveLedgerNmgtDetails.rdlc" />
     <None Remove="RDLC\LeaveLedgerNmgtLeaveType.rdlc" />
@@ -157,6 +160,7 @@
     <None Remove="RDLC\LeaveProcessData.rdlc" />
     <None Remove="RDLC\LeaveRegisterNew.rdlc" />
     <None Remove="RDLC\LeaveReport.rdlc" />
+    <None Remove="RDLC\LeaveReportEcho.rdlc" />
     <None Remove="RDLC\LoanApplication.rdlc" />
     <None Remove="RDLC\LoanIssue.rdlc" />
     <None Remove="RDLC\LoanIssue_prev.rdlc" />
@@ -169,6 +173,7 @@
     <None Remove="RDLC\MLSecondPayment.rdlc" />
     <None Remove="RDLC\MoneyReceipt.rdlc" />
     <None Remove="RDLC\MonthlyPFAmount.rdlc" />
+    <None Remove="RDLC\MultipleEmpLeaveBalance.rdlc" />
     <None Remove="RDLC\MultipleLeaveEmp.rdlc" />
     <None Remove="RDLC\MultipleLeaveEmpSimple.rdlc" />
     <None Remove="RDLC\MultipleLeaveEmpSimpleNmgt.rdlc" />
@@ -363,6 +368,9 @@
 	<EmbeddedResource Include="RDLC\AttendanceBenefit.rdlc" />
 	<EmbeddedResource Include="RDLC\AttnMonthlyBenefit.rdlc" />
 	<EmbeddedResource Include="RDLC\BadliBill.rdlc" />
+	<EmbeddedResource Include="RDLC\BanglaLeaveRegister.rdlc">
+	  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	</EmbeddedResource>
 	<EmbeddedResource Include="RDLC\BanglaPayslip.rdlc" />
 	<EmbeddedResource Include="RDLC\BanglaPSlip.rdlc" />
 	<EmbeddedResource Include="RDLC\BanglaPSlipBonus.rdlc" />
@@ -379,15 +387,21 @@
 	<EmbeddedResource Include="RDLC\EmployeeDetailWithOPIEcho.rdlc" />
 	<EmbeddedResource Include="RDLC\EmployeeInfoBasicForExcel.rdlc" />
 	<EmbeddedResource Include="RDLC\EmployeeInfoBasic.rdlc" />
+	<EmbeddedResource Include="RDLC\EncashmentReportEcho.rdlc" />
+	<EmbeddedResource Include="RDLC\LeaveLedgerEcho.rdlc">
+	  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	</EmbeddedResource>
 	<EmbeddedResource Include="RDLC\LeaveLedgerNmgtDetails.rdlc" />
 	<EmbeddedResource Include="RDLC\LeaveLedgerNmgtLeaveType.rdlc">
 	  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 	</EmbeddedResource>
 	<EmbeddedResource Include="RDLC\LeaveLedgerNmgtMultiple.rdlc" />
+	<EmbeddedResource Include="RDLC\LeaveReportEcho.rdlc" />
 	<EmbeddedResource Include="RDLC\MaternityLeaveAfter.rdlc" />
 	<EmbeddedResource Include="RDLC\MonthlyPFAmount.rdlc">
 	  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	</EmbeddedResource>
+	<EmbeddedResource Include="RDLC\MultipleEmpLeaveBalance.rdlc" />
 	<EmbeddedResource Include="RDLC\MultipleLeaveEmp.rdlc" />
 	<EmbeddedResource Include="RDLC\NewCCWiseSalarySheet.rdlc" />
 	<EmbeddedResource Include="RDLC\PFExceptionNew.rdlc" />
@@ -587,7 +601,9 @@
 	<EmbeddedResource Include="RDLC\rptNewlyIssuedLoan.rdlc" />
 	<EmbeddedResource Include="RDLC\rptObjectivePercentage.rdlc" />
 	<EmbeddedResource Include="RDLC\rptPayslipForFestiveBonusMgt.rdlc" />
-	<EmbeddedResource Include="RDLC\rptProdBonusAttendance.rdlc" />
+	<EmbeddedResource Include="RDLC\rptProdBonusAttendance.rdlc">
+	  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	</EmbeddedResource>
 	<EmbeddedResource Include="RDLC\rptProdBonusDetail.rdlc" />
 	<EmbeddedResource Include="RDLC\rptRecievedData.rdlc" />
 	<EmbeddedResource Include="RDLC\rptRoleAudit.rdlc" />

HRM.Report/PayrollDataSet/PayrollDataSet.xsd

@@ -3247,6 +3247,11 @@
               <xs:element name="Name" msprop:Generator_ColumnPropNameInTable="NameColumn" msprop:Generator_ColumnPropNameInRow="Name" msprop:Generator_UserColumnName="Name" msprop:Generator_ColumnVarNameInTable="columnName" type="xs:string" minOccurs="0" />
               <xs:element name="Date" msprop:Generator_ColumnPropNameInTable="DateColumn" msprop:Generator_ColumnPropNameInRow="Date" msprop:Generator_UserColumnName="Date" msprop:Generator_ColumnVarNameInTable="columnDate" type="xs:string" minOccurs="0" />
               <xs:element name="WorkingHour" msprop:Generator_ColumnPropNameInTable="WorkingHourColumn" msprop:Generator_ColumnPropNameInRow="WorkingHour" msprop:Generator_UserColumnName="WorkingHour" msprop:Generator_ColumnVarNameInTable="columnWorkingHour" type="xs:string" minOccurs="0" />
+              <xs:element name="Designation" msprop:Generator_UserColumnName="Designation" msprop:Generator_ColumnPropNameInTable="DesignationColumn" msprop:Generator_ColumnPropNameInRow="Designation" msprop:Generator_ColumnVarNameInTable="columnDesignation" type="xs:string" minOccurs="0" />
+              <xs:element name="Department" msprop:Generator_UserColumnName="Department" msprop:Generator_ColumnPropNameInTable="DepartmentColumn" msprop:Generator_ColumnPropNameInRow="Department" msprop:Generator_ColumnVarNameInTable="columnDepartment" type="xs:string" minOccurs="0" />
+              <xs:element name="Floor" msprop:Generator_UserColumnName="Floor" msprop:Generator_ColumnPropNameInTable="FloorColumn" msprop:Generator_ColumnPropNameInRow="Floor" msprop:Generator_ColumnVarNameInTable="columnFloor" type="xs:string" minOccurs="0" />
+              <xs:element name="Line" msprop:Generator_UserColumnName="Line" msprop:Generator_ColumnPropNameInTable="LineColumn" msprop:Generator_ColumnPropNameInRow="Line" msprop:Generator_ColumnVarNameInTable="columnLine" type="xs:string" minOccurs="0" />
+              <xs:element name="Section" msprop:Generator_UserColumnName="Section" msprop:Generator_ColumnPropNameInTable="SectionColumn" msprop:Generator_ColumnPropNameInRow="Section" msprop:Generator_ColumnVarNameInTable="columnSection" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -3308,81 +3313,123 @@
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="DeletedLifeCycle" msprop:Generator_RowClassName="DeletedLifeCycleRow" msprop:Generator_RowEvHandlerName="DeletedLifeCycleRowChangeEventHandler" msprop:Generator_RowDeletedName="DeletedLifeCycleRowDeleted" msprop:Generator_RowDeletingName="DeletedLifeCycleRowDeleting" msprop:Generator_RowEvArgName="DeletedLifeCycleRowChangeEvent" msprop:Generator_TablePropName="DeletedLifeCycle" msprop:Generator_RowChangedName="DeletedLifeCycleRowChanged" msprop:Generator_UserTableName="DeletedLifeCycle" msprop:Generator_RowChangingName="DeletedLifeCycleRowChanging" msprop:Generator_TableClassName="DeletedLifeCycleDataTable" msprop:Generator_TableVarName="tableDeletedLifeCycle">
+        <xs:element name="DeletedLifeCycle" msprop:Generator_RowEvHandlerName="DeletedLifeCycleRowChangeEventHandler" msprop:Generator_RowDeletedName="DeletedLifeCycleRowDeleted" msprop:Generator_RowDeletingName="DeletedLifeCycleRowDeleting" msprop:Generator_RowEvArgName="DeletedLifeCycleRowChangeEvent" msprop:Generator_TablePropName="DeletedLifeCycle" msprop:Generator_RowChangedName="DeletedLifeCycleRowChanged" msprop:Generator_UserTableName="DeletedLifeCycle" msprop:Generator_RowChangingName="DeletedLifeCycleRowChanging" msprop:Generator_RowClassName="DeletedLifeCycleRow" msprop:Generator_TableClassName="DeletedLifeCycleDataTable" msprop:Generator_TableVarName="tableDeletedLifeCycle">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="EffectDate" msprop:Generator_UserColumnName="EffectDate" msprop:Generator_ColumnPropNameInTable="EffectDateColumn" msprop:Generator_ColumnPropNameInRow="EffectDate" msprop:Generator_ColumnVarNameInTable="columnEffectDate" type="xs:string" minOccurs="0" />
+              <xs:element name="EffectDate" msprop:Generator_ColumnPropNameInTable="EffectDateColumn" msprop:Generator_ColumnPropNameInRow="EffectDate" msprop:Generator_UserColumnName="EffectDate" msprop:Generator_ColumnVarNameInTable="columnEffectDate" type="xs:string" minOccurs="0" />
-              <xs:element name="GrossSalary" msprop:Generator_UserColumnName="GrossSalary" msprop:Generator_ColumnPropNameInTable="GrossSalaryColumn" msprop:Generator_ColumnPropNameInRow="GrossSalary" msprop:Generator_ColumnVarNameInTable="columnGrossSalary" type="xs:string" minOccurs="0" />
+              <xs:element name="GrossSalary" msprop:Generator_ColumnPropNameInTable="GrossSalaryColumn" msprop:Generator_ColumnPropNameInRow="GrossSalary" msprop:Generator_UserColumnName="GrossSalary" msprop:Generator_ColumnVarNameInTable="columnGrossSalary" type="xs:string" minOccurs="0" />
-              <xs:element name="BasicSalary" msprop:Generator_UserColumnName="BasicSalary" msprop:Generator_ColumnPropNameInTable="BasicSalaryColumn" msprop:Generator_ColumnPropNameInRow="BasicSalary" msprop:Generator_ColumnVarNameInTable="columnBasicSalary" type="xs:string" minOccurs="0" />
+              <xs:element name="BasicSalary" msprop:Generator_ColumnPropNameInTable="BasicSalaryColumn" msprop:Generator_ColumnPropNameInRow="BasicSalary" msprop:Generator_UserColumnName="BasicSalary" msprop:Generator_ColumnVarNameInTable="columnBasicSalary" type="xs:string" minOccurs="0" />
-              <xs:element name="Grade" msprop:Generator_UserColumnName="Grade" msprop:Generator_ColumnPropNameInTable="GradeColumn" msprop:Generator_ColumnPropNameInRow="Grade" msprop:Generator_ColumnVarNameInTable="columnGrade" type="xs:string" minOccurs="0" />
+              <xs:element name="Grade" msprop:Generator_ColumnPropNameInTable="GradeColumn" msprop:Generator_ColumnPropNameInRow="Grade" msprop:Generator_UserColumnName="Grade" msprop:Generator_ColumnVarNameInTable="columnGrade" type="xs:string" minOccurs="0" />
-              <xs:element name="Company" msprop:Generator_UserColumnName="Company" msprop:Generator_ColumnPropNameInTable="CompanyColumn" msprop:Generator_ColumnPropNameInRow="Company" msprop:Generator_ColumnVarNameInTable="columnCompany" type="xs:string" minOccurs="0" />
+              <xs:element name="Company" msprop:Generator_ColumnPropNameInTable="CompanyColumn" msprop:Generator_ColumnPropNameInRow="Company" msprop:Generator_UserColumnName="Company" msprop:Generator_ColumnVarNameInTable="columnCompany" type="xs:string" minOccurs="0" />
-              <xs:element name="Designation" msprop:Generator_UserColumnName="Designation" msprop:Generator_ColumnPropNameInTable="DesignationColumn" msprop:Generator_ColumnPropNameInRow="Designation" msprop:Generator_ColumnVarNameInTable="columnDesignation" type="xs:string" minOccurs="0" />
+              <xs:element name="Designation" msprop:Generator_ColumnPropNameInTable="DesignationColumn" msprop:Generator_ColumnPropNameInRow="Designation" msprop:Generator_UserColumnName="Designation" msprop:Generator_ColumnVarNameInTable="columnDesignation" type="xs:string" minOccurs="0" />
-              <xs:element name="Location" msprop:Generator_UserColumnName="Location" msprop:Generator_ColumnPropNameInTable="LocationColumn" msprop:Generator_ColumnPropNameInRow="Location" msprop:Generator_ColumnVarNameInTable="columnLocation" type="xs:string" minOccurs="0" />
+              <xs:element name="Location" msprop:Generator_ColumnPropNameInTable="LocationColumn" msprop:Generator_ColumnPropNameInRow="Location" msprop:Generator_UserColumnName="Location" msprop:Generator_ColumnVarNameInTable="columnLocation" type="xs:string" minOccurs="0" />
-              <xs:element name="Department" msprop:Generator_UserColumnName="Department" msprop:Generator_ColumnPropNameInTable="DepartmentColumn" msprop:Generator_ColumnPropNameInRow="Department" msprop:Generator_ColumnVarNameInTable="columnDepartment" type="xs:string" minOccurs="0" />
+              <xs:element name="Department" msprop:Generator_ColumnPropNameInTable="DepartmentColumn" msprop:Generator_ColumnPropNameInRow="Department" msprop:Generator_UserColumnName="Department" msprop:Generator_ColumnVarNameInTable="columnDepartment" type="xs:string" minOccurs="0" />
-              <xs:element name="Confirmed" msprop:Generator_UserColumnName="Confirmed" msprop:Generator_ColumnPropNameInTable="ConfirmedColumn" msprop:Generator_ColumnPropNameInRow="Confirmed" msprop:Generator_ColumnVarNameInTable="columnConfirmed" type="xs:string" minOccurs="0" />
+              <xs:element name="Confirmed" msprop:Generator_ColumnPropNameInTable="ConfirmedColumn" msprop:Generator_ColumnPropNameInRow="Confirmed" msprop:Generator_UserColumnName="Confirmed" msprop:Generator_ColumnVarNameInTable="columnConfirmed" type="xs:string" minOccurs="0" />
-              <xs:element name="EmployeeNo" msprop:Generator_UserColumnName="EmployeeNo" msprop:Generator_ColumnPropNameInTable="EmployeeNoColumn" msprop:Generator_ColumnPropNameInRow="EmployeeNo" msprop:Generator_ColumnVarNameInTable="columnEmployeeNo" type="xs:string" minOccurs="0" />
+              <xs:element name="EmployeeNo" msprop:Generator_ColumnPropNameInTable="EmployeeNoColumn" msprop:Generator_ColumnPropNameInRow="EmployeeNo" msprop:Generator_UserColumnName="EmployeeNo" msprop:Generator_ColumnVarNameInTable="columnEmployeeNo" type="xs:string" minOccurs="0" />
-              <xs:element name="EmployeeName" msprop:Generator_UserColumnName="EmployeeName" msprop:Generator_ColumnPropNameInTable="EmployeeNameColumn" msprop:Generator_ColumnPropNameInRow="EmployeeName" msprop:Generator_ColumnVarNameInTable="columnEmployeeName" type="xs:string" minOccurs="0" />
+              <xs:element name="EmployeeName" msprop:Generator_ColumnPropNameInTable="EmployeeNameColumn" msprop:Generator_ColumnPropNameInRow="EmployeeName" msprop:Generator_UserColumnName="EmployeeName" msprop:Generator_ColumnVarNameInTable="columnEmployeeName" type="xs:string" minOccurs="0" />
-              <xs:element name="Status" msprop:Generator_UserColumnName="Status" msprop:Generator_ColumnPropNameInTable="StatusColumn" msprop:Generator_ColumnPropNameInRow="Status" msprop:Generator_ColumnVarNameInTable="columnStatus" type="xs:string" minOccurs="0" />
+              <xs:element name="Status" msprop:Generator_ColumnPropNameInTable="StatusColumn" msprop:Generator_ColumnPropNameInRow="Status" msprop:Generator_UserColumnName="Status" msprop:Generator_ColumnVarNameInTable="columnStatus" type="xs:string" minOccurs="0" />
-              <xs:element name="Remarks" msprop:Generator_UserColumnName="Remarks" msprop:Generator_ColumnPropNameInTable="RemarksColumn" msprop:Generator_ColumnPropNameInRow="Remarks" msprop:Generator_ColumnVarNameInTable="columnRemarks" type="xs:string" minOccurs="0" />
+              <xs:element name="Remarks" msprop:Generator_ColumnPropNameInTable="RemarksColumn" msprop:Generator_ColumnPropNameInRow="Remarks" msprop:Generator_UserColumnName="Remarks" msprop:Generator_ColumnVarNameInTable="columnRemarks" type="xs:string" minOccurs="0" />
-              <xs:element name="Description" msprop:Generator_UserColumnName="Description" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnVarNameInTable="columnDescription" type="xs:string" minOccurs="0" />
+              <xs:element name="Description" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_UserColumnName="Description" msprop:Generator_ColumnVarNameInTable="columnDescription" type="xs:string" minOccurs="0" />
-              <xs:element name="SalaryMonth" msprop:Generator_UserColumnName="SalaryMonth" msprop:Generator_ColumnPropNameInTable="SalaryMonthColumn" msprop:Generator_ColumnPropNameInRow="SalaryMonth" msprop:Generator_ColumnVarNameInTable="columnSalaryMonth" type="xs:string" minOccurs="0" />
+              <xs:element name="SalaryMonth" msprop:Generator_ColumnPropNameInTable="SalaryMonthColumn" msprop:Generator_ColumnPropNameInRow="SalaryMonth" msprop:Generator_UserColumnName="SalaryMonth" msprop:Generator_ColumnVarNameInTable="columnSalaryMonth" type="xs:string" minOccurs="0" />
-              <xs:element name="GradeSalaryAssesment" msprop:Generator_UserColumnName="GradeSalaryAssesment" msprop:Generator_ColumnPropNameInTable="GradeSalaryAssesmentColumn" msprop:Generator_ColumnPropNameInRow="GradeSalaryAssesment" msprop:Generator_ColumnVarNameInTable="columnGradeSalaryAssesment" type="xs:string" minOccurs="0" />
+              <xs:element name="GradeSalaryAssesment" msprop:Generator_ColumnPropNameInTable="GradeSalaryAssesmentColumn" msprop:Generator_ColumnPropNameInRow="GradeSalaryAssesment" msprop:Generator_UserColumnName="GradeSalaryAssesment" msprop:Generator_ColumnVarNameInTable="columnGradeSalaryAssesment" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EmployeeDetailEcho" msprop:Generator_RowEvHandlerName="EmployeeDetailEchoRowChangeEventHandler" msprop:Generator_RowDeletedName="EmployeeDetailEchoRowDeleted" msprop:Generator_RowDeletingName="EmployeeDetailEchoRowDeleting" msprop:Generator_RowEvArgName="EmployeeDetailEchoRowChangeEvent" msprop:Generator_TablePropName="EmployeeDetailEcho" msprop:Generator_RowChangedName="EmployeeDetailEchoRowChanged" msprop:Generator_RowChangingName="EmployeeDetailEchoRowChanging" msprop:Generator_TableClassName="EmployeeDetailEchoDataTable" msprop:Generator_RowClassName="EmployeeDetailEchoRow" msprop:Generator_TableVarName="tableEmployeeDetailEcho" msprop:Generator_UserTableName="EmployeeDetailEcho">
+        <xs:element name="EmployeeDetailEcho" msprop:Generator_RowEvHandlerName="EmployeeDetailEchoRowChangeEventHandler" msprop:Generator_RowDeletedName="EmployeeDetailEchoRowDeleted" msprop:Generator_RowDeletingName="EmployeeDetailEchoRowDeleting" msprop:Generator_RowEvArgName="EmployeeDetailEchoRowChangeEvent" msprop:Generator_TablePropName="EmployeeDetailEcho" msprop:Generator_RowChangedName="EmployeeDetailEchoRowChanged" msprop:Generator_UserTableName="EmployeeDetailEcho" msprop:Generator_RowChangingName="EmployeeDetailEchoRowChanging" msprop:Generator_RowClassName="EmployeeDetailEchoRow" msprop:Generator_TableClassName="EmployeeDetailEchoDataTable" msprop:Generator_TableVarName="tableEmployeeDetailEcho">
           <xs:complexType>
             <xs:sequence>
+              <xs:element name="EmpNo" msprop:Generator_ColumnPropNameInTable="EmpNoColumn" msprop:Generator_ColumnPropNameInRow="EmpNo" msprop:Generator_UserColumnName="EmpNo" msprop:Generator_ColumnVarNameInTable="columnEmpNo" type="xs:string" minOccurs="0" />
+              <xs:element name="Name" msprop:Generator_ColumnPropNameInTable="NameColumn" msprop:Generator_ColumnPropNameInRow="Name" msprop:Generator_UserColumnName="Name" msprop:Generator_ColumnVarNameInTable="columnName" type="xs:string" minOccurs="0" />
+              <xs:element name="Designation" msprop:Generator_ColumnPropNameInTable="DesignationColumn" msprop:Generator_ColumnPropNameInRow="Designation" msprop:Generator_UserColumnName="Designation" msprop:Generator_ColumnVarNameInTable="columnDesignation" type="xs:string" minOccurs="0" />
+              <xs:element name="Department" msprop:Generator_ColumnPropNameInTable="DepartmentColumn" msprop:Generator_ColumnPropNameInRow="Department" msprop:Generator_UserColumnName="Department" msprop:Generator_ColumnVarNameInTable="columnDepartment" type="xs:string" minOccurs="0" />
+              <xs:element name="Grade" msprop:Generator_ColumnPropNameInTable="GradeColumn" msprop:Generator_ColumnPropNameInRow="Grade" msprop:Generator_UserColumnName="Grade" msprop:Generator_ColumnVarNameInTable="columnGrade" type="xs:string" minOccurs="0" />
+              <xs:element name="BasicSalary" msprop:Generator_ColumnPropNameInTable="BasicSalaryColumn" msprop:Generator_ColumnPropNameInRow="BasicSalary" msprop:Generator_UserColumnName="BasicSalary" msprop:Generator_ColumnVarNameInTable="columnBasicSalary" type="xs:double" minOccurs="0" />
+              <xs:element name="DOB" msprop:Generator_ColumnPropNameInTable="DOBColumn" msprop:Generator_ColumnPropNameInRow="DOB" msprop:Generator_UserColumnName="DOB" msprop:Generator_ColumnVarNameInTable="columnDOB" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="Gender" msprop:Generator_ColumnPropNameInTable="GenderColumn" msprop:Generator_ColumnPropNameInRow="Gender" msprop:Generator_UserColumnName="Gender" msprop:Generator_ColumnVarNameInTable="columnGender" type="xs:string" minOccurs="0" />
+              <xs:element name="Religion" msprop:Generator_ColumnPropNameInTable="ReligionColumn" msprop:Generator_ColumnPropNameInRow="Religion" msprop:Generator_UserColumnName="Religion" msprop:Generator_ColumnVarNameInTable="columnReligion" type="xs:string" minOccurs="0" />
+              <xs:element name="Bank" msprop:Generator_ColumnPropNameInTable="BankColumn" msprop:Generator_ColumnPropNameInRow="Bank" msprop:Generator_UserColumnName="Bank" msprop:Generator_ColumnVarNameInTable="columnBank" type="xs:string" minOccurs="0" />
+              <xs:element name="Branch" msprop:Generator_ColumnPropNameInTable="BranchColumn" msprop:Generator_ColumnPropNameInRow="Branch" msprop:Generator_UserColumnName="Branch" msprop:Generator_ColumnVarNameInTable="columnBranch" type="xs:string" minOccurs="0" />
+              <xs:element name="AccountNo" msprop:Generator_ColumnPropNameInTable="AccountNoColumn" msprop:Generator_ColumnPropNameInRow="AccountNo" msprop:Generator_UserColumnName="AccountNo" msprop:Generator_ColumnVarNameInTable="columnAccountNo" type="xs:string" minOccurs="0" />
+              <xs:element name="DOJ" msprop:Generator_ColumnPropNameInTable="DOJColumn" msprop:Generator_ColumnPropNameInRow="DOJ" msprop:Generator_UserColumnName="DOJ" msprop:Generator_ColumnVarNameInTable="columnDOJ" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ConfirmDate" msprop:Generator_ColumnPropNameInTable="ConfirmDateColumn" msprop:Generator_ColumnPropNameInRow="ConfirmDate" msprop:Generator_UserColumnName="ConfirmDate" msprop:Generator_ColumnVarNameInTable="columnConfirmDate" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="TaxAmount" msprop:Generator_ColumnPropNameInTable="TaxAmountColumn" msprop:Generator_ColumnPropNameInRow="TaxAmount" msprop:Generator_UserColumnName="TaxAmount" msprop:Generator_ColumnVarNameInTable="columnTaxAmount" type="xs:string" minOccurs="0" />
+              <xs:element name="MarStatus" msprop:Generator_ColumnPropNameInTable="MarStatusColumn" msprop:Generator_ColumnPropNameInRow="MarStatus" msprop:Generator_UserColumnName="MarStatus" msprop:Generator_ColumnVarNameInTable="columnMarStatus" type="xs:string" minOccurs="0" />
+              <xs:element name="MobileNo" msprop:Generator_ColumnPropNameInTable="MobileNoColumn" msprop:Generator_ColumnPropNameInRow="MobileNo" msprop:Generator_UserColumnName="MobileNo" msprop:Generator_ColumnVarNameInTable="columnMobileNo" type="xs:string" minOccurs="0" />
+              <xs:element name="MailAdd" msprop:Generator_ColumnPropNameInTable="MailAddColumn" msprop:Generator_ColumnPropNameInRow="MailAdd" msprop:Generator_UserColumnName="MailAdd" msprop:Generator_ColumnVarNameInTable="columnMailAdd" type="xs:string" minOccurs="0" />
+              <xs:element name="LocDes" msprop:Generator_ColumnPropNameInTable="LocDesColumn" msprop:Generator_ColumnPropNameInRow="LocDes" msprop:Generator_UserColumnName="LocDes" msprop:Generator_ColumnVarNameInTable="columnLocDes" type="xs:string" minOccurs="0" />
+              <xs:element name="GrossSalary" msprop:Generator_ColumnPropNameInTable="GrossSalaryColumn" msprop:Generator_ColumnPropNameInRow="GrossSalary" msprop:Generator_UserColumnName="GrossSalary" msprop:Generator_ColumnVarNameInTable="columnGrossSalary" type="xs:double" minOccurs="0" />
+              <xs:element name="VendorCode" msprop:Generator_ColumnPropNameInTable="VendorCodeColumn" msprop:Generator_ColumnPropNameInRow="VendorCode" msprop:Generator_UserColumnName="VendorCode" msprop:Generator_ColumnVarNameInTable="columnVendorCode" type="xs:string" minOccurs="0" />
+              <xs:element name="BankOPI" msprop:Generator_ColumnPropNameInTable="BankOPIColumn" msprop:Generator_ColumnPropNameInRow="BankOPI" msprop:Generator_UserColumnName="BankOPI" msprop:Generator_ColumnVarNameInTable="columnBankOPI" type="xs:string" minOccurs="0" />
+              <xs:element name="BranchOPI" msprop:Generator_ColumnPropNameInTable="BranchOPIColumn" msprop:Generator_ColumnPropNameInRow="BranchOPI" msprop:Generator_UserColumnName="BranchOPI" msprop:Generator_ColumnVarNameInTable="columnBranchOPI" type="xs:string" minOccurs="0" />
+              <xs:element name="AccountNoOPI" msprop:Generator_ColumnPropNameInTable="AccountNoOPIColumn" msprop:Generator_ColumnPropNameInRow="AccountNoOPI" msprop:Generator_UserColumnName="AccountNoOPI" msprop:Generator_ColumnVarNameInTable="columnAccountNoOPI" type="xs:string" minOccurs="0" />
+              <xs:element name="Floor" msprop:Generator_ColumnPropNameInTable="FloorColumn" msprop:Generator_ColumnPropNameInRow="Floor" msprop:Generator_UserColumnName="Floor" msprop:Generator_ColumnVarNameInTable="columnFloor" type="xs:string" minOccurs="0" />
+              <xs:element name="Section" msprop:Generator_ColumnPropNameInTable="SectionColumn" msprop:Generator_ColumnPropNameInRow="Section" msprop:Generator_UserColumnName="Section" msprop:Generator_ColumnVarNameInTable="columnSection" type="xs:string" minOccurs="0" />
+              <xs:element name="Line" msprop:Generator_ColumnPropNameInTable="LineColumn" msprop:Generator_ColumnPropNameInRow="Line" msprop:Generator_UserColumnName="Line" msprop:Generator_ColumnVarNameInTable="columnLine" type="xs:string" minOccurs="0" />
+              <xs:element name="RFID" msprop:Generator_ColumnPropNameInTable="RFIDColumn" msprop:Generator_ColumnPropNameInRow="RFID" msprop:Generator_UserColumnName="RFID" msprop:Generator_ColumnVarNameInTable="columnRFID" type="xs:string" minOccurs="0" />
+              <xs:element name="BloodGroup" msprop:Generator_ColumnPropNameInTable="BloodGroupColumn" msprop:Generator_ColumnPropNameInRow="BloodGroup" msprop:Generator_UserColumnName="BloodGroup" msprop:Generator_ColumnVarNameInTable="columnBloodGroup" type="xs:string" minOccurs="0" />
+              <xs:element name="Qualification" msprop:Generator_ColumnPropNameInTable="QualificationColumn" msprop:Generator_ColumnPropNameInRow="Qualification" msprop:Generator_UserColumnName="Qualification" msprop:Generator_ColumnVarNameInTable="columnQualification" type="xs:string" minOccurs="0" />
+              <xs:element name="VotterID" msprop:Generator_ColumnPropNameInTable="VotterIDColumn" msprop:Generator_ColumnPropNameInRow="VotterID" msprop:Generator_UserColumnName="VotterID" msprop:Generator_ColumnVarNameInTable="columnVotterID" type="xs:string" minOccurs="0" />
+              <xs:element name="Nationality" msprop:Generator_ColumnPropNameInTable="NationalityColumn" msprop:Generator_ColumnPropNameInRow="Nationality" msprop:Generator_UserColumnName="Nationality" msprop:Generator_ColumnVarNameInTable="columnNationality" type="xs:string" minOccurs="0" />
+              <xs:element name="FathersName" msprop:Generator_ColumnPropNameInTable="FathersNameColumn" msprop:Generator_ColumnPropNameInRow="FathersName" msprop:Generator_UserColumnName="FathersName" msprop:Generator_ColumnVarNameInTable="columnFathersName" type="xs:string" minOccurs="0" />
+              <xs:element name="MothersName" msprop:Generator_ColumnPropNameInTable="MothersNameColumn" msprop:Generator_ColumnPropNameInRow="MothersName" msprop:Generator_UserColumnName="MothersName" msprop:Generator_ColumnVarNameInTable="columnMothersName" type="xs:string" minOccurs="0" />
+              <xs:element name="Spouse" msprop:Generator_ColumnPropNameInTable="SpouseColumn" msprop:Generator_ColumnPropNameInRow="Spouse" msprop:Generator_UserColumnName="Spouse" msprop:Generator_ColumnVarNameInTable="columnSpouse" type="xs:string" minOccurs="0" />
+              <xs:element name="TempVill" msprop:Generator_ColumnPropNameInTable="TempVillColumn" msprop:Generator_ColumnPropNameInRow="TempVill" msprop:Generator_UserColumnName="TempVill" msprop:Generator_ColumnVarNameInTable="columnTempVill" type="xs:string" minOccurs="0" />
+              <xs:element name="TempPost" msprop:Generator_ColumnPropNameInTable="TempPostColumn" msprop:Generator_ColumnPropNameInRow="TempPost" msprop:Generator_UserColumnName="TempPost" msprop:Generator_ColumnVarNameInTable="columnTempPost" type="xs:string" minOccurs="0" />
+              <xs:element name="TempPS" msprop:Generator_ColumnPropNameInTable="TempPSColumn" msprop:Generator_ColumnPropNameInRow="TempPS" msprop:Generator_UserColumnName="TempPS" msprop:Generator_ColumnVarNameInTable="columnTempPS" type="xs:string" minOccurs="0" />
+              <xs:element name="TempDist" msprop:Generator_ColumnPropNameInTable="TempDistColumn" msprop:Generator_ColumnPropNameInRow="TempDist" msprop:Generator_UserColumnName="TempDist" msprop:Generator_ColumnVarNameInTable="columnTempDist" type="xs:string" minOccurs="0" />
+              <xs:element name="PerVill" msprop:Generator_ColumnPropNameInTable="PerVillColumn" msprop:Generator_ColumnPropNameInRow="PerVill" msprop:Generator_UserColumnName="PerVill" msprop:Generator_ColumnVarNameInTable="columnPerVill" type="xs:string" minOccurs="0" />
+              <xs:element name="PerPost" msprop:Generator_ColumnPropNameInTable="PerPostColumn" msprop:Generator_ColumnPropNameInRow="PerPost" msprop:Generator_UserColumnName="PerPost" msprop:Generator_ColumnVarNameInTable="columnPerPost" type="xs:string" minOccurs="0" />
+              <xs:element name="PerPS" msprop:Generator_ColumnPropNameInTable="PerPSColumn" msprop:Generator_ColumnPropNameInRow="PerPS" msprop:Generator_UserColumnName="PerPS" msprop:Generator_ColumnVarNameInTable="columnPerPS" type="xs:string" minOccurs="0" />
+              <xs:element name="PerDist" msprop:Generator_ColumnPropNameInTable="PerDistColumn" msprop:Generator_ColumnPropNameInRow="PerDist" msprop:Generator_UserColumnName="PerDist" msprop:Generator_ColumnVarNameInTable="columnPerDist" type="xs:string" minOccurs="0" />
+              <xs:element name="Category" msprop:Generator_ColumnPropNameInTable="CategoryColumn" msprop:Generator_ColumnPropNameInRow="Category" msprop:Generator_UserColumnName="Category" msprop:Generator_ColumnVarNameInTable="columnCategory" type="xs:string" minOccurs="0" />
+              <xs:element name="BanglaName" msprop:Generator_ColumnPropNameInTable="BanglaNameColumn" msprop:Generator_ColumnPropNameInRow="BanglaName" msprop:Generator_UserColumnName="BanglaName" msprop:Generator_ColumnVarNameInTable="columnBanglaName" type="xs:string" minOccurs="0" />
+              <xs:element name="BanglaDesignation" msprop:Generator_ColumnPropNameInTable="BanglaDesignationColumn" msprop:Generator_ColumnPropNameInRow="BanglaDesignation" msprop:Generator_UserColumnName="BanglaDesignation" msprop:Generator_ColumnVarNameInTable="columnBanglaDesignation" type="xs:string" minOccurs="0" />
+              <xs:element name="DepartmentBangla" msprop:Generator_ColumnPropNameInTable="DepartmentBanglaColumn" msprop:Generator_ColumnPropNameInRow="DepartmentBangla" msprop:Generator_UserColumnName="DepartmentBangla" msprop:Generator_ColumnVarNameInTable="columnDepartmentBangla" type="xs:string" minOccurs="0" />
+              <xs:element name="SectionBangla" msprop:Generator_ColumnPropNameInTable="SectionBanglaColumn" msprop:Generator_ColumnPropNameInRow="SectionBangla" msprop:Generator_UserColumnName="SectionBangla" msprop:Generator_ColumnVarNameInTable="columnSectionBangla" type="xs:string" minOccurs="0" />
+              <xs:element name="LANDPHONE" msprop:Generator_ColumnPropNameInTable="LANDPHONEColumn" msprop:Generator_ColumnPropNameInRow="LANDPHONE" msprop:Generator_UserColumnName="LANDPHONE" msprop:Generator_ColumnVarNameInTable="columnLANDPHONE" type="xs:string" minOccurs="0" />
+              <xs:element name="OFFICEMOBILE" msprop:Generator_ColumnPropNameInTable="OFFICEMOBILEColumn" msprop:Generator_ColumnPropNameInRow="OFFICEMOBILE" msprop:Generator_UserColumnName="OFFICEMOBILE" msprop:Generator_ColumnVarNameInTable="columnOFFICEMOBILE" type="xs:string" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="dtEncashmentReportNew" msprop:Generator_RowEvHandlerName="dtEncashmentReportNewRowChangeEventHandler" msprop:Generator_RowDeletedName="dtEncashmentReportNewRowDeleted" msprop:Generator_RowDeletingName="dtEncashmentReportNewRowDeleting" msprop:Generator_RowEvArgName="dtEncashmentReportNewRowChangeEvent" msprop:Generator_TablePropName="dtEncashmentReportNew" msprop:Generator_RowChangedName="dtEncashmentReportNewRowChanged" msprop:Generator_RowChangingName="dtEncashmentReportNewRowChanging" msprop:Generator_TableClassName="dtEncashmentReportNewDataTable" msprop:Generator_RowClassName="dtEncashmentReportNewRow" msprop:Generator_TableVarName="tabledtEncashmentReportNew" msprop:Generator_UserTableName="dtEncashmentReportNew">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="EmpName" msdata:Caption="EmpID" msprop:Generator_ColumnPropNameInRow="EmpName" msprop:Generator_ColumnPropNameInTable="EmpNameColumn" msprop:Generator_ColumnVarNameInTable="columnEmpName" msprop:Generator_UserColumnName="EmpName" type="xs:string" minOccurs="0" />
+              <xs:element name="JoiningDate" msprop:Generator_ColumnPropNameInRow="JoiningDate" msprop:Generator_ColumnPropNameInTable="JoiningDateColumn" msprop:Generator_ColumnVarNameInTable="columnJoiningDate" msprop:Generator_UserColumnName="JoiningDate" type="xs:string" minOccurs="0" />
               <xs:element name="EmpNo" msprop:Generator_ColumnPropNameInRow="EmpNo" msprop:Generator_ColumnPropNameInTable="EmpNoColumn" msprop:Generator_ColumnVarNameInTable="columnEmpNo" msprop:Generator_UserColumnName="EmpNo" type="xs:string" minOccurs="0" />
-              <xs:element name="Name" msprop:Generator_ColumnPropNameInRow="Name" msprop:Generator_ColumnPropNameInTable="NameColumn" msprop:Generator_ColumnVarNameInTable="columnName" msprop:Generator_UserColumnName="Name" type="xs:string" minOccurs="0" />
               <xs:element name="Designation" msprop:Generator_ColumnPropNameInRow="Designation" msprop:Generator_ColumnPropNameInTable="DesignationColumn" msprop:Generator_ColumnVarNameInTable="columnDesignation" msprop:Generator_UserColumnName="Designation" type="xs:string" minOccurs="0" />
-              <xs:element name="Department" msprop:Generator_ColumnPropNameInRow="Department" msprop:Generator_ColumnPropNameInTable="DepartmentColumn" msprop:Generator_ColumnVarNameInTable="columnDepartment" msprop:Generator_UserColumnName="Department" type="xs:string" minOccurs="0" />
-              <xs:element name="Grade" msprop:Generator_ColumnPropNameInRow="Grade" msprop:Generator_ColumnPropNameInTable="GradeColumn" msprop:Generator_ColumnVarNameInTable="columnGrade" msprop:Generator_UserColumnName="Grade" type="xs:string" minOccurs="0" />
-              <xs:element name="BasicSalary" msprop:Generator_ColumnPropNameInRow="BasicSalary" msprop:Generator_ColumnPropNameInTable="BasicSalaryColumn" msprop:Generator_ColumnVarNameInTable="columnBasicSalary" msprop:Generator_UserColumnName="BasicSalary" type="xs:double" minOccurs="0" />
-              <xs:element name="DOB" msprop:Generator_ColumnPropNameInRow="DOB" msprop:Generator_ColumnPropNameInTable="DOBColumn" msprop:Generator_ColumnVarNameInTable="columnDOB" msprop:Generator_UserColumnName="DOB" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="Gender" msprop:Generator_ColumnPropNameInRow="Gender" msprop:Generator_ColumnPropNameInTable="GenderColumn" msprop:Generator_ColumnVarNameInTable="columnGender" msprop:Generator_UserColumnName="Gender" type="xs:string" minOccurs="0" />
-              <xs:element name="Religion" msprop:Generator_ColumnPropNameInRow="Religion" msprop:Generator_ColumnPropNameInTable="ReligionColumn" msprop:Generator_ColumnVarNameInTable="columnReligion" msprop:Generator_UserColumnName="Religion" type="xs:string" minOccurs="0" />
-              <xs:element name="Bank" msprop:Generator_ColumnPropNameInRow="Bank" msprop:Generator_ColumnPropNameInTable="BankColumn" msprop:Generator_ColumnVarNameInTable="columnBank" msprop:Generator_UserColumnName="Bank" type="xs:string" minOccurs="0" />
-              <xs:element name="Branch" msprop:Generator_ColumnPropNameInRow="Branch" msprop:Generator_ColumnPropNameInTable="BranchColumn" msprop:Generator_ColumnVarNameInTable="columnBranch" msprop:Generator_UserColumnName="Branch" type="xs:string" minOccurs="0" />
               <xs:element name="AccountNo" msprop:Generator_ColumnPropNameInRow="AccountNo" msprop:Generator_ColumnPropNameInTable="AccountNoColumn" msprop:Generator_ColumnVarNameInTable="columnAccountNo" msprop:Generator_UserColumnName="AccountNo" type="xs:string" minOccurs="0" />
-              <xs:element name="DOJ" msprop:Generator_ColumnPropNameInRow="DOJ" msprop:Generator_ColumnPropNameInTable="DOJColumn" msprop:Generator_ColumnVarNameInTable="columnDOJ" msprop:Generator_UserColumnName="DOJ" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="TINNo" msprop:Generator_ColumnPropNameInRow="TINNo" msprop:Generator_ColumnPropNameInTable="TINNoColumn" msprop:Generator_ColumnVarNameInTable="columnTINNo" msprop:Generator_UserColumnName="TINNo" type="xs:string" minOccurs="0" />
-              <xs:element name="ConfirmDate" msprop:Generator_ColumnPropNameInRow="ConfirmDate" msprop:Generator_ColumnPropNameInTable="ConfirmDateColumn" msprop:Generator_ColumnVarNameInTable="columnConfirmDate" msprop:Generator_UserColumnName="ConfirmDate" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="Department" msprop:Generator_ColumnPropNameInRow="Department" msprop:Generator_ColumnPropNameInTable="DepartmentColumn" msprop:Generator_ColumnVarNameInTable="columnDepartment" msprop:Generator_UserColumnName="Department" type="xs:string" minOccurs="0" />
-              <xs:element name="TaxAmount" msprop:Generator_ColumnPropNameInRow="TaxAmount" msprop:Generator_ColumnPropNameInTable="TaxAmountColumn" msprop:Generator_ColumnVarNameInTable="columnTaxAmount" msprop:Generator_UserColumnName="TaxAmount" type="xs:string" minOccurs="0" />
-              <xs:element name="MarStatus" msprop:Generator_ColumnPropNameInRow="MarStatus" msprop:Generator_ColumnPropNameInTable="MarStatusColumn" msprop:Generator_ColumnVarNameInTable="columnMarStatus" msprop:Generator_UserColumnName="MarStatus" type="xs:string" minOccurs="0" />
-              <xs:element name="MobileNo" msprop:Generator_ColumnPropNameInRow="MobileNo" msprop:Generator_ColumnPropNameInTable="MobileNoColumn" msprop:Generator_ColumnVarNameInTable="columnMobileNo" msprop:Generator_UserColumnName="MobileNo" type="xs:string" minOccurs="0" />
-              <xs:element name="MailAdd" msprop:Generator_ColumnPropNameInRow="MailAdd" msprop:Generator_ColumnPropNameInTable="MailAddColumn" msprop:Generator_ColumnVarNameInTable="columnMailAdd" msprop:Generator_UserColumnName="MailAdd" type="xs:string" minOccurs="0" />
-              <xs:element name="LocDes" msprop:Generator_ColumnPropNameInRow="LocDes" msprop:Generator_ColumnPropNameInTable="LocDesColumn" msprop:Generator_ColumnVarNameInTable="columnLocDes" msprop:Generator_UserColumnName="LocDes" type="xs:string" minOccurs="0" />
-              <xs:element name="GrossSalary" msprop:Generator_ColumnPropNameInRow="GrossSalary" msprop:Generator_ColumnPropNameInTable="GrossSalaryColumn" msprop:Generator_ColumnVarNameInTable="columnGrossSalary" msprop:Generator_UserColumnName="GrossSalary" type="xs:double" minOccurs="0" />
-              <xs:element name="VendorCode" msprop:Generator_ColumnPropNameInRow="VendorCode" msprop:Generator_ColumnPropNameInTable="VendorCodeColumn" msprop:Generator_ColumnVarNameInTable="columnVendorCode" msprop:Generator_UserColumnName="VendorCode" type="xs:string" minOccurs="0" />
-              <xs:element name="BankOPI" msprop:Generator_ColumnPropNameInRow="BankOPI" msprop:Generator_ColumnPropNameInTable="BankOPIColumn" msprop:Generator_ColumnVarNameInTable="columnBankOPI" msprop:Generator_UserColumnName="BankOPI" type="xs:string" minOccurs="0" />
-              <xs:element name="BranchOPI" msprop:Generator_ColumnPropNameInRow="BranchOPI" msprop:Generator_ColumnPropNameInTable="BranchOPIColumn" msprop:Generator_ColumnVarNameInTable="columnBranchOPI" msprop:Generator_UserColumnName="BranchOPI" type="xs:string" minOccurs="0" />
-              <xs:element name="AccountNoOPI" msprop:Generator_ColumnPropNameInRow="AccountNoOPI" msprop:Generator_ColumnPropNameInTable="AccountNoOPIColumn" msprop:Generator_ColumnVarNameInTable="columnAccountNoOPI" msprop:Generator_UserColumnName="AccountNoOPI" type="xs:string" minOccurs="0" />
               <xs:element name="Floor" msprop:Generator_ColumnPropNameInRow="Floor" msprop:Generator_ColumnPropNameInTable="FloorColumn" msprop:Generator_ColumnVarNameInTable="columnFloor" msprop:Generator_UserColumnName="Floor" type="xs:string" minOccurs="0" />
               <xs:element name="Section" msprop:Generator_ColumnPropNameInRow="Section" msprop:Generator_ColumnPropNameInTable="SectionColumn" msprop:Generator_ColumnVarNameInTable="columnSection" msprop:Generator_UserColumnName="Section" type="xs:string" minOccurs="0" />
               <xs:element name="Line" msprop:Generator_ColumnPropNameInRow="Line" msprop:Generator_ColumnPropNameInTable="LineColumn" msprop:Generator_ColumnVarNameInTable="columnLine" msprop:Generator_UserColumnName="Line" type="xs:string" minOccurs="0" />
-              <xs:element name="RFID" msprop:Generator_ColumnPropNameInRow="RFID" msprop:Generator_ColumnPropNameInTable="RFIDColumn" msprop:Generator_ColumnVarNameInTable="columnRFID" msprop:Generator_UserColumnName="RFID" type="xs:string" minOccurs="0" />
+              <xs:element name="CC" msprop:Generator_ColumnPropNameInRow="CC" msprop:Generator_ColumnPropNameInTable="CCColumn" msprop:Generator_ColumnVarNameInTable="columnCC" msprop:Generator_UserColumnName="CC" type="xs:string" minOccurs="0" />
-              <xs:element name="BloodGroup" msprop:Generator_ColumnPropNameInRow="BloodGroup" msprop:Generator_ColumnPropNameInTable="BloodGroupColumn" msprop:Generator_ColumnVarNameInTable="columnBloodGroup" msprop:Generator_UserColumnName="BloodGroup" type="xs:string" minOccurs="0" />
+              <xs:element name="CCCode" msprop:Generator_ColumnPropNameInRow="CCCode" msprop:Generator_ColumnPropNameInTable="CCCodeColumn" msprop:Generator_ColumnVarNameInTable="columnCCCode" msprop:Generator_UserColumnName="CCCode" type="xs:string" minOccurs="0" />
-              <xs:element name="Qualification" msprop:Generator_ColumnPropNameInRow="Qualification" msprop:Generator_ColumnPropNameInTable="QualificationColumn" msprop:Generator_ColumnVarNameInTable="columnQualification" msprop:Generator_UserColumnName="Qualification" type="xs:string" minOccurs="0" />
+              <xs:element name="Grade" msprop:Generator_ColumnPropNameInRow="Grade" msprop:Generator_ColumnPropNameInTable="GradeColumn" msprop:Generator_ColumnVarNameInTable="columnGrade" msprop:Generator_UserColumnName="Grade" type="xs:string" minOccurs="0" />
-              <xs:element name="VotterID" msprop:Generator_ColumnPropNameInRow="VotterID" msprop:Generator_ColumnPropNameInTable="VotterIDColumn" msprop:Generator_ColumnVarNameInTable="columnVotterID" msprop:Generator_UserColumnName="VotterID" type="xs:string" minOccurs="0" />
+              <xs:element name="Gross" msprop:Generator_ColumnPropNameInRow="Gross" msprop:Generator_ColumnPropNameInTable="GrossColumn" msprop:Generator_ColumnVarNameInTable="columnGross" msprop:Generator_UserColumnName="Gross" type="xs:string" minOccurs="0" />
-              <xs:element name="Nationality" msprop:Generator_ColumnPropNameInRow="Nationality" msprop:Generator_ColumnPropNameInTable="NationalityColumn" msprop:Generator_ColumnVarNameInTable="columnNationality" msprop:Generator_UserColumnName="Nationality" type="xs:string" minOccurs="0" />
+              <xs:element name="Present" msprop:Generator_ColumnPropNameInRow="Present" msprop:Generator_ColumnPropNameInTable="PresentColumn" msprop:Generator_ColumnVarNameInTable="columnPresent" msprop:Generator_UserColumnName="Present" type="xs:string" minOccurs="0" />
-              <xs:element name="FathersName" msprop:Generator_ColumnPropNameInRow="FathersName" msprop:Generator_ColumnPropNameInTable="FathersNameColumn" msprop:Generator_ColumnVarNameInTable="columnFathersName" msprop:Generator_UserColumnName="FathersName" type="xs:string" minOccurs="0" />
+              <xs:element name="Holiday" msprop:Generator_ColumnPropNameInRow="Holiday" msprop:Generator_ColumnPropNameInTable="HolidayColumn" msprop:Generator_ColumnVarNameInTable="columnHoliday" msprop:Generator_UserColumnName="Holiday" type="xs:string" minOccurs="0" />
-              <xs:element name="MothersName" msprop:Generator_ColumnPropNameInRow="MothersName" msprop:Generator_ColumnPropNameInTable="MothersNameColumn" msprop:Generator_ColumnVarNameInTable="columnMothersName" msprop:Generator_UserColumnName="MothersName" type="xs:string" minOccurs="0" />
+              <xs:element name="Abcent" msprop:Generator_ColumnPropNameInRow="Abcent" msprop:Generator_ColumnPropNameInTable="AbcentColumn" msprop:Generator_ColumnVarNameInTable="columnAbcent" msprop:Generator_UserColumnName="Abcent" type="xs:string" minOccurs="0" />
-              <xs:element name="Spouse" msprop:Generator_ColumnPropNameInRow="Spouse" msprop:Generator_ColumnPropNameInTable="SpouseColumn" msprop:Generator_ColumnVarNameInTable="columnSpouse" msprop:Generator_UserColumnName="Spouse" type="xs:string" minOccurs="0" />
+              <xs:element name="CL" msprop:Generator_ColumnPropNameInRow="CL" msprop:Generator_ColumnPropNameInTable="CLColumn" msprop:Generator_ColumnVarNameInTable="columnCL" msprop:Generator_UserColumnName="CL" type="xs:string" minOccurs="0" />
-              <xs:element name="TempVill" msprop:Generator_ColumnPropNameInRow="TempVill" msprop:Generator_ColumnPropNameInTable="TempVillColumn" msprop:Generator_ColumnVarNameInTable="columnTempVill" msprop:Generator_UserColumnName="TempVill" type="xs:string" minOccurs="0" />
+              <xs:element name="SL" msprop:Generator_ColumnPropNameInRow="SL" msprop:Generator_ColumnPropNameInTable="SLColumn" msprop:Generator_ColumnVarNameInTable="columnSL" msprop:Generator_UserColumnName="SL" type="xs:string" minOccurs="0" />
-              <xs:element name="TempPost" msprop:Generator_ColumnPropNameInRow="TempPost" msprop:Generator_ColumnPropNameInTable="TempPostColumn" msprop:Generator_ColumnVarNameInTable="columnTempPost" msprop:Generator_UserColumnName="TempPost" type="xs:string" minOccurs="0" />
+              <xs:element name="SPL" msprop:Generator_ColumnPropNameInRow="SPL" msprop:Generator_ColumnPropNameInTable="SPLColumn" msprop:Generator_ColumnVarNameInTable="columnSPL" msprop:Generator_UserColumnName="SPL" type="xs:string" minOccurs="0" />
-              <xs:element name="TempPS" msprop:Generator_ColumnPropNameInRow="TempPS" msprop:Generator_ColumnPropNameInTable="TempPSColumn" msprop:Generator_ColumnVarNameInTable="columnTempPS" msprop:Generator_UserColumnName="TempPS" type="xs:string" minOccurs="0" />
+              <xs:element name="COM" msprop:Generator_ColumnPropNameInRow="COM" msprop:Generator_ColumnPropNameInTable="COMColumn" msprop:Generator_ColumnVarNameInTable="columnCOM" msprop:Generator_UserColumnName="COM" type="xs:string" minOccurs="0" />
-              <xs:element name="TempDist" msprop:Generator_ColumnPropNameInRow="TempDist" msprop:Generator_ColumnPropNameInTable="TempDistColumn" msprop:Generator_ColumnVarNameInTable="columnTempDist" msprop:Generator_UserColumnName="TempDist" type="xs:string" minOccurs="0" />
+              <xs:element name="PL" msprop:Generator_ColumnPropNameInRow="PL" msprop:Generator_ColumnPropNameInTable="PLColumn" msprop:Generator_ColumnVarNameInTable="columnPL" msprop:Generator_UserColumnName="PL" type="xs:string" minOccurs="0" />
-              <xs:element name="PerVill" msprop:Generator_ColumnPropNameInRow="PerVill" msprop:Generator_ColumnPropNameInTable="PerVillColumn" msprop:Generator_ColumnVarNameInTable="columnPerVill" msprop:Generator_UserColumnName="PerVill" type="xs:string" minOccurs="0" />
+              <xs:element name="ML" msprop:Generator_ColumnPropNameInRow="ML" msprop:Generator_ColumnPropNameInTable="MLColumn" msprop:Generator_ColumnVarNameInTable="columnML" msprop:Generator_UserColumnName="ML" type="xs:string" minOccurs="0" />
-              <xs:element name="PerPost" msprop:Generator_ColumnPropNameInRow="PerPost" msprop:Generator_ColumnPropNameInTable="PerPostColumn" msprop:Generator_ColumnVarNameInTable="columnPerPost" msprop:Generator_UserColumnName="PerPost" type="xs:string" minOccurs="0" />
+              <xs:element name="LWOP" msprop:Generator_ColumnPropNameInRow="LWOP" msprop:Generator_ColumnPropNameInTable="LWOPColumn" msprop:Generator_ColumnVarNameInTable="columnLWOP" msprop:Generator_UserColumnName="LWOP" type="xs:string" minOccurs="0" />
-              <xs:element name="PerPS" msprop:Generator_ColumnPropNameInRow="PerPS" msprop:Generator_ColumnPropNameInTable="PerPSColumn" msprop:Generator_ColumnVarNameInTable="columnPerPS" msprop:Generator_UserColumnName="PerPS" type="xs:string" minOccurs="0" />
+              <xs:element name="EL" msprop:Generator_ColumnPropNameInRow="EL" msprop:Generator_ColumnPropNameInTable="ELColumn" msprop:Generator_ColumnVarNameInTable="columnEL" msprop:Generator_UserColumnName="EL" type="xs:string" minOccurs="0" />
-              <xs:element name="PerDist" msprop:Generator_ColumnPropNameInRow="PerDist" msprop:Generator_ColumnPropNameInTable="PerDistColumn" msprop:Generator_ColumnVarNameInTable="columnPerDist" msprop:Generator_UserColumnName="PerDist" type="xs:string" minOccurs="0" />
+              <xs:element name="ELDays" msprop:Generator_ColumnPropNameInRow="ELDays" msprop:Generator_ColumnPropNameInTable="ELDaysColumn" msprop:Generator_ColumnVarNameInTable="columnELDays" msprop:Generator_UserColumnName="ELDays" type="xs:double" minOccurs="0" />
-              <xs:element name="Category" msprop:Generator_ColumnPropNameInRow="Category" msprop:Generator_ColumnPropNameInTable="CategoryColumn" msprop:Generator_ColumnVarNameInTable="columnCategory" msprop:Generator_UserColumnName="Category" type="xs:string" minOccurs="0" />
+              <xs:element name="ELPayment" msprop:Generator_ColumnPropNameInRow="ELPayment" msprop:Generator_ColumnPropNameInTable="ELPaymentColumn" msprop:Generator_ColumnVarNameInTable="columnELPayment" msprop:Generator_UserColumnName="ELPayment" type="xs:string" minOccurs="0" />
-              <xs:element name="BanglaName" msprop:Generator_ColumnPropNameInRow="BanglaName" msprop:Generator_ColumnPropNameInTable="BanglaNameColumn" msprop:Generator_ColumnVarNameInTable="columnBanglaName" msprop:Generator_UserColumnName="BanglaName" type="xs:string" minOccurs="0" />
+              <xs:element name="TDSAIT" msprop:Generator_ColumnPropNameInRow="TDSAIT" msprop:Generator_ColumnPropNameInTable="TDSAITColumn" msprop:Generator_ColumnVarNameInTable="columnTDSAIT" msprop:Generator_UserColumnName="TDSAIT" type="xs:string" minOccurs="0" />
-              <xs:element name="BanglaDesignation" msprop:Generator_ColumnPropNameInRow="BanglaDesignation" msprop:Generator_ColumnPropNameInTable="BanglaDesignationColumn" msprop:Generator_ColumnVarNameInTable="columnBanglaDesignation" msprop:Generator_UserColumnName="BanglaDesignation" type="xs:string" minOccurs="0" />
+              <xs:element name="Net" msprop:Generator_ColumnPropNameInRow="Net" msprop:Generator_ColumnPropNameInTable="NetColumn" msprop:Generator_ColumnVarNameInTable="columnNet" msprop:Generator_UserColumnName="Net" type="xs:double" minOccurs="0" />
-              <xs:element name="DepartmentBangla" msprop:Generator_ColumnPropNameInRow="DepartmentBangla" msprop:Generator_ColumnPropNameInTable="DepartmentBanglaColumn" msprop:Generator_ColumnVarNameInTable="columnDepartmentBangla" msprop:Generator_UserColumnName="DepartmentBangla" type="xs:string" minOccurs="0" />
+              <xs:element name="Remarks" msprop:Generator_ColumnPropNameInRow="Remarks" msprop:Generator_ColumnPropNameInTable="RemarksColumn" msprop:Generator_ColumnVarNameInTable="columnRemarks" msprop:Generator_UserColumnName="Remarks" type="xs:string" minOccurs="0" />
-              <xs:element name="SectionBangla" msprop:Generator_ColumnPropNameInRow="SectionBangla" msprop:Generator_ColumnPropNameInTable="SectionBanglaColumn" msprop:Generator_ColumnVarNameInTable="columnSectionBangla" msprop:Generator_UserColumnName="SectionBangla" type="xs:string" minOccurs="0" />
+              <xs:element name="Signature" msprop:Generator_ColumnPropNameInRow="Signature" msprop:Generator_ColumnPropNameInTable="SignatureColumn" msprop:Generator_ColumnVarNameInTable="columnSignature" msprop:Generator_UserColumnName="Signature" type="xs:string" minOccurs="0" />
-              <xs:element name="LANDPHONE" msprop:Generator_ColumnPropNameInRow="LANDPHONE" msprop:Generator_ColumnPropNameInTable="LANDPHONEColumn" msprop:Generator_ColumnVarNameInTable="columnLANDPHONE" msprop:Generator_UserColumnName="LANDPHONE" type="xs:string" minOccurs="0" />
+              <xs:element name="NetSum" msprop:Generator_ColumnPropNameInRow="NetSum" msprop:Generator_ColumnPropNameInTable="NetSumColumn" msprop:Generator_ColumnVarNameInTable="columnNetSum" msprop:Generator_UserColumnName="NetSum" type="xs:string" minOccurs="0" />
-              <xs:element name="OFFICEMOBILE" msprop:Generator_ColumnPropNameInRow="OFFICEMOBILE" msprop:Generator_ColumnPropNameInTable="OFFICEMOBILEColumn" msprop:Generator_ColumnVarNameInTable="columnOFFICEMOBILE" msprop:Generator_UserColumnName="OFFICEMOBILE" type="xs:string" minOccurs="0" />
+              <xs:element name="EnjoyedLeave" msprop:Generator_ColumnPropNameInRow="EnjoyedLeave" msprop:Generator_ColumnPropNameInTable="EnjoyedLeaveColumn" msprop:Generator_ColumnVarNameInTable="columnEnjoyedLeave" msprop:Generator_UserColumnName="EnjoyedLeave" type="xs:double" minOccurs="0" />
+              <xs:element name="EncashmentFromDate" msprop:Generator_ColumnPropNameInRow="EncashmentFromDate" msprop:Generator_ColumnPropNameInTable="EncashmentFromDateColumn" msprop:Generator_ColumnVarNameInTable="columnEncashmentFromDate" msprop:Generator_UserColumnName="EncashmentFromDate" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="EncashmentToDate" msprop:Generator_ColumnPropNameInRow="EncashmentToDate" msprop:Generator_ColumnPropNameInTable="EncashmentToDateColumn" msprop:Generator_ColumnVarNameInTable="columnEncashmentToDate" msprop:Generator_UserColumnName="EncashmentToDate" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="LeaveBalance" msprop:Generator_ColumnPropNameInRow="LeaveBalance" msprop:Generator_ColumnPropNameInTable="LeaveBalanceColumn" msprop:Generator_ColumnVarNameInTable="columnLeaveBalance" msprop:Generator_UserColumnName="LeaveBalance" type="xs:double" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

HRM.Report/PayrollDataSet/PayrollDataSet.xss

@@ -4,191 +4,192 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-76" ViewPortY="1153" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-76" ViewPortY="987" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:Payslip" ZOrder="86" X="917" Y="260" Height="257" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:Payslip" ZOrder="87" X="917" Y="260" Height="257" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmployeeInfo" ZOrder="4" X="-66" Y="301" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
+    <Shape ID="DesignTable:EmployeeInfo" ZOrder="6" X="-66" Y="301" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <Shape ID="DesignTable:EmployeePersonalInfo" ZOrder="34" X="0" Y="72" Height="239" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:EmployeePersonalInfo" ZOrder="35" X="0" Y="72" Height="239" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:EmployeeEducation" ZOrder="33" X="0" Y="72" Height="125" Width="180" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:EmployeeEducation" ZOrder="34" X="0" Y="72" Height="125" Width="180" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:EmployeeChildren" ZOrder="32" X="0" Y="72" Height="201" Width="171" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:EmployeeChildren" ZOrder="33" X="0" Y="72" Height="201" Width="171" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:EmployeeHobby" ZOrder="31" X="0" Y="72" Height="68" Width="161" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:EmployeeHobby" ZOrder="32" X="0" Y="72" Height="68" Width="161" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:EmployeeExperience" ZOrder="30" X="0" Y="72" Height="163" Width="185" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:EmployeeExperience" ZOrder="31" X="0" Y="72" Height="163" Width="185" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:EmployeeTraining" ZOrder="29" X="0" Y="72" Height="144" Width="171" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:EmployeeTraining" ZOrder="30" X="0" Y="72" Height="144" Width="171" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:EmployeeReferenceInside" ZOrder="28" X="0" Y="72" Height="163" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:EmployeeReferenceInside" ZOrder="29" X="0" Y="72" Height="163" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:EmployeeNominee" ZOrder="18" X="-1" Y="72" Height="28" Width="175" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="159" SplitterPosition="24" />
+    <Shape ID="DesignTable:EmployeeNominee" ZOrder="19" X="-1" Y="72" Height="28" Width="175" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="159" SplitterPosition="24" />
-    <Shape ID="DesignTable:EmployeeReferenceOutside" ZOrder="25" X="43" Y="181" Height="144" Width="225" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:EmployeeReferenceOutside" ZOrder="26" X="43" Y="181" Height="144" Width="225" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:IncomeTax" ZOrder="170" X="616" Y="409" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:IncomeTax" ZOrder="171" X="616" Y="409" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:IncomeTaxSlab" ZOrder="183" X="612" Y="318" Height="143" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="160" SplitterPosition="139" />
+    <Shape ID="DesignTable:IncomeTaxSlab" ZOrder="184" X="612" Y="318" Height="143" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="160" SplitterPosition="139" />
-    <Shape ID="DesignTable:IncomeTaxOther" ZOrder="176" X="615" Y="380" Height="124" Width="162" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="120" />
+    <Shape ID="DesignTable:IncomeTaxOther" ZOrder="177" X="615" Y="380" Height="124" Width="162" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="120" />
-    <Shape ID="DesignTable:BankAdvice" ZOrder="150" X="1214" Y="421" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
+    <Shape ID="DesignTable:BankAdvice" ZOrder="151" X="1214" Y="421" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
-    <Shape ID="DesignTable:SalarySheet" ZOrder="91" X="1740" Y="101" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="313" SplitterPosition="253" />
+    <Shape ID="DesignTable:SalarySheet" ZOrder="92" X="1740" Y="101" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="313" SplitterPosition="253" />
-    <Shape ID="DesignTable:SettlementAdvice" ZOrder="26" X="47" Y="115" Height="257" Width="168" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:SettlementAdvice" ZOrder="27" X="47" Y="115" Height="257" Width="168" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
-    <Shape ID="DesignTable:SalaryReconsilation" ZOrder="92" X="1744" Y="199" Height="257" Width="179" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:SalaryReconsilation" ZOrder="93" X="1744" Y="199" Height="257" Width="179" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:CCWSalaryDetail" ZOrder="89" X="285" Y="303" Height="162" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="158" />
+    <Shape ID="DesignTable:CCWSalaryDetail" ZOrder="90" X="285" Y="303" Height="162" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="158" />
-    <Shape ID="DesignTable:CCWSaSummary" ZOrder="47" X="286" Y="242" Height="124" Width="162" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="120" />
+    <Shape ID="DesignTable:CCWSaSummary" ZOrder="48" X="286" Y="242" Height="124" Width="162" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="120" />
-    <Shape ID="DesignTable:CashDisbursement" ZOrder="48" X="286" Y="213" Height="124" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
+    <Shape ID="DesignTable:CashDisbursement" ZOrder="49" X="286" Y="213" Height="124" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
-    <Shape ID="DesignTable:PostingDetails" ZOrder="175" X="911" Y="107" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:PostingDetails" ZOrder="176" X="911" Y="107" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmployeeDetail" ZOrder="27" X="594" Y="62" Height="239" Width="156" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="235" />
+    <Shape ID="DesignTable:EmployeeDetail" ZOrder="28" X="594" Y="62" Height="239" Width="156" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="235" />
-    <Shape ID="DesignTable:EmployeeHistory" ZOrder="84" X="-66" Y="402" Height="257" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:EmployeeHistory" ZOrder="85" X="-66" Y="402" Height="257" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmpCostAllocation" ZOrder="64" X="-67" Y="534" Height="105" Width="176" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
+    <Shape ID="DesignTable:EmpCostAllocation" ZOrder="65" X="-67" Y="534" Height="105" Width="176" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <Shape ID="DesignTable:UpcomEmployee" ZOrder="38" X="312" Y="965" Height="105" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
+    <Shape ID="DesignTable:UpcomEmployee" ZOrder="39" X="312" Y="965" Height="105" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <Shape ID="DesignTable:OTMonthlySheet" ZOrder="5" X="361" Y="66" Height="200" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="196" />
+    <Shape ID="DesignTable:OTMonthlySheet" ZOrder="7" X="361" Y="66" Height="200" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="196" />
-    <Shape ID="DesignTable:BonusBankAdvice" ZOrder="174" X="1212" Y="333" Height="162" Width="169" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
+    <Shape ID="DesignTable:BonusBankAdvice" ZOrder="175" X="1212" Y="333" Height="162" Width="169" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
-    <Shape ID="DesignTable:BonusRegister" ZOrder="110" X="1212" Y="361" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="272" SplitterPosition="253" />
+    <Shape ID="DesignTable:BonusRegister" ZOrder="111" X="1212" Y="361" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="272" SplitterPosition="253" />
-    <Shape ID="DesignTable:AnnualIncomeTax" ZOrder="173" X="624" Y="607" Height="143" Width="170" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
+    <Shape ID="DesignTable:AnnualIncomeTax" ZOrder="174" X="624" Y="607" Height="143" Width="170" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
-    <Shape ID="DesignTable:LaonPaymentDue" ZOrder="40" X="308" Y="803" Height="257" Width="168" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:LaonPaymentDue" ZOrder="41" X="308" Y="803" Height="257" Width="168" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:LoanIssue" ZOrder="41" X="308" Y="771" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="227" SplitterPosition="253" />
+    <Shape ID="DesignTable:LoanIssue" ZOrder="42" X="308" Y="771" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="227" SplitterPosition="253" />
-    <Shape ID="DesignTable:OTHourlySheet" ZOrder="53" X="361" Y="-28" Height="143" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
+    <Shape ID="DesignTable:OTHourlySheet" ZOrder="54" X="361" Y="-28" Height="143" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
-    <Shape ID="DesignTable:BasicReport" ZOrder="36" X="1205" Y="322" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="63" SplitterPosition="102" />
+    <Shape ID="DesignTable:BasicReport" ZOrder="37" X="1205" Y="322" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="63" SplitterPosition="102" />
-    <Shape ID="DesignTable:ExtendedSalarySheet" ZOrder="70" X="-65" Y="236" Height="257" Width="188" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:ExtendedSalarySheet" ZOrder="71" X="-65" Y="236" Height="257" Width="188" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:OTMonthRange" ZOrder="50" X="361" Y="127" Height="143" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
+    <Shape ID="DesignTable:OTMonthRange" ZOrder="51" X="361" Y="127" Height="143" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
-    <Shape ID="DesignTable:BranchWiseOT" ZOrder="114" X="1217" Y="541" Height="105" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
+    <Shape ID="DesignTable:BranchWiseOT" ZOrder="115" X="1217" Y="541" Height="105" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <Shape ID="DesignTable:DivisionWiseOT" ZOrder="180" X="1471" Y="161" Height="124" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
+    <Shape ID="DesignTable:DivisionWiseOT" ZOrder="181" X="1471" Y="161" Height="124" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
-    <Shape ID="DesignTable:OverAllSummary" ZOrder="51" X="360" Y="34" Height="257" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:OverAllSummary" ZOrder="52" X="360" Y="34" Height="257" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmpGradeBasic" ZOrder="77" X="-67" Y="72" Height="257" Width="155" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:EmpGradeBasic" ZOrder="78" X="-67" Y="72" Height="257" Width="155" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmpAllowDeduct" ZOrder="78" X="-68" Y="39" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:EmpAllowDeduct" ZOrder="79" X="-68" Y="39" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmpBankHistory" ZOrder="68" X="-66" Y="333" Height="257" Width="162" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:EmpBankHistory" ZOrder="69" X="-66" Y="333" Height="257" Width="162" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmpConfirmHis" ZOrder="71" X="-66" Y="202" Height="257" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:EmpConfirmHis" ZOrder="72" X="-66" Y="202" Height="257" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmpPFHis" ZOrder="169" X="-68" Y="1192" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
+    <Shape ID="DesignTable:EmpPFHis" ZOrder="170" X="-68" Y="1192" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
-    <Shape ID="DesignTable:JVReport" ZOrder="128" X="294" Y="536" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:JVReport" ZOrder="129" X="294" Y="536" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:UpCommingEmp" ZOrder="37" X="313" Y="997" Height="181" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
+    <Shape ID="DesignTable:UpCommingEmp" ZOrder="38" X="313" Y="997" Height="181" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
-    <Shape ID="DesignTable:PRBProcessDetail" ZOrder="168" X="914" Y="199" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="194" SplitterPosition="234" />
+    <Shape ID="DesignTable:PRBProcessDetail" ZOrder="169" X="914" Y="199" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="194" SplitterPosition="234" />
-    <Shape ID="DesignTable:Report108" ZOrder="90" X="949" Y="711" Height="257" Width="256" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="687" SplitterPosition="253" />
+    <Shape ID="DesignTable:Report108" ZOrder="91" X="949" Y="711" Height="257" Width="256" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="687" SplitterPosition="253" />
-    <Shape ID="DesignTable:CCWReport" ZOrder="45" X="286" Y="335" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
+    <Shape ID="DesignTable:CCWReport" ZOrder="46" X="286" Y="335" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
-    <Shape ID="DesignTable:CCDetailReport" ZOrder="46" X="286" Y="271" Height="257" Width="155" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:CCDetailReport" ZOrder="47" X="286" Y="271" Height="257" Width="155" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:JVSalaryDetail" ZOrder="42" X="295" Y="567" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
+    <Shape ID="DesignTable:JVSalaryDetail" ZOrder="43" X="295" Y="567" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
-    <Shape ID="DesignTable:JVLoactionWReport" ZOrder="167" X="296" Y="598" Height="162" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
+    <Shape ID="DesignTable:JVLoactionWReport" ZOrder="168" X="296" Y="598" Height="162" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
-    <Shape ID="DesignTable:JVSummaryReport" ZOrder="179" X="297" Y="629" Height="124" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
+    <Shape ID="DesignTable:JVSummaryReport" ZOrder="180" X="297" Y="629" Height="124" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
-    <Shape ID="DesignTable:OPIRegister" ZOrder="81" X="361" Y="96" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:OPIRegister" ZOrder="82" X="361" Y="96" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:AccountReportForSAP" ZOrder="126" X="622" Y="577" Height="162" Width="195" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
+    <Shape ID="DesignTable:AccountReportForSAP" ZOrder="127" X="622" Y="577" Height="162" Width="195" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
-    <Shape ID="DesignTable:LoanReportForSAP" ZOrder="39" X="311" Y="867" Height="257" Width="175" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:LoanReportForSAP" ZOrder="40" X="311" Y="867" Height="257" Width="175" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:ReportForSAP" ZOrder="127" X="948" Y="680" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:ReportForSAP" ZOrder="128" X="948" Y="680" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:BankAdviceOfPRB" ZOrder="113" X="1215" Y="482" Height="162" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
+    <Shape ID="DesignTable:BankAdviceOfPRB" ZOrder="114" X="1215" Y="482" Height="162" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
-    <Shape ID="DesignTable:OPITotalValueRegister" ZOrder="52" X="360" Y="3" Height="143" Width="196" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
+    <Shape ID="DesignTable:OPITotalValueRegister" ZOrder="53" X="360" Y="3" Height="143" Width="196" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
-    <Shape ID="DesignTable:WartsilaSalarySheetSummary" ZOrder="172" X="649" Y="769" Height="257" Width="237" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:WartsilaSalarySheetSummary" ZOrder="173" X="649" Y="769" Height="257" Width="237" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:WartsilaSalarySheet" ZOrder="129" X="650" Y="830" Height="257" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:WartsilaSalarySheet" ZOrder="130" X="650" Y="830" Height="257" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmployeeJoining" ZOrder="75" X="-67" Y="139" Height="238" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
+    <Shape ID="DesignTable:EmployeeJoining" ZOrder="76" X="-67" Y="139" Height="238" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
-    <Shape ID="DesignTable:WartsilaPaySlip" ZOrder="116" X="645" Y="935" Height="257" Width="199" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:WartsilaPaySlip" ZOrder="117" X="645" Y="935" Height="257" Width="199" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:WartsilaReconciliation" ZOrder="131" X="649" Y="799" Height="257" Width="196" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:WartsilaReconciliation" ZOrder="132" X="649" Y="799" Height="257" Width="196" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmpJoining4Novartis" ZOrder="76" X="-67" Y="105" Height="257" Width="190" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:EmpJoining4Novartis" ZOrder="77" X="-67" Y="105" Height="257" Width="190" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:WartSilaRSummary" ZOrder="171" X="648" Y="738" Height="257" Width="178" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:WartSilaRSummary" ZOrder="172" X="648" Y="738" Height="257" Width="178" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmpLifeCycle" ZOrder="63" X="-65" Y="596" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:EmpLifeCycle" ZOrder="64" X="-65" Y="596" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:IndividualLoanReport" ZOrder="7" X="613" Y="350" Height="257" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:IndividualLoanReport" ZOrder="9" X="613" Y="350" Height="257" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:BankAdviceLetter" ZOrder="111" X="1217" Y="513" Height="181" Width="168" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
+    <Shape ID="DesignTable:BankAdviceLetter" ZOrder="112" X="1217" Y="513" Height="181" Width="168" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
-    <Shape ID="DesignTable:EmployeeMonthlyExpense" ZOrder="60" X="-68" Y="753" Height="105" Width="219" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
+    <Shape ID="DesignTable:EmployeeMonthlyExpense" ZOrder="61" X="-68" Y="753" Height="105" Width="219" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <Shape ID="DesignTable:EmployeeRetirement" ZOrder="59" X="-67" Y="976" Height="181" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
+    <Shape ID="DesignTable:EmployeeRetirement" ZOrder="60" X="-67" Y="976" Height="181" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
-    <Shape ID="DesignTable:EmpPersonalInformation" ZOrder="58" X="-67" Y="1006" Height="257" Width="211" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
+    <Shape ID="DesignTable:EmpPersonalInformation" ZOrder="59" X="-67" Y="1006" Height="257" Width="211" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmpAcademicBackground" ZOrder="166" X="-69" Y="881" Height="124" Width="218" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
+    <Shape ID="DesignTable:EmpAcademicBackground" ZOrder="167" X="-69" Y="881" Height="124" Width="218" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
-    <Shape ID="DesignTable:EmpLanguageKnown" ZOrder="161" X="-67" Y="785" Height="86" Width="188" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="58" SplitterPosition="82" />
+    <Shape ID="DesignTable:EmpLanguageKnown" ZOrder="162" X="-67" Y="785" Height="86" Width="188" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="58" SplitterPosition="82" />
-    <Shape ID="DesignTable:EmpMembershipInSocietiesClubsAssociations" ZOrder="178" X="-69" Y="914" Height="86" Width="300" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="58" SplitterPosition="82" />
+    <Shape ID="DesignTable:EmpMembershipInSocietiesClubsAssociations" ZOrder="179" X="-69" Y="914" Height="86" Width="300" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="58" SplitterPosition="82" />
-    <Shape ID="DesignTable:EmpCloseRelations" ZOrder="55" X="-68" Y="1101" Height="86" Width="180" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="58" SplitterPosition="82" />
+    <Shape ID="DesignTable:EmpCloseRelations" ZOrder="56" X="-68" Y="1101" Height="86" Width="180" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="58" SplitterPosition="82" />
-    <Shape ID="DesignTable:EmpEmploymentHistory" ZOrder="56" X="-67" Y="1069" Height="105" Width="207" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
+    <Shape ID="DesignTable:EmpEmploymentHistory" ZOrder="57" X="-67" Y="1069" Height="105" Width="207" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <Shape ID="DesignTable:EmpOtherProfessionalQualifications" ZOrder="62" X="-68" Y="659" Height="48" Width="276" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
+    <Shape ID="DesignTable:EmpOtherProfessionalQualifications" ZOrder="63" X="-68" Y="659" Height="48" Width="276" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
-    <Shape ID="DesignTable:EmpReferences" ZOrder="57" X="-67" Y="1037" Height="105" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
+    <Shape ID="DesignTable:EmpReferences" ZOrder="58" X="-67" Y="1037" Height="105" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <Shape ID="DesignTable:EmpDescribeInDetailsPresentJobResponsibilities" ZOrder="61" X="-69" Y="722" Height="48" Width="300" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
+    <Shape ID="DesignTable:EmpDescribeInDetailsPresentJobResponsibilities" ZOrder="62" X="-69" Y="722" Height="48" Width="300" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
-    <Shape ID="DesignTable:EmpReasonForLeavingCurrentJob" ZOrder="163" X="-68" Y="690" Height="48" Width="262" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
+    <Shape ID="DesignTable:EmpReasonForLeavingCurrentJob" ZOrder="164" X="-68" Y="690" Height="48" Width="262" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
-    <Shape ID="DesignTable:EmpExtraCaricularActivities" ZOrder="164" X="-68" Y="816" Height="48" Width="226" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
+    <Shape ID="DesignTable:EmpExtraCaricularActivities" ZOrder="165" X="-68" Y="816" Height="48" Width="226" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
-    <Shape ID="DesignTable:EmpListOfRelativeWorkingInNovatis" ZOrder="162" X="-67" Y="626" Height="105" Width="278" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
+    <Shape ID="DesignTable:EmpListOfRelativeWorkingInNovatis" ZOrder="163" X="-67" Y="626" Height="105" Width="278" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <Shape ID="DesignTable:EmpAdditionalInformation" ZOrder="149" X="-66" Y="564" Height="48" Width="222" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
+    <Shape ID="DesignTable:EmpAdditionalInformation" ZOrder="150" X="-66" Y="564" Height="48" Width="222" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
-    <Shape ID="DesignTable:EmpAns" ZOrder="54" X="-67" Y="1130" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="63" />
+    <Shape ID="DesignTable:EmpAns" ZOrder="55" X="-67" Y="1130" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="63" />
-    <Shape ID="DesignTable:EmpWorkingRelativesAns" ZOrder="72" X="-66" Y="172" Height="48" Width="215" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
+    <Shape ID="DesignTable:EmpWorkingRelativesAns" ZOrder="73" X="-66" Y="172" Height="48" Width="215" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
-    <Shape ID="DesignTable:EmpPermanentAndMailingAddress" ZOrder="165" X="-69" Y="848" Height="143" Width="269" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
+    <Shape ID="DesignTable:EmpPermanentAndMailingAddress" ZOrder="166" X="-69" Y="848" Height="143" Width="269" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
-    <Shape ID="DesignTable:EmployeePhotoPath" ZOrder="181" X="-68" Y="944" Height="48" Width="184" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
+    <Shape ID="DesignTable:EmployeePhotoPath" ZOrder="182" X="-68" Y="944" Height="48" Width="184" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
-    <Shape ID="DesignTable:EmpListOfRelativeWorkingInCompany" ZOrder="79" X="-69" Y="-25" Height="105" Width="289" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
+    <Shape ID="DesignTable:EmpListOfRelativeWorkingInCompany" ZOrder="80" X="-69" Y="-25" Height="105" Width="289" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <Shape ID="DesignTable:ITPfAndOtherDetails" ZOrder="182" X="619" Y="470" Height="124" Width="186" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
+    <Shape ID="DesignTable:ITPfAndOtherDetails" ZOrder="183" X="619" Y="470" Height="124" Width="186" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
-    <Shape ID="DesignTable:MultipleEmpIT" ZOrder="120" X="1201" Y="866" Height="257" Width="155" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="364" SplitterPosition="253" />
+    <Shape ID="DesignTable:MultipleEmpIT" ZOrder="121" X="1201" Y="866" Height="257" Width="155" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="364" SplitterPosition="253" />
-    <Shape ID="DesignTable:ITHeader" ZOrder="177" X="617" Y="439" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
+    <Shape ID="DesignTable:ITHeader" ZOrder="178" X="617" Y="439" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
-    <Shape ID="DesignTable:EmployeeLFAData" ZOrder="69" X="-65" Y="269" Height="143" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="139" />
+    <Shape ID="DesignTable:EmployeeLFAData" ZOrder="70" X="-65" Y="269" Height="143" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="139" />
-    <Shape ID="DesignTable:TaxRebeatInvestment" ZOrder="154" X="907" Y="511" Height="105" Width="192" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="101" />
+    <Shape ID="DesignTable:TaxRebeatInvestment" ZOrder="155" X="907" Y="511" Height="105" Width="192" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="101" />
-    <Shape ID="DesignTable:TaxChallan" ZOrder="158" X="908" Y="542" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="63" />
+    <Shape ID="DesignTable:TaxChallan" ZOrder="159" X="908" Y="542" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="63" />
-    <Shape ID="DesignTable:Pmpbasic" ZOrder="160" X="906" Y="-14" Height="219" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="176" SplitterPosition="215" />
+    <Shape ID="DesignTable:Pmpbasic" ZOrder="161" X="906" Y="-14" Height="219" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="176" SplitterPosition="215" />
-    <Shape ID="DesignTable:Pmpobjectives" ZOrder="159" X="912" Y="169" Height="181" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="159" SplitterPosition="177" />
+    <Shape ID="DesignTable:Pmpobjectives" ZOrder="160" X="912" Y="169" Height="181" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="159" SplitterPosition="177" />
-    <Shape ID="DesignTable:PmpEmpValueBehaviorRatings" ZOrder="13" X="910" Y="79" Height="124" Width="245" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
+    <Shape ID="DesignTable:PmpEmpValueBehaviorRatings" ZOrder="15" X="910" Y="79" Height="124" Width="245" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
-    <Shape ID="DesignTable:FSSJVReport" ZOrder="157" X="646" Y="672" Height="200" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="262" SplitterPosition="196" />
+    <Shape ID="DesignTable:FSSJVReport" ZOrder="158" X="646" Y="672" Height="200" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="262" SplitterPosition="196" />
-    <Shape ID="DesignTable:dtTransferTPToPR" ZOrder="156" X="1472" Y="73" Height="143" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
+    <Shape ID="DesignTable:dtTransferTPToPR" ZOrder="157" X="1472" Y="73" Height="143" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
-    <Shape ID="DesignTable:EmpContinueFromDiscontinue" ZOrder="67" X="-66" Y="367" Height="181" Width="243" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
+    <Shape ID="DesignTable:EmpContinueFromDiscontinue" ZOrder="68" X="-66" Y="367" Height="181" Width="243" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
-    <Shape ID="DesignTable:EmpITInfoAndBasicInfo" ZOrder="66" X="-67" Y="438" Height="162" Width="203" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="142" SplitterPosition="158" />
+    <Shape ID="DesignTable:EmpITInfoAndBasicInfo" ZOrder="67" X="-67" Y="438" Height="162" Width="203" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="142" SplitterPosition="158" />
-    <Shape ID="DesignTable:SalaryStracture" ZOrder="155" X="1737" Y="40" Height="257" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="585" SplitterPosition="253" />
+    <Shape ID="DesignTable:SalaryStracture" ZOrder="156" X="1737" Y="40" Height="257" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="585" SplitterPosition="253" />
-    <Shape ID="DesignTable:DedtaxByMonth" ZOrder="153" X="1472" Y="132" Height="143" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="139" />
+    <Shape ID="DesignTable:DedtaxByMonth" ZOrder="154" X="1472" Y="132" Height="143" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="139" />
-    <Shape ID="DesignTable:SalarySheetByMonth" ZOrder="132" X="1735" Y="10" Height="257" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="330" SplitterPosition="253" />
+    <Shape ID="DesignTable:SalarySheetByMonth" ZOrder="133" X="1735" Y="10" Height="257" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="330" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmployeeServiceLength" ZOrder="65" X="-67" Y="470" Height="143" Width="204" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
+    <Shape ID="DesignTable:EmployeeServiceLength" ZOrder="66" X="-67" Y="470" Height="143" Width="204" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
-    <Shape ID="DesignTable:PayRollRegisterForAll" ZOrder="151" X="909" Y="48" Height="124" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="120" />
+    <Shape ID="DesignTable:PayRollRegisterForAll" ZOrder="152" X="909" Y="48" Height="124" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="120" />
-    <Shape ID="DesignTable:ReckittTaxCard" ZOrder="152" X="950" Y="743" Height="105" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="101" />
+    <Shape ID="DesignTable:ReckittTaxCard" ZOrder="153" X="950" Y="743" Height="105" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="101" />
-    <Shape ID="DesignTable:DedtaxByMonthRange" ZOrder="141" X="1471" Y="42" Height="162" Width="197" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="142" SplitterPosition="158" />
+    <Shape ID="DesignTable:DedtaxByMonthRange" ZOrder="142" X="1471" Y="42" Height="162" Width="197" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="142" SplitterPosition="158" />
-    <Shape ID="DesignTable:dtRolePermission" ZOrder="146" X="1467" Y="-22" Height="105" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
+    <Shape ID="DesignTable:dtRolePermission" ZOrder="147" X="1467" Y="-22" Height="105" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
-    <Shape ID="DesignTable:dtRoleInfo" ZOrder="139" X="1469" Y="12" Height="105" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
+    <Shape ID="DesignTable:dtRoleInfo" ZOrder="140" X="1469" Y="12" Height="105" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
-    <Shape ID="DesignTable:dtUserRole" ZOrder="138" X="1471" Y="103" Height="200" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
+    <Shape ID="DesignTable:dtUserRole" ZOrder="139" X="1471" Y="103" Height="200" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
-    <Shape ID="DesignTable:EERSData" ZOrder="137" X="-68" Y="1161" Height="257" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="227" SplitterPosition="253" />
+    <Shape ID="DesignTable:EERSData" ZOrder="138" X="-68" Y="1161" Height="257" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="227" SplitterPosition="253" />
-    <Shape ID="DesignTable:SalaryReconDeduction" ZOrder="148" X="1740" Y="133" Height="124" Width="197" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
+    <Shape ID="DesignTable:SalaryReconDeduction" ZOrder="149" X="1740" Y="133" Height="124" Width="197" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
-    <Shape ID="DesignTable:SalaryReconciliationSummary" ZOrder="147" X="1739" Y="71" Height="86" Width="238" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
+    <Shape ID="DesignTable:SalaryReconciliationSummary" ZOrder="148" X="1739" Y="71" Height="86" Width="238" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
-    <Shape ID="DesignTable:MemoDebit" ZOrder="119" X="1198" Y="803" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="83" SplitterPosition="120" />
+    <Shape ID="DesignTable:MemoDebit" ZOrder="120" X="1198" Y="803" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="83" SplitterPosition="120" />
-    <Shape ID="DesignTable:MemoCredit" ZOrder="118" X="1203" Y="898" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
+    <Shape ID="DesignTable:MemoCredit" ZOrder="119" X="1203" Y="898" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
-    <Shape ID="DesignTable:SharedLoanIssue" ZOrder="145" X="1735" Y="-23" Height="257" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:SharedLoanIssue" ZOrder="146" X="1735" Y="-23" Height="257" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:GratuityProvision" ZOrder="144" X="1205" Y="8" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="210" SplitterPosition="234" />
+    <Shape ID="DesignTable:GratuityProvision" ZOrder="145" X="1205" Y="8" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="210" SplitterPosition="234" />
-    <Shape ID="DesignTable:GratuityRegister" ZOrder="143" X="1204" Y="-20" Height="143" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
+    <Shape ID="DesignTable:GratuityRegister" ZOrder="144" X="1204" Y="-20" Height="143" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
-    <Shape ID="DesignTable:GratuityLedger" ZOrder="142" X="1206" Y="38" Height="86" Width="153" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="74" SplitterPosition="82" />
+    <Shape ID="DesignTable:GratuityLedger" ZOrder="143" X="1206" Y="38" Height="86" Width="153" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="74" SplitterPosition="82" />
-    <Shape ID="DesignTable:LoanData" ZOrder="140" X="317" Y="834" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
+    <Shape ID="DesignTable:LoanData" ZOrder="141" X="317" Y="834" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
-    <Shape ID="DesignTable:dtUsers" ZOrder="102" X="1474" Y="258" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="216" SplitterPosition="177" />
+    <Shape ID="DesignTable:dtUsers" ZOrder="103" X="1474" Y="258" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="216" SplitterPosition="177" />
-    <Shape ID="DesignTable:dtUserLogin" ZOrder="103" X="1472" Y="227" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="158" />
+    <Shape ID="DesignTable:dtUserLogin" ZOrder="104" X="1472" Y="227" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="158" />
-    <Shape ID="DesignTable:dtBadUser" ZOrder="130" X="1470" Y="194" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
+    <Shape ID="DesignTable:dtBadUser" ZOrder="131" X="1470" Y="194" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
-    <Shape ID="DesignTable:EmpItemWiseSalary" ZOrder="136" X="-67" Y="500" Height="105" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
+    <Shape ID="DesignTable:EmpItemWiseSalary" ZOrder="137" X="-67" Y="500" Height="105" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
-    <Shape ID="DesignTable:PFLedger" ZOrder="135" X="912" Y="137" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
+    <Shape ID="DesignTable:PFLedger" ZOrder="136" X="912" Y="137" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
-    <Shape ID="DesignTable:Challan" ZOrder="44" X="287" Y="365" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
+    <Shape ID="DesignTable:Challan" ZOrder="45" X="287" Y="365" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
-    <Shape ID="DesignTable:UpcomingTraining" ZOrder="134" X="312" Y="1027" Height="181" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
+    <Shape ID="DesignTable:UpcomingTraining" ZOrder="135" X="312" Y="1027" Height="181" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
-    <Shape ID="DesignTable:SalaryCertificate" ZOrder="133" X="1742" Y="167" Height="257" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:SalaryCertificate" ZOrder="134" X="1742" Y="167" Height="257" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:ChallanNoWithMonth" ZOrder="43" X="286" Y="398" Height="86" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
+    <Shape ID="DesignTable:ChallanNoWithMonth" ZOrder="44" X="286" Y="398" Height="86" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
-    <Shape ID="DesignTable:MarketSurveyCom" ZOrder="117" X="1199" Y="834" Height="124" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
+    <Shape ID="DesignTable:MarketSurveyCom" ZOrder="118" X="1199" Y="834" Height="124" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
-    <Shape ID="DesignTable:activeInactiveUserList" ZOrder="98" X="918" Y="878" Height="105" Width="192" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
+    <Shape ID="DesignTable:activeInactiveUserList" ZOrder="99" X="918" Y="878" Height="105" Width="192" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
-    <Shape ID="DesignTable:dtCashAdvice" ZOrder="125" X="1474" Y="291" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="158" />
+    <Shape ID="DesignTable:dtCashAdvice" ZOrder="126" X="1474" Y="291" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="158" />
-    <Shape ID="DesignTable:BanglaPaySlip" ZOrder="115" X="1219" Y="604" Height="257" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:BanglaPaySlip" ZOrder="116" X="1219" Y="604" Height="257" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:dtProdBonusDetail" ZOrder="124" X="1475" Y="419" Height="200" Width="176" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
+    <Shape ID="DesignTable:dtProdBonusDetail" ZOrder="125" X="1475" Y="419" Height="200" Width="176" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
-    <Shape ID="DesignTable:dtEmpDesWiseProdBonus" ZOrder="12" X="1476" Y="451" Height="257" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:dtEmpDesWiseProdBonus" ZOrder="14" X="1476" Y="451" Height="257" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:dtMonthlyProdBonus" ZOrder="123" X="1477" Y="484" Height="143" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
+    <Shape ID="DesignTable:dtMonthlyProdBonus" ZOrder="124" X="1477" Y="484" Height="143" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
-    <Shape ID="DesignTable:SalarySheetStatic" ZOrder="122" X="1747" Y="264" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="748" SplitterPosition="253" />
+    <Shape ID="DesignTable:SalarySheetStatic" ZOrder="123" X="1747" Y="264" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="748" SplitterPosition="253" />
-    <Shape ID="DesignTable:dtRoleAudit" ZOrder="83" X="1474" Y="322" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
+    <Shape ID="DesignTable:dtRoleAudit" ZOrder="84" X="1474" Y="322" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
-    <Shape ID="DesignTable:dtRolePermission2" ZOrder="121" X="1474" Y="355" Height="143" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
+    <Shape ID="DesignTable:dtRolePermission2" ZOrder="122" X="1474" Y="355" Height="143" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
-    <Shape ID="DesignTable:CasualSalarySheet" ZOrder="49" X="289" Y="179" Height="257" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:CasualSalarySheet" ZOrder="50" X="289" Y="179" Height="257" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:BankAdviceHNM" ZOrder="112" X="1214" Y="451" Height="181" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
+    <Shape ID="DesignTable:BankAdviceHNM" ZOrder="113" X="1214" Y="451" Height="181" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
-    <Shape ID="DesignTable:EmpDesCatChange" ZOrder="74" X="127" Y="31" Height="257" Width="175" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:EmpDesCatChange" ZOrder="75" X="127" Y="31" Height="257" Width="175" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmployeeConfirmation" ZOrder="109" X="282" Y="436" Height="143" Width="199" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
+    <Shape ID="DesignTable:EmployeeConfirmation" ZOrder="110" X="282" Y="436" Height="143" Width="199" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
-    <Shape ID="DesignTable:MonthlySchedule" ZOrder="108" X="681" Y="1101" Height="257" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:MonthlySchedule" ZOrder="109" X="681" Y="1101" Height="257" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:AllMedicalClaim" ZOrder="105" X="927" Y="908" Height="143" Width="160" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
+    <Shape ID="DesignTable:AllMedicalClaim" ZOrder="106" X="927" Y="908" Height="143" Width="160" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
-    <Shape ID="DesignTable:AllEmpTaxInfo" ZOrder="107" X="864" Y="1031" Height="181" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
+    <Shape ID="DesignTable:AllEmpTaxInfo" ZOrder="108" X="864" Y="1031" Height="181" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
-    <Shape ID="DesignTable:dtAllActiveLaons" ZOrder="106" X="1475" Y="388" Height="257" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:dtAllActiveLaons" ZOrder="107" X="1475" Y="388" Height="257" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:ArrSheet" ZOrder="104" X="889" Y="597" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:ArrSheet" ZOrder="105" X="889" Y="597" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:EmpGroupInsurance" ZOrder="101" X="571" Y="297" Height="200" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="196" />
+    <Shape ID="DesignTable:EmpGroupInsurance" ZOrder="102" X="571" Y="297" Height="200" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="196" />
-    <Shape ID="DesignTable:EmpGroupInsuranceDiscon" ZOrder="73" X="114" Y="139" Height="200" Width="222" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="196" />
+    <Shape ID="DesignTable:EmpGroupInsuranceDiscon" ZOrder="74" X="114" Y="139" Height="200" Width="222" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="196" />
-    <Shape ID="DesignTable:SKFExpencesPaySlip" ZOrder="100" X="1747" Y="296" Height="257" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:SKFExpencesPaySlip" ZOrder="101" X="1747" Y="296" Height="257" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:RemainingLoanforPayslip" ZOrder="99" X="948" Y="769" Height="105" Width="214" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
+    <Shape ID="DesignTable:RemainingLoanforPayslip" ZOrder="100" X="948" Y="769" Height="105" Width="214" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
-    <Shape ID="DesignTable:PayslipBasicInfo" ZOrder="82" X="915" Y="302" Height="239" Width="160" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="235" />
+    <Shape ID="DesignTable:PayslipBasicInfo" ZOrder="83" X="915" Y="302" Height="239" Width="160" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="235" />
-    <Shape ID="DesignTable:EmpPromotion" ZOrder="80" X="118" Y="275" Height="200" Width="153" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
+    <Shape ID="DesignTable:EmpPromotion" ZOrder="81" X="118" Y="275" Height="200" Width="153" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
-    <Shape ID="DesignTable:NewlyIssuedLoan" ZOrder="97" X="650" Y="521" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
+    <Shape ID="DesignTable:NewlyIssuedLoan" ZOrder="98" X="650" Y="521" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
-    <Shape ID="DesignTable:CurrentMonthDueLoan" ZOrder="96" X="1093" Y="929" Height="257" Width="200" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="253" />
+    <Shape ID="DesignTable:CurrentMonthDueLoan" ZOrder="97" X="1093" Y="929" Height="257" Width="200" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="253" />
-    <Shape ID="DesignTable:CashRefund" ZOrder="95" X="875" Y="1079" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
+    <Shape ID="DesignTable:CashRefund" ZOrder="96" X="875" Y="1079" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
-    <Shape ID="DesignTable:PFRegister" ZOrder="94" X="907" Y="16" Height="257" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="252" SplitterPosition="253" />
+    <Shape ID="DesignTable:PFRegister" ZOrder="95" X="907" Y="16" Height="257" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="252" SplitterPosition="253" />
-    <Shape ID="DesignTable:BonusRegisterBAT" ZOrder="93" X="1217" Y="571" Height="238" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
+    <Shape ID="DesignTable:BonusRegisterBAT" ZOrder="94" X="1217" Y="571" Height="238" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
-    <Shape ID="DesignTable:NmgtSpringFestivalBonusRegister" ZOrder="88" X="1093" Y="962" Height="257" Width="265" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="292" SplitterPosition="253" />
+    <Shape ID="DesignTable:NmgtSpringFestivalBonusRegister" ZOrder="89" X="1093" Y="962" Height="257" Width="265" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="292" SplitterPosition="253" />
-    <Shape ID="DesignTable:NmgtBonusPaySlip" ZOrder="87" X="1104" Y="997" Height="257" Width="177" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:NmgtBonusPaySlip" ZOrder="88" X="1104" Y="997" Height="257" Width="177" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:SalaryRegister" ZOrder="85" X="1746" Y="305" Height="239" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="235" />
+    <Shape ID="DesignTable:SalaryRegister" ZOrder="86" X="1746" Y="305" Height="239" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="235" />
-    <Shape ID="DesignTable:CrewDeployment" ZOrder="35" X="471" Y="78" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:CrewDeployment" ZOrder="36" X="471" Y="78" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:ActiveEmployee" ZOrder="8" X="756" Y="101" Height="28" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="235" SplitterPosition="24" />
+    <Shape ID="DesignTable:ActiveEmployee" ZOrder="10" X="756" Y="101" Height="28" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="235" SplitterPosition="24" />
-    <Shape ID="DesignTable:BonusPaySlip" ZOrder="11" X="1214" Y="390" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:BonusPaySlip" ZOrder="13" X="1214" Y="390" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <Shape ID="DesignTable:LoanDueWithCC" ZOrder="23" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:LoanDueWithCC" ZOrder="24" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:dtBankAdvice" ZOrder="22" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:dtBankAdvice" ZOrder="23" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:dtEncashmentReport" ZOrder="21" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:dtEncashmentReport" ZOrder="22" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:SalaryReconNew" ZOrder="20" X="0" Y="0" Height="28" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="24" />
+    <Shape ID="DesignTable:SalaryReconNew" ZOrder="21" X="0" Y="0" Height="28" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="24" />
-    <Shape ID="DesignTable:AnnualIncomeCertificate" ZOrder="24" X="155" Y="190" Height="257" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="253" />
+    <Shape ID="DesignTable:AnnualIncomeCertificate" ZOrder="25" X="155" Y="190" Height="257" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="253" />
-    <Shape ID="DesignTable:AssetAcknowledgement" ZOrder="9" X="819" Y="0" Height="28" Width="205" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
+    <Shape ID="DesignTable:AssetAcknowledgement" ZOrder="11" X="819" Y="0" Height="28" Width="205" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <Shape ID="DesignTable:AssetSerialInformation" ZOrder="19" X="580" Y="14" Height="162" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="158" />
+    <Shape ID="DesignTable:AssetSerialInformation" ZOrder="20" X="580" Y="14" Height="162" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="158" />
-    <Shape ID="DesignTable:BanglaPaySlipNew" ZOrder="17" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:BanglaPaySlipNew" ZOrder="18" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:BanglaPaySlipNewProdBonus" ZOrder="16" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:BanglaPaySlipNewProdBonus" ZOrder="17" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:Employee" ZOrder="15" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:Employee" ZOrder="16" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:dtProdAttendance" ZOrder="14" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:dtProdAttendance" ZOrder="2" X="513" Y="1359" Height="200" Width="173" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="196" />
-    <Shape ID="DesignTable:CCWiseSalarySheetNew" ZOrder="10" X="533" Y="586" Height="28" Width="203" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
+    <Shape ID="DesignTable:CCWiseSalarySheetNew" ZOrder="12" X="533" Y="586" Height="28" Width="203" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <Shape ID="DesignTable:CandidateInformation" ZOrder="6" X="767" Y="198" Height="28" Width="194" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="24" />
+    <Shape ID="DesignTable:CandidateInformation" ZOrder="8" X="767" Y="198" Height="28" Width="194" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="24" />
-    <Shape ID="DesignTable:EmployeeInfoBasic" ZOrder="3" X="0" Y="0" Height="256" Width="175" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:EmployeeInfoBasic" ZOrder="5" X="0" Y="0" Height="256" Width="175" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
-    <Shape ID="DesignTable:DeletedLifeCycle" ZOrder="2" X="0" Y="0" Height="257" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:DeletedLifeCycle" ZOrder="4" X="0" Y="0" Height="257" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
-    <Shape ID="DesignTable:EmployeeDetailEcho" ZOrder="1" X="309" Y="1348" Height="257" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:EmployeeDetailEcho" ZOrder="3" X="309" Y="1348" Height="257" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:dtEncashmentReportNew" ZOrder="1" X="785" Y="1382" Height="257" Width="214" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

HRM.Report/PayrollDataSet/dsEmpLeaveLedger.xsd

@@ -31,6 +31,9 @@
               <xs:element name="WorkDayType" msprop:Generator_ColumnPropNameInTable="WorkDayTypeColumn" msprop:Generator_ColumnPropNameInRow="WorkDayType" msprop:Generator_UserColumnName="WorkDayType" msprop:Generator_ColumnVarNameInTable="columnWorkDayType" type="xs:string" minOccurs="0" />
               <xs:element name="AttnDate2" msprop:Generator_ColumnPropNameInTable="AttnDate2Column" msprop:Generator_ColumnPropNameInRow="AttnDate2" msprop:Generator_UserColumnName="AttnDate2" msprop:Generator_ColumnVarNameInTable="columnAttnDate2" type="xs:dateTime" minOccurs="0" />
               <xs:element name="Remarks" msprop:Generator_ColumnPropNameInTable="RemarksColumn" msprop:Generator_ColumnPropNameInRow="Remarks" msprop:Generator_UserColumnName="Remarks" msprop:Generator_ColumnVarNameInTable="columnRemarks" type="xs:string" minOccurs="0" />
+              <xs:element name="ApplyDate" msprop:Generator_UserColumnName="ApplyDate" msprop:Generator_ColumnPropNameInTable="ApplyDateColumn" msprop:Generator_ColumnPropNameInRow="ApplyDate" msprop:Generator_ColumnVarNameInTable="columnApplyDate" type="xs:string" minOccurs="0" />
+              <xs:element name="ApproveDate" msprop:Generator_UserColumnName="ApproveDate" msprop:Generator_ColumnPropNameInTable="ApproveDateColumn" msprop:Generator_ColumnPropNameInRow="ApproveDate" msprop:Generator_ColumnVarNameInTable="columnApproveDate" type="xs:string" minOccurs="0" />
+              <xs:element name="LeaveStatus" msprop:Generator_UserColumnName="LeaveStatus" msprop:Generator_ColumnPropNameInTable="LeaveStatusColumn" msprop:Generator_ColumnPropNameInRow="LeaveStatus" msprop:Generator_ColumnVarNameInTable="columnLeaveStatus" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -58,7 +61,13 @@
               <xs:element name="Department" msprop:Generator_ColumnPropNameInTable="DepartmentColumn" msprop:Generator_ColumnPropNameInRow="Department" msprop:Generator_UserColumnName="Department" msprop:Generator_ColumnVarNameInTable="columnDepartment" type="xs:string" minOccurs="0" />
               <xs:element name="Designation" msprop:Generator_ColumnPropNameInTable="DesignationColumn" msprop:Generator_ColumnPropNameInRow="Designation" msprop:Generator_UserColumnName="Designation" msprop:Generator_ColumnVarNameInTable="columnDesignation" type="xs:string" minOccurs="0" />
               <xs:element name="JoiningDate" msprop:Generator_ColumnPropNameInTable="JoiningDateColumn" msprop:Generator_ColumnPropNameInRow="JoiningDate" msprop:Generator_UserColumnName="JoiningDate" msprop:Generator_ColumnVarNameInTable="columnJoiningDate" type="xs:string" minOccurs="0" />
-              <xs:element name="Shift" msprop:Generator_ColumnPropNameInTable="ShiftColumn" msprop:Generator_ColumnPropNameInRow="Shift" msprop:Generator_UserColumnName="Shift" msprop:Generator_ColumnVarNameInTable="columnShift" type="xs:string" minOccurs="0" />
+              <xs:element name="Shift" msprop:Generator_UserColumnName="Shift" msprop:Generator_ColumnPropNameInTable="ShiftColumn" msprop:Generator_ColumnPropNameInRow="Shift" msprop:Generator_ColumnVarNameInTable="columnShift" type="xs:string" minOccurs="0" />
+              <xs:element name="LeavePeriod" msprop:Generator_UserColumnName="LeavePeriod" msprop:Generator_ColumnPropNameInTable="LeavePeriodColumn" msprop:Generator_ColumnPropNameInRow="LeavePeriod" msprop:Generator_ColumnVarNameInTable="columnLeavePeriod" type="xs:string" minOccurs="0" />
+              <xs:element name="LeaveApprover" msprop:Generator_UserColumnName="LeaveApprover" msprop:Generator_ColumnPropNameInTable="LeaveApproverColumn" msprop:Generator_ColumnPropNameInRow="LeaveApprover" msprop:Generator_ColumnVarNameInTable="columnLeaveApprover" type="xs:string" minOccurs="0" />
+              <xs:element name="LeaveNotifier" msprop:Generator_UserColumnName="LeaveNotifier" msprop:Generator_ColumnPropNameInTable="LeaveNotifierColumn" msprop:Generator_ColumnPropNameInRow="LeaveNotifier" msprop:Generator_ColumnVarNameInTable="columnLeaveNotifier" type="xs:string" minOccurs="0" />
+              <xs:element name="Floor" msprop:Generator_UserColumnName="Floor" msprop:Generator_ColumnPropNameInTable="FloorColumn" msprop:Generator_ColumnPropNameInRow="Floor" msprop:Generator_ColumnVarNameInTable="columnFloor" type="xs:string" minOccurs="0" />
+              <xs:element name="Section" msprop:Generator_UserColumnName="Section" msprop:Generator_ColumnPropNameInTable="SectionColumn" msprop:Generator_ColumnPropNameInRow="Section" msprop:Generator_ColumnVarNameInTable="columnSection" type="xs:string" minOccurs="0" />
+              <xs:element name="Line" msprop:Generator_UserColumnName="Line" msprop:Generator_ColumnPropNameInTable="LineColumn" msprop:Generator_ColumnPropNameInRow="Line" msprop:Generator_ColumnVarNameInTable="columnLine" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -363,6 +372,7 @@
               <xs:element name="Opening" msprop:Generator_ColumnPropNameInTable="OpeningColumn" msprop:Generator_ColumnPropNameInRow="Opening" msprop:Generator_UserColumnName="Opening" msprop:Generator_ColumnVarNameInTable="columnOpening" type="xs:string" minOccurs="0" />
               <xs:element name="Availed" msprop:Generator_ColumnPropNameInTable="AvailedColumn" msprop:Generator_ColumnPropNameInRow="Availed" msprop:Generator_UserColumnName="Availed" msprop:Generator_ColumnVarNameInTable="columnAvailed" type="xs:string" minOccurs="0" />
               <xs:element name="Balance" msprop:Generator_ColumnPropNameInTable="BalanceColumn" msprop:Generator_ColumnPropNameInRow="Balance" msprop:Generator_UserColumnName="Balance" msprop:Generator_ColumnVarNameInTable="columnBalance" type="xs:string" minOccurs="0" />
+              <xs:element name="CFDays" msprop:Generator_UserColumnName="CFDays" msprop:Generator_ColumnPropNameInTable="CFDaysColumn" msprop:Generator_ColumnPropNameInRow="CFDays" msprop:Generator_ColumnVarNameInTable="columnCFDays" type="xs:string" minOccurs="0" />
               <xs:element name="EmpNo" msprop:Generator_ColumnPropNameInTable="EmpNoColumn" msprop:Generator_ColumnPropNameInRow="EmpNo" msprop:Generator_UserColumnName="EmpNo" msprop:Generator_ColumnVarNameInTable="columnEmpNo" type="xs:string" minOccurs="0" />
               <xs:element name="Name" msprop:Generator_ColumnPropNameInTable="NameColumn" msprop:Generator_ColumnPropNameInRow="Name" msprop:Generator_UserColumnName="Name" msprop:Generator_ColumnVarNameInTable="columnName" type="xs:string" minOccurs="0" />
               <xs:element name="Designation" msprop:Generator_ColumnPropNameInTable="DesignationColumn" msprop:Generator_ColumnPropNameInRow="Designation" msprop:Generator_UserColumnName="Designation" msprop:Generator_ColumnVarNameInTable="columnDesignation" type="xs:string" minOccurs="0" />
@@ -375,6 +385,9 @@
               <xs:element name="MaxAccumulatedDays" msprop:Generator_ColumnPropNameInTable="MaxAccumulatedDaysColumn" msprop:Generator_ColumnPropNameInRow="MaxAccumulatedDays" msprop:Generator_UserColumnName="MaxAccumulatedDays" msprop:Generator_ColumnVarNameInTable="columnMaxAccumulatedDays" type="xs:string" minOccurs="0" />
               <xs:element name="MaxAccumulatedDaysHr" msprop:Generator_ColumnPropNameInTable="MaxAccumulatedDaysHrColumn" msprop:Generator_ColumnPropNameInRow="MaxAccumulatedDaysHr" msprop:Generator_UserColumnName="MaxAccumulatedDaysHr" msprop:Generator_ColumnVarNameInTable="columnMaxAccumulatedDaysHr" type="xs:string" minOccurs="0" />
               <xs:element name="LateAttnAdjust" msprop:Generator_ColumnPropNameInTable="LateAttnAdjustColumn" msprop:Generator_ColumnPropNameInRow="LateAttnAdjust" msprop:Generator_UserColumnName="LateAttnAdjust" msprop:Generator_ColumnVarNameInTable="columnLateAttnAdjust" type="xs:string" minOccurs="0" />
+              <xs:element name="Floor" msprop:Generator_UserColumnName="Floor" msprop:Generator_ColumnPropNameInTable="FloorColumn" msprop:Generator_ColumnPropNameInRow="Floor" msprop:Generator_ColumnVarNameInTable="columnFloor" type="xs:string" minOccurs="0" />
+              <xs:element name="Section" msprop:Generator_UserColumnName="Section" msprop:Generator_ColumnPropNameInTable="SectionColumn" msprop:Generator_ColumnPropNameInRow="Section" msprop:Generator_ColumnVarNameInTable="columnSection" type="xs:string" minOccurs="0" />
+              <xs:element name="Line" msprop:Generator_UserColumnName="Line" msprop:Generator_ColumnPropNameInTable="LineColumn" msprop:Generator_ColumnPropNameInRow="Line" msprop:Generator_ColumnVarNameInTable="columnLine" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -762,25 +775,60 @@
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="CCWiseSalarySummary" msprop:Generator_RowEvHandlerName="CCWiseSalarySummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="CCWiseSalarySummaryRowDeleted" msprop:Generator_RowDeletingName="CCWiseSalarySummaryRowDeleting" msprop:Generator_RowEvArgName="CCWiseSalarySummaryRowChangeEvent" msprop:Generator_TablePropName="CCWiseSalarySummary" msprop:Generator_RowChangedName="CCWiseSalarySummaryRowChanged" msprop:Generator_RowChangingName="CCWiseSalarySummaryRowChanging" msprop:Generator_TableClassName="CCWiseSalarySummaryDataTable" msprop:Generator_RowClassName="CCWiseSalarySummaryRow" msprop:Generator_TableVarName="tableCCWiseSalarySummary" msprop:Generator_UserTableName="CCWiseSalarySummary">
+        <xs:element name="CCWiseSalarySummary" msprop:Generator_RowEvHandlerName="CCWiseSalarySummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="CCWiseSalarySummaryRowDeleted" msprop:Generator_RowDeletingName="CCWiseSalarySummaryRowDeleting" msprop:Generator_RowEvArgName="CCWiseSalarySummaryRowChangeEvent" msprop:Generator_TablePropName="CCWiseSalarySummary" msprop:Generator_RowChangedName="CCWiseSalarySummaryRowChanged" msprop:Generator_UserTableName="CCWiseSalarySummary" msprop:Generator_RowChangingName="CCWiseSalarySummaryRowChanging" msprop:Generator_RowClassName="CCWiseSalarySummaryRow" msprop:Generator_TableClassName="CCWiseSalarySummaryDataTable" msprop:Generator_TableVarName="tableCCWiseSalarySummary">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="Name" msprop:Generator_ColumnPropNameInRow="Name" msprop:Generator_ColumnPropNameInTable="NameColumn" msprop:Generator_ColumnVarNameInTable="columnName" msprop:Generator_UserColumnName="Name" type="xs:string" minOccurs="0" />
+              <xs:element name="Name" msprop:Generator_ColumnPropNameInTable="NameColumn" msprop:Generator_ColumnPropNameInRow="Name" msprop:Generator_UserColumnName="Name" msprop:Generator_ColumnVarNameInTable="columnName" type="xs:string" minOccurs="0" />
-              <xs:element name="Gross" msprop:Generator_ColumnPropNameInRow="Gross" msprop:Generator_ColumnPropNameInTable="GrossColumn" msprop:Generator_ColumnVarNameInTable="columnGross" msprop:Generator_UserColumnName="Gross" type="xs:double" minOccurs="0" />
+              <xs:element name="Gross" msprop:Generator_ColumnPropNameInTable="GrossColumn" msprop:Generator_ColumnPropNameInRow="Gross" msprop:Generator_UserColumnName="Gross" msprop:Generator_ColumnVarNameInTable="columnGross" type="xs:double" minOccurs="0" />
-              <xs:element name="PF" msprop:Generator_ColumnPropNameInRow="PF" msprop:Generator_ColumnPropNameInTable="PFColumn" msprop:Generator_ColumnVarNameInTable="columnPF" msprop:Generator_UserColumnName="PF" type="xs:double" minOccurs="0" />
+              <xs:element name="PF" msprop:Generator_ColumnPropNameInTable="PFColumn" msprop:Generator_ColumnPropNameInRow="PF" msprop:Generator_UserColumnName="PF" msprop:Generator_ColumnVarNameInTable="columnPF" type="xs:double" minOccurs="0" />
-              <xs:element name="PFLoan" msprop:Generator_ColumnPropNameInRow="PFLoan" msprop:Generator_ColumnPropNameInTable="PFLoanColumn" msprop:Generator_ColumnVarNameInTable="columnPFLoan" msprop:Generator_UserColumnName="PFLoan" type="xs:double" minOccurs="0" />
+              <xs:element name="PFLoan" msprop:Generator_ColumnPropNameInTable="PFLoanColumn" msprop:Generator_ColumnPropNameInRow="PFLoan" msprop:Generator_UserColumnName="PFLoan" msprop:Generator_ColumnVarNameInTable="columnPFLoan" type="xs:double" minOccurs="0" />
-              <xs:element name="Deduction" msprop:Generator_ColumnPropNameInRow="Deduction" msprop:Generator_ColumnPropNameInTable="DeductionColumn" msprop:Generator_ColumnVarNameInTable="columnDeduction" msprop:Generator_UserColumnName="Deduction" type="xs:double" minOccurs="0" />
+              <xs:element name="Deduction" msprop:Generator_ColumnPropNameInTable="DeductionColumn" msprop:Generator_ColumnPropNameInRow="Deduction" msprop:Generator_UserColumnName="Deduction" msprop:Generator_ColumnVarNameInTable="columnDeduction" type="xs:double" minOccurs="0" />
-              <xs:element name="NetPay" msprop:Generator_ColumnPropNameInRow="NetPay" msprop:Generator_ColumnPropNameInTable="NetPayColumn" msprop:Generator_ColumnVarNameInTable="columnNetPay" msprop:Generator_UserColumnName="NetPay" type="xs:double" minOccurs="0" />
+              <xs:element name="NetPay" msprop:Generator_ColumnPropNameInTable="NetPayColumn" msprop:Generator_ColumnPropNameInRow="NetPay" msprop:Generator_UserColumnName="NetPay" msprop:Generator_ColumnVarNameInTable="columnNetPay" type="xs:double" minOccurs="0" />
-              <xs:element name="Basic" msprop:Generator_ColumnPropNameInRow="Basic" msprop:Generator_ColumnPropNameInTable="BasicColumn" msprop:Generator_ColumnVarNameInTable="columnBasic" msprop:Generator_UserColumnName="Basic" type="xs:double" minOccurs="0" />
+              <xs:element name="Basic" msprop:Generator_ColumnPropNameInTable="BasicColumn" msprop:Generator_ColumnPropNameInRow="Basic" msprop:Generator_UserColumnName="Basic" msprop:Generator_ColumnVarNameInTable="columnBasic" type="xs:double" minOccurs="0" />
-              <xs:element name="HR" msprop:Generator_ColumnPropNameInRow="HR" msprop:Generator_ColumnPropNameInTable="HRColumn" msprop:Generator_ColumnVarNameInTable="columnHR" msprop:Generator_UserColumnName="HR" type="xs:double" minOccurs="0" />
+              <xs:element name="HR" msprop:Generator_ColumnPropNameInTable="HRColumn" msprop:Generator_ColumnPropNameInRow="HR" msprop:Generator_UserColumnName="HR" msprop:Generator_ColumnVarNameInTable="columnHR" type="xs:double" minOccurs="0" />
-              <xs:element name="Medical" msprop:Generator_ColumnPropNameInRow="Medical" msprop:Generator_ColumnPropNameInTable="MedicalColumn" msprop:Generator_ColumnVarNameInTable="columnMedical" msprop:Generator_UserColumnName="Medical" type="xs:double" minOccurs="0" />
+              <xs:element name="Medical" msprop:Generator_ColumnPropNameInTable="MedicalColumn" msprop:Generator_ColumnPropNameInRow="Medical" msprop:Generator_UserColumnName="Medical" msprop:Generator_ColumnVarNameInTable="columnMedical" type="xs:double" minOccurs="0" />
-              <xs:element name="Convence" msprop:Generator_ColumnPropNameInRow="Convence" msprop:Generator_ColumnPropNameInTable="ConvenceColumn" msprop:Generator_ColumnVarNameInTable="columnConvence" msprop:Generator_UserColumnName="Convence" type="xs:double" minOccurs="0" />
+              <xs:element name="Convence" msprop:Generator_ColumnPropNameInTable="ConvenceColumn" msprop:Generator_ColumnPropNameInRow="Convence" msprop:Generator_UserColumnName="Convence" msprop:Generator_ColumnVarNameInTable="columnConvence" type="xs:double" minOccurs="0" />
-              <xs:element name="MonthlyLocationAllowanceEURO" msprop:Generator_ColumnPropNameInRow="MonthlyLocationAllowanceEURO" msprop:Generator_ColumnPropNameInTable="MonthlyLocationAllowanceEUROColumn" msprop:Generator_ColumnVarNameInTable="columnMonthlyLocationAllowanceEURO" msprop:Generator_UserColumnName="MonthlyLocationAllowanceEURO" type="xs:double" minOccurs="0" />
+              <xs:element name="MonthlyLocationAllowanceEURO" msprop:Generator_ColumnPropNameInTable="MonthlyLocationAllowanceEUROColumn" msprop:Generator_ColumnPropNameInRow="MonthlyLocationAllowanceEURO" msprop:Generator_UserColumnName="MonthlyLocationAllowanceEURO" msprop:Generator_ColumnVarNameInTable="columnMonthlyLocationAllowanceEURO" type="xs:double" minOccurs="0" />
-              <xs:element name="ActualGross" msprop:Generator_ColumnPropNameInRow="ActualGross" msprop:Generator_ColumnPropNameInTable="ActualGrossColumn" msprop:Generator_ColumnVarNameInTable="columnActualGross" msprop:Generator_UserColumnName="ActualGross" type="xs:double" minOccurs="0" />
+              <xs:element name="ActualGross" msprop:Generator_ColumnPropNameInTable="ActualGrossColumn" msprop:Generator_ColumnPropNameInRow="ActualGross" msprop:Generator_UserColumnName="ActualGross" msprop:Generator_ColumnVarNameInTable="columnActualGross" type="xs:double" minOccurs="0" />
-              <xs:element name="ChildDeductionEURO" msprop:Generator_ColumnPropNameInRow="ChildDeductionEURO" msprop:Generator_ColumnPropNameInTable="ChildDeductionEUROColumn" msprop:Generator_ColumnVarNameInTable="columnChildDeductionEURO" msprop:Generator_UserColumnName="ChildDeductionEURO" type="xs:double" minOccurs="0" />
+              <xs:element name="ChildDeductionEURO" msprop:Generator_ColumnPropNameInTable="ChildDeductionEUROColumn" msprop:Generator_ColumnPropNameInRow="ChildDeductionEURO" msprop:Generator_UserColumnName="ChildDeductionEURO" msprop:Generator_ColumnVarNameInTable="columnChildDeductionEURO" type="xs:double" minOccurs="0" />
-              <xs:element name="TotalDeduction" msprop:Generator_ColumnPropNameInRow="TotalDeduction" msprop:Generator_ColumnPropNameInTable="TotalDeductionColumn" msprop:Generator_ColumnVarNameInTable="columnTotalDeduction" msprop:Generator_UserColumnName="TotalDeduction" type="xs:double" minOccurs="0" />
+              <xs:element name="TotalDeduction" msprop:Generator_ColumnPropNameInTable="TotalDeductionColumn" msprop:Generator_ColumnPropNameInRow="TotalDeduction" msprop:Generator_UserColumnName="TotalDeduction" msprop:Generator_ColumnVarNameInTable="columnTotalDeduction" type="xs:double" minOccurs="0" />
-              <xs:element name="HousingDeductionEURO" msprop:Generator_ColumnPropNameInRow="HousingDeductionEURO" msprop:Generator_ColumnPropNameInTable="HousingDeductionEUROColumn" msprop:Generator_ColumnVarNameInTable="columnHousingDeductionEURO" msprop:Generator_UserColumnName="HousingDeductionEURO" type="xs:double" minOccurs="0" />
+              <xs:element name="HousingDeductionEURO" msprop:Generator_ColumnPropNameInTable="HousingDeductionEUROColumn" msprop:Generator_ColumnPropNameInRow="HousingDeductionEURO" msprop:Generator_UserColumnName="HousingDeductionEURO" msprop:Generator_ColumnVarNameInTable="columnHousingDeductionEURO" type="xs:double" minOccurs="0" />
-              <xs:element name="PFLoaninterest" msprop:Generator_ColumnPropNameInRow="PFLoaninterest" msprop:Generator_ColumnPropNameInTable="PFLoaninterestColumn" msprop:Generator_ColumnVarNameInTable="columnPFLoaninterest" msprop:Generator_UserColumnName="PFLoaninterest" type="xs:double" minOccurs="0" />
+              <xs:element name="PFLoaninterest" msprop:Generator_ColumnPropNameInTable="PFLoaninterestColumn" msprop:Generator_ColumnPropNameInRow="PFLoaninterest" msprop:Generator_UserColumnName="PFLoaninterest" msprop:Generator_ColumnVarNameInTable="columnPFLoaninterest" type="xs:double" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="LeaveRegisterBangla" msprop:Generator_RowEvHandlerName="LeaveRegisterBanglaRowChangeEventHandler" msprop:Generator_RowDeletedName="LeaveRegisterBanglaRowDeleted" msprop:Generator_RowDeletingName="LeaveRegisterBanglaRowDeleting" msprop:Generator_RowEvArgName="LeaveRegisterBanglaRowChangeEvent" msprop:Generator_TablePropName="LeaveRegisterBangla" msprop:Generator_RowChangedName="LeaveRegisterBanglaRowChanged" msprop:Generator_RowChangingName="LeaveRegisterBanglaRowChanging" msprop:Generator_TableClassName="LeaveRegisterBanglaDataTable" msprop:Generator_RowClassName="LeaveRegisterBanglaRow" msprop:Generator_TableVarName="tableLeaveRegisterBangla" msprop:Generator_UserTableName="LeaveRegisterBangla">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="CardNo" msprop:Generator_ColumnPropNameInRow="CardNo" msprop:Generator_ColumnPropNameInTable="CardNoColumn" msprop:Generator_ColumnVarNameInTable="columnCardNo" msprop:Generator_UserColumnName="CardNo" type="xs:string" minOccurs="0" />
+              <xs:element name="EmpName" msprop:Generator_ColumnPropNameInRow="EmpName" msprop:Generator_ColumnPropNameInTable="EmpNameColumn" msprop:Generator_ColumnVarNameInTable="columnEmpName" msprop:Generator_UserColumnName="EmpName" type="xs:string" minOccurs="0" />
+              <xs:element name="Designation" msprop:Generator_ColumnPropNameInRow="Designation" msprop:Generator_ColumnPropNameInTable="DesignationColumn" msprop:Generator_ColumnVarNameInTable="columnDesignation" msprop:Generator_UserColumnName="Designation" type="xs:string" minOccurs="0" />
+              <xs:element name="Department" msprop:Generator_ColumnPropNameInRow="Department" msprop:Generator_ColumnPropNameInTable="DepartmentColumn" msprop:Generator_ColumnVarNameInTable="columnDepartment" msprop:Generator_UserColumnName="Department" type="xs:string" minOccurs="0" />
+              <xs:element name="JoiningDate" msprop:Generator_ColumnPropNameInRow="JoiningDate" msprop:Generator_ColumnPropNameInTable="JoiningDateColumn" msprop:Generator_ColumnVarNameInTable="columnJoiningDate" msprop:Generator_UserColumnName="JoiningDate" type="xs:string" minOccurs="0" />
+              <xs:element name="OpeningEL" msprop:Generator_ColumnPropNameInRow="OpeningEL" msprop:Generator_ColumnPropNameInTable="OpeningELColumn" msprop:Generator_ColumnVarNameInTable="columnOpeningEL" msprop:Generator_UserColumnName="OpeningEL" type="xs:string" minOccurs="0" />
+              <xs:element name="DesEL" msprop:Generator_ColumnPropNameInRow="DesEL" msprop:Generator_ColumnPropNameInTable="DesELColumn" msprop:Generator_ColumnVarNameInTable="columnDesEL" msprop:Generator_UserColumnName="DesEL" type="xs:string" minOccurs="0" />
+              <xs:element name="DesCL" msprop:Generator_ColumnPropNameInRow="DesCL" msprop:Generator_ColumnPropNameInTable="DesCLColumn" msprop:Generator_ColumnVarNameInTable="columnDesCL" msprop:Generator_UserColumnName="DesCL" type="xs:string" minOccurs="0" />
+              <xs:element name="DesML" msprop:Generator_ColumnPropNameInRow="DesML" msprop:Generator_ColumnPropNameInTable="DesMLColumn" msprop:Generator_ColumnVarNameInTable="columnDesML" msprop:Generator_UserColumnName="DesML" type="xs:string" minOccurs="0" />
+              <xs:element name="DesPL" msprop:Generator_ColumnPropNameInRow="DesPL" msprop:Generator_ColumnPropNameInTable="DesPLColumn" msprop:Generator_ColumnVarNameInTable="columnDesPL" msprop:Generator_UserColumnName="DesPL" type="xs:string" minOccurs="0" />
+              <xs:element name="DesSPL" msprop:Generator_ColumnPropNameInRow="DesSPL" msprop:Generator_ColumnPropNameInTable="DesSPLColumn" msprop:Generator_ColumnVarNameInTable="columnDesSPL" msprop:Generator_UserColumnName="DesSPL" type="xs:string" minOccurs="0" />
+              <xs:element name="DesCOM" msprop:Generator_ColumnPropNameInRow="DesCOM" msprop:Generator_ColumnPropNameInTable="DesCOMColumn" msprop:Generator_ColumnVarNameInTable="columnDesCOM" msprop:Generator_UserColumnName="DesCOM" type="xs:string" minOccurs="0" />
+              <xs:element name="DesLWOP" msprop:Generator_ColumnPropNameInRow="DesLWOP" msprop:Generator_ColumnPropNameInTable="DesLWOPColumn" msprop:Generator_ColumnVarNameInTable="columnDesLWOP" msprop:Generator_UserColumnName="DesLWOP" type="xs:string" minOccurs="0" />
+              <xs:element name="ReasonOfRejection" msprop:Generator_ColumnPropNameInRow="ReasonOfRejection" msprop:Generator_ColumnPropNameInTable="ReasonOfRejectionColumn" msprop:Generator_ColumnVarNameInTable="columnReasonOfRejection" msprop:Generator_UserColumnName="ReasonOfRejection" type="xs:string" minOccurs="0" />
+              <xs:element name="LeaveGrantedDate" msprop:Generator_ColumnPropNameInRow="LeaveGrantedDate" msprop:Generator_ColumnPropNameInTable="LeaveGrantedDateColumn" msprop:Generator_ColumnVarNameInTable="columnLeaveGrantedDate" msprop:Generator_UserColumnName="LeaveGrantedDate" type="xs:string" minOccurs="0" />
+              <xs:element name="TotalGrantedDays" msprop:Generator_ColumnPropNameInRow="TotalGrantedDays" msprop:Generator_ColumnPropNameInTable="TotalGrantedDaysColumn" msprop:Generator_ColumnVarNameInTable="columnTotalGrantedDays" msprop:Generator_UserColumnName="TotalGrantedDays" type="xs:string" minOccurs="0" />
+              <xs:element name="RemainingEL" msprop:Generator_ColumnPropNameInRow="RemainingEL" msprop:Generator_ColumnPropNameInTable="RemainingELColumn" msprop:Generator_ColumnVarNameInTable="columnRemainingEL" msprop:Generator_UserColumnName="RemainingEL" type="xs:string" minOccurs="0" />
+              <xs:element name="RemainingCL" msprop:Generator_ColumnPropNameInRow="RemainingCL" msprop:Generator_ColumnPropNameInTable="RemainingCLColumn" msprop:Generator_ColumnVarNameInTable="columnRemainingCL" msprop:Generator_UserColumnName="RemainingCL" type="xs:string" minOccurs="0" />
+              <xs:element name="RemainingML" msprop:Generator_ColumnPropNameInRow="RemainingML" msprop:Generator_ColumnPropNameInTable="RemainingMLColumn" msprop:Generator_ColumnVarNameInTable="columnRemainingML" msprop:Generator_UserColumnName="RemainingML" type="xs:string" minOccurs="0" />
+              <xs:element name="RemainingPL" msprop:Generator_ColumnPropNameInRow="RemainingPL" msprop:Generator_ColumnPropNameInTable="RemainingPLColumn" msprop:Generator_ColumnVarNameInTable="columnRemainingPL" msprop:Generator_UserColumnName="RemainingPL" type="xs:string" minOccurs="0" />
+              <xs:element name="RemainingSPL" msprop:Generator_ColumnPropNameInRow="RemainingSPL" msprop:Generator_ColumnPropNameInTable="RemainingSPLColumn" msprop:Generator_ColumnVarNameInTable="columnRemainingSPL" msprop:Generator_UserColumnName="RemainingSPL" type="xs:string" minOccurs="0" />
+              <xs:element name="RemainingCOM" msprop:Generator_ColumnPropNameInRow="RemainingCOM" msprop:Generator_ColumnPropNameInTable="RemainingCOMColumn" msprop:Generator_ColumnVarNameInTable="columnRemainingCOM" msprop:Generator_UserColumnName="RemainingCOM" type="xs:string" minOccurs="0" />
+              <xs:element name="RemainingLWOP" msprop:Generator_ColumnPropNameInRow="RemainingLWOP" msprop:Generator_ColumnPropNameInTable="RemainingLWOPColumn" msprop:Generator_ColumnVarNameInTable="columnRemainingLWOP" msprop:Generator_UserColumnName="RemainingLWOP" type="xs:string" minOccurs="0" />
+              <xs:element name="EmployeeSignature" msprop:Generator_ColumnPropNameInRow="EmployeeSignature" msprop:Generator_ColumnPropNameInTable="EmployeeSignatureColumn" msprop:Generator_ColumnVarNameInTable="columnEmployeeSignature" msprop:Generator_UserColumnName="EmployeeSignature" type="xs:string" minOccurs="0" />
+              <xs:element name="EmployerSignature" msprop:Generator_ColumnPropNameInRow="EmployerSignature" msprop:Generator_ColumnPropNameInTable="EmployerSignatureColumn" msprop:Generator_ColumnVarNameInTable="columnEmployerSignature" msprop:Generator_UserColumnName="EmployerSignature" type="xs:string" minOccurs="0" />
+              <xs:element name="DesSL" msprop:Generator_ColumnPropNameInRow="DesSL" msprop:Generator_ColumnPropNameInTable="DesSLColumn" msprop:Generator_ColumnVarNameInTable="columnDesSL" msprop:Generator_UserColumnName="DesSL" type="xs:string" minOccurs="0" />
+              <xs:element name="RemainingSL" msprop:Generator_ColumnPropNameInRow="RemainingSL" msprop:Generator_ColumnPropNameInTable="RemainingSLColumn" msprop:Generator_ColumnVarNameInTable="columnRemainingSL" msprop:Generator_UserColumnName="RemainingSL" type="xs:string" minOccurs="0" />
+              <xs:element name="ELEncashmentDetail" msprop:Generator_ColumnPropNameInRow="ELEncashmentDetail" msprop:Generator_ColumnPropNameInTable="ELEncashmentDetailColumn" msprop:Generator_ColumnVarNameInTable="columnELEncashmentDetail" msprop:Generator_UserColumnName="ELEncashmentDetail" type="xs:string" minOccurs="0" />
+              <xs:element name="Section" msprop:Generator_ColumnPropNameInRow="Section" msprop:Generator_ColumnPropNameInTable="SectionColumn" msprop:Generator_ColumnVarNameInTable="columnSection" msprop:Generator_UserColumnName="Section" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

HRM.Report/PayrollDataSet/dsEmpLeaveLedger.xss

@@ -4,56 +4,57 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="94" ViewPortY="-2" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-15" ViewPortY="-13" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:EmpLeaveLedger" ZOrder="25" X="443" Y="-3" Height="257" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
+    <Shape ID="DesignTable:EmpLeaveLedger" ZOrder="34" X="443" Y="-3" Height="28" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <Shape ID="DesignTable:CCWiseLeaveEncash" ZOrder="9" X="0" Y="18" Height="49" Width="182" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:CCWiseLeaveEncash" ZOrder="42" X="183" Y="456" Height="28" Width="182" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="45" SplitterPosition="24" />
-    <Shape ID="DesignTable:LeaveYear" ZOrder="15" X="664" Y="33" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="57" SplitterPosition="24" />
+    <Shape ID="DesignTable:LeaveYear" ZOrder="12" X="664" Y="33" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="57" SplitterPosition="24" />
-    <Shape ID="DesignTable:EmpInformation" ZOrder="24" X="446" Y="29" Height="143" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="24" />
+    <Shape ID="DesignTable:EmpInformation" ZOrder="33" X="448" Y="29" Height="28" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <Shape ID="DesignTable:OPIRegister" ZOrder="21" X="870" Y="102" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="24" />
+    <Shape ID="DesignTable:OPIRegister" ZOrder="44" X="870" Y="102" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="24" />
-    <Shape ID="DesignTable:MaternityLeave" ZOrder="30" X="218" Y="32" Height="257" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="329" SplitterPosition="24" />
+    <Shape ID="DesignTable:MaternityLeave" ZOrder="30" X="218" Y="32" Height="28" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="329" SplitterPosition="24" />
-    <Shape ID="DesignTable:MaternityStatusDetail" ZOrder="29" X="217" Y="-2" Height="105" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="91" SplitterPosition="24" />
+    <Shape ID="DesignTable:MaternityStatusDetail" ZOrder="32" X="217" Y="-2" Height="28" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="91" SplitterPosition="24" />
-    <Shape ID="DesignTable:FSSDeduct" ZOrder="36" X="8" Y="196" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="228" SplitterPosition="24" />
+    <Shape ID="DesignTable:FSSDeduct" ZOrder="21" X="8" Y="196" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="228" SplitterPosition="24" />
-    <Shape ID="DesignTable:FSSAdd" ZOrder="37" X="7" Y="3" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="228" SplitterPosition="24" />
+    <Shape ID="DesignTable:FSSAdd" ZOrder="25" X="7" Y="3" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="228" SplitterPosition="24" />
-    <Shape ID="DesignTable:GratuityLedger" ZOrder="20" X="1053" Y="0" Height="143" Width="153" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="24" />
+    <Shape ID="DesignTable:GratuityLedger" ZOrder="4" X="1053" Y="0" Height="28" Width="153" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="24" />
-    <Shape ID="DesignTable:GratuityRegister" ZOrder="19" X="1055" Y="34" Height="124" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="108" SplitterPosition="24" />
+    <Shape ID="DesignTable:GratuityRegister" ZOrder="5" X="1055" Y="34" Height="28" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="108" SplitterPosition="24" />
-    <Shape ID="DesignTable:FSSEmpInformation" ZOrder="43" X="6" Y="101" Height="257" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
+    <Shape ID="DesignTable:FSSEmpInformation" ZOrder="27" X="6" Y="101" Height="28" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <Shape ID="DesignTable:Budget" ZOrder="18" X="869" Y="66" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="24" />
+    <Shape ID="DesignTable:Budget" ZOrder="6" X="869" Y="66" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="24" />
-    <Shape ID="DesignTable:BudgetCC" ZOrder="17" X="866" Y="-2" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="142" SplitterPosition="24" />
+    <Shape ID="DesignTable:BudgetCC" ZOrder="8" X="866" Y="-2" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="142" SplitterPosition="24" />
-    <Shape ID="DesignTable:BudgetComparison" ZOrder="3" X="868" Y="31" Height="238" Width="178" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="245" SplitterPosition="234" />
+    <Shape ID="DesignTable:BudgetComparison" ZOrder="7" X="868" Y="31" Height="28" Width="178" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="245" SplitterPosition="24" />
-    <Shape ID="DesignTable:FSSAddItem" ZOrder="47" X="7" Y="133" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="63" SplitterPosition="24" />
+    <Shape ID="DesignTable:FSSAddItem" ZOrder="23" X="7" Y="133" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="63" SplitterPosition="24" />
-    <Shape ID="DesignTable:FSSDeductItem" ZOrder="48" X="8" Y="165" Height="67" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="63" SplitterPosition="24" />
+    <Shape ID="DesignTable:FSSDeductItem" ZOrder="22" X="8" Y="165" Height="28" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="63" SplitterPosition="24" />
-    <Shape ID="DesignTable:FSSAddOtherItem" ZOrder="46" X="3" Y="361" Height="67" Width="170" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="63" SplitterPosition="24" />
+    <Shape ID="DesignTable:FSSAddOtherItem" ZOrder="16" X="3" Y="361" Height="28" Width="170" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="63" SplitterPosition="24" />
-    <Shape ID="DesignTable:FStkinwords" ZOrder="45" X="5" Y="328" Height="48" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="44" SplitterPosition="24" />
+    <Shape ID="DesignTable:FStkinwords" ZOrder="49" X="5" Y="328" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="44" SplitterPosition="24" />
-    <Shape ID="DesignTable:FSSsalaryComponent" ZOrder="44" X="7" Y="69" Height="238" Width="188" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="24" />
+    <Shape ID="DesignTable:FSSsalaryComponent" ZOrder="26" X="7" Y="69" Height="28" Width="188" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="24" />
-    <Shape ID="DesignTable:FSEmp" ZOrder="38" X="7" Y="230" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
+    <Shape ID="DesignTable:FSEmp" ZOrder="20" X="7" Y="230" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <Shape ID="DesignTable:FSSFracsalary" ZOrder="42" X="6" Y="296" Height="219" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="215" SplitterPosition="24" />
+    <Shape ID="DesignTable:FSSFracsalary" ZOrder="18" X="6" Y="296" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="215" SplitterPosition="24" />
-    <Shape ID="DesignTable:FSPreLeave" ZOrder="41" X="6" Y="263" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="24" />
+    <Shape ID="DesignTable:FSPreLeave" ZOrder="19" X="6" Y="263" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="24" />
-    <Shape ID="DesignTable:fsdec" ZOrder="39" X="7" Y="38" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="24" />
+    <Shape ID="DesignTable:fsdec" ZOrder="24" X="197" Y="231" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="24" />
-    <Shape ID="DesignTable:fstotal" ZOrder="40" X="5" Y="393" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="24" />
+    <Shape ID="DesignTable:fstotal" ZOrder="17" X="5" Y="393" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="24" />
-    <Shape ID="DesignTable:LeaveBalance" ZOrder="14" X="662" Y="-1" Height="257" Width="160" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
+    <Shape ID="DesignTable:LeaveBalance" ZOrder="2" X="662" Y="-1" Height="28" Width="177" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="140" SplitterPosition="24" />
-    <Shape ID="DesignTable:EmployeesTaxDeduction" ZOrder="23" X="442" Y="62" Height="162" Width="209" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="24" />
+    <Shape ID="DesignTable:EmployeesTaxDeduction" ZOrder="14" X="442" Y="62" Height="28" Width="209" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="24" />
-    <Shape ID="DesignTable:TaxInvestment" ZOrder="28" X="219" Y="99" Height="143" Width="152" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="24" />
+    <Shape ID="DesignTable:TaxInvestment" ZOrder="29" X="219" Y="99" Height="28" Width="152" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="24" />
-    <Shape ID="DesignTable:TaxChallan" ZOrder="27" X="218" Y="132" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="24" />
+    <Shape ID="DesignTable:TaxChallan" ZOrder="28" X="218" Y="132" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="24" />
-    <Shape ID="DesignTable:LeaveApplication" ZOrder="2" X="663" Y="68" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
+    <Shape ID="DesignTable:LeaveApplication" ZOrder="36" X="663" Y="68" Height="28" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <Shape ID="DesignTable:ShortLeave" ZOrder="16" X="1055" Y="68" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="24" />
+    <Shape ID="DesignTable:ShortLeave" ZOrder="43" X="1055" Y="68" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="24" />
-    <Shape ID="DesignTable:MultipleEmployeeLeave" ZOrder="26" X="217" Y="64" Height="257" Width="204" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
+    <Shape ID="DesignTable:MultipleEmployeeLeave" ZOrder="31" X="217" Y="64" Height="28" Width="204" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <Shape ID="DesignTable:LeaveInformation" ZOrder="13" X="662" Y="97" Height="257" Width="168" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
+    <Shape ID="DesignTable:LeaveInformation" ZOrder="11" X="662" Y="97" Height="28" Width="168" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <Shape ID="DesignTable:LeaveLedger" ZOrder="12" X="663" Y="129" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="310" SplitterPosition="24" />
+    <Shape ID="DesignTable:LeaveLedger" ZOrder="10" X="663" Y="129" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="310" SplitterPosition="24" />
-    <Shape ID="DesignTable:LFAReport" ZOrder="11" X="662" Y="162" Height="238" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="24" />
+    <Shape ID="DesignTable:LFAReport" ZOrder="9" X="662" Y="162" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="24" />
-    <Shape ID="DesignTable:FSTerminalBenefit" ZOrder="35" X="3" Y="427" Height="257" Width="172" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
+    <Shape ID="DesignTable:FSTerminalBenefit" ZOrder="15" X="3" Y="427" Height="28" Width="172" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <Shape ID="DesignTable:FSLess" ZOrder="34" X="2" Y="458" Height="200" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="24" />
+    <Shape ID="DesignTable:FSLess" ZOrder="48" X="2" Y="458" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="24" />
-    <Shape ID="DesignTable:EmpDepartmentalLeave" ZOrder="22" X="439" Y="96" Height="257" Width="204" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
+    <Shape ID="DesignTable:EmpDepartmentalLeave" ZOrder="13" X="439" Y="96" Height="28" Width="204" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <Shape ID="DesignTable:TeamLeaveEmpInfo" ZOrder="31" X="0" Y="0" Height="162" Width="180" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="24" />
+    <Shape ID="DesignTable:TeamLeaveEmpInfo" ZOrder="45" X="192" Y="491" Height="28" Width="180" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="24" />
-    <Shape ID="DesignTable:TeamLeaveType" ZOrder="32" X="0" Y="0" Height="162" Width="159" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="24" />
+    <Shape ID="DesignTable:TeamLeaveType" ZOrder="46" X="195" Y="524" Height="28" Width="159" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="24" />
-    <Shape ID="DesignTable:TeamLeaveDetails" ZOrder="33" X="0" Y="0" Height="200" Width="170" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="24" />
+    <Shape ID="DesignTable:TeamLeaveDetails" ZOrder="47" X="188" Y="311" Height="28" Width="170" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="24" />
-    <Shape ID="DesignTable:BonusPaySlip" ZOrder="8" X="0" Y="18" Height="201" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:BonusPaySlip" ZOrder="41" X="184" Y="423" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="197" SplitterPosition="24" />
-    <Shape ID="DesignTable:LeaveCashAdvice" ZOrder="7" X="0" Y="18" Height="87" Width="165" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:LeaveCashAdvice" ZOrder="40" X="183" Y="385" Height="28" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="83" SplitterPosition="24" />
-    <Shape ID="DesignTable:LeaveEntrysForSchedular" ZOrder="10" X="660" Y="195" Height="257" Width="210" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
+    <Shape ID="DesignTable:LeaveEntrysForSchedular" ZOrder="3" X="660" Y="195" Height="28" Width="210" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <Shape ID="DesignTable:LeaveEncash" ZOrder="6" X="0" Y="18" Height="182" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:LeaveEncash" ZOrder="39" X="199" Y="347" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="178" SplitterPosition="24" />
-    <Shape ID="DesignTable:MLPayment" ZOrder="5" X="399" Y="182" Height="239" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:MLPayment" ZOrder="38" X="399" Y="182" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="235" SplitterPosition="24" />
-    <Shape ID="DesignTable:MLBenefit" ZOrder="4" X="240" Y="185" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:MLBenefit" ZOrder="37" X="240" Y="185" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <Shape ID="DesignTable:CCWiseSalarySummary" ZOrder="1" X="943" Y="316" Height="257" Width="221" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:CCWiseSalarySummary" ZOrder="35" X="378" Y="313" Height="28" Width="221" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
+    <Shape ID="DesignTable:LeaveRegisterBangla" ZOrder="1" X="633" Y="315" Height="28" Width="186" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

HRM.Report/RDLC/rptProdBonusAttendance.rdlc

@@ -34,16 +34,36 @@
         </Field>
         <Field Name="Date">
           <DataField>Date</DataField>
-          <rd:TypeName>System.DateTime</rd:TypeName>
+          <rd:TypeName>System.String</rd:TypeName>
         </Field>
         <Field Name="WorkingHour">
           <DataField>WorkingHour</DataField>
-          <rd:TypeName>System.Double</rd:TypeName>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Designation">
+          <DataField>Designation</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Department">
+          <DataField>Department</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Floor">
+          <DataField>Floor</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Line">
+          <DataField>Line</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Section">
+          <DataField>Section</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
         </Field>
       </Fields>
       <rd:DataSetInfo>
         <rd:DataSetName>PayrollDataSet</rd:DataSetName>
-        <rd:SchemaPath>D:\Local\Echo TextNew\Echo v2.0\Echo_Desktop\Payroll.Report\PayrollDataSet\PayrollDataSet.xsd</rd:SchemaPath>
+        <rd:SchemaPath>D:\Git\EchoTex_Payroll\HRM.Report\PayrollDataSet\PayrollDataSet.xsd</rd:SchemaPath>
         <rd:TableName>dtProdAttendance</rd:TableName>
         <rd:TableAdapterFillMethod />
         <rd:TableAdapterGetDataMethod />
@@ -150,6 +170,134 @@
                       </Textbox>
                     </CellContents>
                   </TablixCornerCell>
+                  <TablixCornerCell>
+                    <CellContents>
+                      <Textbox Name="Textbox9">
+                        <CanGrow>true</CanGrow>
+                        <KeepTogether>true</KeepTogether>
+                        <Paragraphs>
+                          <Paragraph>
+                            <TextRuns>
+                              <TextRun>
+                                <Value>Designation</Value>
+                                <Style>
+                                  <FontSize>8pt</FontSize>
+                                </Style>
+                              </TextRun>
+                            </TextRuns>
+                            <Style />
+                          </Paragraph>
+                        </Paragraphs>
+                        <rd:DefaultName>Textbox9</rd:DefaultName>
+                        <Style>
+                          <Border>
+                            <Style>Solid</Style>
+                          </Border>
+                          <BackgroundColor>LightGrey</BackgroundColor>
+                          <PaddingLeft>2pt</PaddingLeft>
+                          <PaddingRight>2pt</PaddingRight>
+                          <PaddingTop>2pt</PaddingTop>
+                          <PaddingBottom>2pt</PaddingBottom>
+                        </Style>
+                      </Textbox>
+                    </CellContents>
+                  </TablixCornerCell>
+                  <TablixCornerCell>
+                    <CellContents>
+                      <Textbox Name="Textbox11">
+                        <CanGrow>true</CanGrow>
+                        <KeepTogether>true</KeepTogether>
+                        <Paragraphs>
+                          <Paragraph>
+                            <TextRuns>
+                              <TextRun>
+                                <Value>Department</Value>
+                                <Style>
+                                  <FontSize>8pt</FontSize>
+                                </Style>
+                              </TextRun>
+                            </TextRuns>
+                            <Style />
+                          </Paragraph>
+                        </Paragraphs>
+                        <rd:DefaultName>Textbox11</rd:DefaultName>
+                        <Style>
+                          <Border>
+                            <Style>Solid</Style>
+                          </Border>
+                          <BackgroundColor>LightGrey</BackgroundColor>
+                          <PaddingLeft>2pt</PaddingLeft>
+                          <PaddingRight>2pt</PaddingRight>
+                          <PaddingTop>2pt</PaddingTop>
+                          <PaddingBottom>2pt</PaddingBottom>
+                        </Style>
+                      </Textbox>
+                    </CellContents>
+                  </TablixCornerCell>
+                  <TablixCornerCell>
+                    <CellContents>
+                      <Textbox Name="Textbox13">
+                        <CanGrow>true</CanGrow>
+                        <KeepTogether>true</KeepTogether>
+                        <Paragraphs>
+                          <Paragraph>
+                            <TextRuns>
+                              <TextRun>
+                                <Value>Section</Value>
+                                <Style>
+                                  <FontSize>8pt</FontSize>
+                                </Style>
+                              </TextRun>
+                            </TextRuns>
+                            <Style />
+                          </Paragraph>
+                        </Paragraphs>
+                        <rd:DefaultName>Textbox13</rd:DefaultName>
+                        <Style>
+                          <Border>
+                            <Style>Solid</Style>
+                          </Border>
+                          <BackgroundColor>LightGrey</BackgroundColor>
+                          <PaddingLeft>2pt</PaddingLeft>
+                          <PaddingRight>2pt</PaddingRight>
+                          <PaddingTop>2pt</PaddingTop>
+                          <PaddingBottom>2pt</PaddingBottom>
+                        </Style>
+                      </Textbox>
+                    </CellContents>
+                  </TablixCornerCell>
+                  <TablixCornerCell>
+                    <CellContents>
+                      <Textbox Name="Textbox15">
+                        <CanGrow>true</CanGrow>
+                        <KeepTogether>true</KeepTogether>
+                        <Paragraphs>
+                          <Paragraph>
+                            <TextRuns>
+                              <TextRun>
+                                <Value>Floor</Value>
+                                <Style>
+                                  <FontSize>8pt</FontSize>
+                                </Style>
+                              </TextRun>
+                            </TextRuns>
+                            <Style />
+                          </Paragraph>
+                        </Paragraphs>
+                        <rd:DefaultName>Textbox15</rd:DefaultName>
+                        <Style>
+                          <Border>
+                            <Style>Solid</Style>
+                          </Border>
+                          <BackgroundColor>LightGrey</BackgroundColor>
+                          <PaddingLeft>2pt</PaddingLeft>
+                          <PaddingRight>2pt</PaddingRight>
+                          <PaddingTop>2pt</PaddingTop>
+                          <PaddingBottom>2pt</PaddingBottom>
+                        </Style>
+                      </Textbox>
+                    </CellContents>
+                  </TablixCornerCell>
                 </TablixCornerRow>
               </TablixCornerRows>
             </TablixCorner>
@@ -422,6 +570,190 @@
                           </Textbox>
                         </CellContents>
                       </TablixHeader>
+                      <TablixMembers>
+                        <TablixMember>
+                          <Group Name="Designation">
+                            <GroupExpressions>
+                              <GroupExpression>=Fields!Designation.Value</GroupExpression>
+                            </GroupExpressions>
+                          </Group>
+                          <SortExpressions>
+                            <SortExpression>
+                              <Value>=Fields!Designation.Value</Value>
+                            </SortExpression>
+                          </SortExpressions>
+                          <TablixHeader>
+                            <Size>1in</Size>
+                            <CellContents>
+                              <Textbox Name="Designation">
+                                <CanGrow>true</CanGrow>
+                                <KeepTogether>true</KeepTogether>
+                                <Paragraphs>
+                                  <Paragraph>
+                                    <TextRuns>
+                                      <TextRun>
+                                        <Value>=Fields!Designation.Value</Value>
+                                        <Style>
+                                          <FontSize>8pt</FontSize>
+                                        </Style>
+                                      </TextRun>
+                                    </TextRuns>
+                                    <Style />
+                                  </Paragraph>
+                                </Paragraphs>
+                                <rd:DefaultName>Designation</rd:DefaultName>
+                                <Style>
+                                  <Border>
+                                    <Style>Solid</Style>
+                                  </Border>
+                                  <PaddingLeft>2pt</PaddingLeft>
+                                  <PaddingRight>2pt</PaddingRight>
+                                  <PaddingTop>2pt</PaddingTop>
+                                  <PaddingBottom>2pt</PaddingBottom>
+                                </Style>
+                              </Textbox>
+                            </CellContents>
+                          </TablixHeader>
+                          <TablixMembers>
+                            <TablixMember>
+                              <Group Name="Department">
+                                <GroupExpressions>
+                                  <GroupExpression>=Fields!Department.Value</GroupExpression>
+                                </GroupExpressions>
+                              </Group>
+                              <SortExpressions>
+                                <SortExpression>
+                                  <Value>=Fields!Department.Value</Value>
+                                </SortExpression>
+                              </SortExpressions>
+                              <TablixHeader>
+                                <Size>1in</Size>
+                                <CellContents>
+                                  <Textbox Name="Department">
+                                    <CanGrow>true</CanGrow>
+                                    <KeepTogether>true</KeepTogether>
+                                    <Paragraphs>
+                                      <Paragraph>
+                                        <TextRuns>
+                                          <TextRun>
+                                            <Value>=Fields!Department.Value</Value>
+                                            <Style>
+                                              <FontSize>8pt</FontSize>
+                                            </Style>
+                                          </TextRun>
+                                        </TextRuns>
+                                        <Style />
+                                      </Paragraph>
+                                    </Paragraphs>
+                                    <rd:DefaultName>Department</rd:DefaultName>
+                                    <Style>
+                                      <Border>
+                                        <Style>Solid</Style>
+                                      </Border>
+                                      <PaddingLeft>2pt</PaddingLeft>
+                                      <PaddingRight>2pt</PaddingRight>
+                                      <PaddingTop>2pt</PaddingTop>
+                                      <PaddingBottom>2pt</PaddingBottom>
+                                    </Style>
+                                  </Textbox>
+                                </CellContents>
+                              </TablixHeader>
+                              <TablixMembers>
+                                <TablixMember>
+                                  <Group Name="Section">
+                                    <GroupExpressions>
+                                      <GroupExpression>=Fields!Section.Value</GroupExpression>
+                                    </GroupExpressions>
+                                  </Group>
+                                  <SortExpressions>
+                                    <SortExpression>
+                                      <Value>=Fields!Section.Value</Value>
+                                    </SortExpression>
+                                  </SortExpressions>
+                                  <TablixHeader>
+                                    <Size>0.80208in</Size>
+                                    <CellContents>
+                                      <Textbox Name="Section">
+                                        <CanGrow>true</CanGrow>
+                                        <KeepTogether>true</KeepTogether>
+                                        <Paragraphs>
+                                          <Paragraph>
+                                            <TextRuns>
+                                              <TextRun>
+                                                <Value>=Fields!Section.Value</Value>
+                                                <Style>
+                                                  <FontSize>8pt</FontSize>
+                                                </Style>
+                                              </TextRun>
+                                            </TextRuns>
+                                            <Style />
+                                          </Paragraph>
+                                        </Paragraphs>
+                                        <rd:DefaultName>Section</rd:DefaultName>
+                                        <Style>
+                                          <Border>
+                                            <Style>Solid</Style>
+                                          </Border>
+                                          <PaddingLeft>2pt</PaddingLeft>
+                                          <PaddingRight>2pt</PaddingRight>
+                                          <PaddingTop>2pt</PaddingTop>
+                                          <PaddingBottom>2pt</PaddingBottom>
+                                        </Style>
+                                      </Textbox>
+                                    </CellContents>
+                                  </TablixHeader>
+                                  <TablixMembers>
+                                    <TablixMember>
+                                      <Group Name="Floor">
+                                        <GroupExpressions>
+                                          <GroupExpression>=Fields!Floor.Value</GroupExpression>
+                                        </GroupExpressions>
+                                      </Group>
+                                      <SortExpressions>
+                                        <SortExpression>
+                                          <Value>=Fields!Floor.Value</Value>
+                                        </SortExpression>
+                                      </SortExpressions>
+                                      <TablixHeader>
+                                        <Size>0.53125in</Size>
+                                        <CellContents>
+                                          <Textbox Name="Floor">
+                                            <CanGrow>true</CanGrow>
+                                            <KeepTogether>true</KeepTogether>
+                                            <Paragraphs>
+                                              <Paragraph>
+                                                <TextRuns>
+                                                  <TextRun>
+                                                    <Value>=Fields!Floor.Value</Value>
+                                                    <Style>
+                                                      <FontSize>8pt</FontSize>
+                                                    </Style>
+                                                  </TextRun>
+                                                </TextRuns>
+                                                <Style />
+                                              </Paragraph>
+                                            </Paragraphs>
+                                            <rd:DefaultName>Floor</rd:DefaultName>
+                                            <Style>
+                                              <Border>
+                                                <Style>Solid</Style>
+                                              </Border>
+                                              <PaddingLeft>2pt</PaddingLeft>
+                                              <PaddingRight>2pt</PaddingRight>
+                                              <PaddingTop>2pt</PaddingTop>
+                                              <PaddingBottom>2pt</PaddingBottom>
+                                            </Style>
+                                          </Textbox>
+                                        </CellContents>
+                                      </TablixHeader>
+                                    </TablixMember>
+                                  </TablixMembers>
+                                </TablixMember>
+                              </TablixMembers>
+                            </TablixMember>
+                          </TablixMembers>
+                        </TablixMember>
+                      </TablixMembers>
                     </TablixMember>
                   </TablixMembers>
                 </TablixMember>
@@ -431,7 +763,7 @@
             <Top>0.53417in</Top>
             <Left>0.025in</Left>
             <Height>0.5in</Height>
-            <Width>2.66458in</Width>
+            <Width>5.99791in</Width>
             <ZIndex>1</ZIndex>
             <Style>
               <Border>

HRM.UI/ClientApp/src/app/_models/enums.ts

@@ -102,14 +102,32 @@ export enum EnumWFCvSortStatus {
 }
 
 export enum EnumLeaveCalculationType {
-    Yearly = 1,
+    // Yearly = 1,
-    Monthly_Earn = 2,
+    // Monthly_Earn = 2,
-    Hourly_365Day = 3,
+    // Hourly_365Day = 3,
-    Hourly_Monthly = 4,
+    // Hourly_Monthly = 4,
-    OneDay_On_18Day_Present = 5,
+    // OneDay_On_18Day_Present = 5,
-    Hourly_Prorated = 6,
+    // Hourly_Prorated = 6,
-    Days_365 = 7,
+    // Days_365 = 7,
-    Yearly_Without_Prorated = 8,
+    // Yearly_Without_Prorated = 8,
+    
+    Daily = 0,
+    Monthly = 1,
+    Yearly = 2,
+    //Prorated=3,
+    Not_Applicable = 4,
+    Not_Applicable_With_Prorated = 5,
+
+    
+    Hourly = 6,
+    //Yearly = 7,
+    Monthly_Earn = 8,
+    Hourly_365Day = 9,
+    Hourly_Monthly = 10,
+    OneDay_On_18Day_Present = 11,
+    Hourly_Prorated = 12,
+    Days_365 = 13,
+    Yearly_without_Prorated = 14
 }
 
 export enum EnumLeaveparamOn {

HRM.UI/ClientApp/src/app/_models/globalFunctions.ts

@@ -9,6 +9,15 @@ export class GlobalfunctionExtension {
     lastDate.setMonth(lastDate.getMonth() + 1, 0);
     return lastDate;
   }
+
+  public static getFirstDateofYear(inputDate: Date): Date {
+    inputDate = new Date(inputDate);
+    return new Date(inputDate.getFullYear(), 0, 1);
+  }
+  public static getLastDateOfYear(inputDate: Date): Date {
+    inputDate = new Date(inputDate);
+    return new Date(inputDate.getFullYear(), 11, 31);
+  }
   public static capitalizeFirstLetter(inputString: string): string {
     debugger;
     if (inputString.length === 0) {

HRM.UI/ClientApp/src/app/app.api.service.ts

@@ -14,7 +14,7 @@ export class ApiService {
     public isSSO = false;
     public versionDeployement = false;
     // public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2025, 1, 25))}-`+"01";
-    public versionNumber = `V-20250724-`+"01";
+    public versionNumber = `V-20250902-`+"01";
     public static BASE_URL = '';
     public base_url = '';
     // public currentLink = '';

HRM.UI/ClientApp/src/app/payroll/career-and-profile/life-cycle-entry/life-cycle-entry.component.html

@@ -80,7 +80,9 @@
                 </div>
                 <div class="p-col-12 p-lg-1" align="center">:</div>
                 <div class="p-col-12 p-lg-4"
-                    [ngStyle]="{ 'color': _statusString === 'Discontinued' ? 'red' : 'inherit' }">
+                    [ngStyle]="{ color: _statusString === 'Discontinued' ? 'red' : (_statusString === 'Live' ? 'green' : 'black'), 
+                        fontWeight: 'bold'
+                     }">
                     {{ _statusString }}
                 </div>
 

HRM.UI/ClientApp/src/app/reports/emp-leave-balance/emp-leave-balance.component.html

@@ -1,78 +1,126 @@
 <app-loading-panel> </app-loading-panel>
 <div class="card card-w-card">
-    <div class="p-grid">
+    <div *ngIf="reportID == 724">
-        <div class="p-col-12 p-md-6 p-lg-2">
+
+        <div class="p-grid">
+            <!-- <div class="p-col-12 p-md-6 p-lg-2">
             <label>Select Employee:</label>
+        </div> -->
+            <div class="p-col-12 p-md-6 p-lg-2">
+                <app-employee-picker (ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
+            </div>
+            <div class="p-col-12 p-md-6 p-lg-3">
+                <div class="p-grid">
+                    <div class="p-col-4" style="margin: auto;">
+                        <label>From Date </label>
+                    </div>
+                    <div class="p-col-8">
+                        <kendo-datepicker format="dd MMM yyyy" [(ngModel)]="fromDate"
+                            style="width:100%"></kendo-datepicker>
+                    </div>
+                </div>
+            </div>
+            <div class="p-col-12 p-md-6 p-lg-3">
+                <div class="p-grid">
+                    <div class="p-col-4" style="margin: auto;">
+                        <label>To Date </label>
+                    </div>
+                    <div class="p-col-8">
+                        <kendo-datepicker format="dd MMM yyyy" [(ngModel)]="toDate"
+                            style="width:100%"></kendo-datepicker>
+                    </div>
+                </div>
+            </div>
+            <div class="p-col-12 p-md-6 p-lg-3">
+                <div class="p-grid">
+                    <div class="p-col-4" style="margin: auto;">
+                        <label>Leave Type </label>
+                    </div>
+                    <div class="p-col-8">
+                        <kendo-dropdownlist [data]="leaveList" [(ngModel)]="leaveId"
+                            [defaultItem]="{ description: 'All', id: null }" [textField]="'description'"
+                            [valueField]="'id'" [valuePrimitive]="true" style="width: 100%">
+                        </kendo-dropdownlist>
+                    </div>
+                </div>
+            </div>
+            <div class="p-col-12 p-md-6 p-lg-1" align="right">
+                <button type="button" kendoButton icon="file-pdf" [primary]="true" (click)="preview('PDF')" style="margin-right: 10px;">Preview</button>
+                <button type="button" kendoButton icon="file-excel" [primary]="true" (click)="preview('EXCEL')">Export</button>
+            </div>
+            <!-- <div class="p-col-12 p-md-6 p-lg-2">
+                <label>Leave Year:</label>
+            </div>
+            <div class="p-col-12 p-md-6 p-lg-2">
+                <kendo-dropdownlist [data]="leaveYearList"
+                                    [(ngModel)]="leaveYearId"
+                                    [defaultItem]="{ name: 'Select Leave Year...', id: null }"
+                                    [textField]="'name'"
+                                    [valueField]="'id'"
+                                    [valuePrimitive]="true"
+                                    style="width: 100%"
+                                    class="form-control form-control-sm input-sm"
+                >
+                </kendo-dropdownlist>
+            </div> -->
         </div>
-        <div class="p-col-12 p-md-6 p-lg-2">
+    </div>
-            <app-employee-picker (ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
+    
-        </div>
+    <div *ngIf="reportID == 727">
-        <div class="p-col-12 p-md-6 p-lg-2">
+        <div class="p-grid">
-            <label>Leave:</label>
+            <div class="p-col-12 p-md-6 p-lg-4">
-        </div>
+                <div class="p-grid">
-        <div class="p-col-12 p-md-6 p-lg-2">
+                    <div class="p-col-4" style="margin: auto;">
-            <kendo-dropdownlist [data]="leaveList"
+                        <label>Select Employee</label>
-                                [(ngModel)]="leaveId"
+                    </div>
-                                [defaultItem]="{ description: 'Select Leave Year...', id: null }"
+                    <div class="p-col-8">
-                                [textField]="'description'"
+                        <app-employee-picker (ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
-                                [valueField]="'id'"
+                    </div>
-                                [valuePrimitive]="true"
+                </div>
-                                style="width: 100%"
+            </div>
-                                class="form-control form-control-sm input-sm"
+            <div class="p-col-12 p-md-6 p-lg-4">
-            >
+                <div class="p-grid">
-            </kendo-dropdownlist>
+                    <div class="p-col-4" style="margin: auto;">
-        </div>
+                        <label>Authorized Person</label>
-        <div class="p-col-12 p-md-6 p-lg-2">
+                    </div>
-            <label>Leave Year:</label>
+                    <div class="p-col-8">
-        </div>
+                        <kendo-dropdownlist [data]="authPersons" [(ngModel)]="personID"
-        <div class="p-col-12 p-md-6 p-lg-2">
+                            [textField]="'name'" [valueField]="'id'" 
-            <kendo-dropdownlist [data]="leaveYearList"
+                            [valuePrimitive]="true" style="width: 100%">
-                                [(ngModel)]="leaveYearId"
+                        </kendo-dropdownlist>
-                                [defaultItem]="{ name: 'Select Leave Year...', id: null }"
+                    </div>
-                                [textField]="'name'"
+                </div>
-                                [valueField]="'id'"
+            </div>
-                                [valuePrimitive]="true"
+            
-                                style="width: 100%"
+            <div class="p-col-12 p-md-12 p-lg-4" align="right">
-                                class="form-control form-control-sm input-sm"
+                <button type="button" kendoButton icon="file-pdf" [primary]="true" (click)="preview('PDF')" style="margin-right: 10px;">Preview</button>
-            >
+                <button type="button" kendoButton icon="file-excel" [primary]="true" (click)="preview('EXCEL')">Export</button>
-            </kendo-dropdownlist>
+            </div>
-        </div>
+
-        <div class="p-col-12 p-md-12 p-lg-2" align="right">
-            <button type="button" class="k-primary" (click)="preview()" icon="preview" kendoButton>Preview</button>
         </div>
     </div>
 </div>
-<kendo-dialog *ngIf="showPopUp" (close)="closeForm()"
-              title="{{PDFTitle}}"
-              [height]="500" [width]="800">
-
 
+<!-- <kendo-window *ngIf="showPopUp" (close)="closeForm()" title="{{PDFTitle}}" [height]="500" [width]="800">
     <div class="p-grid">
         <div class="p-col-12">
-            <!--<pdf-viewer [src]="src" style="width: 400px; height: 500px"
+            <ngx-extended-pdf-viewer [src]="src" [showBookmarkButton]="false" [showOpenFileButton]="false"
-        [show-borders]="true"></pdf-viewer>-->
+                [showSidebarButton]="false" [textLayer]="false" [enableDragAndDrop]="false"
-            <!--<ngx-extended-pdf-viewer [src]="getSrcDocument()"
+                [showSecondaryToolbarButton]="false" [zoom]="'page-width'" [useBrowserLocale]="true" [height]="'70vh'"
-                             backgroundColor="#ffffff"
+                [handTool]="true">
-                             [height]="'90vh'"
-                             [useBrowserLocale]="true"
-                             [showOpenFileButton]="false"
-                             [showPresentationModeButton]="true"
-                             [handTool]="false"
-                             *ngIf="blocFilterOpened">
-    </ngx-extended-pdf-viewer>-->
-
-            <ngx-extended-pdf-viewer [src]="src"
-                                     [showBookmarkButton]="false"
-                                     [showOpenFileButton]="false"
-                                     [showSidebarButton]="false"
-                                     [textLayer]="false"
-                                     [enableDragAndDrop]="false"
-                                     [showSecondaryToolbarButton]="false"
-                                     [zoom]="'page-width'"
-                                     [useBrowserLocale]="true"
-                                     [height]="'70vh'"
-                                     [handTool]="true">
             </ngx-extended-pdf-viewer>
         </div>
     </div>
-</kendo-dialog>
+</kendo-window>
+ -->
+
+
+<div class="card" *ngIf="showPopUp" class="blur-background">
+    <kendo-window [height]="600" class='window-viewer' title="{{PDFTitle}}" *ngIf="showPopUp" (close)="closeForm()">
+    <!-- [height]="600" [style]="{'min-width': '70%','max-width': '100%', 'max-height': '100%'}"> -->
+        <app-loading-panel> </app-loading-panel>
+        <div class='embed-responsive'>
+            <iframe class="pdf-viewer" id="pdf-viewer-report" type='application/pdf' [zoom]="zoomLevel"></iframe>
+        </div>
+    </kendo-window>
+</div>

HRM.UI/ClientApp/src/app/reports/emp-leave-balance/emp-leave-balance.component.scss

@@ -0,0 +1,32 @@
+.embed-responsive {
+    position: relative;
+    display: block;
+    /* height: 0; */
+    padding: 0;
+    overflow: hidden;
+    /* padding-bottom:68%; */
+    background: white;
+}
+
+
+.pdf-viewer {
+    width: 100%;
+    /* min-height: 700px; */
+    height: 100%;
+    /* min-width: 275px; */
+    /* max-height: 100%;
+    background-color: white !important; */
+}
+
+.window-viewer {
+    /* position: relative;
+    top: 0;
+    left: 0;
+    transform: translate(5%, 5%); */
+    width: 70%;
+    /* height: 90%; */
+    /* min-width: 300px; */
+    /* max-width: 100%;
+    min-height: 80%; */
+    max-height: 100%;
+}

HRM.UI/ClientApp/src/app/reports/emp-leave-balance/emp-leave-balance.component.ts

@@ -1,43 +1,67 @@
 import { Component, OnInit } from '@angular/core';
-import {SearchEmployee} from '../../_models/Employee/searchEmployee';
+import { SearchEmployee } from '../../_models/Employee/searchEmployee';
-import {LeaveYear} from '../../_models/Leave/leaveYear';
+import { LeaveYear } from '../../_models/Leave/leaveYear';
-import {Leave} from '../../_models/Leave/leave';
+import { Leave } from '../../_models/Leave/leave';
-import {LeaveService} from '../../_services/leave/leave.service';
+import { LeaveService } from '../../_services/leave/leave.service';
-import {HRMNotificationService} from '../../app.notification.service';
+import { HRMNotificationService } from '../../app.notification.service';
-import {loadingPanelService} from '../../hrm-loding panel/loding.panel.service';
+import { loadingPanelService } from '../../hrm-loding panel/loding.panel.service';
-import {ApiService} from '../../app.api.service';
+import { ApiService } from '../../app.api.service';
-import {EnumStatus} from '../../_models/enums';
+import { EnumStatus } from '../../_models/enums';
-import {saveAs} from 'file-saver';
+import { saveAs } from 'file-saver';
-import {ReportServices} from '../../_services/reports/report.service';
+import { ReportServices } from '../../_services/reports/report.service';
+import { GlobalfunctionExtension } from 'src/app/_models/globalFunctions';
+import { Router } from '@angular/router';
+import { EmployeeServices } from 'src/app/_services/employee/employee.service';
+import { AuthorizedPerson } from 'src/app/adhoc-feature/authorized-persons/authorizedPerson';
 
 @Component({
-  selector: 'app-emp-leave-balance',
+    selector: 'app-emp-leave-balance',
-  templateUrl: './emp-leave-balance.component.html',
+    templateUrl: './emp-leave-balance.component.html',
-  styleUrls: ['./emp-leave-balance.component.scss']
+    styleUrls: ['./emp-leave-balance.component.scss']
 })
 export class EmpLeaveBalanceComponent implements OnInit {
     selectedEmployee: SearchEmployee;
     leaveYearList: LeaveYear[] = [];
     leaveList: Leave[] = [];
     leaveYearId: number;
-    PDFTitle = 'Employee Leave Balance';
+    PDFTitle = null;
     showPopUp = false;
     data: Array<Object>;
     src: any;
     base64Data: any;
     leaveId: number;
+    fromDate: Date = GlobalfunctionExtension.getFirstDateofYear(new Date());
+    toDate: Date = GlobalfunctionExtension.getLastDateOfYear(new Date());
 
+    authPersons: AuthorizedPerson[];
+    personID: number;
+    reportRoute: any;
+    reportID: number;
 
     constructor(public leaveService: LeaveService,
-                public notificationService: HRMNotificationService,
+        public notificationService: HRMNotificationService,
-                public reportService: ReportServices,
+        public reportService: ReportServices,
-                public loadingPanel: loadingPanelService,
+        public loadingPanel: loadingPanelService,
-                public apiService: ApiService) {
+        public apiService: ApiService,
-        this.apiService.selectedMenuName = 'Employee Leave Balance';
+        public router: Router,
+        public employeeService: EmployeeServices) {
+        this.reportRoute = this.router.url.split('/').pop();
+        debugger
+        if (this.reportRoute == 'emp-leave-balance') {
+            this.apiService.selectedMenuName = 'Employee Leave Balance';
+            this.PDFTitle = 'Employee Leave Balance';
+            this.reportID = 724;
+        }
+        else if (this.reportRoute == 'leave-register') {
+            this.apiService.selectedMenuName = 'Leave Register Report';
+            this.PDFTitle = 'Leave Register Bangla';
+            this.reportID = 727;
+        }
     }
 
     ngOnInit(): void {
         this.loadLeaveYear();
+        this.loadAuthPersons();
     }
 
     public GetSelectedEmployee(childData) {
@@ -50,10 +74,11 @@ export class EmpLeaveBalanceComponent implements OnInit {
                 this.leaveYearList = resp;
             },
             (err) => {
-                console.log(err);
+                this.notificationService.showError(err.error);
+                this.loadingPanel.ShowLoadingPanel = false;
             },
             () => {
-                console.log(this.leaveYearList);
+                // console.log(this.leaveYearList);
             }
         );
         this.leaveService.getAllLeave(EnumStatus.Active, '', '').subscribe(
@@ -61,40 +86,72 @@ export class EmpLeaveBalanceComponent implements OnInit {
                 this.leaveList = resp;
             },
             (err) => {
-                console.log(err);
+                this.notificationService.showError(err.error);
+                this.loadingPanel.ShowLoadingPanel = false;
             },
             () => {
-                console.log(this.leaveList);
+                // console.log(this.leaveList);
                 /*this.leaveList.forEach(x => {
                     x.code = x.code.toLowerCase() + x.id;
                 });*/
             },
         );
     }
+    loadAuthPersons() {
+        this.employeeService.getAuthorizedPerson().subscribe(
+            (resp) => {
+                this.authPersons = resp;
+                debugger;
+            },
+            (err) => {
+                this.notificationService.showError(err.error);
+                this.loadingPanel.ShowLoadingPanel = false;
+            }
+        );
+    }
 
-    preview() {
+    preview(reportType: string) {
-        const leave = this.leaveYearList.find(l => l.id === this.leaveYearId);
+        // const leave = this.leaveYearList.find(l => l.id === this.leaveYearId);
-        if (leave === null) {
+        // if (leave === null) {
-            this.notificationService.showError('Please select leave year!');
+        //     this.notificationService.showError('Please select leave year!');
-            return;
+        //     return;
-        }
+        // }
-        const data = {
+        let data;
-            reportid: 97,
+        if (this.reportID == 724)
-            itemid: this.leaveId,
+            data = {
-            bankId: null,
+                reportid: this.reportID,
-            empIds: this.selectedEmployee.employeeID.toString(),
+                itemid: this.leaveId,
-            reportType: 'PDF',
+                bankId: null,
-            fromDate: leave.startDate,
+                empIds: this.selectedEmployee.employeeID.toString(),
-            toDate: leave.endDate
+                reportType: reportType,
-        };
+                fromDate: this.fromDate,
+                toDate: this.toDate
+            };
+        else if (this.reportID == 727)
+            data = {
+                reportid: this.reportID,
+                itemid: this.personID,
+                empIds: this.selectedEmployee.employeeID.toString(),
+                reportType: reportType,
+            };
 
         this.loadingPanel.ShowLoadingPanel = true;
+        if (reportType === 'PDF')
+            this.showPopUp = true;
         this.reportService.getCommonReportData(data).subscribe(
             (resp: any) => {
-                if (data.reportType === 'PDF') {
+                // if (data.reportType === 'PDF') {
-                    this.src = URL.createObjectURL(this.b64toBlob(resp, 'data:application/pdf;base64', 1024));
+                //     this.src = URL.createObjectURL(this.b64toBlob(resp, 'data:application/pdf;base64', 1024));
-                    this.showPopUp = true;
+                //     this.showPopUp = true;
-                } else if (data.reportType === 'EXCEL') {
+                // } else if (data.reportType === 'EXCEL') {
+                //     this.downloadFile(resp);
+                // }
+                
+                if (reportType === 'PDF') {
+                    this.src = URL.createObjectURL(this.b64toBlob(resp, 'application/pdf', 1024));
+                    var element = <HTMLIFrameElement>(document.getElementById("pdf-viewer-report"));
+                    element.src = this.src;
+                } else if (reportType === 'EXCEL') {
                     this.downloadFile(resp);
                 }
             },
@@ -102,6 +159,7 @@ export class EmpLeaveBalanceComponent implements OnInit {
                 console.log(err);
                 this.notificationService.showError(err.error);
                 this.loadingPanel.ShowLoadingPanel = false;
+                this.showPopUp = false;
             },
             () => {
 
@@ -132,7 +190,7 @@ export class EmpLeaveBalanceComponent implements OnInit {
             byteArrays.push(byteArray);
         }
 
-        const blob = new Blob(byteArrays, {type: contentType});
+        const blob = new Blob(byteArrays, { type: contentType });
         return blob;
     }
 

HRM.UI/ClientApp/src/app/reports/leave-encashment-report/leave-encashment-report.component.html

@@ -0,0 +1,50 @@
+<app-loading-panel> </app-loading-panel>
+<div class="card card-w-card">
+    <div class="p-grid" style="margin: auto;">
+        <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
+            <label>Select Employee:</label>
+        </div>
+        <div class="p-col-12 p-md-6 p-lg-2">
+            <app-employee-picker [MultiSelect]="true"
+                (ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
+        </div>
+        <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
+            <label>Leave Year:</label>
+        </div>
+        <div class="p-col-12 p-md-6 p-lg-2">
+            <kendo-dropdownlist [data]="leaveYearList" [(ngModel)]="leaveYearId"
+                [defaultItem]="{ name: 'Select a Leave Year', id: null }" [textField]="'name'" [valueField]="'id'"
+                [valuePrimitive]="true" style="width: 100%" class="form-control form-control-sm input-sm">
+            </kendo-dropdownlist>
+        </div>
+        <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
+            <label>Encash From Month:</label>
+        </div>
+        <div class="p-col-12 p-md-6 p-lg-2">
+            <kendo-datepicker format="MMM yyyy" [(ngModel)]="fromDate" style="width:100%"></kendo-datepicker>
+        </div>
+        <div class="p-col-12 p-md-12 p-lg-12" align="right">
+            <button type="button" kendoButton icon="file-pdf" [primary]="true" (click)="preview('PDF')"
+                style="margin-right: 10px;">Preview</button>
+            <button type="button" kendoButton icon="file-excel" [primary]="true"
+                (click)="preview('EXCEL')">Export</button>
+        </div>
+    </div>
+</div>
+
+
+
+
+
+
+
+
+<div class="card" *ngIf="showPopUp" class="blur-background">
+    <kendo-window [height]="600" class='window-viewer' title="{{PDFTitle}}" *ngIf="showPopUp" (close)="closeForm()">
+        <!-- [height]="600" [style]="{'min-width': '70%','max-width': '100%', 'max-height': '100%'}"> -->
+        <app-loading-panel> </app-loading-panel>
+        <div class='embed-responsive'>
+            <iframe class="pdf-viewer" id="pdf-viewer-report" type='application/pdf' [zoom]="zoomLevel"></iframe>
+        </div>
+    </kendo-window>
+</div>

HRM.UI/ClientApp/src/app/reports/leave-encashment-report/leave-encashment-report.component.ts

@@ -0,0 +1,172 @@
+import { Component, OnInit } from '@angular/core';
+import { SearchEmployee } from 'src/app/_models/Employee/searchEmployee';
+import { LeaveYear } from 'src/app/_models/Leave/leaveYear';
+import { LeaveService } from 'src/app/_services/leave/leave.service';
+import { ReportServices } from 'src/app/_services/reports/report.service';
+import { ApiService } from 'src/app/app.api.service';
+import { HRMNotificationService } from 'src/app/app.notification.service';
+import { loadingPanelService } from 'src/app/hrm-loding panel/loding.panel.service';
+import { saveAs } from 'file-saver';
+import { Router } from '@angular/router';
+
+@Component({
+  selector: 'app-leave-encashment-report',
+  templateUrl: './leave-encashment-report.component.html',
+  styles: [`
+    .embed-responsive {
+      position: relative;
+      display: block;
+      /* height: 0; */
+      padding: 0;
+      overflow: hidden;
+      /* padding-bottom:68%; */
+      background: white;
+    }
+
+
+    .pdf-viewer {
+        width: 100%;
+        /* min-height: 700px; */
+        height: 100%;
+        /* min-width: 275px; */
+        /* max-height: 100%;
+        background-color: white !important; */
+    }
+
+    .window-viewer {
+        /* position: relative;
+        top: 0;
+        left: 0;
+        transform: translate(5%, 5%); */
+        width: 70%;
+        /* height: 90%; */
+        /* min-width: 300px; */
+        /* max-width: 100%;
+        min-height: 80%; */
+        max-height: 100%;
+    }`
+  ]
+})
+export class LeaveEncashmentReportComponent implements OnInit {
+
+  selectedEmployees: SearchEmployee[] = [];
+  leaveYearList: LeaveYear[] = [];
+  leaveYearId = undefined;
+  fromDate: Date = new Date();
+  empIds = '';
+
+  PDFTitle = 'Leave Encashment';
+  showPopUp = false;
+  src: any;
+  base64Data: any;
+
+  constructor(public leaveService: LeaveService, public notificationService: HRMNotificationService,
+    public loadingPanel: loadingPanelService, public apiService: ApiService,
+    public reportService: ReportServices,
+    public router: Router) {
+    this.apiService.selectedMenuName = 'Employee Encashment Report';
+  }
+
+  ngOnInit(): void {
+    this.loadLeaveYear();
+  }
+
+  loadLeaveYear() {
+    this.leaveService.getAllLeaveYear().subscribe(
+      (resp) => {
+        this.leaveYearList = resp;
+      },
+      (err) => {
+        console.log(err);
+      },
+      () => {
+      }
+    );
+  }
+
+  public GetSelectedEmployee(childData) {
+    this.selectedEmployees = childData;
+  }
+  preview(reportType: string) {
+
+    if (this.selectedEmployees == undefined || this.selectedEmployees.length == 0) {
+      this.notificationService.showWarning('Select employees for the report');
+      return;
+    }
+    if (this.leaveYearId == undefined || this.leaveYearId == null) {
+      this.notificationService.showWarning('Select Leave Year');
+      return;
+    }
+    debugger
+
+    this.selectedEmployees.forEach(x => {
+      if (this.empIds !== '') {
+        this.empIds += ',';
+      }
+      this.empIds += x.employeeID;
+    });
+
+    const data = {
+      reportid: 728,
+      itemid: this.leaveYearId,
+      empIds: this.empIds,
+      reportType: reportType,
+    };
+
+    this.loadingPanel.ShowLoadingPanel = true;
+    if (reportType === 'PDF')
+      this.showPopUp = true;
+    this.reportService.getCommonReportData(data).subscribe(
+      (resp: any) => {
+        debugger;
+        if (reportType === 'PDF') {
+          this.src = URL.createObjectURL(this.b64toBlob(resp, 'application/pdf', 1024));
+          var element = <HTMLIFrameElement>(document.getElementById("pdf-viewer-report"));
+          element.src = this.src;
+        } else if (reportType === 'EXCEL') {
+          this.downloadFile(resp);
+        }
+      },
+      (err) => {
+        console.log(err);
+        this.notificationService.showError(err.error);
+        this.loadingPanel.ShowLoadingPanel = false;
+        this.showPopUp = false;
+      },
+      () => {
+
+        this.loadingPanel.ShowLoadingPanel = false;
+        // this.loadGrid();
+      }
+    );
+
+  }
+  downloadFile(blobContent) {
+    const blob = new Blob([this.b64toBlob(blobContent, 'application/data:application/vnd.ms-excel', 1024)], {});
+    saveAs(blob, this.PDFTitle + '.xls');
+  }
+
+  b64toBlob(b64Data, contentType, sliceSize) {
+    const byteCharacters = atob(b64Data);
+    const byteArrays = [];
+
+    for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
+      const slice = byteCharacters.slice(offset, offset + sliceSize);
+
+      const byteNumbers = new Array(slice.length);
+      for (let i = 0; i < slice.length; i++) {
+        byteNumbers[i] = slice.charCodeAt(i);
+      }
+
+      const byteArray = new Uint8Array(byteNumbers);
+      byteArrays.push(byteArray);
+    }
+
+    const blob = new Blob(byteArrays, { type: contentType });
+    return blob;
+  }
+
+  closeForm(): void {
+    this.showPopUp = false;
+  }
+}

HRM.UI/ClientApp/src/app/reports/multiple-emp-leave-balance/multiple-emp-leave-balance.component.css

@@ -0,0 +1,32 @@
+.embed-responsive {
+    position: relative;
+    display: block;
+    /* height: 0; */
+    padding: 0;
+    overflow: hidden;
+    /* padding-bottom:68%; */
+    background: white;
+}
+
+
+.pdf-viewer {
+    width: 100%;
+    /* min-height: 700px; */
+    height: 100%;
+    /* min-width: 275px; */
+    /* max-height: 100%;
+    background-color: white !important; */
+}
+
+.window-viewer {
+    /* position: relative;
+    top: 0;
+    left: 0;
+    transform: translate(5%, 5%); */
+    width: 70%;
+    /* height: 90%; */
+    /* min-width: 300px; */
+    /* max-width: 100%;
+    min-height: 80%; */
+    max-height: 100%;
+}

HRM.UI/ClientApp/src/app/reports/multiple-emp-leave-balance/multiple-emp-leave-balance.component.html

@@ -4,14 +4,14 @@
         <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
             <label>Select Employee:</label>
         </div>
-        <div class="p-col-12 p-md-6 p-lg-3">
+        <div class="p-col-12 p-md-6 p-lg-2">
             <app-employee-picker [MultiSelect]="true"
                                  (ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
         </div>
         <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
             <label>Leave Year:</label>
         </div>
-        <div class="p-col-12 p-md-6 p-lg-3">
+        <div class="p-col-12 p-md-6 p-lg-2">
             <kendo-dropdownlist [data]="leaveYearList"
                                 [(ngModel)]="leaveYearId"
                                 [defaultItem]="{ name: 'Select a Leave Year', id: null }"
@@ -22,13 +22,14 @@
                                 class="form-control form-control-sm input-sm">
             </kendo-dropdownlist>
         </div>
-        <div class="p-col-12 p-md-12 p-lg-2" align="right">
+        <div class="p-col-12 p-md-12 p-lg-4" align="right">
-            <button type="button" class="k-primary" (click)="preview()" icon="preview" kendoButton>Preview</button>
+            <button type="button" kendoButton icon="file-pdf" [primary]="true" (click)="preview('PDF')" style="margin-right: 10px;">Preview</button>
+            <button type="button" kendoButton icon="file-excel" [primary]="true" (click)="preview('EXCEL')">Export</button>
         </div>
     </div>
 </div>
 
-<div class="card">
+<!-- <div class="card">
     <div class="p-grid">
         <div class="p-col-12 p-md-12 p-lg-12">
             <kendo-grid [data]="data" [resizable]="true" [height]="480">
@@ -48,4 +49,14 @@
             </kendo-grid>
         </div>
     </div>
-</div>
+</div> -->
+
+<div class="card" *ngIf="showPopUp" class="blur-background">
+    <kendo-window [height]="600" class='window-viewer' title="{{PDFTitle}}" *ngIf="showPopUp" (close)="closeForm()">
+    <!-- [height]="600" [style]="{'min-width': '70%','max-width': '100%', 'max-height': '100%'}"> -->
+        <app-loading-panel> </app-loading-panel>
+        <div class='embed-responsive'>
+            <iframe class="pdf-viewer" id="pdf-viewer-report" type='application/pdf' [zoom]="zoomLevel"></iframe>
+        </div>
+    </kendo-window>
+</div>

HRM.UI/ClientApp/src/app/reports/multiple-emp-leave-balance/multiple-emp-leave-balance.component.ts

@@ -1,13 +1,16 @@
-import {Component, OnInit} from '@angular/core';
+import { Component, OnInit } from '@angular/core';
-import {SearchEmployee} from '../../_models/Employee/searchEmployee';
+import { SearchEmployee } from '../../_models/Employee/searchEmployee';
-import {LeaveYear} from '../../_models/Leave/leaveYear';
+import { LeaveYear } from '../../_models/Leave/leaveYear';
-import {LeaveService} from '../../_services/leave/leave.service';
+import { LeaveService } from '../../_services/leave/leave.service';
-import {MultipleEmployeeLeaveBalance} from '../../_models/report/multipleEmployeeLeaveBalance';
+import { MultipleEmployeeLeaveBalance } from '../../_models/report/multipleEmployeeLeaveBalance';
-import {Leave} from '../../_models/Leave/leave';
+import { Leave } from '../../_models/Leave/leave';
-import {EnumStatus} from '../../_models/enums';
+import { EnumStatus } from '../../_models/enums';
-import {HRMNotificationService} from '../../app.notification.service';
+import { HRMNotificationService } from '../../app.notification.service';
-import {loadingPanelService} from '../../hrm-loding panel/loding.panel.service';
+import { loadingPanelService } from '../../hrm-loding panel/loding.panel.service';
-import {ApiService} from '../../app.api.service';
+import { ApiService } from '../../app.api.service';
+import { ReportServices } from 'src/app/_services/reports/report.service';
+import { saveAs } from 'file-saver';
+import { Router } from '@angular/router';
 
 @Component({
     selector: 'app-multiple-emp-leave-balance',
@@ -25,9 +28,22 @@ export class MultipleEmpLeaveBalanceComponent implements OnInit {
     temp = 'Header boss';
     cols: { colfiled: string, colName: string, width: string, color: string }[];
 
+    reportType: any;
+    PDFTitle = 'Employee Leave Balance';
+    showPopUp = false;
+    src: any;
+    base64Data: any;
+
     constructor(public leaveService: LeaveService, public notificationService: HRMNotificationService,
-                public loadingPanel: loadingPanelService, public apiService: ApiService) {
+        public loadingPanel: loadingPanelService, public apiService: ApiService,
-        this.apiService.selectedMenuName = 'Employee Leave Balance';
+        public reportService: ReportServices,
+        public router: Router) {
+        this.reportType = this.router.url.split('/').pop();
+        debugger
+        if(this.reportType == 'multiple-emp-leave-balance')
+            this.apiService.selectedMenuName = 'Multiple Employee Leave Balance';
+        else if(this.reportType == 'multiple-emp-leave-report')
+            this.apiService.selectedMenuName = 'Employee Leave Report';
     }
 
     ngOnInit() {
@@ -65,63 +81,62 @@ export class MultipleEmpLeaveBalanceComponent implements OnInit {
         this.selectedEmployees = childData;
     }
 
-    preview() {
+    // preview() {
-        /*this.selectedEmployees.forEach(x => {
+    //     /*this.selectedEmployees.forEach(x => {
-            if (this.empIds.length !== 0) {
+    //         if (this.empIds.length !== 0) {
-                this.empIds += ',';
+    //             this.empIds += ',';
-            }
+    //         }
-            this.empIds += x.employeeID;
+    //         this.empIds += x.employeeID;
-        });*/
+    //     });*/
-        this.loadingPanel.ShowLoadingPanel = true;
+    //     this.loadingPanel.ShowLoadingPanel = true;
-        if (this.selectedEmployees == undefined || this.selectedEmployees.length == 0) {
+    //     if (this.selectedEmployees == undefined || this.selectedEmployees.length == 0) {
-            this.notificationService.showError('Select employees for the report');
+    //         this.notificationService.showError('Select employees for the report');
-            this.loadingPanel.ShowLoadingPanel = false;
+    //         this.loadingPanel.ShowLoadingPanel = false;
-            return;
+    //         return;
-        }
+    //     }
-        this.selectedEmployees[0].departmentID = this.leaveYearId;
+    //     this.selectedEmployees[0].departmentID = this.leaveYearId;
-        // this.leaveService.getMultipleEmployeeLeaveBalance(this.selectedEmployees, ).subscribe(
+    //     // this.leaveService.getMultipleEmployeeLeaveBalance(this.selectedEmployees, ).subscribe(
-        this.leaveService.getMultipleEmployeeLeaveBalance(this.leaveYearId, this.selectedEmployees).subscribe(    
+    //     this.leaveService.getMultipleEmployeeLeaveBalance(this.leaveYearId, this.selectedEmployees).subscribe(    
-            (resp) => {
+    //         (resp) => {
-                debugger;
+    //             debugger;
-                this.data = resp;
+    //             this.data = resp;
-            },
+    //         },
-            (err) => {
+    //         (err) => {
-                this.notificationService.showError(err.error);
+    //             this.notificationService.showError(err.error);
-                this.loadingPanel.ShowLoadingPanel = false;
+    //             this.loadingPanel.ShowLoadingPanel = false;
 
-            },
+    //         },
-            () => {
+    //         () => {
-                this.loadingPanel.ShowLoadingPanel = false;
+    //             this.loadingPanel.ShowLoadingPanel = false;
-                if (this.data.length > 0) {
+    //             if (this.data.length > 0) {
-                    this.cols = [];
+    //                 this.cols = [];
-                    for (var i = 0; i < Object.keys(this.data[0]).length; i++) {
+    //                 for (var i = 0; i < Object.keys(this.data[0]).length; i++) {
-                        if (i == 0) {
+    //                     if (i == 0) {
-                            this.cols.push({
+    //                         this.cols.push({
-                                'colfiled': Object.keys(this.data[0])[i], 'colName': this.capitalizeFirstLetter(Object.keys(this.data[0])[i]) == 'EmpNo' ? 'Emp Id' :this.capitalizeFirstLetter(Object.keys(this.data[0])[i]) ,
+    //                             'colfiled': Object.keys(this.data[0])[i], 'colName': this.capitalizeFirstLetter(Object.keys(this.data[0])[i]) == 'EmpNo' ? 'Emp Id' :this.capitalizeFirstLetter(Object.keys(this.data[0])[i]) ,
-                                'width': '80', 'color': 'transparent'
+    //                             'width': '80', 'color': 'transparent'
-                            });
+    //                         });
-                        } else if (i == 1) {
+    //                     } else if (i == 1) {
-                            this.cols.push({
+    //                         this.cols.push({
-                                'colfiled': Object.keys(this.data[0])[i], 'colName': this.capitalizeFirstLetter(Object.keys(this.data[0])[i]),
+    //                             'colfiled': Object.keys(this.data[0])[i], 'colName': this.capitalizeFirstLetter(Object.keys(this.data[0])[i]),
-                                'width': '100', 'color': 'transparent'
+    //                             'width': '100', 'color': 'transparent'
-                            });
+    //                         });
-                        } else {
+    //                     } else {
-                            this.cols.push({
+    //                         this.cols.push({
-                                'colfiled': Object.keys(this.data[0])[i], 'colName': this.replaceUnderscoresWithSpaces(Object.keys(this.data[0])[i].toUpperCase()),
+    //                             'colfiled': Object.keys(this.data[0])[i], 'colName': this.replaceUnderscoresWithSpaces(Object.keys(this.data[0])[i].toUpperCase()),
-                                'width': '65', 'color': 'transparent'
+    //                             'width': '65', 'color': 'transparent'
-                            });
+    //                         });
-                        }
+    //                     }
-                    }
+    //                 }
-                }
+    //             }
-
-            }
-        );
-    }
 
+    //         }
+    //     );
+    // }
     public capitalizeFirstLetter(inputString: string): string {
         debugger;
         if (inputString.length === 0) {
-          return inputString; // Return an empty string if input is empty
+            return inputString; // Return an empty string if input is empty
         }
         return inputString.charAt(0).toUpperCase() + inputString.slice(1);
     }
@@ -129,4 +144,92 @@ export class MultipleEmpLeaveBalanceComponent implements OnInit {
         if (!str) return str;
         return str.replace(/_/g, ' ');
     }
+    preview(reportType: string) {
+
+        if (this.selectedEmployees == undefined || this.selectedEmployees.length == 0) {
+            this.notificationService.showWarning('Select employees for the report');
+            return;
+        }
+        if (this.leaveYearId == undefined || this.leaveYearId == null) {
+            this.notificationService.showWarning('Select Leave Year');
+            return;
+        }
+        debugger
+
+        this.selectedEmployees.forEach(x => {
+            if (this.empIds !== '') {
+                this.empIds += ',';
+            }
+            this.empIds += x.employeeID;
+        });
+        
+        let reportid
+        if(this.reportType == 'multiple-emp-leave-balance')
+            reportid = 725;
+        else if(this.reportType == 'multiple-emp-leave-report')
+            reportid = 726;
+
+        const data = {
+            reportid: reportid,
+            itemid: this.leaveYearId,
+            empIds: this.empIds,
+            reportType: reportType,
+        };
+
+        this.loadingPanel.ShowLoadingPanel = true;
+        if (reportType === 'PDF')
+            this.showPopUp = true;
+        this.reportService.getCommonReportData(data).subscribe(
+            (resp: any) => {
+                debugger;
+                if (reportType === 'PDF') {
+                    this.src = URL.createObjectURL(this.b64toBlob(resp, 'application/pdf', 1024));
+                    var element = <HTMLIFrameElement>(document.getElementById("pdf-viewer-report"));
+                    element.src = this.src;
+                } else if (reportType === 'EXCEL') {
+                    this.downloadFile(resp);
+                }
+            },
+            (err) => {
+                console.log(err);
+                this.notificationService.showError(err.error);
+                this.loadingPanel.ShowLoadingPanel = false;
+                this.showPopUp = false;
+            },
+            () => {
+
+                this.loadingPanel.ShowLoadingPanel = false;
+                // this.loadGrid();
+            }
+        );
+    }
+
+    downloadFile(blobContent) {
+        const blob = new Blob([this.b64toBlob(blobContent, 'application/data:application/vnd.ms-excel', 1024)], {});
+        saveAs(blob, this.PDFTitle + '.xls');
+    }
+
+    b64toBlob(b64Data, contentType, sliceSize) {
+        const byteCharacters = atob(b64Data);
+        const byteArrays = [];
+
+        for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
+            const slice = byteCharacters.slice(offset, offset + sliceSize);
+
+            const byteNumbers = new Array(slice.length);
+            for (let i = 0; i < slice.length; i++) {
+                byteNumbers[i] = slice.charCodeAt(i);
+            }
+
+            const byteArray = new Uint8Array(byteNumbers);
+            byteArrays.push(byteArray);
+        }
+
+        const blob = new Blob(byteArrays, { type: contentType });
+        return blob;
+    }
+
+    closeForm(): void {
+        this.showPopUp = false;
+    }
 }

HRM.UI/ClientApp/src/app/reports/report-viewer/report-viewer.component.ts

@@ -261,7 +261,7 @@ export class ReportViewerComponent implements OnInit {
             mode: 'multiple', // this.mode
         };
     }
-
+    //#region setReportColumns
     setReportColumns(reportType: any) {
         debugger
         let reportName = '';
@@ -1335,7 +1335,7 @@ export class ReportViewerComponent implements OnInit {
             };
         }
     }
-
+    //#endregion
     loadLeave() {
         let leave = [];
         this.leaveYearService.getAllLeave(EnumStatus.Regardless).subscribe(

HRM.UI/ClientApp/src/app/reports/reports-routing.module.ts

@@ -31,7 +31,7 @@ import { CcWiseBonusSummaryComponent } from './cc-wise-bonus-summary/cc-wise-bon
 import { CcwiseSalarySummaryComponent } from './ccwise-salary-summary/ccwise-salary-summary.component';
 import { CcwiseNewPfMemberWithAmountComponent } from './ccwise-new-pf-member-with-amount/ccwise-new-pf-member-with-amount.component';
 import { EmployeeProfileReportsComponent } from './employee-profile-reports/employee-profile-reports.component';
-
+import { LeaveEncashmentReportComponent } from './leave-encashment-report/leave-encashment-report.component';
 
 const routes: Routes = [
     { path: 'report-viewer/36', component: ReportViewerComponent, canActivate: [AuthGuard] },
@@ -73,7 +73,9 @@ const routes: Routes = [
     { path: 'report-viewer/dailyAbsentReport', component: ReportViewerComponent, canActivate: [AuthGuard] },
     { path: 'report-viewer/dailyAttnReport', component: ReportViewerComponent, canActivate: [AuthGuard] },
     { path: 'multiple-emp-leave-balance', component: MultipleEmpLeaveBalanceComponent, canActivate: [AuthGuard] },
+    { path: 'multiple-emp-leave-report', component: MultipleEmpLeaveBalanceComponent, canActivate: [AuthGuard] },
     { path: 'emp-leave-balance', component: EmpLeaveBalanceComponent, canActivate: [AuthGuard] },
+    { path: 'leave-register', component: EmpLeaveBalanceComponent, canActivate: [AuthGuard] },
     { path: 'month-wise-leave-register', component: MonthWiseLeaveRegisterComponent, canActivate: [AuthGuard] },
     { path: 'leave-register', component: LeaveRegisterComponent, canActivate: [AuthGuard] },
     { path: 'date-wise-job-card', component: DateWiseJobCardComponent, canActivate: [AuthGuard] },
@@ -162,6 +164,7 @@ const routes: Routes = [
     { path: 'report-viewer/722', component: ReportViewerComponent, canActivate: [AuthGuard] },
     { path: 'report-viewer/723', component: ReportViewerComponent, canActivate: [AuthGuard] },
     { path: 'report-viewer/profile-reports', component: EmployeeProfileReportsComponent, canActivate: [AuthGuard] },
+    { path: 'report-viewer/leave-encashment-report', component: LeaveEncashmentReportComponent, canActivate: [AuthGuard] },
     
 ];
 

HRM.UI/ClientApp/src/app/reports/reports.module.ts

@@ -49,6 +49,7 @@ import { CcWiseBonusSummaryComponent } from './cc-wise-bonus-summary/cc-wise-bon
 import { CcwiseSalarySummaryComponent } from './ccwise-salary-summary/ccwise-salary-summary.component';
 import { CcwiseNewPfMemberWithAmountComponent } from './ccwise-new-pf-member-with-amount/ccwise-new-pf-member-with-amount.component';
 import { EmployeeProfileReportsComponent } from './employee-profile-reports/employee-profile-reports.component';
+import { LeaveEncashmentReportComponent } from './leave-encashment-report/leave-encashment-report.component';
 
 @NgModule({
     declarations: [
@@ -76,7 +77,8 @@ import { EmployeeProfileReportsComponent } from './employee-profile-reports/empl
         CcWiseBonusSummaryComponent,
         CcwiseSalarySummaryComponent,
         CcwiseNewPfMemberWithAmountComponent,
-        EmployeeProfileReportsComponent
+        EmployeeProfileReportsComponent,
+        LeaveEncashmentReportComponent
     ],
     imports: [
         CommonModule,

HRM.UI/Controllers/Report/ReportController.cs

@@ -814,6 +814,21 @@ namespace HRM.UI.Controllers.Report
                     case EnumReportType.LifeCycleDeletedHistor:
                         bytes = new rptEmployee().GetEmpLFDeletedHistory(sEmpIDs, (int)currentUser.PayrollTypeID, reportType);
                         break;
+                    case EnumReportType.SingleEmpLeaveBalance:
+                        bytes = new rptEcho().ShowEmployeeIndvLeaveBalance(sEmpIDs, fromDate, toDate, itemid, (int)currentUser.PayrollTypeID, nextPayProcessDate, reportType);
+                        break;
+                    case EnumReportType.MultipleEmpLeaveBalanceEcho:
+                        bytes = new rptEcho().ShowMultipleEmployeeLeaveReport(sEmpIDs, itemid, (int)currentUser.PayrollTypeID, nextPayProcessDate, reportType);
+                        break;
+                    case EnumReportType.LeaveReportEcho:
+                        bytes = new rptEcho().ShowLeaveReport(sEmpIDs, itemid, (int)currentUser.PayrollTypeID, nextPayProcessDate, reportType);
+                        break;
+                    case EnumReportType.LeaveRegisterBangla:
+                        bytes = new rptEcho().ShowLeaveRegisterBanglaReport(sEmpIDs, itemid, (int)currentUser.PayrollTypeID, nextPayProcessDate, reportType);
+                        break;
+                    case EnumReportType.LeaveEncashment:
+                        bytes = new rptEcho().ShowLeaveEncashmentReport(sEmpIDs, fromDate, itemid, (int)currentUser.PayrollTypeID, nextPayProcessDate, reportType);
+                        break;
                     default:
                         break;
                 }