diff --git a/application/config/routes.php b/application/config/routes.php index b809f2ec..72df7ac4 100755 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -217,11 +217,15 @@ $route['EditMRIR'] = "MRIRcontroller/editmaterialinspectionreport"; $route['ViewMRIR'] = "MRIRcontroller/viewmaterialinspectionreport"; $route['Viewigr'] = "MRIRcontroller/viewinwardgateregister"; $route['Distribution'] = "MRIRcontroller/viewmMaterialDistributionList"; + +//<-------------Cashbook page-----------------> $route['ViewIncomeExpense'] = "cashbook/incomeExpenseList"; $route['EditIncomeExpense'] = "cashbook/editcashbook"; $route['addNewIncomeExpense'] = "cashbook/addNewIncomeExpenseLoad"; $route['addIncomeExpense'] = "cashbook/addIncomeExpense"; $route['updateExpense'] = "cashbook/updateExpense"; + +//<----------Cashbook page - Bank statement--------------> $route['Bankingview']= "cashbook/bankfileview"; $route['Bankfiletostatement']= "cashbook/bankfileupload"; $route['Bankingstatement']= "cashbook/bankdata"; @@ -270,6 +274,8 @@ $route['cashbookreport']="report/cashbook"; $route['cashbookmonthlyexpenses']="report/monthexpenses"; $route['cashbookyearlyexpenses']="report/yearexpenses"; $route['Empperform']="report/per"; +$route['cashbookcumulativereport']="report/cashbook_cumulative_report"; +$route['cashbookcumulativemonthreport']="report/cashbook_month_cumulative_report"; // Company Information $route['companyview'] = 'companycontroller/companyview'; diff --git a/application/controllers/cashbook.php b/application/controllers/cashbook.php index 0eacfe15..9aeab5c4 100755 --- a/application/controllers/cashbook.php +++ b/application/controllers/cashbook.php @@ -133,6 +133,23 @@ class cashbook extends BaseController $this->global['pageTitle'] = 'Siddharth : Cash Book: Add New Income Expense '; $this->loadViews("addnewIncomeExpense", $this->global, $data , NULL); } + + function autocomplete() + { + //$this->load->model('model','cashbook_model'); + $mer = $this->input->get('query'); + $query= $this->cashbook_model->checkMerchant($mer); + echo json_encode($query); + + } + + function getSupplierDtls() + { + $s = $this->input->post('id'); + $supp = $this->cashbook_model->getsupp_dtls($s); + echo json_encode($supp); + } + function bankfileview() { @@ -342,7 +359,7 @@ class cashbook extends BaseController } $balance=$totalbankamount-$totalamount; $created_by = $this->session->userdata('userId'); - $addincomexpense = array('type'=>$accounttype,'account_code'=>$accountcode,'date'=>$date,'towhom'=>$towhome,'invoice_no'=>$invoiceno,'merchant'=>$merchantname,'merchant_gst'=>$mergstno,'HSN'=>$hsn ,'value_before_gst'=>$beforegst,'sgst'=>$sgst,'cgst'=>$cgst,'igst'=>$igst,'total'=>$totalamount,'description'=>$description,'document'=>$document,'Created_By'=>$created_by,'cashtype'=>$option,'bankid'=>$bankid,'totalbankamount'=>$totalbankamount,'balance'=>$balance,'amounttype'=>$amounttype); + $addincomexpense = array('type'=>$accounttype,'account_code'=>$accountcode,'date'=>$date,'towhom'=>$towhome,'invoice_no'=>$invoiceno,'merchant'=>$merchantname,'merchant_gst'=>$mergstno,'HSN'=>$hsn ,'value_before_gst'=>$beforegst,'sgst'=>$sgst,'cgst'=>$cgst,'igst'=>$igst,'total'=>$totalamount,'description'=>$description,'document'=>$document,'Created_By'=>$created_by,'cashtype'=>$option,'bankid'=>$bankid,'totalbankamount'=>$totalbankamount,'balance'=>$balance,'gststatus'=>(!empty($gsttoggle)?'1':'0'),'amounttype'=>$amounttype); //print_r($addincomexpense); //die(); if($balance=='0') @@ -648,6 +665,7 @@ class cashbook extends BaseController $bankid=$this->input->post('bankid'); $normalid=$this->input->post('normalid'); $bankamount=$this->input->post('bankamount'); + $gsttoggle = $this->input->post('gsttoggle'); $document =null; //$document1=$this->input->post('myfile'); @@ -679,7 +697,7 @@ class cashbook extends BaseController } - $updateaccount = array('type'=>$option,'account_code'=>$accountcode1,'date'=>$date,'towhom'=>$towhome1,'invoice_no'=>$Invoiceno1,'merchant'=>$merchant1,'merchant_gst'=>$Merchantgst1,'HSN'=>$hsn1,'value_before_gst'=>$valuebeforegST1,'sgst'=>$SGST1,'cgst'=>$CGST1,'igst'=>$IGST1,'total'=>$totalamount1,'description'=>$description1,'document'=>$document); + $updateaccount = array('type'=>$option,'account_code'=>$accountcode1,'date'=>$date,'towhom'=>$towhome1,'invoice_no'=>$Invoiceno1,'merchant'=>$merchant1,'merchant_gst'=>$Merchantgst1,'HSN'=>$hsn1,'value_before_gst'=>$valuebeforegST1,'sgst'=>$SGST1,'cgst'=>$CGST1,'igst'=>$IGST1,'total'=>$totalamount1,'gststatus'=>(!empty($gsttoggle)?'1':'0'),'description'=>$description1,'document'=>$document); $res = $this->cashbook_model->updatedepartment($updateaccount,$id1); //print_r($updateaccount);die(); $cashbookamount=$this->cashbook_model->cashbookamount($bankid); diff --git a/application/controllers/report.php b/application/controllers/report.php index 1d41b18e..5f0d9f36 100755 --- a/application/controllers/report.php +++ b/application/controllers/report.php @@ -523,7 +523,8 @@ class report extends BaseController $data['material']=$this->dahsboard_Model->material_name(); $data['cust']=$this->dahsboard_Model->customer_name(); $data['finyear']=$this->dahsboard_Model->report_finyear(); - $data['purchase']=$this->dahsboard_Model->ireport_purchase($cname,$prod,$fa,$aa,$m,$frm,$t,$cat); + $data['purchase']=$this->dahsboard_Model->ireport_purchase($cname,$prod,$fa,$aa,$m,$frm,$t,$cat); + $data['cashbookdatas']=$this->dahsboard_Model->report_inwardcashbook($cname,$fa,$aa,$m,$frm,$t,$cat); } $data['material']=$this->dahsboard_Model->material_name(); $data['cust']=$this->dahsboard_Model->customer_name(); @@ -1039,7 +1040,23 @@ class report extends BaseController // $data['monthlywiseexpense']=$this->dahsboard_Model->monthwise_data_expense(); // $data['todayincome']=$this->dahsboard_Model->today_data_income(); // $data['todayexpense']=$this->dahsboard_Model->today_data_expense(); + $now = new DateTime(); + + $currentdate = $now->format('Y-m-d'); // MySQL datetime format + $yesterday = date('Y-m-d', strtotime("-1 day")); + $month = $now->format('m') ; + $year = $now->format('y'); + + $premonth = $month-1; + $premonth = $premonth < 10 ? '0'.$premonth : ''.$premonth; + $premonth = $premonth == '00' ? '12' : $premonth; + $yearvalue = $premonth == '12' ? $year-1 : $year; + $preyear = $yearvalue-1; + + $data['b4finyeartotal']=$this->dahsboard_Model->yearbeforetotal($preyear,$yearvalue); + $data['prevmonthtotal']=$this->dahsboard_Model->monthbeforetotal($premonth,$yearvalue); + $data['yesterdaytotal'] = $this->dahsboard_Model->daybeforetotal($yesterday); $this->loadviews("reportcashbook",$this->global,$data, NULL); diff --git a/application/models/cashbook_model.php b/application/models/cashbook_model.php index 57f62392..53abec2a 100755 --- a/application/models/cashbook_model.php +++ b/application/models/cashbook_model.php @@ -407,6 +407,33 @@ function debitlistpo($SupplierName,$fdate,$tdate,$pono) return $r->result(); } + + function checkMerchant($mer){ + + $temp[] = '' ; + $this->db->distinct(); + $this->db->select('SupplierID,SupplierName'); + $this->db->from('T_SupplierDetailsN'); + $this->db->like('SupplierName',$mer); + $query = $this->db->get(); + + $temparr[] = '' ; + foreach($query->result() as $arr){ + $temparr[] = $arr->SupplierName; + } + $temp['suggestions'] = $temparr; + + return $temp; + } + + function getsupp_dtls($s){ + $this->db->select('GSTNO'); + $this->db->from('T_SupplierDetailsN'); + $this->db->where('SupplierName',$s); + $r = $this->db->get(); + return $r->result(); + } + function getcustomer() { $this->db->select('client_name,client_id'); diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index 278436b3..8a1b4f0d 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -2160,6 +2160,41 @@ if ($cname!= ''){ //echo $sql; return $query->result(); } + + function report_inwardcashbook($cname,$fa,$aa,$m,$frm,$t,$cat){ + + $sql="select tinex.account_code as AccountCode,date_format(tinex.date,'%d-%m-%Y') as Date,ac.name as AccountName, + tinex.type as type,tinex.cashtype as category ,tinex.merchant as Suppliername, tinex.sgst as sgst, + tinex.value_before_gst as Value,tinex.cgst as cgst,tinex.igst as igst, + tinex.total as Total + FROM t_income_expense tinex + join t_accountcode ac on ac.code = tinex.account_code + where tinex.gststatus = '1' "; + + if ($cname!= ''){ + $sql.="and tinex.merchant = '".$cname."'"; + } + + if ($fa and $aa != ''){ + $sql.=" and (tinex.created_on >= '".$fa."-04-01' and tinex.created_on <= '".$aa."-03-31')"; + } + if ($m!= ''){ + $sql.="and monthname(tinex.created_on) = '".$m."'"; + } + if ($frm and $t != ''){ + $fromd= date("Y-m-d",strtotime($frm)); + $tod=date("Y-m-d",strtotime($t)); + + $sql.="and date(tinex.created_on) >= '".$fromd."' + and date(tinex.created_on) <= '".$tod."'"; + } + if ($cat!= ''){ + $sql.=" and tinex.type = '".$cat."' "; + } + $query = $this->db->query($sql); + return $query->result(); + } + function cashbook() { $sql="SELECT date_format(tinc.date,'%d-%m-%Y')as date, @@ -2447,6 +2482,155 @@ function INRSymbol() return $query->result(); } + function report_cumulative_cashbook(){ + + 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 year.name as name,year.yearexpense as yexp,year.yearincome as yinc,month.monthexpense as mexp,month.monthincome as minc,today.todayexpense as texp,today.todayincome as tinc + FROM (select ac1.name, ifnull(case + when tinc1.type = 'PAYMENT' + then sum(tinc1.total) + end,'0') as yearexpense, + ifnull(case + when tinc1.type = 'RECEIPT' + then sum(tinc1.total) + end, '0') as yearincome + FROM t_income_expense tinc1 + join t_accountcode ac1 on ac1.code = tinc1.account_code + WHERE (tinc1.date >= '".$fa."-04-01' and tinc1.date <= '".$aa."-03-31') + group by ac1.name ) as year + left join + (select ac2.name ,ifnull(case + when tinc2.type = 'PAYMENT' + then sum(tinc2.total) + end,'0') as monthexpense, + ifnull(case + when tinc2.type = 'RECEIPT' + then sum(tinc2.total) + end, '0') as monthincome + FROM t_income_expense tinc2 + join t_accountcode ac2 on ac2.code = tinc2.account_code + where month(tinc2.date) = month(current_date()) + group by ac2.name) as month on month.name = year.name + left join + (select ac3.name ,ifnull(case + when tinc3.type = 'PAYMENT' + then sum(tinc3.total) + end,'0') as todayexpense, + ifnull(case + when tinc3.type = 'RECEIPT' + then sum(tinc3.total) + end, '0') as todayincome + FROM t_income_expense tinc3 + join t_accountcode ac3 on ac3.code = tinc3.account_code + where date(tinc3.date) = current_date() + group by ac3.name ) as today on today.name=month.name + group by name "; + $query = $this->db->query($sql); + return $query->result(); + } + + function monthbeforetotal($month,$year){ + + $sql="SELECT month(date) as monthnum ,year(date) as yearnum, + sum(if(type = 'PAYMENT',total,0)) as payment_amt, + sum(if(type = 'RECEIPT',total,0)) as receipt_amt + FROM t_income_expense + WHERE + month(date) = '".$month."'and year(date) = '".$year."'"; + $query = $this->db->query($sql); + return $query->result(); + + } + + function yearbeforetotal($pre,$curr){ + $sql="SELECT + sum(if(type = 'PAYMENT',total,0)) as payment_amt, + sum(if(type = 'RECEIPT',total,0)) as receipt_amt + FROM t_income_expense + where date >= '".$pre."-04-01' and date <= '".$curr."-03-31'"; + $query = $this->db->query($sql); + return $query->result(); + //print_r($query->result()); + + } + +function daybeforetotal($yesterday){ + $sql="select date, + sum(if(type = 'PAYMENT',total,0)) as payment_amt, + sum(if(type = 'RECEIPT',total,0)) as receipt_amt + from t_income_expense + where date = ? "; + $query = $this->db->query($sql,array($yesterday)); + return $query->result(); + } + + + function report_cumulative_month_cashbook(){ + + 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 sub.name as name, + sub.expensetotal as Finyeartotalexpense, + sub.incometotal as Finyeartotalincome, + IF(month = 'Jan', sub.expensetotal, 0) AS 'Janexp', + IF(month = 'Feb', sub.expensetotal, 0) AS 'Febexp', + IF(month = 'Mar', sub.expensetotal, 0) AS 'Marexp', + IF(month = 'Apr', sub.expensetotal, 0) AS 'Aprexp', + IF(month = 'May', sub.expensetotal, 0) AS 'Mayexp', + IF(month = 'Jun', sub.expensetotal, 0) AS 'Junexp', + IF(month = 'Jul', sub.expensetotal, 0) AS 'Julexp', + IF(month = 'Aug', sub.expensetotal, 0) AS 'Augexp', + IF(month = 'Sep', sub.expensetotal, 0) AS 'Sepexp', + IF(month = 'Oct', sub.expensetotal, 0) AS 'Octexp', + IF(month = 'Nov', sub.expensetotal, 0) AS 'Novexp', + IF(month = 'Dec', sub.expensetotal, 0) AS 'Decexp', + IF(month = 'Jan', sub.incometotal, 0) AS 'Janinc', + IF(month = 'Feb', sub.incometotal, 0) AS 'Febinc', + IF(month = 'Mar', sub.incometotal, 0) AS 'Marinc', + IF(month = 'Apr', sub.incometotal, 0) AS 'Aprinc', + IF(month = 'May', sub.incometotal, 0) AS 'Mayinc', + IF(month = 'Jun', sub.incometotal, 0) AS 'Juninc', + IF(month = 'Jul', sub.incometotal, 0) AS 'Julinc', + IF(month = 'Aug', sub.incometotal, 0) AS 'Auginc', + IF(month = 'Sep', sub.incometotal, 0) AS 'Sepinc', + IF(month = 'Oct', sub.incometotal, 0) AS 'Octinc', + IF(month = 'Nov', sub.incometotal, 0) AS 'Novinc', + IF(month = 'Dec', sub.incometotal, 0) AS 'Decinc' + FROM ( + select DATE_FORMAT(tinc1.date, '%b') AS month,ac1.name, + ifnull(case + when tinc1.type = 'PAYMENT' + then sum(tinc1.total) + end,'0') as expensetotal, + ifnull(case + when tinc1.type = 'RECEIPT' + then sum(tinc1.total) + end, '0') as incometotal + FROM t_income_expense tinc1 + join t_accountcode ac1 on ac1.code = tinc1.account_code + WHERE (tinc1.date >='".$fa."-04-01' and tinc1.date <= '".$aa."-03-31') + GROUP BY ac1.name ) as sub + GROUP BY name "; + $query = $this->db->query($sql); + return $query->result(); + + } } ?> diff --git a/application/views/Report_purchase_inward.php b/application/views/Report_purchase_inward.php index 8ec2b80b..25f92f75 100755 --- a/application/views/Report_purchase_inward.php +++ b/application/views/Report_purchase_inward.php @@ -1,592 +1,510 @@ - - - - - - - - - -
-
-
- -
- -
-
-

Inward Details

- input->post('client_name')){ - $cl=$this->input->post('client_name'); - echo $cl; - echo ' '.' '; - } - if($this->input->post('item_name')){ - $it=$this->input->post('item_name'); - echo $it; - echo ' '.' '; - } - - if($this->input->post('financialyear')){ - $ab=$this->input->post('financialyear'); - echo '('.$ab.')'; - echo ' '; - - } - if($this->input->post('month')){ - $m=$this->input->post('month'); - echo '('.$m.')'; - echo ' '; - } - if($this->input->post('from_date') && $this->input->post('to_date')){ - $frm = $this->input->post('from_date'); - $t = $this->input->post('to_date'); - echo $frm.'-to-'.$t; - } - - ?>

-
- - -
- -
- -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - - - -
-
- - -
- -
- - - - -
- -
-

- - -
-
-
- - - -
- - - *Insurance field not included - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PO NoDateTimeMaterial NameCategorySupplier NameQtyUOMRate  ()Value  ()Exchange RateSGST  ()CGST  ()IGST  ()Discount  ()Freight  ()Package  ()Total  ()
- pono;?> - created_date;?>created_time;?>material_name;?>category;?>supplier_name;?>quantity); - echo round($rel->quantity);?>UOM;?>rate; - echo $rel->rate;?>value; - echo $rel->value;?>exchange_rate; - echo $rel->exchange_rate;?>sgst; - echo $rel->sgst;?>cgst; - echo $rel->cgst;?>igst; - echo $rel->igst;?>discount; - echo $rel->discount;?>freight; - echo $rel->freight;?>Package; - echo $rel->Package;?>total,2); - ?> - file)){ ?> - total,2,'.','');?> - total,2,'.',''); - } - ?> - -
Total      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
- -
- -
-
-
- - - - - - - - - + + +$('#towhom').text('Received From:'); + +$("#Date").datepicker({ + //minDate : new Date(year-SIAStartYear,1,1), + maxDate :'now', + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true, + +}); + + }); + + +function readURL(input) { + var sizeof = document.getElementById('file').files[0].size; + + if(sizeof > 2100000){ + alert('Sorry Your File is Large To 2MB'); + $('#file').val(''); + //window.location.reload(); + }else { + alert('Your file added successfully'); + } + if (input.files && input.files[0]) { + var reader = new FileReader(); + + reader.onload = function (e) { + $('#slip') + .attr('src', e.target.result) + .width(100) + .height(100); + //alert(e.target.result); + }; + + reader.readAsDataURL(input.files[0]); + $('#slip').val(input.files[0]['name']); + } + +} +function isNumberKey(evt) + { + var charCode = (evt.which) ? evt.which : evt.keyCode; + if (charCode != 46 && charCode > 31 + && (charCode < 48 || charCode > 57)) + return false; + + return true; + } + +function loadAccountType(id) + { + //alert('called'+id); + var id=id; + var t = []; + var ex = []; + var inc = []; + t= ; - \ No newline at end of file + if(id == 'myradio1') + { + // alert('INCOME clicked'); + + $('#accode').find('option').remove().end().append('').val('Select Account Code'); + + $.each(t,function(i,item){ + if(item.type == 'RECEIPT') + { + $("#accode").append( $('').val(item.code).html(item.name)); + } + }); + + + } + if(id == 'myradio2') + { + //alert('expense clicked'); + + $('#accode').find('option').remove().end().append('').val('Select Account Code'); + + $.each(t,function(i,item){ + if(item.type == 'PAYMENT') + { + $("#accode").append( $('').val(item.code).html(item.name)); + } + }); + + } + //alert('final alert'); + } + + + +
+ +
+

+
Siddharth Industries - Add New Receipt and Payment
+

+
+ +
+
+ Back +
+
+
+ +
+ + +
+ + + +
+ +
+
+ + +
+ +
+
+ Select Account type:

+ RECEIPT         + PAYMENT + + +
+
+
+
+ Account Name Select: *

+ +
+
+ + +
+
+ + Date:*

+ + +
+ +
+ +
+
+ + AAA*

+ + +
+ +
+
+
+
+
+
+ GST +
+
+
+ +
+
+
+ Total Amount:* + + +
+
+
+
+
+
+ Description: + + +
+
+ File Upload: + your image
+ +
+
+
+ + + + +
+ + +
+ +
+
+
+
+ load->helper('form'); + $error = $this->session->flashdata('error'); + if($error) + { + ?> +
+ + session->flashdata('error'); ?> +
+ + session->flashdata('success'); + if($success) + { + ?> +
+ + session->flashdata('success'); ?> +
+ + +
+
+ ', '
'); ?> +
+
+
+
+
+ + +
+ \ No newline at end of file diff --git a/application/views/bankcashnew.php b/application/views/bankcashnew.php index a53f62d2..df61f3d7 100644 --- a/application/views/bankcashnew.php +++ b/application/views/bankcashnew.php @@ -1,4 +1,4 @@ - + cashbook/autocomplete", + onSelect: function (suggestion) { + + var data = suggestion.SupplierName; + var selectedvalue = $('input[name=merchant]').val(); + if(selectedvalue != ' ' ) + { + + $.ajax({ + data:{id:selectedvalue}, + type:"POST", + url:"cashbook/getSupplierDtls", + success:function(data) { + var supplier_gstno = ''; + if(data != '') + { + + data = JSON.parse(data); + $.each(data,function(i,arr){ + supplier_gstno = arr.GSTNO; + }); + $("#merchantgst").val(supplier_gstno); + } + } + }); + } + } + }); +/**** autocomplete ends here ********/ + var amounttype=localStorage.getItem('typeamount'); //alert(amounttype+'atp'); if(amounttype==0) @@ -213,16 +243,20 @@ else }); - - - +

Siddharth Industries - Bank Statement(Receipt and Payment)
-

@@ -234,89 +268,70 @@ else
- - +
- -
-
- - - -
-
-
-
- Select Account type:

- - PAYMENT -
-
-
-
- -
-
-
-
- Select Account type:

- RECEIPT         - -
-
-
-
- - -
-
- Account Name Select: *

- -
-
- - -
-
- - Date:*

- - -
- -
- -
-
- - AAA*

- - -
- -
-
-
-

Payment ID:  

+ +
+
+
+

Payment ID:  

+

Payment Mode:  Bank

Payment Amount:  

Payment Amount Type:  

-
- -
- +
+
+
+
+
+ +
+
+
+ Select Account type:

+ +
+ PAYMENT +
+ +
+ RECEIPT         +
+
+
+ +
+
+ Account Name Select: *

+ +
+ +
+
+ Date:*

+ +
-
+ +
+
+ AAA*

+ +
+
+ +
+
+ +
GST @@ -343,8 +358,8 @@ else
Merchant Name: - - + +
@@ -453,43 +468,15 @@ else
-
- -
-
- load->helper('form'); - $error = $this->session->flashdata('error'); - if($error) - { - ?> -
- - session->flashdata('error'); ?> -
- - session->flashdata('success'); - if($success) - { - ?> -
- - session->flashdata('success'); ?> -
- - -
-
- ', '
'); ?> -
-
-
+ + +
-
- +
+ -
+ + + + + + + + + + \ No newline at end of file diff --git a/application/views/cashbook_cumulative_report.php b/application/views/cashbook_cumulative_report.php new file mode 100755 index 00000000..9803ff3e --- /dev/null +++ b/application/views/cashbook_cumulative_report.php @@ -0,0 +1,141 @@ += 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); +?> + + +
+
+
+ +
+ +
+
+

Cashbook - Cumulative Report ( )

+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Account Name
Receipt  ()Payment  ()Receipt  ()Payment  ()Recepit  ()Payment  ()
name; ?>tinc)){ echo '0';}else{echo number_format($d->tinc,2,'.','');} ?>texp)){ echo '0';}else{echo number_format($d->texp,2,'.','');} ?>minc,2,'.',''); ?>mexp,2,'.',''); ?>yinc,2,'.',''); ?>yexp,2,'.',''); ?>
+
+
+ +
+ +
+
+
+ + + + + + + + + + + \ No newline at end of file diff --git a/application/views/editincomeexpenses.php b/application/views/editincomeexpenses.php index 4a2ce958..1b4a7d5f 100755 --- a/application/views/editincomeexpenses.php +++ b/application/views/editincomeexpenses.php @@ -1,4 +1,4 @@ - + document; + $document =$ded->document; //echo $document; $final = base_url().$document; //echo $final; @@ -50,6 +50,7 @@ if(!empty($DepDetails)) $MerchantGST1=$ded->merchant_gst; $HSNSAC1=$ded->HSN; $valuebeforegst1=$ded->value_before_gst; + $gst1=$ded->gststatus; $SGST1=$ded->sgst; $CGST1=$ded->cgst; $IGST1=$ded->igst; @@ -58,9 +59,18 @@ if(!empty($DepDetails)) $balancetoupdate=($bankamount)-($alreadypaid+$alreadyreceived); //$file1=$ded->document; //echo $file1; - }} + }} + ?> +