From 153a11b4ce6382bf1442b1e26c4c33d3df169bec Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Wed, 10 Jan 2018 11:08:50 +0530 Subject: [PATCH] cashbook report --- application/controllers/report.php | 21 ++-- application/logs/log-2018-01-10.php | 126 ++++++++++++++++++++ application/models/dahsboard_model.php | 11 +- application/views/cashbookdepmenu.php | 22 ++-- application/views/cashbookmonthlydep.php | 4 +- application/views/cashbookmonthlyexp.php | 2 +- application/views/cashbookyearmonthwise.php | 2 +- application/views/reportcashbook.php | 18 +-- application/views/viewIndIncomeExpense.php | 24 ++-- 9 files changed, 180 insertions(+), 50 deletions(-) create mode 100644 application/logs/log-2018-01-10.php diff --git a/application/controllers/report.php b/application/controllers/report.php index fb3308ea..e6f2cfda 100755 --- a/application/controllers/report.php +++ b/application/controllers/report.php @@ -1211,8 +1211,9 @@ class report extends BaseController } public function cashbookdepartment() { - $this->global['pageTitle'] = 'Cashbook - department - '; + $this->global['pageTitle'] = 'Cashbook - department - '; $sid=$_GET['sid']; + //echo $sid; $d=$_GET['d']; $c=$_GET['c']; if ($c=='PAYMENT') @@ -1241,15 +1242,15 @@ class report extends BaseController $this->loadviews("cashbookmonthlyexp",$this->global,$data, NULL); } //for cashbook menu link// - public function cashbookmonthmenu() - { + // public function cashbookmonthmenu() + // { - $this->global['pageTitle'] = 'Cashbook monthly '; - $data['yearmonthwise']=$this->dahsboard_Model->yearmonthwise(); - $data['Indiancurrency']=$this->dahsboard_Model->INRSymbol(); - //print_r($data['departmentwise']); - $this->loadviews("cashbookyearmonthwise",$this->global,$data, NULL); - } + // $this->global['pageTitle'] = 'Cashbook monthly '; + // $data['yearmonthwise']=$this->dahsboard_Model->yearmonthwise(); + // $data['Indiancurrency']=$this->dahsboard_Model->INRSymbol(); + // //print_r($data['departmentwise']); + // $this->loadviews("cashbookyearmonthwise",$this->global,$data, NULL); + // } public function yearmonthwise() { $sid=$_GET['sid']; @@ -1296,5 +1297,3 @@ class report extends BaseController ?> - - diff --git a/application/logs/log-2018-01-10.php b/application/logs/log-2018-01-10.php new file mode 100644 index 00000000..3f316f23 --- /dev/null +++ b/application/logs/log-2018-01-10.php @@ -0,0 +1,126 @@ + + +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:29 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:30 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:31 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 141 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 142 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 143 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Undefined offset: 0 C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:35:32 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\controllers\user.php 144 +ERROR - 2018-01-10 06:36:10 --> Severity: Notice --> Undefined variable: cash C:\xampp\htdocs\siddharth_application\application\views\cashbookmonthlyexpenses.php 97 +ERROR - 2018-01-10 06:36:10 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\views\cashbookmonthlyexpenses.php 97 +ERROR - 2018-01-10 06:36:10 --> Severity: Notice --> Undefined variable: cash C:\xampp\htdocs\siddharth_application\application\views\cashbookmonthlyexpenses.php 97 +ERROR - 2018-01-10 06:36:10 --> Severity: Notice --> Trying to get property of non-object C:\xampp\htdocs\siddharth_application\application\views\cashbookmonthlyexpenses.php 97 diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index bfa37e1f..cbc003c7 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -2226,10 +2226,18 @@ if ($cname!= ''){ } 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 ((YEAR(date) = YEAR(CURRENT_DATE) and MONTH(date) >= 4) or (YEAR(date) = YEAR(CURRENT_DATE)+1 and MONTH(date) <= 3))"; + type = ? and (date >= '".$fa."-04-01' and date <= '".$aa."-03-31')"; $query = $this->db->query($sql,array($value)); return $query->result(); @@ -2426,3 +2434,4 @@ function INRSymbol() } } ?> + diff --git a/application/views/cashbookdepmenu.php b/application/views/cashbookdepmenu.php index 3fc17fdd..c89c1061 100755 --- a/application/views/cashbookdepmenu.php +++ b/application/views/cashbookdepmenu.php @@ -101,14 +101,20 @@ $(document).ready(function() { "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>>", - buttons: [ - { - extend: 'collection', - text: 'Export Cashbook Reports', - buttons: [ - 'excel' - ] - } + buttons: [ + + { + extend: 'excelHtml5', + footer: 'true', + //messageTop: $('h3').text(), + title: $('h3').text(), + exportOptions: { + columns: ':visible' + + } + }, + + 'colvis' ] } ); } ); diff --git a/application/views/cashbookmonthlydep.php b/application/views/cashbookmonthlydep.php index 458ad378..ce80361b 100755 --- a/application/views/cashbookmonthlydep.php +++ b/application/views/cashbookmonthlydep.php @@ -54,9 +54,9 @@ if(!empty($Indiancurrency))
-

Report (DEP:)

+

Report(DEP:)

-
+
diff --git a/application/views/cashbookmonthlyexp.php b/application/views/cashbookmonthlyexp.php index 4c681bca..efe5df7d 100755 --- a/application/views/cashbookmonthlyexp.php +++ b/application/views/cashbookmonthlyexp.php @@ -57,7 +57,7 @@ if(!empty($Indiancurrency))
-

Report (DEP:)

+

Report (DEP:)

diff --git a/application/views/cashbookyearmonthwise.php b/application/views/cashbookyearmonthwise.php index a22ca8e3..ff43f6ee 100755 --- a/application/views/cashbookyearmonthwise.php +++ b/application/views/cashbookyearmonthwise.php @@ -40,7 +40,7 @@ if(!empty($Indiancurrency))
-

Month Report()

+

Month Report()

diff --git a/application/views/reportcashbook.php b/application/views/reportcashbook.php index 6e26d3e9..12da95dd 100755 --- a/application/views/reportcashbook.php +++ b/application/views/reportcashbook.php @@ -111,7 +111,7 @@ if(!empty($todayincome))
-
+
@@ -126,7 +126,7 @@ if(!empty($todayincome))
-
+
@@ -139,7 +139,7 @@ if(!empty($todayincome))
-
+
@@ -149,17 +149,7 @@ if(!empty($todayincome))
-
-
-
- -
- - Receipt : - Payment : -
-
-
+
diff --git a/application/views/viewIndIncomeExpense.php b/application/views/viewIndIncomeExpense.php index 904a8052..ab28e33e 100755 --- a/application/views/viewIndIncomeExpense.php +++ b/application/views/viewIndIncomeExpense.php @@ -60,20 +60,20 @@ if(!empty($data))
- - + + - - - - - - - - + + + + + + + + - - + +

Date :

     date)){echo date_format(date_create($data[0]->date),'d-m-Y');}?>

     towhom)){echo $data[0]->towhom;}?>

Date :

     date)){echo date_format(date_create($data[0]->date),'d-m-Y');}?>

     towhom)){echo $data[0]->towhom;}?>

Invoice No :

     invoice_no)){echo $data[0]->invoice_no;}?>

Merchant Name :

     merchant)){echo $data[0]->merchant;}?>

Merchant GST No :

     merchant_gst)){echo $data[0]->merchant_gst;}?>

HSN/SAC No :

     HSN)){echo $data[0]->HSN;}?>

Value Before GST :

     value_before_gst)){echo $data[0]->value_before_gst;}?>

SGST :

     sgst)){echo $data[0]->sgst;}?>

CGST :

     cgst)){echo $data[0]->cgst;}?>

IGST :

     igst)){echo $data[0]->igst;}?>

Invoice No :

     invoice_no)){echo $data[0]->invoice_no;}?>

Merchant Name :

     merchant)){echo $data[0]->merchant;}?>

Merchant GST No :

     merchant_gst)){echo $data[0]->merchant_gst;}?>

HSN/SAC No :

     HSN)){echo $data[0]->HSN;}?>

Value Before GST :

     value_before_gst)){echo $data[0]->value_before_gst;}?>

SGST :

     sgst)){echo $data[0]->sgst;}?>

CGST :

     cgst)){echo $data[0]->cgst;}?>

IGST :

     igst)){echo $data[0]->igst;}?>

Total Amount :

     total)){echo $data[0]->total;}?>

Description :

     description)){echo $data[0]->description;}?>

Total Amount :

     total)){echo $data[0]->total;}?>

Description :

     description)){echo $data[0]->description;}?>