Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pl report

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-10-05 18:27:26 +05:30
parent 6083f04b16
commit 75d95a35b6
2 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Apollo/api/application/models/DayBook_model.php
View File

@ -987,24 +987,42 @@ public function GetPLexcelDetails($from,$to,$branch)
$fromd= date("Y-m-d",strtotime($from));
$tod=date("Y-m-d",strtotime($to));
$subQuery='select
Name,sum(Amount) as Total ,Date,T_Income_Outcome_Master.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName
from T_DayBookMaster
$subQuery='select Name,ListName,Date,T_Income_Outcome_Master.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,
SUM(IF(p.Name=? ,Amount,0)) AS OperationalIncome,
SUM(IF(p.Name=? ,Amount,0)) AS OperationalExpense,
SUM(IF(p.Name=? ,Amount,0)) AS NonOperationalIncome,
SUM(IF(p.Name=? ,Amount,0)) AS NonOperationalExpense
from T_DayBookMaster as p
Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= p.Type
Join T_PickListDetails on T_PickListDetails.ListCode=p.Name
where str_to_date(Date,?)>=?
and str_to_date(Date,?)<=?
and p.Isdaybook=?
and p.BranchCode=?
group by Name,Month(str_to_date(Date,?))
Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= T_DayBookMaster.Type
where str_to_date(Date,?)>=? and str_to_date(Date,?)<=? and T_DayBookMaster.Isdaybook=? and T_DayBookMaster.BranchCode=? group by Name,Month(str_to_date(Date,?))
union
select Name,sum(Amount) as Total,Date,T_Income_Outcome_Master.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName from T_NonOperationalMaster
Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= T_NonOperationalMaster.Type
where str_to_date(Date,?)>=?
and str_to_date(Date,?)<=?
and T_NonOperationalMaster.BranchCode=?
group by Name,Month(str_to_date(Date,?))
union
select Name,ListName,Date,T_Income_Outcome_Master.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,
SUM(IF(q.Name=?,Amount,0)) AS OperationalIncome,
SUM(IF(q.Name=?,Amount,0)) AS OperationalExpense,
SUM(IF(q.Name=?,Amount,0)) AS NonOperationalIncome,
SUM(IF(q.Name=?,Amount,0)) AS NonOperationalExpense
from T_NonOperationalMaster as q
Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= q.Type
Join T_PickListDetails on T_PickListDetails.ListCode=q.Name
where str_to_date(Date,?)>=?
and str_to_date(Date,?)<=?
and q.BranchCode=?
group by Name,Month(str_to_date(Date,?)) ;
';
$query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1',$branch,'%d-%m-%Y','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch,'%d-%m-%Y'));
$query = $this->db->query($subQuery,array('I002','I001','I003','I003','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1',$branch,'%d-%m-%Y','I003','I004','I002','I001','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch,'%d-%m-%Y'));
// $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1',$branch,'%d-%m-%Y','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch,'%d-%m-%Y'));
$expenseNon = $query->result();

4
Apollo/assets/js/controllers/income_reportCtrl.js
View File

@ -359,7 +359,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
{
$scope.PLexceldetails = response.data.exceldetails;
//console.log($scope.PLexceldetails);
// console.log($scope.PLexceldetails);
}
else
@ -423,7 +423,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
//return false;
//console.log($scope.fullincomedetail);
alasql('SELECT * INTO XLS("Income Expense report.xls",?) FROM ?',[mystyle,$scope.Newexcel]);
alasql('SELECT ListName,Date,OperationalIncome,NonOperationalIncome,OperationalExpense,NonOperationalExpense INTO XLS("Income Expense report.xls",?) FROM ?',[mystyle,$scope.PLexceldetails]);
};