diff --git a/Apollo/api/application/config/database.php b/Apollo/api/application/config/database.php index 2d33a761..8ff92c04 100755 --- a/Apollo/api/application/config/database.php +++ b/Apollo/api/application/config/database.php @@ -80,6 +80,7 @@ $db['default'] = array( 'password' => 'apollo1234', 'database' => 'apollod4_ApolloDECDev', + // 'username' => 'apollod4_SIT', // 'password' => 'apollosit1234', // 'database' => 'apollod4_ApolloDECNEWSIT', diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 60f363be..cbf73ade 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -916,7 +916,7 @@ where std.active = 1 and sms.branch = '".$br."' left join T_StudentDetails std on std.StudentID=sfp.StudentID and std.IsActive = 1 left join T_Student_CourseDetails scd on scd.StudentID=sfs.StudentID and scd.CourseID=sfs.CourseID left join BalFees as bal on bal.student=sfp.StudentID and bal.course=sfs.CourseID and bal.feestype=sfs.FeesType - where sfp.IsActive = 1 and sfp.UpdatedBy = '".$br."' + where sfp.IsActive = 1 and sfp.UpdatedBy = '".$br."' and std.BranchCode='".$br."' ";