From 366ce7e19265477c5259bc2bd97184a9e94f5b13 Mon Sep 17 00:00:00 2001
From: sriramv <sriram.v@venbainfotech.com>
Date: Mon, 28 May 2018 15:28:45 +0530
Subject: [PATCH] issues fixed Date filter

---
 application/models/dahsboard_model.php                    | 4 ++--
 application/views/Report_Material_Master_SupplierWise.php | 3 ++-
 application/views/Report_POreleased.php                   | 3 ++-
 application/views/Report_openorder.php                    | 3 ++-
 application/views/Report_pending_purchase.php             | 3 ++-
 application/views/Report_purchase_inward.php              | 3 ++-
 application/views/Report_year_wise.php                    | 3 ++-
 application/views/cashbookmonthlydep.php                  | 3 ++-
 application/views/cashbookmonthlyexp.php                  | 3 ++-
 application/views/includes/header.php                     | 4 ++--
 application/views/salarycostforproduction.php             | 3 ++-
 11 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php
index ce529e62..0acca3e5 100755
--- a/application/models/dahsboard_model.php
+++ b/application/models/dahsboard_model.php
@@ -1504,7 +1504,7 @@ if ($cname!= ''){
         
 
 
-$sql.="group by pono,material_name,category,supplier_name";
+$sql.="group by pono,material_name,category,supplier_name,id.IGRItemNo";
 //echo $sql;
         $query = $this->db->query($sql);
         return $query->result();    
@@ -1629,7 +1629,7 @@ if ($cname!= ''){
         
 
 
-$sql.="group by pono,material_name,category,supplier_name";
+$sql.="group by pono,material_name,category,supplier_name,id.IGRItemNo";
 // echo $m;
 // echo $sid;
 //echo $sql;
diff --git a/application/views/Report_Material_Master_SupplierWise.php b/application/views/Report_Material_Master_SupplierWise.php
index bf96bd5e..1521c1fa 100755
--- a/application/views/Report_Material_Master_SupplierWise.php
+++ b/application/views/Report_Material_Master_SupplierWise.php
@@ -104,13 +104,14 @@ if(!empty($mms))
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
-
+	<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
 <script> 
 	
 
 // Bootstrap datepicker
 // Set up your table
 $(document).ready(function() {
+	$.fn.dataTable.moment( 'DD-MM-YYYY' );
     table = $('#cc').DataTable( {
         "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
 "<'row'<'col-md-6'><'col-md-6'>>" +
diff --git a/application/views/Report_POreleased.php b/application/views/Report_POreleased.php
index 3deae640..66bac447 100755
--- a/application/views/Report_POreleased.php
+++ b/application/views/Report_POreleased.php
@@ -250,13 +250,14 @@ if(!empty($rel_po))
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
-
+<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
 <script> 
 	
 
 // Bootstrap datepicker
 // Set up your table
 $(document).ready(function() {
+	$.fn.dataTable.moment( 'DD-MM-YYYY' );
     table = $('#req').DataTable( {
         "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
 "<'row'<'col-md-6'><'col-md-6'>>" +
diff --git a/application/views/Report_openorder.php b/application/views/Report_openorder.php
index 0aa7beb8..29771faa 100755
--- a/application/views/Report_openorder.php
+++ b/application/views/Report_openorder.php
@@ -249,13 +249,14 @@ if(!empty($open_po))
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
-
+	<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
 <script> 
 	
 
 // Bootstrap datepicker
 // Set up your table
 $(document).ready(function() {
+	$.fn.dataTable.moment( 'DD-MM-YYYY' );
     table = $('#req').DataTable( {
         "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
 "<'row'<'col-md-6'><'col-md-6'>>" +
diff --git a/application/views/Report_pending_purchase.php b/application/views/Report_pending_purchase.php
index cc433b88..b22c259a 100755
--- a/application/views/Report_pending_purchase.php
+++ b/application/views/Report_pending_purchase.php
@@ -392,13 +392,14 @@ if(!empty($mms))
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
-
+	<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
 <script> 
 	
 
 // Bootstrap datepicker
 // Set up your table
 $(document).ready(function() {
+	$.fn.dataTable.moment( 'DD-MM-YYYY' );
     table = $('#cc').DataTable( {
         "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
 "<'row'<'col-md-6'><'col-md-6'>>" +
diff --git a/application/views/Report_purchase_inward.php b/application/views/Report_purchase_inward.php
index 021f790d..42f3d25a 100755
--- a/application/views/Report_purchase_inward.php
+++ b/application/views/Report_purchase_inward.php
@@ -469,13 +469,14 @@ table.dataTable thead > tr > td.sorting {
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
-
+	<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
 <script> 
 	
 
 // Bootstrap datepicker
 // Set up your table
 $(document).ready(function() {
+	$.fn.dataTable.moment( 'DD-MM-YYYY' );
     table = $('#cc').DataTable( {
 		"columnDefs" : [{"targets":1, "type":"date-eu"}],
       
diff --git a/application/views/Report_year_wise.php b/application/views/Report_year_wise.php
index 31d8271b..cad5a025 100755
--- a/application/views/Report_year_wise.php
+++ b/application/views/Report_year_wise.php
@@ -191,7 +191,7 @@ if(!empty($mms))
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
-
+	<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
 <script> 
 	jQuery.extend( jQuery.fn.dataTableExt.oSort, {
     "date-range-pre": function ( a ) {
@@ -209,6 +209,7 @@ if(!empty($mms))
 // Bootstrap datepicker
 // Set up your table
 $(document).ready(function() {
+	$.fn.dataTable.moment( 'DD-MM-YYYY' );
     table = $('#cc').DataTable( {
         "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
 "<'row'<'col-md-6'><'col-md-6'>>" +
diff --git a/application/views/cashbookmonthlydep.php b/application/views/cashbookmonthlydep.php
index 4172d83c..710c553c 100755
--- a/application/views/cashbookmonthlydep.php
+++ b/application/views/cashbookmonthlydep.php
@@ -169,7 +169,7 @@ if(!empty($Indiancurrency))
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
-	  
+	  <script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
 <script> 
 	
 
@@ -177,6 +177,7 @@ if(!empty($Indiancurrency))
 // Set up your table
 $(document).ready(function() {
     table = $('#req').DataTable( {
+		$.fn.dataTable.moment( 'DD-MM-YYYY' );
         "dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" +
 "<'row'<'col-md-6'><'col-md-6'>>" +
 "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
diff --git a/application/views/cashbookmonthlyexp.php b/application/views/cashbookmonthlyexp.php
index 582402f3..520ec87b 100755
--- a/application/views/cashbookmonthlyexp.php
+++ b/application/views/cashbookmonthlyexp.php
@@ -174,13 +174,14 @@ if(!empty($Indiancurrency))
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
-	  
+	<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
 <script> 
 	
 
 // Bootstrap datepicker
 // Set up your table
 $(document).ready(function() {
+	$.fn.dataTable.moment( 'DD-MM-YYYY' );
     table = $('#req').DataTable( {
         "dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" +
 "<'row'<'col-md-6'><'col-md-6'>>" +
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index da9998d5..cb8b8fa7 100755
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -2,8 +2,8 @@
 <html>
   <head>
     <meta charset="UTF-8">
-	//Date Sorting Filter...
-	<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+	
+	
     <title><?php echo $pageTitle; ?></title>
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
     <!-- Bootstrap 3.3.4 -->
diff --git a/application/views/salarycostforproduction.php b/application/views/salarycostforproduction.php
index 0bfb1712..221758f1 100644
--- a/application/views/salarycostforproduction.php
+++ b/application/views/salarycostforproduction.php
@@ -309,9 +309,10 @@ th{
 					<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
 					<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
 					<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
-					
+					<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
 					<script>
 					$(document).ready(function() {
+						$.fn.dataTable.moment( 'DD-MM-YYYY' );
 					table = $('#testreport').DataTable( {
 						
 					"dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" +