diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php
index 9a1f08ee..627c9e52 100755
--- a/Apollo/api/application/models/DayBook_model.php
+++ b/Apollo/api/application/models/DayBook_model.php
@@ -709,12 +709,12 @@ class DayBook_model extends CI_Model
        $subQuery='select Name,sum(Amount) as Total,T_DayBookMaster.ID,T_Income_Outcome_Master.ID as SubID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,T_DayBookMaster.Date,Reason,T_DayBookMaster.Description,ListName from T_DayBookMaster
 left join T_Income_Outcome_Master on  T_Income_Outcome_Master.ID = T_DayBookMaster.Type
 join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID
-where str_to_date(date,?)>=? and str_to_date(date,?)<=?  group by Type';  
+where str_to_date(date,?)>=? and str_to_date(date,?)<=?  group by Type,Name';  
 
 $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod)); 
 
         
-         //print_r( $this->db->last_query());    
+        //print_r( $this->db->last_query());    
          // die();  
 
          $expense = $query->result(); 
diff --git a/Apollo/assets/views/daybook/daybooksuperAdminApproval.html b/Apollo/assets/views/daybook/daybooksuperAdminApproval.html
index 6ccf9ca8..96ec626a 100755
--- a/Apollo/assets/views/daybook/daybooksuperAdminApproval.html
+++ b/Apollo/assets/views/daybook/daybooksuperAdminApproval.html
@@ -54,10 +54,11 @@
                                         <div class="col-md-3 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
                                             <label for="form-field-select-2">
                                                Income/Expense 
-                                                </label>
+                                                </label>   
                                            <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="showTheRefValue" ng-change="showTheResType(showTheRefValue)"
                                                 required>
                                                 <option value="" selected>Select</option>
+                                            
                                                 <option ng-repeat="typeName in incomeExpenseName"  ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option>
                                                 </select>
                                             <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html
index c7cd7109..dae4cdc2 100755
--- a/Apollo/assets/views/daybook/daybooksuperadmin.html
+++ b/Apollo/assets/views/daybook/daybooksuperadmin.html
@@ -232,13 +232,28 @@
                                                                 <label for="form-field-select-2">
                                                Type <span class="symbol required"></span>
                                                 </label>
+    {{typeItem}}
+                                                <!-- <select class="form-control" ng-init="getType(p.Name)" tabindex="1" class="cs-select cs-skin-elastic" name="editType" ng-model="myModel.type" required>
 
-                                                                <select class="form-control" ng-init="getType(p.Name)" tabindex="1" class="cs-select cs-skin-elastic" name="editType" ng-model="myModel.type"
-                                                                    required>
                                                 <option value="" disabled selected>Select Type</option>
+
                                                 <option ng-repeat="typeItem in getTypes" ng-selected="typeItem.ID == p.Type"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option>
+                                                </select> -->
+
+
+
+                                                 <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
+
+
+                                     <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
+                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" ng-selected="typeItem.ID == p.Type"  value="{{typeItem.ID}}" 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.editType.$dirty && Form.editType.$error.required">Type is Required</span>
+                                                
+                                                <span class="error text-small block" ng-if="Form.editType.$dirty && Form.editType.$error.required">Type is Required</span>
 
                                                             </div>
                                                             <div class="col-md-4" ng-class="{'has-error':Form.editAmount.$dirty && Form.editAmount.$invalid, 'has-success':Form.editAmount.$valid}">