diff --git a/Apollo/api/application/config/constants.php b/Apollo/api/application/config/constants.php
index 1ac086c5..780ff423 100755
--- a/Apollo/api/application/config/constants.php
+++ b/Apollo/api/application/config/constants.php
@@ -178,3 +178,4 @@ defined('ENCR_PASSWORD') OR define('ENCR_PASSWORD','e99a18c428cb38d5f26085367892
 //end of encripted password
 
 
+
diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 60b15d3e..4b3efa29 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -871,6 +871,10 @@ $query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$from
         $start_date= $det['from'];
         $end_date = $det['to']; 
 
+
+        $fromd= date("Y-m-d",strtotime($start_date));
+         $tod=date("Y-m-d",strtotime($end_date));
+
         //echo $det['university'];die() ;
 
         $this->db->select('T_Student_CourseDetails.UniversityID,UniversityName,
@@ -887,9 +891,13 @@ $query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$from
        //  $this->db->where('T_Students_Fees_PaidDetails.CreatedOn BETWEEN "'.date('Y-m-d', strtotime($start_date)). '" and "'. date('Y-m-d', strtotime($end_date)).'"');
 
 
-         $this->db->where('T_Students_Fees_PaidDetails.CreatedOn>=',date('Y-m-d', strtotime($start_date)));
+         $this->db->where("date_format(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')>=",date('Y-m-d', strtotime($start_date)));
 
-         $this->db->where('T_Students_Fees_PaidDetails.CreatedOn<=',date('Y-m-d', strtotime($end_date)));
+         
+
+          $this->db->where("date_format(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')<=",date('Y-m-d', strtotime($end_date)));
+
+         
          // $this->db->where(' BillDate <= str_to_date("'.$end_date.'",%d-%m-%Y)');
            
    
@@ -905,8 +913,8 @@ $query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$from
 
         $feeDetails = $this->db->get()->result();
 
-  //      print_r( $this->db->last_query());  
-// die();
+ //        print_r( $this->db->last_query());  
+ // die();
 
        // print_r($feeDetails);
 if($feeDetails) 
diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json
index 0eb26179..d0b61293 100755
--- a/Apollo/assets/i18n/en.json
+++ b/Apollo/assets/i18n/en.json
@@ -19,6 +19,7 @@
       "MESSAGES": "My Messages",
       "LOCKSCREEN": "Lock Screen",
       "LOGOUT": "Log Out",
+      "MYPROFILE": "My Profile",
       "CHANGEPASSWORD": "Change Password"
     }
   },
@@ -92,8 +93,7 @@
         "examfee": "EXAM WRITING FEE REPORT",
         "balfee": "FEE BALANCE REPORT",
 		"lead": "LEAD TRACKING REPORT",
-		"newreg":"NEW REG REPORT",
-    "feeCollect":"FEE COLLECTED"
+		"newreg":"NEW REG REPORT"
        
       },
       "student": {
diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js
index 05809016..01728e08 100755
--- a/Apollo/assets/js/config.router.js
+++ b/Apollo/assets/js/config.router.js
@@ -85,7 +85,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                 title: "My Profile",
                 ncyBreadcrumb: {
                     label: 'My Profile'
-                }
+                }          
             }).state('app.changePassword', {
                 url: "/changePassword",
                 templateUrl: "assets/views/changePassword.html",
@@ -194,14 +194,6 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                 ncyBreadcrumb: {
                     label: 'newreg'
                 },
-            }).state('app.reports.feeCollect', {
-                url: '/feeCollect',
-                templateUrl: "assets/views/feecollected.html",
-                resolve: loadSequence('FeeCollected_reportCtrl','ngTable', 'ladda', 'angular-ladda'),
-                title: 'feeCollect',
-                ncyBreadcrumb: {
-                    label: 'feeCollect'
-                },
             }).state('app.master.studentStatusUpdate', {
             url: '/default activity',
             templateUrl: "assets/views/studentStatusUpdate.html",
diff --git a/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js b/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js
index 68724f7c..50705ac6 100644
--- a/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js
+++ b/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js
@@ -160,8 +160,8 @@ $scope.tod = to_dt;
                 },
                 data: {
                     university: $scope.universityId,
-                    from : $scope.fromd ,
-                    to : $scope.tod
+                    from : $scope.filters.from_date ,
+                    to : $scope.filters.to_date
                     
                 }
           }
diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html
index cc804d72..8207f617 100755
--- a/Apollo/assets/views/daybook/daybooksuperadmin.html
+++ b/Apollo/assets/views/daybook/daybooksuperadmin.html
@@ -345,6 +345,25 @@
                                     <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
                                 </div>
 
+
+
+                                  <div class="col-md-4" ng-class="{'has-error':Form.addType.$dirty && Form.addType.$invalid, 'has-success':Form.addType.$valid}">
+                                    <label for="form-field-select-2">
+                                              Type  <span class="symbol required"></span>
+                                                </label>
+                                    <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
+<option value="" disabled selected>Select Type</option>
+
+                                     <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
+                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
+
+                                    </optgroup> 
+                                              
+                                                </select>
+                                    <span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
+
+                                </div>
+
                             </div>
                             <div class="row">
                                 <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
@@ -365,7 +384,27 @@
                                     required/>
                                     <span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.paidTo.$error.maxlength || Form.paidTo.$error.minlength || Form.paidTo.$error.pattern">Paid To / Reveived From is required.</span>
                                 </div>
-                                <div class="col-md-4"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
+
+
+ <div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
+                                    <label>
+                                               Amount <span class="symbol required"></span>
+                                            </label>
+                                    <input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control"
+                                        ng-model="myModelAdd.amount" required/>
+                                    <span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span>
+                                    
+                                </div>
+
+
+
+                             
+
+                            </div>
+                            <div class="row">
+
+                         
+                            <div class="col-md-4"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
                                     <label>
                                                Description  <span class="symbol required"></span>
                                             </label>
@@ -377,36 +416,15 @@
 
                                 </div>
 
-                            </div>
-                            <div class="row">
-
-                                <div class="col-md-4" ng-class="{'has-error':Form.addType.$dirty && Form.addType.$invalid, 'has-success':Form.addType.$valid}">
-                                    <label for="form-field-select-2">
-                                              Type  <span class="symbol required"></span>
-                                                </label>
-                                    <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
-<option value="" disabled selected>Select Type</option>
-
-                                     <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
-                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
-
-                                    </optgroup> 
-                                                <!-- <option value="" disabled selected>Select Type</option>
-                                                <option ng-repeat="typeItem in getTypes"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option> -->
-                                                </select>
-                                    <span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
-
-                                </div>
-
-                                <div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
+                               <!--  <div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
                                     <label>
                                                Amount <span class="symbol required"></span>
                                             </label>
                                     <input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control"
                                         ng-model="myModelAdd.amount" required/>
                                     <span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span>
-                                    <!--<span class="error text-small block" ng-if="Form.addAmount.$dirty">Amount is Required </span>-->
-                                </div>
+                                    
+                                </div> -->
                                 <div class="col-md-4">
                                     <label>
                                                Comments
diff --git a/Apollo/assets/views/partials/top-navbar.html b/Apollo/assets/views/partials/top-navbar.html
index a3326a97..66b18791 100755
--- a/Apollo/assets/views/partials/top-navbar.html
+++ b/Apollo/assets/views/partials/top-navbar.html
@@ -183,7 +183,7 @@
 				<!--<li>
 					<a ui-sref="app.pages.calendar" translate="topbar.user.CALENDAR">
 						My Calendar
-					</a>
+					</a>      
 				</li>
 				<li>
 					<a ui-sref="app.pages.messages" translate="topbar.user.MESSAGES">
@@ -191,6 +191,12 @@
 					</a>
 				</li>-->
 				<li>
+		<a ui-sref="app.myprofile" translate="topbar.user.PROFILE">
+			   My Profile
+					</a>
+
+	</li>
+				<li>
 					<a ui-sref="app.changePassword" translate="topbar.user.CHANGEPASSWORD">
 						Change Password
 					</a>
@@ -200,6 +206,8 @@
 						Log Out
 					</a>
 				</li>
+				
+				
 			</ul>
 		</li>
 		<!-- end: USER OPTIONS DROPDOWN -->