From 8f04f538df560d6c2e2b925e9729831219d96951 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 29 May 2018 10:32:02 +0530 Subject: [PATCH] cashbook report and igr files issues fixes --- application/controllers/report.php | 46 +++++--- application/models/dahsboard_model.php | 109 ++++++++++++------ application/views/Report_attach_inward.php | 8 +- application/views/Report_purchase_inward.php | 12 +- application/views/cashbookmthlyreport.php | 48 ++++---- application/views/cashbooktoday.php | 44 ++++--- application/views/cashbookyearlyreport.php | 51 ++++---- application/views/inwardgateregister.php | 11 +- application/views/reportcashbook.php | 115 +++++++------------ uploads/BillFiles/AV-Travel-Logo.png | Bin 0 -> 296370 bytes 10 files changed, 237 insertions(+), 207 deletions(-) create mode 100755 uploads/BillFiles/AV-Travel-Logo.png diff --git a/application/controllers/report.php b/application/controllers/report.php index bf150f3b..61bed12a 100755 --- a/application/controllers/report.php +++ b/application/controllers/report.php @@ -994,19 +994,25 @@ class report extends BaseController $data['getTotalrevenuePoCount'] = $this->dahsboard_Model->getTotalrevenuePoCount(); $data['cashbook']=$this->dahsboard_Model->cashbook(); - $income="RECEIPT"; - $expense="PAYMENT"; - $data['monthlywiseincome']=$this->dahsboard_Model->monthwise_data($income); - $data['monthlywiseexpense']=$this->dahsboard_Model->monthwise_data($expense); - $data['todayincome']=$this->dahsboard_Model->today_data($income); - $data['todayexpense']=$this->dahsboard_Model->today_data($expense); - $data['yearincome']=$this->dahsboard_Model->yearwise_data($income); - $data['yearexpense']=$this->dahsboard_Model->yearwise_data($expense); + // $income="RECEIPT"; + // $expense="PAYMENT"; + // $data['monthlywiseincome']=$this->dahsboard_Model->monthwise_data($income); + // $data['monthlywiseexpense']=$this->dahsboard_Model->monthwise_data($expense); + // $data['todayincome']=$this->dahsboard_Model->today_data($income); + // $data['todayexpense']=$this->dahsboard_Model->today_data($expense); + // $data['yearincome']=$this->dahsboard_Model->yearwise_data($income); + // $data['yearexpense']=$this->dahsboard_Model->yearwise_data($expense); + + + $data['dailyIncomeExpense']=$this->dahsboard_Model->today_data(); + $data['monthlyIncomeExpense']=$this->dahsboard_Model->monthwise_data(); + $data['yearlyIncomeExpense']=$this->dahsboard_Model->yearwise_data(); + $data['gettoptotal1'] = $this->dahsboard_Model->gettoptotal(); $data['tdy']=$this->dahsboard_Model->today(); - //echo ($data['tdy']); - $data['Indiancurrency']=$this->dahsboard_Model->INRSymbol(); - //print_r($data['gettoptotal1']); + + //echo ($data['tdy']); + //print_r($data['gettoptotal1']); // $data['monthlywiseincome']=$this->dahsboard_Model->monthwise_data_income(); // $data['monthlywiseexpense']=$this->dahsboard_Model->monthwise_data_expense(); // $data['todayincome']=$this->dahsboard_Model->today_data_income(); @@ -1066,8 +1072,12 @@ class report extends BaseController $premonth = $premonth == '00' ? '12' : $premonth; $yearvalue = $premonth == '12' ? $year-1 : $year; - - $data['prevmonthtotal']=$this->dahsboard_Model->monthbeforetotal($premonth,$yearvalue); + + $lastdate = cal_days_in_month(CAL_GREGORIAN,$premonth,$yearvalue); + $dateformat = $yearvalue.'-'.$premonth.'-'.$lastdate; + $data['monthlybalances']=$this->dahsboard_Model->getMonthlyOpeningAmt($dateformat); + + //$data['prevmonthtotal']=$this->dahsboard_Model->monthbeforetotal($premonth,$yearvalue); $data['monthlyreport']=$this->dahsboard_Model->month_incexp_report($month,$year); @@ -1098,14 +1108,18 @@ class report extends BaseController //echo $data['fyears']; $fa=substr( $fyear,0,-5); $aa=substr( $fyear,5,5); + $finyear = explode("-",$fyear); - $b4oneyear = $finyear[0] -1; - $b4twoyear = $finyear[1] -1; + $prev_year = $finyear[0]; + // $b4oneyear = $finyear[0] -1; + // $b4twoyear = $finyear[1] -1; $data['yearlyreport']=$this->dahsboard_Model->yearexpensereport($fa,$aa); - $data['b4finyeartotal']=$this->dahsboard_Model->yearbeforetotal($b4oneyear,$b4twoyear); + //$data['b4finyeartotal']=$this->dahsboard_Model->yearbeforetotal($b4oneyear,$b4twoyear); + + $data['yearlybalances']=$this->dahsboard_Model->getYearlyOpeningAmt($prev_year); //$this->loadviews("cashbookyearlyreport",$this->global,$data, NULL); diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index c6f92e1b..b3e1c24d 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -1445,7 +1445,7 @@ ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0))) - round(ifnull(if(POType = 'REVENUE', sum(id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity), sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total, -pb.FilePath as file + im.file as ifile,pb.FilePath as file from T_IGR_Master im join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode @@ -1545,7 +1545,7 @@ ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0))) - round(ifnull(if(POType = 'REVENUE', sum(id.QuantityAsPerInvoice * rt.AfterDiscount / pl.Quantity), sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total, -pb.FilePath as file + im.file as ifile,pb.FilePath as file from T_IGR_Master im join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode @@ -1633,7 +1633,7 @@ $sql.="group by pono,material_name,category,supplier_name"; $sql="select pono,potype,date_format(created_date,'%d-%m-%Y') as created_date,supplier_name, -sum(total) as total,file +sum(total) as total,file,ifile from igr where status != 'ST030' "; @@ -2258,40 +2258,83 @@ if ($cname!= ''){ } //home--report--Day Wise Report // - function today_data($value='') + function today_data() { - $sql="SELECT type,Sum(total) as todaydata FROM t_income_expense WHERE type = ? AND DATE(date) = CURRENT_DATE"; - $query = $this->db->query($sql,array($value)); - return $query->result(); - + $sql="SELECT sum(if(type = 'RECEIPT',total,0)) as daily_income_amt, + sum(if(type = 'PAYMENT',total,0)) as daily_expenses_amt + FROM t_income_expense + WHERE DATE(date) = CURRENT_DATE"; + $query = $this->db->query($sql); + return $query->result(); + } - - function monthwise_data($value='') - { - $sql="SELECT type,Sum(total) as monthlydata FROM t_income_expense WHERE type = ? AND MONTH(date) = MONTH(curdate()) AND YEAR(date) = YEAR(curdate())"; - //$sql="SELECT type,Sum(total) as monthlydata FROM resicoin_RIADev.t_income_expense WHERE type = ? AND MONTH(date) = MONTH(curdate()) And YEAR(date) = YEAR(curdate())" - $query = $this->db->query($sql,array($value)); - return $query->result(); - - } - function yearwise_data($value='') - { - if (date('m') >= 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - $fa=substr($ab,0,-5); - $aa=substr($ab,5,5); - $sql="SELECT type,sum(total) as yearlydata from t_income_expense - where - type = ? and (date >= '".$fa."-04-01' and date <= '".$aa."-03-31')"; - $query = $this->db->query($sql,array($value)); - return $query->result(); - + function monthwise_data() + { + //$sql="SELECT type,Sum(total) as monthlydata FROM t_income_expense WHERE type = ? AND MONTH(date) = MONTH(curdate())"; + $sql="SELECT sum(if(type = 'RECEIPT',total,0)) as monthly_income_amt, + sum(if(type = 'PAYMENT',total,0)) as monthly_expenses_amt + FROM t_income_expense + WHERE YEAR(date) = YEAR(curdate()) AND MONTH(date) = MONTH(curdate())"; + $query = $this->db->query($sql); + //,array($value)); + return $query->result(); + } + function yearwise_data() + { + if (date('m') >= 4) { + $yearl = date('Y').'-'.(date('Y')+1); + } else { + $yearl = (date('Y')-1).'-'.date('Y'); + } + $ab=$yearl; + $fa=substr($ab,0,-5); + $aa=substr($ab,5,5); + + $sql="SELECT sum(if(type = 'RECEIPT',total,0)) as yearly_income_amt, + sum(if(type = 'PAYMENT',total,0)) as yearly_expenses_amt + FROM t_income_expense + WHERE (date >= '".$fa."-04-01' and date <= '".$aa."-03-31')"; + $query = $this->db->query($sql); + return $query->result(); + + } + + function getYearlyOpeningAmt($prev_year){ + $sql="SELECT min(date),(sum(if(type = 'RECEIPT',total,0)) - sum(if(type = 'PAYMENT',total,0)) ) as opening_amt + FROM t_income_expense + WHERE date >= (select min(date) from t_income_expense) and date <= '".$prev_year."-03-31' "; + $query = $this->db->query($sql); + return $query->result(); + //print_r($query->result()); + + } + + //function monthbeforetotal($month,$year){ + function getMonthlyOpeningAmt($dateformat){ + + $sql="SELECT month('".$dateformat."') as monthnum ,year('".$dateformat."') as yearnum, + (sum(if(type = 'RECEIPT',total,0)) - sum(if(type = 'PAYMENT',total,0))) as opening_amt + FROM t_income_expense + WHERE date >= (select min(date) from t_income_expense) and date <= '".$dateformat."'"; + //WHERE month(date) between (select month(min(date)) from t_income_expense) and '".$month."' and year(date) = '".$year."'"; + $query = $this->db->query($sql); + return $query->result(); + +} + + +//function daybeforetotal($yesterday){ +function getDailyOpeningAmt($yesterday){ + $sql="select date,(sum(if(type = 'RECEIPT',total,0)) - sum(if(type = 'PAYMENT',total,0))) as opening_amt + from t_income_expense + where date between (select min(date) from t_income_expense) and '".$yesterday."'"; + $query = $this->db->query($sql); + return $query->result(); + } + + function departmentwise($sid='',$d='',$c='') { $sql="SELECT date_format(tinc.date,'%d-%m-%Y')as date, diff --git a/application/views/Report_attach_inward.php b/application/views/Report_attach_inward.php index 9eefcd41..15f180ec 100755 --- a/application/views/Report_attach_inward.php +++ b/application/views/Report_attach_inward.php @@ -225,12 +225,14 @@ if(!empty($mms)) ?> file1)){ ?> - + if(!empty($rel->file)){ ?> + + ifile)) { ?> + diff --git a/application/views/Report_purchase_inward.php b/application/views/Report_purchase_inward.php index e7f1e144..e3f4a153 100755 --- a/application/views/Report_purchase_inward.php +++ b/application/views/Report_purchase_inward.php @@ -321,15 +321,11 @@ table.dataTable thead > tr > td.sorting { $tot_tot= $tot_tot + round($rel->total,2); ?> file)){ ?> + if(!empty($rel->file)){ ?> total,2,'.','');?> - total,2,'.',''); - } - ?> - + ifile)) { ?> + total,2,'.','');?> + total,2,'.',''); } ?> diff --git a/application/views/cashbookmthlyreport.php b/application/views/cashbookmthlyreport.php index 52d2ad5d..89ba58dc 100755 --- a/application/views/cashbookmthlyreport.php +++ b/application/views/cashbookmthlyreport.php @@ -1,9 +1,7 @@ payment_amt; - $payamt = $prevttl->payment_amt; - // $recamt = $prevmonthtotal[0]->receipt_amt; - $recamt = $prevttl->receipt_amt; -}} + if(!empty($monthyearvalue)) { $monthyr = explode("-",$monthyearvalue); @@ -28,13 +18,6 @@ $yearNum = $monthyr[1]; $dateObj = DateTime::createFromFormat('!m', $monthNum); $monthName = $dateObj->format('F'); } -// $inrsymbol=''; -// if(!empty($Indiancurrency)) -// { -// foreach ($Indiancurrency as $inr) -// { -// $inrsymbol = $inr->FontCode2000; -// }} ?> @@ -138,19 +121,28 @@ $(function() { - + + opening_amt; + + }} + ?> Previous Month Balance(Opening Balances)   - - + +   @@ -163,19 +155,19 @@ $(function() { expense,2,'.',''); echo number_format($mr->expense,2,'.','');?> - + Total   - + @@ -187,6 +179,7 @@ $(function() {   + @@ -209,6 +202,9 @@ $(function() { // Set up your table $(document).ready(function() { table = $('#cbmthly').DataTable( { + "language": { + "emptyTable": "
Data Not Found !
" + }, "dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" + "<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", diff --git a/application/views/cashbooktoday.php b/application/views/cashbooktoday.php index 1022bfc2..eb165baf 100755 --- a/application/views/cashbooktoday.php +++ b/application/views/cashbooktoday.php @@ -1,21 +1,11 @@ 2018-02-21 [payment_amt] => 0 [receipt_amt] => 13 ) ) - if(!empty($yesterdaytotal)) - { - foreach ($yesterdaytotal as $ttl) - { - $strdayttl = $ttl->date; - $payamt = $ttl->payment_amt; - $recamt = $ttl->receipt_amt; - }} ?> @@ -68,23 +58,34 @@ $tvt=0.00; + opening_amt; + }} + $open = $yesterdaytotal[0]->opening_amt; + echo $open; + echo $yesterdaytotal[0]->opening_amt; + ?> Yesterday Balances (opening balances)         - - +       date?> @@ -105,12 +106,12 @@ $tvt=0.00; - + Total @@ -122,7 +123,7 @@ $tvt=0.00;     - + @@ -141,6 +142,7 @@ $tvt=0.00;   + @@ -159,7 +161,11 @@ $tvt=0.00;