diff --git a/app/Controllers/Report.php b/app/Controllers/Report.php index 30c85222..743ab06d 100755 --- a/app/Controllers/Report.php +++ b/app/Controllers/Report.php @@ -79,6 +79,11 @@ class Report extends BaseController $agt = $this->request->getPost('aging_to'); $data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['pending_list'] = $this->dahsboard_Model->req_list($fa, $aa, $m, $frm, $t, $agf, $agt); + $data['givenYear'] = $ab ; + $data['givenMonth']= $m ; + $data['givenFrm'] = $frm ; + $data['givenTo'] = $t; + //print_r($data); } $data['finyear'] = $this->dahsboard_Model->report_finyear(); @@ -105,7 +110,13 @@ class Report extends BaseController $agt = $this->request->getPost('total_order_value_To'); $data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['rel_po'] = $this->dahsboard_Model->report_relpo($fa, $aa, $m, $frm, $t, $agf, $agt); - //print_r($data); + + $data['givenYear'] = $ab ; + $data['givenMonth']= $m ; + $data['givenFrm'] = $frm ; + $data['givenTo'] = $t; + $data['givenAgf'] = $agf; + $data['givenAgt'] = $agt; @@ -155,6 +166,8 @@ class Report extends BaseController $aa = substr((string)$ab, 5, 5); $data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['Total'] = $this->dahsboard_Model->report_total($fa, $aa); + + $data['givenYear'] = $ab ; } $data['finyear'] = $this->dahsboard_Model->report_finyear(); @@ -174,6 +187,7 @@ class Report extends BaseController $data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['ccrpt'] = $this->dahsboard_Model->report_ccr($fa, $aa); + $data['ab'] = $ab; } $data['finyear'] = $this->dahsboard_Model->report_finyear(); @@ -321,6 +335,7 @@ class Report extends BaseController $b = substr((string)$ab, 5, 5); $data['year'] = $this->dahsboard_Model->report_year_wise($a, $b); $data['finyear'] = $this->dahsboard_Model->report_finyear(); + $data['givenFinancialYear'] = $ab; //$this->loadviews("Report_year_wise",$this->global,$data, NULL); } @@ -380,6 +395,13 @@ class Report extends BaseController $data['cust'] = $this->dahsboard_Model->customer_name(); $data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['spurchse'] = $this->dahsboard_Model->report_supplier($cname, $fa, $aa, $m, $frm, $t); + $data['cname'] = $cname; + $data['ab'] = $ab; + $data['m'] = $m; + $data['frm'] = $frm; + $data['t'] = $t; + + } $data['material'] = $this->dahsboard_Model->material_name(); $data['cust'] = $this->dahsboard_Model->customer_name(); @@ -403,6 +425,10 @@ class Report extends BaseController $data['cust'] = $this->dahsboard_Model->customer_name(); $data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['spurchse'] = $this->dahsboard_Model->report_consolidate($cname, $fa, $aa); + + $data['cname'] = $cname; + $data['ab'] = $ab; + } $data['material'] = $this->dahsboard_Model->material_name(); $data['cust'] = $this->dahsboard_Model->customer_name(); @@ -1060,6 +1086,11 @@ class Report extends BaseController $data['monthly_gst_purchase'] = $this->dahsboard_Model->monthly_gst_purchase($m, $frm, $t, $fa, $aa); $data['monthly_gst_sales'] = $this->dahsboard_Model->monthly_gst_sales($m, $frm, $t, $fa, $aa); + + $data['m'] = $m; + $data['frm']= $frm; + $data['t'] = $t; + $data['ab']= $ab; } $data['finyear'] = $this->dahsboard_Model->report_finyear(); $this->loadviews("Report_monthly_gst", $this->global, $data, NULL); diff --git a/app/Views/Report_POreleased.php b/app/Views/Report_POreleased.php index 818e3677..26855a28 100755 --- a/app/Views/Report_POreleased.php +++ b/app/Views/Report_POreleased.php @@ -52,9 +52,9 @@
  1. Reports
    2. -
    3. +
  3. Requisation
  4. -

    +

    Order Value Released

@@ -81,13 +81,16 @@ - - - - - - - - - - - - - + + + + + + + @@ -122,7 +123,8 @@
- + ">
@@ -131,7 +133,8 @@
- + ">
@@ -143,7 +146,8 @@
- + ">
@@ -152,12 +156,14 @@
- + ">
-

+

+ @@ -236,6 +242,13 @@ $(document).ready(function() { // Initialize the DataTable with only pagination enabled var table = $('#cc').DataTable({ + dom: 'Blfrtip', + buttons: [ + { + extend: 'excel', + text: 'Excel', + } + ], paging: true, // Enable pagination searching: true, // Disable search ordering: false, // Disable column sorting @@ -312,6 +325,7 @@ $( function() { dateFormat: 'dd-mm-yy', defaultDate: "+0d", changeMonth: true, + orientation : "botttom" //numberOfMonths: 1 }) .on( "change", function() { @@ -321,6 +335,7 @@ $( function() { dateFormat: 'dd-mm-yy', defaultDate: "+0d", changeMonth: true, + orientation : "bottom" //numberOfMonths: 1 }) .on( "change", function() { diff --git a/app/Views/Report_consolidate.php b/app/Views/Report_consolidate.php index 8a58eeeb..01027b2f 100755 --- a/app/Views/Report_consolidate.php +++ b/app/Views/Report_consolidate.php @@ -71,8 +71,8 @@
-
-
+
+
@@ -84,7 +84,12 @@ {?> - + @@ -94,7 +99,7 @@
-
+
@@ -104,28 +109,42 @@ - + - +
-
-
+
+ +
+
+  
-

+

+ @@ -417,6 +436,13 @@ $(document).ready(function() { // Initialize the DataTable with only pagination enabled var table = $('#cc').DataTable({ + dom: 'Blfrtip', + buttons: [ + { + extend: 'excel', + text: 'Excel', + } + ], paging: true, // Enable pagination searching: true, // Disable search ordering: false, // Disable column sorting diff --git a/app/Views/Report_costcenter.php b/app/Views/Report_costcenter.php index c8a6d5b9..efd57160 100755 --- a/app/Views/Report_costcenter.php +++ b/app/Views/Report_costcenter.php @@ -1,139 +1,166 @@ + + + - -
-
-
- -
- -
-
-

Report - Cost Center

- input->post('financialyear')){ - $ab=$this->input->post('financialyear'); - echo '('.$ab.')'; - } - - ?>

-
- - -
-
- - -
- - -
-
- - -
- -
-
- - -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
Cost Center CodeCost Center Name DepartmentBudget TypeBudget YearUtilized Amount  (₹)Balance Amount  (₹)
Cost_Center_Code?>Cost_Center_Name?>Dept_Name?>BudgetType?>BudgetYear?>Util_Amount,2,'.','')?>Avlbl_Amt,2,'.','')?>
- +
+
-
-
- -
- -
- - -
- +
+
+
+ - +
+ +
+
+
+ + + +
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Cost Center CodeCost Center Name DepartmentBudget TypeBudget YearUtilized Amount  (₹)Balance Amount  (₹)
Cost_Center_Code?>Cost_Center_Name?>Dept_Name?>BudgetType?>BudgetYear?>Util_Amount,2,'.','')?>Avlbl_Amt,2,'.','')?>
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + @@ -147,45 +174,47 @@ // Bootstrap datepicker // Set up your table + $(document).ready(function() { - table = $('#cc').DataTable( { - "language": { - "emptyTable":"
Data Not Found !
" - }, - "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + -"<'row'<'col-md-6'><'col-md-6'>>" + -"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", - buttons: [ - - { - extend: 'excelHtml5', - footer: 'true', - //messageTop: $('h3').text(), - title: $('h3').text(), - exportOptions: { - columns: ':visible' - - } - }, - - 'colvis' - ] - } ); -} ); + // Initialize the DataTable with only pagination enabled + var table = $('#cc').DataTable({ + dom: 'Blfrtip', + buttons: [ + { + extend: 'excel', + text: 'Excel', + } + ], + paging: true, // Enable pagination + searching: true, // Disable search + ordering: false, // Disable column sorting + info: false, // Disable table information + lengthChange: false, // Disable page length options + pageLength: 10, // Default rows per page + responsive: true, // Keep responsive design + language: { + paginate: { + next: '', // Next button icon + previous: '' // Previous button icon + } + } + }); +}); - $('#mySelect').on('change',function(){ - - table + + $('#mySelect').on('change',function(){ + table .column(4) .search(this.value) .draw(); }); + function Reset() -{ - $('#mySelect').val(''); - -} + { + $('#mySelect').val(''); + + } diff --git a/app/Views/Report_monthly_gst.php b/app/Views/Report_monthly_gst.php index 9d0d96e2..4bda46f8 100755 --- a/app/Views/Report_monthly_gst.php +++ b/app/Views/Report_monthly_gst.php @@ -1,288 +1,272 @@ + - -
-
-
- -
- -
-
-

Report - Monthly GST -

- 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; - } - - ?> -

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


- - -
-
-
- - - -
- - -
-
-
- - - - - - - - - - - input->post('month'); - $frm=$this->input->post('from_date'); - $t=$this->input->post('to_date'); - $ab=$this->input->post('financialyear'); - if(!empty($monthly_gst_purchase) and !empty($monthly_gst_sales)){ ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameSales  ()Purchase  ()Net  ()
SGSTsgst,2);?>sgst,2);?>sgst - $monthly_gst_purchase[0]->sgst; - echo round($sgst_net,2);?>
CGSTcgst,2);?>cgst,2);?>cgst - $monthly_gst_purchase[0]->cgst; - echo round($cgst_net,2);?>
IGSTigst,2);?>igst,2);?>igst - $monthly_gst_purchase[0]->igst; - echo round($igst_net,2);?>
Total GSTtotal,2);?>total,2);?>total - $monthly_gst_purchase[0]->total; - echo round($total_net,2);?>
-
-
- -
- -
-
-
-
- -
- -
-
-
+ + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Reports
    2. +
    3. +
  3. +

    Monthly GST Summary Reports

    +
    4. +
+
+ +
+
+
+
+
+
+ + +
+ +
+ +
+
+
+ + + +
+
+ +
+ "> +
+
+
+ +
+ "> +
+ +
+
+ +
+ + + + +
+
+ +
+
+


+ + + +
+
+ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameSales  ()Purchase  ()Net  ()
SGSTsgst,2);?>sgst,2);?>sgst - $monthly_gst_purchase[0]->sgst; + echo round($sgst_net,2);?>
CGSTcgst,2);?>cgst,2);?>cgst - $monthly_gst_purchase[0]->cgst; + echo round($cgst_net,2);?>
IGSTigst,2);?>igst,2);?>igst - $monthly_gst_purchase[0]->igst; + echo round($igst_net,2);?>
Total GSTtotal,2);?>total,2);?>total - $monthly_gst_purchase[0]->total; + echo round($total_net,2);?>
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + @@ -375,6 +359,4 @@ $(document).ready(function() { } - - \ No newline at end of file diff --git a/app/Views/Report_openorder.php b/app/Views/Report_openorder.php index b79259e3..c6847981 100755 --- a/app/Views/Report_openorder.php +++ b/app/Views/Report_openorder.php @@ -52,9 +52,9 @@
  1. Reports
    2. -
    3. +
  3. Requisation
  4. -

    +

    Open Orders - Pending

@@ -123,7 +123,7 @@
- +
@@ -132,7 +132,7 @@
- +
@@ -160,7 +160,8 @@
-

+

+ @@ -242,6 +243,13 @@ $(document).ready(function() { // Initialize the DataTable with only pagination enabled var table = $('#cc').DataTable({ + dom: 'Blfrtip', + buttons: [ + { + extend: 'excel', + text: 'Excel', + } + ], paging: true, // Enable pagination searching: true, // Disable search ordering: false, // Disable column sorting diff --git a/app/Views/Report_pending_purchase.php b/app/Views/Report_pending_purchase.php index 913a9c29..1add1af4 100755 --- a/app/Views/Report_pending_purchase.php +++ b/app/Views/Report_pending_purchase.php @@ -71,7 +71,7 @@
">
-
+
@@ -84,7 +84,7 @@ endforeach; ?>
-
+
@@ -97,7 +97,7 @@ endforeach; ?>
-
+
@@ -110,7 +110,7 @@ endforeach; ?>
-
+
@@ -127,7 +127,7 @@

-
+
@@ -135,7 +135,7 @@
-
+
@@ -144,7 +144,7 @@
-
+
@@ -157,8 +157,7 @@ endforeach; ?>
-
-

+

@@ -351,6 +350,13 @@ $(document).ready(function() { // Initialize the DataTable with only pagination enabled var table = $('#cc').DataTable({ + dom: 'Blfrtip', + buttons: [ + { + extend: 'excel', + text: 'Excel', + } + ], paging: true, // Enable pagination searching: true, // Disable search ordering: false, // Disable column sorting diff --git a/app/Views/Report_purchase.php b/app/Views/Report_purchase.php index c8006637..3eed6072 100755 --- a/app/Views/Report_purchase.php +++ b/app/Views/Report_purchase.php @@ -71,7 +71,7 @@
-
+
@@ -84,7 +84,7 @@ endforeach; ?>
-
+
@@ -97,7 +97,7 @@ endforeach; ?>
-
+
@@ -110,7 +110,7 @@ endforeach; ?>
-
+
@@ -127,7 +127,7 @@

-
+
@@ -135,7 +135,7 @@
-
+
@@ -144,8 +144,9 @@
-
-

+
+

+
@@ -425,6 +426,13 @@ $(document).ready(function() { // Initialize the DataTable with only pagination enabled var table = $('#cc').DataTable({ + dom: 'Blfrtip', + buttons: [ + { + extend: 'excel', + text: 'Excel', + } + ], paging: true, // Enable pagination searching: true, // Disable search ordering: false, // Disable column sorting diff --git a/app/Views/Report_supplier.php b/app/Views/Report_supplier.php index 1d73cc98..d25d05dd 100755 --- a/app/Views/Report_supplier.php +++ b/app/Views/Report_supplier.php @@ -73,7 +73,7 @@
-
+
@@ -86,20 +86,7 @@ endforeach; ?>
-
- - -
-
+
@@ -112,7 +99,7 @@ endforeach; ?>
-
+
@@ -126,10 +113,7 @@
-
-
-
-
+
@@ -137,7 +121,11 @@
-
+
+
+
+ +
@@ -146,8 +134,9 @@
-
-

+
+

+
@@ -272,6 +261,13 @@ $(document).ready(function() { // Initialize the DataTable with only pagination enabled var table = $('#cc').DataTable({ + dom: 'Blfrtip', + buttons: [ + { + extend: 'excel', + text: 'Excel', + } + ], paging: true, // Enable pagination searching: true, // Disable search ordering: false, // Disable column sorting diff --git a/app/Views/Report_totalorders.php b/app/Views/Report_totalorders.php index b00883e8..89d272c3 100755 --- a/app/Views/Report_totalorders.php +++ b/app/Views/Report_totalorders.php @@ -41,9 +41,9 @@
  1. Reports
    2. -
    3. +
  3. Requisation
  4. -

    +

    Total Orders

@@ -59,25 +59,36 @@
-
- + + + + + + + - {?> - - - - - - - -
-
- + +
+
+ + +
+ @@ -145,37 +156,39 @@ + + \ No newline at end of file diff --git a/app/Views/Report_year_wise.php b/app/Views/Report_year_wise.php index 106db822..eee56ba7 100755 --- a/app/Views/Report_year_wise.php +++ b/app/Views/Report_year_wise.php @@ -4,9 +4,8 @@ + //for clear button + function Reset() { + $('#min').val(''); + $('#max').val(''); + $('#min-date').val(''); + $('#max-date').val(''); + $('#financialyear').val(''); + } + \ No newline at end of file diff --git a/app/Views/reportslink.php b/app/Views/reportslink.php index 8ae57ec3..0d940f75 100644 --- a/app/Views/reportslink.php +++ b/app/Views/reportslink.php @@ -55,10 +55,11 @@

  Finance Reports

-

Cost Cente

+

Cost Center

Production Salary Cost

+ + +

  GST Reports

-

Monthly GST Summary Report

+

Monthly GST Summary Report

 +

  Sales Reports

@@ -81,14 +85,11 @@
-
-

  PayRoll

-

Employee Payroll

-
+

  Attendance

Employee Attendance

-

Employee Performance

+

Employee Performance

Leave Report