From 457585c5adaa6be0dea6326e5ba5639e30d34061 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 23 Apr 2025 15:00:50 +0530 Subject: [PATCH 01/12] stock changes 23-04-2025 --- app/Controllers/Report.php | 27 ++++++++++++- app/Views/Report_POreleased.php | 53 ++++++++++++++----------- app/Views/Report_consolidate.php | 38 +++++++++++++----- app/Views/Report_openorder.php | 10 ++--- app/Views/Report_pending_purchase.php | 17 ++++---- app/Views/Report_supplier.php | 34 ++++++---------- app/Views/Report_totalorders.php | 56 ++++++++++++++++---------- app/Views/Report_year_wise.php | 16 ++++---- app/Views/report_pendingreqst.php | 57 ++++++++++++++++----------- 9 files changed, 187 insertions(+), 121 deletions(-) diff --git a/app/Controllers/Report.php b/app/Controllers/Report.php index b1b5509c..ebc4f3e7 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(); @@ -318,6 +331,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); } @@ -377,6 +391,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(); @@ -400,6 +421,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(); diff --git a/app/Views/Report_POreleased.php b/app/Views/Report_POreleased.php index 818e3677..18f51c1d 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,13 @@
- + ">
-

+

@@ -312,6 +317,7 @@ $( function() { dateFormat: 'dd-mm-yy', defaultDate: "+0d", changeMonth: true, + orientation : "botttom" //numberOfMonths: 1 }) .on( "change", function() { @@ -321,6 +327,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..92ba7de0 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,41 @@ - + - +
-
-
+
+ +
+
+  
-

+

diff --git a/app/Views/Report_openorder.php b/app/Views/Report_openorder.php index b79259e3..414292c8 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,7 @@
-

+

diff --git a/app/Views/Report_pending_purchase.php b/app/Views/Report_pending_purchase.php index 913a9c29..f64ea7f0 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; ?>
-
-

+

diff --git a/app/Views/Report_supplier.php b/app/Views/Report_supplier.php index 1d73cc98..621132dd 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,8 @@
-
-

+
+

diff --git a/app/Views/Report_totalorders.php b/app/Views/Report_totalorders.php index b00883e8..8af4e815 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,34 @@
-
- -
-
- +
+
+ + +
+
+ +
+ @@ -178,4 +187,11 @@ $(document).ready(function() { } ); + + + \ No newline at end of file diff --git a/app/Views/Report_year_wise.php b/app/Views/Report_year_wise.php index 106db822..1fdde443 100755 --- a/app/Views/Report_year_wise.php +++ b/app/Views/Report_year_wise.php @@ -4,9 +4,8 @@ + - -
-
-
- -
- -
-
-

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 414292c8..c6847981 100755 --- a/app/Views/Report_openorder.php +++ b/app/Views/Report_openorder.php @@ -161,6 +161,7 @@

+ @@ -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 f64ea7f0..1add1af4 100755 --- a/app/Views/Report_pending_purchase.php +++ b/app/Views/Report_pending_purchase.php @@ -350,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 621132dd..d25d05dd 100755 --- a/app/Views/Report_supplier.php +++ b/app/Views/Report_supplier.php @@ -136,6 +136,7 @@

+
@@ -260,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 8af4e815..89d272c3 100755 --- a/app/Views/Report_totalorders.php +++ b/app/Views/Report_totalorders.php @@ -63,25 +63,27 @@
+
@@ -154,38 +156,33 @@ + diff --git a/app/Views/Report_year_wise.php b/app/Views/Report_year_wise.php index 1fdde443..eee56ba7 100755 --- a/app/Views/Report_year_wise.php +++ b/app/Views/Report_year_wise.php @@ -89,6 +89,7 @@

+
@@ -202,6 +203,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_pendingreqst.php b/app/Views/report_pendingreqst.php index b8f4235e..2eeb4087 100755 --- a/app/Views/report_pendingreqst.php +++ b/app/Views/report_pendingreqst.php @@ -1,6 +1,3 @@ - - - + //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 a136b0b2..8725d7c6 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,13 +85,9 @@
-
-

  PayRoll

-

Employee Payroll

-
+

  Attendance

-

Employee Attendance

Employee Performance

Leave Report
From 41e2acfc493e8a54cc1e03f7c2b28766e5a39c21 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Wed, 23 Apr 2025 13:54:14 +0000 Subject: [PATCH 03/12] merge --- app/Controllers/Report.php | 80 ++++++++++++++++++++------------------ app/Views/reportslink.php | 26 ++++++------- 2 files changed, 56 insertions(+), 50 deletions(-) diff --git a/app/Controllers/Report.php b/app/Controllers/Report.php index 54a2bae7..30c85222 100755 --- a/app/Controllers/Report.php +++ b/app/Controllers/Report.php @@ -316,6 +316,7 @@ class Report extends BaseController if ($this->request->getPost('financialyear')) { $ab = $this->request->getPost('financialyear'); + $data['financialyear'] = $ab; $a = substr((string)$ab, 0, -5); $b = substr((string)$ab, 5, 5); $data['year'] = $this->dahsboard_Model->report_year_wise($a, $b); @@ -559,6 +560,7 @@ class Report extends BaseController $ab = $this->request->getPost('financialyear'); $data['financialyear'] = $ab; $cat = $this->request->getVar('cat'); + $data['cat'] = $cat; $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); $m = $this->request->getPost('month'); @@ -589,13 +591,19 @@ class Report extends BaseController $this->global['pageTitle'] = 'Inward PO Reports'; //$this->request->getPost('btn_submit'); $cname = $this->request->getPost('client_name'); + $data['client_name'] = $cname; $prod = $this->request->getPost('item_name'); + $data['item_name'] = $prod; $ab = $this->request->getPost('financialyear'); + $data['financialyear'] = $ab; $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); $m = $this->request->getPost('month'); + $data['month'] = $m; $frm = $this->request->getPost('from_date'); + $data['frm'] = $frm; $t = $this->request->getPost('to_date'); + $data['t'] = $t; $sid = $this->request->getVar('sid'); $mid = $this->request->getVar('mid'); @@ -611,13 +619,19 @@ class Report extends BaseController //$this->request->getPost('btn_submit'); $cat = $this->request->getVar('cat'); $cname = $this->request->getVar('cname'); + $data['client_name'] = $cname; $prod = $this->request->getVar('prod'); + $data['item_name'] = $prod; $ab = $this->request->getVar('ab'); + $data['financialyear'] = $ab; $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); $m = $this->request->getVar('m'); + $data['month'] = $m; $frm = $this->request->getVar('frm'); + $data['frm'] = $frm; $t = $this->request->getVar('t'); + $data['t'] = $t; $sid = $this->request->getVar('sid'); $mid = $this->request->getVar('mid'); $d = $this->request->getVar('d'); @@ -640,12 +654,17 @@ class Report extends BaseController $this->global['pageTitle'] = 'Inward Reports - Summary'; if ($this->request->getPost('btn_submit')) { $cname = $this->request->getPost('client_name'); + $data['client_name'] = $cname; $ab = $this->request->getPost('financialyear'); + $data['financialyear'] = $ab; $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); $m = $this->request->getPost('month'); + $data['month'] = $m; $frm = $this->request->getPost('from_date'); + $data['from_date'] = $frm; $t = $this->request->getPost('to_date'); + $data['to_date'] = $t; //print_r($prod); $data['material'] = $this->dahsboard_Model->material_name(); $data['cust'] = $this->dahsboard_Model->customer_name(); @@ -676,6 +695,7 @@ class Report extends BaseController if ($this->request->getPost('financialyear')) { $ab = $this->request->getPost('financialyear'); + $data['financialyear'] = $ab; $a = substr((string)$ab, 0, -5); $b = substr((string)$ab, 5, 5); $data['year'] = $this->dahsboard_Model->ireport_year_wise($a, $b); @@ -704,17 +724,13 @@ class Report extends BaseController $data['month'] = $this->dahsboard_Model->ireport_month_wise($month); $this->loadviews("Report_month_wise_inward", $this->global, $data, NULL); } - public function iyear_wise_total() + public function iyear_wise_total($year) { $this->global['pageTitle'] = 'Inward Reports - Yearwise'; - $uri = service('uri'); - $last = $uri->getTotalSegments(); - $month = $uri->getSegment($last); - $a = substr($month, 0, -5); - $b = substr($month, 5, 5); - //print_r($month); - $data['year'] = $month; + $a = substr($year, 0, -5); + $b = substr($year, 5, 5); + $data['year'] = $year; $data['ytotal'] = $this->dahsboard_Model->ireport_year_wise_total($a, $b); $this->loadviews("Report_year_wise_total_inward", $this->global, $data, NULL); } @@ -725,12 +741,17 @@ class Report extends BaseController $this->global['pageTitle'] = 'Inward Reports - Supplierwise'; if ($this->request->getPost('btn_submit')) { $cname = $this->request->getPost('client_name'); + $data['client_name'] = $cname; $ab = $this->request->getPost('financialyear'); + $data['financialyear'] = $ab; $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); $m = $this->request->getPost('month'); + $data['month'] = $m; $frm = $this->request->getPost('from_date'); + $data['frm'] = $frm; $t = $this->request->getPost('to_date'); + $data['t'] = $t; //print_r($prod); $data['material'] = $this->dahsboard_Model->material_name(); $data['cust'] = $this->dahsboard_Model->customer_name(); @@ -753,7 +774,9 @@ class Report extends BaseController $this->global['pageTitle'] = 'Inward Reports - Consolidate'; if ($this->request->getPost('btn_submit')) { $cname = $this->request->getPost('client_name'); + $data['client_name'] = $cname; $ab = $this->request->getPost('financialyear'); + $data['financialyear'] = $ab; $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); //print_r($prod); @@ -778,10 +801,14 @@ class Report extends BaseController $sid = $this->request->getVar('sid'); $mid = $this->request->getVar('mid'); $cname = $this->request->getVar('cname'); + $data['client_name'] = $cname; $prod = $this->request->getVar('prod'); + $data['item_name'] = $prod; //$mat = $this->request->getVar('mid'); $m = $this->request->getVar('m'); + $data['month'] = $m; $ab = $this->request->getVar('ab'); + $data['financialyear'] = $ab; $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); //print_r($prod); @@ -802,9 +829,12 @@ class Report extends BaseController $sid = $this->request->getVar('sid'); $mid = $this->request->getVar('mid'); $cname = $this->request->getVar('cname'); + $data['client_name'] = $cname; $prod = $this->request->getVar('prod'); + $data['item_name'] = $prod; //$mat = $this->request->getVar('mid'); $ab = $this->request->getVar('ab'); + $data['financialyear'] = $ab; $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); //print_r($prod); @@ -835,49 +865,23 @@ class Report extends BaseController $this->loadviews("Report_cumulative_inward", $this->global, $data, NULL); } - public function icum_month() + public function icum_month($sup,$mat) { - $this->global['pageTitle'] = 'Inward Reports - Cumulative-Monthwise'; - $uri = service('uri'); - $last = $uri->getSegments(); - - - $sup = $last[3]; - $mat = $last[4]; - //print_r($prod); - $data['cum_month'] = $this->dahsboard_Model->ireport_cum_month($sup, $mat); $this->loadviews("Report_cumulative_month_inward", $this->global, $data, NULL); } - public function icum_year() + public function icum_year($sup,$mat) { $this->global['pageTitle'] = 'Inward Reports - Cumulative-Yearwise '; - $uri = service('uri'); - $last = $uri->getSegments(); - - - $sup = $last[3]; - $mat = $last[4]; - - //print_r($sup); - $data['cum_year'] = $this->dahsboard_Model->ireport_cum_year($sup, $mat); $this->loadviews("Report_cumulative_year_inward", $this->global, $data, NULL); } - public function icum_day() + public function icum_day($sup,$mat) { $this->global['pageTitle'] = 'Inward Reports - Cumulative-Daywise '; - $uri = service('uri'); - $last = $uri->getSegments(); - - - $sup = $last[3]; - $mat = $last[4]; - //print_r($prod); - $data['cum_day'] = $this->dahsboard_Model->ireport_cum_day($sup, $mat); $this->loadviews("Report_cumulative_day_inward", $this->global, $data, NULL); } @@ -933,7 +937,9 @@ class Report extends BaseController $this->global['pageTitle'] = ' Inward Report - Consolidate '; if ($this->request->getPost('btn_submit')) { $cname = $this->request->getPost('client_name'); + $data['client_name'] = $cname; $ab = $this->request->getPost('financialyear'); + $data['financialyear'] = $ab; $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); //print_r($prod); diff --git a/app/Views/reportslink.php b/app/Views/reportslink.php index a136b0b2..8ae57ec3 100644 --- a/app/Views/reportslink.php +++ b/app/Views/reportslink.php @@ -34,21 +34,21 @@

  Material Master

-

Material Master - supplier wise

-

Material Master - Item wise

-

Material Master - Receipt Value

+

Material Master - supplier wise

 +

Material Master - Item wise

 +

Material Master - Receipt Value

  Inward

-

Inward Details

-

Inward Summary

-

Year Wise-Inward

-

Inward-Supplier Wise

-

Consolidate Report-Inward

-

Cumulative Report-Inward

-

Cumulative Report - Category Wise-Inward

-

Consolidate Report - Category Wise-Inward

-

Report - DeliveryPerformance

+ Inward Details

 + Inward Summary

 + Year Wise-Inward

 + Inward-Supplier Wise

 + Consolidate Report-Inward

 + Cumulative Report-Inward

 + Cumulative Report - Category Wise-Inward

 + Consolidate Report - Category Wise-Inward

 + Report - DeliveryPerformance
@@ -88,7 +88,7 @@

  Attendance

Employee Attendance

-

Employee Performance

+

Employee Performance

Leave Report
From 4553b566a9ed888b1d3a6c45396ef478d7a95d98 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 23 Apr 2025 20:19:00 +0530 Subject: [PATCH 04/12] stock changes 23-04-2025 --- app/Controllers/Report.php | 2 +- app/Helpers/datetime_helper.php | 44 ++- app/Views/report_emp.php | 525 +++++++++++++++----------------- app/Views/reportslink.php | 4 +- 4 files changed, 270 insertions(+), 305 deletions(-) diff --git a/app/Controllers/Report.php b/app/Controllers/Report.php index 22cff088..f2c78550 100755 --- a/app/Controllers/Report.php +++ b/app/Controllers/Report.php @@ -1193,7 +1193,7 @@ class Report extends BaseController $day = array(); - $DateofJoiningInString = $Employee->DateofJoining; + $DateofJoiningInString = $Employee->DateofJoining; $DateofJoining = date_create($DateofJoiningInString); // print_r($DateofJoining); // $doj_month = date_format($DateofJoining, "n"); diff --git a/app/Helpers/datetime_helper.php b/app/Helpers/datetime_helper.php index 75a9dd26..a39ee72d 100755 --- a/app/Helpers/datetime_helper.php +++ b/app/Helpers/datetime_helper.php @@ -79,40 +79,34 @@ if (!function_exists('get_date_format')) { // } if (!function_exists('format_date')) { - function format_date($dateString, $days = 0,$format = 'Y-m-d') + function format_date($dateString, $days = 0, $format = 'Y-m-d') { - // Check if the input is already a Unix timestamp - if (is_numeric($dateString) && (string) (int) $dateString === $dateString) { - $date = strtotime($dateString); - } else { - // Use date_create() to create a DateTime object + // If already a DateTime object + if ($dateString instanceof DateTime) { + $date = $dateString; + } + // If Unix timestamp + elseif (is_numeric($dateString) && (string) (int) $dateString === (string) $dateString) { + $date = new DateTime(); + $date->setTimestamp((int) $dateString); + } + // If string + else { $date = date_create($dateString); } - - // If $date is false, meaning parsing failed, return null + if (!$date) { return null; } - - // Subtract the specified number of days from the date if $days is provided + + // Modify date if ($days != 0) { - // If $date is a Unix timestamp, modify it using strtotime() - if (is_numeric($dateString) && (string) (int) $dateString === $dateString) { - $date = strtotime("-$days day", $date); - } else { - // If $date is a DateTime object, modify it using DateTime::modify() - date_modify($date, "-$days day"); - } - } - - // If $date is a Unix timestamp, format it using date() - if (is_numeric($dateString) && (string) (int) $dateString === $dateString) { - return date($format, $date); - } else { - // If $date is a DateTime object, format it using DateTime::format() - return date_format($date, $format); + $date->modify("-{$days} days"); } + + return $date->format($format); } + } if (!function_exists('get_financial_year')) { diff --git a/app/Views/report_emp.php b/app/Views/report_emp.php index 63c4588a..acbe3e4e 100755 --- a/app/Views/report_emp.php +++ b/app/Views/report_emp.php @@ -1,303 +1,274 @@ + - -
-
-
- -
- -
-
-

Employee Performance
- input->post('financialyear')){ - $ab=$this->input->post('financialyear'); - echo '('.$ab.')'; - echo ' '; - - } - if($this->input->post('month')){ - $m=$this->input->post('month'); - echo '('.$m.')'; - echo ' '; - } - - ?> -

- -
- -
+ .dataTables_filter input { + padding: 4px; + } - + .dataTables_filter { + /* width: 50%; */ + float: right; + text-align: right; + } -
- - - -
- -
- -
+ .dataTables_paginate { + width: 50%; + float: right; + text-align: right; + } + + div.dt-buttons { + position: relative; + /* float: right; */ + + } + + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Reports
    2. +
  2. Attendance
    3. +
  3. +

    Employee Performance

    +
    4. +
-
- -
- -
- - - -
-

- - -
- - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - uri->total_segments(); - $ab=$this->uri->segment($last); - foreach($per as $index =>$rel) - { - //echo $index; - //echo - ?> - - - - - - - - - - - - - - - - - - -
EmpIDEmployee Name Status
Month
Year
Total DaysPresent DaysPercentageTotal DaysPresent DaysPercentage
- Eid;?> - ename;?>active == 1){ - echo 'Active'; - }else - { - echo 'In Active'; - } - ?>monthworked;?>monthpercentage;?>
- -
-
-
- -
- -
-
+ +
+
+
+
+
+ + +
+
+ +
+ + +
+
+ +
+ +
+
+ +
+ +
+ +
+ + + +
+ +

+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $rel) + { + //echo $index; + //echo + ?> + + + + + + + + + + + + + + + + + + +
EmpIDEmployee Name Status
Month
Year
Total DaysPresent DaysPercentageTotal DaysPresent DaysPercentage
+ Eid;?> + ename;?>active == 1){ + echo 'Active'; + }else + { + echo 'In Active'; + } + ?>monthworked;?>monthpercentage;?>
+
+
+
+
+
+
+
+
+ + + + + + + + + - - - - - - - - \ No newline at end of file diff --git a/app/Views/reportslink.php b/app/Views/reportslink.php index 8725d7c6..150d7d0d 100644 --- a/app/Views/reportslink.php +++ b/app/Views/reportslink.php @@ -56,7 +56,7 @@

  Finance Reports

Cost Center

 -

Production Salary Cost

+
@@ -88,7 +88,7 @@

  Attendance

-

Employee Performance

+

Employee Performance

Leave Report
From ea0d9afaaf27271f6111d6ca1826220397d8f222 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Thu, 24 Apr 2025 09:07:52 +0530 Subject: [PATCH 05/12] stock changes 23-04-2025 --- app/Controllers/Report.php | 2 ++ app/Views/report_emp.php | 51 +++++++++++++++++++++++++++----------- app/Views/reportslink.php | 16 ++++++------ 3 files changed, 47 insertions(+), 22 deletions(-) diff --git a/app/Controllers/Report.php b/app/Controllers/Report.php index 9db52041..b2d01671 100755 --- a/app/Controllers/Report.php +++ b/app/Controllers/Report.php @@ -1170,10 +1170,12 @@ class Report extends BaseController $ab = $this->request->getPost('financialyear'); + $data['ab'] = $ab; $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); $m = $this->request->getPost('month'); + $data['m'] = $m; //print_r($prod); diff --git a/app/Views/report_emp.php b/app/Views/report_emp.php index acbe3e4e..9e8f9c59 100755 --- a/app/Views/report_emp.php +++ b/app/Views/report_emp.php @@ -87,8 +87,12 @@ foreach($fy as $item): {?> + + - + @@ -104,19 +108,38 @@
diff --git a/app/Views/reportslink.php b/app/Views/reportslink.php index 5149411d..ca030c4e 100644 --- a/app/Views/reportslink.php +++ b/app/Views/reportslink.php @@ -40,15 +40,15 @@

  Inward

- Inward Details

 - Inward Summary

 - Year Wise-Inward

 - Inward-Supplier Wise

 - Consolidate Report-Inward

 - Cumulative Report-Inward

 - Cumulative Report - Category Wise-Inward

 + Inward Details

 + Inward Summary

 + Year Wise-Inward

 + Inward-Supplier Wise

 + Consolidate Report-Inward

 + Cumulative Report-Inward

 + Cumulative Report - Category Wise-Inward

 Consolidate Report - Category Wise-Inward

 - Report - DeliveryPerformance

 + Report - DeliveryPerformance
From 1c92fcf07a4aa9420cea4abd29df9982ba6b2657 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Thu, 24 Apr 2025 03:57:39 +0000 Subject: [PATCH 06/12] reportlink 2 --- app/Config/Routes.php | 32 +- app/Controllers/Report.php | 15 + app/Controllers/User.php | 152 +- app/Models/Dashboard_model.php | 41 +- app/Views/Report_Material_Master_ItemWise.php | 242 ++- .../Report_Material_Master_ReceiptValue.php | 481 +++-- .../Report_Material_Master_SupplierWise.php | 255 ++- app/Views/Report_attach_inward.php | 1070 +++++------ app/Views/Report_consolidate_inward.php | 1572 ++++++++-------- app/Views/Report_consolidate_m.php | 423 +++-- app/Views/Report_consolidate_month.php | 425 ++--- app/Views/Report_consolidate_month_inward.php | 392 ++-- app/Views/Report_consolidate_raw.php | 1599 ++++++++--------- app/Views/Report_consolidate_y.php | 420 +++-- app/Views/Report_consolidate_year.php | 432 ++--- app/Views/Report_consolidate_year_inward.php | 398 ++-- app/Views/Report_cumulative_day_inward.php | 368 ++-- app/Views/Report_cumulative_day_raw.php | 379 ++-- app/Views/Report_cumulative_inward.php | 756 ++++---- app/Views/Report_cumulative_month_inward.php | 373 ++-- app/Views/Report_cumulative_month_raw.php | 420 ++--- app/Views/Report_cumulative_raw.php | 540 +++--- app/Views/Report_cumulative_year_inward.php | 435 +++-- app/Views/Report_cumulative_year_raw.php | 456 +++-- app/Views/Report_month_wise_inward.php | 398 ++-- app/Views/Report_purchase_inward.php | 1187 +++++------- app/Views/Report_supplier_inward.php | 702 +++----- app/Views/Report_supplier_summary.php | 631 +++---- app/Views/Report_year_wise_inward.php | 472 +++-- app/Views/Report_year_wise_total_inward.php | 420 ++--- app/Views/deliver_perform.php | 639 +++---- app/Views/employeeLeaveApplicationForm.php | 6 +- app/Views/emppayListing.php | 2 +- 33 files changed, 7305 insertions(+), 8828 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index a56d708e..40536921 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -418,6 +418,9 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_Material_Supplier', 'Re $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_Material_Item', 'Report::MM_Item'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_Material_ReceiptValue', 'Report::MM_ReceiptValue'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_purchase', 'Report::purchase'); +$routes->get('report/consolidate_month', 'Report::consolidate_month'); +$routes->get('report/link_purchase', 'Report::link_purchase'); +$routes->get('report/consolidate_year', 'Report::consolidate_year'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_year_wise', 'Report::year_wise'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_supplier', 'Report::purchase_supplier'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_consolidate', 'Report::consolidate'); @@ -429,12 +432,25 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'cashbookmonthlyexpenses', 'Rep $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'cashbookyearlyexpenses', 'Report::yearexpenses'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_purchase_inward', 'Report::ipurchase'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_year_wise_inward', 'Report::iyear_wise'); +$routes->get('report/imonth_wise', 'Report::imonth_wise'); +$routes->get('report/iyear_wise_total/(:any)', 'Report::iyear_wise_total/$1'); +$routes->get('report/ilink_purchase', 'Report::ilink_purchase'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_supplier_inward', 'Report::ipurchase_supplier'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_supplier_summary', 'Report::suppliersummary'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_consolidate_inward', 'Report::iconsolidate'); +$routes->get('report/i_consolidate_month', 'Report::i_consolidate_month'); +$routes->get('report/i_consolidate_year', 'Report::i_consolidate_year'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_cumulative_inward', 'Report::icumulative'); +$routes->get('report/icum_day/(:any)/(:any)', 'Report::icum_day/$1/$2'); +$routes->get('report/icum_month/(:any)/(:any)', 'Report::icum_month/$1/$2'); +$routes->get('report/icum_year/(:any)/(:any)', 'Report::icum_year/$1/$2'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_cumulative_raw', 'Report::rawi_cumulative'); +$routes->get('report/rawi_cum_day', 'Report::rawi_cum_day'); +$routes->get('report/rawi_cum_month', 'Report::rawi_cum_month'); +$routes->get('report/rawi_cum_year', 'Report::rawi_cum_year'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_consolidate_category', 'Report::rawi_consolidate'); +$routes->get('report/rawi_consolidate_month', 'Report::rawi_consolidate_month'); +$routes->get('report/rawi_consolidate_year', 'Report::rawi_consolidate_year'); $routes->match(['GET', 'POST'], 'Report_pending_purchase', 'Report::pending_purchase'); $routes->match(['GET', 'POST'], '/Report_pending_purchase', 'Report::pending_purchase'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_purchase_attach', 'Report::iattach'); @@ -547,18 +563,4 @@ $routes->post('updateAbstractDetails','StockController::updateAbstractDetails'); //Reports Module -$routes->get('allReports','Report::allReports'); - -// Material Report Links -$routes->get('MM_Supplier', 'Report::MM_Supplier'); -$routes->get('MM_Item','Report::MM_Item'); -$routes->match(['GET', 'POST'],'MM_ReceiptValue','Report::MM_ReceiptValue'); - -//Inward Report Links -$routes->match(['GET', 'POST'],'ipurchase','Report::ipurchase'); -$routes->match(['GET', 'POST'],'iyear_wise', 'Report::iyear_wise'); -$routes->match(['GET', 'POST'],'ipurchase_supplier' , 'Report::ipurchase_supplier'); -$routes->match(['GET', 'POST'],'iconsolidate' , 'Report::iconsolidate'); -$routes->match(['GET', 'POST'],'icumulative' , 'Report::icumulative'); -$routes->match(['GET', 'POST'],'rawi_cumulative' , 'Report::rawi_cumulative'); -$routes->match(['GET', 'POST'],'rawi_consolidate' , 'Report::rawi_consolidate'); \ No newline at end of file +$routes->get('allReports','Report::allReports'); \ No newline at end of file diff --git a/app/Controllers/Report.php b/app/Controllers/Report.php index 743ab06d..5482e4dd 100755 --- a/app/Controllers/Report.php +++ b/app/Controllers/Report.php @@ -284,13 +284,19 @@ class Report extends BaseController $this->global['pageTitle'] = 'Reports'; //$this->request->getPost('btn_submit'); $cname = $this->request->getPost('client_name'); + $data['cname'] = $cname; $prod = $this->request->getPost('item_name'); + $data['prod'] = $prod; $ab = $this->request->getPost('financialyear'); + $data['ab'] = $ab; $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); $m = $this->request->getPost('month'); + $data['m'] = $m; $frm = $this->request->getPost('from_date'); + $data['frm'] = $frm; $t = $this->request->getPost('to_date'); + $data['t'] = $t; //print_r($prod); $data['material'] = $this->dahsboard_Model->material_name(); $data['cust'] = $this->dahsboard_Model->customer_name(); @@ -300,13 +306,19 @@ class Report extends BaseController $this->global['pageTitle'] = 'Reports'; //$this->request->getPost('btn_submit'); $cname = $this->request->getVar('cname'); + $data['cname'] = $cname; $prod = $this->request->getVar('prod'); + $data['prod'] = $prod; $ab = $this->request->getVar('ab'); + $data['ab'] = $ab; $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); $m = $this->request->getVar('month'); + $data['m'] = $m; $frm = $this->request->getVar('frm'); + $data['frm'] = $frm; $t = $this->request->getVar('t'); + $data['t'] = $t; $sid = $this->request->getVar('sid'); $mid = $this->request->getVar('mid'); $d = $this->request->getVar('d'); @@ -448,7 +460,9 @@ class Report extends BaseController $prod = $this->request->getVar('prod'); //$mat = $this->request->getVar('mid'); $m = $this->request->getVar('m'); + $data['month'] = $m; $ab = $this->request->getVar('ab'); + $data['financialyear'] = $ab; $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); //print_r($prod); @@ -471,6 +485,7 @@ class Report extends BaseController $prod = $this->request->getVar('prod'); //$mat = $this->request->getVar('mid'); $ab = $this->request->getVar('ab'); + $data['financialyear'] = $ab; $fa = substr((string)$ab, 0, -5); $aa = substr((string)$ab, 5, 5); //print_r($prod); diff --git a/app/Controllers/User.php b/app/Controllers/User.php index 2f55a36d..606ef723 100755 --- a/app/Controllers/User.php +++ b/app/Controllers/User.php @@ -897,22 +897,22 @@ class User extends BaseController */ function userListing() { - - $isDeleted = 0 ; // default showing active data - $showArchive = 0 ; // + + $isDeleted = 0; // default showing active data + $showArchive = 0; // if ($this->request->getMethod() === 'POST') { $showArchive = $this->request->getPost('showArchive'); //reversing condition that when user wants deleted data to be shown then we are making active filter 0 - if($showArchive){ - $isDeleted = 1; - } - } + if ($showArchive) { + $isDeleted = 1; + } + } $data['showArchive'] = $showArchive; - // dd($data); + // dd($data); $data['userRecords'] = $this->user_model->userListing($isDeleted); @@ -1024,7 +1024,7 @@ class User extends BaseController $password = (string)$this->request->getPost('password'); $Createddt = date('Y-m-d H:i:s'); $email = $this->request->getPost('MailID'); - + $userInfo = [ 'email' => $email, 'EmpID' => $EmpID, @@ -1036,7 +1036,7 @@ class User extends BaseController $result = $this->user_model->addNewUser($userInfo); - + if ($result > 0) { // return redirect()->to('userListing')->with('success', 'New user created successfully!'); $this->session->setFlashdata('success', 'New user created successfully!'); @@ -1059,25 +1059,25 @@ class User extends BaseController }; } - function isEmailExists(){ - - + function isEmailExists() + { + + $MailID = $this->request->getPost('MailID'); - $empID = $this->request->getPost('EmpID'); + $empID = $this->request->getPost('EmpID'); if (!$MailID) { return $this->response->setJSON(['success' => false, 'message' => 'Mail ID not provided']); } - $isEmailExists = $this->user_model->isEmailExists($MailID,$empID); + $isEmailExists = $this->user_model->isEmailExists($MailID, $empID); if ($isEmailExists) { return $this->response->setJSON(['success' => true, 'message' => 'Email Already Exsiting']); } else { return $this->response->setJSON(['success' => false, 'message' => '']); } - } @@ -1161,7 +1161,7 @@ class User extends BaseController $userInfo = array(); // $userInfo = array('password' => getHashedPassword($password), 'roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate); - $userInfo = array('roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate , 'email'=> $this->request->getPost('MailID')); + $userInfo = array('roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate, 'email' => $this->request->getPost('MailID')); $result = $this->user_model->editUser($userInfo, $EmpID); @@ -1183,16 +1183,16 @@ class User extends BaseController */ function deleteUser() { - + $Uid = $this->request->getGet('UID'); $updatedDate = get_current_date_time(); $updateInfo = array('isDeleted' => 1, 'updatedBy' => $this->vendorId, 'updatedDtm' => $updatedDate); - + $result = $this->user_model->userActivation($Uid, $updateInfo); - return redirect()->route('userListing'); + return redirect()->route('userListing'); } function reActivateUser() @@ -1208,31 +1208,31 @@ class User extends BaseController $result = $this->user_model->userActivation($Uid, $updateInfo); - return redirect()->route('userListing'); + return redirect()->route('userListing'); } - + function userChangePassword() { - helper('form'); + helper('form'); $userId = $this->request->getPost('userId'); $newPassword = $this->request->getPost('password'); $cNewPassword = $this->request->getPost('cpassword'); if ($newPassword == $cNewPassword) { - $usersData = array( - 'password' => getHashedPassword($newPassword), - 'updatedBy' => $userId, - 'updatedDtm' => date('Y-m-d H:i:sa') - ); - $result = $this->user_model->changePassword($userId, $usersData); - if ($result > 0) { - $this->session->setFlashdata('success', 'Password updation successful'); - } else { - $this->session->setFlashdata('error', 'Password updation failed'); - } + $usersData = array( + 'password' => getHashedPassword($newPassword), + 'updatedBy' => $userId, + 'updatedDtm' => date('Y-m-d H:i:sa') + ); + $result = $this->user_model->changePassword($userId, $usersData); + if ($result > 0) { + $this->session->setFlashdata('success', 'Password updation successful'); + } else { + $this->session->setFlashdata('error', 'Password updation failed'); + } - return redirect()->route('userListing'); + return redirect()->route('userListing'); } else { $this->session->setFlashdata('error', 'New Password and Confirm Password Not Same'); return redirect()->route('userListing'); @@ -1300,10 +1300,12 @@ class User extends BaseController if ($this->request->getPost('btn_submit')) { $ab = (string)$this->request->getPost('financialyear'); + $data['financialyear'] = $ab; $fa = substr($ab, 0, -5); $aa = substr($ab, 5, 5); $m = $this->request->getPost('month'); + $data['month'] = $m; $data['fy'] = $this->user_model->fincalYear(); $data['per'] = $this->user_model->deliver_perform($fa, $aa, $m); @@ -1355,9 +1357,9 @@ class User extends BaseController function zohobooks_api_fetch_all() { - + try { - + helper('zohobook'); $Zohobook_model = model('Zohobook_api_model'); if (isset($_GET['from']) && $_GET['from'] != null && isset($_GET['to']) && $_GET['to'] != null) { @@ -1367,13 +1369,13 @@ class User extends BaseController $date_today = date('Y-m-d'); $date_yesterday = date('Y-m-d', strtotime('-3 day', strtotime($date_today))); } - + $chk_acc_token_val = $Zohobook_model->get_data('zohobook_accesstoken', 'id', 1); - + $date = new \DateTime($chk_acc_token_val[0]['created_at']); - + $date->add(new \DateInterval('PT1H')); - + $token = 0; if ($date->format('Y-m-d H:i:s') > date('Y-m-d H:i:s')) { $token = $chk_acc_token_val[0]['token']; @@ -1385,7 +1387,7 @@ class User extends BaseController // $token = generateNewToken(); $tokendata['token'] = $token; //$Zohobook_model->update($tokendata , 1,'zohobook_accesstoken'); $result = getheringInvoiceDetails($date_today, $date_yesterday, $token); - + $headers_new = $result['headers_new']; $res = json_decode($result['data'], true); $inv_array = $res['invoices']; @@ -1393,16 +1395,15 @@ class User extends BaseController $tokenWithCreditNoteScope = generateNewTokenForCreditNoteScope(); $cteditNotesRes = getAllCreditNotes($date_today, $date_yesterday, $tokenWithCreditNoteScope); - - $cteditNotesData = json_decode($cteditNotesRes['data'],true); - - if(count($cteditNotesData['creditnotes'])) - { - $this->saveOrUpdateCreditNote($cteditNotesData['creditnotes'] , $tokenWithCreditNoteScope); + + $cteditNotesData = json_decode($cteditNotesRes['data'], true); + + if (count($cteditNotesData['creditnotes'])) { + $this->saveOrUpdateCreditNote($cteditNotesData['creditnotes'], $tokenWithCreditNoteScope); } // dd($cteditNotesData); - - + + foreach ($inv_array as $inv) { $invoice_id = $inv['invoice_id']; //filter only einvoice status pushed invoices only @@ -1419,7 +1420,7 @@ class User extends BaseController // dd($res2); foreach ($res2 as $rs) { - + $gst_no = $rs['gst_no']; $customer_id = $rs['customer_id']; $customer_name = $rs['customer_name']; @@ -1440,16 +1441,14 @@ class User extends BaseController if ($sql_invoice_chk <= 0) { //this check only for ASHOK LEYLAND LIMITED - if($customer_id == '3215000000000082604' || $customer_id == '3215000000000082724') - { + if ($customer_id == '3215000000000082604' || $customer_id == '3215000000000082724') { //this combination of customer_id & gst_no search only for client ASHOK LEYLAND - $gst_sql = $Zohobook_model->ip_client_ashok_leyland($gst_no,$customer_id); + $gst_sql = $Zohobook_model->ip_client_ashok_leyland($gst_no, $customer_id); if ($gst_sql) { $client_id = $gst_sql[0]['client_id']; log_message('error', 'Data fetch success DB : ip_clients , client_id : ' . $client_id); } - - }else{ + } else { $gst_sql = $Zohobook_model->ip_clients($gst_no); if ($gst_sql) { @@ -1464,13 +1463,12 @@ class User extends BaseController $client_id = $gst_inserted_id; log_message('error', 'New Data Created : DB : ip_clients , client_id : ' . $client_id); } - } - - + + $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; @@ -1656,7 +1654,7 @@ class User extends BaseController $ip_invoice_items['Sgst_item_tax_rate_id'] = $sgsttaxid; $ip_invoice_items['Cgst_item_tax_rate_id'] = $cgsttaxid; $ip_invoice_items['hsn_or_sac'] = $hsn_or_sac; - + $item_insert_id = $Zohobook_model->customInsert($ip_invoice_items, 'ip_invoice_items'); if ($item_insert_id) log_message('error', 'Data insert success DB : ip_invoice_items => Sgst_item_tax_rate_id :' . $sgsttaxid); @@ -1726,54 +1724,44 @@ class User extends BaseController } // END zoho API - public function saveOrUpdateCreditNote($data , $tokenWithCreditNoteScope ) + public function saveOrUpdateCreditNote($data, $tokenWithCreditNoteScope) { - + foreach ($data as $key => $value) { - + $existingCreditNote = $this->CreditNoteModel->where('creditnote_id', $value['creditnote_id'])->first(); - + if ($existingCreditNote) { // Update existing record - $this->CreditNoteModel->update($value['creditnote_id'], $value); - + $this->CreditNoteModel->update($value['creditnote_id'], $value); } else { // Insert new record - $this->CreditNoteModel->insert($value); - + $this->CreditNoteModel->insert($value); } //credit note line item api call $cteditNotesLineItemsRes = getCreditNotesItemDetails($value['creditnote_id'], $tokenWithCreditNoteScope); - - $lineItemData = json_decode($cteditNotesLineItemsRes['data'],true); - if(count($lineItemData['creditnote']['line_items'])) - { - foreach ($lineItemData['creditnote']['line_items'] as $itemkey => $itemvalue) - { + $lineItemData = json_decode($cteditNotesLineItemsRes['data'], true); + + if (count($lineItemData['creditnote']['line_items'])) { + foreach ($lineItemData['creditnote']['line_items'] as $itemkey => $itemvalue) { $itemvalue['creditnote_id'] = $value['creditnote_id']; - + $existingCreditNoteItems = $this->CreditNotesItemsModel->where('line_item_id', $itemvalue['line_item_id'])->first(); - + if ($existingCreditNoteItems) { // Update existing record $this->CreditNotesItemsModel->update($itemvalue['line_item_id'], $itemvalue); - } else { // Insert new record $this->CreditNotesItemsModel->insert($itemvalue); - } - - } - } } - } diff --git a/app/Models/Dashboard_model.php b/app/Models/Dashboard_model.php index b2a4fcb2..459771d8 100755 --- a/app/Models/Dashboard_model.php +++ b/app/Models/Dashboard_model.php @@ -943,33 +943,33 @@ where pm.PODate != 0 "; where pm.Status != 'ST030' and pm.Status != 'ST056' and pm.Status != 'ST027'"; - if ($cname != '') { + if ($cname != '') { - $sql .= "and sd.SupplierName = '" . $cname . "'"; - } + $sql .= "and sd.SupplierName = '" . $cname . "'"; + } - if ($fa and $aa != '') { + if ($fa and $aa != '') { - $sql .= " and (pm.PODate >= '" . $fa . "-04-01' and pm.PODate <= '" . $aa . "-03-31')"; - } - if ($m != '') { + $sql .= " and (pm.PODate >= '" . $fa . "-04-01' and pm.PODate <= '" . $aa . "-03-31')"; + } + if ($m != '') { - $sql .= "and monthname(pm.PODate) = '" . $m . "'"; - } + $sql .= "and monthname(pm.PODate) = '" . $m . "'"; + } - if ($frm and $t != '') { - $fromd = date("Y-m-d", strtotime($frm)); - $tod = date("Y-m-d", strtotime($t)); + if ($frm and $t != '') { + $fromd = date("Y-m-d", strtotime($frm)); + $tod = date("Y-m-d", strtotime($t)); - $sql .= "and date(pm.PODate) >= '" . $fromd . "' + $sql .= "and date(pm.PODate) >= '" . $fromd . "' and date(pm.PODate) <= '" . $tod . "'"; - } - if ($prod != '') { + } + if ($prod != '') { - $sql .= " and mm.MaterialName = '" . $prod . "' "; - } + $sql .= " and mm.MaterialName = '" . $prod . "' "; + } @@ -2032,7 +2032,8 @@ group by supplier_name,material_name"; $ab = $yearl; $fa = substr($ab, 0, -5); $aa = substr($ab, 5, 5); - $sql = "SELECT year.category as category,year.quantity as quantity,year.total as total,month.mquantity as mquantity,month.mtotal as mtotal,today.tquantity as tquantity,today.ttotal as ttotal + $sql = "SELECT cd.ConfigValue as category_id, + cd.key, year.category,year.quantity as quantity,year.total as total,month.mquantity as mquantity,month.mtotal as mtotal,today.tquantity as tquantity,today.ttotal as ttotal FROM (SELECT category,sum(Quantity) as quantity,sum(value) as total FROM igr where status != 'ST030' and @@ -2052,6 +2053,7 @@ where status != 'ST030' and date(materialrcvddate) = current_date() group by category ) as today on today.category=month.category +left join t_configdetails cd on cd.key = year.category group by category "; $query = $this->db->query($sql); return $query->getResult(); @@ -2238,7 +2240,7 @@ where po.Status != 'ST030' and po.Status = 'ST026' // } - if($purchaseorder_number != ''){ + if ($purchaseorder_number != '') { $sql .= " and po.PONO = '" . $purchaseorder_number . "' "; } $sql .= "order by date(po.PODate) desc"; @@ -3044,5 +3046,4 @@ function daybeforetotal($yesterday){ $query = $this->db->query($sql); return $query->getResult(); } - } \ No newline at end of file diff --git a/app/Views/Report_Material_Master_ItemWise.php b/app/Views/Report_Material_Master_ItemWise.php index c0fe1625..557f8db1 100755 --- a/app/Views/Report_Material_Master_ItemWise.php +++ b/app/Views/Report_Material_Master_ItemWise.php @@ -1,147 +1,113 @@ - - - - + - - } - - - -
- -
- -
- -
-
-

Report - Material Master - Item Wise

-
- - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Material CodeMaterial NameUOMCategoryHSNCODE
MaterialCode?>MaterialName?>UOM?>Category?>HSNCODE?>
- -
-
-
- +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Material Master
    3. +
  3. +

    Item Wise

    +
    4. +
+
+ +
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Material CodeMaterial NameUOMCategoryHSNCODE
MaterialCode ?>MaterialName ?>UOM ?>Category ?>HSNCODE ?>
+
+
+
-
-
- +
+
+
- - - - - - + + + + + + + + - - - \ No newline at end of file + }); + \ No newline at end of file diff --git a/app/Views/Report_Material_Master_ReceiptValue.php b/app/Views/Report_Material_Master_ReceiptValue.php index c16e6d0c..af89330c 100755 --- a/app/Views/Report_Material_Master_ReceiptValue.php +++ b/app/Views/Report_Material_Master_ReceiptValue.php @@ -1,267 +1,236 @@ - + + - -
- -
- -
- -
-
-

Report - Material Master - Receipt Value -

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

-
- - -
+ -
+
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Material Master
    3. +
  3. +

    Receipt Value

    +
    4. +
+
-
- - - -
- -
- -
-
-
- -
- -
-
- - - - - - - -

- - -
-
- - - - -
- - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
MonthMaterial CodeMaterial NameUOMAverage Rate (₹)
Month?>MaterialCode?>MaterialName?>UOM?>Average_Rate,2,'.',''); - echo number_format($rel->Average_Rate,2,'.','')?>
- +
+
+
+
+
+
+ + +
+ +
"> +
+ +
+
+ + +
+ +
+ + + + + +
+
+ +
+ + +
+ +
+
+
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
MonthMaterial CodeMaterial NameUOMAverage Rate (₹)
Month ?>MaterialCode ?>MaterialName ?>UOM ?>Average_Rate, 2, '.', ''); + echo number_format($rel->Average_Rate, 2, '.', '') ?>
Total
+
+
+
-
- -
- -
-
- +
+
+
- - - - - - - + + + + + + + - - - \ No newline at end of file + // Initialize the DataTable + var table = $('#cc').DataTable({ + dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination + buttons: [ + 'excel' // Export buttons + ], + pageLength: 10, // Default rows per page + lengthMenu: [ + [10, 20, 30, 50, -1], + [10, 20, 30, 50, "All"] + ], // Rows per page options + responsive: true, // Responsive table + ordering: false, + language: { + paginate: { + next: '', // Next button icon + previous: '' // Previous button icon + }, + emptyTable: '
Data Not Found!
' + } + }); + }); + \ No newline at end of file diff --git a/app/Views/Report_Material_Master_SupplierWise.php b/app/Views/Report_Material_Master_SupplierWise.php index 43a1b8fb..e431761f 100755 --- a/app/Views/Report_Material_Master_SupplierWise.php +++ b/app/Views/Report_Material_Master_SupplierWise.php @@ -1,154 +1,119 @@ - - - - + - - } - - - -
-
-
- -
- -
-
-

Report - Material Master - Supplier Wise

-
- - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Material DateSupplier ID Supplier NameMaterial CodeMaterial NameMaterial TypeUOMHSNCODE
Material_Date);echo $date->format('d-m-Y');?>SupplierID?>SupplierName?>MaterialCode?>MaterialName?>MaterialType?>UOM?>HSNCODE?>
- -
-
-
- +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Material Master
    3. +
  3. +

    Supplier Wise

    +
    4. +
+
+ +
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Material DateSupplier ID Supplier NameMaterial CodeMaterial NameMaterial TypeUOMHSNCODE
Material_Date); + echo $date->format('d-m-Y'); ?>SupplierID ?>SupplierName ?>MaterialCode ?>MaterialName ?>MaterialType ?>UOM ?>HSNCODE ?>
+
+
+
-
-
-
- +
+
+
- - - - - - - - + + + + + + + - - - \ No newline at end of file + }); + \ No newline at end of file diff --git a/app/Views/Report_attach_inward.php b/app/Views/Report_attach_inward.php index 652b5607..e0ff9db2 100755 --- a/app/Views/Report_attach_inward.php +++ b/app/Views/Report_attach_inward.php @@ -1,582 +1,606 @@ - - -
-
-
- -
- -
-
-

Inward Summary

- input->post('client_name')){ - $cl=$this->input->post('client_name'); - echo $cl; - 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; - } - - ?>

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

- - -
-
-
- - - -
- - -
-
+
+
+ - + \ No newline at end of file + $(document).ready(function() { + + + // Initialize the DataTable + var table = $('#cc').DataTable({ + dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination + buttons: [ + 'excel' // Export buttons + ], + pageLength: 10, // Default rows per page + lengthMenu: [ + [10, 20, 30, 50, -1], + [10, 20, 30, 50, "All"] + ], // Rows per page options + responsive: true, // Responsive table + ordering: false, + language: { + paginate: { + next: '', // Next button icon + previous: '' // Previous button icon + }, + emptyTable: '
Data Not Found!
' + } + }); + }); + \ No newline at end of file diff --git a/app/Views/Report_consolidate_inward.php b/app/Views/Report_consolidate_inward.php index d50aed65..c25c141d 100755 --- a/app/Views/Report_consolidate_inward.php +++ b/app/Views/Report_consolidate_inward.php @@ -1,737 +1,686 @@ - - + + + + + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Consolidate

    +
    4. +
+
+ +
+
+
+
+
+
+
+ +
"> +
+ +
+
+ + + + +
+
+ + +
+ +
+
+ + +
+ + + +
+ + + + +
+ +
+
+
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + $result) { ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NameMaterial NameAprMayJunJulAugSepOctNovDecJanFebMarTotal
+ supplier_name; ?> + material_name)) { + echo $result->material_name; + } else { + echo "-"; + } + ?>April); + ?> + April); ?> + May); + ?> + May); ?> + June); + ?> + June); ?> + July); + ?> + July); ?> + August); + ?> + August); ?> + September); + ?> + September); ?> + October); + ?> + October); ?> + November); + ?> + November); ?> + December); + ?> + December); ?> + January); + ?> + January); ?> + February); + ?> + February); ?> + March); + ?> + March); ?> + qtotal); + ?> + qtotal); ?> +
Total + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+
+
+
+
+
+
+
+ + + + + + + + + + - - -
-
-
- -
- -
-
-

Report - Consolidate-Inward

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

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

- - -
-
-
- - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - input->post('financialyear'); - foreach ($spurchse as $index=>$result) { ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Supplier NameMaterial NameAprMayJunJulAugSepOctNovDecJanFebMarTotal
- supplier_name;?> - material_name)) { echo $result->material_name ; } else {echo "-";} - ?>April); - ?> - April);?> - May); - ?> - May);?> - June); - ?> - June);?> - July); - ?> - July);?> - August); - ?> - August);?> - September); - ?> - September);?> - October); - ?> - October);?> - November); - ?> - November);?> - December); - ?> - December);?> - January); - ?> - January);?> - February); - ?> - February);?> - March); - ?> - March);?> - qtotal); - ?> - qtotal);?> -
Total - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
- -
- -
-
-
- - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/Views/Report_consolidate_m.php b/app/Views/Report_consolidate_m.php index 28bc1ca3..da36ed6b 100755 --- a/app/Views/Report_consolidate_m.php +++ b/app/Views/Report_consolidate_m.php @@ -1,231 +1,218 @@ + + + - -
-
-
- -
- -
-
-

Report - Consolidate(input->get('m'); - echo $m; - ?>)

-
- - -
-
- - - - - - - - - - - - - - - - input->get('ab'); - $month=date('F'); - $m = $this->input->get('m'); - //echo $month; - foreach($spurchse as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - -
Supplier NameMaterial Name
QuantityValue  (₹)
- supplier_name;?> - material_name;?>quantity); - echo round($rel->quantity);?>total,2,'.',''); - echo number_format($rel->total,2,'.','');?>
Total - - - - - - - - - - -
- + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Reports
    2. +
  2. Purchase
    3. +
  3. +

    Report - Purchase Consolidate

    +
    4. +
+
+ +
+
+
+
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NameMaterial Name
QuantityValue  (₹)
+ supplier_name; ?> + material_name; ?>quantity); + echo round($rel->quantity); ?>total, 2, '.', ''); + echo number_format($rel->total, 2, '.', ''); ?>
Total + + + + + + + + + + +
+
+
+
-
- -
- -
-
-
- +
+
+
- - - - - - + + + + + + + + - - - - \ No newline at end of file + } + } + \ No newline at end of file diff --git a/app/Views/Report_consolidate_month.php b/app/Views/Report_consolidate_month.php index 0cbf0d49..c597d03f 100755 --- a/app/Views/Report_consolidate_month.php +++ b/app/Views/Report_consolidate_month.php @@ -1,239 +1,208 @@ - - - } - .btn-success { - background-color: #00d976;; - border-color: #00d976;; - } - - - -
-
-
- -
- -
-
-

Report - Consolidate Category-Wise(input->get('m'); - echo $m; - ?>)

-
- - -
-
- - - - - - - - - - - - - - - - - input->get('ab'); - $month=date('F'); - $m = $this->input->get('m'); - //echo $month; - foreach($spurchse as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - -
CategorySupplier NameMaterial Name
QuantityValue   (₹)
- category;?> - - supplier_name;?> - material_name;?>quantity); - echo round($rel->quantity);?>total,2,'.',''); - echo number_format($rel->total,2,'.','');?>
Total - - - - - - - - - - - - - -
- -
-
-
- +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Consolidate Category-Wise

    +
    4. +
+
+ +
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CategorySupplier NameMaterial Name
QuantityValue   (₹)
+ category; ?> + + supplier_name; ?> + material_name; ?>quantity); + echo round($rel->quantity); ?>total, 2, '.', ''); + echo number_format($rel->total, 2, '.', ''); ?>
Total + + + + + + + + + + + + + +
+
+
+
-
-
-
+
+
+
- - - - - - + + + + + + + + +// "footerCallback": function ( row, data, start, end, display ) { +// var api = this.api(), data; - - - - \ No newline at end of file +// // Remove the formatting to get integer data for summation +// var intVal = function ( i ) { +// return typeof i === 'string' ? +// parseFloat(i.replace(/[^0.00-9.00]+/g,"")*1) : +// typeof i === 'number' ? +// parseFloat(i) : 0; +// }; + +// TotalQTY = api +// .column( 3, { search:'applied' } ) +// .data() +// .reduce( function (a, b) { +// return intVal(a) + intVal(b); +// }, 0 ); + +// $( api.column( 3 ).footer() ).html( TotalQTY.toFixed().bold() ); + +// TotalVALUE = api +// .column( 4, { search:'applied' } ) +// .data() +// .reduce( function (a, b) { +// return intVal(a) + intVal(b); +// }, 0 ); + +// $( api.column( 4 ).footer() ).html( TotalVALUE.toFixed(2).bold() ); + + +// } + \ No newline at end of file diff --git a/app/Views/Report_consolidate_month_inward.php b/app/Views/Report_consolidate_month_inward.php index 2c932fa2..159ad76f 100755 --- a/app/Views/Report_consolidate_month_inward.php +++ b/app/Views/Report_consolidate_month_inward.php @@ -1,232 +1,178 @@ - + + - -
-
-
- -
- -
-
-

Report - Consolidate-Inward(input->get('m'); - echo $m; - ?>)

-
- - -
-
- - - - - - - - - - - - - - - - input->get('ab'); - $month=date('F'); - $m = $this->input->get('m'); - //echo $month; - foreach($spurchse as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - -
Supplier NameMaterial Name
QuantityValue  (₹)
- supplier_name;?> - material_name;?>quantity); - echo round($rel->quantity);?>total,2,'.',''); - echo number_format($rel->total,2,'.','');?>
Total - - - - - - - - - - -
- + + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Consolidate ( )

    +
    4. +
+
+ +
+
+
+
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NameMaterial Name
QuantityValue  (₹)
+ supplier_name; ?> + material_name; ?>quantity); + echo round($rel->quantity); ?>total, 2, '.', ''); + echo number_format($rel->total, 2, '.', ''); ?>
Total + + + + + + + + + + +
+ +
+
+
-
- -
- -
-
+
+
+
-
- - - - - - - + + + + + + + + - - - \ No newline at end of file + // Initialize the DataTable + var table = $('#cc').DataTable({ + dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination + buttons: [ + 'excel' // Export buttons + ], + pageLength: 10, // Default rows per page + lengthMenu: [ + [10, 20, 30, 50, -1], + [10, 20, 30, 50, "All"] + ], // Rows per page options + responsive: true, // Responsive table + ordering: false, + language: { + paginate: { + next: '', // Next button icon + previous: '' // Previous button icon + }, + emptyTable: '
Data Not Found!
' + } + }); + }); + \ No newline at end of file diff --git a/app/Views/Report_consolidate_raw.php b/app/Views/Report_consolidate_raw.php index 611be826..9299fdec 100755 --- a/app/Views/Report_consolidate_raw.php +++ b/app/Views/Report_consolidate_raw.php @@ -1,700 +1,681 @@ - - + + - -table.dataTable thead > tr > th.sorting_asc, -table.dataTable thead > tr > th.sorting_desc, -table.dataTable thead > tr > th.sorting, -table.dataTable thead > tr > td.sorting_asc, -table.dataTable thead > tr > td.sorting_desc, -table.dataTable thead > tr > td.sorting { - padding-right: inherit; -} - - - - -
-
-
- -
- -
-
-

Report - Consolidate (Category-Wise)

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

+
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Material Master
    3. +
  3. +

    Consolidate (Category-Wise)

    +
    4. +
+
+ +
+
+
+
+
+
+ + +
+ +
"> +
+ +
+
+ + + +
+ +
+ + + + + +
+
+
+ + + + + +
+ + +
+ + + + +
+ +
+
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + $result) { ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CategoryAprMayJunJulAugSepOctNovDecJanFebMarTotal
+ category; ?> + + April); + ?> + April); ?> + + May); + ?> + May); ?> + + June); + ?> + June); ?> + + July); + ?> + July); ?> + + August); + ?> + August); ?> + + September; + ?> + September); ?> + + October); + ?> + October); ?> + + November); + ?> + November); ?> + + December); + ?> + December); ?> + + January); + ?> + January); ?> + + February); + ?> + February); ?> + + March); + ?> + March); ?> + + qtotal); + ?> + qtotal); ?> +
Total + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+
+
+
- - -
- -
- -
-
- -
- -
-
- - -
- -
- -
-
- -
-
- - - -
- - -

- - -
-
-
- - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - input->post('financialyear'); - foreach ($spurchse as $index=>$result) { ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CategoryAprMayJunJulAugSepOctNovDecJanFebMarTotal
- category;?> - - April); - ?> - April);?> - - May); - ?> - May);?> - - June); - ?> - June);?> - - July); - ?> - July);?> - - August); - ?> - August);?> - - September; - ?> - September);?> - - October); - ?> - October);?> - - November); - ?> - November);?> - - December); - ?> - December);?> - - January); - ?> - January);?> - - February); - ?> - February);?> - - March); - ?> - March);?> - - qtotal); - ?> - qtotal);?> -
Total - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
- -
- -
-
-
- + + + - - - - - - + + + + + + + + + - \ No newline at end of file diff --git a/app/Views/Report_consolidate_y.php b/app/Views/Report_consolidate_y.php index 0a42bb12..af8ce618 100755 --- a/app/Views/Report_consolidate_y.php +++ b/app/Views/Report_consolidate_y.php @@ -1,231 +1,215 @@ + + + - -
-
-
- -
- -
-
-

Report - Consolidate(input->get('ab'); - echo $m; - ?>)

-
- - -
-
- - - - - - - - - - - - - - - - input->get('ab'); - - $month=date('F'); - //echo $month; - foreach($spurchse as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - -
Supplier NameMaterial Name
QuantityValue  (₹)
- supplier_name;?> - - material_name;?>quantity); - echo round($rel->quantity);?>total,2,'.',''); - echo number_format($rel->total,2,'.','');?>
Total - - - - - - - - - - -
- + .dataTables_filter input { + padding: 4px; + } + + .dataTables_filter { + /* width: 50%; */ + float: right; + text-align: right; + } + + .dataTables_paginate { + width: 50%; + float: right; + text-align: right; + } + + div.dt-buttons { + position: relative; + /* float: right; */ + + } + + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Reports
    2. +
  2. Purchase
    3. +
  3. +

    Report - Purchase Consolidate

    +
    4. +
+
+ +
+
+
+
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NameMaterial Name
QuantityValue  (₹)
+ supplier_name; ?> + material_name; ?>quantity); + echo round($rel->quantity); ?>total, 2, '.', ''); + echo number_format($rel->total, 2, '.', ''); ?>
Total + + + + + + + + + + +
+
+
+
-
- -
- -
-
-
+ + + - - - - - - + + + + + + + + - - - - \ No newline at end of file + } + } + \ No newline at end of file diff --git a/app/Views/Report_consolidate_year.php b/app/Views/Report_consolidate_year.php index 84104ae7..ba56771b 100755 --- a/app/Views/Report_consolidate_year.php +++ b/app/Views/Report_consolidate_year.php @@ -1,249 +1,207 @@ + + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Consolidate Category-Wise

    +
    4. +
+
- - - - -
-
-
- -
- -
-
-

Report - Consolidate Category-Wise(input->get('ab'); - echo $m; - ?>)

-
- - -
-
- - - - - - - - - - - - - - - - - input->get('ab'); - - $month=date('F'); - //echo $month; - foreach($spurchse as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - -
CategorySupplier NameMaterial Name
QuantityValue  (₹)
- category;?> - - supplier_name;?> - - material_name;?>quantity); - echo round($rel->quantity);?>total,2,'.',''); - echo number_format($rel->total,2,'.','');?>
Total - - - - - - - - - - - - - -
- -
-
-
- +
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CategorySupplier NameMaterial Name
QuantityValue  (₹)
+ category; ?> + + supplier_name; ?> + + material_name; ?>quantity); + echo round($rel->quantity); ?>total, 2, '.', ''); + echo number_format($rel->total, 2, '.', ''); ?>
Total + + + + + + + + + + + + + +
+
+
+
-
- -
+
+
+
- - - - - - + + + + + + + + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/Views/Report_consolidate_year_inward.php b/app/Views/Report_consolidate_year_inward.php index cff6d1ce..e310c3f3 100755 --- a/app/Views/Report_consolidate_year_inward.php +++ b/app/Views/Report_consolidate_year_inward.php @@ -1,233 +1,183 @@ + + + - -
-
-
- -
- -
-
-

Report - Consolidate-Inwardinput->get('ab')){ - $ab = $this->input->get('ab'); - echo '('.$ab.')'; - } - ?>

-
- - -
-
- - - - - - - - - - - - - - - - input->get('ab'); - $month=date('F'); - $m = $this->input->get('m'); - //echo $month; - foreach($spurchse as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - -
Supplier NameMaterial Name
QuantityValue  (₹)
- supplier_name;?> - material_name;?>quantity); - echo round($rel->quantity);?>total,2,'.',''); - echo number_format($rel->total,2,'.','');?>
Total - - - - - - - - - - -
- + + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Consolidate

    +
    4. +
+
+ +
+
+
+
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NameMaterial Name
QuantityValue  (₹)
+ supplier_name; ?> + material_name; ?>quantity); + echo round($rel->quantity); ?>total, 2, '.', ''); + echo number_format($rel->total, 2, '.', ''); ?>
Total + + + + + + + + + + +
+ + +
+
+
-
- -
- -
-
-
- - +
+
+ - - - - - - + + + + + + + + - - - \ No newline at end of file + // Initialize the DataTable + var table = $('#cc').DataTable({ + dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination + buttons: [ + 'excel' // Export buttons + ], + pageLength: 10, // Default rows per page + lengthMenu: [ + [10, 20, 30, 50, -1], + [10, 20, 30, 50, "All"] + ], // Rows per page options + responsive: true, // Responsive table + ordering: false, + language: { + paginate: { + next: '', // Next button icon + previous: '' // Previous button icon + }, + emptyTable: '
Data Not Found!
' + } + }); + }); + \ No newline at end of file diff --git a/app/Views/Report_cumulative_day_inward.php b/app/Views/Report_cumulative_day_inward.php index 1ad032d5..8db34487 100755 --- a/app/Views/Report_cumulative_day_inward.php +++ b/app/Views/Report_cumulative_day_inward.php @@ -1,149 +1,131 @@ + + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Cumulative Month ()

    +
    4. +
+
- - - - - -
-
-
- -
- -
-
-

Report - Cumulative - Inward()

-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Supplier NameMaterial Name
QuantityValue  (₹)
- supplier_name;?> - material_name;?>tquantity); - echo round($rel->tquantity);?>ttotal,2,'.',''); - echo number_format($rel->ttotal,2,'.','');?>
Total - - - - - - - - - - -
- +
+
+
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NameMaterial Name
QuantityValue  (₹)
+ supplier_name; ?> + material_name; ?>tquantity); + echo round($rel->tquantity); ?>ttotal, 2, '.', ''); + echo number_format($rel->ttotal, 2, '.', ''); ?>
Total + + + + + + + + + + +
+ + +
+
+
+
-
- -
- -
- -
+
+
+ @@ -152,78 +134,32 @@ if(!empty($mms)) + + - - - \ No newline at end of file + } + }); + }); + \ No newline at end of file diff --git a/app/Views/Report_cumulative_day_raw.php b/app/Views/Report_cumulative_day_raw.php index 6d8dbe63..f049c331 100755 --- a/app/Views/Report_cumulative_day_raw.php +++ b/app/Views/Report_cumulative_day_raw.php @@ -1,151 +1,140 @@ + + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Cumulative-Category-Wise()

    +
    4. +
+
- - -
-
-
- -
- -
-
-

Report - Cumulative-Category-Wise()

-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CategorySupplier NameMaterial Name
QuantityValue  (₹)
category;?> - supplier_name;?> - material_name;?>tquantity); - echo round($rel->tquantity);?>ttotal,2,'.',''); - echo number_format($rel->ttotal,2,'.','');?>
Total - - - - - - - - - - - - - - -
- +
+
+
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CategorySupplier NameMaterial Name
QuantityValue  (₹)
category; ?> + supplier_name; ?> + material_name; ?>tquantity); + echo round($rel->tquantity); ?>ttotal, 2, '.', ''); + echo number_format($rel->ttotal, 2, '.', ''); ?>
Total + + + + + + + + + + + + + + +
+ + +
+
+
+
-
- -
- -
- -
+
+
+ @@ -154,78 +143,32 @@ + + - - - \ No newline at end of file + } + }); + }); + \ No newline at end of file diff --git a/app/Views/Report_cumulative_inward.php b/app/Views/Report_cumulative_inward.php index 8ef2ce04..a0e1beac 100755 --- a/app/Views/Report_cumulative_inward.php +++ b/app/Views/Report_cumulative_inward.php @@ -1,233 +1,205 @@ - - + + = 4) { + $yearl = date('Y') . '-' . (date('Y') + 1); +} else { + $yearl = (date('Y') - 1) . '-' . date('Y'); } ?> +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Cumulative ( )

    - - -
    -
    -
    - -
    - -
    -
    -

    Report - Cumulative - Inward( - = 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - echo $yearl; - ?> - )

    -
    - - -
    -
    - - - - = 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - ?> - - - - - - - - - - - - - - - - - - = 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - - foreach($cum as $index=>$rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Supplier NameMaterial Name
    QuantityValue  ()QuantityValue  ()QuantityValue  ()
    - supplier_name;?> - material_name;?>tquantity); - echo anchor('report/icum_day/'.$rel->sid . '/' . $rel->mid,round($rel->tquantity));?>ttotal,2,'.',''); - echo anchor('report/icum_day/'.$rel->sid . '/' . $rel->mid,number_format($rel->ttotal,2,'.',''));?>mquantity); - echo anchor('report/icum_month/'.$rel->sid . '/' . $rel->mid,round($rel->mquantity));?>mtotal,2,'.',''); - echo anchor('report/icum_month/'.$rel->sid . '/' . $rel->mid,number_format($rel->mtotal,2,'.',''));?>quantity); - echo anchor('report/icum_year/'.$rel->sid . '/' . $rel->mid,round($rel->quantity));?>total,2,'.',''); - echo anchor('report/icum_year/'.$rel->sid . '/' . $rel->mid,number_format($rel->total,2,'.',''));?>
    Total - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - +
    +
    +
    +
    +
    +
    + + +
    + +
    + + + + = 4) { + $yearl = date('Y') . '-' . (date('Y') + 1); + } else { + $yearl = (date('Y') - 1) . '-' . date('Y'); + } + $ab = $yearl; + ?> + + + + + + + + + + + + + + + + + + = 4) { + $yearl = date('Y') . '-' . (date('Y') + 1); + } else { + $yearl = (date('Y') - 1) . '-' . date('Y'); + } + $ab = $yearl; + + foreach ($cum as $index => $rel) { + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Supplier NameMaterial Name
    QuantityValue  (₹)QuantityValue  (₹)QuantityValue  (₹)
    + supplier_name; ?> + material_name; ?>tquantity); + echo anchor('report/icum_day/' . $rel->sid . '/' . $rel->mid, round($rel->tquantity)); ?>ttotal, 2, '.', ''); + echo anchor('report/icum_day/' . $rel->sid . '/' . $rel->mid, number_format($rel->ttotal, 2, '.', '')); ?>mquantity); + echo anchor('report/icum_month/' . $rel->sid . '/' . $rel->mid, round($rel->mquantity)); ?>mtotal, 2, '.', ''); + echo anchor('report/icum_month/' . $rel->sid . '/' . $rel->mid, number_format($rel->mtotal, 2, '.', '')); ?>quantity); + echo anchor('report/icum_year/' . $rel->sid . '/' . $rel->mid, round($rel->quantity)); ?>total, 2, '.', ''); + echo anchor('report/icum_year/' . $rel->sid . '/' . $rel->mid, number_format($rel->total, 2, '.', '')); ?>
    Total + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + +
    +
    +
    +
    -
    - -
    - -
- -
- +
+
+ @@ -236,155 +208,207 @@ if(!empty($mms)) + + - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/Views/Report_cumulative_month_inward.php b/app/Views/Report_cumulative_month_inward.php index 5adb549b..6a12d364 100755 --- a/app/Views/Report_cumulative_month_inward.php +++ b/app/Views/Report_cumulative_month_inward.php @@ -1,145 +1,136 @@ - - +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Cumulative Month ()

    +
    4. +
+
- } - .btn-success { - background-color: #00d976;; - border-color: #00d976;; - } - - - -
-
-
- -
- -
-
-

Report - Cumulative Month - Inward()

-
- - -
-
- - - - - - - - - - - - - - - - = 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - $month=date('F'); - //echo $month; - foreach($cum_month as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - -
Supplier NameMaterial Name
QuantityValue  (₹)
- supplier_name;?> - material_name;?>tquantity); - echo round($rel->tquantity);?>ttotal,2,'.',''); - echo number_format($rel->ttotal,2,'.','');?>
Total - - - - - - - - - - -
- +
+
+
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + = 4) { + $yearl = date('Y') . '-' . (date('Y') + 1); + } else { + $yearl = (date('Y') - 1) . '-' . date('Y'); + } + $ab = $yearl; + $month = date('F'); + //echo $month; + foreach ($cum_month as $rel) { + ?> + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NameMaterial Name
QuantityValue  (₹)
+ supplier_name; ?> + material_name; ?>tquantity); + echo round($rel->tquantity); ?>ttotal, 2, '.', ''); + echo number_format($rel->ttotal, 2, '.', ''); ?>
Total + + + + + + + + + + +
+ + +
+
+
+
-
- -
- -
- -
+
+
+ @@ -148,81 +139,31 @@ + + - - - \ No newline at end of file + $.fn.dataTable.moment('DD-MM-YYYY'); + // Initialize the DataTable + var table = $('#cc').DataTable({ + dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination + buttons: [ + 'excel' // Export buttons + ], + pageLength: 10, // Default rows per page + lengthMenu: [ + [10, 20, 30, 50, -1], + [10, 20, 30, 50, "All"] + ], // Rows per page options + responsive: true, // Responsive table + ordering: false, + language: { + paginate: { + next: '', // Next button icon + previous: '' // Previous button icon + }, + emptyTable: '
Data Not Found!
' + } + }); + }); + \ No newline at end of file diff --git a/app/Views/Report_cumulative_month_raw.php b/app/Views/Report_cumulative_month_raw.php index 18f27430..9bd3fbef 100755 --- a/app/Views/Report_cumulative_month_raw.php +++ b/app/Views/Report_cumulative_month_raw.php @@ -1,157 +1,145 @@ + + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Cumulative Month-Category-Wise()

    +
    4. +
+
- - -
-
-
- -
- -
-
-

Report - Cumulative Month-Category-Wise()

-
- - -
-
- - - - - - - - - - - - - - - - = 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - $month=date('F'); - //echo $month; - foreach($cum_month as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CategorySupplier NameMaterial Name
QuantityValue  (₹)
category;?> - supplier_name;?> - material_name;?>tquantity); - echo round($rel->tquantity);?>ttotal,2,'.',''); - echo number_format($rel->ttotal,2,'.','');?>
Total - - - - - - - - - - - - - - -
- +
+
+
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + = 4) { + $yearl = date('Y') . '-' . (date('Y') + 1); + } else { + $yearl = (date('Y') - 1) . '-' . date('Y'); + } + $ab = $yearl; + $month = date('F'); + //echo $month; + foreach ($cum_month as $rel) { + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CategorySupplier NameMaterial Name
QuantityValue  (₹)
category; ?> + supplier_name; ?> + material_name; ?>tquantity); + echo round($rel->tquantity); ?>ttotal, 2, '.', ''); + echo number_format($rel->ttotal, 2, '.', ''); ?>
Total + + + + + + + + + + + + + + +
+ + +
+
+
+
-
- -
- -
- -
+
+
+ @@ -160,78 +148,64 @@ + + - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/Views/Report_cumulative_raw.php b/app/Views/Report_cumulative_raw.php index 60bfe74b..cf2bf7d1 100755 --- a/app/Views/Report_cumulative_raw.php +++ b/app/Views/Report_cumulative_raw.php @@ -1,241 +1,221 @@ - - + = 4) { + $yearl = date('Y') . '-' . (date('Y') + 1); +} else { + $yearl = (date('Y') - 1) . '-' . date('Y'); } + ?> + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Cumulative-Category-Wise ()

    +
    4. +
+
- - -
-
-
- -
- -
-
-

Report - Cumulative-Category-Wise( - = 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - echo $yearl; - ?> - )

-
- - -
-
- - - - = 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - ?> - - - - - - - - - - - - - - - - - = 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - - - foreach($cum as $index=>$rel) - { - $cat = $rel->category; - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Category
QuantityValue  ()QuantityValue  ()QuantityValue  ()
- category;?> - - tquantity); - ?> - tquantity);?> - ttotal,2,'.',''); - ?> - ttotal,2,'.','');?> - mquantity); - ?> - mquantity);?> - mtotal,2,'.',''); - ?> - mtotal,2,'.','');?> - quantity); - ?> - quantity);?> - total,2,'.',''); - ?> - total,2,'.','');?> -
Total - - - - - - - - - - - - - - - - - - - - - - - -
- +
+
+
+
+
+
+ + +
+ +
+ + + + + + = 4) { + $yearl = date('Y') . '-' . (date('Y') + 1); + } else { + $yearl = (date('Y') - 1) . '-' . date('Y'); + } + $ab = $yearl; + ?> + + + + + + + + + + + + + + + + + = 4) { + $yearl = date('Y') . '-' . (date('Y') + 1); + } else { + $yearl = (date('Y') - 1) . '-' . date('Y'); + } + $ab = $yearl; + + + foreach ($cum as $index => $rel) { + $cat = $rel->category; + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Category
QuantityValue  (₹)QuantityValue  (₹)QuantityValue  (₹)
+ category; ?> + + tquantity); + ?> + tquantity); ?> + ttotal, 2, '.', ''); + ?> + ttotal, 2, '.', ''); ?> + mquantity); + ?> + mquantity); ?> + mtotal, 2, '.', ''); + ?> + mtotal, 2, '.', ''); ?> + quantity); + ?> + quantity); ?> + total, 2, '.', ''); + ?> + total, 2, '.', ''); ?> +
Total + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+
-
- -
- -
- -
- +
+
+ @@ -244,58 +224,37 @@ if(!empty($mms)) + + + \ No newline at end of file diff --git a/app/Views/Report_cumulative_year_inward.php b/app/Views/Report_cumulative_year_inward.php index a52bce32..80f034bc 100755 --- a/app/Views/Report_cumulative_year_inward.php +++ b/app/Views/Report_cumulative_year_inward.php @@ -1,250 +1,215 @@ - - + = 4) { + $yearl = date('Y') . '-' . (date('Y') + 1); +} else { + $yearl = (date('Y') - 1) . '-' . date('Y'); } +$yearl; ?> + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Cumulative Year ()

    +
    4. +
+
- - -
-
-
- -
- -
-
-

Report - Cumulative Year - Inward( - = 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - echo $yearl; - ?> - )

-
- - -
-
- - - - = 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - ?> - - - - - - - - - - - - - = 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - foreach($cum_year as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - -
Supplier NameMaterial Name
QuantityValue  ( )
- supplier_name;?> - material_name;?>tquantity); - echo round($rel->tquantity);?>ttotal,2,'.',''); - echo number_format($rel->ttotal,2,'.','');?>
Total - - - - - - - - - - -
- +
+
-
-
- -
- -
- -
+
+
+
+ + +
+ +
+ + + + = 4) { + $yearl = date('Y') . '-' . (date('Y') + 1); + } else { + $yearl = (date('Y') - 1) . '-' . date('Y'); + } + $ab = $yearl; + ?> + + + + + + + + + + + + + = 4) { + $yearl = date('Y') . '-' . (date('Y') + 1); + } else { + $yearl = (date('Y') - 1) . '-' . date('Y'); + } + $ab = $yearl; + foreach ($cum_year as $rel) { + ?> + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NameMaterial Name
QuantityValue  (₹)
+ supplier_name; ?> + material_name; ?>tquantity); + echo round($rel->tquantity); ?>ttotal, 2, '.', ''); + echo number_format($rel->ttotal, 2, '.', ''); ?>
Total + + + + + + + + + + +
+ + +
+
+
+
+
+
+
+
+ + - + + - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/Views/Report_cumulative_year_raw.php b/app/Views/Report_cumulative_year_raw.php index aea8f26b..dbeee1bd 100755 --- a/app/Views/Report_cumulative_year_raw.php +++ b/app/Views/Report_cumulative_year_raw.php @@ -1,253 +1,223 @@ + += 4) { + $yearl = date('Y') . '-' . (date('Y') + 1); +} else { + $yearl = (date('Y') - 1) . '-' . date('Y'); +} +$yearl; +?> + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Cumulative Year-Category-Wise ()

    +
    4. +
+
- - -
-
-
- -
- -
-
-

Report - Cumulative Year-Category-Wise( - = 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - echo $yearl; - ?> - )

-
- - -
-
- - - - = 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - ?> - - - - - - - - - - - - - - = 4) { - $yearl = date('Y').'-'.(date('Y')+1); - } else { - $yearl = (date('Y')-1).'-'.date('Y'); - } - $ab=$yearl; - foreach($cum_year as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - -
CategorySupplier NameMaterial Name
QuantityValue  ( ₹ )
category;?> - supplier_name;?> - material_name;?>tquantity); - echo round($rel->tquantity);?>ttotal,2,'.',''); - echo number_format($rel->ttotal,2,'.','');?>
Total - - - - - - - - - - - - - - -
- +
+
+
+
+
+
+ + +
+ +
+ + + + = 4) { + $yearl = date('Y') . '-' . (date('Y') + 1); + } else { + $yearl = (date('Y') - 1) . '-' . date('Y'); + } + $ab = $yearl; + ?> + + + + + + + + + + + + + + = 4) { + $yearl = date('Y') . '-' . (date('Y') + 1); + } else { + $yearl = (date('Y') - 1) . '-' . date('Y'); + } + $ab = $yearl; + foreach ($cum_year as $rel) { + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + +
CategorySupplier NameMaterial Name
QuantityValue  (₹)
category; ?> + supplier_name; ?> + material_name; ?>tquantity); + echo round($rel->tquantity); ?>ttotal, 2, '.', ''); + echo number_format($rel->ttotal, 2, '.', ''); ?>
Total + + + + + + + + + + + + + + +
+ + + +
+
+
+
-
- -
- -
- -
+
+
+
+ + + + + + + + - - - - - + $.fn.dataTable.moment('DD-MM-YYYY'); + // Initialize the DataTable + var table = $('#cc').DataTable({ + dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination + buttons: [ + 'excel' // Export buttons + ], + pageLength: 10, // Default rows per page + lengthMenu: [ + [10, 20, 30, 50, -1], + [10, 20, 30, 50, "All"] + ], // Rows per page options + responsive: true, // Responsive table + ordering: false, + language: { + paginate: { + next: '', // Next button icon + previous: '' // Previous button icon + }, + emptyTable: '
Data Not Found!
' + } + }); + }); + + - - - \ No newline at end of file + // $( api.column( 3 ).footer() ).html( TotalVALUE.toFixed(2).bold() ); + \ No newline at end of file diff --git a/app/Views/Report_month_wise_inward.php b/app/Views/Report_month_wise_inward.php index 8c3c8994..3fef32de 100755 --- a/app/Views/Report_month_wise_inward.php +++ b/app/Views/Report_month_wise_inward.php @@ -1,252 +1,190 @@ - + -
-
-
- -
- -
-
-
-

-

Report - Month-wise-Inward()

-

-
-
- -
-
- - - - - - - - - - - - input->get('ab'); - $last = $this->input->get('dat'); - $new = date("F", strtotime($last)) . "\n"; - foreach ($month as $rel) { - ?> - - - - - - - - - - - - - - - - - - - - - -
Supplier NameMaterial NameQuantityTotal Value  (₹)
- supplier_name; ?> - material_name; ?>quantity); - echo round($rel->quantity); ?>total, 2, '.', ''); - echo number_format($rel->total, 2, '.', ''); ?>
- - - - - - - - - - - -
+
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Month-wise ( ) +

    +
    4. +
+
- +
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NameMaterial NameQuantityTotal Value  (₹)
+ supplier_name; ?> + material_name; ?>quantity); + echo round($rel->quantity); ?>total, 2, '.', ''); + echo number_format($rel->total, 2, '.', ''); ?>
+ + + + + + + + + + + +
+ +
+
+
+
+
- -
-
-
+
+
- - - - - - - + + + + + + + \ No newline at end of file + \ No newline at end of file diff --git a/app/Views/Report_purchase_inward.php b/app/Views/Report_purchase_inward.php index b6891477..78cc0849 100755 --- a/app/Views/Report_purchase_inward.php +++ b/app/Views/Report_purchase_inward.php @@ -1,820 +1,435 @@ + - -
-
-
- -
- -
-
-

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

-
- - -
+ -
- -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - - - -
-
- - -
- -
- - - - -
- -
-

- - -
-
-
- - - -
- - - - - -
+
+
- - - - - - - - - + + + + + + + \ No newline at end of file + }); + }); + \ No newline at end of file diff --git a/app/Views/Report_supplier_inward.php b/app/Views/Report_supplier_inward.php index 6478c8a3..2df2f81a 100755 --- a/app/Views/Report_supplier_inward.php +++ b/app/Views/Report_supplier_inward.php @@ -1,420 +1,314 @@ - + - -
-
-
- -
- -
-
-

Report - Supplier-Inward

- input->post('client_name')){ - $cl=$this->input->post('client_name'); - echo $cl; - 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; - } - - ?>

-
- - -
+ -
+
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Supplier-Wise +

    +
    4. +
+
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - - - -
-
- - -
- -
- - - - -
-
-

- - -
-
- - - - -
- - - -
-
- - - - - - - - - - - - - input->post('financialyear'); - $month=$this->input->post('month'); - $frm = $this->input->post('from_date'); - $t = $this->input->post('to_date'); - foreach($spurchse as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Supplier NamePO CountQuantityValue  (₹)
- supplier_name;?> - counts); - echo round($rel->counts);?>quantity); - echo round($rel->quantity);?>value; - echo number_format($rel->value,2,'.','');?>
Total - - - - - - - - - - -
- +
+
+
+
+
+ + +
+ +
+ +
+
+
+ + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + +
+
+ + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NamePO CountQuantityValue  (₹)
+ supplier_name; ?> + counts); + echo round($rel->counts); ?>quantity); + echo round($rel->quantity); ?>value; + echo number_format($rel->value, 2, '.', ''); ?>
Total + + + + + + + + + + +
+ + + + +
+
+
+
-
- -
- -
-
+
+
+
-
- - - - - - - + + + + + + + + - - - \ No newline at end of file + }); + }); + \ No newline at end of file diff --git a/app/Views/Report_supplier_summary.php b/app/Views/Report_supplier_summary.php index ffd84bf8..77fd6556 100755 --- a/app/Views/Report_supplier_summary.php +++ b/app/Views/Report_supplier_summary.php @@ -1,404 +1,257 @@ - - + - -
-

-
- -
- -
-
-

Report - Supplier_Summary

- input->post('client_name')){ - $cl=$this->input->post('client_name'); - echo $cl; - 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; - } - - ?>

-
- - -
+ -
+
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Inward Summary +

    +
    4. +
+
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- - - - -
-
- - -
- -
- - - - -
-
-

- - -
-
- - - - -
- - - -
-
- - - - - - - - - - - - input->post('financialyear'); - $month=$this->input->post('month'); - $frm = $this->input->post('from_date'); - $t = $this->input->post('to_date'); - foreach($spurchse as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Supplier NameQuantityValue  (₹)
- supplier_name;?> - quantity); - echo round($rel->quantity);?>value; - echo number_format($rel->value,2,'.','');?>
Total - - - - - - - -
- +
-
+
+
+
+ + +
+ +
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + + + +
+
+ + +
+ +
+ + + + +
+ +
+

+ + +
+
+ + +
+ + +
+ + + + + + + + + + + + input->post('financialyear'); + $month = $this->input->post('month'); + $frm = $this->input->post('from_date'); + $t = $this->input->post('to_date'); + foreach ($spurchse as $rel) { + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NameQuantityValue  (₹)
+ supplier_name; ?> + quantity); + echo round($rel->quantity); ?>value; + echo number_format($rel->value, 2, '.', ''); ?>
Total + + + + + + + +
+ + + + +
+
+
+
- -
- -
-
-
+
+
+
+
- - - - - - - - + + + + + + + - - - \ No newline at end of file + }); + }); + \ No newline at end of file diff --git a/app/Views/Report_year_wise_inward.php b/app/Views/Report_year_wise_inward.php index 073f6466..176145ef 100755 --- a/app/Views/Report_year_wise_inward.php +++ b/app/Views/Report_year_wise_inward.php @@ -1,179 +1,178 @@ + + + - - - -
-
-
- -
- -
-
-

Report - Year-Wise-Inward

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

-
- - -
- -
-
-
-
-
- -
-
-
-
-
- -
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Month-YearQuantityTotal Value  (₹)
- materialrcvddate); - $new = date('M-y', $da); - $pass = date('Y-m-d',$da); - $ab=$this->input->post('financialyear'); - //echo $rel->CreatedDate; - ?> - - - quantity; - echo round($rel->quantity);?>value,2,'.',''); - echo number_format($rel->value,2,'.','');?>
input->post('financialyear'); - $Total="Total"; - echo anchor('report/iyear_wise_total/' . $ab,$Total); ?> - - - - - - - - - -
- -
-
- -
- - -
- -
-
+
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Year-Wise +

    +
    4. +
+
+ +
+
+
+
+
+ + +
+ +
+ + + +
+
+ + +
+
+ + + +
+
+ + +
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Month-YearQuantityTotal Value  (₹)
+ materialrcvddate); + $new = date('M-y', $da); + $pass = date('Y-m-d', $da); + $ab = $financialyear; + //echo $rel->CreatedDate; + ?> + + + quantity; + echo round($rel->quantity); ?>value, 2, '.', ''); + echo number_format($rel->value, 2, '.', ''); ?>
+ + + + + + + + + +
+ + +
+
+
+
+
+
+
+
+ @@ -182,95 +181,44 @@ + + - - - \ No newline at end of file + $.fn.dataTable.moment('DD-MM-YYYY'); + // Initialize the DataTable + var table = $('#cc').DataTable({ + dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination + buttons: [ + 'excel' // Export buttons + ], + pageLength: 10, // Default rows per page + lengthMenu: [ + [10, 20, 30, 50, -1], + [10, 20, 30, 50, "All"] + ], // Rows per page options + responsive: true, // Responsive table + ordering: false, + language: { + paginate: { + next: '', // Next button icon + previous: '' // Previous button icon + }, + emptyTable: '
Data Not Found!
' + } + }); + }); + \ No newline at end of file diff --git a/app/Views/Report_year_wise_total_inward.php b/app/Views/Report_year_wise_total_inward.php index 915deb1f..457311e8 100755 --- a/app/Views/Report_year_wise_total_inward.php +++ b/app/Views/Report_year_wise_total_inward.php @@ -1,130 +1,130 @@ - - + + - -
-
-
- -
- -
-
-

Report - Year-wise-Total()

-
- -
-
- - - - - - - - - - - - - uri->total_segments(); - $ab=$this->uri->segment($last); - foreach($ytotal as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - -
Supplier NameMaterial NameQuantityTotal Value  (₹)
- supplier_name;?> - material_name;?>quantity); - echo round($rel->quantity);?>total,2,'.',''); - echo number_format($rel->total,2,'.','');?>
- - - - - - - - - - - -
- -
-
-
- -
- -
-
+ + +
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Year-wise-Total ( ) +

    +
    4. +
+
+
+
+
+
+
+ + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Supplier NameMaterial NameQuantityTotal Value  (₹)
+ supplier_name; ?> + material_name; ?>quantity); + echo round($rel->quantity); ?>total, 2, '.', ''); + echo number_format($rel->total, 2, '.', ''); ?>
+ + + + + + + + + + + +
+ +
+
+
+
+
+
+
+
+ @@ -133,120 +133,82 @@ + + - - - \ No newline at end of file + $.fn.dataTable.moment('DD-MM-YYYY'); + // Initialize the DataTable + var table = $('#cc').DataTable({ + dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination + buttons: [ + 'excel' // Export buttons + ], + pageLength: 10, // Default rows per page + lengthMenu: [ + [10, 20, 30, 50, -1], + [10, 20, 30, 50, "All"] + ], // Rows per page options + responsive: true, // Responsive table + ordering: false, + language: { + paginate: { + next: '', // Next button icon + previous: '' // Previous button icon + }, + emptyTable: '
Data Not Found!
' + } + }); + }); + \ No newline at end of file diff --git a/app/Views/deliver_perform.php b/app/Views/deliver_perform.php index 84e4257f..6d2a02f4 100755 --- a/app/Views/deliver_perform.php +++ b/app/Views/deliver_perform.php @@ -1,379 +1,286 @@ + + - - - -
-
-
- -
- -
-
-

Delivery Performance
- input->post('financialyear')){ - $ab=$this->input->post('financialyear'); - echo '('.$ab.')'; - echo ' '; - - } - if($this->input->post('month')){ - $m=$this->input->post('month'); - echo '('.$m.')'; - echo ' '; - } - - ?> -

- -
- -
+ -
+
+
+ +
+ +
+
+
+
+
+
    +
  1. Report
    2. +
  2. Inward
    3. +
  3. +

    Delivery Performance + + +

    +
    4. +
+
-
- - - -
- -
- -
-
-
- -
- -
- - - -
-

- - -
- - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - uri->total_segments(); - // $ab=$this->uri->segment($last); - $i=0; - foreach($per as $rel) - { - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
OrderedDateDispatchDateCustomerNameInvoiceNumberOrderedQuantityDispatchQuantityRating
invoice_date_created)); - echo $itemdate; - ?> - invoice_date_created)); - echo $invoicedate; - ?> - client_name);?>invoice_number); ?>qty); - echo number_format(round($rel->qty)); - ?>qty); - echo number_format(round($rel->qty)); - ?>qty); - $DispatchQuantity= round($rel->qty); - $Rating =@($DispatchQuantity / $OrderedQuantity )*100; - - - echo number_format($Rating, 2, '.', ' ') ; ?>
   Total  - - - - - -  
- +
+
+
+
+
+
+ + +
+ +
"> +
+ +
+
+ + +
+ +
+ + + + + +
+ + +
+ + + + +
+ +
+
+
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + uri->total_segments(); + // $ab=$this->uri->segment($last); + $i = 0; + foreach ($per as $rel) { + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
OrderedDateDispatchDateCustomerNameInvoiceNumberOrderedQuantityDispatchQuantityRating
invoice_date_created)); + echo $itemdate; + ?> + invoice_date_created)); + echo $invoicedate; + ?> + client_name); ?>invoice_number); ?>qty); + echo number_format(round($rel->qty)); + ?>qty); + echo number_format(round($rel->qty)); + ?>qty); + $DispatchQuantity = round($rel->qty); + $Rating = @($DispatchQuantity / $OrderedQuantity) * 100; + + + echo number_format($Rating, 2, '.', ' '); ?>
   Total  + + + + + +  
+
+
+
-
- -
- -
-
-
- +
+
+
- - - - - - - + + + + + + + - - - \ No newline at end of file + }); + }); + \ No newline at end of file diff --git a/app/Views/employeeLeaveApplicationForm.php b/app/Views/employeeLeaveApplicationForm.php index 594a4fa5..a89fe967 100755 --- a/app/Views/employeeLeaveApplicationForm.php +++ b/app/Views/employeeLeaveApplicationForm.php @@ -229,7 +229,7 @@
-
+
@@ -258,10 +258,10 @@
- + - +
diff --git a/app/Views/emppayListing.php b/app/Views/emppayListing.php index fadad718..13ad4ab7 100755 --- a/app/Views/emppayListing.php +++ b/app/Views/emppayListing.php @@ -17,7 +17,7 @@
- Create New Loan + Create New Loan
From 0f54bd4cdd9002a0613803629e7d3d69167c9892 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Thu, 24 Apr 2025 10:10:01 +0530 Subject: [PATCH 07/12] stock changes 23-04-2025 --- app/Views/stock/bagStockDetails.php | 7 +++++++ app/Views/stock/dieselStockDetails.php | 7 +++++++ app/Views/stock/gasStockDetails.php | 2 +- app/Views/stock/powerConsumptionDetails.php | 7 +++++++ app/Views/stock/resinStockDetails.php | 7 +++++++ 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app/Views/stock/bagStockDetails.php b/app/Views/stock/bagStockDetails.php index 84815e86..b1b523d5 100644 --- a/app/Views/stock/bagStockDetails.php +++ b/app/Views/stock/bagStockDetails.php @@ -1411,6 +1411,13 @@ foreach ($period as $day) { let dropdown = document.getElementById("customizeHeader"); let selectedOption = dropdown.options[dropdown.selectedIndex]; + let containerId = `${selectedOption.value}_container` + let alreadyPresent = document.getElementById(containerId); + + if(alreadyPresent){ + return ; + } + if (selectedOption.value !== "") { let materialCode = selectedOption.value; let materialName = selectedOption.text; diff --git a/app/Views/stock/dieselStockDetails.php b/app/Views/stock/dieselStockDetails.php index 868f18aa..d9754477 100644 --- a/app/Views/stock/dieselStockDetails.php +++ b/app/Views/stock/dieselStockDetails.php @@ -1890,6 +1890,13 @@ foreach ($period as $day) { let dropdown = document.getElementById("customizeHeader"); let selectedOption = dropdown.options[dropdown.selectedIndex]; + let containerId = `${selectedOption.value}_container` + let alreadyPresent = document.getElementById(containerId); + + if(alreadyPresent){ + return ; + } + if (selectedOption.value !== "") { let machineId = selectedOption.value; let materialName = selectedOption.text; diff --git a/app/Views/stock/gasStockDetails.php b/app/Views/stock/gasStockDetails.php index 337a91b8..4b04b017 100644 --- a/app/Views/stock/gasStockDetails.php +++ b/app/Views/stock/gasStockDetails.php @@ -686,7 +686,7 @@ + data-id="footer balanceStock" > Date: Thu, 24 Apr 2025 05:00:18 +0000 Subject: [PATCH 08/12] Rotues Missing --- .../Report_Material_Master_ReceiptValue.php | 4 +-- app/Views/Report_consolidate_inward.php | 26 +++++++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/app/Views/Report_Material_Master_ReceiptValue.php b/app/Views/Report_Material_Master_ReceiptValue.php index af89330c..013cadba 100755 --- a/app/Views/Report_Material_Master_ReceiptValue.php +++ b/app/Views/Report_Material_Master_ReceiptValue.php @@ -43,7 +43,7 @@
-
"> + ">
@@ -118,7 +118,7 @@
- +
diff --git a/app/Views/Report_consolidate_inward.php b/app/Views/Report_consolidate_inward.php index c25c141d..61bb1751 100755 --- a/app/Views/Report_consolidate_inward.php +++ b/app/Views/Report_consolidate_inward.php @@ -140,7 +140,7 @@ $qtot = 0; ?>
- +
@@ -384,7 +384,7 @@ $qtot = 0; ?>
Supplier Name
+
@@ -668,6 +668,28 @@ $qtot = 0; ?> } } }); + var table = $('#cd').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 + } + } + }); }); From c5daf0b6d84a00c26604bf7d16acf418d45c9147 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Thu, 24 Apr 2025 05:26:25 +0000 Subject: [PATCH 09/12] 0001541 solved --- app/Controllers/Purchaseorder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php index b81c8109..c1d1223f 100755 --- a/app/Controllers/Purchaseorder.php +++ b/app/Controllers/Purchaseorder.php @@ -2662,7 +2662,7 @@ class Purchaseorder extends BaseController $store = array('Status' => $StatusCode, 'ReleasedOn' => $ReleasedDate, 'ReleasedBy' => $ReleasedBy, 'Remarks' => $Remarks); $this->purchaseorder_model->UpdatePO($store, $PONO); // echo "Successfully Released the Purchase Order No: " . $PONO; - echo "Successfully Approved the Purchase Order No: " . $PONO; + echo "The Purchase Order No: " . $PONO . "is Approved"; } else { $store = array('Status' => $StatusCode, 'OnHoldOn' => $ReleasedDate, 'OnHoldBy' => $ReleasedBy, 'Remarks' => $Remarks); $this->purchaseorder_model->UpdatePO($store, $PONO); From 66edb153e8c724b77a301cfa46256d2c909f16df Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Thu, 24 Apr 2025 11:24:58 +0530 Subject: [PATCH 10/12] stock changes 24-04-2025 --- app/Views/stock/dieselStockDetails.php | 59 ++++++++++++-------------- 1 file changed, 27 insertions(+), 32 deletions(-) diff --git a/app/Views/stock/dieselStockDetails.php b/app/Views/stock/dieselStockDetails.php index d9754477..f5b2da8f 100644 --- a/app/Views/stock/dieselStockDetails.php +++ b/app/Views/stock/dieselStockDetails.php @@ -1,4 +1,7 @@
Supplier Name