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/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php
index 80cd15e5..fd4f21e9 100755
--- a/app/Controllers/Inwardgateregister.php
+++ b/app/Controllers/Inwardgateregister.php
@@ -460,7 +460,7 @@ class Inwardgateregister extends BaseController
     $igr = array('IGRNO'=>$newIGRNO,'PONO' => $PONO, 'VehicleNo' => $VehicleNo, 'TransporterId'=>$TransporterId,'DeliveryChellanOrInvoiceNo' => $DeliveryChellanOrInvoiceNo, 'DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt, 'DriverName' => $DriverName, 'DriverMobileNumber' => $DriverMobileNumber,'IGRStatus' => $IGRStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt, 'PaymentStatus' => $paymentstatus, 'Remark'=>$MasterRemarks);
     $igr['MasterFile'] = $requestMasterFileName;
     #Step 4 Calling DB to Save IGR Master
-    $IGRNO = $this->inwardgateregister_model->addigrM($igr);
+    $IGRNO = $this->inwardgateregister_model->addigrM($igr);    
 
     if($IGRNO){
 
@@ -689,7 +689,6 @@ class Inwardgateregister extends BaseController
   // Escape newlines and quotes for the JavaScript alert
   $finalstatement = json_encode($finalstatement);
 
-
   echo "<script>
   alert('$finalstatement');
   window.location.href = 'ViewIGR';
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);
diff --git a/app/Controllers/Report.php b/app/Controllers/Report.php
index 54a2bae7..6575f62f 100755
--- a/app/Controllers/Report.php
+++ b/app/Controllers/Report.php
@@ -79,6 +79,11 @@ class Report extends BaseController
 			$agt = $this->request->getPost('aging_to');
 			$data['finyear'] = $this->dahsboard_Model->report_finyear();
 			$data['pending_list'] = $this->dahsboard_Model->req_list($fa, $aa, $m, $frm, $t, $agf, $agt);
+			$data['givenYear'] = $ab ;
+			$data['givenMonth']= $m  ;
+			$data['givenFrm']  = $frm ;
+			$data['givenTo']   = $t;
+
 			//print_r($data);
 		}
 		$data['finyear'] = $this->dahsboard_Model->report_finyear();
@@ -105,7 +110,13 @@ class Report extends BaseController
 			$agt = $this->request->getPost('total_order_value_To');
 			$data['finyear'] = $this->dahsboard_Model->report_finyear();
 			$data['rel_po'] = $this->dahsboard_Model->report_relpo($fa, $aa, $m, $frm, $t, $agf, $agt);
-			//print_r($data);
+			
+			$data['givenYear'] = $ab ;
+			$data['givenMonth']= $m  ;
+			$data['givenFrm']  = $frm ;
+			$data['givenTo']   = $t;
+			$data['givenAgf']  = $agf;
+			$data['givenAgt']  = $agt;
 
 
 
@@ -155,6 +166,8 @@ class Report extends BaseController
 			$aa = substr((string)$ab, 5, 5);
 			$data['finyear'] = $this->dahsboard_Model->report_finyear();
 			$data['Total'] = $this->dahsboard_Model->report_total($fa, $aa);
+
+			$data['givenYear'] = $ab ;
 		}
 		$data['finyear'] = $this->dahsboard_Model->report_finyear();
 
@@ -174,6 +187,7 @@ class Report extends BaseController
 
 			$data['finyear'] = $this->dahsboard_Model->report_finyear();
 			$data['ccrpt'] = $this->dahsboard_Model->report_ccr($fa, $aa);
+			$data['ab'] = $ab;
 		}
 		$data['finyear'] = $this->dahsboard_Model->report_finyear();
 
@@ -270,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();
@@ -286,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');
@@ -316,10 +342,12 @@ 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);
 			$data['finyear'] = $this->dahsboard_Model->report_finyear();
+			$data['givenFinancialYear'] = $ab;
 
 			//$this->loadviews("Report_year_wise",$this->global,$data, NULL);
 		}
@@ -379,6 +407,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();
@@ -402,6 +437,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();
@@ -421,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);
@@ -444,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);
@@ -559,6 +601,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 +632,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 +660,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 +695,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 +736,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 +765,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 +782,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 +815,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 +842,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 +870,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 +906,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 +978,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);
@@ -1054,6 +1101,11 @@ class Report extends BaseController
 
 			$data['monthly_gst_purchase'] = $this->dahsboard_Model->monthly_gst_purchase($m, $frm, $t, $fa, $aa);
 			$data['monthly_gst_sales'] = $this->dahsboard_Model->monthly_gst_sales($m, $frm, $t, $fa, $aa);
+
+			$data['m'] =  $m;
+			$data['frm']= $frm;
+			$data['t'] =  $t;
+			$data['ab']=  $ab;
 		}
 		$data['finyear'] = $this->dahsboard_Model->report_finyear();
 		$this->loadviews("Report_monthly_gst", $this->global, $data, NULL);
@@ -1133,10 +1185,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);
 
@@ -1162,7 +1216,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/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/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/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/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php
index db7dbb13..c751e1d6 100755
--- a/app/Models/Inwardgateregister_model.php
+++ b/app/Models/Inwardgateregister_model.php
@@ -195,7 +195,7 @@ class Inwardgateregister_model extends Model
 	function viewpurchaseorder($PO)
 	{
 
-		$subQuery = 'SELECT distinct POM.PONO, POL.MaterialCode, POL.Quantity, POL.ReceivedQuantity, (POL.Quantity - POL.ReceivedQuantity) as PendingQty, QuantityRejected, POL.PONO, MM.MaterialName, MM.UOM,MM.HSNCODE,POL.Rate
+		$subQuery = 'SELECT distinct POM.PONO, POL.LineItemNo,POL.MaterialCode, POL.Quantity, POL.ReceivedQuantity, (POL.Quantity - POL.ReceivedQuantity) as PendingQty, QuantityRejected, POL.PONO, MM.MaterialName, MM.UOM,MM.HSNCODE,POL.Rate
              FROM t_purchaseorder_master POM
              LEFT JOIN t_purchaseorder_lineitem POL ON POL.PONO = POM.PONO
              LEFT JOIN t_igr_master IGM ON IGM.PONO = POL.PONO
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 @@
-
-
-<?php
-if(!empty($mmi))
-{
-
-}
-?>
-
+<!-- Report_Material_Master_ItemWise.php -->
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
+<style>
+  table {
+    width: auto;
+  }
+</style>
 
-                           }
-		 
-			   
-	 </style>
-     <div class="content-wrapper">
-<section="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Material Master - Item Wise</b></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    
-           	
-			 
-		       
-			 <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-                     <tr>
-				       
-					   <th>Material Code</th>
-					   <th>Material Name</th>
-					   <th>UOM</th>
-					   <th>Category</th>
-					   <th>HSNCODE</th>
-					   
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($mmi)){
-					   foreach($mmi as $rel)
-					    {				
-					   ?> 
-					  <tr>
-                        
-                        <td><span><?php echo $rel->MaterialCode?></span></td>
-				        <td><span><?php echo $rel->MaterialName?></span></td>
-						<td><span><?php echo $rel->UOM?></span></td>
-						<td><span><?php echo $rel->Category?></span></td>
-						<td><span><?php echo $rel->HSNCODE?></span></td>
-					   
-					   
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   }
-					   ?>
-			        </tbody>
-			      </table>
-			 
-				</div>
-			   </div>
-			</div>
-          <!-- /.box -->
+<div class="content-page">
+  <div class="content">
+    <!-- Start Content-->
+    <div class="container-fluid">
+      <!-- start page title -->
+      <div>
+        <div class="row">
+          <div class="col-12">
+            <div class="page-title-box page-title-box-alt">
+              <div class="page-title-right">
+                <ol class="breadcrumb m-0">
+                  <li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+                  <li class="breadcrumb-item"><a href="javascript: void(0);">Material Master</a></li>
+                  <li class="breadcrumb-item active">
+                    <h4 class="page-title"><b> Item Wise </b></h4>
+                  </li>
+                </ol>
+              </div>
+
+            </div>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-12">
+            <div class="card">
+              <div class="card-body">
+                <table id="MM_Supplier" class="table table-bordered table-hover mb-0 nowrap w-100"
+                  style="background-color:#fff; font-size:12px;">
+                  <thead>
+                    <tr>
+                      <th>Material Code</th>
+                      <th>Material Name</th>
+                      <th>UOM</th>
+                      <th>Category</th>
+                      <th>HSNCODE</th>
+
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <?php if (!empty($mmi)) {
+                      foreach ($mmi as $rel) {
+                    ?>
+                        <tr>
+
+                          <td><span><?php echo $rel->MaterialCode ?></span></td>
+                          <td><span><?php echo $rel->MaterialName ?></span></td>
+                          <td><span><?php echo $rel->UOM ?></span></td>
+                          <td><span><?php echo $rel->Category ?></span></td>
+                          <td><span><?php echo $rel->HSNCODE ?></span></td>
+
+
+
+                        </tr>
+                    <?php
+                      }
+                    }
+                    ?>
+                  </tbody>
+                </table>
+              </div> <!-- end card body-->
+            </div> <!-- end card -->
+          </div><!-- end col-->
         </div>
-        <!-- /.col -->
       </div>
-      </div>
-      </section>
+    </div> <!-- container -->
+  </div> <!-- content -->
+</div>
 
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
 
-<script> 
-	
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-        "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: 'Report - Material Master - Item Wise',
-                exportOptions: {
-                    columns: ':visible'
-					
-                }
-            },
-            
-            'colvis'
-        ]
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
+    // Initialize the DataTable
+    var table = $('#MM_Supplier').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: '<i class="fas fa-angle-right"></i>', // Next button icon
+          previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+        },
+        emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
+      }
     });
-   function Reset()
-{
-	 $('#mySelect').val('');
-	
-}
-
-	</script>
-	
-	
-	
\ No newline at end of file
+  });
+</script>
\ 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..013cadba 100755
--- a/app/Views/Report_Material_Master_ReceiptValue.php
+++ b/app/Views/Report_Material_Master_ReceiptValue.php
@@ -1,267 +1,236 @@
-
+<!-- Report_Material_Master_ReceiptValue.php -->
+<script>
+	$(document).ready(function() {
+		$("#financialyear").select2();
+		$("#month").select2();
+	});
+</script>
 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
 
-                           }
-		    .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}					   
-		 
-			   
-	 </style>
-	 <div class="content-wrapper">
-<section="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Material Master - Receipt Value</b>
-			  <br><br>
-			  <?php
-			  
-			  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 ' ';
-			  }
-			 
-			  ?>
-			  </p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="panel-body">
+<style>
+	table {
+		width: auto;
+	}
+</style>
 
-                    <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Material Master</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Receipt Value </b></h4>
+									</li>
+								</ol>
+							</div>
 
-                        <div class="form-group has-feedback">
-						
-						
-						
-                       <div class="col-md-2">
-							 <label for="to_date">
-                                <?php echo 'Year'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="financialyear" name="financialyear">
-								 <option value="">Select Year</option>
-								 <?php 
-								 
-								
-								  foreach($finyear as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                            </div>
-								<div class="col-md-2">
-								<label for="to_date">
-                                <?php echo 'Month'; ?>
-                                </label>
-                                <div class="input-group">
-                                 <select class="form-control" id="month" name="month">
-								  <option value="">Select Month</option>
-								 <option value="January">January</option>
-								 <option value="February">February</option>
-								 <option value="March">March</option>
-								 <option value="April">April</option>
-								 <option value="May">May</option>
-								 <option value="June">June</option>
-								 <option value="July">July</option>
-								 <option value="August">August</option>
-								 <option value="September">September</option>
-								 <option value="October">October</option>
-								 <option value="November">November</option>
-								 <option value="December">December</option>
-								 </select>
-                              </div>
-                            </div>
-						
-             
-                     
-					
-
-             
-                      
-						<div class="col-md-2 col-md-offset-0"><br>
-                        <input type="submit" class="btn btn-success" name="btn_submit" style="padding:10px;"
-                               value="View Report">
-                        
-							</div>  
-							</div>  
-                    </form>
-
-               
-
-            </div>	
-           	
-			 
-		       
-			 <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-                     <tr>
-				       <th>Month</th>
-                       <th>Material Code</th>
-					   <th>Material Name</th>
-					   <th>UOM</th>
-					   <th>Average Rate (&#8377;)</th>
-					   
-					   
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php 
-					   $tot=0.00;
-					   if(!empty($mmr)){
-					   foreach($mmr as $rel)
-					    {				
-					   ?> 
-					  <tr>
-                        
-                        <td><span><?php echo $rel->Month?></span></td>
-				        <td><span><?php echo $rel->MaterialCode?></span></td>
-						<td><span><?php echo $rel->MaterialName?></span></td>
-						<td><span><?php echo $rel->UOM?></span></td>
-						<td align="right"><span><?php 
-						$tot= $tot + number_format($rel->Average_Rate,2,'.','');
-						echo number_format($rel->Average_Rate,2,'.','')?></span></td>
-					   
-					   
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   }
-					   ?>
-			        </tbody>
-					<tfoot>
-					<td style="text-align:center"><?php 
-					$t='Total';
-					echo $t;?></td>
-					<td><?php echo '';?></td>
-					<td><?php echo '';?></td>
-					<td><?php echo '';?></td>
-					<td style="text-align:right"><?php echo number_format($tot,2,'.','');?></td>
-					</tfoot>
-			      </table>
-			 
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<form method="post" action="<?php echo base_url("Report_Material_ReceiptValue"); ?>">
+									<div class="form-group">
+
+										<div class="row">
+											<div class="col-3">
+												<label for="financialyear">
+													<?php echo 'Year'; ?>
+												</label>
+												<select class="form-control" id="financialyear" name="financialyear">
+													<option value="">Select Year</option>
+													<?php
+
+
+													foreach ($finyear as $item): { ?>
+
+															<option value="<?php echo $item->financial_year; ?>" <?php if (isset($financialyear) && ($financialyear == $item->financial_year)) {
+																														echo 'selected';
+																													} ?>><?php echo $item->financial_year;  ?></option>
+
+
+													<?php }
+													endforeach; ?>
+												</select>
+											</div>
+
+											<div class="col-3">
+												<label for="month">
+													<?php echo 'Month'; ?>
+												</label>
+
+												<select class="form-control" id="month" name="month">
+													<option value="">Select Month</option>
+													<option value="January" <?php if (isset($month) && ($month == "January")) {
+																				echo 'selected';
+																			} ?>>January</option>
+													<option value="February" <?php if (isset($month) && ($month == "February")) {
+																					echo 'selected';
+																				} ?>>February</option>
+													<option value="March" <?php if (isset($month) && ($month == "March")) {
+																				echo 'selected';
+																			} ?>>March</option>
+													<option value="April" <?php if (isset($month) && ($month == "April")) {
+																				echo 'selected';
+																			} ?>>April</option>
+													<option value="May" <?php if (isset($month) && ($month == "May")) {
+																			echo 'selected';
+																		} ?>>May</option>
+													<option value="June" <?php if (isset($month) && ($month == "June")) {
+																				echo 'selected';
+																			} ?>>June</option>
+													<option value="July" <?php if (isset($month) && ($month == "July")) {
+																				echo 'selected';
+																			} ?>>July</option>
+													<option value="August" <?php if (isset($month) && ($month == "August")) {
+																				echo 'selected';
+																			} ?>>August</option>
+													<option value="September" <?php if (isset($month) && ($month == "September")) {
+																					echo 'selected';
+																				} ?>>September</option>
+													<option value="October" <?php if (isset($month) && ($month == "October")) {
+																				echo 'selected';
+																			} ?>>October</option>
+													<option value="November" <?php if (isset($month) && ($month == "November")) {
+																					echo 'selected';
+																				} ?>>November</option>
+													<option value="December" <?php if (isset($month) && ($month == "December")) {
+																					echo 'selected';
+																				} ?>>December</option>
+												</select>
+
+
+											</div>
+											<div class="col-3"></div>
+
+											<div class="col-3 text-right">
+												<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Report_Material_ReceiptValue') ?>';">
+												<input type="submit" class="btn btn-success m-2" name="btn_submit" value="View Report">
+											</div>
+
+										</div>
+									</div>
+									<div class="form-group has-feedback">
+
+									</div>
+
+
+								</form>
+								<table id="cc" class="table table-bordered table-hover mb-0 nowrap w-100"
+									style="background-color:#fff; font-size:12px;">
+
+
+
+									<thead>
+										<tr>
+											<th style="white-space: nowrap !important;">Month</th>
+											<th style="white-space: nowrap !important;">Material Code</th>
+											<th style="white-space: nowrap !important;">Material Name</th>
+											<th style="white-space: nowrap !important;">UOM</th>
+											<th style="white-space: nowrap !important;">Average Rate (&#8377;)</th>
+										</tr>
+									</thead>
+									<tbody>
+										<?php $tot = 0.00;
+										if (!empty($mmr)) {
+											foreach ($mmr as $rel) {
+
+										?>
+												<tr>
+													<!-- Main invoice row -->
+													<td><span><?php echo $rel->Month ?></span></td>
+													<td><span><?php echo $rel->MaterialCode ?></span></td>
+													<td><span><?php echo $rel->MaterialName ?></span></td>
+													<td><span><?php echo $rel->UOM ?></span></td>
+													<td align="right"><span><?php
+																			$tot = $tot + number_format($rel->Average_Rate, 2, '.', '');
+																			echo number_format($rel->Average_Rate, 2, '.', '') ?></span></td>
+												</tr>
+
+
+										<?php
+											}
+										}  ?>
+									</tbody>
+									<tfoot width="100%">
+										<tr>
+											<td style="text-align:center;"><strong>Total</strong></td>
+											<td style="text-align:right"><strong><?php {
+																						echo '';
+																					} ?></strong></td>
+											<td style="text-align:right"><strong><?php {
+																						echo '';
+																					} ?></strong></td>
+											<td style="text-align:right"><strong><?php {
+																						echo '';
+																					} ?></strong></td>
+											<td style="text-align:right"><?php echo number_format($tot, 2, '.', ''); ?></td>
+
+											</td>
+
+
+										</tr>
+
+									</tfoot>
+
+								</table>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-      </div>
-	  </div>
-	  </section>
+		</div> <!-- container -->
+	</div> <!-- content -->
+</div>
 
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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> 
-	
+<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":     "<center> Data Not Found ! </center>"
-        },
-        "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'
-        ],
-		
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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;
-            };
-			 
-			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) );
 
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-   function Reset()
-{
-	 $('#mySelect').val('');
-	
-}
-
-	</script>
-	
-	
-	
\ 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+					previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+				},
+				emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
+			}
+		});
+	});
+</script>
\ 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 @@
-
-
-<?php
-if(!empty($mms))
-{
-
-}
-?>
-
+<!-- Report_Material_Master_SupplierWise.php -->
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
+<style>
+  table {
+    width: auto;
+  }
+</style>
 
-                           }
-		 
-			   
-	 </style>
-     <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Material Master - Supplier Wise</b></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    
-           	
-			 
-		       
-			 <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:12.5px;">
-                   <thead>
-                     <tr>
-				       <th>Material Date</th>
-                       <th>Supplier ID </th>
-					   <th>Supplier Name</th>
-					   <th>Material Code</th>
-					   <th>Material Name</th>
-					   <th>Material Type</th>
-					   <th>UOM</th>
-					   <th>HSNCODE</th>
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($mms)){
-					   foreach($mms as $rel)
-					    {				
-					   ?> 
-					  <tr>
-                        <td><span><?php $date = new DateTime($rel->Material_Date);echo $date->format('d-m-Y');?></span></td>
-                        <td><span><?php echo $rel->SupplierID?></span></td>
-				        <td><span><?php echo $rel->SupplierName?></span></td>
-						<td><span><?php echo $rel->MaterialCode?></span></td>
-						<td><span><?php echo $rel->MaterialName?></span></td>
-						<td><span><?php echo $rel->MaterialType?></span></td>
-						<td><span><?php echo $rel->UOM?></span></td>
-						<td><span><?php echo $rel->HSNCODE?></span></td>
-					   
-					   
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   }
-					   ?>
-			        </tbody>
-			      </table>
-			 
-				</div>
-			   </div>
-			</div>
-          <!-- /.box -->
+<div class="content-page">
+  <div class="content">
+    <!-- Start Content-->
+    <div class="container-fluid">
+      <!-- start page title -->
+      <div>
+        <div class="row">
+          <div class="col-12">
+            <div class="page-title-box page-title-box-alt">
+              <div class="page-title-right">
+                <ol class="breadcrumb m-0">
+                  <li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+                  <li class="breadcrumb-item"><a href="javascript: void(0);">Material Master</a></li>
+                  <li class="breadcrumb-item active">
+                    <h4 class="page-title"><b> Supplier Wise </b></h4>
+                  </li>
+                </ol>
+              </div>
+
+            </div>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-12">
+            <div class="card">
+              <div class="card-body">
+                <table id="MM_Supplier" class="table table-bordered table-hover mb-0 nowrap w-100"
+                  style="background-color:#fff; font-size:12px;">
+                  <thead>
+                    <tr>
+                      <th>Material Date</th>
+                      <th>Supplier ID </th>
+                      <th>Supplier Name</th>
+                      <th>Material Code</th>
+                      <th>Material Name</th>
+                      <th>Material Type</th>
+                      <th>UOM</th>
+                      <th>HSNCODE</th>
+
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <?php if (!empty($mms)) {
+                      foreach ($mms as $rel) {
+                    ?>
+                        <tr>
+                          <td><span><?php $date = new DateTime($rel->Material_Date);
+                                    echo $date->format('d-m-Y'); ?></span></td>
+                          <td><span><?php echo $rel->SupplierID ?></span></td>
+                          <td><span><?php echo $rel->SupplierName ?></span></td>
+                          <td><span><?php echo $rel->MaterialCode ?></span></td>
+                          <td><span><?php echo $rel->MaterialName ?></span></td>
+                          <td><span><?php echo $rel->MaterialType ?></span></td>
+                          <td><span><?php echo $rel->UOM ?></span></td>
+                          <td><span><?php echo $rel->HSNCODE ?></span></td>
+
+
+
+                        </tr>
+                    <?php
+                      }
+                    }
+                    ?>
+                  </tbody>
+                </table>
+              </div> <!-- end card body-->
+            </div> <!-- end card -->
+          </div><!-- end col-->
         </div>
-        <!-- /.col -->
       </div>
-      </section>
-      </div>
-    
+    </div> <!-- container -->
+  </div> <!-- content -->
+</div>
 
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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> 
-	
+<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-	$.fn.dataTable.moment( 'DD-MM-YYYY' );
-    table = $('#cc').DataTable( {
-    	 "aaSorting": [[ 0, "desc" ]],
-        "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: 'Report - Material Master - SupplierWise',
-                exportOptions: {
-                    columns: ':visible'
-					
-                }
-            },
-            
-            'colvis'
-        ]
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
+    // Initialize the DataTable
+    var table = $('#MM_Supplier').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: '<i class="fas fa-angle-right"></i>', // Next button icon
+          previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+        },
+        emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
+      }
     });
-   function Reset()
-{
-	 $('#mySelect').val('');
-	
-}
-
-	</script>
-	
-	
-	
\ No newline at end of file
+  });
+</script>
\ No newline at end of file
diff --git a/app/Views/Report_POreleased.php b/app/Views/Report_POreleased.php
index 818e3677..26855a28 100755
--- a/app/Views/Report_POreleased.php
+++ b/app/Views/Report_POreleased.php
@@ -52,9 +52,9 @@
 						<div class="page-title-right">
                                 <ol class="breadcrumb m-0">
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
-                                    <li class="breadcrumb-item"><a href="javascript: void(0);"></a></li>
+                                    <li class="breadcrumb-item"><a href="javascript: void(0);">Requisation</a></li>
                                     <li class="breadcrumb-item active">
-                                    <h4 class="page-title"><b>   </b></h4>
+                                    <h4 class="page-title"><b> Order Value Released  </b></h4>
                                     </li>
                                 </ol>
                             </div>
@@ -81,13 +81,16 @@
 										<select class="form-control" id="financialyear" name="financialyear">
 										<option value="">Select Year</option>
 										<?php 
-										
-										
+
 										foreach($finyear as $item):
 												
 												{?>
 												
-												<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
+											<option 
+											    <?php echo isset($givenYear) && $item->financial_year == $givenYear ? "selected" : "" ?>
+												value="<?php echo $item->financial_year;?>">
+												<?php echo $item->financial_year ;  ?>
+											</option>
 												
 														
 												<?php } endforeach; ?>
@@ -101,19 +104,17 @@
 									</label>
 									<div class="input-group">
 									<select class="form-control" id="month" name="month">
-									<option value="">Select Month</option>
-									<option value="January">January</option>
-									<option value="February">February</option>
-									<option value="March">March</option>
-									<option value="April">April</option>
-									<option value="May">May</option>
-									<option value="June">June</option>
-									<option value="July">July</option>
-									<option value="August">August</option>
-									<option value="September">September</option>
-									<option value="October">October</option>
-									<option value="November">November</option>
-									<option value="December">December</option>
+
+									<?php $monthArray=['January',"February","March","April",
+																	"May","June","July","August","September","October",
+																	"November","December"] ?>
+
+											<option value="">Select Month</option>
+												<?php	foreach($monthArray as $month): ?>
+													<option value="<?=$month?>" <?php if(isset($givenMonth) && $givenMonth == $month){ echo 'selected'; } ?> >
+														<?=$month?>
+													</option>
+												<?php endforeach ?>
 									</select>
 								</div>
 									</div>
@@ -122,7 +123,8 @@
 											<?php echo 'Total Order Value From'; ?>
 										</label>
 										<div class="input-group">
-											<input name="total_order_value_From" id="total_order_value_From" style="padding:4px;">
+											<input class="form-control" name="total_order_value_From" id="total_order_value_From" style="padding:4px;"
+											value="<?php echo isset($givenAgf) ? $givenAgf : "" ?>">
 										</span>
 										</div>
 									</div>
@@ -131,7 +133,8 @@
 											<?php echo 'Total Order Value To'; ?>
 										</label>  
 										<div class="input-group">
-											<input name="total_order_value_To" id="total_order_value_To" style="padding:4px;">
+											<input class="form-control" name="total_order_value_To" id="total_order_value_To" style="padding:4px;"
+											value="<?php echo isset($givenAgt) ? $givenAgt : "" ?>">
 										</span>
 										</div>
 
@@ -143,7 +146,8 @@
 											<?php echo 'From Date'; ?>
 										</label>
 										<div class="input-group">
-											<input name="from_date" id="max-date" class="form-control datepicker">
+											<input name="from_date" id="max-date" class="form-control datepicker"
+											value="<?php echo isset($givenFrm) ? $givenFrm : "" ?>">
 											
 										</div>
 									</div>
@@ -152,12 +156,14 @@
 											<?php echo 'To Date'; ?>
 										</label>  
 										<div class="input-group">
-											<input name="to_date" id="min-date" class="form-control datepicker">
+											<input name="to_date" id="min-date" class="form-control datepicker"
+											value="<?php echo isset($givenTo) ? $givenTo : "" ?>">
 											
 										</div>
 
 									</div>
-									<div class="col-md-3 col-md-offset-10"><br>
+									<div class="col-md-6 text-right"><br>
+									<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('releasedpo') ?>';">
 									<input type="submit" class="btn btn-success" name="btn_submit"
 										value="View Report">
 
@@ -236,6 +242,13 @@
 	$(document).ready(function() {
     // Initialize the DataTable with only pagination enabled
     var table = $('#cc').DataTable({
+		dom: 'Blfrtip',
+            buttons: [
+                {
+					extend: 'excel',
+					text: 'Excel',
+				}
+            ],
         paging: true, // Enable pagination
         searching: true, // Disable search
         ordering: false, // Disable column sorting
@@ -312,6 +325,7 @@ $( function() {
 					dateFormat: 'dd-mm-yy',
 					defaultDate: "+0d",
 					changeMonth: true,
+					orientation : "botttom"
 					//numberOfMonths: 1
 				})
 				.on( "change", function() {
@@ -321,6 +335,7 @@ $( function() {
 				dateFormat: 'dd-mm-yy',
 				defaultDate: "+0d",
 				changeMonth: true,
+				orientation : "bottom"
 				//numberOfMonths: 1
 			})
 			.on( "change", function() {
diff --git a/app/Views/Report_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 @@
 <script>
- $(document).ready(function () {
-	  $("#client_name").select2();
-	  $("#item_name").select2();                
-}); 
+	$(document).ready(function() {
+		$("#client_name").select2();
+		$("#financialyear").select2();
+		$("#month").select2();
+	});
 </script>
 
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">  
-<style> 
-          .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;
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
 
-                           } 
-		  .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
+<style>
+	table {
+		width: auto;
+	}
 </style>
-<div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Inward Summary</b><br><br>
-			  <?php
-			  if($this->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;
-			  }
-		 
-			  ?></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		     <div class="panel-body">
 
-                    <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
-
-                        <div class="form-group has-feedback">
-						<div class="col-md-2">
-						    <label for="client_name">
-                                <?php echo 'Supplier'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="client_name" name="client_name" >
-								 <option value="">Select Supplier</option>
-								 <?php 
-								foreach($cust as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->SupplierName;?>"><?php echo $item->SupplierName ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                        </div>   
-                       <div class="col-md-2">
-							 <label for="to_date">
-                                <?php echo 'Year'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="financialyear" name="financialyear">
-								 <option value="">Select Year</option>
-								 <?php 
-								 
-								
-								  foreach($finyear as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                            </div>
-								<div class="col-md-2">
-								<label for="to_date">
-                                <?php echo 'Month'; ?>
-                                </label>
-                                <div class="input-group">
-                                 <select class="form-control" id="month" name="month">
-								  <option value="">Select Month</option>
-								 <option value="January">January</option>
-								 <option value="February">February</option>
-								 <option value="March">March</option>
-								 <option value="April">April</option>
-								 <option value="May">May</option>
-								 <option value="June">June</option>
-								 <option value="July">July</option>
-								 <option value="August">August</option>
-								 <option value="September">September</option>
-								 <option value="October">October</option>
-								 <option value="November">November</option>
-								 <option value="December">December</option>
-								 </select>
-                              </div>
-                            </div>
-						<div class="col-md-2">
-						    <label for="from_date">
-                                <?php echo 'From Date'; ?>
-                            </label>
-                            <div class="input-group">
-                                <input name="from_date" id="max-date" class="form-control datepicker">
-                                <span class="input-group-addon">
-                                    <i class="fa fa-calendar fa-fw"></i>
-                            </span>
-                            </div>
-                        </div>
-
-             
-                       <div class="col-md-2">
-					        <label for="to_date">
-                                <?php echo 'To Date'; ?>
-                            </label>  
-                            <div class="input-group">
-                                <input name="to_date" id="min-date" class="form-control datepicker">
-                                <span class="input-group-addon">
-                                    <i class="fa fa-calendar fa-fw"></i>
-                            </span>
-                            </div>
-                       
-						</div>
-						<div class="col-md-2 "  ><br>
-                        <input type="submit" class="btn btn-success" name="btn_submit"
-                               value="View Report">
-                        
-							</div>  
-							</div>  
-                    </form>
-
-               
-
-            </div>
-           
-
-           <div class="modal fade" id="Fileshow" role="dialog">
-				<div class="modal-dialog">
-					<!-- Modal content-->
-					<form>
-						<div class="modal-content" style="width:800px;">
-							
-							<!-- Table to show the line item of po -->
-							  <div id="content" > </div> 
-							  <table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
-								<thead style="background-color:#ffffff;">
-									<tr>								 
-										<th>SNo</th>
-										<th>BillNO</th>
-										<th>PONO</th>
-										<th>FileName</th>
-										
-																				
-									</tr>
-								</thead>								
-								<tbody id="tbleAppend1">
-																	
-								</tbody>
-  							    </table>
-							 
-							<div class="modal-footer">
-								<a class="btn btn-success" data-dismiss="modal"  value="Cancel">Cancel</a>
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);"> Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Inward Summary
+											</b></h4>
+									</li>
+								</ol>
 							</div>
+
 						</div>
-					</form>
+					</div>
 				</div>
-			</div>	
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<form method="post" action="<?php echo base_url('Report_purchase_attach'); ?>">
 
 
-  
-<!-- </div> -->
 
-			 
-		       
-			 <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" >
-                    <thead>
-                     <tr>
-				       <th style="text-align:center">PO No</th>
-					   <th style="text-align:center">IGR Created Date</th>
-					   <th style="text-align:center">Material Received Date</th>
-					   <th style="text-align:center">Supplier Name</th>
-					   <th style="text-align:center">Total &nbsp;(&#8377;)</th>
-					   <th style="text-align:center">Attachments</th>
-                      </tr>
-                    </thead>
-		            <tbody>
-				       <?php if(!empty($purchase)){
-						
-						$tot_tot = 0;
-						//print_r($purchase); return false;
-					    foreach($purchase as $rel)
-					    {	
-                            
-					   // print_r($rel);
+									<div class="row">
+										<div class="col-4">
+											<label for="client_name">
+												<?php echo 'Supplier'; ?>
+											</label>
+
+											<select class="form-control" id="client_name" name="client_name">
+												<option value="">Select Supplier</option>
+												<?php
+												foreach ($cust as $item): { ?>
+
+														<option
+															<?php if (isset($client_name) && ($client_name == $item->SupplierName)) {
+																echo 'selected';
+															} ?>
+															value="<?php echo $item->SupplierName; ?>"><?php echo $item->SupplierName;  ?></option>
 
 
-					// 	$newArray = array();
-					// foreach($multi as $array) {
-					//  foreach($array as $k=>$v) {
-					//   $newArray[$k] = $v;
-					//  }
-					// }		
-					   ?> 
-					  <tr>
-                        <td><span>
-						<a href="<?php echo base_url().'purchaseorder/CreatePOPrint?PONO='.$rel['pono'],'&ReqType='.$rel['potype']; ?>"><?php echo $rel['pono'];?></a>
-						
-						</span></td>
-                        <td style="text-align:center"><span><?php echo $rel['created_date'];?></span></td>
-						<td style="text-align:center"><span><?php echo $rel['materialrcvddate'];?></span></td>
-				        <td><span>
-						<a href="<?= base_url() ?>report/ilink_purchase?po=<?php echo $rel['pono'];?>"><?php echo $rel['supplier_name'];?> </a>
-						</span></td>
-						<td style="text-align:right">
-						<span><?php 
-						$tot_tot= $tot_tot + round($rel['total'],2);
-						echo $rel['total'];
-						?></span></td>
+												<?php }
+												endforeach; ?>
 
-						
-					<!-- 	$record->IGRNO.'-'.$record->PONO -->
+											</select>
 
-					    <td style="text-align:center"><span>
-						<?php 
-						if(!empty($rel['file'])){ ?>
-						<a target="_blank"  data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><button class="btn btn-info btn-sm splpofile" id="<?php echo $rel['igrn'].'-'.$rel['pono'];?>">Download</button></a>	
+										</div>
+										<div class="col-4">
+											<label for="to_date">
+												<?php echo 'Year'; ?>
+											</label>
+											<select class="form-control" id="financialyear" name="financialyear">
+												<option value="">Select Year</option>
+												<?php
 
-                        <?php }	elseif(!empty($rel['ifile'])){?>
-					    		
-                        		<a target="_blank"  data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><button class="btn btn-info btn-sm IGRfile" id="<?php echo $rel['igrn'].'-'.$rel['pono'];?>">Download</button></a>
-					   <?php }	elseif(!empty(sizeof($rel['Infiles'])) !=0){?>
-					    		
-                        		<a target="_blank"  data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><button class="btn btn-info btn-sm IGRfile" id="<?php echo $rel['igrn'].'-'.$rel['pono'];?>">Download</button></a>
-						                  
-					<?php	}else{
-						echo "N/A";
-					}
-						?>
-						</span></td>
-					
-					  </tr>
-			           <?php
-					    
-						}
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-								<td style="text-align:center;"><strong>Total</strong></td>
-								<td><strong>&nbsp</strong></td>
-								<td><strong>&nbsp</strong></td>
-								<td><strong>&nbsp</strong></td>
-								<td class="amount" style="text-align:right"> 
-									<strong><?php {
-														echo number_format($tot_tot,2,'.','');	
-													} 	  
-													?></strong></td>
-								<td><strong>&nbsp</strong></td>
-							</tr>	
-					</tfoot>
-					<?php
-					    }
-						
-					?>
-			      </table>
-			 
+
+												foreach ($finyear as $item): { ?>
+
+														<option value="<?php echo $item->financial_year; ?>" <?php if (isset($financialyear) && ($financialyear == $item->financial_year)) {
+																													echo 'selected';
+																												} ?>><?php echo $item->financial_year;  ?></option>
+
+
+												<?php }
+												endforeach; ?>
+											</select>
+										</div>
+										<div class="col-4">
+											<label for="month">
+												<?php echo 'Month'; ?>
+											</label>
+
+											<select class="form-control" id="month" name="month">
+												<option value="">Select Month</option>
+												<option value="January" <?php if (isset($month) && ($month == "January")) {
+																			echo 'selected';
+																		} ?>>January</option>
+												<option value="February" <?php if (isset($month) && ($month == "February")) {
+																				echo 'selected';
+																			} ?>>February</option>
+												<option value="March" <?php if (isset($month) && ($month == "March")) {
+																			echo 'selected';
+																		} ?>>March</option>
+												<option value="April" <?php if (isset($month) && ($month == "April")) {
+																			echo 'selected';
+																		} ?>>April</option>
+												<option value="May" <?php if (isset($month) && ($month == "May")) {
+																		echo 'selected';
+																	} ?>>May</option>
+												<option value="June" <?php if (isset($month) && ($month == "June")) {
+																			echo 'selected';
+																		} ?>>June</option>
+												<option value="July" <?php if (isset($month) && ($month == "July")) {
+																			echo 'selected';
+																		} ?>>July</option>
+												<option value="August" <?php if (isset($month) && ($month == "August")) {
+																			echo 'selected';
+																		} ?>>August</option>
+												<option value="September" <?php if (isset($month) && ($month == "September")) {
+																				echo 'selected';
+																			} ?>>September</option>
+												<option value="October" <?php if (isset($month) && ($month == "October")) {
+																			echo 'selected';
+																		} ?>>October</option>
+												<option value="November" <?php if (isset($month) && ($month == "November")) {
+																				echo 'selected';
+																			} ?>>November</option>
+												<option value="December" <?php if (isset($month) && ($month == "December")) {
+																				echo 'selected';
+																			} ?>>December</option>
+											</select>
+
+
+										</div>
+									</div>
+									<div class="row mt-2">
+										<div class="col-md-2 ">
+											<label for="from_date">
+												<?php echo 'From Date'; ?>
+											</label>
+											<div class="input-group">
+												<input name="from_date" id="max-date" class="form-control datepicker" autocomplete="off" value="<?php if (isset($from_date)) {
+																																					echo $from_date;
+																																				} ?>">
+
+											</div>
+										</div>
+										<div class="col-md-2">
+											<label for="to_date">
+												<?php echo 'To Date'; ?>
+											</label>
+											<div class="input-group">
+												<input name="to_date" id="min-date" class="form-control datepicker" autocomplete="off" value="<?php if (isset($to_date)) {
+																																					echo $to_date;
+																																				} ?>">
+											</div>
+
+										</div>
+										<div class="col-md-8 mt-2 text-right">
+											<input type="button" class="btn btn-danger" value="Reset" onclick="window.location.href='<?= base_url('Report_purchase_inward') ?>';">
+
+
+											<input type="submit" class="btn btn-success ml-2" name="btn_submit" value="View Report">
+										</div>
+									</div>
+
+
+								</form>
+								<div class="form-group has-feedback"></div>
+
+
+								<div class="modal fade" id="Fileshow" role="dialog">
+									<div class="modal-dialog">
+										<!-- Modal content-->
+										<form>
+											<div class="modal-content" style="width:800px;">
+
+												<!-- Table to show the line item of po -->
+												<div id="content"> </div>
+												<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
+													<thead style="background-color:#ffffff;">
+														<tr>
+															<th>SNo</th>
+															<th>BillNO</th>
+															<th>PONO</th>
+															<th>FileName</th>
+
+
+														</tr>
+													</thead>
+													<tbody id="tbleAppend1">
+
+													</tbody>
+												</table>
+
+												<div class="modal-footer">
+													<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
+												</div>
+											</div>
+										</form>
+									</div>
+								</div>
+
+								<div class="table-responsive">
+									<table class="table table-bordered table-hover" id="cc">
+										<thead>
+											<tr>
+												<th style="text-align:center">PO No</th>
+												<th style="text-align:center">IGR Created Date</th>
+												<th style="text-align:center">Material Received Date</th>
+												<th style="text-align:center">Supplier Name</th>
+												<th style="text-align:center">Total &nbsp;(&#8377;)</th>
+												<th style="text-align:center">Attachments</th>
+											</tr>
+										</thead>
+										<tbody>
+											<?php if (!empty($purchase)) {
+
+												$tot_tot = 0;
+												//print_r($purchase); return false;
+												foreach ($purchase as $rel) {
+
+													// print_r($rel);
+
+
+													// 	$newArray = array();
+													// foreach($multi as $array) {
+													//  foreach($array as $k=>$v) {
+													//   $newArray[$k] = $v;
+													//  }
+													// }		
+											?>
+													<tr>
+														<td><span>
+																<a href="<?php echo base_url() . 'purchaseorder/CreatePOPrint?PONO=' . $rel['pono'], '&ReqType=' . $rel['potype']; ?>"><?php echo $rel['pono']; ?></a>
+
+															</span></td>
+														<td style="text-align:center"><span><?php echo $rel['created_date']; ?></span></td>
+														<td style="text-align:center"><span><?php echo $rel['materialrcvddate']; ?></span></td>
+														<td><span>
+																<a href="<?= base_url() ?>report/ilink_purchase?po=<?php echo $rel['pono']; ?>"><?php echo $rel['supplier_name']; ?> </a>
+															</span></td>
+														<td style="text-align:right">
+															<span><?php
+																	$tot_tot = $tot_tot + round($rel['total'], 2);
+																	echo $rel['total'];
+																	?></span>
+														</td>
+
+
+														<!-- 	$record->IGRNO.'-'.$record->PONO -->
+
+														<td style="text-align:center"><span>
+																<?php
+																if (!empty($rel['file'])) { ?>
+																	<a target="_blank" data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><button class="btn btn-info btn-sm splpofile" id="<?php echo $rel['igrn'] . '-' . $rel['pono']; ?>">Download</button></a>
+
+																<?php } elseif (!empty($rel['ifile'])) { ?>
+
+																	<a target="_blank" data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><button class="btn btn-info btn-sm IGRfile" id="<?php echo $rel['igrn'] . '-' . $rel['pono']; ?>">Download</button></a>
+																<?php } elseif (!empty(sizeof($rel['Infiles'])) != 0) { ?>
+
+																	<a target="_blank" data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><button class="btn btn-info btn-sm IGRfile" id="<?php echo $rel['igrn'] . '-' . $rel['pono']; ?>">Download</button></a>
+
+																<?php	} else {
+																	echo "N/A";
+																}
+																?>
+															</span></td>
+
+													</tr>
+												<?php
+
+												}
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+												<td><strong>&nbsp</strong></td>
+												<td><strong>&nbsp</strong></td>
+												<td><strong>&nbsp</strong></td>
+												<td class="amount" style="text-align:right">
+													<strong><?php {
+																echo number_format($tot_tot, 2, '.', '');
+															}
+															?></strong>
+												</td>
+												<td><strong>&nbsp</strong></td>
+											</tr>
+										</tfoot>
+									<?php
+											}
+
+									?>
+									</table>
+
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-      </div>
-	  </section>
-	  </div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+
 
 
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
 	<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
+		$('.IGRfile').click(function() {
+			var id = $(this).attr('id');
+			//alert(id);
 
+			var igr = id.substring(0, 9);
+			//alert(igr);
+			var po = id.substring(10, 33);
+			//alert(po);
 
+			$("#Fileshow").modal("show");
+			$.ajax({
+				data: {
+					id: igr,
+					id1: po
+				},
+				type: "POST",
+				//dataType: 'json',
+				url: "<?php echo base_url() ?>report/Viewnormaligrfiles",
+				success: function(data) {
+					//console.log((data));
 
-<script> 
-	
+					// var trHTML = '';
+					// $.each($.parseJSON(data), function (i, item) {
+					var trHTML = '';
 
+					var trHTML = '';
+					var FilePath = '';
+					var Filename = '';
+					var PONO = '';
+					var BillNO = '';
+					$.each($.parseJSON(data), function(i, item) {
 
-$('.IGRfile').click(function() {
-var id = $(this).attr('id');
-//alert(id);
+						if (item.file == null) {
+							if (item.Remarks == null) {
+								//alert()
+								PONO = item.PONO;
+								BillNO = item.BillNo;
+								Filename = item.FilePath;
+								FilePath = "<?php echo base_url() ?>public/uploads/Igrfiles/" + item.FilePath;
+							} else {
+								Filename = "BillDetails";
+								PONO = item.PONO;
+								BillNO = item.BillNo;
+								FilePath = item.FilePath;
+							}
 
-  var igr = id.substring(0, 9);
-     //alert(igr);
-    var po = id.substring(10, 33);
- //alert(po);
- 
-$("#Fileshow").modal("show");
-    $.ajax({  
-			data:{id:igr,id1:po},
-			type:"POST",
-			//dataType: 'json',
-			url:"<?php echo base_url() ?>report/Viewnormaligrfiles",
-			success: function(data){
-             //console.log((data));
-    	
-				// var trHTML = '';
-				// $.each($.parseJSON(data), function (i, item) {
-				var trHTML = '';
+						} else {
+							Filename = item.file;
+							PONO = item.pono;
 
-				var trHTML = '';
-				var FilePath ='';
-				var Filename = '';
-				var PONO ='';
-				var BillNO ='';
-				$.each($.parseJSON(data), function (i, item) { 
-				
-					if(item.file == null)
-					{ if(item.Remarks ==null)
-						{
-							//alert()
-					    PONO =item.PONO;
-					    BillNO =item.BillNo;
-						Filename =item.FilePath;
-						FilePath = "<?php echo base_url()?>public/uploads/Igrfiles/"+item.FilePath;
-						}else{
-						Filename ="BillDetails";
-						PONO =item.PONO;
-						BillNO =item.BillNo;
-						FilePath = item.FilePath;
+							BillNO = '-';
+
+							FilePath = item.file;
 						}
 
-					}else{
-						Filename = item.file; 
-						PONO =item.pono;
 
-					    BillNO = '-';
 
-                        FilePath =item.file;
+
+
+						// i=i+1;
+						// 	trHTML += '<tr>' +
+						// 		'<td align="right">' + i + '</td>' +
+
+						// 		'<td>' + item.BillNo+ '</td>' +
+						// 		'<td>' + item.PONO+ '</td>' +
+
+						// 		 '<td><a target="_blank" href = <?php echo base_url() ?>public/uploads/Igrfiles/'+item.FilePath+'>'+ item.FilePath +'</a></td>' +
+
+						// 		 // '<td>' +item.FilePath+"<?php echo  base_url() . 'public/uploads/BillFiles/' ?>"> +'</td>'
+
+						// 				'</tr>';	
+						if (Filename != null) {
+							i = i + 1;
+							trHTML += '<tr id=' + i + '>' +
+								'<td align="right">' + i + '</td>' +
+								'<td id="billno' + i + '">' + BillNO + '</td>' +
+								'<td>' + PONO + '</td>' +
+
+								'<td  id="file' + i + '"><a target="_blank" href = ' + FilePath + '>' + Filename + '</a></td>' +
+
+								// '<td name="filepathname" id="filepathname" onclick="openbillmodel('+i+');"><i class="fa fa-pencil"></i></td>' +
+								'</tr>';
+
+						}
+
+
+
+					});
+
+					$("#tbleAppend1").empty();
+					$('#Inwardgateregistertable1 > tbody').append(trHTML);
+				}
+			});
+
+		});
+
+		// Bootstrap datepicker
+		// Set up your table
+		$(document).ready(function() {
+
+			$('.splpofile').click(function() {
+				var id = $(this).attr('id');
+				$("#Fileshow").modal("show");
+				$.ajax({
+					data: {
+						id: id
+					},
+					type: "POST",
+					//dataType: 'json',
+					url: "<?php echo base_url() ?>report/Viewfiles",
+					success: function(data) {
+						//console.log((data));
+
+						var trHTML = '';
+						$.each($.parseJSON(data), function(i, item) {
+
+
+
+
+
+							i = i + 1;
+							trHTML += '<tr>' +
+								'<td align="right">' + i + '</td>' +
+
+								'<td>' + item.BillNo + '</td>' +
+								'<td>' + item.PONO + '</td>' +
+
+								'<td><a target="_blank" href = <?php echo base_url() ?>public/uploads/BillFiles/' + item.FilePath + '>' + item.FilePath + '</a></td>' +
+
+								// '<td>' +item.FilePath+"<?php echo  base_url() . 'public/uploads/BillFiles/' ?>"> +'</td>'
+
+								'</tr>';
+
+
+
+						});
+
+						$("#tbleAppend1").empty();
+						$('#Inwardgateregistertable1 > tbody').append(trHTML);
 					}
+				});
 
-										
-					
-				
-			 
-								// i=i+1;
-								// 	trHTML += '<tr>' +
-								// 		'<td align="right">' + i + '</td>' +
-										
-								// 		'<td>' + item.BillNo+ '</td>' +
-								// 		'<td>' + item.PONO+ '</td>' +
+			});
 
-								// 		 '<td><a target="_blank" href = <?php echo base_url()?>public/uploads/Igrfiles/'+item.FilePath+'>'+ item.FilePath +'</a></td>' +
 
-								// 		 // '<td>' +item.FilePath+"<?php echo  base_url().'public/uploads/BillFiles/'?>"> +'</td>'
-										
-								// 				'</tr>';	
-										if(Filename != null)
-						{			
-					    i=i+1;
-						trHTML += '<tr id='+i+'>' +
-						'<td align="right">' + i + '</td>' +
-						'<td id="billno'+i+'">' + BillNO+ '</td>' +
-						'<td>' + PONO+ '</td>' +
 
-                        '<td  id="file'+i+'"><a target="_blank" href = '+FilePath+'>'+ Filename +'</a></td>' +
 
-                        // '<td name="filepathname" id="filepathname" onclick="openbillmodel('+i+');"><i class="fa fa-pencil"></i></td>' +
-                        '</tr>';
-									
-		       }	
-								
-			 
-		
+
+			$.fn.dataTable.moment('DD-MM-YYYY');
+			table = $('#cc').DataTable({
+				"language": {
+					"emptyTable": "<center> Data Not Found ! </center>"
+				},
+				"aaSorting": [
+					[2, "desc"]
+				],
+				"autoWidth": false,
+				orderCellsTop: true,
+
+				"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: 'Report Attachment-Inward',
+						title: $('h3').text(),
+						exportOptions: {
+							columns: ':visible'
+
+						}
+					},
+
+					'colvis'
+				],
+				"footerCallback": function(row, data, start, end, display) {
+					var api = this.api(),
+						data;
+
+					// 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;
+					};
+
+					FinalTotal = api
+						.column(4, {
+							search: 'applied'
+						})
+						.data()
+						.reduce(function(a, b) {
+							return intVal(a) + intVal(b);
+						}, 0);
+
+					$(api.column(4).footer()).html(FinalTotal.toFixed(2).bold());
+
+
+				}
+
+			});
 		});
-						
-							$("#tbleAppend1").empty();
-							$('#Inwardgateregistertable1 > tbody').append(trHTML);
-} 
- 			});
-
-});
-
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-
-$('.splpofile').click(function() {
-var id = $(this).attr('id');
-$("#Fileshow").modal("show");
-    $.ajax({  
-			data:{id:id},
-			type:"POST",
-			//dataType: 'json',
-			url:"<?php echo base_url() ?>report/Viewfiles",
-			success: function(data){
-             //console.log((data));
-    	
-				var trHTML = '';
-				$.each($.parseJSON(data), function (i, item) {
-				
-										
-					
-				
-			 
-								i=i+1;
-									trHTML += '<tr>' +
-										'<td align="right">' + i + '</td>' +
-										
-										'<td>' + item.BillNo+ '</td>' +
-										'<td>' + item.PONO+ '</td>' +
-
-										 '<td><a target="_blank" href = <?php echo base_url()?>public/uploads/BillFiles/'+item.FilePath+'>'+ item.FilePath +'</a></td>' +
-
-										 // '<td>' +item.FilePath+"<?php echo  base_url().'public/uploads/BillFiles/'?>"> +'</td>'
-										
-												'</tr>';	
-									
-			 
-		
-		});
-						
-							$("#tbleAppend1").empty();
-							$('#Inwardgateregistertable1 > tbody').append(trHTML);
-} 
- 			});
-
-});
 
 
-
-
-	
-$.fn.dataTable.moment( 'DD-MM-YYYY' );
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":"<center> Data Not Found ! </center>"
-        },
-        "aaSorting": [[ 2, "desc" ]],
-        "autoWidth": false,
-        orderCellsTop: true,
-
-        "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: 'Report Attachment-Inward',
-				title: $('h3').text(),
-                exportOptions: {
-                    columns: ':visible'
-					
-                }
-            },
-            
-            'colvis'
-        ],
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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;
-            };
-
-			FinalTotal = api
-                 .column( 4, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 4 ).footer() ).html( FinalTotal.toFixed(2).bold() );
-			 
-			
-        }
-
-    } );
-} );
- 
-	
-	$( function() {
-		//var dateFormat = "mm/dd/yy",
-			from = $( "#min-date" )
+		$(function() {
+			//var dateFormat = "mm/dd/yy",
+			from = $("#min-date")
 				.datepicker({
-					dateFormat: "dd-mm-yy", 
+					dateFormat: "dd-mm-yy",
 					defaultDate: "+0d",
 					changeMonth: true,
 					//numberOfMonths: 1
-					
+
 				})
-				.on( "change", function() {
-					to.datepicker("option", "minDate", getDate( this ) );
+				.on("change", function() {
+					to.datepicker("option", "minDate", getDate(this));
 				}),
-			to = $( "#max-date" ).datepicker({
-				dateFormat: "dd-mm-yy", 
-				defaultDate: "+0d",
-				changeMonth: true,
-				//numberOfMonths: 1
-				
-			})
-			.on( "change", function() {
-				from.datepicker( "option", "maxDate", getDate( this ) );
-			});
+				to = $("#max-date").datepicker({
+					dateFormat: "dd-mm-yy",
+					defaultDate: "+0d",
+					changeMonth: true,
+					//numberOfMonths: 1
 
-		function getDate( element ) {
-			var date;
-			 
-			try {
-				date = $.datepicker.parseDate( dateFormat, element.value );
-				 
-			} catch( error ) {
-				date = null;
+				})
+				.on("change", function() {
+					from.datepicker("option", "maxDate", getDate(this));
+				});
+
+			function getDate(element) {
+				var date;
+
+				try {
+					date = $.datepicker.parseDate(dateFormat, element.value);
+
+				} catch (error) {
+					date = null;
+				}
+
+				return date;
 			}
+		});
+
+		function Reset() {
+			$('#mySelect').val('');
 
-			return date;
 		}
-	} );
+		$(document).ready(function() {
+			$('[data-toggle="tooltip"]').tooltip();
+		});
 
-   function Reset()
-{
-	 $('#mySelect').val('');
-	
-}
-$(document).ready(function(){
-    $('[data-toggle="tooltip"]').tooltip();   
-});
-	
-	</script>	
\ 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+						previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+					},
+					emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
+				}
+			});
+		});
+	</script>
\ No newline at end of file
diff --git a/app/Views/Report_consolidate.php b/app/Views/Report_consolidate.php
index 8a58eeeb..01027b2f 100755
--- a/app/Views/Report_consolidate.php
+++ b/app/Views/Report_consolidate.php
@@ -71,8 +71,8 @@
 
 							<form method="post" action="<?php echo base_url('Report_consolidate'); ?>">
 
-									<div class="form-group has-feedback">
-									<div class="col-md-4">
+									<div class="row has-feedback">
+									<div class="col-3">
 										<label for="client_name">
 											<?php echo 'Supplier'; ?>
 										</label>
@@ -84,7 +84,12 @@
 													
 													{?>
 													
-													<option value="<?php echo $item->SupplierName;?>"><?php echo $item->SupplierName ;  ?></option>
+													<option 
+													
+													<?php echo isset($cname) && ($cname == $item->SupplierName) ? "selected" : "" ;
+													 ?>
+
+													value="<?php echo $item->SupplierName;?>"><?php echo $item->SupplierName ;  ?></option>
 													
 															
 													<?php } endforeach; ?>
@@ -94,7 +99,7 @@
 									</div>  
 
 
-									<div class="col-md-2">
+									<div class="col-3">
 										<label for="to_date">
 											<?php echo 'year'; ?>
 										</label>
@@ -104,28 +109,42 @@
 											<?php 
 											
 											
-											foreach($finyear as $item):
+											foreach($finyear as $item)
 													
 													{?>
 													
-													<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
+												<option 
+													
+													<?php echo (isset($ab) && $ab == ($item->financial_year) )? "selected" : "" ?>
+
+													value="<?php echo $item->financial_year;?>"
+													
+													>
+													
+													<?php echo $item->financial_year ;  ?>
+													
+												</option>
 													
 															
-													<?php } endforeach; ?>
+													<?php } ?>
 											
 											</select>
 										</div>
 										</div>
 
-									<div class="col-md-2">
-									<br>
+									<div class="col-3 ">
+									    <label for="">Select Value/Quantity </label>
+										<br>
+										<br>
 										<label><input type="radio" name="colorRadio" id="value" onclick="toggleTables('2')" value="tab"> Value</label>
+										&nbsp;
 										<label><input type="radio" name="colorRadio" id="qty" onclick="toggleTables('1')" value="ta" checked> Quantity</label>
 									
 										</div>
 
 
-									<div class="col-md-2 "><br>
+									<div class="col-3 text-right"><br>
+										<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Report_consolidate') ?>';">
 										<input type="submit" class="btn btn-success" name="btn_submit"
 											   value="View Report">
 
@@ -417,6 +436,13 @@
 	$(document).ready(function() {
     // Initialize the DataTable with only pagination enabled
     var table = $('#cc').DataTable({
+		dom: 'Blfrtip',
+            buttons: [
+                {
+					extend: 'excel',
+					text: 'Excel',
+				}
+            ],
         paging: true, // Enable pagination
         searching: true, // Disable search
         ordering: false, // Disable column sorting
diff --git a/app/Views/Report_consolidate_inward.php b/app/Views/Report_consolidate_inward.php
index d50aed65..61bb1751 100755
--- a/app/Views/Report_consolidate_inward.php
+++ b/app/Views/Report_consolidate_inward.php
@@ -1,737 +1,708 @@
-
-
+<!-- Report_consolidate_inward -->
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
 <script>
- $(document).ready(function () {
-	 
-	  $("#client_name").select2();
-	 
-	  
-                
-            }); 
+	$(document).ready(function() {
+		$("#client_name").select2();
+	});
+</script>
+<?php
+$vapr = 0;
+$vmay = 0;
+$vjun = 0;
+$vjul = 0;
+$vaug = 0;
+$vsep = 0;
+$voct = 0;
+$vnov = 0;
+$vdec = 0;
+$vjan = 0;
+$vfeb = 0;
+$vmar = 0;
+$vtot = 0;
+
+$qapr = 0;
+$qmay = 0;
+$qjun = 0;
+$qjul = 0;
+$qaug = 0;
+$qsep = 0;
+$qoct = 0;
+$qnov = 0;
+$qdec = 0;
+$qjan = 0;
+$qfeb = 0;
+$qmar = 0;
+$qtot = 0; ?>
+<style>
+	table {
+		width: auto;
+	}
+</style>
+
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Consolidate </b></h4>
+									</li>
+								</ol>
+							</div>
+
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<div class="card-body">
+
+								<form method="post" action="<?php echo base_url("Report_consolidate_inward"); ?>">
+									<div class="form-group">
+
+										<div class="row">
+											<div class="col-3">
+												<label for="client_name">
+													<?php echo 'Supplier'; ?>
+												</label>
+
+												<select class="form-control" id="client_name" name="client_name">
+													<option value="">Select Supplier</option>
+													<?php
+													foreach ($cust as $item): { ?>
+
+															<option
+																<?php if (isset($client_name) && ($client_name == $item->SupplierName)) {
+																	echo 'selected';
+																} ?>
+																value="<?php echo $item->SupplierName; ?>"><?php echo $item->SupplierName;  ?></option>
+
+
+													<?php }
+													endforeach; ?>
+
+												</select>
+
+											</div>
+											<div class="col-3">
+												<label for="financialyear">
+													<?php echo 'Year'; ?>
+												</label>
+												<select class="form-control" id="financialyear" name="financialyear">
+													<option value="">Select Year</option>
+													<?php
+
+
+													foreach ($finyear as $item): { ?>
+
+															<option value="<?php echo $item->financial_year; ?>" <?php if (isset($financialyear) && ($financialyear == $item->financial_year)) {
+																														echo 'selected';
+																													} ?>><?php echo $item->financial_year;  ?></option>
+
+
+													<?php }
+													endforeach; ?>
+												</select>
+											</div>
+
+											<div class="col-3">
+												<br>
+												<label class="mr-2"><input type="radio" class="mt-2" name="colorRadio" id="value" onclick="toggleTables('2')" value="tab"> Value</label>
+												<label><input type="radio" class="mt-2" name="colorRadio" id="qty" onclick="toggleTables('1')" value="ta" checked> Quantity</label>
+											</div>
+
+
+
+											<div class="col-3 text-right">
+												<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Report_consolidate_inward') ?>';">
+
+
+												<input type="submit" class="btn btn-success m-2" name="btn_submit" value="View Report">
+											</div>
+
+										</div>
+									</div>
+									<div class="form-group has-feedback">
+
+									</div>
+
+
+								</form>
+
+								<div id="a" style="display:block">
+
+									<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+										<thead>
+											<tr>
+												<th style="text-align:center;">Supplier Name</th>
+												<th style="white-space: wrap;">Material Name</th>
+												<th style="text-align:center;">Apr</th>
+												<th style="text-align:center;">May</th>
+												<th style="text-align:center;">Jun</th>
+												<th style="text-align:center;">Jul</th>
+												<th style="text-align:center;">Aug</th>
+												<th style="text-align:center;">Sep</th>
+												<th style="text-align:center;">Oct</th>
+												<th style="text-align:center;">Nov</th>
+												<th style="text-align:center;">Dec</th>
+												<th style="text-align:center;">Jan</th>
+												<th style="text-align: center;">Feb</th>
+												<th style="text-align: center;">Mar</th>
+												<th style="text-align: center;">Total</th>
+
+											</tr>
+										</thead>
+										<tbody>
+
+											<?php
+											if (!empty($spurchse)) {
+												$qapr = 0;
+												$qmay = 0;
+												$qjun = 0;
+												$qjul = 0;
+												$qaug = 0;
+												$qsep = 0;
+												$qoct = 0;
+												$qnov = 0;
+												$qdec = 0;
+												$qjan = 0;
+												$qfeb = 0;
+												$qmar = 0;
+												$qtot = 0;
+												$ab = $financialyear;
+												foreach ($spurchse as $index => $result) { ?>
+													<tr>
+														<td style="text-align:left;">
+															<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&ab=<?php echo $ab; ?>"><?php echo $result->supplier_name; ?> </a>
+														</td>
+														<td style="text-align:left;"><?php
+																						if (!empty($result->material_name)) {
+																							echo $result->material_name;
+																						} else {
+																							echo "-";
+																						}
+																						?></td>
+														<td style="text-align:right;"><span id="april_qty<?php echo $index ?>"><?php
+																																$qapr = $qapr + round($result->April);
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'April'; ?>"><?php echo round($result->April); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="may_qty<?php echo $index ?>"><?php
+																																$qmay = $qmay + round($result->May);
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'May'; ?>"><?php echo round($result->May); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="june_qty<?php echo $index ?>"><?php
+																																$qjun = $qjun + round($result->June);
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'June'; ?>"><?php echo round($result->June); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="july_qty<?php echo $index ?>"><?php
+																																$qjul = $qjul + round($result->July);
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'July'; ?>"><?php echo round($result->July); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="aug_qty<?php echo $index ?>"><?php
+																																$qaug = $qaug + round($result->August);
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'August'; ?>"><?php echo round($result->August); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="sep_qty<?php echo $index ?>"><?php
+																																$qsep = $qsep + round($result->September);
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'September'; ?>"><?php echo round($result->September); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="oct_qty<?php echo $index ?>"><?php
+																																$qoct = $qoct + round($result->October);
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'October'; ?>"><?php echo round($result->October); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="nov_qty<?php echo $index ?>"><?php
+																																$qnov = $qnov + round($result->November);
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'November'; ?>"><?php echo round($result->November); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="dec_qty<?php echo $index ?>"><?php
+																																$qdec = $qdec + round($result->December);
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'December'; ?>"><?php echo round($result->December); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="jan_qty<?php echo $index ?>"><?php
+																																$qjan = $qjan + round($result->January);
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'January'; ?>"><?php echo round($result->January); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="feb_qty<?php echo $index ?>"><?php
+																																$qfeb = $qfeb + round($result->February);
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'February'; ?>"><?php echo round($result->February); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="mar_qty<?php echo $index ?>"><?php
+																																$qmar = $qmar + round($result->March);
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'March'; ?>"><?php echo round($result->March); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="tot_qty<?php echo $index ?>"><?php
+																																$qtot = $qtot + round($result->qtotal);
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_year?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>"><?php echo round($result->qtotal); ?> </a></span>
+														</td>
+													</tr>
+
+												<?php
+
+												}
+
+
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+												<td style="text-align:right;"><strong><?php {
+																							echo '';
+																						}
+																						?>
+													</strong></td>
+												<td style="text-align:right;"><strong><?php {
+																							echo $qapr;
+																						}
+																						?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo $qmay;
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo $qjun;
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo $qjul;
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo $qaug;
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo $qsep;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo  $qoct;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo $qnov;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo $qdec;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo $qjan;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo $qfeb;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo $qmar;
+														}
+
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo $qtot;
+														}
+
+														?>
+													</strong>
+												</td>
+
+
+
+											</tr>
+
+										</tfoot>
+									<?php
+
+											}
+
+
+									?>
+									</table>
+
+								</div>
+								<div id="b" style="display:none">
+
+
+									<table class="table table-bordered table-hover" style="font-size:14px!important;" id="cd">
+										<thead>
+											<tr>
+												<th style="text-align:center;">Supplier Name</th>
+												<th style="text-align:center;">Material Name</th>
+												<th style="text-align:center;">Apr &nbsp;(&#8377;)</th>
+												<th style="text-align:center;">May &nbsp;(&#8377;)</th>
+												<th style="text-align:center;">Jun &nbsp;(&#8377;)</th>
+												<th style="text-align:center;">Jul &nbsp;(&#8377;)</th>
+												<th style="text-align:center;">Aug &nbsp;(&#8377;)</th>
+												<th style="text-align:center;">Sep &nbsp;(&#8377;)</th>
+												<th style="text-align:center;">Oct &nbsp;(&#8377;)</th>
+												<th style="text-align:center;">Nov &nbsp;(&#8377;)</th>
+												<th style="text-align:center;">Dec &nbsp;(&#8377;)</th>
+												<th style="text-align:center;">Jan &nbsp;(&#8377;)</th>
+												<th style="text-align:center;">Feb &nbsp;(&#8377;)</th>
+												<th style="text-align:center;">Mar &nbsp;(&#8377;)</th>
+												<th style="text-align:center;">Total &nbsp;(&#8377;)</th>
+
+											</tr>
+										</thead>
+										<tbody>
+
+											<?php
+											if (!empty($spurchse)) {
+												$vapr = 0;
+												$vmay = 0;
+												$vjun = 0;
+												$vjul = 0;
+												$vaug = 0;
+												$vsep = 0;
+												$voct = 0;
+												$vnov = 0;
+												$vdec = 0;
+												$vjan = 0;
+												$vfeb = 0;
+												$vmar = 0;
+												$vtot = 0;
+												foreach ($spurchse as $index => $result) { ?>
+													<tr>
+														<td style="text-align:left;">
+															<a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>"><?php echo $result->supplier_name; ?> </a>
+														</td>
+														<td style="text-align:left;"><?php
+																						if (!empty($result->material_name)) {
+																							echo $result->material_name;
+																						} else {
+																							echo "-";
+																						}
+																						?></td>
+														<td style="text-align:right;"><span id="aprilval<?php echo $index ?>"><?php
+																																$vapr = $vapr + number_format($result->vApril, 2, '.', '');
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'April'; ?>"><?php echo number_format($result->vApril, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="mayval<?php echo $index ?>"><?php
+																															$vmay = $vmay + number_format($result->vMay, 2, '.', '');
+																															?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'May'; ?>"><?php echo number_format($result->vMay, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="juneval<?php echo $index ?>"><?php
+																																$vjun = $vjun + number_format($result->vJune, 2, '.', '');
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'June'; ?>"><?php echo number_format($result->vJune, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="julyval<?php echo $index ?>"><?php
+																																$vjul = $vjul + number_format($result->vJuly, 2, '.', '');
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'July'; ?>"><?php echo number_format($result->vJuly, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="augval<?php echo $index ?>"><?php
+																															$vaug = $vaug + number_format($result->vAugust, 2, '.', '');
+																															?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'August'; ?>"><?php echo number_format($result->vAugust, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="sepval<?php echo $index ?>"><?php
+																															$vsep = $vsep + number_format($result->vSeptember, 2, '.', '');
+																															?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'September'; ?>"><?php echo number_format($result->vSeptember, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="octval<?php echo $index ?>"><?php
+																															$voct = $voct + number_format($result->vOctober, 2, '.', '');
+																															?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'October'; ?>"><?php echo number_format($result->vOctober, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="novval<?php echo $index ?>"><?php
+																															$vnov = $vnov + number_format($result->vNovember, 2, '.', '');
+																															?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'November'; ?>"><?php echo number_format($result->vNovember, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="decval<?php echo $index ?>"><?php
+																															$vdec = $vdec + number_format($result->vDecember, 2, '.', '');
+																															?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'December'; ?>"><?php echo number_format($result->vDecember, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="janval<?php echo $index ?>"><?php
+																															$vjan = $vjan + number_format($result->vJanuary, 2, '.', '');
+																															?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'January'; ?>"><?php echo number_format($result->vJanuary, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="febval<?php echo $index ?>"><?php
+																															$vfeb = $vfeb + number_format($result->vFebruary, 2, '.', '');
+																															?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'February'; ?>"><?php echo number_format($result->vFebruary, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="marval<?php echo $index ?>"><?php
+																															$vmar = $vmar + number_format($result->vMarch, 2, '.', '');
+																															?>
+																<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>&m=<?php echo 'March'; ?>"><?php echo number_format($result->vMarch, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="totalval<?php echo $index ?>"><?php
+																																$vtot = $vtot + number_format($result->vtotal, 2, '.', '');
+																																?>
+																<a href="<?= base_url() ?>report/i_consolidate_year?ab=<?php echo $ab; ?>&sid=<?php echo $result->sid; ?>&mid=<?php echo $result->mid; ?>"><?php echo number_format($result->vtotal, 2, '.', ''); ?> </a></span>
+														</td>
+													</tr>
+
+												<?php
+
+												}
+
+
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+												<td><strong><?php {
+																echo '';
+															}
+															?>
+													</strong></td>
+												<td style="text-align:right;"><strong><?php {
+																							echo number_format($vapr, 2, '.', '');
+																						}
+																						?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo number_format($vmay, 2, '.', '');
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo number_format($vjun, 2, '.', '');
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo number_format($vjul, 2, '.', '');
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo number_format($vaug, 2, '.', '');
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo number_format($vsep, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo  number_format($voct, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo number_format($vnov, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo number_format($vdec, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo number_format($vjan, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo number_format($vfeb, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo number_format($vmar, 2, '.', '');
+														}
+
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo number_format($vtot, 2, '.', '');
+														}
+
+														?>
+													</strong>
+												</td>
+
+
+
+											</tr>
+
+										</tfoot>
+									<?php
+
+											}
+
+
+									?>
+									</table>
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
+				</div>
+			</div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+</div>
+
+
+<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
+    // 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+                previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+            }
+        }
+    });
+	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: '<i class="fas fa-angle-right"></i>', // Next button icon
+                previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+            }
+        }
+    });
+});
 </script>
 
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
-
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}	
-
-		  th{ white-space: nowrap; }
-		   td{ white-space: wrap; }
-		   .dataTable > thead > tr > th[class*="sort"]:after{
-    content: "" !important;
-}
-
-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;
-}
-			   
-	 </style>
-	  <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Consolidate-Inward</b><br><br>
-			  <?php
-			  if($this->input->post('client_name')){
-				  $cl=$this->input->post('client_name');
-				  echo $cl;
-			  }
-			  if($this->input->post('financialyear')){
-				  $ab=$this->input->post('financialyear'); 
-				  echo '('.$ab.')';
-			  }
-		   
-			  ?></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		     <div class="panel-body">
-
-                    <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
-
-                        <div class="form-group has-feedback">
-						<div class="col-md-4">
-						    <label for="client_name">
-                                <?php echo 'Supplier'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="client_name" name="client_name">
-								 <option value="">Select Supplier</option>
-								 <?php 
-								foreach($cust as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->SupplierName;?>"><?php echo $item->SupplierName ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                        </div>  
-						
-						
-                       <div class="col-md-2">
-							 <label for="to_date">
-                                <?php echo 'year'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="financialyear" name="financialyear">
-								 <option value="">Select Year</option>
-								 <?php 
-								 
-								
-								  foreach($finyear as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                            </div>
-					
-                        <div class="col-md-2">
-						<br>
-							 <label><input type="radio" name="colorRadio" id="value" onclick="toggleTables('2')" value="tab"> Value</label>
-                             <label><input type="radio" name="colorRadio" id="qty" onclick="toggleTables('1')" value="ta" checked> Quantity</label>
-                           
-                            </div>
-             
-                     
-						<div class="col-md-2 "><br>
-                        <input type="submit" class="btn btn-success" name="btn_submit"
-                               value="View Report">
-                        
-							</div>  
-							</div>  
-                    </form>
-
-               
-
-            </div>
-           	
-			  <div class="box-body" style="display:block" id="a">
-	 
-	           <table class="table table-bordered table-hover" id="tab" style="font-size:14px;">
-                        <thead>
-                        <tr>
-							 <th style="text-align:center;">Supplier Name</th>
-							 <th style="white-space: wrap;">Material Name</th>
-							<th style="text-align:center;">Apr</th>
-                            <th style="text-align:center;">May</th>
-                            <th style="text-align:center;">Jun</th>
-							<th style="text-align:center;">Jul</th>
-							<th style="text-align:center;">Aug</th>
-							 <th style="text-align:center;">Sep</th>
-							 <th style="text-align:center;">Oct</th>
-							 <th style="text-align:center;">Nov</th>
-							 <th style="text-align:center;">Dec</th> 
-							 <th style="text-align:center;">Jan</th>
-							 <th style="text-align: center;">Feb</th>
-							 <th style="text-align: center;">Mar</th>
-							 <th style="text-align: center;">Total</th>
-                             
-                        </tr>
-                        </thead>
-                        <tbody>
-
-                        <?php
-                       if(!empty($spurchse)){						
-						$qapr = 0;
-						$qmay = 0;
-						$qjun = 0;
-						$qjul = 0;
-						$qaug = 0;
-						$qsep = 0;
-						$qoct = 0;
-						$qnov = 0;
-						$qdec = 0;
-						$qjan = 0;
-						$qfeb = 0;
-						$qmar = 0;
-						$qtot = 0;
-						$ab=$this->input->post('financialyear');
-						foreach ($spurchse as $index=>$result) { ?>
-						<tr>
-						    <td style="text-align:left;">
-							<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&ab=<?php echo $ab;?>"><?php echo $result->supplier_name;?> </a>
-							</td>
-							 <td style="text-align:left;"><?php 
-							if(!empty($result->material_name)) { echo $result->material_name ; } else {echo "-";}
-							?></td>
-							<td style="text-align:right;"><span id="april_qty<?php echo $index?>"><?php 
-							$qapr= $qapr + round($result->April);
-							?>
-							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'April';?>"><?php echo round($result->April);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="may_qty<?php echo $index?>"><?php 
-							$qmay= $qmay + round($result->May);
-							?>
-							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'May';?>"><?php echo round($result->May);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="june_qty<?php echo $index?>"><?php 
-							$qjun= $qjun + round($result->June);
-							?>
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'June';?>"><?php echo round($result->June);?> </a></span>
-							 </td>
-							<td style="text-align:right;"><span id="july_qty<?php echo $index?>"><?php 
-							$qjul= $qjul + round($result->July);
-							?>
-							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'July';?>"><?php echo round($result->July);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="aug_qty<?php echo $index?>"><?php 
-							$qaug= $qaug + round($result->August);
-							?>
-							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'August';?>"><?php echo round($result->August);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="sep_qty<?php echo $index?>"><?php 
-							$qsep= $qsep + round($result->September);
-							?>
-							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'September';?>"><?php echo round($result->September);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="oct_qty<?php echo $index?>"><?php 
-							$qoct= $qoct + round($result->October);
-							 ?>
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'October';?>"><?php echo round($result->October);?> </a></span>
-							 </td>
-							<td style="text-align:right;"><span id="nov_qty<?php echo $index?>"><?php 
-							$qnov= $qnov + round($result->November);
-							 ?>
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'November';?>"><?php echo round($result->November);?> </a></span>
-							 </td>
-							<td style="text-align:right;"><span id="dec_qty<?php echo $index?>"><?php 
-							$qdec= $qdec + round($result->December);
-							?>
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'December';?>"><?php echo round($result->December);?> </a></span>
-							 </td>
-							<td style="text-align:right;"><span id="jan_qty<?php echo $index?>"><?php 
-							$qjan= $qjan + round($result->January);
-							?>
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'January';?>"><?php echo round($result->January);?> </a></span>
-							 </td>
-							<td style="text-align:right;"><span id="feb_qty<?php echo $index?>"><?php 
-							$qfeb= $qfeb + round($result->February);
-							?>
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'February';?>"><?php echo round($result->February);?> </a></span>
-							 </td>
-							<td style="text-align:right;"><span id="mar_qty<?php echo $index?>"><?php 
-							$qmar= $qmar + round($result->March);
-							?>
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'March';?>"><?php echo round($result->March);?> </a></span>
-							 </td>
-							 <td style="text-align:right;"><span id="tot_qty<?php echo $index?>"><?php 
-							$qtot= $qtot + round($result->qtotal);
-							?>
-							 <a href="<?= base_url() ?>report/i_consolidate_year?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo round($result->qtotal);?> </a></span>
-							 </td>
-						</tr>
-						
-					<?php
-					
-					} 
-					
-					
-					?>
-                        </tbody>
-						<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						<td style="text-align:right;"><strong><?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-							</strong></td>
-						   <td style="text-align:right;"><strong><?php 
-								 {
-								 echo $qapr;
-								
-								  } 
-								 ?>  
-							</strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo $qmay;
-								
-								  } 
-								 ?>  
-						    </strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo $qjun;
-								
-								  } 
-								 ?>  
-						   </strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo $qjul;
-								
-								  } 
-								 ?>  
-						   </strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo $qaug;
-								
-								  } 
-								 ?>  
-						   </strong></td>
-							<td style="text-align:right;"><strong>
-								 <?php 
-								 {
-								 echo $qsep;
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								<td style="text-align:right;"><strong>
-								 <?php 
-								 {
-								 echo  $qoct;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>	
-								<td style="text-align:right;">
-								<strong>
-								<?php 
-								 {
-								 echo $qnov;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right;">
-									<strong>
-									<?php 
-									 {
-									 echo $qdec;
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										<td style="text-align:right;">
-										<strong>
-										<?php 
-										 {
-										 echo $qjan;
-										
-										  } 
-										 ?> 
-										</strong>
-										</td>
-											<td style="text-align:right;">
-											<strong>
-											<?php 
-											 {
-											 echo $qfeb;
-											
-											  } 
-											 ?> 
-											</strong>
-											</td>
-												<td style="text-align:right;"> 
-												<strong>
-												<?php 
-												 {
-												 echo $qmar;
-												
-												  } 
-												  
-												 ?>  
-												 </strong></td>
-												 <td style="text-align:right;"> 
-												<strong>
-												<?php 
-												 {
-												 echo $qtot;
-												
-												  } 
-												  
-												 ?>  
-												 </strong></td>
-											
-												
-												
-						</tr>
-						
-						</tfoot>
-						<?php
-					
-					} 
-					
-					
-					?>
-                    </table>
-               
-                </div>
-	<div class="box-body" id="b" style="display:none">
-	 
-	 		
-                    <table class="table table-bordered table-hover"  style="font-size:13px!important;" id="ta">
-                        <thead>
-                        <tr>
-							 <th style="text-align:center;">Supplier Name</th>
-							 <th style="text-align:center;">Material Name</th>
-							<th style="text-align:center;">Apr &nbsp;(<i class="fa fa-rupee "  ></i>)</th>
-                            <th style="text-align:center;">May &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-                            <th style="text-align:center;">Jun &nbsp;(<i class="fa fa-rupee "></i>)</th>
-							<th style="text-align:center;">Jul &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							<th style="text-align:center;">Aug &nbsp;(<i class="fa fa-rupee "></i>)</th>
-							 <th style="text-align:center;">Sep &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align:center;">Oct &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align:center;">Nov &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align:center;">Dec &nbsp;(<i class="fa fa-rupee " ></i>)</th> 
-							 <th style="text-align:center;">Jan &nbsp;(<i class="fa fa-rupee "  ></i>)</th>
-							 <th style="text-align: center;">Feb &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align: center;">Mar &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align: center;">Total &nbsp;(<i class="fa fa-rupee "  ></i>)</th>
-                             
-                        </tr>
-                        </thead>
-                        <tbody>
-
-                        <?php 
-						if(!empty($spurchse)){			
-						$vapr = 0;
-						$vmay = 0;
-						$vjun = 0;
-						$vjul = 0;
-						$vaug = 0;
-						$vsep = 0;
-						$voct = 0;
-						$vnov = 0;
-						$vdec = 0;
-						$vjan = 0;
-						$vfeb = 0;
-						$vmar = 0;
-						$vtot = 0;
-						foreach ($spurchse as $index=>$result) { ?>
-						<tr>
-						    <td style="text-align:left;">
-							<a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo $result->supplier_name;?> </a>
-							</td>
-							 <td style="text-align:left;"><?php 
-							if(!empty($result->material_name)) { echo $result->material_name ; } else {echo "-";}
-							?></td>
-							<td style="text-align:right;"><span id="aprilval<?php echo $index?>"><?php 
-							$vapr= $vapr + number_format($result->vApril,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'April';?>"><?php echo number_format($result->vApril,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="mayval<?php echo $index?>"><?php 
-							$vmay= $vmay + number_format($result->vMay,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'May';?>"><?php echo number_format($result->vMay,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id ="juneval<?php echo $index?>"><?php 
-							$vjun= $vjun + number_format($result->vJune,2,'.','');
-							?>
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'June';?>"><?php echo number_format($result->vJune,2,'.','');?> </a></span>
-							 </td>
-							<td style="text-align:right;"><span id="julyval<?php echo $index?>"><?php 
-							$vjul= $vjul + number_format($result->vJuly,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'July';?>"><?php echo number_format($result->vJuly,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="augval<?php echo $index?>"><?php 
-							$vaug= $vaug + number_format($result->vAugust,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'August';?>"><?php echo number_format($result->vAugust,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="sepval<?php echo $index?>"><?php 
-							$vsep= $vsep + number_format($result->vSeptember,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'September';?>"><?php echo number_format($result->vSeptember,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="octval<?php echo $index?>"><?php 
-							$voct= $voct + number_format($result->vOctober,2,'.','');
-							 ?>
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'October';?>"><?php echo number_format($result->vOctober,2,'.','');?> </a></span>
-							 </td>
-							<td style="text-align:right;"><span id="novval<?php echo $index?>"><?php 
-							$vnov= $vnov + number_format($result->vNovember,2,'.','');
-							 ?>
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'November';?>"><?php echo number_format($result->vNovember,2,'.','');?> </a></span>
-							 </td>
-							<td style="text-align:right;"><span id="decval<?php echo $index?>"><?php 
-							$vdec= $vdec + number_format($result->vDecember,2,'.','');
-							?>
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'December';?>"><?php echo number_format($result->vDecember,2,'.','');?> </a></span>
-							 </td>
-							<td style="text-align:right;"><span id="janval<?php echo $index?>"><?php
-							$vjan= $vjan + number_format($result->vJanuary,2,'.','');
-							?>
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'January';?>"><?php echo number_format($result->vJanuary,2,'.','');?> </a></span>
-							 </td>
-							<td style="text-align:right;"><span id="febval<?php echo $index?>"><?php 
-							$vfeb= $vfeb + number_format($result->vFebruary,2,'.','');
-							?>
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'February';?>"><?php echo number_format($result->vFebruary,2,'.','');?> </a></span>
-							 </td>
-							<td style="text-align:right;"><span id="marval<?php echo $index?>"><?php 
-							$vmar= $vmar + number_format($result->vMarch,2,'.','');
-							?>
-							 <a href="<?= base_url() ?>report/i_consolidate_month?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&m=<?php echo 'March';?>"><?php echo number_format($result->vMarch,2,'.','');?> </a></span>
-							 </td>
-							 <td style="text-align:right;"><span id="totalval<?php echo $index?>"><?php 
-							$vtot= $vtot + number_format($result->vtotal,2,'.','');
-							?>
-							 <a href="<?= base_url() ?>report/i_consolidate_year?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo number_format($result->vtotal,2,'.','');?> </a></span>
-							 </td>
-						</tr>
-						
-					<?php
-					
-					} 
-					
-					
-					?>
-                        </tbody>
-						<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						<td><strong><?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-							</strong></td>
-						   <td style="text-align:right;"><strong><?php 
-								 {
-								 echo number_format($vapr,2,'.','');
-								
-								  } 
-								 ?>  
-							</strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo number_format($vmay,2,'.','');
-								
-								  } 
-								 ?>  
-						    </strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo number_format($vjun,2,'.','');
-								
-								  } 
-								 ?>  
-						   </strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo number_format($vjul,2,'.','');
-								
-								  } 
-								 ?>  
-						   </strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo number_format($vaug,2,'.','');
-								
-								  } 
-								 ?>  
-						   </strong></td>
-							<td style="text-align:right;"><strong>
-								 <?php 
-								 {
-								 echo number_format($vsep,2,'.','');
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								<td style="text-align:right;"><strong>
-								 <?php 
-								 {
-								 echo  number_format($voct,2,'.','');
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>	
-								<td style="text-align:right;">
-								<strong>
-								<?php 
-								 {
-								 echo number_format($vnov,2,'.','');
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right;">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($vdec,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										<td style="text-align:right;">
-										<strong>
-										<?php 
-										 {
-										 echo number_format($vjan,2,'.','');
-										
-										  } 
-										 ?> 
-										</strong>
-										</td>
-											<td style="text-align:right;">
-											<strong>
-											<?php 
-											 {
-											 echo number_format($vfeb,2,'.','');
-											
-											  } 
-											 ?> 
-											</strong>
-											</td>
-												<td style="text-align:right;"> 
-												<strong>
-												<?php 
-												 {
-												 echo number_format($vmar,2,'.','');
-												
-												  } 
-												  
-												 ?>  
-												 </strong></td>
-												 <td style="text-align:right;"> 
-												<strong>
-												<?php 
-												 {
-												 echo number_format($vtot,2,'.','');
-												
-												  } 
-												  
-												 ?>  
-												 </strong></td>
-											
-												
-												
-						</tr>
-						
-						</tfoot>
-						<?php
-					
-					} 
-					
-					
-					?>
-                    </table>
-                
-                </div>
-	 
-			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-	  </div>
-	  </section>
-	  </div>
-	
-
-
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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> 
-$('.DataTables_sort_icon').remove();	
+	
 
 // Bootstrap datepicker
 // Set up your table
 $(document).ready(function() {
-	var txt_count = 0;
-	var qapril_sum = "<?php echo json_encode($qapr)?>";
-	var qmay_sum="<?php echo json_encode($qmay)?>";
-    var qjune_sum = "<?php echo json_encode($qjun)?>";
-    var qjuly_sum = "<?php echo json_encode($qjul)?>";
-    var qaug_sum = "<?php echo json_encode($qaug)?>";
-    var qsep_sum= "<?php echo json_encode($qsep)?>";
-    var qoct_sum = "<?php echo json_encode($qoct)?>";
-    var qnov_sum = "<?php echo json_encode($qnov)?>";
-    var qdec_sum= "<?php echo json_encode($qdec)?>";
-    var qjan_sum= "<?php echo json_encode($qjan)?>";
-    var qfeb_sum= "<?php echo json_encode($qfeb)?>";
-    var qmar_sum= "<?php echo json_encode($qmar)?>";
-    var qtotal_sum= "<?php echo json_encode($qtot)?>";
 
-
-   
-    var vaprilval_sum = "<?php echo json_encode($vapr)?>";
-    var vmayval_sum = "<?php echo json_encode($vmay)?>";
-    var vjuneval_sum = "<?php echo json_encode($vjun)?>";
-    var vjulyval_sum = "<?php echo json_encode($vjul)?>";
-    var vaugval_sum = "<?php echo json_encode($vaug)?>";
-    var vsepval_sum = "<?php echo json_encode($vsep)?>";
-    var voctval_sum = "<?php echo json_encode($voct)?>";
-    var vnovval_sum = "<?php echo json_encode($vnov)?>";
-    var vdecval_sum = "<?php echo json_encode($vdec)?>";
-    var vjanval_sum = "<?php echo json_encode($vjan)?>";
-    var vfebval_sum = "<?php echo json_encode($vfeb)?>";
-    var vmarval_sum = "<?php echo json_encode($vmar)?>";
-    var vtotalval_sum = "<?php echo json_encode($vtot)?>";
-
-
-    
-
-	   			
-	$('#tab').on('search.dt', function() {
+var txt_count = 0;
+$('#tab').on('search.dt', function() {
     var value = $('.dataTables_filter input').val();
     //console.log(value);
     
@@ -742,13 +713,32 @@ $(document).ready(function() {
     }
     
 });
+
+
+    var qapril_sum = "<?php echo json_encode($qapr??0)?>";
+	var qmay_sum="<?php echo json_encode($qmay??0)?>";
+    var qjune_sum = "<?php echo json_encode($qjun??0)?>";
+    var qjuly_sum = "<?php echo json_encode($qjul??0)?>";
+    var qaug_sum = "<?php echo json_encode($qaug??0)?>";
+    var qsep_sum= "<?php echo json_encode($qsep??0)?>";
+    var qoct_sum = "<?php echo json_encode($qoct??0)?>";
+    var qnov_sum = "<?php echo json_encode($qnov??0)?>";
+    var qdec_sum= "<?php echo json_encode($qdec??0)?>";
+    var qjan_sum= "<?php echo json_encode($qjan??0)?>";
+    var qfeb_sum= "<?php echo json_encode($qfeb??0)?>";
+    var qmar_sum= "<?php echo json_encode($qmar??0)?>";
+    var qtotal_sum= "<?php echo json_encode($qtot??0)?>";
+
+
+
+
+
+
     table = $('#tab').DataTable( {
-		"responsive": true,
-"bAutoWidth": true,
         "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: [
+       buttons: [
             
             {
                 extend: 'excelHtml5',
@@ -764,9 +754,11 @@ $(document).ready(function() {
             'colvis'
         ],
 
-      "footerCallback": function ( row, data, start, end, display ) 
+
+    "footerCallback": function ( row, data, start, end, display ) 
     {  
 
+
     	var april_sum=0;
     	var may_sum=0;
     	var june_sum = 0;
@@ -780,9 +772,10 @@ $(document).ready(function() {
     	var feb_sum=0;
     	var mar_sum=0;
     	var total_sum=0;
-       if(txt_count !=0){
 
-       	//console.log(display);
+    	if(txt_count !=0)
+    	{
+       
        for(var j = 0;j<=display.length-1;j++)
 	   {
            var count = display[j];
@@ -831,7 +824,7 @@ $(document).ready(function() {
 	   var Final_feb_total = parseInt(feb_sum);
 	   var Final_mar_total = parseInt(mar_sum);
 	   var Final_tot = parseInt(total_sum);
-	   //console.log(Final_april_total);
+
 	   $( api.column( 2 ).footer() ).html( Final_april_total.toFixed(2).bold() );
 	   $( api.column( 3 ).footer() ).html( Final_may_total.toFixed(2).bold() );
 	   $( api.column( 4 ).footer() ).html( Final_june_total.toFixed(2).bold() );
@@ -845,12 +838,16 @@ $(document).ready(function() {
 	   $( api.column( 12 ).footer() ).html( Final_feb_total.toFixed(2).bold() );
 	   $( api.column( 13 ).footer() ).html( Final_mar_total.toFixed(2).bold() );
 	   $( api.column( 14 ).footer() ).html( Final_tot.toFixed(2).bold() );
-	   }else{
-	   	
-	   		
-	    var api = this.api(), data;
-	    var Final_april_total =parseInt(qapril_sum);
-	    var Final_may_total = parseInt(qmay_sum);
+
+
+	}
+
+	else
+	{
+
+       var api = this.api(), data;
+	   var Final_april_total =parseInt(qapril_sum);
+	   var Final_may_total = parseInt(qmay_sum);
 	   var Final_june_total = parseInt(qjune_sum);
 	   var Final_july_total = parseInt(qjuly_sum);
 	   var Final_aug_total = parseInt(qaug_sum);
@@ -862,32 +859,31 @@ $(document).ready(function() {
 	   var Final_feb_total = parseInt(qfeb_sum);
 	   var Final_mar_total = parseInt(qmar_sum);
 	   var Final_tot = parseInt(qtotal_sum);
-	   // //console.log(Final_april_total);
-	    $( api.column( 2 ).footer() ).html( Final_april_total.toFixed(2).bold() );
-	    $( api.column( 3 ).footer() ).html( Final_may_total.toFixed(2).bold() );
-	    $( api.column( 4 ).footer() ).html( Final_june_total.toFixed(2).bold() );
-	    $( api.column( 5 ).footer() ).html( Final_july_total.toFixed(2).bold() );
-	    $( api.column( 6 ).footer() ).html( Final_aug_total.toFixed(2).bold() );
-	    $( api.column( 7 ).footer() ).html( Final_sep_total.toFixed(2).bold() );
-	    $( api.column( 8 ).footer() ).html( Final_oct_total.toFixed(2).bold() );
-	    $( api.column( 9 ).footer() ).html( Final_nov_total.toFixed(2).bold() );
-	    $( api.column( 10 ).footer() ).html( Final_dec_total.toFixed(2).bold() );
-	    $( api.column( 11 ).footer() ).html( Final_jan_total.toFixed(2).bold() );
-	    $( api.column( 12 ).footer() ).html( Final_feb_total.toFixed(2).bold() );
-	    $( api.column( 13 ).footer() ).html( Final_mar_total.toFixed(2).bold() );
-	    $( api.column( 14 ).footer() ).html( Final_tot.toFixed(2).bold() );
-	   }
+
+	   $( api.column( 2 ).footer() ).html( Final_april_total.toFixed(2).bold() );
+	   $( api.column( 3 ).footer() ).html( Final_may_total.toFixed(2).bold() );
+	   $( api.column( 4 ).footer() ).html( Final_june_total.toFixed(2).bold() );
+	   $( api.column( 5 ).footer() ).html( Final_july_total.toFixed(2).bold() );
+	   $( api.column( 6 ).footer() ).html( Final_aug_total.toFixed(2).bold() );
+	   $( api.column( 7 ).footer() ).html( Final_sep_total.toFixed(2).bold() );
+	   $( api.column( 8 ).footer() ).html( Final_oct_total.toFixed(2).bold() );
+	   $( api.column( 9 ).footer() ).html( Final_nov_total.toFixed(2).bold() );
+	   $( api.column( 10 ).footer() ).html( Final_dec_total.toFixed(2).bold() );
+	   $( api.column( 11 ).footer() ).html( Final_jan_total.toFixed(2).bold() );
+	   $( api.column( 12 ).footer() ).html( Final_feb_total.toFixed(2).bold() );
+	   $( api.column( 13 ).footer() ).html( Final_mar_total.toFixed(2).bold() );
+	   $( api.column( 14 ).footer() ).html( Final_tot.toFixed(2).bold() );
+    
+	}
 
     }
 
-
-
-
     } );
 } );
 $(document).ready(function() {
 
-  var vtxt_count = 0;
+
+ var vtxt_count = 0;
 
   $('#ta').on('search.dt', function() {
 
@@ -902,22 +898,22 @@ $(document).ready(function() {
 });
 
 
- // console.log(vtxt_count);
 
+    var vaprilval_sum = "<?php echo json_encode($vapr??0)?>";
+    var vmayval_sum = "<?php echo json_encode($vmay??0)?>";
+    var vjuneval_sum = "<?php echo json_encode($vjun??0)?>";
+    var vjulyval_sum = "<?php echo json_encode($vjul??0)?>";
+    var vaugval_sum = "<?php echo json_encode($vaug??0)?>";
+    var vsepval_sum = "<?php echo json_encode($vsep??0)?>";
+    var voctval_sum = "<?php echo json_encode($voct??0)?>";
+    var vnovval_sum = "<?php echo json_encode($vnov??0)?>";
+    var vdecval_sum = "<?php echo json_encode($vdec??0)?>";
+    var vjanval_sum = "<?php echo json_encode($vjan??0)?>";
+    var vfebval_sum = "<?php echo json_encode($vfeb??0)?>";
+    var vmarval_sum = "<?php echo json_encode($vmar??0)?>";
+    var vtotalval_sum = "<?php echo json_encode($vtot??0)?>";
 
-    var vaprilval_sum = "<?php echo json_encode($vapr)?>";
-    var vmayval_sum = "<?php echo json_encode($vmay)?>";
-    var vjuneval_sum = "<?php echo json_encode($vjun)?>";
-    var vjulyval_sum = "<?php echo json_encode($vjul)?>";
-    var vaugval_sum = "<?php echo json_encode($vaug)?>";
-    var vsepval_sum = "<?php echo json_encode($vsep)?>";
-    var voctval_sum = "<?php echo json_encode($voct)?>";
-    var vnovval_sum = "<?php echo json_encode($vnov)?>";
-    var vdecval_sum = "<?php echo json_encode($vdec)?>";
-    var vjanval_sum = "<?php echo json_encode($vjan)?>";
-    var vfebval_sum = "<?php echo json_encode($vfeb)?>";
-    var vmarval_sum = "<?php echo json_encode($vmar)?>";
-    var vtotalval_sum = "<?php echo json_encode($vtot)?>";
+    
 
 
 
@@ -925,7 +921,7 @@ $(document).ready(function() {
         "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: [
+       buttons: [
             
             {
                 extend: 'excelHtml5',
@@ -942,7 +938,7 @@ $(document).ready(function() {
         ],
 
 
-       "footerCallback": function ( row, data, start, end, display ) 
+    "footerCallback": function ( row, data, start, end, display ) 
     {
          var aprilval_sum =0;
          var mayval_sum =0;
@@ -957,12 +953,8 @@ $(document).ready(function() {
          var febval_sum =0;
          var marval_sum =0;
          var totalval_sum =0;
-
-        // console.log(vtxt_count);
-
-        if(vtxt_count !=0){
-
-        	//console.log('if')
+       if(vtxt_count !=0)
+       {
          for(var j = 0;j<=display.length-1;j++)
 	     {
            var count = display[j];
@@ -1030,24 +1022,24 @@ $(document).ready(function() {
 
 	  }
 
-
 	  else
-	  { 
-        //console.log('else');
-	  	 var api = this.api(), data;
-	   var Final_april_total =parseInt(vaprilval_sum);
-	   var Final_may_total = parseInt(vmayval_sum);
-	   var Final_june_total = parseInt(vjuneval_sum);
-	   var Final_july_total = parseInt(vjulyval_sum);
-	   var Final_aug_total = parseInt(vaugval_sum);
-	   var Final_sep_total = parseInt(vsepval_sum);
-	   var Final_oct_total = parseInt(voctval_sum);
-	   var Final_nov_total = parseInt(vnovval_sum);
-	   var Final_dec_total = parseInt(vdecval_sum);
-	   var Final_jan_total = parseInt(vjanval_sum);
-	   var Final_feb_total = parseInt(vfebval_sum);
-	   var Final_mar_total = parseInt(vmarval_sum);
-	   var Final_tot = parseInt(vtotalval_sum);
+	  {
+
+
+	  			var api = this.api(), data;
+				var Final_april_total =parseInt(vaprilval_sum);
+				var Final_may_total = parseInt(vmayval_sum);
+				var Final_june_total = parseInt(vjuneval_sum);
+				var Final_july_total = parseInt(vjulyval_sum);
+				var Final_aug_total = parseInt(vaugval_sum);
+				var Final_sep_total = parseInt(vsepval_sum);
+				var Final_oct_total = parseInt(voctval_sum);
+				var Final_nov_total = parseInt(vnovval_sum);
+				var Final_dec_total = parseInt(vdecval_sum);
+				var Final_jan_total = parseInt(vjanval_sum);
+				var Final_feb_total = parseInt(vfebval_sum);
+				var Final_mar_total = parseInt(vmarval_sum);
+				var Final_tot = parseInt(vtotalval_sum);
 
 	   $( api.column( 2 ).footer() ).html( Final_april_total.toFixed(2).bold() );
 	   $( api.column( 3 ).footer() ).html( Final_may_total.toFixed(2).bold() );
@@ -1067,13 +1059,6 @@ $(document).ready(function() {
 
      }
 
-
-
-
-
-		// columns:[
-    // { id:"col1",  width:2 }
-// ]
     } );
 } );
  
@@ -1093,7 +1078,4 @@ function toggleTables(which)
         }
 }
 
-	</script>
-	
-	
-	
\ No newline at end of file
+</script>
\ 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_m -->
+
+<script>
+	$(document).ready(function() {
+
+		$("#client_name").select2();
+		$("#item_name").select2();
+		$("#purchaseorder_number").select2();
+
+
+	});
+</script>
 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
+<style>
+	table {
+		width: auto;
+	}
 
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
+	.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; */
+
+	}
 </style>
-<div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Consolidate(<?php
-			  $m = $this->input->get('m');
-			  echo $m;
-			  ?>)</b></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				    <tr>
-					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Material Name</th>
-						 <th  style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th> 
-						 </tr>
-                     <tr>
-				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(&#8377;)</th>
-					    
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php 
-					  
-					   if(!empty($spurchse)){
-					   $tqt=0;
-					   $tvt=0;
-					  $ab=$this->input->get('ab');
-						$month=date('F');
-						 $m = $this->input->get('m');
-						//echo $month;
-					   foreach($spurchse as $rel)
-					    {				
-					   ?> 
-					  <tr>
-					 
-                       <td><span>
-					   <a href="<?= base_url() ?>report/link_purchase?ab=<?php echo $ab;?>&sid=<?php echo $rel->sid;?>&mid=<?php echo $rel->mid;?>&month=<?php echo $m;?>"><?php echo $rel->supplier_name;?> </a>
-					   </span></td>
-					   <td><span><?php echo $rel->material_name;?></span></td>
-					   <td style="text-align:right"><span><?php 
-						$tqt= $tqt + round($rel->quantity);
-						echo round($rel->quantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tvt= $tvt + number_format($rel->total,2,'.','');
-						echo number_format($rel->total,2,'.','');?></span></td>
-						
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							
-								<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td> 
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tqt;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tvt,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
+
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Purchase</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Report - Purchase Consolidate <?php echo isset($month) ? $month : ''; ?> </b></h4>
+									</li>
+								</ol>
+							</div>
+
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<table id="cc" class="table table-bordered table-hover wrap" style="background-color:#fff;width: 100% !important;">
+									<thead>
+										<tr>
+											<th style="text-align:center" rowspan="2">Supplier Name</th>
+											<th style="text-align:center" rowspan="2">Material Name</th>
+											<th style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th>
+										</tr>
+										<tr>
+											<th style="text-align:center">Quantity</th>
+											<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+
+
+										</tr>
+									</thead>
+									<tbody>
+										<?php
+
+										if (!empty($spurchse)) {
+											$tqt = 0;
+											$tvt = 0;
+											$ab = $financialyear;
+											$m = $month;
+											//echo $month;
+											$month = date('F');
+											//echo $month;
+											foreach ($spurchse as $rel) {
+										?>
+												<tr>
+
+													<td><span>
+															<a href="<?= base_url() ?>report/link_purchase?ab=<?php echo $ab; ?>&sid=<?php echo $rel->sid; ?>&mid=<?php echo $rel->mid; ?>&month=<?php echo $m; ?>"><?php echo $rel->supplier_name; ?> </a>
+														</span></td>
+													<td><span><?php echo $rel->material_name; ?></span></td>
+													<td style="text-align:right"><span><?php
+																						$tqt = $tqt + round($rel->quantity);
+																						echo round($rel->quantity); ?></span></td>
+													<td style="text-align:right"><span><?php
+																						$tvt = $tvt + number_format($rel->total, 2, '.', '');
+																						echo number_format($rel->total, 2, '.', ''); ?></span></td>
+
+
+												</tr>
+											<?php
+											}
+
+											?>
+									</tbody>
+									<tfoot width="100%">
+										<tr>
+											<td style="text-align:center;"><strong>Total</strong></td>
+
+
+											<td style="text-align:right"><strong>
+													<?php {
+														echo '';
+													}
+													?>
+												</strong>
+											</td>
+											<td style="text-align:right">
+												<strong>
+													<?php {
+														echo $tqt;
+													}
+													?>
+												</strong>
+											</td>
+											<td style="text-align:right">
+												<strong>
+													<?php {
+														echo number_format($tvt, 2, '.', '');
+													}
+													?>
+												</strong>
+											</td>
+
+
+
+										</tr>
+
+									</tfoot>
+								<?php
+										}
+
+								?>
+								</table>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-	  </div>
-	  </section>
-	  </div>
-	 
+		</div> <!-- container -->
+	</div> <!-- content -->
+</div>
 
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
+		// 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+					previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+				}
+			}
+		});
+	});
+</script>
 
-<script> 
-	
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":"<center> Data Not Found ! </center>"
-        },
-        "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'
-        ],
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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;
-            };
+<script>
+	function toggleTables(which) {
 
-			TotalQTY = api
-                 .column( 2, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
+		if (which == "1") {
+			document.getElementById('a').style.display = "block";
+			document.getElementById('b').style.display = "none";
 
-             $( api.column( 2 ).footer() ).html( TotalQTY.toFixed().bold() );
-			 
-			TotalVALUE = api
-                 .column( 3, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-				
-             $( api.column( 3 ).footer() ).html(  TotalVALUE.toFixed(2).bold() );
+		}
+		if (which == "2") {
+			document.getElementById('b').style.display = "block";
+			document.getElementById('a').style.display = "none";
 
-		
-        }
-
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	
-
-	</script>
-	
-	
-	
\ No newline at end of file
+		}
+	}
+</script>
\ 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 @@
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
+<!-- Report_consolidate_month -->
+<style>
+  table {
+    width: auto;
+  }
+</style>
 
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	   <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Consolidate Category-Wise(<?php
-			  $m = $this->input->get('m');
-			  echo $m;
-			  ?>)</b></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				    <tr>
-					     <th style="text-align:center" rowspan="2">Category</th>
-					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Material Name</th>
-						 <th  style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th> 
-						 </tr>
-                     <tr>
-				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp; (&#8377;)</th>
-					    
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php 
-					  
-					   if(!empty($spurchse)){
-					   $tqt=0;
-					   $tvt=0;
-					  $ab=$this->input->get('ab');
-						$month=date('F');
-						 $m = $this->input->get('m');
-						//echo $month;
-					   foreach($spurchse as $rel)
-					    {				
-					   ?> 
-					  <tr>
-					  <td style="text-align:left;">
-							<?php echo $rel->category;?>
-							</td>
-                       <td><span>
-					   <a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid;?>&ab=<?php echo $ab;?>&mid=<?php echo $rel->mid;?>&cat=<?php echo $rel->category;?>&m=<?php echo $m;?>"><?php echo $rel->supplier_name;?> </a>
-					   </span></td>
-					   <td><span><?php echo $rel->material_name;?></span></td>
-					   <td style="text-align:right"><span><?php 
-						$tqt= $tqt + round($rel->quantity);
-						echo round($rel->quantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tvt= $tvt + number_format($rel->total,2,'.','');
-						echo number_format($rel->total,2,'.','');?></span></td>
-						
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td> 
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tqt;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tvt,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
-				</div>
-			   </div>
-			</div>
-          <!-- /.box -->
+<div class="content-page">
+  <div class="content">
+    <!-- Start Content-->
+    <div class="container-fluid">
+      <!-- start page title -->
+      <div>
+        <div class="row">
+          <div class="col-12">
+            <div class="page-title-box page-title-box-alt">
+              <div class="page-title-right">
+                <ol class="breadcrumb m-0">
+                  <li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+                  <li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+                  <li class="breadcrumb-item active">
+                    <h4 class="page-title"><b> Consolidate Category-Wise <?php echo isset($month) ? '(' . $month . ')' : '' ?> </b></h4>
+                  </li>
+                </ol>
+              </div>
+
+            </div>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-12">
+            <div class="card">
+              <div class="card-body">
+                <table id="cc" class="table table-bordered table-hover mb-0 nowrap w-100"
+                  style="background-color:#fff; font-size:12px;">
+                  <thead>
+                    <tr>
+                      <th style="text-align:center" rowspan="2">Category</th>
+                      <th style="text-align:center" rowspan="2">Supplier Name</th>
+                      <th style="text-align:center" rowspan="2">Material Name</th>
+                      <th style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th>
+                    </tr>
+                    <tr>
+                      <th style="text-align:center">Quantity</th>
+                      <th style="text-align:center">Value &nbsp; (&#8377;)</th>
+
+
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <?php
+
+                    if (!empty($spurchse)) {
+                      $tqt = 0;
+                      $tvt = 0;
+                      $ab = isset($financialyear) ? $financialyear : '';
+
+                      $month = date('F');
+                      $m = $month;
+                      //echo $month;
+                      foreach ($spurchse as $rel) {
+                    ?>
+                        <tr>
+                          <td style="text-align:left;">
+                            <?php echo $rel->category; ?>
+                          </td>
+                          <td><span>
+                              <a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid; ?>&ab=<?php echo $ab; ?>&mid=<?php echo $rel->mid; ?>&cat=<?php echo $rel->category; ?>&m=<?php echo $m; ?>"><?php echo $rel->supplier_name; ?> </a>
+                            </span></td>
+                          <td><span><?php echo $rel->material_name; ?></span></td>
+                          <td style="text-align:right"><span><?php
+                                                              $tqt = $tqt + round($rel->quantity);
+                                                              echo round($rel->quantity); ?></span></td>
+                          <td style="text-align:right"><span><?php
+                                                              $tvt = $tvt + number_format($rel->total, 2, '.', '');
+                                                              echo number_format($rel->total, 2, '.', ''); ?></span></td>
+
+
+                        </tr>
+                      <?php
+                      }
+
+                      ?>
+                  </tbody>
+                  <tfoot width="100%">
+                    <tr>
+                      <td style="text-align:center;"><strong>Total</strong></td>
+
+                      <td style="text-align:right"><strong>
+                          <?php {
+                            echo '';
+                          }
+                          ?>
+                        </strong>
+                      </td>
+                      <td style="text-align:right"><strong>
+                          <?php {
+                            echo '';
+                          }
+                          ?>
+                        </strong>
+                      </td>
+                      <td style="text-align:right">
+                        <strong>
+                          <?php {
+                            echo $tqt;
+                          }
+                          ?>
+                        </strong>
+                      </td>
+                      <td style="text-align:right">
+                        <strong>
+                          <?php {
+                            echo number_format($tvt, 2, '.', '');
+                          }
+                          ?>
+                        </strong>
+                      </td>
+
+
+
+                    </tr>
+
+                  </tfoot>
+                <?php
+                    }
+
+                ?>
+                </table>
+              </div> <!-- end card body-->
+            </div> <!-- end card -->
+          </div><!-- end col-->
         </div>
-        <!-- /.col -->
       </div>
-	  </section>
-	  </div>
+    </div> <!-- container -->
+  </div> <!-- content -->
+</div>
 
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
 
-<script> 
-	
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":"<center> Data Not Found ! </center>"
+    // 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+          previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
         },
-        "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'
-        ],
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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;
-            };
+        emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
 
-			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() );
-
-		
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
+      }
     });
-	
-	
+  });
+</script>
+// "footerCallback": function ( row, data, start, end, display ) {
+// var api = this.api(), data;
 
-	</script>
-	
-	
-	
\ 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() );
+
+
+// }
+</script>
\ 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_month_inward.php -->
+<script>
+	$(document).ready(function() {
+		$("#financialyear").select2();
+		$("#month").select2();
+	});
+</script>
 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
 
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	  <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Consolidate-Inward(<?php
-			  $m = $this->input->get('m');
-			  echo $m;
-			  ?>)</b></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				    <tr>
-					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Material Name</th>
-						 <th  style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th> 
-						 </tr>
-                     <tr>
-				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(&#8377;)</th>
-					    
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php 
-					  
-					   if(!empty($spurchse)){
-					   $tqt=0;
-					   $tvt=0;
-					  $ab=$this->input->get('ab');
-						$month=date('F');
-						 $m = $this->input->get('m');
-						//echo $month;
-					   foreach($spurchse as $rel)
-					    {				
-					   ?> 
-					  <tr>
-					 
-                       <td><span>
-					   <a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab;?>&sid=<?php echo $rel->sid;?>&mid=<?php echo $rel->mid;?>&month=<?php echo $m;?>"><?php echo $rel->supplier_name;?> </a>
-					   </span></td>
-					   <td><span><?php echo $rel->material_name;?></span></td>
-					   <td style="text-align:right"><span><?php 
-						$tqt= $tqt + round($rel->quantity);
-						echo round($rel->quantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tvt= $tvt + number_format($rel->total,2,'.','');
-						echo number_format($rel->total,2,'.','');?></span></td>
-						
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							
-								<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td> 
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tqt;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tvt,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
+<style>
+	table {
+		width: auto;
+	}
+</style>
+
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Consolidate ( <?php echo $month; ?> ) </b></h4>
+									</li>
+								</ol>
+							</div>
+
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<table id="cc" class="table table-bordered table-hover mb-0 nowrap w-100"
+									style="background-color:#fff; font-size:12px;">
+									<thead>
+										<tr>
+											<th style="text-align:center" rowspan="2">Supplier Name</th>
+											<th style="text-align:center" rowspan="2">Material Name</th>
+											<th style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th>
+										</tr>
+										<tr>
+											<th style="text-align:center">Quantity</th>
+											<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+
+
+										</tr>
+									</thead>
+									<tbody>
+										<?php
+
+										if (!empty($spurchse)) {
+											$tqt = 0;
+											$tvt = 0;
+											$ab = $financialyear;
+											$month_letter = date('F');
+											$m = $month;
+											//echo $month_letter;
+											foreach ($spurchse as $rel) {
+										?>
+												<tr>
+
+													<td><span>
+															<a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab; ?>&sid=<?php echo $rel->sid; ?>&mid=<?php echo $rel->mid; ?>&month=<?php echo $m; ?>"><?php echo $rel->supplier_name; ?> </a>
+														</span></td>
+													<td><span><?php echo $rel->material_name; ?></span></td>
+													<td style="text-align:right"><span><?php
+																						$tqt = $tqt + round($rel->quantity);
+																						echo round($rel->quantity); ?></span></td>
+													<td style="text-align:right"><span><?php
+																						$tvt = $tvt + number_format($rel->total, 2, '.', '');
+																						echo number_format($rel->total, 2, '.', ''); ?></span></td>
+
+
+												</tr>
+											<?php
+											}
+
+											?>
+									</tbody>
+									<tfoot width="100%">
+										<tr>
+											<td style="text-align:center;"><strong>Total</strong></td>
+
+
+											<td style="text-align:right"><strong>
+													<?php {
+														echo '';
+													}
+													?>
+												</strong>
+											</td>
+											<td style="text-align:right">
+												<strong>
+													<?php {
+														echo $tqt;
+													}
+													?>
+												</strong>
+											</td>
+											<td style="text-align:right">
+												<strong>
+													<?php {
+														echo number_format($tvt, 2, '.', '');
+													}
+													?>
+												</strong>
+											</td>
+
+
+
+										</tr>
+
+									</tfoot>
+								<?php
+										}
+
+								?>
+								</table>
+
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-	  </div>
-	  </section>
+		</div> <!-- container -->
+	</div> <!-- content -->
+</div>
 
-	  </div>
-	
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
 
-<script> 
-	
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":"<center> Data Not Found ! </center>"
-        },
-        "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'
-        ],
-		
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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( 2, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 2 ).footer() ).html( TotalQTY.toFixed().bold() );
-			 
-			TotalVALUE = api
-                 .column( 3, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-				
-             $( api.column( 3 ).footer() ).html(  TotalVALUE.toFixed(2).bold() );
-
-		
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	
-
-	</script>
-	
-	
-	
\ 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+					previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+				},
+				emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
+			}
+		});
+	});
+</script>
\ 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 @@
-
-
+<!-- Report_consolidate_raw Report_consolidate_category -->
 <script>
- $(document).ready(function () {
-	 
-	  $("#client_name").select2();
-	 
-	  
-                
-            }); 
+	$(document).ready(function() {
+		$("#financialyear").select2();
+		$("#month").select2();
+	});
 </script>
+<?
+$qapr = 0;
+$qmay = 0;
+$qjun = 0;
+$qjul = 0;
+$qaug = 0;
+$qsep = 0;
+$qoct = 0;
+$qnov = 0;
+$qdec = 0;
+$qjan = 0;
+$qfeb = 0;
+$qmar = 0;
+$qtot = 0;
+$vapr = 0;
+$vmay = 0;
+$vjun = 0;
+$vjul = 0;
+$vaug = 0;
+$vsep = 0;
+$voct = 0;
+$vnov = 0;
+$vdec = 0;
+$vjan = 0;
+$vfeb = 0;
+$vmar = 0;
+$vtot = 0;
+?>
 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
 
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}
- th{ white-space: nowrap; }
-		   td{ white-space: wrap; }
-		   .dataTable > thead > tr > th[class*="sort"]:after{
-    content: "" !important;
-}
+<style>
+	table {
+		width: auto;
+	}
+</style>
 
-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;
-}							
-		 
-			   
-	 </style>
-	 
-	  <div class="content-wrapper">
-	 <section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Consolidate (Category-Wise)</b><br><br>
-			  <?php
-			  if($this->input->post('client_name')){
-				  $cl=$this->input->post('client_name');
-				  echo $cl;
-			  }
-			  if($this->input->post('financialyear')){
-				  $ab=$this->input->post('financialyear'); 
-				  echo '('.$ab.')';
-			  }
-		   
-			  ?></p></h3></center>
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Material Master</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Consolidate (Category-Wise) <?php echo isset($client_name) ? $client_name : ''; ?> <?php echo isset($financialyear) ? "(" . $financialyear . ")" : ''; ?> </b></h4>
+									</li>
+								</ol>
+							</div>
+
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<form method="post" action="<?php echo base_url("Report_consolidate_category"); ?>">
+									<div class="form-group">
+
+										<div class="row">
+											<div class="col-3">
+												<label for="client_name">
+													<?php echo 'Category'; ?>
+												</label>
+
+												<select class="form-control" id="client_name" name="client_name">
+													<option value="">Select Category</option>
+													<?php
+													foreach ($material as $item): { ?>
+
+															<option value="<?php echo $item->Category; ?>"><?php echo $item->Category;  ?></option>
+
+
+													<?php }
+													endforeach; ?>
+
+												</select>
+											</div>
+
+											<div class="col-3">
+												<label for="to_date">
+													<?php echo 'year'; ?>
+												</label>
+
+												<select class="form-control" id="financialyear" name="financialyear">
+													<option value="">Select Year</option>
+													<?php
+
+
+													foreach ($finyear as $item): { ?>
+
+															<option value="<?php echo $item->financial_year; ?>" <?php if (isset($financialyear) && ($financialyear == $item->financial_year)) {
+																														echo 'selected';
+																													} ?>><?php echo $item->financial_year;  ?></option>
+
+
+													<?php }
+													endforeach; ?>
+												</select>
+
+
+											</div>
+											<div class="col-3">
+												<br>
+
+												<label class="mr-2"><input type="radio" class="mt-2" name="colorRadio" id="value" onclick="toggleTables('2')" value="tab"> Value</label>
+												<label><input type="radio" class="mt-2" name="colorRadio" id="qty" onclick="toggleTables('1')" value="ta" checked> Quantity</label>
+
+
+											</div>
+
+
+											<div class="col-3 text-right">
+												<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Report_consolidate_inward') ?>';">
+
+
+												<input type="submit" class="btn btn-success m-2" name="btn_submit" value="View Report">
+											</div>
+
+										</div>
+									</div>
+									<div class="form-group has-feedback">
+
+									</div>
+
+
+								</form>
+								<div class="box-body" style="display:block" id="a">
+
+									<table class="table table-bordered table-hover" id="tab" style="font-size:14px;">
+										<thead>
+											<tr>
+												<th style="text-align:center;">Category</th>
+												<th style="text-align:center;">Apr</th>
+												<th style="text-align:center;">May</th>
+												<th style="text-align:center;">Jun</th>
+												<th style="text-align:center;">Jul</th>
+												<th style="text-align:center;">Aug</th>
+												<th style="text-align:center;">Sep</th>
+												<th style="text-align:center;">Oct</th>
+												<th style="text-align:center;">Nov</th>
+												<th style="text-align:center;">Dec</th>
+												<th style="text-align:center;">Jan</th>
+												<th style="text-align: center;">Feb</th>
+												<th style="text-align: center;">Mar</th>
+												<th style="text-align: center;">Total</th>
+
+											</tr>
+										</thead>
+										<tbody>
+
+											<?php
+											if (!empty($spurchse)) {
+												$qapr = 0;
+												$qmay = 0;
+												$qjun = 0;
+												$qjul = 0;
+												$qaug = 0;
+												$qsep = 0;
+												$qoct = 0;
+												$qnov = 0;
+												$qdec = 0;
+												$qjan = 0;
+												$qfeb = 0;
+												$qmar = 0;
+												$qtot = 0;
+												$ab = $financialyear;
+												foreach ($spurchse as $index => $result) { ?>
+													<tr>
+														<td style="text-align:left;">
+															<a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>"><?php echo $result->category; ?> </a>
+														</td>
+														<td style="text-align:right;"><span id="april_qty<?php echo $index ?>">
+																<?php
+																$qapr = $qapr + round($result->April);
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'April'; ?>"><?php echo round($result->April); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="may_qty<?php echo $index ?>">
+																<?php
+																$qmay = $qmay + round($result->May);
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'May'; ?>"><?php echo round($result->May); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="june_qty<?php echo $index ?>">
+																<?php
+																$qjun = $qjun + round($result->June);
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'June'; ?>"><?php echo round($result->June); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="july_qty<?php echo $index ?>">
+																<?php
+																$qjul = $qjul + round($result->July);
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'July'; ?>"><?php echo round($result->July); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="aug_qty<?php echo $index ?>">
+																<?php
+																$qaug = $qaug + round($result->August);
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'August'; ?>"><?php echo round($result->August); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="sep_qty<?php echo $index ?>">
+																<?php
+																$qsep = $qsep + $result->September;
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'September'; ?>"><?php echo round($result->September); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="oct_qty<?php echo $index ?>">
+																<?php
+																$qoct = $qoct + round($result->October);
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'October'; ?>"><?php echo round($result->October); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="nov_qty<?php echo $index ?>">
+																<?php
+																$qnov = $qnov + round($result->November);
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'November'; ?>"><?php echo round($result->November); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="dec_qty<?php echo $index ?>">
+																<?php
+																$qdec = $qdec + round($result->December);
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'December'; ?>"><?php echo round($result->December); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="jan_qty<?php echo $index ?>">
+																<?php
+																$qjan = $qjan + round($result->January);
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'January'; ?>"><?php echo round($result->January); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="feb_qty<?php echo $index ?>">
+																<?php
+																$qfeb = $qfeb + round($result->February);
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'February'; ?>"><?php echo round($result->February); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="mar_qty<?php echo $index ?>">
+																<?php
+																$qmar = $qmar + round($result->March);
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'March'; ?>"><?php echo round($result->March); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="tot_qty<?php echo $index ?>">
+																<?php
+																$qtot = $qtot + round($result->qtotal);
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_year?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>"><?php echo round($result->qtotal); ?> </a></span>
+														</td>
+													</tr>
+
+												<?php
+
+												}
+
+
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+
+												<td style="text-align:right;"><strong><?php {
+																							echo $qapr;
+																						}
+																						?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo $qmay;
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo $qjun;
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo $qjul;
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo $qaug;
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo $qsep;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo  $qoct;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo $qnov;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo $qdec;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo $qjan;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo $qfeb;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo $qmar;
+														}
+
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo $qtot;
+														}
+
+														?>
+													</strong>
+												</td>
+
+
+
+											</tr>
+
+										</tfoot>
+									<?php
+
+											}
+
+
+									?>
+									</table>
+
+								</div>
+								<div class="box-body" id="b" style="display:none">
+
+
+									<table class="table table-bordered table-hover" style="font-size:13px!important;" id="ta">
+										<thead>
+											<tr>
+												<th style="text-align:center;">Category</th>
+												<th style="text-align:center;">Apr &nbsp;(<i class="fa fa-rupee "></i>)</th>
+												<th style="text-align:center;">May &nbsp;(<i class="fa fa-rupee "></i>)</th>
+												<th style="text-align:center;">Jun &nbsp;(<i class="fa fa-rupee "></i>)</th>
+												<th style="text-align:center;">Jul &nbsp;(<i class="fa fa-rupee "></i>)</th>
+												<th style="text-align:center;">Aug &nbsp;(<i class="fa fa-rupee "></i>)</th>
+												<th style="text-align:center;">Sep &nbsp;(<i class="fa fa-rupee "></i>)</th>
+												<th style="text-align:center;">Oct &nbsp;(<i class="fa fa-rupee "></i>)</th>
+												<th style="text-align:center;">Nov &nbsp;(<i class="fa fa-rupee "></i>)</th>
+												<th style="text-align:center;">Dec &nbsp;(<i class="fa fa-rupee "></i>)</th>
+												<th style="text-align:center;">Jan &nbsp;(<i class="fa fa-rupee "></i>)</th>
+												<th style="text-align: center;">Feb &nbsp;(<i class="fa fa-rupee "></i>)</th>
+												<th style="text-align: center;">Mar &nbsp;(<i class="fa fa-rupee "></i>)</th>
+												<th style="text-align: center;">Total &nbsp;(<i class="fa fa-rupee "></i>)</th>
+
+											</tr>
+										</thead>
+										<tbody>
+
+											<?php
+											if (!empty($spurchse)) {
+												$vapr = 0;
+												$vmay = 0;
+												$vjun = 0;
+												$vjul = 0;
+												$vaug = 0;
+												$vsep = 0;
+												$voct = 0;
+												$vnov = 0;
+												$vdec = 0;
+												$vjan = 0;
+												$vfeb = 0;
+												$vmar = 0;
+												$vtot = 0;
+												foreach ($spurchse as $index => $result) { ?>
+													<tr>
+														<td style="text-align:left;">
+															<a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>"><?php echo $result->category; ?> </a>
+														</td>
+														<td style="text-align:right;"><span id="aprilval<?php echo $index ?>">
+																<?php
+																$vapr = $vapr + number_format($result->vApril, 2, '.', '');
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'April'; ?>"><?php echo number_format($result->vApril, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="mayval<?php echo $index ?>">
+																<?php
+																$vmay = $vmay + number_format($result->vMay, 2, '.', '');
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'May'; ?>"><?php echo number_format($result->vMay, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="juneval<?php echo $index ?>">
+																<?php
+																$vjun = $vjun + number_format($result->vJune, 2, '.', '');
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'June'; ?>"><?php echo number_format($result->vJune, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="julyval<?php echo $index ?>">
+																<?php
+																$vjul = $vjul + number_format($result->vJuly, 2, '.', '');
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'July'; ?>"><?php echo number_format($result->vJuly, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="augval<?php echo $index ?>">
+																<?php
+																$vaug = $vaug + number_format($result->vAugust, 2, '.', '');
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'August'; ?>"><?php echo number_format($result->vAugust, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="sepval<?php echo $index ?>">
+																<?php
+																$vsep = $vsep + number_format($result->vSeptember, 2, '.', '');
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'September'; ?>"><?php echo number_format($result->vSeptember, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="octval<?php echo $index ?>">
+																<?php
+																$voct = $voct + number_format($result->vOctober, 2, '.', '');
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'October'; ?>"><?php echo number_format($result->vOctober, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="novval<?php echo $index ?>">
+																<?php
+																$vnov = $vnov + number_format($result->vNovember, 2, '.', '');
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'November'; ?>"><?php echo number_format($result->vNovember, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="decval<?php echo $index ?>">
+																<?php
+																$vdec = $vdec + number_format($result->vDecember, 2, '.', '');
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'December'; ?>"><?php echo number_format($result->vDecember, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="janval<?php echo $index ?>">
+																<?php
+																$vjan = $vjan + number_format($result->vJanuary, 2, '.', '');
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'January'; ?>"><?php echo number_format($result->vJanuary, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="febval<?php echo $index ?>">
+																<?php
+																$vfeb = $vfeb + number_format($result->vFebruary, 2, '.', '');
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'February'; ?>"><?php echo number_format($result->vFebruary, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="marval<?php echo $index ?>">
+																<?php
+																$vmar = $vmar + number_format($result->vMarch, 2, '.', '');
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>&m=<?php echo 'March'; ?>"><?php echo number_format($result->vMarch, 2, '.', ''); ?> </a></span>
+														</td>
+														<td style="text-align:right;"><span id="totalval<?php echo $index ?>">
+																<?php
+																$vtot = $vtot + number_format($result->vtotal, 2, '.', '');
+																?>
+																<a href="<?= base_url() ?>report/rawi_consolidate_year?ab=<?php echo $ab; ?>&cat=<?php echo $result->category; ?>"><?php echo number_format($result->vtotal, 2, '.', ''); ?> </a></span>
+														</td>
+													</tr>
+
+												<?php
+
+												}
+
+
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+												<td style="text-align:right;"><strong><?php {
+																							echo number_format($vapr, 2, '.', '');
+																						}
+																						?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo number_format($vmay, 2, '.', '');
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo number_format($vjun, 2, '.', '');
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo number_format($vjul, 2, '.', '');
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo number_format($vaug, 2, '.', '');
+														}
+														?>
+													</strong></td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo number_format($vsep, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;"><strong>
+														<?php {
+															echo  number_format($voct, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo number_format($vnov, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo number_format($vdec, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo number_format($vjan, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo number_format($vfeb, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo number_format($vmar, 2, '.', '');
+														}
+
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right;">
+													<strong>
+														<?php {
+															echo number_format($vtot, 2, '.', '');
+														}
+
+														?>
+													</strong>
+												</td>
+
+
+
+											</tr>
+
+										</tfoot>
+									<?php
+
+											}
+
+
+									?>
+									</table>
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
+				</div>
 			</div>
-			<!-- /.box-header -->
-			
-		     <div class="panel-body">
-
-                    <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
-
-                        <div class="form-group has-feedback">
-						<div class="col-md-4">
-						    <label for="client_name">
-                                <?php echo 'Category'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="client_name" name="client_name">
-								 <option value="">Select Category</option>
-								 <?php 
-								foreach($material as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->Category;?>"><?php echo $item->Category ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                        </div>  
-						
-						
-                       <div class="col-md-2">
-							 <label for="to_date">
-                                <?php echo 'year'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="financialyear" name="financialyear">
-								 <option value="">Select Year</option>
-								 <?php 
-								 
-								
-								  foreach($finyear as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                            </div>
-					
-                        <div class="col-md-2">
-						<br>
-							 <label><input type="radio" name="colorRadio" id="value" onclick="toggleTables('2')" value="tab"> Value</label>
-                             <label><input type="radio" name="colorRadio" id="qty" onclick="toggleTables('1')" value="ta" checked> Quantity</label>
-                           
-                            </div>
-             
-                     
-						<div class="col-md-2 "><br>
-                        <input type="submit" class="btn btn-success" name="btn_submit"
-                               value="View Report">
-                        
-							</div>  
-							</div>  
-                    </form>
-
-               
-
-            </div>
-           	
-			  <div class="box-body" style="display:block" id="a">
-	 
-	           <table class="table table-bordered table-hover" id="tab" style="font-size:14px;">
-                        <thead>
-                        <tr>
-							 <th style="text-align:center;">Category</th>
-							<th style="text-align:center;">Apr</th>
-                            <th style="text-align:center;">May</th>
-                            <th style="text-align:center;">Jun</th>
-							<th style="text-align:center;">Jul</th>
-							<th style="text-align:center;">Aug</th>
-							 <th style="text-align:center;">Sep</th>
-							 <th style="text-align:center;">Oct</th>
-							 <th style="text-align:center;">Nov</th>
-							 <th style="text-align:center;">Dec</th> 
-							 <th style="text-align:center;">Jan</th>
-							 <th style="text-align: center;">Feb</th>
-							 <th style="text-align: center;">Mar</th>
-							 <th style="text-align: center;">Total</th>
-                             
-                        </tr>
-                        </thead>
-                        <tbody>
-
-                        <?php 
-						if(!empty($spurchse)){
-						$qapr = 0;
-						$qmay = 0;
-						$qjun = 0;
-						$qjul = 0;
-						$qaug = 0;
-						$qsep = 0;
-						$qoct = 0;
-						$qnov = 0;
-						$qdec = 0;
-						$qjan = 0;
-						$qfeb = 0;
-						$qmar = 0;
-						$qtot = 0;
-						$ab=$this->input->post('financialyear');
-						foreach ($spurchse as $index=>$result) { ?>
-						<tr>
-						    <td style="text-align:left;">
-							<a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>"><?php echo $result->category;?> </a>
-							</td>
-							 <td style="text-align:right;"><span id="april_qty<?php echo $index?>">
-							<?php 
-							$qapr= $qapr + round($result->April);
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'April';?>"><?php echo round($result->April);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="may_qty<?php echo $index?>">
-							<?php 
-							$qmay= $qmay + round($result->May);
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'May';?>"><?php echo round($result->May);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="june_qty<?php echo $index?>">
-							<?php 
-							$qjun= $qjun + round($result->June);
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'June';?>"><?php echo round($result->June);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="july_qty<?php echo $index?>">
-							<?php 
-							$qjul= $qjul + round($result->July);
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'July';?>"><?php echo round($result->July);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="aug_qty<?php echo $index?>">
-							<?php 
-							$qaug= $qaug + round($result->August);
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'August';?>"><?php echo round($result->August);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="sep_qty<?php echo $index?>">
-							<?php 
-							$qsep= $qsep + $result->September;
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'September';?>"><?php echo round($result->September);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="oct_qty<?php echo $index?>">
-							<?php 
-							$qoct= $qoct + round($result->October);
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'October';?>"><?php echo round($result->October);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="nov_qty<?php echo $index?>">
-							<?php 
-							$qnov= $qnov + round($result->November);
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'November';?>"><?php echo round($result->November);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="dec_qty<?php echo $index?>">
-							<?php 
-							$qdec= $qdec + round($result->December);
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'December';?>"><?php echo round($result->December);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="jan_qty<?php echo $index?>">
-							<?php 
-							$qjan= $qjan + round($result->January);
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'January';?>"><?php echo round($result->January);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="feb_qty<?php echo $index?>">
-							<?php 
-							$qfeb= $qfeb + round($result->February);
-							?>
-						    <a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'February';?>"><?php echo round($result->February);?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="mar_qty<?php echo $index?>">
-							<?php 
-							$qmar= $qmar + round($result->March);
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'March';?>"><?php echo round($result->March);?> </a></span>
-							</td>
-							 <td style="text-align:right;"><span id="tot_qty<?php echo $index?>">
-							 <?php 
-							$qtot= $qtot + round($result->qtotal);
-							?>
-							 <a href="<?= base_url() ?>report/rawi_consolidate_year?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>"><?php echo round($result->qtotal);?> </a></span>
-							 </td>
-						</tr>
-						
-					<?php
-					
-					} 
-					
-					
-					?>
-                        </tbody>
-						<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						
-						   <td style="text-align:right;"><strong><?php 
-								 {
-								 echo $qapr;
-								
-								  } 
-								 ?>  
-							</strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo $qmay;
-								
-								  } 
-								 ?>  
-						    </strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo $qjun;
-								
-								  } 
-								 ?>  
-						   </strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo $qjul;
-								
-								  } 
-								 ?>  
-						   </strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo $qaug;
-								
-								  } 
-								 ?>  
-						   </strong></td>
-							<td style="text-align:right;"><strong>
-								 <?php 
-								 {
-								 echo $qsep;
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								<td style="text-align:right;"><strong>
-								 <?php 
-								 {
-								 echo  $qoct;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>	
-								<td style="text-align:right;">
-								<strong>
-								<?php 
-								 {
-								 echo $qnov;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right;">
-									<strong>
-									<?php 
-									 {
-									 echo $qdec;
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										<td style="text-align:right;">
-										<strong>
-										<?php 
-										 {
-										 echo $qjan;
-										
-										  } 
-										 ?> 
-										</strong>
-										</td>
-											<td style="text-align:right;">
-											<strong>
-											<?php 
-											 {
-											 echo $qfeb;
-											
-											  } 
-											 ?> 
-											</strong>
-											</td>
-												<td style="text-align:right;"> 
-												<strong>
-												<?php 
-												 {
-												 echo $qmar;
-												
-												  } 
-												  
-												 ?>  
-												 </strong></td>
-												 <td style="text-align:right;"> 
-												<strong>
-												<?php 
-												 {
-												 echo $qtot;
-												
-												  } 
-												  
-												 ?>  
-												 </strong></td>
-											
-												
-												
-						</tr>
-						
-						</tfoot>
-						<?php
-					
-					} 
-					
-					
-					?>
-                    </table>
-               
-                </div>
-	<div class="box-body" id="b" style="display:none">
-	 
-	 		
-                    <table class="table table-bordered table-hover"  style="font-size:13px!important;" id="ta">
-                        <thead>
-                        <tr>
-							 <th style="text-align:center;">Category</th>
-							<th style="text-align:center;">Apr &nbsp;(<i class="fa fa-rupee "  ></i>)</th>
-                            <th style="text-align:center;">May &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-                            <th style="text-align:center;">Jun &nbsp;(<i class="fa fa-rupee "></i>)</th>
-							<th style="text-align:center;">Jul &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							<th style="text-align:center;">Aug &nbsp;(<i class="fa fa-rupee "></i>)</th>
-							 <th style="text-align:center;">Sep &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align:center;">Oct &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align:center;">Nov &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align:center;">Dec &nbsp;(<i class="fa fa-rupee " ></i>)</th> 
-							 <th style="text-align:center;">Jan &nbsp;(<i class="fa fa-rupee "  ></i>)</th>
-							 <th style="text-align: center;">Feb &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align: center;">Mar &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-							 <th style="text-align: center;">Total &nbsp;(<i class="fa fa-rupee "  ></i>)</th>
-                             
-                        </tr>
-                        </thead>
-                        <tbody>
-
-                        <?php 
-						if(!empty($spurchse)){
-						$vapr = 0;
-						$vmay = 0;
-						$vjun = 0;
-						$vjul = 0;
-						$vaug = 0;
-						$vsep = 0;
-						$voct = 0;
-						$vnov = 0;
-						$vdec = 0;
-						$vjan = 0;
-						$vfeb = 0;
-						$vmar = 0;
-						$vtot = 0;
-						foreach ($spurchse as $index=>$result) { ?>
-						<tr>
-						    <td style="text-align:left;">
-							<a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>"><?php echo $result->category;?> </a>
-							</td>
-							<td style="text-align:right;"><span id="aprilval<?php echo $index?>">
-							<?php 
-							$vapr= $vapr + number_format($result->vApril,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'April';?>"><?php echo number_format($result->vApril,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="mayval<?php echo $index?>">
-							<?php 
-							$vmay= $vmay + number_format($result->vMay,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'May';?>"><?php echo number_format($result->vMay,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id ="juneval<?php echo $index?>">
-							<?php 
-							$vjun= $vjun + number_format($result->vJune,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'June';?>"><?php echo number_format($result->vJune,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="julyval<?php echo $index?>">
-							<?php 
-							$vjul= $vjul + number_format($result->vJuly,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'July';?>"><?php echo number_format($result->vJuly,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="augval<?php echo $index?>">
-							<?php 
-							$vaug= $vaug + number_format($result->vAugust,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'August';?>"><?php echo number_format($result->vAugust,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="sepval<?php echo $index?>">
-							<?php 
-							$vsep= $vsep + number_format($result->vSeptember,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'September';?>"><?php echo number_format($result->vSeptember,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="octval<?php echo $index?>">
-							<?php 
-							$voct= $voct + number_format($result->vOctober,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'October';?>"><?php echo number_format($result->vOctober,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="novval<?php echo $index?>">
-							<?php 
-							$vnov= $vnov + number_format($result->vNovember,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'November';?>"><?php echo number_format($result->vNovember,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="decval<?php echo $index?>">
-							<?php 
-							$vdec= $vdec + number_format($result->vDecember,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'December';?>"><?php echo number_format($result->vDecember,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="janval<?php echo $index?>">
-							<?php 
-							$vjan= $vjan + number_format($result->vJanuary,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'January';?>"><?php echo number_format($result->vJanuary,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="febval<?php echo $index?>">
-							<?php 
-							$vfeb= $vfeb + number_format($result->vFebruary,2,'.','');
-							?>
-						    <a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'February';?>"><?php echo number_format($result->vFebruary,2,'.','');?> </a></span>
-							</td>
-							<td style="text-align:right;"><span id="marval<?php echo $index?>">
-							<?php 
-							$vmar= $vmar + number_format($result->vMarch,2,'.','');
-							?>
-							<a href="<?= base_url() ?>report/rawi_consolidate_month?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>&m=<?php echo 'March';?>"><?php echo number_format($result->vMarch,2,'.','');?> </a></span>
-							</td>
-							 <td style="text-align:right;"><span id="totalval<?php echo $index?>">
-							 <?php 
-							$vtot= $vtot + number_format($result->vtotal,2,'.','');
-							?>
-							 <a href="<?= base_url() ?>report/rawi_consolidate_year?ab=<?php echo $ab;?>&cat=<?php echo $result->category;?>"><?php echo number_format($result->vtotal,2,'.','');?> </a></span>
-							 </td>
-						</tr>
-						
-					<?php
-					
-					} 
-					
-					
-					?>
-                        </tbody>
-						<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						<td style="text-align:right;"><strong><?php 
-								 {
-								 echo number_format($vapr,2,'.','');
-								
-								  } 
-								 ?>  
-							</strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo number_format($vmay,2,'.','');
-								
-								  } 
-								 ?>  
-						    </strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo number_format($vjun,2,'.','');
-								
-								  } 
-								 ?>  
-						   </strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo number_format($vjul,2,'.','');
-								
-								  } 
-								 ?>  
-						   </strong></td>
-						   <td style="text-align:right;"><strong>
-						   <?php 
-								 {
-								 echo number_format($vaug,2,'.','');
-								
-								  } 
-								 ?>  
-						   </strong></td>
-							<td style="text-align:right;"><strong>
-								 <?php 
-								 {
-								 echo number_format($vsep,2,'.','');
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								<td style="text-align:right;"><strong>
-								 <?php 
-								 {
-								 echo  number_format($voct,2,'.','');
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>	
-								<td style="text-align:right;">
-								<strong>
-								<?php 
-								 {
-								 echo number_format($vnov,2,'.','');
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right;">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($vdec,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										<td style="text-align:right;">
-										<strong>
-										<?php 
-										 {
-										 echo number_format($vjan,2,'.','');
-										
-										  } 
-										 ?> 
-										</strong>
-										</td>
-											<td style="text-align:right;">
-											<strong>
-											<?php 
-											 {
-											 echo number_format($vfeb,2,'.','');
-											
-											  } 
-											 ?> 
-											</strong>
-											</td>
-												<td style="text-align:right;"> 
-												<strong>
-												<?php 
-												 {
-												 echo number_format($vmar,2,'.','');
-												
-												  } 
-												  
-												 ?>  
-												 </strong></td>
-												 <td style="text-align:right;"> 
-												<strong>
-												<?php 
-												 {
-												 echo number_format($vtot,2,'.','');
-												
-												  } 
-												  
-												 ?>  
-												 </strong></td>
-											
-												
-												
-						</tr>
-						
-						</tfoot>
-						<?php
-					
-					} 
-					
-					
-					?>
-                    </table>
-                
-                </div>
-	 
-			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-	  </div>
-	  </section>
-	  </div>
-	 
+		</div> <!-- container -->
+	</div> <!-- content -->
+</div>
 
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
+    // 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+                previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+            }
+        }
+    });
+});
+</script>
+
 
 <script> 
 	
@@ -717,20 +698,21 @@ $('#tab').on('search.dt', function() {
 });
 
 
+    var qapril_sum = "<?php echo json_encode($qapr??0)?>";
+	var qmay_sum="<?php echo json_encode($qmay??0)?>";
+    var qjune_sum = "<?php echo json_encode($qjun??0)?>";
+    var qjuly_sum = "<?php echo json_encode($qjul??0)?>";
+    var qaug_sum = "<?php echo json_encode($qaug??0)?>";
+    var qsep_sum= "<?php echo json_encode($qsep??0)?>";
+    var qoct_sum = "<?php echo json_encode($qoct??0)?>";
+    var qnov_sum = "<?php echo json_encode($qnov??0)?>";
+    var qdec_sum= "<?php echo json_encode($qdec??0)?>";
+    var qjan_sum= "<?php echo json_encode($qjan??0)?>";
+    var qfeb_sum= "<?php echo json_encode($qfeb??0)?>";
+    var qmar_sum= "<?php echo json_encode($qmar??0)?>";
+    var qtotal_sum= "<?php echo json_encode($qtot??0)?>";
+
 
-    var qapril_sum = "<?php echo json_encode($qapr)?>";
-	var qmay_sum="<?php echo json_encode($qmay)?>";
-    var qjune_sum = "<?php echo json_encode($qjun)?>";
-    var qjuly_sum = "<?php echo json_encode($qjul)?>";
-    var qaug_sum = "<?php echo json_encode($qaug)?>";
-    var qsep_sum= "<?php echo json_encode($qsep)?>";
-    var qoct_sum = "<?php echo json_encode($qoct)?>";
-    var qnov_sum = "<?php echo json_encode($qnov)?>";
-    var qdec_sum= "<?php echo json_encode($qdec)?>";
-    var qjan_sum= "<?php echo json_encode($qjan)?>";
-    var qfeb_sum= "<?php echo json_encode($qfeb)?>";
-    var qmar_sum= "<?php echo json_encode($qmar)?>";
-    var qtotal_sum= "<?php echo json_encode($qtot)?>";
 
 
 
@@ -739,7 +721,7 @@ $('#tab').on('search.dt', function() {
         "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: [
+       buttons: [
             
             {
                 extend: 'excelHtml5',
@@ -756,10 +738,10 @@ $('#tab').on('search.dt', function() {
         ],
 
 
-        
     "footerCallback": function ( row, data, start, end, display ) 
     {  
 
+
     	var april_sum=0;
     	var may_sum=0;
     	var june_sum = 0;
@@ -774,7 +756,8 @@ $('#tab').on('search.dt', function() {
     	var mar_sum=0;
     	var total_sum=0;
 
-    	if(txt_count !=0){
+    	if(txt_count !=0)
+    	{
        
        for(var j = 0;j<=display.length-1;j++)
 	   {
@@ -825,27 +808,27 @@ $('#tab').on('search.dt', function() {
 	   var Final_mar_total = parseInt(mar_sum);
 	   var Final_tot = parseInt(total_sum);
 
-	  // console.log(Final_jan_total);
+	   $( api.column( 2 ).footer() ).html( Final_april_total.toFixed(2).bold() );
+	   $( api.column( 3 ).footer() ).html( Final_may_total.toFixed(2).bold() );
+	   $( api.column( 4 ).footer() ).html( Final_june_total.toFixed(2).bold() );
+	   $( api.column( 5 ).footer() ).html( Final_july_total.toFixed(2).bold() );
+	   $( api.column( 6 ).footer() ).html( Final_aug_total.toFixed(2).bold() );
+	   $( api.column( 7 ).footer() ).html( Final_sep_total.toFixed(2).bold() );
+	   $( api.column( 8 ).footer() ).html( Final_oct_total.toFixed(2).bold() );
+	   $( api.column( 9 ).footer() ).html( Final_nov_total.toFixed(2).bold() );
+	   $( api.column( 10 ).footer() ).html( Final_dec_total.toFixed(2).bold() );
+	   $( api.column( 11 ).footer() ).html( Final_jan_total.toFixed(2).bold() );
+	   $( api.column( 12 ).footer() ).html( Final_feb_total.toFixed(2).bold() );
+	   $( api.column( 13 ).footer() ).html( Final_mar_total.toFixed(2).bold() );
+	   $( api.column( 14 ).footer() ).html( Final_tot.toFixed(2).bold() );
 
-	   $( api.column( 1 ).footer() ).html( Final_april_total.toFixed(2).bold() );
-	   $( api.column( 2 ).footer() ).html( Final_may_total.toFixed(2).bold() );
-	   $( api.column( 3 ).footer() ).html( Final_june_total.toFixed(2).bold() );
-	   $( api.column( 4 ).footer() ).html( Final_july_total.toFixed(2).bold() );
-	   $( api.column( 5 ).footer() ).html( Final_aug_total.toFixed(2).bold() );
-	   $( api.column( 6 ).footer() ).html( Final_sep_total.toFixed(2).bold() );
-	   $( api.column( 7 ).footer() ).html( Final_oct_total.toFixed(2).bold() );
-	   $( api.column( 8 ).footer() ).html( Final_nov_total.toFixed(2).bold() );
-	   $( api.column( 9 ).footer() ).html( Final_dec_total.toFixed(2).bold() );
-	   $( api.column( 10 ).footer() ).html( Final_jan_total.toFixed(2).bold() );
-	   $( api.column( 11 ).footer() ).html( Final_feb_total.toFixed(2).bold() );
-	   $( api.column( 12 ).footer() ).html( Final_mar_total.toFixed(2).bold() );
-	   $( api.column( 13 ).footer() ).html( Final_tot.toFixed(2).bold() );
-       }
 
-       else
-       {
-          
-          var api = this.api(), data;
+	}
+
+	else
+	{
+
+       var api = this.api(), data;
 	   var Final_april_total =parseInt(qapril_sum);
 	   var Final_may_total = parseInt(qmay_sum);
 	   var Final_june_total = parseInt(qjune_sum);
@@ -860,33 +843,30 @@ $('#tab').on('search.dt', function() {
 	   var Final_mar_total = parseInt(qmar_sum);
 	   var Final_tot = parseInt(qtotal_sum);
 
-	  // console.log(Final_jan_total);
+	   $( api.column( 2 ).footer() ).html( Final_april_total.toFixed(2).bold() );
+	   $( api.column( 3 ).footer() ).html( Final_may_total.toFixed(2).bold() );
+	   $( api.column( 4 ).footer() ).html( Final_june_total.toFixed(2).bold() );
+	   $( api.column( 5 ).footer() ).html( Final_july_total.toFixed(2).bold() );
+	   $( api.column( 6 ).footer() ).html( Final_aug_total.toFixed(2).bold() );
+	   $( api.column( 7 ).footer() ).html( Final_sep_total.toFixed(2).bold() );
+	   $( api.column( 8 ).footer() ).html( Final_oct_total.toFixed(2).bold() );
+	   $( api.column( 9 ).footer() ).html( Final_nov_total.toFixed(2).bold() );
+	   $( api.column( 10 ).footer() ).html( Final_dec_total.toFixed(2).bold() );
+	   $( api.column( 11 ).footer() ).html( Final_jan_total.toFixed(2).bold() );
+	   $( api.column( 12 ).footer() ).html( Final_feb_total.toFixed(2).bold() );
+	   $( api.column( 13 ).footer() ).html( Final_mar_total.toFixed(2).bold() );
+	   $( api.column( 14 ).footer() ).html( Final_tot.toFixed(2).bold() );
+    
+	}
 
-	   $( api.column( 1 ).footer() ).html( Final_april_total.toFixed(2).bold() );
-	   $( api.column( 2 ).footer() ).html( Final_may_total.toFixed(2).bold() );
-	   $( api.column( 3 ).footer() ).html( Final_june_total.toFixed(2).bold() );
-	   $( api.column( 4 ).footer() ).html( Final_july_total.toFixed(2).bold() );
-	   $( api.column( 5 ).footer() ).html( Final_aug_total.toFixed(2).bold() );
-	   $( api.column( 6 ).footer() ).html( Final_sep_total.toFixed(2).bold() );
-	   $( api.column( 7 ).footer() ).html( Final_oct_total.toFixed(2).bold() );
-	   $( api.column( 8 ).footer() ).html( Final_nov_total.toFixed(2).bold() );
-	   $( api.column( 9 ).footer() ).html( Final_dec_total.toFixed(2).bold() );
-	   $( api.column( 10 ).footer() ).html( Final_jan_total.toFixed(2).bold() );
-	   $( api.column( 11 ).footer() ).html( Final_feb_total.toFixed(2).bold() );
-	   $( api.column( 12 ).footer() ).html( Final_mar_total.toFixed(2).bold() );
-	   $( api.column( 13 ).footer() ).html( Final_tot.toFixed(2).bold() );
-       }
-   
     }
 
-
-
-
     } );
 } );
 $(document).ready(function() {
 
-   var vtxt_count = 0;
+
+ var vtxt_count = 0;
 
   $('#ta').on('search.dt', function() {
 
@@ -901,19 +881,22 @@ $(document).ready(function() {
 });
 
 
-  var vaprilval_sum = "<?php echo json_encode($vapr)?>";
-    var vmayval_sum = "<?php echo json_encode($vmay)?>";
-    var vjuneval_sum = "<?php echo json_encode($vjun)?>";
-    var vjulyval_sum = "<?php echo json_encode($vjul)?>";
-    var vaugval_sum = "<?php echo json_encode($vaug)?>";
-    var vsepval_sum = "<?php echo json_encode($vsep)?>";
-    var voctval_sum = "<?php echo json_encode($voct)?>";
-    var vnovval_sum = "<?php echo json_encode($vnov)?>";
-    var vdecval_sum = "<?php echo json_encode($vdec)?>";
-    var vjanval_sum = "<?php echo json_encode($vjan)?>";
-    var vfebval_sum = "<?php echo json_encode($vfeb)?>";
-    var vmarval_sum = "<?php echo json_encode($vmar)?>";
-    var vtotalval_sum = "<?php echo json_encode($vtot)?>";
+
+    var vaprilval_sum = "<?php echo json_encode($vapr??0)?>";
+    var vmayval_sum = "<?php echo json_encode($vmay??0)?>";
+    var vjuneval_sum = "<?php echo json_encode($vjun??0)?>";
+    var vjulyval_sum = "<?php echo json_encode($vjul??0)?>";
+    var vaugval_sum = "<?php echo json_encode($vaug??0)?>";
+    var vsepval_sum = "<?php echo json_encode($vsep??0)?>";
+    var voctval_sum = "<?php echo json_encode($voct??0)?>";
+    var vnovval_sum = "<?php echo json_encode($vnov??0)?>";
+    var vdecval_sum = "<?php echo json_encode($vdec??0)?>";
+    var vjanval_sum = "<?php echo json_encode($vjan??0)?>";
+    var vfebval_sum = "<?php echo json_encode($vfeb??0)?>";
+    var vmarval_sum = "<?php echo json_encode($vmar??0)?>";
+    var vtotalval_sum = "<?php echo json_encode($vtot??0)?>";
+
+    
 
 
 
@@ -921,7 +904,7 @@ $(document).ready(function() {
         "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: [
+       buttons: [
             
             {
                 extend: 'excelHtml5',
@@ -938,7 +921,7 @@ $(document).ready(function() {
         ],
 
 
-     "footerCallback": function ( row, data, start, end, display ) 
+    "footerCallback": function ( row, data, start, end, display ) 
     {
          var aprilval_sum =0;
          var mayval_sum =0;
@@ -953,9 +936,8 @@ $(document).ready(function() {
          var febval_sum =0;
          var marval_sum =0;
          var totalval_sum =0;
-
-          if(vtxt_count !=0){
-
+       if(vtxt_count !=0)
+       {
          for(var j = 0;j<=display.length-1;j++)
 	     {
            var count = display[j];
@@ -1007,59 +989,59 @@ $(document).ready(function() {
 	   var Final_mar_total = parseInt(marval_sum);
 	   var Final_tot = parseInt(totalval_sum);
 
-	   $( api.column( 1 ).footer() ).html( Final_april_total.toFixed(2).bold() );
-	   $( api.column( 2 ).footer() ).html( Final_may_total.toFixed(2).bold() );
-	   $( api.column( 3 ).footer() ).html( Final_june_total.toFixed(2).bold() );
-	   $( api.column( 4 ).footer() ).html( Final_july_total.toFixed(2).bold() );
-	   $( api.column( 5 ).footer() ).html( Final_aug_total.toFixed(2).bold() );
-	   $( api.column( 6 ).footer() ).html( Final_sep_total.toFixed(2).bold() );
-	   $( api.column( 7 ).footer() ).html( Final_oct_total.toFixed(2).bold() );
-	   $( api.column( 8 ).footer() ).html( Final_nov_total.toFixed(2).bold() );
-	   $( api.column( 9 ).footer() ).html( Final_dec_total.toFixed(2).bold() );
-	   $( api.column( 10 ).footer() ).html( Final_jan_total.toFixed(2).bold() );
-	   $( api.column( 11 ).footer() ).html( Final_feb_total.toFixed(2).bold() );
-	   $( api.column( 12 ).footer() ).html( Final_mar_total.toFixed(2).bold() );
-	   $( api.column( 13 ).footer() ).html( Final_tot.toFixed(2).bold() );
+	   $( api.column( 2 ).footer() ).html( Final_april_total.toFixed(2).bold() );
+	   $( api.column( 3 ).footer() ).html( Final_may_total.toFixed(2).bold() );
+	   $( api.column( 4 ).footer() ).html( Final_june_total.toFixed(2).bold() );
+	   $( api.column( 5 ).footer() ).html( Final_july_total.toFixed(2).bold() );
+	   $( api.column( 6 ).footer() ).html( Final_aug_total.toFixed(2).bold() );
+	   $( api.column( 7 ).footer() ).html( Final_sep_total.toFixed(2).bold() );
+	   $( api.column( 8 ).footer() ).html( Final_oct_total.toFixed(2).bold() );
+	   $( api.column( 9 ).footer() ).html( Final_nov_total.toFixed(2).bold() );
+	   $( api.column( 10 ).footer() ).html( Final_dec_total.toFixed(2).bold() );
+	   $( api.column( 11 ).footer() ).html( Final_jan_total.toFixed(2).bold() );
+	   $( api.column( 12 ).footer() ).html( Final_feb_total.toFixed(2).bold() );
+	   $( api.column( 13 ).footer() ).html( Final_mar_total.toFixed(2).bold() );
+	   $( api.column( 14 ).footer() ).html( Final_tot.toFixed(2).bold() );
 
-	}
-	else
-	{
+	  }
 
-             var api = this.api(), data;
-	   var Final_april_total =parseInt(vaprilval_sum);
-	   var Final_may_total = parseInt(vmayval_sum);
-	   var Final_june_total = parseInt(vjuneval_sum);
-	   var Final_july_total = parseInt(vjulyval_sum);
-	   var Final_aug_total = parseInt(vaugval_sum);
-	   var Final_sep_total = parseInt(vsepval_sum);
-	   var Final_oct_total = parseInt(voctval_sum);
-	   var Final_nov_total = parseInt(vnovval_sum);
-	   var Final_dec_total = parseInt(vdecval_sum);
-	   var Final_jan_total = parseInt(vjanval_sum);
-	   var Final_feb_total = parseInt(vfebval_sum);
-	   var Final_mar_total = parseInt(vmarval_sum);
-	   var Final_tot = parseInt(vtotalval_sum);
+	  else
+	  {
 
-	   $( api.column( 1 ).footer() ).html( Final_april_total.toFixed(2).bold() );
-	   $( api.column( 2 ).footer() ).html( Final_may_total.toFixed(2).bold() );
-	   $( api.column( 3 ).footer() ).html( Final_june_total.toFixed(2).bold() );
-	   $( api.column( 4 ).footer() ).html( Final_july_total.toFixed(2).bold() );
-	   $( api.column( 5 ).footer() ).html( Final_aug_total.toFixed(2).bold() );
-	   $( api.column( 6 ).footer() ).html( Final_sep_total.toFixed(2).bold() );
-	   $( api.column( 7 ).footer() ).html( Final_oct_total.toFixed(2).bold() );
-	   $( api.column( 8 ).footer() ).html( Final_nov_total.toFixed(2).bold() );
-	   $( api.column( 9 ).footer() ).html( Final_dec_total.toFixed(2).bold() );
-	   $( api.column( 10 ).footer() ).html( Final_jan_total.toFixed(2).bold() );
-	   $( api.column( 11 ).footer() ).html( Final_feb_total.toFixed(2).bold() );
-	   $( api.column( 12 ).footer() ).html( Final_mar_total.toFixed(2).bold() );
-	   $( api.column( 13 ).footer() ).html( Final_tot.toFixed(2).bold() );
-  
-	}
+
+	  			var api = this.api(), data;
+				var Final_april_total =parseInt(vaprilval_sum);
+				var Final_may_total = parseInt(vmayval_sum);
+				var Final_june_total = parseInt(vjuneval_sum);
+				var Final_july_total = parseInt(vjulyval_sum);
+				var Final_aug_total = parseInt(vaugval_sum);
+				var Final_sep_total = parseInt(vsepval_sum);
+				var Final_oct_total = parseInt(voctval_sum);
+				var Final_nov_total = parseInt(vnovval_sum);
+				var Final_dec_total = parseInt(vdecval_sum);
+				var Final_jan_total = parseInt(vjanval_sum);
+				var Final_feb_total = parseInt(vfebval_sum);
+				var Final_mar_total = parseInt(vmarval_sum);
+				var Final_tot = parseInt(vtotalval_sum);
+
+	   $( api.column( 2 ).footer() ).html( Final_april_total.toFixed(2).bold() );
+	   $( api.column( 3 ).footer() ).html( Final_may_total.toFixed(2).bold() );
+	   $( api.column( 4 ).footer() ).html( Final_june_total.toFixed(2).bold() );
+	   $( api.column( 5 ).footer() ).html( Final_july_total.toFixed(2).bold() );
+	   $( api.column( 6 ).footer() ).html( Final_aug_total.toFixed(2).bold() );
+	   $( api.column( 7 ).footer() ).html( Final_sep_total.toFixed(2).bold() );
+	   $( api.column( 8 ).footer() ).html( Final_oct_total.toFixed(2).bold() );
+	   $( api.column( 9 ).footer() ).html( Final_nov_total.toFixed(2).bold() );
+	   $( api.column( 10 ).footer() ).html( Final_dec_total.toFixed(2).bold() );
+	   $( api.column( 11 ).footer() ).html( Final_jan_total.toFixed(2).bold() );
+	   $( api.column( 12 ).footer() ).html( Final_feb_total.toFixed(2).bold() );
+	   $( api.column( 13 ).footer() ).html( Final_mar_total.toFixed(2).bold() );
+	   $( api.column( 14 ).footer() ).html( Final_tot.toFixed(2).bold() );
+
+	  }
 
      }
 
-
-
     } );
 } );
  
@@ -1082,4 +1064,3 @@ function toggleTables(which)
 	</script>
 	
 	
-	
\ 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_y -->
+<script>
+	$(document).ready(function() {
 
+		$("#client_name").select2();
+		$("#item_name").select2();
+		$("#purchaseorder_number").select2();
+
+
+	});
+</script>
+<?php $ab = isset($financialyear) ? $financialyear : '';
+$m = isset($month) ? $month : '';
+?>
 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
+<style>
+	table {
+		width: auto;
+	}
 
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	   <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Consolidate(<?php
-			  $m = $this->input->get('ab');
-			  echo $m;
-			  ?>)</b></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				    <tr>
-					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Material Name</th>
-						 <th  style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th> 
-						 </tr>
-                     <tr>
-				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(&#8377;)</th>
-					    
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php 
-					  
-					   if(!empty($spurchse)){
-					   $tqt=0;
-					   $tvt=0;
-					  $ab=$this->input->get('ab');
-					 
-						$month=date('F');
-						//echo $month;
-					   foreach($spurchse as $rel)
-					    {				
-					   ?> 
-					  <tr>
-					 
-                       <td><span>
-					   <a href="<?= base_url() ?>report/link_purchase?sid=<?php echo $rel->sid;?>&ab=<?php echo $ab;?>&mid=<?php echo $rel->mid;?>"><?php echo $rel->supplier_name;?> </a>
-					   
-					   </span></td>
-					   <td><span><?php echo $rel->material_name;?></span></td>
-					   <td style="text-align:right"><span><?php 
-						$tqt= $tqt + round($rel->quantity);
-						echo round($rel->quantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tvt= $tvt + number_format($rel->total,2,'.','');
-						echo number_format($rel->total,2,'.','');?></span></td>
-						
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							
-								<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td> 
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tqt;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tvt,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
+	.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; */
+
+	}
+</style>
+
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Purchase</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Report - Purchase Consolidate <?php echo isset($month) ? $month : ''; ?> </b></h4>
+									</li>
+								</ol>
+							</div>
+
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<table id="cc" class="table table-bordered table-hover wrap" style="background-color:#fff;width: 100% !important;">
+									<thead>
+										<tr>
+											<th style="text-align:center" rowspan="2">Supplier Name</th>
+											<th style="text-align:center" rowspan="2">Material Name</th>
+											<th style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th>
+										</tr>
+										<tr>
+											<th style="text-align:center">Quantity</th>
+											<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+
+
+										</tr>
+									</thead>
+									<tbody>
+										<?php
+
+										if (!empty($spurchse)) {
+											$tqt = 0;
+											$tvt = 0;
+											foreach ($spurchse as $rel) {
+										?>
+												<tr>
+
+													<td><span>
+															<a href="<?= base_url() ?>report/link_purchase?ab=<?php echo $ab; ?>&sid=<?php echo $rel->sid; ?>&mid=<?php echo $rel->mid; ?>&month=<?php echo $m; ?>"><?php echo $rel->supplier_name; ?> </a>
+														</span></td>
+													<td><span><?php echo $rel->material_name; ?></span></td>
+													<td style="text-align:right"><span><?php
+																						$tqt = $tqt + round($rel->quantity);
+																						echo round($rel->quantity); ?></span></td>
+													<td style="text-align:right"><span><?php
+																						$tvt = $tvt + number_format($rel->total, 2, '.', '');
+																						echo number_format($rel->total, 2, '.', ''); ?></span></td>
+
+
+												</tr>
+											<?php
+											}
+
+											?>
+									</tbody>
+									<tfoot width="100%">
+										<tr>
+											<td style="text-align:center;"><strong>Total</strong></td>
+
+
+											<td style="text-align:right"><strong>
+													<?php {
+														echo '';
+													}
+													?>
+												</strong>
+											</td>
+											<td style="text-align:right">
+												<strong>
+													<?php {
+														echo $tqt;
+													}
+													?>
+												</strong>
+											</td>
+											<td style="text-align:right">
+												<strong>
+													<?php {
+														echo number_format($tvt, 2, '.', '');
+													}
+													?>
+												</strong>
+											</td>
+
+
+
+										</tr>
+
+									</tfoot>
+								<?php
+										}
+
+								?>
+								</table>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-      </div>
-	  </section>
-	  </div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+</div>
 
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
+		// 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+					previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+				}
+			}
+		});
+	});
+</script>
 
-<script> 
-	
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":"<center> Data Not Found ! </center>"
-        },
-        "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'
-        ],
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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;
-            };
+<script>
+	function toggleTables(which) {
 
-			TotalQTY = api
-                 .column( 2, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
+		if (which == "1") {
+			document.getElementById('a').style.display = "block";
+			document.getElementById('b').style.display = "none";
 
-             $( api.column( 2 ).footer() ).html( TotalQTY.toFixed().bold() );
-			 
-			TotalVALUE = api
-                 .column( 3, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-				
-             $( api.column( 3 ).footer() ).html(  TotalVALUE.toFixed(2).bold() );
+		}
+		if (which == "2") {
+			document.getElementById('b').style.display = "block";
+			document.getElementById('a').style.display = "none";
 
-		
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	
-
-	</script>
-	
-	
-	
\ No newline at end of file
+		}
+	}
+</script>
\ 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 @@
+<!-- Report_consolidate_month -->
+<style>
+  table {
+    width: auto;
+  }
+</style>
 
+<div class="content-page">
+  <div class="content">
+    <!-- Start Content-->
+    <div class="container-fluid">
+      <!-- start page title -->
+      <div>
+        <div class="row">
+          <div class="col-12">
+            <div class="page-title-box page-title-box-alt">
+              <div class="page-title-right">
+                <ol class="breadcrumb m-0">
+                  <li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+                  <li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+                  <li class="breadcrumb-item active">
+                    <h4 class="page-title"><b> Consolidate Category-Wise <?php echo isset($financialyear) ? '(' . $financialyear . ')' : '' ?> </b></h4>
+                  </li>
+                </ol>
+              </div>
 
-<?php
-if(!empty($mms))
-{
-
-}
-?>
-
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
-
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	   <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Consolidate Category-Wise(<?php
-			  $m = $this->input->get('ab');
-			  echo $m;
-			  ?>)</b></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				    <tr>
-					     <th style="text-align:center" rowspan="2">Category</th>
-					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Material Name</th>
-						 <th  style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th> 
-						 </tr>
-                     <tr>
-				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(&#8377;)</th>
-					    
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php 
-					  
-					   if(!empty($spurchse)){
-					   $tqt=0;
-					   $tvt=0;
-					  $ab=$this->input->get('ab');
-					 
-						$month=date('F');
-						//echo $month;
-					   foreach($spurchse as $rel)
-					    {				
-					   ?> 
-					  <tr>
-					  <td style="text-align:left;">
-							<?php echo $rel->category;?>
-							</td>
-                       <td><span>
-					   <a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid;?>&ab=<?php echo $ab;?>&mid=<?php echo $rel->mid;?>&cat=<?php echo $rel->category;?>"><?php echo $rel->supplier_name;?> </a>
-					   
-					   </span></td>
-					   <td><span><?php echo $rel->material_name;?></span></td>
-					   <td style="text-align:right"><span><?php 
-						$tqt= $tqt + round($rel->quantity);
-						echo round($rel->quantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tvt= $tvt + number_format($rel->total,2,'.','');
-						echo number_format($rel->total,2,'.','');?></span></td>
-						
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td> 
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tqt;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tvt,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
-				</div>
-			   </div>
-			</div>
-          <!-- /.box -->
+            </div>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-12">
+            <div class="card">
+              <div class="card-body">
+                <table id="cc" class="table table-bordered table-hover mb-0 nowrap w-100"
+                  style="background-color:#fff; font-size:12px;">
+                  <thead>
+                    <tr>
+                      <th style="text-align:center" rowspan="2">Category</th>
+                      <th style="text-align:center" rowspan="2">Supplier Name</th>
+                      <th style="text-align:center" rowspan="2">Material Name</th>
+                      <th style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th>
+                    </tr>
+                    <tr>
+                      <th style="text-align:center">Quantity</th>
+                      <th style="text-align:center">Value &nbsp;(&#8377;)</th>
+
+
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <?php
+
+                    if (!empty($spurchse)) {
+                      $tqt = 0;
+                      $tvt = 0;
+                      $ab = isset($financialyear) ? $financialyear : '';
+
+                      // $month=date('F');
+                      //echo $month;
+                      foreach ($spurchse as $rel) {
+                    ?>
+                        <tr>
+                          <td style="text-align:left;">
+                            <?php echo $rel->category; ?>
+                          </td>
+                          <td><span>
+                              <a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid; ?>&ab=<?php echo $ab; ?>&mid=<?php echo $rel->mid; ?>&cat=<?php echo $rel->category; ?>"><?php echo $rel->supplier_name; ?> </a>
+
+                            </span></td>
+                          <td><span><?php echo $rel->material_name; ?></span></td>
+                          <td style="text-align:right"><span><?php
+                                                              $tqt = $tqt + round($rel->quantity);
+                                                              echo round($rel->quantity); ?></span></td>
+                          <td style="text-align:right"><span><?php
+                                                              $tvt = $tvt + number_format($rel->total, 2, '.', '');
+                                                              echo number_format($rel->total, 2, '.', ''); ?></span></td>
+
+
+                        </tr>
+                      <?php
+                      }
+
+                      ?>
+                  </tbody>
+                  <tfoot width="100%">
+                    <tr>
+                      <td style="text-align:center;"><strong>Total</strong></td>
+
+                      <td style="text-align:right"><strong>
+                          <?php {
+                            echo '';
+                          }
+                          ?>
+                        </strong>
+                      </td>
+                      <td style="text-align:right"><strong>
+                          <?php {
+                            echo '';
+                          }
+                          ?>
+                        </strong>
+                      </td>
+                      <td style="text-align:right">
+                        <strong>
+                          <?php {
+                            echo $tqt;
+                          }
+                          ?>
+                        </strong>
+                      </td>
+                      <td style="text-align:right">
+                        <strong>
+                          <?php {
+                            echo number_format($tvt, 2, '.', '');
+                          }
+                          ?>
+                        </strong>
+                      </td>
+
+
+
+                    </tr>
+
+                  </tfoot>
+                <?php
+                    }
+
+                ?>
+                </table>
+              </div> <!-- end card body-->
+            </div> <!-- end card -->
+          </div><!-- end col-->
         </div>
-        <!-- /.col -->
       </div>
-	  </section>
-	  </div>
+    </div> <!-- container -->
+  </div> <!-- content -->
+</div>
 
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
 
-<script> 
-	
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":"<center> Data Not Found ! </center>"
+    // 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+          previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
         },
-        "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'
-        ],
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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;
-            };
+        emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
 
-			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() );
-
-		
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
+      }
     });
-	
-	
+  });
+</script>
 
-	</script>
-	
-	
-	
\ No newline at end of file
+<script>
+  // "footerCallback": function ( row, data, start, end, display ) {
+  //     var api = this.api(), data;
+
+  //     // 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() );
+</script>
\ 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_year_inward -->
+<!-- Report_consolidate_month_inward.php -->
+<script>
+	$(document).ready(function() {
+		$("#financialyear").select2();
+		$("#month").select2();
+	});
+</script>
 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
 
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	  <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Consolidate-Inward<?php
-			  if ($this->input->get('ab')){
-			  $ab = $this->input->get('ab');
-			  echo '('.$ab.')';
-			  }
-			  ?></b></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				    <tr>
-					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Material Name</th>
-						 <th  style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th> 
-						 </tr>
-                     <tr>
-				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(&#8377;)</th>
-					    
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php 
-					  
-					   if(!empty($spurchse)){
-					   $tqt=0;
-					   $tvt=0;
-					  $ab=$this->input->get('ab');
-						$month=date('F');
-						 $m = $this->input->get('m');
-						//echo $month;
-					   foreach($spurchse as $rel)
-					    {				
-					   ?> 
-					  <tr>
-					 
-                       <td><span>
-					   <a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab;?>&sid=<?php echo $rel->sid;?>&mid=<?php echo $rel->mid;?>"><?php echo $rel->supplier_name;?> </a>
-					   </span></td>
-					   <td><span><?php echo $rel->material_name;?></span></td>
-					   <td style="text-align:right"><span><?php 
-						$tqt= $tqt + round($rel->quantity);
-						echo round($rel->quantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tvt= $tvt + number_format($rel->total,2,'.','');
-						echo number_format($rel->total,2,'.','');?></span></td>
-						
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							
-								<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td> 
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tqt;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tvt,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
+<style>
+	table {
+		width: auto;
+	}
+</style>
+
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Consolidate <!-- ( <?php echo $financialyear; ?> ) --> </b></h4>
+									</li>
+								</ol>
+							</div>
+
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<table id="cc" class="table table-bordered table-hover mb-0 nowrap w-100"
+									style="background-color:#fff; font-size:12px;">
+
+
+
+									<thead>
+										<tr>
+											<th style="text-align:center" rowspan="2">Supplier Name</th>
+											<th style="text-align:center" rowspan="2">Material Name</th>
+											<th style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th>
+										</tr>
+										<tr>
+											<th style="text-align:center">Quantity</th>
+											<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+
+
+										</tr>
+									</thead>
+									<tbody>
+										<?php
+
+										if (!empty($spurchse)) {
+											$tqt = 0;
+											$tvt = 0;
+											$ab = $financialyear;
+											$month_word = date('F');
+											$m = isset($month) ? $month : '';
+											//echo $month_word;
+											foreach ($spurchse as $rel) {
+										?>
+												<tr>
+
+													<td><span>
+															<a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab; ?>&sid=<?php echo $rel->sid; ?>&mid=<?php echo $rel->mid; ?>"><?php echo $rel->supplier_name; ?> </a>
+														</span></td>
+													<td><span><?php echo $rel->material_name; ?></span></td>
+													<td style="text-align:right"><span><?php
+																						$tqt = $tqt + round($rel->quantity);
+																						echo round($rel->quantity); ?></span></td>
+													<td style="text-align:right"><span><?php
+																						$tvt = $tvt + number_format($rel->total, 2, '.', '');
+																						echo number_format($rel->total, 2, '.', ''); ?></span></td>
+
+
+												</tr>
+											<?php
+											}
+
+											?>
+									</tbody>
+									<tfoot width="100%">
+										<tr>
+											<td style="text-align:center;"><strong>Total</strong></td>
+
+
+											<td style="text-align:right"><strong>
+													<?php {
+														echo '';
+													}
+													?>
+												</strong>
+											</td>
+											<td style="text-align:right">
+												<strong>
+													<?php {
+														echo $tqt;
+													}
+													?>
+												</strong>
+											</td>
+											<td style="text-align:right">
+												<strong>
+													<?php {
+														echo number_format($tvt, 2, '.', '');
+													}
+													?>
+												</strong>
+											</td>
+
+
+
+										</tr>
+
+									</tfoot>
+								<?php
+										}
+
+								?>
+								</table>
+
+
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-	  </div>
-	  </section>
-	  </div>
-	 
-	  
+		</div> <!-- container -->
+	</div> <!-- content -->
+</div>
 
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
 
-<script> 
-	
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":"<center> Data Not Found ! </center>"
-        },
-        "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'
-        ],
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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( 2, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 2 ).footer() ).html( TotalQTY.toFixed().bold() );
-			 
-			TotalVALUE = api
-                 .column( 3, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-				
-             $( api.column( 3 ).footer() ).html(  TotalVALUE.toFixed(2).bold() );
-
-		
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	
-
-	</script>
-	
-	
-	
\ 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+					previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+				},
+				emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
+			}
+		});
+	});
+</script>
\ No newline at end of file
diff --git a/app/Views/Report_costcenter.php b/app/Views/Report_costcenter.php
index c8a6d5b9..efd57160 100755
--- a/app/Views/Report_costcenter.php
+++ b/app/Views/Report_costcenter.php
@@ -1,139 +1,166 @@
+
+<script>
+	$(document).ready(function() {
+
+		$("#client_name").select2();
+		$("#item_name").select2();
+		$("#purchaseorder_number").select2();
+
+
+	});
+</script>
+
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
+<style>
+	
+	table{
+		width:auto;
+	}
 
-                           }
-		  .buttons-text {
-                            background-color: blue;
-                            color: white;
-                         }
-			      select {
-                            width: 100%;
-                            padding: 3%;
-                                    
-                          }
-						  .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}
-			   
-	 </style>
-	  <div class="content-wrapper">
-	 <section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Cost Center</b><br><br>
-			  <?php
-			 
-			  if($this->input->post('financialyear')){
-				  $ab=$this->input->post('financialyear'); 
-				  echo '('.$ab.')';
-			  }
-		   
-			  ?></p></h3></center>
-			 <div class="col-xs-12 col-md-4 col-md-offset-4">
-			  
-                      
-                      <center> 
-					  <div class="panel-body">
-					  
-					  <form method="post" action=" ">
-					  <div class="col-md-8">
-					  <select class="form-control" id="financialyear" name="financialyear">
-					 <option value="">Select Budget Year</option>
-					 <?php 
-					 foreach($finyear as $item):
-							 
-							{?>
+	.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; */
+
+	}
+</style>
+
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+						<div class="page-title-right">
+                                <ol class="breadcrumb m-0">
+                                    <li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
+                                    <li class="breadcrumb-item"><a href="javascript: void(0);"></a> Financial Reports</li>
+                                    <li class="breadcrumb-item active">
+                                    <h4 class="page-title"><b> Cost Center  </b></h4>
+                                    </li>
+                                </ol>
+                            </div>
 							
-							<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
-							
-							         
-							 <?php } endforeach; ?>
-					  
-					   </select>
-
-                     </div>
-					 <div class="col-md-2">
-
-                        <input type="submit" class="btn btn-success" id="year" name="btn_submit"
-                               value="View Report">
-							   </div>
-                          </form>
-						  </div>
-							</center>
-                 
-           	
-           </div>
-			</div>
-			<!-- /.box-header -->
-			<div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:12px;">
-                   <thead>
-                     <tr>
-				       <th>Cost Center Code</th>
-                       <th>Cost Center Name </th>
-					   <th>Department</th>
-					   <th>Budget Type</th>
-					   <th>Budget Year</th>
-					   <th>Utilized Amount &nbsp;(&#8377;)</th>
-					   <th>Balance Amount &nbsp;(&#8377;)</th>
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($ccrpt)){
-					   foreach($ccrpt as $rel)
-					    {				
-					   ?> 
-					  <tr>
-                        <td><span><?php echo $rel->Cost_Center_Code?></span></td>
-                        <td><span><?php echo $rel->Cost_Center_Name?></span></td>
-				        <td><span><?php echo $rel->Dept_Name?></span></td>
-						<td><span><?php echo $rel->BudgetType?></span></td>
-						<td><span><?php echo $rel->BudgetYear?></span></td>
-						<td align="right"><span><?php echo number_format($rel->Util_Amount,2,'.','')?></span></td>
-						<td align="right"><span><?php echo number_format($rel->Avlbl_Amt,2,'.','')?></span></td>
-					  </tr>
-			           <?php
-					    }
-						
-					   }
-					   ?>
-			        </tbody>
-			      </table>
-			 
+						</div>
+					</div>
 				</div>
-			   </div>
-			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-      </div>
-	 
-	  </section>
-	  </div>
-	 
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+							<div class="card-body">
+
+							<form method="post" action=" ">
+								<div class="row">
+									<div class="col-2">
+									<label for="">Budget year</label>
+									<select class="form-control" id="financialyear" name="financialyear">
+										<option value="">Select Year</option>
+											<?php 
+											foreach($finyear as $item):	
+												{
+											?>
+												
+												<option 
+												<?php echo isset($ab) && $ab == $item->financial_year ? "selected" : " "; ?>
+												value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
+												
+														
+											<?php 
+												} 
+											endforeach; 
+											?>
+									
+									</select>
+
+									</div>
+									<div class="col-10 mt-2 text-right">
+										<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Report_costcenter') ?>';">
+										<input type="submit" class="btn btn-success" id="year" name="btn_submit"
+											value="View Report">
+									</div>
+								</div>
+								
+                          </form>
+								<table id="cc" class="table table-bordered table-hover wrap" style="background-color:#fff;width: 100% !important;">
+
+									<!-- <table class="table table-bordered table-hover" id="asset_list_table" style="background-color:#fff;font-size:12px;"> -->
+									<thead>
+										<tr>
+											<th>Cost Center Code</th>
+											<th>Cost Center Name </th>
+											<th>Department</th>
+											<th>Budget Type</th>
+											<th>Budget Year</th>
+											<th>Utilized Amount &nbsp;(&#8377;)</th>
+											<th>Balance Amount &nbsp;(&#8377;)</th>
+										</tr>	
+									</thead>
+									<tbody>
+										<?php if(!empty($ccrpt)){
+											foreach($ccrpt as $rel)
+												{				
+											?> 
+											<tr>
+												<td><span><?php echo $rel->Cost_Center_Code?></span></td>
+												<td><span><?php echo $rel->Cost_Center_Name?></span></td>
+												<td><span><?php echo $rel->Dept_Name?></span></td>
+												<td><span><?php echo $rel->BudgetType?></span></td>
+												<td><span><?php echo $rel->BudgetYear?></span></td>
+												<td align="right"><span><?php echo number_format($rel->Util_Amount,2,'.','')?></span></td>
+												<td align="right"><span><?php echo number_format($rel->Avlbl_Amt,2,'.','')?></span></td>
+											</tr>
+											<?php
+												}
+												
+											}
+											?>
+
+			                        </tbody>
+                                        <tfoot  width="100%">
+
+                                        </tfoot>
+								</table>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
+				</div>
+			</div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+</div>
+
+
+<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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 src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
@@ -147,45 +174,47 @@
 
 // Bootstrap datepicker
 // Set up your table
+
 $(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":"<center> Data Not Found ! </center>"
-        },
-        "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: '<i class="fas fa-angle-right"></i>', // Next button icon
+                previous: '<i class="fas fa-angle-left"></i>' // 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('');
+		
+	}
 
 
 	</script>
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 @@
+<!-- Report_cumulative_day_inward -->
+<style>
+	table {
+		width: auto;
+	}
+</style>
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Cumulative Month (<?php echo date('F'); ?>) </b></h4>
+									</li>
+								</ol>
+							</div>
 
-
-<?php
-if(!empty($mms))
-{
-
-}
-?>
-
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
-
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	   <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Cumulative - Inward(<?php echo date('d-m-Y'); ?>)</b></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				    <tr>
-					
-					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Material Name</th>
-						 <th  style="text-align:center" colspan="2"><?php echo date('d-m-Y'); ?></th> 
-						 </tr>
-                     <tr>
-				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(&#8377;)</th>
-					    
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($cum_day)){
-					   $tqt=0;
-					   $tvt=0.00;
-					  
-						$d=date('Y-m-d');
-					   foreach($cum_day as $rel)
-					    {				
-					   ?> 
-					  <tr>
-                       <td><span>
-					   <a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid;?>&d=<?php echo $d;?>&mid=<?php echo $rel->mid;?>"><?php echo $rel->supplier_name;?></a>
-					   </span></td>
-					   <td><span><?php echo $rel->material_name;?></span></td>
-					   <td style="text-align:right"><span><?php 
-						$tqt= $tqt + round($rel->tquantity);
-						echo round($rel->tquantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tvt= $tvt + number_format($rel->ttotal,2,'.','');
-						echo number_format($rel->ttotal,2,'.','');?></span></td>
-						
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tqt;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tvt,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<div class="table-responsive">
+									<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+										<thead>
+											<tr>
+
+												<th style="text-align:center" rowspan="2">Supplier Name</th>
+												<th style="text-align:center" rowspan="2">Material Name</th>
+												<th style="text-align:center" colspan="2"><?php echo date('d-m-Y'); ?></th>
+											</tr>
+											<tr>
+												<th style="text-align:center">Quantity</th>
+												<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+
+
+											</tr>
+										</thead>
+										<tbody>
+											<?php if (!empty($cum_day)) {
+												$tqt = 0;
+												$tvt = 0.00;
+
+												$d = date('Y-m-d');
+												foreach ($cum_day as $rel) {
+											?>
+													<tr>
+														<td><span>
+																<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid; ?>&d=<?php echo $d; ?>&mid=<?php echo $rel->mid; ?>"><?php echo $rel->supplier_name; ?></a>
+															</span></td>
+														<td><span><?php echo $rel->material_name; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tqt = $tqt + round($rel->tquantity);
+																							echo round($rel->tquantity); ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tvt = $tvt + number_format($rel->ttotal, 2, '.', '');
+																							echo number_format($rel->ttotal, 2, '.', ''); ?></span></td>
+
+
+													</tr>
+												<?php
+												}
+
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+
+												<td style="text-align:right"><strong>
+														<?php {
+															echo '';
+														}
+														?>
+													</strong>
+												</td>
+
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo $tqt;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($tvt, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+
+
+
+											</tr>
+
+										</tfoot>
+									<?php
+											}
+
+									?>
+									</table>
+
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-      </div>
-	  </section>
-	  </div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+
 
 
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
@@ -152,78 +134,32 @@ 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>
+		$(document).ready(function() {
 
-<script> 
-	
+			$.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: '<i class="fas fa-angle-right"></i>', // Next button icon
+						previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+					},
+					emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":"<center> Data Not Found ! </center>"
-        },
-        "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'
-        ],
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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() );
-
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	
-
-	</script>
-	
-	
-	
\ No newline at end of file
+				}
+			});
+		});
+	</script>
\ 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 @@
+<!-- Report_cumulative_day_raw -->
+<style>
+	table {
+		width: auto;
+	}
+</style>
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Cumulative-Category-Wise(<?php echo date('d-m-Y'); ?>) </b></h4>
+									</li>
+								</ol>
+							</div>
 
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
-
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	   <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Cumulative-Category-Wise(<?php echo date('d-m-Y'); ?>)</b></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				    <tr>
-					     <th style="text-align:center" rowspan="2">Category</th>
-					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Material Name</th>
-						 <th  style="text-align:center" colspan="2"><?php echo date('d-m-Y'); ?></th> 
-						 </tr>
-                     <tr>
-				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(&#8377;)</th>
-					    
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($cum_day)){
-					   $tqt=0;
-					   $tvt=0.00;
-					  
-						$d=date('Y-m-d');
-					   foreach($cum_day as $rel)
-					    {				
-					   ?> 
-					  <tr>
-					   <td><span><?php echo $rel->category;?></span></td>
-                       <td><span>
-					   <a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid;?>&d=<?php echo $d;?>&mid=<?php echo $rel->mid;?>&cat=<?php echo $rel->category;?>"><?php echo $rel->supplier_name;?></a>
-					   </span></td>
-					   <td><span><?php echo $rel->material_name;?></span></td>
-					   <td style="text-align:right"><span><?php 
-						$tqt= $tqt + round($rel->tquantity);
-						echo round($rel->tquantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tvt= $tvt + number_format($rel->ttotal,2,'.','');
-						echo number_format($rel->ttotal,2,'.','');?></span></td>
-						
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tqt;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tvt,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<div class="table-responsive">
+									<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+										<thead>
+
+											<tr>
+												<th style="text-align:center" rowspan="2">Category</th>
+												<th style="text-align:center" rowspan="2">Supplier Name</th>
+												<th style="text-align:center" rowspan="2">Material Name</th>
+												<th style="text-align:center" colspan="2"><?php echo date('d-m-Y'); ?></th>
+											</tr>
+											<tr>
+												<th style="text-align:center">Quantity</th>
+												<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+
+
+											</tr>
+										</thead>
+										<tbody>
+											<?php if (!empty($cum_day)) {
+												$tqt = 0;
+												$tvt = 0.00;
+
+												$d = date('Y-m-d');
+												foreach ($cum_day as $rel) {
+											?>
+													<tr>
+														<td><span><?php echo $rel->category; ?></span></td>
+														<td><span>
+																<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid; ?>&d=<?php echo $d; ?>&mid=<?php echo $rel->mid; ?>&cat=<?php echo $rel->category; ?>"><?php echo $rel->supplier_name; ?></a>
+															</span></td>
+														<td><span><?php echo $rel->material_name; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tqt = $tqt + round($rel->tquantity);
+																							echo round($rel->tquantity); ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tvt = $tvt + number_format($rel->ttotal, 2, '.', '');
+																							echo number_format($rel->ttotal, 2, '.', ''); ?></span></td>
+
+
+													</tr>
+												<?php
+												}
+
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+
+												<td style="text-align:right"><strong>
+														<?php {
+															echo '';
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo '';
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo $tqt;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($tvt, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+
+
+
+											</tr>
+
+										</tfoot>
+									<?php
+											}
+
+									?>
+									</table>
+
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-      </div>
-	  </section>
-	  </div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+
 
 
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
@@ -154,78 +143,32 @@
 	<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() {
 
-<script> 
-	
+			$.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: '<i class="fas fa-angle-right"></i>', // Next button icon
+						previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+					},
+					emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":"<center> Data Not Found ! </center>"
-        },
-        "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'
-        ],
-	   "footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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() );
-
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	
-
-	</script>
-	
-	
-	
\ No newline at end of file
+				}
+			});
+		});
+	</script>
\ 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 @@
-
-
+<!-- Report_cumulative_inward -->
+<style>
+	table {
+		width: auto;
+	}
+</style>
 <?php
-if(!empty($mms))
-{
-
+if (date('m') >= 4) {
+	$yearl = date('Y') . '-' . (date('Y') + 1);
+} else {
+	$yearl = (date('Y') - 1) . '-' . date('Y');
 }
 ?>
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Cumulative ( <?php echo $yearl; ?> ) </b></h4>
 
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
+									</li>
+								</ol>
+							</div>
 
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	  <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Cumulative - Inward</b>(<i>
-			  <?php
-			  if (date('m') >= 4) {
-								$yearl = date('Y').'-'.(date('Y')+1);
-							} else {
-								$yearl = (date('Y')-1).'-'.date('Y');
-							}
-					 echo $yearl;
-			  ?>
-			  </i>)</p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				    <tr>
-					<?php
-					if (date('m') >= 4) {
-								$yearl = date('Y').'-'.(date('Y')+1);
-							} else {
-								$yearl = (date('Y')-1).'-'.date('Y');
-							}
-					 $ab=$yearl;
-					?>
-					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Material Name</th>
-						 <th  style="text-align:center" colspan="2"><?php echo date('d-m-Y'); ?></th> 
-						  <th  style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th> 
-						  <th  style="text-align:center" colspan="2"><?php echo $ab; ?></th> 						 
-						 </tr>
-                     <tr>
-				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(<i class="fa fa-rupee "></i>)</th>
-					    <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(<i class="fa fa-rupee "></i>)</th>
-					    <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(<i class="fa fa-rupee "></i>)</th>
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($cum)){
-					   $yqt=0.00;
-					   $yvt=0.00;
-					   $mqt=0.00;
-					   $mvt=0.00;
-					   $tqt=0.00;
-					   $tvt=0.00;
-						
-					if (date('m') >= 4) {
-								$yearl = date('Y').'-'.(date('Y')+1);
-							} else {
-								$yearl = (date('Y')-1).'-'.date('Y');
-							}
-					 $ab=$yearl;
-					
-					   foreach($cum as $index=>$rel)
-					    {				
-					   ?> 
-					  <tr>
-                       <td><span>
-					   <a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid;?>&ab=<?php echo $ab;?>&mid=<?php echo $rel->mid;?>"><?php echo $rel->supplier_name;?></a>
-					  </span></td>
-					   <td><span><?php echo $rel->material_name;?></span></td>
-					   <td style="text-align:right"><span id="d_qty<?php echo $index;?>"><?php 
-						$tqt= $tqt + round($rel->tquantity);
-						echo anchor('report/icum_day/'.$rel->sid . '/' . $rel->mid,round($rel->tquantity));?></span></td>
-						<td style="text-align:right"><span id="d_value<?php echo $index?>"><?php 
-						$tvt= $tvt + number_format($rel->ttotal,2,'.','');
-						echo anchor('report/icum_day/'.$rel->sid . '/' . $rel->mid,number_format($rel->ttotal,2,'.',''));?></span></td>
-						<td style="text-align:right"><span id="m_quty<?php echo $index?>"><?php 
-						$mqt= $mqt + round($rel->mquantity);
-						echo anchor('report/icum_month/'.$rel->sid . '/' . $rel->mid,round($rel->mquantity));?></span></td>
-						<td style="text-align:right"><span id="m_value<?php echo $index?>"><?php 
-						$mvt= $mvt + number_format($rel->mtotal,2,'.','');
-						echo anchor('report/icum_month/'.$rel->sid . '/' . $rel->mid,number_format($rel->mtotal,2,'.',''));?></span></td>
-						<td style="text-align:right"><span id="y_qty<?php echo $index?>"><?php 
-						$yqt= $yqt + round($rel->quantity);
-						echo anchor('report/icum_year/'.$rel->sid . '/' . $rel->mid,round($rel->quantity));?></span></td>
-						<td style="text-align:right"><span id="y_value<?php echo $index;?>"><?php 
-						$yvt= $yvt + number_format($rel->total,2,'.','');
-						echo anchor('report/icum_year/'.$rel->sid . '/' . $rel->mid,number_format($rel->total,2,'.',''));?></span></td>
-					   
-					   
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tqt;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tvt,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										<td style="text-align:right">
-										<strong>
-										<?php 
-										 {
-										 echo $mqt;
-										
-										  } 
-										 ?> 
-										</strong>
-										</td>
-										<td style="text-align:right">
-										<strong>
-										<?php 
-										 {
-										 echo number_format($mvt,2,'.','');
-										
-										  } 
-										 ?> 
-										</strong>
-										</td>
-										<td style="text-align:right">
-										<strong>
-										<?php 
-										 {
-										 echo $yqt;
-										
-										  } 
-										 ?> 
-										</strong>
-										</td>
-										<td style="text-align:right">
-										<strong>
-										<?php 
-										 {
-										 echo number_format($yvt,2,'.','');
-										
-										  } 
-										 ?> 
-										</strong>
-										</td>
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<div class="table-responsive">
+									<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+										<thead>
+											<tr>
+												<?php
+												if (date('m') >= 4) {
+													$yearl = date('Y') . '-' . (date('Y') + 1);
+												} else {
+													$yearl = (date('Y') - 1) . '-' . date('Y');
+												}
+												$ab = $yearl;
+												?>
+												<th style="text-align:center" rowspan="2">Supplier Name</th>
+												<th style="text-align:center" rowspan="2">Material Name</th>
+												<th style="text-align:center" colspan="2"><?php echo date('d-m-Y'); ?></th>
+												<th style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th>
+												<th style="text-align:center" colspan="2"><?php echo $ab; ?></th>
+											</tr>
+											<tr>
+												<th style="text-align:center">Quantity</th>
+												<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+												<th style="text-align:center">Quantity</th>
+												<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+												<th style="text-align:center">Quantity</th>
+												<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+
+											</tr>
+										</thead>
+										<tbody>
+											<?php if (!empty($cum)) {
+												$yqt = 0.00;
+												$yvt = 0.00;
+												$mqt = 0.00;
+												$mvt = 0.00;
+												$tqt = 0.00;
+												$tvt = 0.00;
+
+												if (date('m') >= 4) {
+													$yearl = date('Y') . '-' . (date('Y') + 1);
+												} else {
+													$yearl = (date('Y') - 1) . '-' . date('Y');
+												}
+												$ab = $yearl;
+
+												foreach ($cum as $index => $rel) {
+											?>
+													<tr>
+														<td><span>
+																<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid; ?>&ab=<?php echo $ab; ?>&mid=<?php echo $rel->mid; ?>"><?php echo $rel->supplier_name; ?></a>
+															</span></td>
+														<td><span><?php echo $rel->material_name; ?></span></td>
+														<td style="text-align:right"><span id="d_qty<?php echo $index; ?>"><?php
+																															$tqt = $tqt + round($rel->tquantity);
+																															echo anchor('report/icum_day/' . $rel->sid . '/' . $rel->mid, round($rel->tquantity)); ?></span></td>
+														<td style="text-align:right"><span id="d_value<?php echo $index ?>"><?php
+																															$tvt = $tvt + number_format($rel->ttotal, 2, '.', '');
+																															echo anchor('report/icum_day/' . $rel->sid . '/' . $rel->mid, number_format($rel->ttotal, 2, '.', '')); ?></span></td>
+														<td style="text-align:right"><span id="m_quty<?php echo $index ?>"><?php
+																															$mqt = $mqt + round($rel->mquantity);
+																															echo anchor('report/icum_month/' . $rel->sid . '/' . $rel->mid, round($rel->mquantity)); ?></span></td>
+														<td style="text-align:right"><span id="m_value<?php echo $index ?>"><?php
+																															$mvt = $mvt + number_format($rel->mtotal, 2, '.', '');
+																															echo anchor('report/icum_month/' . $rel->sid . '/' . $rel->mid, number_format($rel->mtotal, 2, '.', '')); ?></span></td>
+														<td style="text-align:right"><span id="y_qty<?php echo $index ?>"><?php
+																															$yqt = $yqt + round($rel->quantity);
+																															echo anchor('report/icum_year/' . $rel->sid . '/' . $rel->mid, round($rel->quantity)); ?></span></td>
+														<td style="text-align:right"><span id="y_value<?php echo $index; ?>"><?php
+																																$yvt = $yvt + number_format($rel->total, 2, '.', '');
+																																echo anchor('report/icum_year/' . $rel->sid . '/' . $rel->mid, number_format($rel->total, 2, '.', '')); ?></span></td>
+
+
+
+													</tr>
+												<?php
+												}
+
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+
+												<td style="text-align:right"><strong>
+														<?php {
+															echo '';
+														}
+														?>
+													</strong>
+												</td>
+
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo $tqt;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($tvt, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo $mqt;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($mvt, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo $yqt;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($yvt, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+
+
+											</tr>
+
+										</tfoot>
+									<?php
+											}
+
+									?>
+									</table>
+
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-	  </div>
-	  </section>
-	  </div>
-	 
+		</div> <!-- container -->
+	</div> <!-- content -->
+
 
 
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
@@ -236,155 +208,207 @@ 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>
+		$(document).ready(function() {
 
-<script> 
-	
+			$.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: '<i class="fas fa-angle-right"></i>', // Next button icon
+						previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+					},
+					emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
+				}
+			});
+		});
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
+		$(function() {
+			//var dateFormat = "mm/dd/yy",
+			from = $("#min-date")
+				.datepicker({
+					dateFormat: "dd-mm-yy",
+					defaultDate: "+0d",
+					changeMonth: true,
+					//numberOfMonths: 1
 
- var vtxt_count = 0;
+				})
+				.on("change", function() {
+					to.datepicker("option", "minDate", getDate(this));
+				}),
+				to = $("#max-date").datepicker({
+					dateFormat: "dd-mm-yy",
+					defaultDate: "+0d",
+					changeMonth: true,
+					//numberOfMonths: 1
 
+				})
+				.on("change", function() {
+					from.datepicker("option", "maxDate", getDate(this));
+				});
 
+			function getDate(element) {
+				var date;
 
- $('#cc').on('search.dt', function() {
+				try {
+					date = $.datepicker.parseDate(dateFormat, element.value);
 
-    var vvalue = $('#cc_filter input').val();
-    
-    if(vvalue !=''){
-    	vtxt_count = 1;
-    }else{
-    	vtxt_count = 0;
-    }
-    
-});
- //console.log(vtxt_count);
-
- 
-  var Fm_qsum ="<?php echo json_encode($mqt)?>";
-  var Fd_qsum= "<?php echo json_encode($tqt)?>";
-  var Fd_valuesum="<?php echo json_encode($tvt)?>";
-  var Fm_valuesum= "<?php echo json_encode($mvt)?>";
-  var Fy_quty="<?php echo json_encode($yqt)?>";
-  var Fyear_value = "<?php echo json_encode($yvt)?>";
-
- 
-
- 
-
-
-
-
-    table = $('#cc').DataTable( {
-        "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'
-        ],
-
-
-    "footerCallback": function ( row, data, start, end, display ) 
-    {
-
-        var m_qsum =0;
-        var d_qsum= 0; 
-        var d_valuesum= 0; 
-        var m_valuesum= 0;
-        var y_quty=0;
-        var year_value = 0;
-
-         
-    if(vtxt_count !=0)
-    {
-      for(var j = 0;j<=display.length-1;j++)
-	  {
-            
-           var count = display[j];
-           var te= $('#m_quty'+count).text();
-    	   var dte= $('#d_qty'+count).text();
-           var dvte= $('#d_value'+count).text();
-           var m_value= $('#m_value'+count).text();
-           var y_qty= $('#y_qty'+count).text();
-           var y_value = $('#y_value'+count).text();
-
-
-          
-           m_qsum += +te;
-	       d_qsum += +dte;
-	       d_valuesum += +dvte;
-	       m_valuesum += +m_value;
-	       y_quty += +y_qty;
-	       year_value += +y_value;  
- 
-      }
-
-
-      var FinalTotal =parseInt(m_qsum);
- 	  var DailyFinalToatal=parseInt(d_qsum);
- 	  var DailyvalueFinalTotal=parseInt(d_valuesum);
- 	  var MonthlyValueFinal = parseInt(m_valuesum);
- 	  var yearlyFinalQty = parseInt(y_quty);
- 	  var yearlyValueFinal = parseInt(year_value);
-
-       var api = this.api(), data;
-     $( api.column( 4 ).footer() ).html( FinalTotal.toFixed(2).bold() );
-     $( api.column( 2 ).footer() ).html( DailyFinalToatal.toFixed(2).bold() );
-     $( api.column( 3 ).footer() ).html( DailyvalueFinalTotal.toFixed(2).bold() );
-     $( api.column( 5 ).footer() ).html( MonthlyValueFinal.toFixed(2).bold() );
-     $( api.column( 6 ).footer() ).html( yearlyFinalQty.toFixed(2).bold() );
-     $( api.column( 7 ).footer() ).html( yearlyValueFinal.toFixed(2).bold() );
-   } 
-
-
-
-   else
-   {
-
-   	  var FinalTotal =parseInt(Fm_qsum);
- 	  var DailyFinalToatal=parseInt(Fd_qsum);
- 	  var DailyvalueFinalTotal=parseInt(Fd_valuesum);
- 	  var MonthlyValueFinal = parseInt(Fm_valuesum);
- 	  var yearlyFinalQty = parseInt(Fy_quty);
- 	  var yearlyValueFinal = parseInt(Fyear_value);
-
-       var api = this.api(), data;
-     $( api.column( 4 ).footer() ).html( FinalTotal.toFixed(2).bold() );
-     $( api.column( 2 ).footer() ).html( DailyFinalToatal.toFixed(2).bold() );
-     $( api.column( 3 ).footer() ).html( DailyvalueFinalTotal.toFixed(2).bold() );
-     $( api.column( 5 ).footer() ).html( MonthlyValueFinal.toFixed(2).bold() );
-     $( api.column( 6 ).footer() ).html( yearlyFinalQty.toFixed(2).bold() );
-     $( api.column( 7 ).footer() ).html( yearlyValueFinal.toFixed(2).bold() );
-   }
-
-   }
-
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	
+				} catch (error) {
+					date = null;
+				}
 
+				return date;
+			}
+		});
 	</script>
-	
-	
-	
\ No newline at end of file
+
+	<script>
+		// Bootstrap datepicker
+		// Set up your table
+		$(document).ready(function() {
+
+			var vtxt_count = 0;
+
+
+
+			$('#cc').on('search.dt', function() {
+
+				var vvalue = $('#cc_filter input').val();
+
+				if (vvalue != '') {
+					vtxt_count = 1;
+				} else {
+					vtxt_count = 0;
+				}
+
+			});
+			//console.log(vtxt_count);
+
+
+			var Fm_qsum = "<?php echo json_encode($mqt) ?>";
+			var Fd_qsum = "<?php echo json_encode($tqt) ?>";
+			var Fd_valuesum = "<?php echo json_encode($tvt) ?>";
+			var Fm_valuesum = "<?php echo json_encode($mvt) ?>";
+			var Fy_quty = "<?php echo json_encode($yqt) ?>";
+			var Fyear_value = "<?php echo json_encode($yvt) ?>";
+
+
+
+
+
+
+
+
+			table = $('#cc').DataTable({
+				"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'
+				],
+
+
+				"footerCallback": function(row, data, start, end, display) {
+
+					var m_qsum = 0;
+					var d_qsum = 0;
+					var d_valuesum = 0;
+					var m_valuesum = 0;
+					var y_quty = 0;
+					var year_value = 0;
+
+
+					if (vtxt_count != 0) {
+						for (var j = 0; j <= display.length - 1; j++) {
+
+							var count = display[j];
+							var te = $('#m_quty' + count).text();
+							var dte = $('#d_qty' + count).text();
+							var dvte = $('#d_value' + count).text();
+							var m_value = $('#m_value' + count).text();
+							var y_qty = $('#y_qty' + count).text();
+							var y_value = $('#y_value' + count).text();
+
+
+
+							m_qsum += +te;
+							d_qsum += +dte;
+							d_valuesum += +dvte;
+							m_valuesum += +m_value;
+							y_quty += +y_qty;
+							year_value += +y_value;
+
+						}
+
+
+						var FinalTotal = parseInt(m_qsum);
+						var DailyFinalToatal = parseInt(d_qsum);
+						var DailyvalueFinalTotal = parseInt(d_valuesum);
+						var MonthlyValueFinal = parseInt(m_valuesum);
+						var yearlyFinalQty = parseInt(y_quty);
+						var yearlyValueFinal = parseInt(year_value);
+
+						var api = this.api(),
+							data;
+						$(api.column(4).footer()).html(FinalTotal.toFixed(2).bold());
+						$(api.column(2).footer()).html(DailyFinalToatal.toFixed(2).bold());
+						$(api.column(3).footer()).html(DailyvalueFinalTotal.toFixed(2).bold());
+						$(api.column(5).footer()).html(MonthlyValueFinal.toFixed(2).bold());
+						$(api.column(6).footer()).html(yearlyFinalQty.toFixed(2).bold());
+						$(api.column(7).footer()).html(yearlyValueFinal.toFixed(2).bold());
+					} else {
+
+						var FinalTotal = parseInt(Fm_qsum);
+						var DailyFinalToatal = parseInt(Fd_qsum);
+						var DailyvalueFinalTotal = parseInt(Fd_valuesum);
+						var MonthlyValueFinal = parseInt(Fm_valuesum);
+						var yearlyFinalQty = parseInt(Fy_quty);
+						var yearlyValueFinal = parseInt(Fyear_value);
+
+						var api = this.api(),
+							data;
+						$(api.column(4).footer()).html(FinalTotal.toFixed(2).bold());
+						$(api.column(2).footer()).html(DailyFinalToatal.toFixed(2).bold());
+						$(api.column(3).footer()).html(DailyvalueFinalTotal.toFixed(2).bold());
+						$(api.column(5).footer()).html(MonthlyValueFinal.toFixed(2).bold());
+						$(api.column(6).footer()).html(yearlyFinalQty.toFixed(2).bold());
+						$(api.column(7).footer()).html(yearlyValueFinal.toFixed(2).bold());
+					}
+
+				}
+
+			});
+		});
+		$('#mySelect').on('change', function() {
+
+			table
+				.column(4)
+				.search(this.value)
+				.draw();
+		});
+	</script>
\ 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 @@
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
+<!-- Report_cumulative_inward -->
+<style>
+	table {
+		width: auto;
+	}
+</style>
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Cumulative Month (<?php echo date('F'); ?>) </b></h4>
+									</li>
+								</ol>
+							</div>
 
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	   <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Cumulative Month - Inward(<?php echo date('F'); ?>)</b></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				    <tr>
-					
-					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Material Name</th>
-						 <th  style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th> 
-						 </tr>
-                     <tr>
-				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(&#8377;)</th>
-					
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($cum_month)){
-					   $tqt=0;
-					   $tvt=0;
-					  if (date('m') >= 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)
-					    {				
-					   ?> 
-					  <tr>
-                       <td><span>
-					   <a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid;?>&ab=<?php echo $ab;?>&m=<?php echo $month;?>&mid=<?php echo $rel->mid;?>"><?php echo $rel->supplier_name;?></a>
-					   </span></td>
-					   <td><span><?php echo $rel->material_name;?></span></td>
-					   <td style="text-align:right"><span><?php 
-						$tqt= $tqt + round($rel->tquantity);
-						echo round($rel->tquantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tvt= $tvt + number_format($rel->ttotal,2,'.','');
-						echo number_format($rel->ttotal,2,'.','');?></span></td>
-						
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tqt;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tvt,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<div class="table-responsive">
+									<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+										<thead>
+											<tr>
+
+												<th style="text-align:center" rowspan="2">Supplier Name</th>
+												<th style="text-align:center" rowspan="2">Material Name</th>
+												<th style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th>
+											</tr>
+											<tr>
+												<th style="text-align:center">Quantity</th>
+												<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+
+											</tr>
+										</thead>
+										<tbody>
+											<?php if (!empty($cum_month)) {
+												$tqt = 0;
+												$tvt = 0;
+												if (date('m') >= 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) {
+											?>
+													<tr>
+														<td><span>
+																<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid; ?>&ab=<?php echo $ab; ?>&m=<?php echo $month; ?>&mid=<?php echo $rel->mid; ?>"><?php echo $rel->supplier_name; ?></a>
+															</span></td>
+														<td><span><?php echo $rel->material_name; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tqt = $tqt + round($rel->tquantity);
+																							echo round($rel->tquantity); ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tvt = $tvt + number_format($rel->ttotal, 2, '.', '');
+																							echo number_format($rel->ttotal, 2, '.', ''); ?></span></td>
+
+
+													</tr>
+												<?php
+												}
+
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+
+												<td style="text-align:right"><strong>
+														<?php {
+															echo '';
+														}
+														?>
+													</strong>
+												</td>
+
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo $tqt;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($tvt, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+
+
+
+											</tr>
+
+										</tfoot>
+									<?php
+											}
+
+									?>
+									</table>
+
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-      </div>
-	  </section>
-	  </div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+
 
 
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
@@ -148,81 +139,31 @@
 	<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() {
 
-<script> 
-	
-
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":"<center> Data Not Found ! </center>"
-        },
-        "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'
-        ],
-		
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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( 2, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 2 ).footer() ).html( TotalQTY.toFixed().bold() );
-			 
-			TotalVALUE = api
-                 .column( 3, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-				
-             $( api.column( 3 ).footer() ).html(  TotalVALUE.toFixed(2).bold() );
-
-		
-        }
-
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	
-
-	</script>
-	
-	
-	
\ 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+						previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+					},
+					emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
+				}
+			});
+		});
+	</script>
\ 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 @@
+<!-- Report_cumulative_month_raw -->
+<style>
+	table {
+		width: auto;
+	}
+</style>
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Cumulative Month-Category-Wise(<?php echo date('F'); ?>) </b></h4>
+									</li>
+								</ol>
+							</div>
 
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
-
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	   <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Cumulative Month-Category-Wise(<?php echo date('F'); ?>)</b></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				    <tr>
-					     <th style="text-align:center" rowspan="2">Category</th>
-					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Material Name</th>
-						 <th  style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th> 
-						 </tr>
-                     <tr>
-				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(&#8377;)</th>
-					   				 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($cum_month)){
-					   $tqt=0;
-					   $tvt=0;
-					  if (date('m') >= 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)
-					    {				
-					   ?> 
-					  <tr>
-					     <td><span><?php echo $rel->category;?></span></td>
-                       <td><span>
-					   <a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid;?>&ab=<?php echo $ab;?>&m=<?php echo $month;?>&mid=<?php echo $rel->mid;?>&cat=<?php echo $rel->category;?>"><?php echo $rel->supplier_name;?></a>
-					   </span></td>
-					   <td><span><?php echo $rel->material_name;?></span></td>
-					   <td style="text-align:right"><span><?php 
-						$tqt= $tqt + round($rel->tquantity);
-						echo round($rel->tquantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tvt= $tvt + number_format($rel->ttotal,2,'.','');
-						echo number_format($rel->ttotal,2,'.','');?></span></td>
-						
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-								
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tqt;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tvt,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<div class="table-responsive">
+									<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+										<thead>
+											<tr>
+												<th style="text-align:center" rowspan="2">Category</th>
+												<th style="text-align:center" rowspan="2">Supplier Name</th>
+												<th style="text-align:center" rowspan="2">Material Name</th>
+												<th style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th>
+											</tr>
+											<tr>
+												<th style="text-align:center">Quantity</th>
+												<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+
+											</tr>
+										</thead>
+										<tbody>
+											<?php if (!empty($cum_month)) {
+												$tqt = 0;
+												$tvt = 0;
+												if (date('m') >= 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) {
+											?>
+													<tr>
+														<td><span><?php echo $rel->category; ?></span></td>
+														<td><span>
+																<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid; ?>&ab=<?php echo $ab; ?>&m=<?php echo $month; ?>&mid=<?php echo $rel->mid; ?>&cat=<?php echo $rel->category; ?>"><?php echo $rel->supplier_name; ?></a>
+															</span></td>
+														<td><span><?php echo $rel->material_name; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tqt = $tqt + round($rel->tquantity);
+																							echo round($rel->tquantity); ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tvt = $tvt + number_format($rel->ttotal, 2, '.', '');
+																							echo number_format($rel->ttotal, 2, '.', ''); ?></span></td>
+
+
+													</tr>
+												<?php
+												}
+
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+
+												<td style="text-align:right"><strong>
+														<?php {
+															echo '';
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo '';
+														}
+														?>
+													</strong>
+												</td>
+
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo $tqt;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($tvt, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+
+
+
+											</tr>
+
+										</tfoot>
+									<?php
+											}
+
+									?>
+									</table>
+
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-      </div>
-	  </section>
-	  </div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+
 
 
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
@@ -160,78 +148,64 @@
 	<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() {
 
-<script> 
-	
-
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":"<center> Data Not Found ! </center>"
-        },
-        "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'
-        ],
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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() );
-
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	
+			$.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: '<i class="fas fa-angle-right"></i>', // Next button icon
+						previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+					},
+					emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
 
+				}
+			});
+		});
 	</script>
-	
-	
-	
\ No newline at end of file
+	<script>
+		// "footerCallback": function ( row, data, start, end, display ) {
+		// var api = this.api(), data;
+
+		// // 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() );
+
+		// }
+	</script>
\ 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 @@
-
-
+<!-- Report_cumulative_raw -->
 <?php
-if(!empty($mms))
-{
-
+if (date('m') >= 4) {
+	$yearl = date('Y') . '-' . (date('Y') + 1);
+} else {
+	$yearl = (date('Y') - 1) . '-' . date('Y');
 }
+
 ?>
+<style>
+	table {
+		width: auto;
+	}
+</style>
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Cumulative-Category-Wise (<?php echo $yearl; ?>) </b></h4>
+									</li>
+								</ol>
+							</div>
 
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
-
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	  <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Cumulative-Category-Wise</b>(<i>
-			  <?php
-			  if (date('m') >= 4) {
-								$yearl = date('Y').'-'.(date('Y')+1);
-							} else {
-								$yearl = (date('Y')-1).'-'.date('Y');
-							}
-					 echo $yearl;
-			  ?>
-			  </i>)</p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				    <tr>
-					<?php
-					if (date('m') >= 4) {
-								$yearl = date('Y').'-'.(date('Y')+1);
-							} else {
-								$yearl = (date('Y')-1).'-'.date('Y');
-							}
-					 $ab=$yearl;
-					?>
-					     <th style="text-align:center" rowspan="2">Category</th>
-					     <th  style="text-align:center" colspan="2"><?php echo date('d-m-Y'); ?></th> 
-						  <th  style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th> 
-						  <th  style="text-align:center" colspan="2"><?php echo $ab; ?></th> 						 
-						 </tr>
-                     <tr>
-				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(<i class="fa fa-rupee "></i>)</th>
-					    <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(<i class="fa fa-rupee "></i>)</th>
-					    <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(<i class="fa fa-rupee "></i>)</th>
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($cum)){
-					   $yqt=0.00;
-					   $yvt=0.00;
-					   $mqt=0.00;
-					   $mvt=0.00;
-					   $tqt=0.00;
-					   $tvt=0.00;
-						
-					if (date('m') >= 4) {
-								$yearl = date('Y').'-'.(date('Y')+1);
-							} else {
-								$yearl = (date('Y')-1).'-'.date('Y');
-							}
-					 $ab=$yearl;
-					 
-					
-					   foreach($cum as $index=>$rel)
-					    {	
-						$cat = $rel->category;
-					   ?> 
-					  <tr>
-                      <!-- <td><span>
-					   <a href="<?= base_url() ?>report/link_purchase?sid=<?php //echo $rel->sid;?>&ab=<?php //echo $ab;?>&mid=<?php //echo $rel->mid;?>"><?php //echo $rel->supplier_name;?></a>
-					  </span></td>-->
-					   <td><span>
-					   <a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab;?>&cat=<?php echo $rel->category;?>"><?php echo $rel->category;?></a>
-					   </span></td>
-					   <td style="text-align:right"><span id="d_qty<?php echo $index;?>">
-					   <?php 
-						$tqt= $tqt + round($rel->tquantity);
-						?>
-					   <a href="<?= base_url() ?>report/rawi_cum_day?cat=<?php echo $rel->category;?>&ab=<?php echo $ab;?>"><?php echo round($rel->tquantity);?></a>
-					   </span></td>
-						<td style="text-align:right"><span id="d_value<?php echo $index?>"><?php 
-						$tvt= $tvt + number_format($rel->ttotal,2,'.','');
-						?>
-						<a href="<?= base_url() ?>report/rawi_cum_day?cat=<?php echo $rel->category;?>&ab=<?php echo $ab;?>"><?php echo number_format($rel->ttotal,2,'.','');?></a>
-						</span></td>
-						<td style="text-align:right"><span id="m_quty<?php echo $index?>"><?php 
-						$mqt= $mqt + round($rel->mquantity);
-						?>
-						<a href="<?= base_url() ?>report/rawi_cum_month?cat=<?php echo $rel->category;?>&ab=<?php echo $ab;?>"><?php echo round($rel->mquantity);?></a>
-						</span></td>
-						<td style="text-align:right"><span id="m_value<?php echo $index?>"><?php 
-						$mvt= $mvt + number_format($rel->mtotal,2,'.','');
-						?>
-						<a href="<?= base_url() ?>report/rawi_cum_month?cat=<?php echo $rel->category;?>&ab=<?php echo $ab;?>"><?php echo number_format($rel->mtotal,2,'.','');?></a>
-						</span></td>
-						<td style="text-align:right"><span id="y_qty<?php echo $index?>"><?php 
-						$yqt= $yqt + round($rel->quantity);
-						?>
-						<a href="<?= base_url() ?>report/rawi_cum_year?cat=<?php echo $rel->category;?>&ab=<?php echo $ab;?>"><?php echo round($rel->quantity);?></a>
-						</span></td>
-						<td style="text-align:right"><span id="y_value<?php echo $index;?>"><?php 
-						$yvt= $yvt + number_format($rel->total,2,'.','');
-						?>
-						<a href="<?= base_url() ?>report/rawi_cum_year?cat=<?php echo $rel->category;?>&ab=<?php echo $ab;?>"><?php echo number_format($rel->total,2,'.','');?></a>
-						</span></td>
-					   
-					   
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							
-								
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tqt;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tvt,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										<td style="text-align:right">
-										<strong>
-										<?php 
-										 {
-										 echo $mqt;
-										
-										  } 
-										 ?> 
-										</strong>
-										</td>
-										<td style="text-align:right">
-										<strong>
-										<?php 
-										 {
-										 echo number_format($mvt,2,'.','');
-										
-										  } 
-										 ?> 
-										</strong>
-										</td>
-										<td style="text-align:right">
-										<strong>
-										<?php 
-										 {
-										 echo $yqt;
-										
-										  } 
-										 ?> 
-										</strong>
-										</td>
-										<td style="text-align:right">
-										<strong>
-										<?php 
-										 {
-										 echo number_format($yvt,2,'.','');
-										
-										  } 
-										 ?> 
-										</strong>
-										</td>
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<div class="table-responsive">
+									<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+										<thead>
+											<tr>
+												<thead>
+													<tr>
+														<?php
+														if (date('m') >= 4) {
+															$yearl = date('Y') . '-' . (date('Y') + 1);
+														} else {
+															$yearl = (date('Y') - 1) . '-' . date('Y');
+														}
+														$ab = $yearl;
+														?>
+														<th style="text-align:center" rowspan="2">Category</th>
+														<th style="text-align:center" colspan="2"><?php echo date('d-m-Y'); ?></th>
+														<th style="text-align:center" colspan="2"><?php echo date('M-Y'); ?></th>
+														<th style="text-align:center" colspan="2"><?php echo $ab; ?></th>
+													</tr>
+													<tr>
+														<th style="text-align:center">Quantity</th>
+														<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+														<th style="text-align:center">Quantity</th>
+														<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+														<th style="text-align:center">Quantity</th>
+														<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+
+													</tr>
+												</thead>
+										<tbody>
+											<?php if (!empty($cum)) {
+												$yqt = 0.00;
+												$yvt = 0.00;
+												$mqt = 0.00;
+												$mvt = 0.00;
+												$tqt = 0.00;
+												$tvt = 0.00;
+
+												if (date('m') >= 4) {
+													$yearl = date('Y') . '-' . (date('Y') + 1);
+												} else {
+													$yearl = (date('Y') - 1) . '-' . date('Y');
+												}
+												$ab = $yearl;
+
+
+												foreach ($cum as $index => $rel) {
+													$cat = $rel->category;
+											?>
+													<tr>
+														<!-- <td><span>
+					   <a href="<?= base_url() ?>report/link_purchase?sid=<?php //echo $rel->sid;
+																			?>&ab=<?php //echo $ab;
+																					?>&mid=<?php //echo $rel->mid;
+																							?>"><?php //echo $rel->supplier_name;
+																													?></a>
+					  </span></td>-->
+														<td><span>
+																<a href="<?= base_url() ?>report/ilink_purchase?ab=<?php echo $ab; ?>&cat=<?php echo $rel->category; ?>"><?php echo $rel->category; ?></a>
+															</span></td>
+														<td style="text-align:right"><span id="d_qty<?php echo $index; ?>">
+																<?php
+																$tqt = $tqt + round($rel->tquantity);
+																?>
+																<a href="<?= base_url() ?>report/rawi_cum_day?cat=<?php echo $rel->category; ?>&ab=<?php echo $ab; ?>"><?php echo round($rel->tquantity); ?></a>
+															</span></td>
+														<td style="text-align:right"><span id="d_value<?php echo $index ?>"><?php
+																															$tvt = $tvt + number_format($rel->ttotal, 2, '.', '');
+																															?>
+																<a href="<?= base_url() ?>report/rawi_cum_day?cat=<?php echo $rel->category; ?>&ab=<?php echo $ab; ?>"><?php echo number_format($rel->ttotal, 2, '.', ''); ?></a>
+															</span></td>
+														<td style="text-align:right"><span id="m_quty<?php echo $index ?>"><?php
+																															$mqt = $mqt + round($rel->mquantity);
+																															?>
+																<a href="<?= base_url() ?>report/rawi_cum_month?cat=<?php echo $rel->category; ?>&ab=<?php echo $ab; ?>"><?php echo round($rel->mquantity); ?></a>
+															</span></td>
+														<td style="text-align:right"><span id="m_value<?php echo $index ?>"><?php
+																															$mvt = $mvt + number_format($rel->mtotal, 2, '.', '');
+																															?>
+																<a href="<?= base_url() ?>report/rawi_cum_month?cat=<?php echo $rel->category; ?>&ab=<?php echo $ab; ?>"><?php echo number_format($rel->mtotal, 2, '.', ''); ?></a>
+															</span></td>
+														<td style="text-align:right"><span id="y_qty<?php echo $index ?>"><?php
+																															$yqt = $yqt + round($rel->quantity);
+																															?>
+																<a href="<?= base_url() ?>report/rawi_cum_year?cat=<?php echo $rel->category; ?>&ab=<?php echo $ab; ?>"><?php echo round($rel->quantity); ?></a>
+															</span></td>
+														<td style="text-align:right"><span id="y_value<?php echo $index; ?>"><?php
+																																$yvt = $yvt + number_format($rel->total, 2, '.', '');
+																																?>
+																<a href="<?= base_url() ?>report/rawi_cum_year?cat=<?php echo $rel->category; ?>&ab=<?php echo $ab; ?>"><?php echo number_format($rel->total, 2, '.', ''); ?></a>
+															</span></td>
+
+
+
+													</tr>
+												<?php
+												}
+
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+
+
+
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo $tqt;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($tvt, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo $mqt;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($mvt, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo $yqt;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($yvt, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+
+
+											</tr>
+
+										</tfoot>
+									<?php
+											}
+
+									?>
+									</table>
+
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-	  </div>
-	  </section>
-	  </div>
-	 
+		</div> <!-- container -->
+	</div> <!-- content -->
+
 
 
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
@@ -244,58 +224,37 @@ 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>
+		$(document).ready(function() {
 
-<script> 
-	
+			$.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: '<i class="fas fa-angle-right"></i>', // Next button icon
+						previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+					},
+					emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-
-var vtxt_count = 0;
- $('#cc').on('search.dt', function() {
-
-    var vvalue = $('#cc_filter input').val();
-    
-    if(vvalue !=''){
-    	vtxt_count = 1;
-    }else{
-    	vtxt_count = 0;
-    }
-    
-});
-
-
-  var Fm_qsum ="<?php echo json_encode($mqt)?>";
-  var Fd_qsum= "<?php echo json_encode($tqt)?>";
-  var Fd_valuesum="<?php echo json_encode($tvt)?>";
-  var Fm_valuesum= "<?php echo json_encode($mvt)?>";
-  var Fy_quty="<?php echo json_encode($yqt)?>";
-  var Fyear_value = "<?php echo json_encode($yvt)?>";
-
-  console.log(Fm_qsum);
-
-
-    table = $('#cc').DataTable( {
-        "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'
-        ],
+				}
+			});
+		});
+	</script>
 
+	<!-- 
     "footerCallback": function ( row, data, start, end, display ) 
     {
 
@@ -373,21 +332,4 @@ console.log(Fm_qsum);
     }
 
     }
-    
-
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	
-
-	</script>
-	
-	
-	
\ No newline at end of file
+     -->
\ 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 @@
-
-
+<!-- Report_cumulative_year_inward -->
 <?php
-if(!empty($mms))
-{
-
+if (date('m') >= 4) {
+	$yearl = date('Y') . '-' . (date('Y') + 1);
+} else {
+	$yearl = (date('Y') - 1) . '-' . date('Y');
 }
+$yearl;
 ?>
+<style>
+	table {
+		width: auto;
+	}
+</style>
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Cumulative Year (<?php echo $yearl; ?>) </b></h4>
+									</li>
+								</ol>
+							</div>
 
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
-
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	   <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Cumulative Year - Inward</b>(<i>
-			  <?php
-			  if (date('m') >= 4) {
-								$yearl = date('Y').'-'.(date('Y')+1);
-							} else {
-								$yearl = (date('Y')-1).'-'.date('Y');
-							}
-					 echo $yearl;
-			  ?>
-			  </i>)</p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				    <tr>
-					<?php
-					if (date('m') >= 4) {
-								$yearl = date('Y').'-'.(date('Y')+1);
-							} else {
-								$yearl = (date('Y')-1).'-'.date('Y');
-							}
-					 $ab=$yearl;
-					?>
-					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Material Name</th>
-						 <th  style="text-align:center" colspan="2"><?php echo $ab; ?></th> 
-						 </tr>
-                     <tr>
-				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;( <i class="fa fa-rupee " ></i>)</th>
-					    
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($cum_year)){
-					   $tqt=0;
-					   $tvt=0;
-					  
-						if (date('m') >= 4) {
-								$yearl = date('Y').'-'.(date('Y')+1);
-							} else {
-								$yearl = (date('Y')-1).'-'.date('Y');
-							}
-					 $ab=$yearl;
-					   foreach($cum_year as $rel)
-					    {				
-					   ?> 
-					  <tr>
-                       <td><span>
-					   <a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid;?>&ab=<?php echo $ab;?>&mid=<?php echo $rel->mid;?>"><?php echo $rel->supplier_name;?></a>
-					   </span></td>
-					   <td><span><?php echo $rel->material_name;?></span></td>
-					   <td style="text-align:right"><span><?php 
-						$tqt= $tqt + round($rel->tquantity);
-						echo round($rel->tquantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tvt= $tvt + number_format($rel->ttotal,2,'.','');
-						echo number_format($rel->ttotal,2,'.','');?></span></td>
-						
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tqt;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tvt,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
+						</div>
+					</div>
 				</div>
-			   </div>
-			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-      </div>
-	  </section>
-	  </div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<div class="table-responsive">
+									<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+										<thead>
+											<tr>
+												<?php
+												if (date('m') >= 4) {
+													$yearl = date('Y') . '-' . (date('Y') + 1);
+												} else {
+													$yearl = (date('Y') - 1) . '-' . date('Y');
+												}
+												$ab = $yearl;
+												?>
+												<th style="text-align:center" rowspan="2">Supplier Name</th>
+												<th style="text-align:center" rowspan="2">Material Name</th>
+												<th style="text-align:center" colspan="2"><?php echo $ab; ?></th>
+											</tr>
+											<tr>
+												<th style="text-align:center">Quantity</th>
+												<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+
+
+											</tr>
+										</thead>
+										<tbody>
+											<?php if (!empty($cum_year)) {
+												$tqt = 0;
+												$tvt = 0;
+
+												if (date('m') >= 4) {
+													$yearl = date('Y') . '-' . (date('Y') + 1);
+												} else {
+													$yearl = (date('Y') - 1) . '-' . date('Y');
+												}
+												$ab = $yearl;
+												foreach ($cum_year as $rel) {
+											?>
+													<tr>
+														<td><span>
+																<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid; ?>&ab=<?php echo $ab; ?>&mid=<?php echo $rel->mid; ?>"><?php echo $rel->supplier_name; ?></a>
+															</span></td>
+														<td><span><?php echo $rel->material_name; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tqt = $tqt + round($rel->tquantity);
+																							echo round($rel->tquantity); ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tvt = $tvt + number_format($rel->ttotal, 2, '.', '');
+																							echo number_format($rel->ttotal, 2, '.', ''); ?></span></td>
+
+
+													</tr>
+												<?php
+												}
+
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+
+												<td style="text-align:right"><strong>
+														<?php {
+															echo '';
+														}
+														?>
+													</strong>
+												</td>
+
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo $tqt;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($tvt, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+
+
+
+											</tr>
+
+										</tfoot>
+									<?php
+											}
+
+									?>
+									</table>
+
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
+				</div>
+			</div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+
+
 
- 
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
 	<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() {
 
-<script> 
-	
-
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-        "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'
-        ],
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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( 2, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 2 ).footer() ).html( TotalQTY.toFixed().bold() );
- 
-			TotalVALUE = api
-                 .column( 3, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-				
-             $( api.column( 3 ).footer() ).html(  TotalVALUE.toFixed(2).bold() );
-
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
- table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	
-
-	
-	
+			$.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: '<i class="fas fa-angle-right"></i>', // Next button icon
+						previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+					},
+					emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
 
+				}
+			});
+		});
 	</script>
-	
-	
-	
\ No newline at end of file
+	<script>
+		// "footerCallback": function ( row, data, start, end, display ) {
+		//     var api = this.api(), data;
+
+		//     // 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( 2, { search:'applied' } )
+		//          .data()
+		//          .reduce( function (a, b) {
+		//              return intVal(a) + intVal(b);
+		//          }, 0 );
+
+		//      $( api.column( 2 ).footer() ).html( TotalQTY.toFixed().bold() );
+
+		// 	TotalVALUE = api
+		//          .column( 3, { search:'applied' } )
+		//          .data()
+		//          .reduce( function (a, b) {
+		//              return intVal(a) + intVal(b);
+		//          }, 0 );
+
+		//      $( api.column( 3 ).footer() ).html(  TotalVALUE.toFixed(2).bold() );
+	</script>
\ 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 @@
+<!-- Report_cumulative_year_raw -->
+<?php
+if (date('m') >= 4) {
+	$yearl = date('Y') . '-' . (date('Y') + 1);
+} else {
+	$yearl = (date('Y') - 1) . '-' . date('Y');
+}
+$yearl;
+?>
+<style>
+	table {
+		width: auto;
+	}
+</style>
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Cumulative Year-Category-Wise (<?php echo $yearl; ?>) </b></h4>
+									</li>
+								</ol>
+							</div>
 
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
-
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	   <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Cumulative Year-Category-Wise</b>(<i>
-			  <?php
-			  if (date('m') >= 4) {
-								$yearl = date('Y').'-'.(date('Y')+1);
-							} else {
-								$yearl = (date('Y')-1).'-'.date('Y');
-							}
-					 echo $yearl;
-			  ?>
-			  </i>)</p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				    <tr>
-					<?php
-					if (date('m') >= 4) {
-								$yearl = date('Y').'-'.(date('Y')+1);
-							} else {
-								$yearl = (date('Y')-1).'-'.date('Y');
-							}
-					 $ab=$yearl;
-					?>
-					     <th style="text-align:center" rowspan="2">Category</th>
-					     <th style="text-align:center" rowspan="2">Supplier Name</th>
-                         <th  style="text-align:center" rowspan="2">Material Name</th>
-						 <th  style="text-align:center" colspan="2"><?php echo $ab; ?></th> 
-						 </tr>
-                     <tr>
-				       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;( &#8377; )</th>
-					    
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($cum_year)){
-					   $tqt=0;
-					   $tvt=0;
-					  
-						if (date('m') >= 4) {
-								$yearl = date('Y').'-'.(date('Y')+1);
-							} else {
-								$yearl = (date('Y')-1).'-'.date('Y');
-							}
-					 $ab=$yearl;
-					   foreach($cum_year as $rel)
-					    {				
-					   ?> 
-					  <tr>
-					   <td><span><?php echo $rel->category;?></span></td>
-                       <td><span>
-					   <a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid;?>&ab=<?php echo $ab;?>&mid=<?php echo $rel->mid;?>&cat=<?php echo $rel->category;?>"><?php echo $rel->supplier_name;?></a>
-					   </span></td>
-					   <td><span><?php echo $rel->material_name;?></span></td>
-					   <td style="text-align:right"><span><?php 
-						$tqt= $tqt + round($rel->tquantity);
-						echo round($rel->tquantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tvt= $tvt + number_format($rel->ttotal,2,'.','');
-						echo number_format($rel->ttotal,2,'.','');?></span></td>
-						
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							<td style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo '';
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tqt;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tvt,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<div class="table-responsive">
+									<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+										<thead>
+											<tr>
+												<?php
+												if (date('m') >= 4) {
+													$yearl = date('Y') . '-' . (date('Y') + 1);
+												} else {
+													$yearl = (date('Y') - 1) . '-' . date('Y');
+												}
+												$ab = $yearl;
+												?>
+												<th style="text-align:center" rowspan="2">Category</th>
+												<th style="text-align:center" rowspan="2">Supplier Name</th>
+												<th style="text-align:center" rowspan="2">Material Name</th>
+												<th style="text-align:center" colspan="2"><?php echo $ab; ?></th>
+											</tr>
+											<tr>
+												<th style="text-align:center">Quantity</th>
+												<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+
+
+											</tr>
+										</thead>
+										<tbody>
+											<?php if (!empty($cum_year)) {
+												$tqt = 0;
+												$tvt = 0;
+
+												if (date('m') >= 4) {
+													$yearl = date('Y') . '-' . (date('Y') + 1);
+												} else {
+													$yearl = (date('Y') - 1) . '-' . date('Y');
+												}
+												$ab = $yearl;
+												foreach ($cum_year as $rel) {
+											?>
+													<tr>
+														<td><span><?php echo $rel->category; ?></span></td>
+														<td><span>
+																<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid; ?>&ab=<?php echo $ab; ?>&mid=<?php echo $rel->mid; ?>&cat=<?php echo $rel->category; ?>"><?php echo $rel->supplier_name; ?></a>
+															</span></td>
+														<td><span><?php echo $rel->material_name; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tqt = $tqt + round($rel->tquantity);
+																							echo round($rel->tquantity); ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tvt = $tvt + number_format($rel->ttotal, 2, '.', '');
+																							echo number_format($rel->ttotal, 2, '.', ''); ?></span></td>
+
+
+													</tr>
+												<?php
+												}
+
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+
+												<td style="text-align:right"><strong>
+														<?php {
+															echo '';
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo '';
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo $tqt;
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($tvt, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+
+
+
+											</tr>
+
+										</tfoot>
+									<?php
+											}
+
+									?>
+									</table>
+
+
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-      </div>
-	  </section>
-	  </div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+</div>
 
+<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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>
+		$.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: '<i class="fas fa-angle-right"></i>', // Next button icon
+					previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+				},
+				emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
+			}
+		});
+	});
+</script>
+<script>
+	// "footerCallback": function ( row, data, start, end, display ) {
+	//     var api = this.api(), data;
 
-<script> 
-	
+	//     // 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;
+	//     };
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":"<center> Data Not Found ! </center>"
-        },
-        "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'
-        ],
-	   "footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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( 2, { search:'applied' } )
+	//          .data()
+	//          .reduce( function (a, b) {
+	//              return intVal(a) + intVal(b);
+	//          }, 0 );
 
-			TotalQTY = api
-                 .column( 3, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
+	//      $( api.column( 2 ).footer() ).html( TotalQTY.toFixed().bold() );
 
-             $( 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() );
+	// 	TotalVALUE = api
+	//          .column( 3, { search:'applied' } )
+	//          .data()
+	//          .reduce( function (a, b) {
+	//              return intVal(a) + intVal(b);
+	//          }, 0 );
 
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	
-
-	</script>
-	
-	
-	
\ No newline at end of file
+	//      $( api.column( 3 ).footer() ).html(  TotalVALUE.toFixed(2).bold() );
+</script>
\ 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 @@
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
+<!-- Report_month_wise_inward.php -->
 <style>
-	.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;
-
-	}
-
-	.btn-success {
-		background-color: #00d976;
-		;
-		border-color: #00d976;
-		;
+	table {
+		width: auto;
 	}
 </style>
-<div class="content-wrapper">
-	<section class="content">
-		<div class="row" style="min-height: 600px;">
-			<!-- Left col -->
-			<div class="col-md-12">
-				<!-- TABLE: LATEST ORDERS -->
-				<div class="box box-info">
-					<div class="box-header with-border">
-						<center>
-							<h3 class="box-title">
-								<p style="color:  #00d976;"><b>Report - Month-wise-Inward(<?php echo $mont; ?>)</b></p>
-							</h3>
-						</center>
-					</div>
-					<!-- /.box-header -->
-					<div class="box-body">
-						<div>
-							<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-								<thead>
-									<tr>
-										<th style="text-align:center">Supplier Name</th>
-										<th style="text-align:center">Material Name</th>
-										<th style="text-align:center">Quantity</th>
-										<th style="text-align:center">Total Value &nbsp;(&#8377;)</th>
 
-
-									</tr>
-								</thead>
-								<tbody>
-									<?php if (!empty($month)) {
-										$tr3 = 0;
-										$tr4 = 0;
-										$ab = $this->input->get('ab');
-										$last = $this->input->get('dat');
-										$new = date("F", strtotime($last)) . "\n";
-										foreach ($month as $rel) {
-									?>
-											<tr>
-												<td><span>
-														<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid; ?>&mid=<?php echo $rel->mid; ?>&ab=<?php echo $ab; ?>&m=<?php echo $new; ?>"><?php echo $rel->supplier_name; ?></a>
-													</span></td>
-												<td><span><?php echo $rel->material_name; ?></span></td>
-												<td style="text-align:right"><span><?php
-																					$tr3 = $tr3 + round($rel->quantity);
-																					echo round($rel->quantity); ?></span></td>
-												<td style="text-align:right"><span><?php
-																					$tr4 = $tr4 + number_format($rel->total, 2, '.', '');
-																					echo number_format($rel->total, 2, '.', ''); ?></span></td>
-											</tr>
-										<?php
-										}
-										?>
-								</tbody>
-								<tfoot width="100%">
-									<tr>
-										<td style="text-align:center;">
-											<strong><?php echo 'Total'; ?></strong>
-										</td>
-										<td style="text-align:center;">
-											<?php echo ''; ?>
-										</td>
-
-										<td style="text-align:right">
-											<strong>
-												<?php {
-													echo round($tr3);
-												}
-												?>
-											</strong>
-										</td>
-										<td style="text-align:right">
-											<strong>
-												<?php {
-													echo number_format($tr4, 2, '.', '');
-												}
-												?>
-											</strong>
-										</td>
-
-
-
-									</tr>
-								</tfoot>
-							<?php
-									}
-							?>
-							</table>
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Month-wise ( <?php echo $mont; ?> )
+											</b></h4>
+									</li>
+								</ol>
+							</div>
 
 						</div>
 					</div>
 				</div>
-				<!-- /.box -->
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<div class="table-responsive">
+									<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+										<thead>
+											<tr>
+												<th style="text-align:center">Supplier Name</th>
+												<th style="text-align:center">Material Name</th>
+												<th style="text-align:center">Quantity</th>
+												<th style="text-align:center">Total Value &nbsp;(&#8377;)</th>
+											</tr>
+										</thead>
+										<tbody>
+											<?php if (!empty($month)) {
+												$tr3 = 0;
+												$tr4 = 0;
+												$ab = isset($_GET['ab']) ? $_GET['ab'] : '';
+												$last = isset($_GET['dat']) ? $_GET['dat'] : '';
+												$new = date("F", strtotime($last)) . "\n";
+												foreach ($month as $rel) {
+											?>
+													<tr>
+														<td><span>
+																<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid; ?>&mid=<?php echo $rel->mid; ?>&ab=<?php echo $ab; ?>&m=<?php echo $new; ?>"><?php echo $rel->supplier_name; ?></a>
+															</span></td>
+														<td><span><?php echo $rel->material_name; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tr3 = $tr3 + round($rel->quantity);
+																							echo round($rel->quantity); ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tr4 = $tr4 + number_format($rel->total, 2, '.', '');
+																							echo number_format($rel->total, 2, '.', ''); ?></span></td>
+													</tr>
+												<?php
+												}
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;">
+													<strong><?php echo 'Total'; ?></strong>
+												</td>
+												<td style="text-align:center;">
+													<?php echo ''; ?>
+												</td>
+
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo round($tr3);
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($tr4, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+
+
+
+											</tr>
+										</tfoot>
+									<?php
+											}
+									?>
+									</table>
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
+				</div>
 			</div>
-			<!-- /.col -->
-		</div>
-	</section>
-</div>
+		</div> <!-- container -->
+	</div> <!-- content -->
 
 
-<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-<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>
-	// Bootstrap datepicker
-	// Set up your table
-	$(document).ready(function() {
-		table = $('#cc').DataTable({
-			"language": {
-				"emptyTable": "<center> Data Not Found ! </center>"
-			},
-			"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: [
+	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+	<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() {
 
-				{
-					extend: 'excelHtml5',
-					footer: 'true',
-					//messageTop: $('h3').text(),
-					title: $('h3').text(),
-					exportOptions: {
-						columns: ':visible'
+			$.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: '<i class="fas fa-angle-right"></i>', // Next button icon
+						previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+					},
+					emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
+				}
+			});
+		});
 
-					}
-				},
+		$(function() {
+			//var dateFormat = "mm/dd/yy",
+			from = $("#min-date")
+				.datepicker({
+					dateFormat: "dd-mm-yy",
+					defaultDate: "+0d",
+					changeMonth: true,
+					//numberOfMonths: 1
 
-				'colvis'
-			],
-			,
-			"footerCallback": function(row, data, start, end, display) {
-				var api = this.api(),
-					data;
+				})
+				.on("change", function() {
+					to.datepicker("option", "minDate", getDate(this));
+				}),
+				to = $("#max-date").datepicker({
+					dateFormat: "dd-mm-yy",
+					defaultDate: "+0d",
+					changeMonth: true,
+					//numberOfMonths: 1
 
-				// 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;
-				};
+				})
+				.on("change", function() {
+					from.datepicker("option", "maxDate", getDate(this));
+				});
 
-				TotalQTY = api
-					.column(2, {
-						search: 'applied'
-					})
-					.data()
-					.reduce(function(a, b) {
-						return intVal(a) + intVal(b);
-					}, 0);
+			function getDate(element) {
+				var date;
 
-				$(api.column(2).footer()).html(TotalQTY.toFixed().bold());
+				try {
+					date = $.datepicker.parseDate(dateFormat, element.value);
 
-				TotalVALUE = api
-					.column(3, {
-						search: 'applied'
-					})
-					.data()
-					.reduce(function(a, b) {
-						return intVal(a) + intVal(b);
-					}, 0);
-
-				$(api.column(3).footer()).html(TotalVALUE.toFixed(2).bold());
+				} catch (error) {
+					date = null;
+				}
 
+				return date;
 			}
 		});
-	});
-	$('#mySelect').on('change', function() {
-
-		table
-			.column(4)
-			.search(this.value)
-			.draw();
-	});
-
-	$(function() {
-		//var dateFormat = "mm/dd/yy",
-		from = $("#min-date")
-			.datepicker({
-				dateFormat: "dd-mm-yy",
-				defaultDate: "+0d",
-				changeMonth: true,
-				//numberOfMonths: 1
-
-			})
-			.on("change", function() {
-				to.datepicker("option", "minDate", getDate(this));
-			}),
-			to = $("#max-date").datepicker({
-				dateFormat: "dd-mm-yy",
-				defaultDate: "+0d",
-				changeMonth: true,
-				//numberOfMonths: 1
-
-			})
-			.on("change", function() {
-				from.datepicker("option", "maxDate", getDate(this));
-			});
-
-		function getDate(element) {
-			var date;
-
-			try {
-				date = $.datepicker.parseDate(dateFormat, element.value);
-
-			} catch (error) {
-				date = null;
-			}
-
-			return date;
-		}
-	});
-
-	function Reset() {
-		$('#mySelect').val('');
-
-	}
-</script>
\ No newline at end of file
+	</script>
\ No newline at end of file
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 @@
 
 
+	<script>
+	$(document).ready(function() {
 
+		$("#client_name").select2();
+		$("#item_name").select2();
+		$("#purchaseorder_number").select2();
+
+
+	});
+</script>
 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
-
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}	
-  th, td { white-space: nowrap; }
-   .dataTable > thead > tr > th[class*="sort"]:after{
-    content: "" !important;
-}
-
-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;
-}		
-		 
-			   
-	 </style>
-	 <div class="content-wrapper">
-	 <section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Monthly GST</b>
-			  <br><br>
-			  <?php
-			  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;
-			  }
-		 
-			  ?>
-			  </p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		     <div class="panel-body">
-
-                    <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
-
-                        <div class="form-group has-feedback">
-						 <div class="col-md-2">
-							 <label for="to_date">
-                                <?php echo 'Year'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="financialyear" name="financialyear">
-								 <option value="">Select Year</option>
-								 <?php 
-								 
-								
-								  foreach($finyear as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                            </div>
-						<div class="col-md-3">
-						    <label for="from_date">
-                                <?php echo 'From Date'; ?>
-                            </label>
-                            <div class="input-group">
-                                <input name="from_date" id="max-date" class="form-control datepicker">
-                                <span class="input-group-addon">
-                                    <i class="fa fa-calendar fa-fw"></i>
-                            </span>
-                            </div>
-                        </div>
-
-             
-                       <div class="col-md-3">
-					        <label for="to_date">
-                                <?php echo 'To Date'; ?>
-                            </label>  
-                            <div class="input-group">
-                                <input name="to_date" id="min-date" class="form-control datepicker">
-                                <span class="input-group-addon">
-                                    <i class="fa fa-calendar fa-fw"></i>
-                            </span>
-                            </div>
-                       
-						</div>
-						<div class="col-md-2">
-								<label for="month">
-                                <?php echo 'Month'; ?>
-                                </label>
-                                <div class="input-group">
-                                 <select class="form-control" id="month" name="month">
-								  <option value="">Select Month</option>
-								 <option value="January">January</option>
-								 <option value="February">February</option>
-								 <option value="March">March</option>
-								 <option value="April">April</option>
-								 <option value="May">May</option>
-								 <option value="June">June</option>
-								 <option value="July">July</option>
-								 <option value="August">August</option>
-								 <option value="September">September</option>
-								 <option value="October">October</option>
-								 <option value="November">November</option>
-								 <option value="December">December</option>
-								 </select>
-                              </div>
-                            </div>
-						<div class="col-md-2"><br><br>
-                        <input type="submit" class="btn btn-success" name="btn_submit" style="margin-top: -14px;margin-bottom: 28px;" 
-                               value="View Report">
-                        
-							</div>  
-							</div>  
-                    </form>
-
-               
-
-            </div>
-           	
-			
-			 <div class="box-body">
-              <div class = "table-responsive">
-                <center><table class="table table-bordered" id="cc" width="70%" style="font-size:12px !important;">
-                   <thead>
-                     <tr>
-				       <th style="text-align:center">Name</th>
-					   <th style="text-align:center">Sales &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-					   <th style="text-align:center">Purchase &nbsp;(<i class="fa fa-rupee " ></i>)</th>
-					   <th style="text-align:center">Net &nbsp;(<i class="fa fa-rupee "></i>)</th>
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				      <?php 
-					  $m=$this->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)){ ?>
-					  
-					   <tr>
-                        <td style="text-align:center"><span>SGST</span></td>
-						<td style="text-align:right"><span><?php 
-						echo round($monthly_gst_sales[0]->sgst,2);?></span></td>
-						<td style="text-align:right"><span><?php 
-						echo round($monthly_gst_purchase[0]->sgst,2);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$sgst_net = $monthly_gst_sales[0]->sgst - $monthly_gst_purchase[0]->sgst;
-						echo round($sgst_net,2);?></span></td>
-					   </tr>
-					   <tr>
-                        <td style="text-align:center"><span>CGST</span></td>
-						<td style="text-align:right"><span><?php 
-						echo round($monthly_gst_sales[0]->cgst,2);?></span></td>
-						<td style="text-align:right"><span><?php 
-						echo round($monthly_gst_purchase[0]->cgst,2);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$cgst_net = $monthly_gst_sales[0]->cgst - $monthly_gst_purchase[0]->cgst;
-						echo round($cgst_net,2);?></span></td>
-					   </tr>
-					    <tr>
-                        <td style="text-align:center"><span>IGST</span></td>
-						<td style="text-align:right"><span><?php 
-						echo round($monthly_gst_sales[0]->igst,2);?></span></td>
-						<td style="text-align:right"><span><?php 
-						echo round($monthly_gst_purchase[0]->igst,2);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$igst_net = $monthly_gst_sales[0]->igst - $monthly_gst_purchase[0]->igst;
-						echo round($igst_net,2);?></span></td>
-					   </tr>
-					   <tr>
-                        <td style="text-align:center"><span>Total GST</span></td>
-						<td style="text-align:right"><span><?php 
-						echo round($monthly_gst_sales[0]->total,2);?></span></td>
-						<td style="text-align:right"><span><?php 
-						echo round($monthly_gst_purchase[0]->total,2);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$total_net = $monthly_gst_sales[0]->total - $monthly_gst_purchase[0]->total;
-						echo round($total_net,2);?></span></td>
-					   </tr>
-			          <?php } ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<!--<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						   
-												 <td class="amount" style="text-align:right"> 
-												<strong>
-												// <?php 
-												 // {
-												 // echo number_format($tot_pac,2,'.','');
-												
-												  // } 
-												  
-												 // ?>  
-												 </strong></td>
-												  <td class="amount" style="text-align:right"> 
-												<strong>
-												// <?php 
-												 // {
-												 // echo number_format($tot_inc,2,'.','');
-												
-												  // } 
-												  
-												 // ?>  
-												 </strong></td>
-												<td class="amount" style="text-align:right"> 
-												<strong>
-												// <?php 
-												 // {
-												 // echo number_format($tot_tot,2,'.','');
-												
-												  // } 
-												  
-												 // ?>  
-												 </strong></td>
-											
-												
-												
-						</tr>-->
-						
-						</tfoot>
-					
-			      </table></center>
-			     <div class="col-md-2" style="float: right;">
-                       <form>
-						<a href="<?= base_url() ?>report/monthly_gst_table?m=<?php echo $m;?>&frm=<?php echo $frm;?>&t=<?php echo $t;?>&financialyear=<?php echo $ab;?>"><input style="width: 100px; padding: 10px; cursor: pointer; box-shadow: 6px 6px 5px; #999; -webkit-box-shadow: 6px 6px 5px #999; -moz-box-shadow: 6px 6px 5px #999; font-weight: bold; background:   #00d976;; color: #000; border-radius: 10px; border: 1px solid #999; font-size: 100%;" type="button" value="View details"/></a>
-						</form>
-                        
-							</div>  
-				</div>
-			   </div>
-			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-	  </div>
-	  </section>
-	  </div>
+<style>
 	
+	table{
+		width:auto;
+	}
+
+	.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; */
+
+	}
+</style>
+
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+						<div class="page-title-right">
+                                <ol class="breadcrumb m-0">
+                                    <li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
+                                    <li class="breadcrumb-item"><a href="javascript: void(0);"></a></li>
+                                    <li class="breadcrumb-item active">
+                                    <h4 class="page-title"><b> Monthly GST Summary Reports </b></h4>
+                                    </li>
+                                </ol>
+                            </div>
+							
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+							<form method="post" action="<?php echo base_url('Report_monthly_gst'); ?>">
+
+								<div class="form-group has-feedback">
+									<div class="row">
+										<div class="col-md-3 ">
+											<label for="to_date">
+												<?php echo 'Year'; ?>
+											</label>
+											<select class="form-control" id="financialyear" name="financialyear">
+											<option value="">Select Year</option>
+											<?php 
+											
+											
+											foreach($finyear as $item):
+													
+													{?>
+													
+													<option 
+													<?php echo isset($ab) && $ab == $item->financial_year ? "selected" : "" ?>
+													value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
+													
+															
+													<?php } endforeach; ?>
+											
+											</select>
+										</d>
+										</div>
+										<div class="col-md-3">
+											<label for="from_date">
+												<?php echo 'From Date'; ?>
+											</label>
+											<div class="input-group">
+												<input name="from_date" id="max-date" class="form-control datepicker"
+												value="<?php echo isset($frm) ? $frm : "" ?>">
+											</div>
+										</div>
+										<div class="col-md-3">
+											<label for="to_date">
+												<?php echo 'To Date'; ?>
+											</label>  
+											<div class="input-group">
+												<input name="to_date" id="min-date" class="form-control datepicker"
+												value="<?php echo isset($t) ? $t : "" ?>">
+											</div>
+
+										</div>
+										<div class="col-md-3">
+											<label for="month">
+											<?php echo 'Month'; ?>
+											</label>
+											<div class="input-group">
+											<?php
+												$months = [
+													"January", "February", "March", "April", "May", "June",
+													"July", "August", "September", "October", "November", "December"
+												];
+												?>
+
+												<select class="form-control" id="month" name="month">
+													<option value="">Select Month</option>
+													<?php foreach ($months as $month): ?>
+														<option value="<?= $month ?>" <?= (isset($m) && $m == $month) ? 'selected' : '' ?>>
+															<?= $month ?>
+														</option>
+													<?php endforeach; ?>
+												</select>
+
+										</div>
+										</div>
+
+									</div>
+									<div class="row">
+										<div class="col text-right"><br><br>
+										<input type="button" class="btn btn-danger mb-4" value="Reset" onclick="window.location.href='<?= base_url('Report_monthly_gst') ?>';">
+										<input type="submit" class="btn btn-success" name="btn_submit" style="margin-top: -14px;margin-bottom: 26px;" 
+											value="View Report">
+
+										</div> 
+									</div>
+										
 
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+								</form>
+								<table id="cc" class="table table-bordered table-hover wrap" style="background-color:#fff;width: 100% !important;">
+
+									<!-- <table class="table table-bordered table-hover" id="asset_list_table" style="background-color:#fff;font-size:12px;"> -->
+									<thead>
+										<tr>
+											<th style="text-align:center">Name</th>
+											<th style="text-align:center">Sales &nbsp;(<i class="fa fa-rupee " ></i>)</th>
+											<th style="text-align:center">Purchase &nbsp;(<i class="fa fa-rupee " ></i>)</th>
+											<th style="text-align:center">Net &nbsp;(<i class="fa fa-rupee "></i>)</th>
+											
+										</tr>
+									</thead>
+									<tbody>
+									<?php 
+
+										if(!empty($monthly_gst_purchase) and !empty($monthly_gst_sales)){ ?>
+
+										<tr>
+										<td style="text-align:center"><span>SGST</span></td>
+										<td style="text-align:right"><span><?php 
+										echo round($monthly_gst_sales[0]->sgst,2);?></span></td>
+										<td style="text-align:right"><span><?php 
+										echo round($monthly_gst_purchase[0]->sgst,2);?></span></td>
+										<td style="text-align:right"><span><?php 
+										$sgst_net = $monthly_gst_sales[0]->sgst - $monthly_gst_purchase[0]->sgst;
+										echo round($sgst_net,2);?></span></td>
+										</tr>
+										<tr>
+										<td style="text-align:center"><span>CGST</span></td>
+										<td style="text-align:right"><span><?php 
+										echo round($monthly_gst_sales[0]->cgst,2);?></span></td>
+										<td style="text-align:right"><span><?php 
+										echo round($monthly_gst_purchase[0]->cgst,2);?></span></td>
+										<td style="text-align:right"><span><?php 
+										$cgst_net = $monthly_gst_sales[0]->cgst - $monthly_gst_purchase[0]->cgst;
+										echo round($cgst_net,2);?></span></td>
+										</tr>
+										<tr>
+										<td style="text-align:center"><span>IGST</span></td>
+										<td style="text-align:right"><span><?php 
+										echo round($monthly_gst_sales[0]->igst,2);?></span></td>
+										<td style="text-align:right"><span><?php 
+										echo round($monthly_gst_purchase[0]->igst,2);?></span></td>
+										<td style="text-align:right"><span><?php 
+										$igst_net = $monthly_gst_sales[0]->igst - $monthly_gst_purchase[0]->igst;
+										echo round($igst_net,2);?></span></td>
+										</tr>
+										<tr>
+										<td style="text-align:center"><span>Total GST</span></td>
+										<td style="text-align:right"><span><?php 
+										echo round($monthly_gst_sales[0]->total,2);?></span></td>
+										<td style="text-align:right"><span><?php 
+										echo round($monthly_gst_purchase[0]->total,2);?></span></td>
+										<td style="text-align:right"><span><?php 
+										$total_net = $monthly_gst_sales[0]->total - $monthly_gst_purchase[0]->total;
+										echo round($total_net,2);?></span></td>
+										</tr>
+										<?php } ?>
+
+			                        </tbody>
+                                        <tfoot  width="100%">
+
+                                        </tfoot>
+								</table>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
+				</div>
+			</div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+</div>
+
+
+<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
+    // 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+                previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+            }
+        }
+    });
+});
+</script>
+
+
+
+<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
@@ -375,6 +359,4 @@ $(document).ready(function() {
 }
 
 	</script>
-	
-	
 	
\ No newline at end of file
diff --git a/app/Views/Report_openorder.php b/app/Views/Report_openorder.php
index b79259e3..c6847981 100755
--- a/app/Views/Report_openorder.php
+++ b/app/Views/Report_openorder.php
@@ -52,9 +52,9 @@
 						<div class="page-title-right">
                                 <ol class="breadcrumb m-0">
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
-                                    <li class="breadcrumb-item"><a href="javascript: void(0);"></a></li>
+                                    <li class="breadcrumb-item"><a href="javascript: void(0);">Requisation</a></li>
                                     <li class="breadcrumb-item active">
-                                    <h4 class="page-title"><b>   </b></h4>
+                                    <h4 class="page-title"><b> Open Orders - Pending  </b></h4>
                                     </li>
                                 </ol>
                             </div>
@@ -123,7 +123,7 @@
 													<?php echo 'Total Order Value From'; ?>
 												</label>
 												<div class="input-group">
-													<input name="total_order_value_From" id="total_order_value_From" style="padding:4px;">
+													<input class="form-control" name="total_order_value_From" id="total_order_value_From" style="padding:4px;">
 												</span>
 												</div>
 											</div>
@@ -132,7 +132,7 @@
 													<?php echo 'Total Order Value To'; ?>
 												</label>  
 												<div class="input-group">
-													<input name="total_order_value_To" id="total_order_value_To" style="padding:4px;">
+													<input class="form-control" name="total_order_value_To" id="total_order_value_To" style="padding:4px;">
 												</span>
 												</div>
 
@@ -160,7 +160,8 @@
 												</div>
 
 											</div>
-											<div class="col-md-3 col-md-offset-10"><br>
+											<div class="col-md-6 text-right"><br>
+											<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('openOrder') ?>';">
 											<input type="submit" class="btn btn-success" name="btn_submit"
 												value="View Report">
 
@@ -242,6 +243,13 @@
 $(document).ready(function() {
     // Initialize the DataTable with only pagination enabled
     var table = $('#cc').DataTable({
+		dom: 'Blfrtip',
+            buttons: [
+                {
+					extend: 'excel',
+					text: 'Excel',
+				}
+            ],
         paging: true, // Enable pagination
         searching: true, // Disable search
         ordering: false, // Disable column sorting
diff --git a/app/Views/Report_pending_purchase.php b/app/Views/Report_pending_purchase.php
index 913a9c29..1add1af4 100755
--- a/app/Views/Report_pending_purchase.php
+++ b/app/Views/Report_pending_purchase.php
@@ -71,7 +71,7 @@
 								<form method="post" action="<?php echo base_url("Report_pending_purchase"); ?>">
 									<div class="form-group">
 										<div class="row">
-											<div class="col-4">
+											<div class="col-3">
 												<label for="client_name">
 													<?php echo 'Supplier'; ?>
 												</label>
@@ -84,7 +84,7 @@
 													endforeach; ?>
 												</select>
 											</div>
-											<div class="col-4">
+											<div class="col-3">
 												<label for="client_name">
 													<?php echo 'Material'; ?>
 												</label>
@@ -97,7 +97,7 @@
 													endforeach; ?>
 												</select>
 											</div>
-											<div class="col-2">
+											<div class="col-3">
 												<label for="to_date">
 													<?php echo 'Year'; ?>
 												</label>
@@ -110,7 +110,7 @@
 													endforeach; ?>
 												</select>
 											</div>
-											<div class="col-2">
+											<div class="col-3">
 												<label for="to_date">
 													<?php echo 'Month'; ?>
 												</label>
@@ -127,7 +127,7 @@
 										</div>
 										<br>
 										<div class="row">
-											<div class="col-2">
+											<div class="col-3">
 												<label for="from_date">
 													<?php echo 'From Date'; ?>
 												</label>
@@ -135,7 +135,7 @@
 													<input type="date" class="form-control" name="from_date" id="max-date" value="<?php if(isset($from_date)){ echo $from_date; } ?>">
 												</div>
 											</div>
-											<div class="col-2">
+											<div class="col-3">
 												<label for="to_date">
 													<?php echo 'To Date'; ?>
 												</label>
@@ -144,7 +144,7 @@
 												</div>
 
 											</div>
-											<div class="col-4">
+											<div class="col-3">
 												<label for="purchaseorder_number">
 													<?php echo 'Purchase order number'; ?>
 												</label>
@@ -157,8 +157,7 @@
 													endforeach; ?>
 												</select>
 											</div>
-											<div class="col-md-2"></div>
-											<div class="col-md-2 text-right"><br>
+											<div class="col-3 text-right"><br>
 												<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Report_pending_purchase') ?>';">
 												<input type="submit" class="btn btn-success" name="btn_submit"
 													value="View Report">
@@ -351,6 +350,13 @@
 	$(document).ready(function() {
     // Initialize the DataTable with only pagination enabled
     var table = $('#cc').DataTable({
+		dom: 'Blfrtip',
+            buttons: [
+                {
+					extend: 'excel',
+					text: 'Excel',
+				}
+            ],
         paging: true, // Enable pagination
         searching: true, // Disable search
         ordering: false, // Disable column sorting
diff --git a/app/Views/Report_purchase.php b/app/Views/Report_purchase.php
index c8006637..3eed6072 100755
--- a/app/Views/Report_purchase.php
+++ b/app/Views/Report_purchase.php
@@ -71,7 +71,7 @@
 							<form method="post" action="<?php echo base_url('Report_purchase'); ?>">
 									<div class="form-group">
 										<div class="row">
-											<div class="col-4">
+											<div class="col-3">
 												<label for="client_name">
 													<?php echo 'Supplier'; ?>
 												</label>
@@ -84,7 +84,7 @@
 													endforeach; ?>
 												</select>
 											</div>
-											<div class="col-4">
+											<div class="col-3">
 												<label for="client_name">
 													<?php echo 'Material'; ?>
 												</label>
@@ -97,7 +97,7 @@
 													endforeach; ?>
 												</select>
 											</div>
-											<div class="col-2">
+											<div class="col-3">
 												<label for="to_date">
 													<?php echo 'Year'; ?>
 												</label>
@@ -110,7 +110,7 @@
 													endforeach; ?>
 												</select>
 											</div>
-											<div class="col-2">
+											<div class="col-3">
 												<label for="to_date">
 													<?php echo 'Month'; ?>
 												</label>
@@ -127,7 +127,7 @@
 										</div>
 										<br>
 										<div class="row">
-											<div class="col-2">
+											<div class="col-3">
 												<label for="from_date">
 													<?php echo 'From Date'; ?>
 												</label>
@@ -135,7 +135,7 @@
 													<input type="date" class="form-control" name="from_date" id="max-date" value="<?php if(isset($frm)){ echo $frm; } ?>">
 												</div>
 											</div>
-											<div class="col-2">
+											<div class="col-3">
 												<label for="to_date">
 													<?php echo 'To Date'; ?>
 												</label>
@@ -144,8 +144,9 @@
 												</div>
 
 											</div>
-											<div class="col-md-6"></div>
-											<div class="col-md-2 text-right"><br>
+											<div class="col-3"></div>
+											<div class="col-3 text-right"><br>
+												<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Report_purchase') ?>';">
 												<input type="submit" class="btn btn-success" name="btn_submit"
 													value="View Report">
 											</div>
@@ -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_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 @@
+<!-- Report_purchase_inward.php -->
 <script>
- $(document).ready(function () {
-	 
-	  $("#client_name").select2();
-	  $("#item_name").select2();
-	                  
-});  
+	$(document).ready(function() {
+		$("#financialyear").select2();
+		$("#month").select2();
+		$("#client_name").select2();
+		$("#item_name").select2();
+	});
 </script>
 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
 
-<style> 
-	 .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;
-
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}	
-  th, td { white-space: nowrap; }
-    .dataTable > thead > tr > th[class*="sort"]:after{
-    content: "" !important;
-
-}
-	#cc_info{
-		    width: 250%;
+<style>
+	table {
+		width: auto;
 	}
-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;
-}
-		
-			   
-	 </style>
-	   <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Inward Details</b><br><br>
-			  <?php
-			  if($this->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;
-			  }
-		 
-			  ?></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		     <div class="panel-body">
+</style>
 
-                    <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
-
-                        <div class="form-group has-feedback">
-						<div class="col-md-4">
-						    <label for="client_name">
-                                <?php echo 'Supplier'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="client_name" name="client_name">
-								 <option value="">Select Supplier</option>
-								 <?php 
-								foreach($cust as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->SupplierName;?>"><?php echo $item->SupplierName ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                        </div>  
-						<div class="col-md-4">
-						    <label for="client_name">
-                                <?php echo'Material'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="item_name" name="item_name">
-								 <option value="">Select Material</option>
-								 <?php 
-								
-								
-								  foreach($material as $it):
-										 
-										 {?>
-										
-										<option value="<?php echo $it->MaterialName;?>"><?php echo $it->MaterialName ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                        </div>   
-                       <div class="col-md-2">
-							 <label for="to_date">
-                                <?php echo 'Year'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="financialyear" name="financialyear">
-								 <option value="">Select Year</option>
-								 <?php 
-								 
-								
-								  foreach($finyear as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                            </div>
-								<div class="col-md-2">
-								<label for="to_date">
-                                <?php echo 'Month'; ?>
-                                </label>
-                                <div class="input-group">
-                                 <select class="form-control" id="month" name="month">
-								  <option value="">Select Month</option>
-								 <option value="January">January</option>
-								 <option value="February">February</option>
-								 <option value="March">March</option>
-								 <option value="April">April</option>
-								 <option value="May">May</option>
-								 <option value="June">June</option>
-								 <option value="July">July</option>
-								 <option value="August">August</option>
-								 <option value="September">September</option>
-								 <option value="October">October</option>
-								 <option value="November">November</option>
-								 <option value="December">December</option>
-								 </select>
-                              </div>
-                            </div>
-						<div class="col-md-4">
-						    <label for="from_date">
-                                <?php echo 'From Date'; ?>
-                            </label>
-                            <div class="input-group">
-                                <input name="from_date" id="max-date" class="form-control datepicker">
-                                <span class="input-group-addon">
-                                    <i class="fa fa-calendar fa-fw"></i>
-                            </span>
-                            </div>
-                        </div>
-
-             
-                       <div class="col-md-4">
-					        <label for="to_date">
-                                <?php echo 'To Date'; ?>
-                            </label>  
-                            <div class="input-group">
-                                <input name="to_date" id="min-date" class="form-control datepicker">
-                                <span class="input-group-addon">
-                                    <i class="fa fa-calendar fa-fw"></i>
-                            </span>
-                            </div>
-                       
-						</div>
-						<div class="col-md-2 col-md-offset-2"> <br>
-                        <input type="submit" class="btn btn-success" name="btn_submit"
-                               value="View Report">
-                        
-							</div>  
-							</div>  
-                    </form>
-
-               
-
-            </div>
-           	
-
-
-
-
-           	<div class="modal fade" id="Fileshow" role="dialog">
-				<div class="modal-dialog">
-					<!-- Modal content-->
-					<form>
-						<div class="modal-content" style="width:800px;">
-							
-							
-		
-
-							<!-- Table to show the line item of po -->
-							  <div id="content" > </div> 
-							<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
-								<!-- <thead style="background-color:#ffffff;"> -->
-								<thead>
-									<tr>								 
-										<th>SNo</th>
-										<th>BillNO</th>
-										<th>PONO</th>
-										<th>FileName</th>
-										
-																				
-									</tr>
-								</thead>								
-								<tbody id="tbleAppend1">
-																	
-								</tbody>
-  							</table>
-							 
-							<div class="modal-footer">
-								<a class="btn btn-success" data-dismiss="modal"  value="Cancel">Cancel</a>
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b>Inward Details</b></h4>
+									</li>
+								</ol>
 							</div>
+
 						</div>
-					</form>
+					</div>
 				</div>
-			</div>	
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
 
-			 
-                        <span style="color:red;">*Insurance field not included </span>
-                        
-						
-		       
-			 <div class="box-body">
-              <div class = "table-responsive">
-                <table   id="cc" class="table table-bordered" cellspacing="0"  style="font-size:12px !important;">
-				<thead>
-                     <tr>
-				       <th>PO No</th>
-					   <th>IGR Created Date</th>
-					   <th>Time</th>
-					   <th>Material Received Date</th>
-					   <th>Material Name</th>
-					   <th>Category</th>
-					   <th>Supplier Name</th>
-					   <th>Qty</th>
-					   <th>UOM</th>
-					   <th>Rate &nbsp;(&#8377;)</th>
-					   <th>Value &nbsp;(&#8377;)</th>
-					    <th>Exchange Rate</th>
-					   <th>SGST &nbsp;(&#8377;)</th>
-					   <th>CGST &nbsp;(&#8377;)</th>
-					   <th>IGST &nbsp;(&#8377;)</th>
-					   <th>Discount &nbsp;(&#8377;)</th>
-					   <th>Freight &nbsp;(&#8377;)</th>
-					   <th>Package &nbsp;(&#8377;)</th>
-					   <th>Total &nbsp;(&#8377;)</th>
-					   <th>Attachments</th>
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-					<?php 
-						$tot_qty = 0;
-						$tot_rate = 0;
-						$tot_value = 0;
-						$tot_ex = 0;
-						$tot_CGST = 0;
-						$tot_SCGT = 0.0000;
-						$tot_ICGT = 0;
-						$tot_dis = 0;
-						$tot_frg = 0;
-						$tot_pac = 0;
-						//$tot_inc = 0;
-						$tot_tot = 0;
-						if(!empty($purchase)){
-							foreach($purchase as $key => $rel)
-								//print_r($rel);
-					    {				
-					   ?> 
-					  <tr id="lastvalue">
-                        <td id="pono<?php echo $key?>"><span>
-						<a href="<?php echo base_url().'purchaseorder/CreatePOPrint?PONO='.$rel->pono.'&ReqType='.$rel->potype; ?>"><?php echo $rel->pono;?></a>
-						</span></td>
-                        <td style="text-align:center"><span><?php echo $rel->created_date;?></span></td>
-				        <td style="text-align:right"><span><?php echo $rel->created_time;?></span></td>
-						<td style="text-align:center"><span><?php echo $rel->materialrcvddate;?></span></td>
-						<td><span><?php echo $rel->material_name;?></span></td>
-						<td><span><?php echo $rel->category;?></span></td>
-						<td><span><?php echo $rel->supplier_name;?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_qty= $tot_qty + round($rel->quantity);
-						echo round($rel->quantity);?></span></td>
-						<td style="text-align:left"><span><?php 
-						echo $rel->UOM;?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_rate= $tot_rate + $rel->rate;
-						echo $rel->rate;?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_value= $tot_value + $rel->value;
-						echo $rel->value;?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_ex= $tot_ex + $rel->exchange_rate;
-						echo $rel->exchange_rate;?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_SCGT= $tot_SCGT + $rel->sgst;
-						echo $rel->sgst;?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_CGST= $tot_CGST + $rel->cgst;
-						echo $rel->cgst;?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_ICGT= $tot_ICGT + $rel->igst;
-						echo $rel->igst;?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_dis= $tot_dis + $rel->discount;
-						echo $rel->discount;?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_frg= $tot_frg + $rel->freight;
-						echo $rel->freight;?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_pac= $tot_pac + $rel->Package;
-						echo $rel->Package;?></span></td>
-						
+							<div class="card-body">
 
-						<td style="text-align:right"><span><?php 
-						$tot_tot= $tot_tot + round($rel->total,2);
-                        echo number_format($rel->total,2,'.','');
-						?></span></td>
+								<form method="post" action="<?php echo base_url("Report_purchase_inward"); ?>">
+									<div class="row">
+										<div class="col-md-4">
+											<label for="client_name">
+												<?php echo 'Supplier'; ?>
+											</label>
+
+											<select class="form-control" id="client_name" name="client_name">
+												<option value="">Select Supplier</option>
+												<?php
+												foreach ($cust as $item): { ?>
+
+														<option
+															<?php if (isset($client_name) && ($client_name == $item->SupplierName)) {
+																echo 'selected';
+															} ?>
+															value="<?php echo $item->SupplierName; ?>"><?php echo $item->SupplierName;  ?></option>
 
 
-						<td  id="download<?php echo $key?>"  style="text-align:center"><span>
-						<?php 
-						if(!empty($rel->file)){ ?><!-- if for Inward po file -->
-						<a target="_blank" class="yourlink"  data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><button class="btn btn-info btn-sm splpofile" id="<?php echo $rel->igrn.'-'.$rel->pono;?>">Download</button></a>
-						<?php }
-						else if(!empty($rel->ifile )) { ?><!-- else if for igr file -->
-					    <a target="_blank" class="yourlink" data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View">
-					    	<button class="btn btn-info btn-sm IGRfile" id="<?php echo $rel->igrn.'-'.$rel->pono;?>">Download</button>
-					    </a>	
-						<?php } else if (!empty($rel->Infiles)){ ?><!-- if for Inward po file -->
-						<a target="_blank" class="yourlink"  data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><button class="btn btn-info btn-sm IGRfile" id="<?php echo $rel->igrn.'-'.$rel->pono;?>">Download</button></a>
-						<?php } else { echo 'N/A'; } ?><!-- both inwardpo file and Igr file empty means -->
+												<?php }
+												endforeach; ?>
+
+											</select>
+
+										</div>
+										<div class="col-md-4">
+											<label for="client_name">
+												<?php echo 'Material'; ?>
+											</label>
+											<div class="input-group">
+												<select class="form-control" id="item_name" name="item_name">
+													<option value="">Select Material</option>
+													<?php
 
 
-						
-						</span></td>
-					   
-					  </tr>
-			           <?php
-					    }}
-					   ?>
-					   <?php if(!empty($cashbookdatas)){
-							 foreach($cashbookdatas as $cb)
-							 {				
-							?> 
-						   <tr>
-                        <td style="text-align:left"><span><?php echo $cb->AccountCode;?></span></td>
-						<td style="text-align:center"><span><?php echo $cb->CreatedDate;?></span></td>
-						<td style="text-align:right"><span><?php echo '-';?></span></td>
-                        <td style="text-align:center"><span><?php echo $cb->Date;?></span></td>
-						<td><span><?php echo $cb->AccountName;?></span></td>
-						<td><span><?php echo $cb->type.'-'.$cb->category;?></span></td>
-						<td><span><?php echo $cb->Suppliername;?></span></td>
-						<td style="text-align:right"><span><?php echo '-';?></span></td>
-						<td style="text-align:left"><span><?php echo '-';?></span></td>
-						<td style="text-align:right"><span><?php echo '-';?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_value= $tot_value + $cb->Value;
-						echo $cb->Value;?></span></td>
-						<td style="text-align:right"><span><?php echo '-';?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_SCGT= $tot_SCGT + $cb->sgst;
-						echo $cb->sgst;?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_CGST= $tot_CGST + $cb->cgst;
-						echo $cb->cgst;?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_ICGT= $tot_ICGT + $cb->igst;
-						echo $cb->igst;?></span></td>
-						<td style="text-align:right"><span><?php echo '-';?></span></td>
-						<td style="text-align:right"><span><?php echo '-';?></span></td>
-						<td style="text-align:right"><span><?php echo '-';?></span></td>
-						<!-- <td style="text-align:right"><span>
-						//$tot_tot= $tot_tot + round($cb->Total,2);
-						//echo number_format($cb->Total,2,'.','');
-						</span></td> -->
-						<td style="text-align:right"><span><?php 
-						$tot_tot= $tot_tot + round($cb->Total,2);
-						echo number_format($cb->Total,2,'.','');?></span></td>
-                        
-						<td style="text-align:center"><span>
-						<?php 
-						if(!empty($cb->cashbookfile)){ ?>
-						<a target="_blank" href="<?php echo  base_url().''. $cb->cashbookfile  ?>" data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><button>File Available</button></a>	
-						<?php }else
-						{
-							echo 'N/A';
-						}
-						?>
-						</span></td>
+													foreach ($material as $it): { ?>
 
-						</tr>
-					<?php } } ?>
+															<option value="<?php echo $it->MaterialName; ?>"
+																<?php if (isset($item_name) && ($item_name == $it->MaterialName)) {
+																	echo 'selected';
+																} ?>><?php echo $it->MaterialName;  ?></option>
 
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-									<td style="text-align:center;"><strong>Total</strong></td>
-									<td><strong>&nbsp</strong></td>
-									<td><strong>&nbsp</strong></td>
-									<td><strong>&nbsp</strong></td>
-									<td><strong>&nbsp</strong></td>
-									<td><strong>&nbsp</strong></td>
-									<td><strong>&nbsp</strong></td>
-						 
-									<td class="amount" style="text-align:right"><strong>
-								 				<?php echo $tot_qty; ?>  
-									</strong></td>  
-											
-								    <td class="amount"><strong>
-								                <?php //echo  format_currency($tot_rate,2,'.',''); ?> 
-                                	</strong></td>	
 
-									<td class="amount"><strong>
-								 				<?php //echo  format_currency($tot_rate,2,'.',''); ?> 
-                                    </strong></td>	
+													<?php }
+													endforeach; ?>
 
-									<td class="amount" style="text-align:right">
-												<strong>
-												<?php echo number_format($tot_value,2,'.',''); ?> 
-                                	</strong></td>
+												</select>
+											</div>
+										</div>
+										<div class="col-md-2">
+											<label for="to_date">
+												<?php echo 'Year'; ?>
+											</label>
+											<div class="input-group">
+												<select class="form-control" id="financialyear" name="financialyear">
+													<option value="">Select Year</option>
+													<?php
 
-									<td class="amount" style="text-align:right">
-												<strong>
-												<?php echo $tot_ex; ?> 
-                                	</strong></td>
 
-									<td class="amount" style="text-align:right">
-												<strong>
-												<?php  echo number_format($tot_SCGT,2,'.',''); ?>  
-									</strong></td>
+													foreach ($finyear as $item): { ?>
 
-									<td class="amount" style="text-align:right">
-												<strong>
-												<?php echo number_format($tot_CGST,2,'.',''); ?> 
-									</strong></td>
+															<option value="<?php echo $item->financial_year; ?>" <?php if (isset($financialyear) && ($financialyear == $item->financial_year)) {
+																														echo 'selected';
+																													} ?>><?php echo $item->financial_year;  ?></option>
 
-									<td class="amount" style="text-align:right">
-												<strong>
-												<?php echo number_format($tot_ICGT,2,'.',''); ?> 
-									</strong></td>
 
-									<td class="amount" style="text-align:right"> 
-												<strong>
-												<?php echo number_format($tot_dis,2,'.','');?>  
-									</strong></td>
+													<?php }
+													endforeach; ?>
+												</select>
+											</div>
+										</div>
+										<div class="col-md-2">
+											<label for="to_date">
+												<?php echo 'Month'; ?>
+											</label>
+											<div class="input-group">
+												<select class="form-control" id="month" name="month">
+													<option value="">Select Month</option>
+													<option value="January" <?php if (isset($month) && ($month == "January")) {
+																				echo 'selected';
+																			} ?>>January</option>
+													<option value="February" <?php if (isset($month) && ($month == "February")) {
+																					echo 'selected';
+																				} ?>>February</option>
+													<option value="March" <?php if (isset($month) && ($month == "March")) {
+																				echo 'selected';
+																			} ?>>March</option>
+													<option value="April" <?php if (isset($month) && ($month == "April")) {
+																				echo 'selected';
+																			} ?>>April</option>
+													<option value="May" <?php if (isset($month) && ($month == "May")) {
+																			echo 'selected';
+																		} ?>>May</option>
+													<option value="June" <?php if (isset($month) && ($month == "June")) {
+																				echo 'selected';
+																			} ?>>June</option>
+													<option value="July" <?php if (isset($month) && ($month == "July")) {
+																				echo 'selected';
+																			} ?>>July</option>
+													<option value="August" <?php if (isset($month) && ($month == "August")) {
+																				echo 'selected';
+																			} ?>>August</option>
+													<option value="September" <?php if (isset($month) && ($month == "September")) {
+																					echo 'selected';
+																				} ?>>September</option>
+													<option value="October" <?php if (isset($month) && ($month == "October")) {
+																				echo 'selected';
+																			} ?>>October</option>
+													<option value="November" <?php if (isset($month) && ($month == "November")) {
+																					echo 'selected';
+																				} ?>>November</option>
+													<option value="December" <?php if (isset($month) && ($month == "December")) {
+																					echo 'selected';
+																				} ?>>December</option>
+												</select>
+											</div>
+										</div>
+									</div>
+									<div class="row mt-2">
+										<div class="col-md-2 ">
+											<label for="from_date">
+												<?php echo 'From Date'; ?>
+											</label>
+											<div class="input-group">
+												<input name="from_date" id="max-date" class="form-control" autocomplete="off" value="<?php if (isset($from_date)) {
+																																			echo $from_date;
+																																		} ?>">
+											</div>
+										</div>
+										<div class="col-md-2">
+											<label for="to_date">
+												<?php echo 'To Date'; ?>
+											</label>
+											<div class="input-group">
+												<input name="to_date" id="min-date" class="form-control datepicker" autocomplete="off" value="<?php if (isset($to_date)) {
+																																					echo $to_date;
+																																				} ?>">
+											</div>
 
-									<td class="amount" style="text-align:right"> 
-												 <strong>
-												 <?php echo number_format($tot_frg,2,'.',''); ?>  
-									</strong></td>
-												
-									<td class="amount" style="text-align:right"> 
-												 <strong>
-												 <?php echo number_format($tot_pac,2,'.',''); ?>  
-											</strong></td>
-												 
-											<td class="amount" style="text-align:right"> 
-												<strong>
-												<?php echo number_format($tot_tot,2,'.',''); ?>  
-											</strong></td>
-																
-						</tr>		
-						</tfoot>
-			      </table>
-				  
-			 
+										</div>
+										<div class="col-md-8 mt-2 text-right">
+											<input type="button" class="btn btn-danger" value="Reset" onclick="window.location.href='<?= base_url('Report_purchase_inward') ?>';">
+
+
+											<input type="submit" class="btn btn-success ml-2" name="btn_submit" value="View Report">
+										</div>
+									</div>
+
+
+
+
+
+
+									<div class="form-group has-feedback">
+
+									</div>
+
+
+								</form>
+								<span style="color:red;">*Insurance field not included </span>
+								<div class="table-responsive">
+									<table id="cc" class="table table-bordered" cellspacing="0" style="font-size:12px !important;">
+										<thead>
+											<tr>
+												<th>PO No</th>
+												<th>IGR Created Date</th>
+												<th>Time</th>
+												<th>Material Received Date</th>
+												<th>Material Name</th>
+												<th>Category</th>
+												<th>Supplier Name</th>
+												<th>Qty</th>
+												<th>UOM</th>
+												<th>Rate &nbsp;(&#8377;)</th>
+												<th>Value &nbsp;(&#8377;)</th>
+												<th>Exchange Rate</th>
+												<th>SGST &nbsp;(&#8377;)</th>
+												<th>CGST &nbsp;(&#8377;)</th>
+												<th>IGST &nbsp;(&#8377;)</th>
+												<th>Discount &nbsp;(&#8377;)</th>
+												<th>Freight &nbsp;(&#8377;)</th>
+												<th>Package &nbsp;(&#8377;)</th>
+												<th>Total &nbsp;(&#8377;)</th>
+
+
+											</tr>
+										</thead>
+										<tbody>
+											<?php
+											$tot_qty = 0;
+											$tot_rate = 0;
+											$tot_value = 0;
+											$tot_ex = 0;
+											$tot_CGST = 0;
+											$tot_SCGT = 0.0000;
+											$tot_ICGT = 0;
+											$tot_dis = 0;
+											$tot_frg = 0;
+											$tot_pac = 0;
+											//$tot_inc = 0;
+											$tot_tot = 0;
+											if (!empty($purchase)) {
+												foreach ($purchase as $key => $rel)
+												//print_r($rel);
+												{
+											?>
+													<tr id="lastvalue">
+														<td id="pono<?php echo $key ?>"><span>
+																<a href="<?php echo base_url() . 'purchaseorder/CreatePOPrint?PONO=' . $rel->pono . '&ReqType=' . $rel->potype; ?>"><?php echo $rel->pono; ?></a>
+															</span></td>
+														<td style="text-align:center"><span><?php echo $rel->created_date; ?></span></td>
+														<td style="text-align:right"><span><?php echo $rel->created_time; ?></span></td>
+														<td style="text-align:center"><span><?php echo $rel->materialrcvddate; ?></span></td>
+														<td><span><?php echo $rel->material_name; ?></span></td>
+														<td><span><?php echo $rel->category; ?></span></td>
+														<td><span><?php echo $rel->supplier_name; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tot_qty = $tot_qty + round($rel->quantity);
+																							echo round($rel->quantity); ?></span></td>
+														<td style="text-align:left"><span><?php
+																							echo $rel->UOM; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tot_rate = $tot_rate + $rel->rate;
+																							echo $rel->rate; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tot_value = $tot_value + $rel->value;
+																							echo $rel->value; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tot_ex = $tot_ex + (int)$rel->exchange_rate;
+																							echo $rel->exchange_rate; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tot_SCGT = $tot_SCGT + $rel->sgst;
+																							echo $rel->sgst; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tot_CGST = $tot_CGST + $rel->cgst;
+																							echo $rel->cgst; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tot_ICGT = $tot_ICGT + $rel->igst;
+																							echo $rel->igst; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tot_dis = $tot_dis + $rel->discount;
+																							echo $rel->discount; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tot_frg = $tot_frg + $rel->freight;
+																							echo $rel->freight; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tot_pac = $tot_pac + $rel->Package;
+																							echo $rel->Package; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tot_tot = $tot_tot + round($rel->total, 2);
+																							echo number_format($rel->total, 2, '.', '');
+																							?></span></td>
+													</tr>
+											<?php
+												}
+											}
+											?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+												<td><strong>&nbsp</strong></td>
+												<td><strong>&nbsp</strong></td>
+												<td><strong>&nbsp</strong></td>
+												<td><strong>&nbsp</strong></td>
+												<td><strong>&nbsp</strong></td>
+												<td><strong>&nbsp</strong></td>
+
+												<td class="amount" style="text-align:right"><strong>
+														<?php echo $tot_qty; ?>
+													</strong></td>
+
+												<td class="amount"><strong>
+														<?php //echo  format_currency($tot_rate,2,'.',''); 
+														?>
+													</strong></td>
+
+												<td class="amount"><strong>
+														<?php //echo  format_currency($tot_rate,2,'.',''); 
+														?>
+													</strong></td>
+
+												<td class="amount" style="text-align:right">
+													<strong>
+														<?php echo number_format($tot_value, 2, '.', ''); ?>
+													</strong>
+												</td>
+
+												<td class="amount" style="text-align:right">
+													<strong>
+														<?php echo $tot_ex; ?>
+													</strong>
+												</td>
+
+												<td class="amount" style="text-align:right">
+													<strong>
+														<?php echo number_format($tot_SCGT, 2, '.', ''); ?>
+													</strong>
+												</td>
+
+												<td class="amount" style="text-align:right">
+													<strong>
+														<?php echo number_format($tot_CGST, 2, '.', ''); ?>
+													</strong>
+												</td>
+
+												<td class="amount" style="text-align:right">
+													<strong>
+														<?php echo number_format($tot_ICGT, 2, '.', ''); ?>
+													</strong>
+												</td>
+
+												<td class="amount" style="text-align:right">
+													<strong>
+														<?php echo number_format($tot_dis, 2, '.', ''); ?>
+													</strong>
+												</td>
+
+												<td class="amount" style="text-align:right">
+													<strong>
+														<?php echo number_format($tot_frg, 2, '.', ''); ?>
+													</strong>
+												</td>
+
+												<td class="amount" style="text-align:right">
+													<strong>
+														<?php echo number_format($tot_pac, 2, '.', ''); ?>
+													</strong>
+												</td>
+
+												<td class="amount" style="text-align:right">
+													<strong>
+														<?php echo number_format($tot_tot, 2, '.', ''); ?>
+													</strong>
+												</td>
+
+											</tr>
+										</tfoot>
+									</table>
+
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-      </div>
-	  </section>
+		</div> <!-- container -->
+	</div> <!-- content -->
 </div>
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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() {
-	
-	$('[data-toggle="tooltip"]').tooltip();   
-/** On click for Displaying File MOdal***/	
-$('.splpofile').click(function() {
-	var id = $(this).attr('id');
-
-	$("#Fileshow").modal("show");
-	    $.ajax({  
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>report/Viewfiles",
-			success: function(data){
-
-				var trHTML = '';
-
-				$.each($.parseJSON(data), function (i, item) {
-		 
-								i=i+1;
-									trHTML += '<tr>' +
-												'<td align="right">' + i + '</td>' +										
-												'<td>' + item.BillNo+ '</td>' +
-												'<td>' + item.PONO+ '</td>' +
-												'<td><a target="_blank" href = <?php echo base_url()?>public/uploads/BillFiles/'+item.FilePath+'>'+ item.FilePath +'</a></td>' +
-											   '</tr>';	
-									
-				});
-						
-				$("#tbleAppend1").empty();
-				$('#Inwardgateregistertable1 > tbody').append(trHTML);
-            } 
- 		});
-
- });//onclick function closed
+<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
 
 
-$('.IGRfile').click(function() {
-	var id = $(this).attr('id');
-
-	  var igr = id.substring(0, 9);
-     //alert(igr);
-    var po = id.substring(10, 33);
-
-	$("#Fileshow").modal("show");
-	    $.ajax({  
-
-			data:{id:igr,id1:po},
-			type:"POST",
-			url:"<?php echo base_url() ?>report/Viewnormaligrfiles",
-			success: function(data){
-
-				var trHTML = '';
-
-				var trHTML = '';
-				var FilePath ='';
-				var Filename = '';
-				var PONO ='';
-				var BillNO ='';
-				$.each($.parseJSON(data), function (i, item) { 
-				
-					if(item.file == null)
-					{ if(item.Remarks ==null)
-						{
-							//alert()
-					    PONO =item.PONO;
-					    BillNO =item.BillNo;
-						Filename =item.FilePath;
-						FilePath = "<?php echo base_url()?>public/uploads/Igrfiles/"+item.FilePath;
-						}else{
-						Filename ="BillDetails";
-						PONO =item.PONO;
-						BillNO =item.BillNo;
-						FilePath = item.FilePath;
-						}
-
-					}else{
-						Filename = item.file; 
-						PONO =item.pono;
-					    BillNO = '-';
-
-                        FilePath =item.file;
-					}
-
-				
-		 
-								// i=i+1;
-								// 	trHTML += '<tr>' +
-								// 				'<td align="right">' + i + '</td>' +										
-								// 				'<td>' + item.BillNo+ '</td>' +
-								// 				'<td>' + item.PONO+ '</td>' +
-								// 				'<td><a target="_blank" href = <?php echo base_url()?>public/uploads/Igrfiles/'+item.FilePath+'>'+ item.FilePath +'</a></td>' +
-								// 			   '</tr>';
-
-									if(Filename != null)
-						{			
-					    i=i+1;
-						trHTML += '<tr id='+i+'>' +
-						'<td align="right">' + i + '</td>' +
-						'<td id="billno'+i+'">' + BillNO+ '</td>' +
-						'<td>' + PONO+ '</td>' +
-
-                        '<td  id="file'+i+'"><a target="_blank" href = '+FilePath+'>'+ Filename +'</a></td>' +
-
-                        // '<td name="filepathname" id="filepathname" onclick="openbillmodel('+i+');"><i class="fa fa-pencil"></i></td>' +
-                        '</tr>';
-									
-		       }	
-									
-				});
-						
-				$("#tbleAppend1").empty();
-				$('#Inwardgateregistertable1 > tbody').append(trHTML);
-            } 
- 		});
-
- });// onclick function innormal  igrfiles
-	
-/******************** Datatable codes starts here **************************/	
-	$.fn.dataTable.moment( 'DD-MM-YYYY' );
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":     "<center> Data Not Found ! </center>"
-        },
-		"aaSorting": [[ 3, "desc" ]],
-        "autoWidth": false,
-        orderCellsTop: true,
-        "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-2'i><'col-md-10'p>>",
-        buttons: [     
-            {
-                extend: 'excelHtml5',
-				footer: 'true',
-				messageTop: 'Report Purchase-Inward',
-				title: $('h3').text(),
-                exportOptions: {
-                    columns: ':visible'
-					
-                }
-            },
-            
-            'colvis'
-        ],
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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( 7, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 7 ).footer() ).html( TotalQTY );
-			 
-			TotalVALUE = api
-                 .column( 10, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-				console.log(parseFloat(TotalVALUE));
-             $( api.column( 10 ).footer() ).html(  TotalVALUE.toFixed(2) );
-
-			 TotalExRATE = api
-                 .column( 11, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 11 ).footer() ).html(  TotalExRATE.toFixed(2) );
-			 
-			 TotalSGST = api
-                 .column( 12, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-				
-			$( api.column( 12 ).footer() ).html(  TotalSGST.toFixed(2) );
-
-			 TotalCGST = api
-                 .column( 13, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 13 ).footer() ).html(  TotalCGST.toFixed(2) );
-
-			 TotalIGST = api
-                 .column( 14, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 14 ).footer() ).html(  TotalIGST.toFixed(2) );
-
-			 TotalDISCOUNT = api
-                 .column( 15, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 15 ).footer() ).html(  TotalDISCOUNT.toFixed(2) );
-
-			 TotalFRIGEHT = api
-                 .column( 16, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 16 ).footer() ).html(  TotalFRIGEHT.toFixed(2) );
-
-			 TotalPACKAGE = api
-                 .column( 17, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 17 ).footer() ).html(  TotalPACKAGE.toFixed(2) );
-
-			 FinalTotal = api
-                 .column( 18, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 18 ).footer() ).html( FinalTotal.toFixed(2) );
-        }
-		
-    } );
-	
-} ); //on ready function Closed
-
-/** jquery on ready for DataPicker. */	
- $( function() {
-		//var dateFormat = "mm/dd/yy",
-			from = $( "#min-date" )
-				.datepicker({
-					dateFormat: "dd-mm-yy", 
-					defaultDate: "+0d",
-					changeMonth: true,
-					//numberOfMonths: 1
-					
-				})
-				.on( "change", function() {
-					to.datepicker("option", "minDate", getDate( this ) );
-				}),
-			to = $( "#max-date" ).datepicker({
-				dateFormat: "dd-mm-yy", 
-				defaultDate: "+0d",
-				changeMonth: true,
-				//numberOfMonths: 1
-				
-			})
-			.on( "change", function() {
-				from.datepicker( "option", "maxDate", getDate( this ) );
-			});
-
-		function getDate( element ) {
-			var date;
-			 
-			try {
-				date = $.datepicker.parseDate( dateFormat, element.value );
-				 
-			} catch( error ) {
-				date = null;
+		// 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+					previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+				},
+				emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
 			}
-
-			return date;
-		}
-	} );
-
-</script>	
\ No newline at end of file
+		});
+	});
+</script>
\ No newline at end of file
diff --git a/app/Views/Report_supplier.php b/app/Views/Report_supplier.php
index 1d73cc98..d25d05dd 100755
--- a/app/Views/Report_supplier.php
+++ b/app/Views/Report_supplier.php
@@ -73,7 +73,7 @@
 							<form method="post" action="<?php echo base_url('Report_supplier'); ?>">
 									<div class="form-group">
 										<div class="row">
-											<div class="col-4">
+											<div class="col-3">
 												<label for="client_name">
 													<?php echo 'Supplier'; ?>
 												</label>
@@ -86,20 +86,7 @@
 													endforeach; ?>
 												</select>
 											</div>
-											<div class="col-4">
-												<label for="client_name">
-													<?php echo 'Material'; ?>
-												</label>
-												<select class="form-control" id="item_name" name="item_name">
-													<option value="">Select Material</option>
-													<?php
-													foreach ($material as $it): { ?>
-															<option <?php if(isset($prod) && ($prod == $it->MaterialName)){ echo 'selected'; } ?> value="<?php echo $it->MaterialName; ?>"><?php echo $it->MaterialName;  ?></option>
-													<?php }
-													endforeach; ?>
-												</select>
-											</div>
-											<div class="col-2">
+											<div class="col-3">
 												<label for="to_date">
 													<?php echo 'Year'; ?>
 												</label>
@@ -112,7 +99,7 @@
 													endforeach; ?>
 												</select>
 											</div>
-											<div class="col-2">
+											<div class="col-3">
 												<label for="to_date">
 													<?php echo 'Month'; ?>
 												</label>
@@ -126,10 +113,7 @@
 													</select>
 												</div>
 											</div>
-										</div>
-										<br>
-										<div class="row">
-											<div class="col-2">
+											<div class="col-3">
 												<label for="from_date">
 													<?php echo 'From Date'; ?>
 												</label>
@@ -137,7 +121,11 @@
 													<input type="date" class="form-control" name="from_date" id="max-date" value="<?php if(isset($frm)){ echo $frm; } ?>">
 												</div>
 											</div>
-											<div class="col-2">
+										</div>
+										<br>
+										<div class="row">
+											
+											<div class="col-3">
 												<label for="to_date">
 													<?php echo 'To Date'; ?>
 												</label>
@@ -146,8 +134,9 @@
 												</div>
 
 											</div>
-											<div class="col-md-6"></div>
-											<div class="col-md-2 text-right"><br>
+											<div class="col-6"></div>
+											<div class="col-3 text-right"><br>
+											<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Report_supplier') ?>';">
 												<input type="submit" class="btn btn-success" name="btn_submit"
 													value="View Report">
 											</div>
@@ -272,6 +261,13 @@
 	$(document).ready(function() {
     // Initialize the DataTable with only pagination enabled
     var table = $('#cc').DataTable({
+		dom: 'Blfrtip',
+            buttons: [
+                {
+					extend: 'excel',
+					text: 'Excel',
+				}
+            ],
         paging: true, // Enable pagination
         searching: true, // Disable search
         ordering: false, // Disable column sorting
diff --git a/app/Views/Report_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.php -->
 <script>
- $(document).ready(function () {
-	 
-	  $("#client_name").select2();
-	 
-	  
-                
-            }); 
+	$(document).ready(function() {
+		$("#financialyear").select2();
+		$("#month").select2();
+		$("#client_name").select2();
+	});
 </script>
 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
 
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	  <div class="content-wrapper">
-<section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Supplier-Inward</b><br><br>
-			  <?php
-			  if($this->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;
-			  }
-		 
-			  ?></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		     <div class="panel-body">
+<style>
+	table {
+		width: auto;
+	}
+</style>
 
-                    <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b>Supplier-Wise
+											</b></h4>
+									</li>
+								</ol>
+							</div>
 
-                        <div class="form-group has-feedback">
-						<div class="col-md-2">
-						    <label for="client_name">
-                                <?php echo 'Supplier'; ?><span style="color:red;">* </span>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="client_name" name="client_name" required="true">
-								 <option value="">Select Supplier</option>
-								 <?php 
-								foreach($cust as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->SupplierName;?>"><?php echo $item->SupplierName ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                        </div>   
-                       <div class="col-md-2">
-							 <label for="to_date">
-                                <?php echo 'Year'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="financialyear" name="financialyear">
-								 <option value="">Select Year</option>
-								 <?php 
-								 
-								
-								  foreach($finyear as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                            </div>
-								<div class="col-md-2">
-								<label for="to_date">
-                                <?php echo 'Month'; ?>
-                                </label>
-                                <div class="input-group">
-                                 <select class="form-control" id="month" name="month">
-								  <option value="">Select Month</option>
-								 <option value="January">January</option>
-								 <option value="February">February</option>
-								 <option value="March">March</option>
-								 <option value="April">April</option>
-								 <option value="May">May</option>
-								 <option value="June">June</option>
-								 <option value="July">July</option>
-								 <option value="August">August</option>
-								 <option value="September">September</option>
-								 <option value="October">October</option>
-								 <option value="November">November</option>
-								 <option value="December">December</option>
-								 </select>
-                              </div>
-                            </div>
-						<div class="col-md-2">
-						    <label for="from_date">
-                                <?php echo 'From Date'; ?>
-                            </label>
-                            <div class="input-group">
-                                <input name="from_date" id="max-date" class="form-control datepicker">
-                                <span class="input-group-addon">
-                                    <i class="fa fa-calendar fa-fw"></i>
-                            </span>
-                            </div>
-                        </div>
-
-             
-                       <div class="col-md-2">
-					        <label for="to_date">
-                                <?php echo 'To Date'; ?>
-                            </label>  
-                            <div class="input-group">
-                                <input name="to_date" id="min-date" class="form-control datepicker">
-                                <span class="input-group-addon">
-                                    <i class="fa fa-calendar fa-fw"></i>
-                            </span>
-                            </div>
-                       
 						</div>
-						<div class="col-md-2 "  ><br>
-                        <input type="submit" class="btn btn-success" name="btn_submit"
-                               value="View Report">
-                        
-							</div>  
-							</div>  
-                    </form>
-
-               
-
-            </div>
-           	
-			 
-		       
-			 <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-				<thead>
-                     <tr>
-				       <th style="text-align:center">Supplier Name</th>
-					   <th style="text-align:center">PO Count</th>
-					   <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(&#8377;)</th>
-					   
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($spurchse)){
-					    $tot_rate = 0;
-						$tot_qty = 0;
-						$tot_value = 0;
-						$tot_tot = 0;
-						$ab=$this->input->post('financialyear');
-						$month=$this->input->post('month');
-						$frm = $this->input->post('from_date');
-						$t = $this->input->post('to_date');
-					   foreach($spurchse as $rel)
-					    {				
-					   ?> 
-					  <tr>
-                       <td><span>
-					   <a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid;?>&ab=<?php echo $ab;?>&month=<?php echo $month;?>&frm=<?php echo $frm;?>&t=<?php echo $t;?>"><?php echo $rel->supplier_name;?></a>
-					   </span></td>
-					   <td style="text-align:right"><span><?php 
-						$tot_rate= $tot_rate + round($rel->counts);
-						echo round($rel->counts);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_qty= $tot_qty + round($rel->quantity);
-						echo round($rel->quantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_value= $tot_value + $rel->value;
-						echo number_format($rel->value,2,'.','');?></span></td>
-						
-					   
-					   
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							<td class="amount" style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo $tot_rate;
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								
-								<td class="amount" style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tot_qty;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td class="amount" style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tot_value,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<form method="post" action="<?php echo base_url('Report_supplier_inward'); ?>">
+
+									<div class="form-group has-feedback">
+										<div class="row">
+											<div class="col-4">
+												<label for="client_name">
+													<?php echo 'Supplier'; ?><span style="color:red;">* </span>
+												</label>
+												<select class="form-control" id="client_name" name="client_name">
+													<option value="">Select Supplier</option>
+													<?php
+													foreach ($cust as $item): { ?>
+
+															<option
+																<?php if (isset($client_name) && ($client_name == $item->SupplierName)) {
+																	echo 'selected';
+																} ?>
+																value="<?php echo $item->SupplierName; ?>"><?php echo $item->SupplierName;  ?></option>
+
+
+													<?php }
+													endforeach; ?>
+
+												</select>
+											</div>
+											<div class="col-4">
+												<label for="to_date">
+													<?php echo 'Year'; ?>
+												</label>
+												<select class="form-control" id="financialyear" name="financialyear">
+													<option value="">Select Year</option>
+													<?php
+
+
+													foreach ($finyear as $item): { ?>
+
+															<option value="<?php echo $item->financial_year; ?>" <?php if (isset($financialyear) && ($financialyear == $item->financial_year)) {
+																														echo 'selected';
+																													} ?>><?php echo $item->financial_year;  ?></option>
+
+
+													<?php }
+													endforeach; ?>
+												</select>
+											</div>
+											<div class="col-4">
+												<label for="to_date">
+													<?php echo 'Month'; ?>
+												</label>
+
+												<select class="form-control" id="month" name="month">
+													<option value="">Select Month</option>
+													<option value="January" <?php if (isset($month) && ($month == "January")) {
+																				echo 'selected';
+																			} ?>>January</option>
+													<option value="February" <?php if (isset($month) && ($month == "February")) {
+																					echo 'selected';
+																				} ?>>February</option>
+													<option value="March" <?php if (isset($month) && ($month == "March")) {
+																				echo 'selected';
+																			} ?>>March</option>
+													<option value="April" <?php if (isset($month) && ($month == "April")) {
+																				echo 'selected';
+																			} ?>>April</option>
+													<option value="May" <?php if (isset($month) && ($month == "May")) {
+																			echo 'selected';
+																		} ?>>May</option>
+													<option value="June" <?php if (isset($month) && ($month == "June")) {
+																				echo 'selected';
+																			} ?>>June</option>
+													<option value="July" <?php if (isset($month) && ($month == "July")) {
+																				echo 'selected';
+																			} ?>>July</option>
+													<option value="August" <?php if (isset($month) && ($month == "August")) {
+																				echo 'selected';
+																			} ?>>August</option>
+													<option value="September" <?php if (isset($month) && ($month == "September")) {
+																					echo 'selected';
+																				} ?>>September</option>
+													<option value="October" <?php if (isset($month) && ($month == "October")) {
+																				echo 'selected';
+																			} ?>>October</option>
+													<option value="November" <?php if (isset($month) && ($month == "November")) {
+																					echo 'selected';
+																				} ?>>November</option>
+													<option value="December" <?php if (isset($month) && ($month == "December")) {
+																					echo 'selected';
+																				} ?>>December</option>
+												</select>
+
+											</div>
+										</div>
+
+
+										<div class="row mt-2">
+											<div class="col-2">
+												<label for="from_date">
+													<?php echo 'From Date'; ?>
+												</label>
+
+												<input name="from_date" id="max-date" class="form-control datepicker" autocomplete="off" value="<?php if (isset($from_date)) {
+																																					echo $from_date;
+																																				} ?>">
+
+
+											</div>
+											<div class="col-2">
+												<label for="to_date">
+													<?php echo 'To Date'; ?>
+												</label>
+
+												<input name="to_date" id="min-date" class="form-control datepicker" autocomplete="off" value="<?php if (isset($to_date)) {
+																																					echo $to_date;
+																																				} ?>">
+
+
+											</div>
+											<div class="col-8 mt-2 text-right">
+												<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Report_supplier_inward') ?>';">
+
+
+												<input type="submit" class="btn btn-success m-2" name="btn_submit" value="View Report">
+											</div>
+										</div>
+
+
+
+									</div>
+								</form>
+
+								<div class="table-responsive">
+
+									<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+										<thead>
+											<tr>
+												<th style="text-align:center">Supplier Name</th>
+												<th style="text-align:center">PO Count</th>
+												<th style="text-align:center">Quantity</th>
+												<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+											</tr>
+										</thead>
+										<tbody>
+											<?php if (!empty($spurchse)) {
+												$tot_rate = 0;
+												$tot_qty = 0;
+												$tot_value = 0;
+												$tot_tot = 0;
+												$ab = $financialyear;
+												$month = $month;
+												$frm = $frm;
+												$t = $t;
+												foreach ($spurchse as $rel) {
+											?>
+													<tr>
+														<td><span>
+																<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid; ?>&ab=<?php echo $ab; ?>&month=<?php echo $month; ?>&frm=<?php echo $frm; ?>&t=<?php echo $t; ?>"><?php echo $rel->supplier_name; ?></a>
+															</span></td>
+														<td style="text-align:right"><span><?php
+																							$tot_rate = $tot_rate + round($rel->counts);
+																							echo round($rel->counts); ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tot_qty = $tot_qty + round($rel->quantity);
+																							echo round($rel->quantity); ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tot_value = $tot_value + $rel->value;
+																							echo number_format($rel->value, 2, '.', ''); ?></span></td>
+
+
+
+
+													</tr>
+												<?php
+												}
+
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong>Total</strong></td>
+
+												<td class="amount" style="text-align:right"><strong>
+														<?php {
+															echo $tot_rate;
+														}
+														?>
+													</strong>
+												</td>
+
+												<td class="amount" style="text-align:right">
+													<strong>
+														<?php {
+															echo $tot_qty;
+														}
+														?>
+													</strong>
+												</td>
+												<td class="amount" style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($tot_value, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+
+
+
+											</tr>
+
+										</tfoot>
+									<?php
+											}
+
+									?>
+									</table>
+
+
+
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-	  </div>
-	  </section>
+		</div> <!-- container -->
+	</div> <!-- content -->
+</div>
 
-	  </div>
-	 
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
 
-<script> 
-	
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":     "<center> Data Not Found ! </center>"
-        },
-        "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'
-        ],
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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;
-            };
+		// 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+					previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+				},
+				emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
 
-			TotalPOCount = api
-                 .column( 1, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 1 ).footer() ).html( TotalPOCount.toFixed().bold() );
-			
-			TotalQTY = api
-                 .column( 2, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 2 ).footer() ).html( TotalQTY.toFixed().bold() );
-			 
-			TotalVALUE = api
-                 .column( 3, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-				
-             $( api.column( 3 ).footer() ).html(  TotalVALUE.toFixed(2).bold() );
-
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	$( function() {
-		//var dateFormat = "mm/dd/yy",
-			from = $( "#min-date" )
-				.datepicker({
-					dateFormat: "dd-mm-yy", 
-					defaultDate: "+0d",
-					changeMonth: true,
-					//numberOfMonths: 1
-					
-				})
-				.on( "change", function() {
-					to.datepicker("option", "minDate", getDate( this ) );
-				}),
-			to = $( "#max-date" ).datepicker({
-				dateFormat: "dd-mm-yy", 
-				defaultDate: "+0d",
-				changeMonth: true,
-				//numberOfMonths: 1
-				
-			})
-			.on( "change", function() {
-				from.datepicker( "option", "maxDate", getDate( this ) );
-			});
-
-		function getDate( element ) {
-			var date;
-			 
-			try {
-				date = $.datepicker.parseDate( dateFormat, element.value );
-				 
-			} catch( error ) {
-				date = null;
 			}
-
-			return date;
-		}
-	} );
-
-   function Reset()
-{
-	 $('#mySelect').val('');
-	
-}
-
-	</script>
-	
-	
-	
\ No newline at end of file
+		});
+	});
+</script>
\ 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.php -->
 <script>
- $(document).ready(function () {
-	 
-	  $("#client_name").select2();
-	 
-	  
-                
-            }); 
+	$(document).ready(function() {
+		$("#client_name").select2();
+		$("#financialyear").select2();
+		$("#month").select2();
+	});
 </script>
 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
 
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	 <div class="content-wrapper">
-    <section class="content"><br/>  
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Supplier_Summary</b><br><br>
-			  <?php
-			  if($this->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;
-			  }
-		 
-			  ?></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		     <div class="panel-body">
+<style>
+	table {
+		width: auto;
+	}
+</style>
 
-                    <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);"> Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Inward Summary
+											</b></h4>
+									</li>
+								</ol>
+							</div>
 
-                        <div class="form-group has-feedback">
-					<!--	<div class="col-md-2">
-						    <label for="client_name">
-                                <?php echo 'Supplier'; ?><span style="color:red;"> </span>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="client_name" name="client_name" >
-								 <option value="">Select Supplier</option>
-								 <?php 
-								foreach($cust as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->SupplierName;?>"><?php echo $item->SupplierName ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                        </div>   -->
-                       <div class="col-md-2">
-							 <label for="to_date">
-                                <?php echo 'Year'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="financialyear" name="financialyear">
-								 <option value="">Select Year</option>
-								 <?php 
-								 
-								
-								  foreach($finyear as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                            </div>
-								<div class="col-md-2">
-								<label for="to_date">
-                                <?php echo 'Month'; ?>
-                                </label>
-                                <div class="input-group">
-                                 <select class="form-control" id="month" name="month">
-								  <option value="">Select Month</option>
-								 <option value="January">January</option>
-								 <option value="February">February</option>
-								 <option value="March">March</option>
-								 <option value="April">April</option>
-								 <option value="May">May</option>
-								 <option value="June">June</option>
-								 <option value="July">July</option>
-								 <option value="August">August</option>
-								 <option value="September">September</option>
-								 <option value="October">October</option>
-								 <option value="November">November</option>
-								 <option value="December">December</option>
-								 </select>
-                              </div>
-                            </div>
-						<div class="col-md-2">
-						    <label for="from_date">
-                                <?php echo 'From Date'; ?>
-                            </label>
-                            <div class="input-group">
-                                <input name="from_date" id="max-date" class="form-control datepicker">
-                                <span class="input-group-addon">
-                                    <i class="fa fa-calendar fa-fw"></i>
-                            </span>
-                            </div>
-                        </div>
-
-             
-                       <div class="col-md-2">
-					        <label for="to_date">
-                                <?php echo 'To Date'; ?>
-                            </label>  
-                            <div class="input-group">
-                                <input name="to_date" id="min-date" class="form-control datepicker">
-                                <span class="input-group-addon">
-                                    <i class="fa fa-calendar fa-fw"></i>
-                            </span>
-                            </div>
-                       
 						</div>
-						<div class="col-md-2 "  ><br>
-                        <input type="submit" class="btn btn-success" name="btn_submit"
-                               value="View Report">
-                        
-							</div>  
-							</div>  
-                    </form>
-
-               
-
-            </div>
-           	
-			 
-		       
-			 <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-				<thead>
-                     <tr>
-				       <th style="text-align:center">Supplier Name</th>
-					   <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Value &nbsp;(&#8377;)</th>
-					   
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($spurchse)){
-					    $tot_rate = 0;
-						$tot_qty = 0;
-						$tot_value = 0;
-						$tot_tot = 0;
-						$ab=$this->input->post('financialyear');
-						$month=$this->input->post('month');
-						$frm = $this->input->post('from_date');
-						$t = $this->input->post('to_date');
-					   foreach($spurchse as $rel)
-					    {				
-					   ?> 
-					  <tr>
-                       <td><span>
-					   <a href="<?= base_url() ?>report/ilink_purchasesummary?sid=<?php echo $rel->sid;?>&ab=<?php echo $ab;?>&month=<?php echo $month;?>&frm=<?php echo $frm;?>&t=<?php echo $t;?>"><?php echo $rel->supplier_name;?></a>
-					   </span></td>
-						
-						<td style="text-align:right"><span><?php 
-						$tot_qty= $tot_qty + round($rel->quantity);
-						echo round($rel->quantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						$tot_value= $tot_value + $rel->value;
-						echo number_format($rel->value,2,'.','');?></span></td>
-						
-					   
-					   
-					
-					  </tr>
-			           <?php
-					    }
-						
-					   ?>
-			        </tbody>
-					<tfoot  width="100%">
-							<tr>
-						<td style="text-align:center;"><strong>Total</strong></td>
-						  
-							
-								
-								<td class="amount" style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo $tot_qty;
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td class="amount" style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tot_value,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-						
-						</tfoot>
-					 <?php
-					    }
-						
-					   ?>
-			      </table>
-			 
+					</div>
 				</div>
-			   </div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
+
+									<div class="form-group has-feedback">
+										<div class="col-md-2">
+											<label for="to_date">
+												<?php echo 'Year'; ?>
+											</label>
+											<div class="input-group">
+												<select class="form-control" id="financialyear" name="financialyear">
+													<option value="">Select Year</option>
+													<?php
+
+
+													foreach ($finyear as $item): { ?>
+
+															<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year;  ?></option>
+
+
+													<?php }
+													endforeach; ?>
+
+												</select>
+											</div>
+										</div>
+										<div class="col-md-2">
+											<label for="to_date">
+												<?php echo 'Month'; ?>
+											</label>
+											<div class="input-group">
+												<select class="form-control" id="month" name="month">
+													<option value="">Select Month</option>
+													<option value="January">January</option>
+													<option value="February">February</option>
+													<option value="March">March</option>
+													<option value="April">April</option>
+													<option value="May">May</option>
+													<option value="June">June</option>
+													<option value="July">July</option>
+													<option value="August">August</option>
+													<option value="September">September</option>
+													<option value="October">October</option>
+													<option value="November">November</option>
+													<option value="December">December</option>
+												</select>
+											</div>
+										</div>
+										<div class="col-md-2">
+											<label for="from_date">
+												<?php echo 'From Date'; ?>
+											</label>
+											<div class="input-group">
+												<input name="from_date" id="max-date" class="form-control datepicker">
+												<span class="input-group-addon">
+													<i class="fa fa-calendar fa-fw"></i>
+												</span>
+											</div>
+										</div>
+
+
+										<div class="col-md-2">
+											<label for="to_date">
+												<?php echo 'To Date'; ?>
+											</label>
+											<div class="input-group">
+												<input name="to_date" id="min-date" class="form-control datepicker">
+												<span class="input-group-addon">
+													<i class="fa fa-calendar fa-fw"></i>
+												</span>
+											</div>
+
+										</div>
+										<div class="col-md-2 "><br>
+											<input type="submit" class="btn btn-success" name="btn_submit"
+												value="View Report">
+
+										</div>
+									</div>
+
+
+							</div>
+							</form>
+
+							<div class="table-responsive">
+								<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+									<thead>
+										<tr>
+											<th style="text-align:center">Supplier Name</th>
+											<th style="text-align:center">Quantity</th>
+											<th style="text-align:center">Value &nbsp;(&#8377;)</th>
+
+
+										</tr>
+									</thead>
+									<tbody>
+										<?php if (!empty($spurchse)) {
+											$tot_rate = 0;
+											$tot_qty = 0;
+											$tot_value = 0;
+											$tot_tot = 0;
+											$ab = $this->input->post('financialyear');
+											$month = $this->input->post('month');
+											$frm = $this->input->post('from_date');
+											$t = $this->input->post('to_date');
+											foreach ($spurchse as $rel) {
+										?>
+												<tr>
+													<td><span>
+															<a href="<?= base_url() ?>report/ilink_purchasesummary?sid=<?php echo $rel->sid; ?>&ab=<?php echo $ab; ?>&month=<?php echo $month; ?>&frm=<?php echo $frm; ?>&t=<?php echo $t; ?>"><?php echo $rel->supplier_name; ?></a>
+														</span></td>
+
+													<td style="text-align:right"><span><?php
+																						$tot_qty = $tot_qty + round($rel->quantity);
+																						echo round($rel->quantity); ?></span></td>
+													<td style="text-align:right"><span><?php
+																						$tot_value = $tot_value + $rel->value;
+																						echo number_format($rel->value, 2, '.', ''); ?></span></td>
+
+
+
+
+												</tr>
+											<?php
+											}
+
+											?>
+									</tbody>
+									<tfoot width="100%">
+										<tr>
+											<td style="text-align:center;"><strong>Total</strong></td>
+
+
+
+											<td class="amount" style="text-align:right">
+												<strong>
+													<?php {
+														echo $tot_qty;
+													}
+													?>
+												</strong>
+											</td>
+											<td class="amount" style="text-align:right">
+												<strong>
+													<?php {
+														echo number_format($tot_value, 2, '.', '');
+													}
+													?>
+												</strong>
+											</td>
+
+
+
+										</tr>
+
+									</tfoot>
+								<?php
+										}
+
+								?>
+								</table>
+
+
+
+
+							</div>
+						</div> <!-- end card body-->
+					</div> <!-- end card -->
+				</div><!-- end col-->
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-      </div>
-	  </section>
-    </div>
+		</div>
+	</div> <!-- container -->
+</div> <!-- content -->
+</div>
 
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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> 
-	
-
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":     "<center> Data Not Found ! </center>"
-        },
-        "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'
-        ],
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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;
-            };
-
-			
+<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
 
 
-			
-			TotalQTY = api
-                 .column( 1, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 1 ).footer() ).html( TotalQTY.toFixed().bold() );
-			 
-			TotalVALUE = api
-                 .column( 2, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-				
-             $( api.column( 2 ).footer() ).html(  TotalVALUE.toFixed(2).bold() );
-
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(3)
-        .search(this.value)
-        .draw();
-    });
-	
-	$( function() {
-		//var dateFormat = "mm/dd/yy",
-			from = $( "#min-date" )
-				.datepicker({
-					dateFormat: "dd-mm-yy", 
-					defaultDate: "+0d",
-					changeMonth: true,
-					//numberOfMonths: 1
-					
-				})
-				.on( "change", function() {
-					to.datepicker("option", "minDate", getDate( this ) );
-				}),
-			to = $( "#max-date" ).datepicker({
-				dateFormat: "dd-mm-yy", 
-				defaultDate: "+0d",
-				changeMonth: true,
-				//numberOfMonths: 1
-				
-			})
-			.on( "change", function() {
-				from.datepicker( "option", "maxDate", getDate( this ) );
-			});
-
-		function getDate( element ) {
-			var date;
-			 
-			try {
-				date = $.datepicker.parseDate( dateFormat, element.value );
-				 
-			} catch( error ) {
-				date = null;
+		// 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+					previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+				},
+				emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
 			}
-
-			return date;
-		}
-	} );
-
-   function Reset()
-{
-	 $('#mySelect').val('');
-	
-}
-
-	</script>
-	
-	
-	
\ No newline at end of file
+		});
+	});
+</script>
\ No newline at end of file
diff --git a/app/Views/Report_totalorders.php b/app/Views/Report_totalorders.php
index b00883e8..89d272c3 100755
--- a/app/Views/Report_totalorders.php
+++ b/app/Views/Report_totalorders.php
@@ -41,9 +41,9 @@
 						<div class="page-title-right">
                                 <ol class="breadcrumb m-0">
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
-                                    <li class="breadcrumb-item"><a href="javascript: void(0);"></a></li>
+                                    <li class="breadcrumb-item"><a href="javascript: void(0);">Requisation</a></li>
                                     <li class="breadcrumb-item active">
-                                    <h4 class="page-title"><b>   </b></h4>
+                                    <h4 class="page-title"><b>  Total Orders </b></h4>
                                     </li>
                                 </ol>
                             </div>
@@ -59,25 +59,36 @@
 							<div class="card-body">
 
 							<form method="post" action=" ">
-									<div class="col-md-2">
-										<select class="form-control" id="financialyear" name="financialyear">
-										<option value="">Select Budget Year</option>
-										<?php 
-										foreach($finyear as $item):
+									<div class="row">
+										<div class="col-2">
+											<label for="">Select Budget Year </label>
+											<select class="form-control" id="financialyear" name="financialyear">
+												<option value="">Select Year</option>
+													<?php 
+													foreach($finyear as $item):
+															
+															{?>
+															
+														<option 
+															<?php echo isset($givenYear) && $givenYear == $item->financial_year 
+															? "selected" : "" ?>
+
+															value="<?php echo $item->financial_year;?>">
+															<?php echo $item->financial_year ;  ?>
+														</option>
+															
+																	
+															<?php } endforeach; ?>
 												
-												{?>
-												
-												<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
-												
-														
-												<?php } endforeach; ?>
-										
-										</select>
-									</div>
-									<div class="col-md-2">
-										<input type="submit" class="btn btn-success" id="year" name="btn_submit"
-											value="View Report">
+											</select>
+										</div>
+										<div class="col-10 mt-2 text-right">
+										<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('TotalOrder') ?>';">
+											<input type="submit" class="btn btn-success" id="year" name="btn_submit"
+												value="View Report">
+										</div>
 									</div>
+									
                           </form>
 								<table id="req" class="table table-bordered table-hover wrap" style="background-color:#fff;width: 100% !important;">
 
@@ -145,37 +156,39 @@
 <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
-
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#req').DataTable( {
-		"language": {
-        "emptyTable":     "<center> Data Not Found ! </center>"
-        },
-        "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'
-        ]
-    } );
-} );
+	$(document).ready(function() {
+		// Initialize the DataTable with only pagination enabled
+		var table = $('#req').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: '<i class="fas fa-angle-right"></i>', // Next button icon
+					previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+				}
+			}
+		});
+	});
 
+</script>
 
+<script>
+	$(document).ready(function(){
+		$('#financialyear').select2();
+	})
+	
 </script>
\ No newline at end of file
diff --git a/app/Views/Report_year_wise.php b/app/Views/Report_year_wise.php
index 106db822..eee56ba7 100755
--- a/app/Views/Report_year_wise.php
+++ b/app/Views/Report_year_wise.php
@@ -4,9 +4,8 @@
 	<script>
 	$(document).ready(function() {
 
-		$("#client_name").select2();
-		$("#item_name").select2();
-		$("#purchaseorder_number").select2();
+
+		$("#financialyear").select2();
 
 
 	});
@@ -56,7 +55,7 @@
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">Purchase</a></li>
                                     <li class="breadcrumb-item active">
-                                    <h4 class="page-title"><b>  Report - Purchase  </b></h4>
+                                    <h4 class="page-title"><b>  Report - Year Wise  </b></h4>
                                     </li>
                                 </ol>
                             </div>
@@ -74,19 +73,23 @@
 							<form method="post" action="<?php echo base_url('Report_year_wise'); ?>">
 									<div class="form-group">
 										<div class="row">
-											<div class="col-md-4">
+											<div class="col-md-2">
+												<label for="financialyear"> Select Year</label>
 												<select class="form-control" id="financialyear" name="financialyear">
 												<option value="">Select Year</option>
 												<?php 
 												foreach($finyear as $item):
 														{?>	
-														<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>															
+														<option 
+														<?php echo isset($givenFinancialYear) && $givenFinancialYear == $item->financial_year ? "selected" : "" ?>
+														value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>															
 												<?php } endforeach; ?>
 												
 												</select>
 											</div>
-											<div class="col-md-6"></div>
+											<div class="col-md-8"></div>
 											<div class="col-md-2 text-right"><br>
+											<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Report_year_wise') ?>';">
 												<input type="submit" class="btn btn-success" name="btn_submit"
 													value="View Report">
 											</div>
@@ -200,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_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.php -->
+<script>
+	$(document).ready(function() {
+		$("#client_name").select2();
+		$("#financialyear").select2();
+		$("#month").select2();
+	});
+</script>
+
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
 
-                           }
-			   .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}
+<style>
+	table {
+		width: auto;
+	}
+</style>
 
-			   
-	 </style>
-	  <div class="content-wrapper">
-	 <section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Year-Wise-Inward</b><br><br>
-			  <?php
-			  
-			  if($this->input->post('financialyear')){
-				  $ab=$this->input->post('financialyear'); 
-				  echo '('.$ab.')';
-				  echo ' ';
-				  
-			  }
-			 
-			  ?></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			
-		    <div class="col-xs-12 col-md-6 col-md-offset-3">
-                      
-                      <center> 
-					  <div class="panel-body">
-					  <form method="post" action=" ">
-					  <div class="col-md-8">
-					  <select class="form-control" id="financialyear" name="financialyear">
-					 <option value="">Select Year</option>
-					 <?php 
-					 foreach($finyear as $item):
-							 
-							{?>
-							
-							<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
-							
-							         
-							 <?php } endforeach; ?>
-					  
-					   </select></div>
- 
-						<div class="col-md-2">
-                        <input type="submit" class="btn btn-success" id="year" name="btn_submit"
-                               value="View Report"></div>
-                          </form>
-						  </div>
-							</center>
-                 
-           	</div>
-			 
-		       <?php 
-					  
-					   if(!empty($year)){
-               ?>						   
-			 <div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-				<thead>
-                     <tr>
-				       <th style="text-align:center">Month-Year</th>
-                       <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Total Value &nbsp;(&#8377;)</th>
-					   
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php 
-					  $tr3=0;
-					  $tr4=00; 
-					   foreach($year as $rel)
-					    {				
-					   ?> 
-					  <tr>
-                        
-                        <td style="text-align:center"><span>
-						<?php 
-							     $da = strtotime($rel->materialrcvddate); 
-                                 $new = date('M-y', $da);
-								 $pass = date('Y-m-d',$da);
-								 $ab=$this->input->post('financialyear'); 
-								 //echo $rel->CreatedDate;
-							?>
-							
-						<a href="<?= base_url() ?>report/imonth_wise?ab=<?php echo $ab;?>&dat=<?php echo $pass;?>"><?php echo $new;?></a>
-						</span></td>
-				        <td style="text-align:right"><span><?php 
-						 $tr3= $tr3 + $rel->quantity;
-						echo round($rel->quantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						 $tr4= $tr4 + number_format($rel->value,2,'.','');
-						echo number_format($rel->value,2,'.','');?></span></td>
-					   
-					   
-					
-					  </tr>
-			           <?php
-					    }
-						?>
-			        </tbody>
-					 <tfoot  width="100%">
-					 <tr>
-						    <td style="text-align:center;"><strong><?php 
-							$ab=$this->input->post('financialyear'); 
-							 $Total="Total";
-							echo anchor('report/iyear_wise_total/' . $ab,$Total); ?></strong>
-							
-							</td>
-						
-									
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo round($tr3);
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tr4,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-					 </tfoot>
-			      </table>
-			 
-				</div>
-			   </div>
-			   <?php
-					    }
-						?>
-			</div>
-			 
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-	  </div>
-					</section>
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Year-Wise
+											</b></h4>
+									</li>
+								</ol>
+							</div>
+
+						</div>
 					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<form method="post" action="<?php echo base_url('Report_year_wise_inward'); ?>">
+
+
+
+									<div class="row">
+										<div class="col-4">
+											<label for="financialyear">
+												<?php echo 'Year'; ?>
+											</label>
+											<select class="form-control" id="financialyear" name="financialyear">
+												<option value="">Select Year</option>
+												<?php
+
+
+												foreach ($finyear as $item): { ?>
+
+														<option value="<?php echo $item->financial_year; ?>" <?php if (isset($financialyear) && ($financialyear == $item->financial_year)) {
+																													echo 'selected';
+																												} ?>><?php echo $item->financial_year;  ?></option>
+
+
+												<?php }
+												endforeach; ?>
+											</select>
+										</div>
+										<div class="col-8 text-right">
+											<input type="button" class="btn btn-danger" value="Reset" onclick="window.location.href='<?= base_url('Report_year_wise_inward') ?>';">
+
+											<input type="submit" class="btn btn-success ml-2" name="btn_submit" value="View Report">
+										</div>
+									</div>
+
+
+								</form>
+								<div class="form-group has-feedback"></div>
+
+
+
+
+								<div class="table-responsive">
+									<table class="table table-bordered table-hover" id="cc">
+										<thead>
+											<tr>
+												<th style="text-align:center">Month-Year</th>
+												<th style="text-align:center">Quantity</th>
+												<th style="text-align:center">Total Value &nbsp;(&#8377;)</th>
+											</tr>
+										</thead>
+										<tbody>
+											<?php
+											$tr3 = 0;
+											$tr4 = 00;
+											if (!empty($year)) {
+												foreach ($year as $rel) {
+											?>
+													<tr>
+
+														<td style="text-align:center"><span>
+																<?php
+																$da = strtotime($rel->materialrcvddate);
+																$new = date('M-y', $da);
+																$pass = date('Y-m-d', $da);
+																$ab = $financialyear;
+																//echo $rel->CreatedDate;
+																?>
+
+																<a href="<?= base_url() ?>report/imonth_wise?ab=<?php echo $ab; ?>&dat=<?php echo $pass; ?>"><?php echo $new; ?></a>
+															</span></td>
+														<td style="text-align:right"><span><?php
+																							$tr3 = $tr3 + $rel->quantity;
+																							echo round($rel->quantity); ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tr4 = $tr4 + number_format($rel->value, 2, '.', '');
+																							echo number_format($rel->value, 2, '.', ''); ?></span></td>
+
+
+
+													</tr>
+											<?php
+												}
+											}
+											?>
+										</tbody>
+										<?php if (!empty($year)) { ?>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;"><strong><?php
+																						$ab = isset($financialyear) ? $financialyear : '';
+																						$Total = "Total";
+																						echo anchor('report/iyear_wise_total/' . $ab, $Total); ?></strong>
+
+												</td>
+
+
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo round($tr3);
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($tr4, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+
+
+
+											</tr>
+										</tfoot>
+										<?php } ?>
+									</table>
+
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
+				</div>
+			</div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+
 
 
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
@@ -182,95 +181,44 @@
 	<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) {
+				var monthArr = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+				return monthArr.indexOf(a);
+			},
+			"date-range-asc": function(a, b) {
+				return ((a < b) ? -1 : ((a > b) ? 1 : 0));
+			},
+			"date-range-desc": function(a, b) {
+				return ((a < b) ? 1 : ((a > b) ? -1 : 0));
+			}
+		});
 
-<script> 
-	
-jQuery.extend( jQuery.fn.dataTableExt.oSort, {
-    "date-range-pre": function ( a ) {
-        var monthArr = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
-        return monthArr.indexOf(a); 
-    },
-     "date-range-asc": function ( a, b ) {
-        return ((a < b) ? -1 : ((a > b) ? 1 : 0));
-    },
-     "date-range-desc": function ( a, b ) {
-        return ((a < b) ? 1 : ((a > b) ? -1 : 0));
-    }
-} );
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":"<center> Data Not Found ! </center>"
-        },
-        "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'
-        ],
-		columnDefs: [
-       { type: 'date-range', targets: 0 }
-    ],
-	"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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;
-            };
+		$(document).ready(function() {
 
-			TotalQTY = api
-                 .column( 1, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 1 ).footer() ).html( TotalQTY.toFixed().bold() );
-			 
-			TotalVALUE = api
-                 .column( 2, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-				
-             $( api.column( 2 ).footer() ).html(  TotalVALUE.toFixed(2).bold() );
-
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-   function Reset()
-{
-	 $('#mySelect').val('');
-	
-}
-
-	</script>
-	
-	
-	
\ 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+						previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+					},
+					emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
+				}
+			});
+		});
+	</script>
\ 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_inward.php -->
+<script>
+	$(document).ready(function() {
+		$("#client_name").select2();
+		$("#financialyear").select2();
+		$("#month").select2();
+	});
+</script>
 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
 
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-		 
-			   
-	 </style>
-	  <div class="content-wrapper">
-	 <section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Report - Year-wise-Total(<?php echo $year; ?>)</b></p></h3></center>
-			</div>
-			<!-- /.box-header -->
-			<div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-				<thead>
-                     <tr>
-				       <th style="text-align:center">Supplier Name</th>
-                       <th style="text-align:center">Material Name</th>
-					   <th style="text-align:center">Quantity</th>
-					   <th style="text-align:center">Total Value &nbsp;(&#8377;)</th>
-					   
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($ytotal)){
-					  $tr3=0;
-					  $tr4=0; 
-					  $last = $this->uri->total_segments();
-		               $ab=$this->uri->segment($last);
-					   foreach($ytotal as $rel)
-					    {				
-					   ?> 
-					  <tr>
-                        <td><span>
-						<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid;?>&mid=<?php echo $rel->mid;?>&ab=<?php echo $ab;?>"><?php echo $rel->supplier_name;?></a>
-						</span></td>
-						<td><span><?php echo $rel->material_name;?></span></td>
-						<td style="text-align:right"><span><?php 
-						 $tr3= $tr3 + round($rel->quantity);
-						echo round($rel->quantity);?></span></td>
-						<td style="text-align:right"><span><?php 
-						 $tr4= $tr4 + number_format($rel->total,2,'.','');
-						echo number_format($rel->total,2,'.','');?></span></td>
-						</tr>
-			           <?php
-					    }
-						
-					  ?>
-			        </tbody>
-					<tfoot  width="100%">
-					 <tr>
-						    <td style="text-align:center;">
-							<strong><?php echo 'Total'; ?></strong>
-							</td>
-						    <td style="text-align:center;">
-							<?php echo ''; ?>
-							</td>
-									
-								<td style="text-align:right">
-								<strong>
-								<?php 
-								 {
-								 echo round($tr3);
-								
-								  } 
-								 ?> 
-                                </strong>								 
-								</td>
-									<td style="text-align:right">
-									<strong>
-									<?php 
-									 {
-									 echo number_format($tr4,2,'.','');
-									
-									  } 
-									 ?>  
-									</strong>
-									</td>
-										
-											
-												
-						</tr>
-					 </tfoot>
-					  <?php
-					    }
-						
-					  ?>
-			      </table>
-			 
-				</div>
-			   </div>
-			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-	  </div>
-					</section>
+<style>
+	table {
+		width: auto;
+	}
+</style>
+
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Year-wise-Total ( <?php echo $year; ?> )
+											</b></h4>
+									</li>
+								</ol>
+							</div>
+						</div>
 					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+
+								<div class="table-responsive">
+									<table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
+										<thead>
+											<tr>
+												<th style="text-align:center">Supplier Name</th>
+												<th style="text-align:center">Material Name</th>
+												<th style="text-align:center">Quantity</th>
+												<th style="text-align:center">Total Value &nbsp;(&#8377;)</th>
+											</tr>
+										</thead>
+										<tbody>
+											<?php if (!empty($ytotal)) {
+												$tr3 = 0;
+												$tr4 = 0;
+
+												$ab = $year;
+												foreach ($ytotal as $rel) {
+											?>
+													<tr>
+														<td><span>
+																<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $rel->sid; ?>&mid=<?php echo $rel->mid; ?>&ab=<?php echo $ab; ?>"><?php echo $rel->supplier_name; ?></a>
+															</span></td>
+														<td><span><?php echo $rel->material_name; ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tr3 = $tr3 + round($rel->quantity);
+																							echo round($rel->quantity); ?></span></td>
+														<td style="text-align:right"><span><?php
+																							$tr4 = $tr4 + number_format($rel->total, 2, '.', '');
+																							echo number_format($rel->total, 2, '.', ''); ?></span></td>
+													</tr>
+												<?php
+												}
+
+												?>
+										</tbody>
+										<tfoot width="100%">
+											<tr>
+												<td style="text-align:center;">
+													<strong><?php echo 'Total'; ?></strong>
+												</td>
+												<td style="text-align:center;">
+													<?php echo ''; ?>
+												</td>
+
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo round($tr3);
+														}
+														?>
+													</strong>
+												</td>
+												<td style="text-align:right">
+													<strong>
+														<?php {
+															echo number_format($tr4, 2, '.', '');
+														}
+														?>
+													</strong>
+												</td>
+
+
+
+											</tr>
+										</tfoot>
+									<?php
+											}
+
+									?>
+									</table>
+
+								</div>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
+				</div>
+			</div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+
 
 
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
@@ -133,120 +133,82 @@
 	<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) {
+				var monthArr = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+				return monthArr.indexOf(a);
+			},
+			"date-range-asc": function(a, b) {
+				return ((a < b) ? -1 : ((a > b) ? 1 : 0));
+			},
+			"date-range-desc": function(a, b) {
+				return ((a < b) ? 1 : ((a > b) ? -1 : 0));
+			}
+		});
 
-<script> 
-	
-
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":     "<center> Data Not Found ! </center>"
-        },
-        "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'
-        ],
-	   "footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // 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( 2, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 2 ).footer() ).html( TotalQTY.toFixed().bold() );
-			 
-			TotalVALUE = api
-                 .column( 3, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 3 ).footer() ).html(  TotalVALUE.toFixed(2).bold() );
-
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	$( function() {
-		//var dateFormat = "mm/dd/yy",
-			from = $( "#min-date" )
+		$(function() {
+			//var dateFormat = "mm/dd/yy",
+			from = $("#min-date")
 				.datepicker({
-					dateFormat: "dd-mm-yy", 
+					dateFormat: "dd-mm-yy",
 					defaultDate: "+0d",
 					changeMonth: true,
 					//numberOfMonths: 1
-					
+
 				})
-				.on( "change", function() {
-					to.datepicker("option", "minDate", getDate( this ) );
+				.on("change", function() {
+					to.datepicker("option", "minDate", getDate(this));
 				}),
-			to = $( "#max-date" ).datepicker({
-				dateFormat: "dd-mm-yy", 
-				defaultDate: "+0d",
-				changeMonth: true,
-				//numberOfMonths: 1
-				
-			})
-			.on( "change", function() {
-				from.datepicker( "option", "maxDate", getDate( this ) );
-			});
+				to = $("#max-date").datepicker({
+					dateFormat: "dd-mm-yy",
+					defaultDate: "+0d",
+					changeMonth: true,
+					//numberOfMonths: 1
 
-		function getDate( element ) {
-			var date;
-			 
-			try {
-				date = $.datepicker.parseDate( dateFormat, element.value );
-				 
-			} catch( error ) {
-				date = null;
+				})
+				.on("change", function() {
+					from.datepicker("option", "maxDate", getDate(this));
+				});
+
+			function getDate(element) {
+				var date;
+
+				try {
+					date = $.datepicker.parseDate(dateFormat, element.value);
+
+				} catch (error) {
+					date = null;
+				}
+
+				return date;
 			}
+		});
 
-			return date;
-		}
-	} );
+		$(document).ready(function() {
 
-   function Reset()
-{
-	 $('#mySelect').val('');
-	
-}
-
-	</script>
-	
-	
-	
\ 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+						previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+					},
+					emptyTable: '<div style="text-align:center;">Data Not Found!</div>'
+				}
+			});
+		});
+	</script>
\ No newline at end of file
diff --git a/app/Views/accountsDashboard.php b/app/Views/accountsDashboard.php
index afde5728..c2ebacde 100644
--- a/app/Views/accountsDashboard.php
+++ b/app/Views/accountsDashboard.php
@@ -334,7 +334,7 @@
 					<div class="col-md-3">
 						<div class="form-group">
 							<label class="col-form-label">Invoice Number <span class="text-danger">*</span></label>
-							<?php $data = array('name' => 'InvoiceNO', 'value' => set_value('InvoiceNO'), 'id' => 'Invoice_No',  'class' => 'form-control', 'required=>"true"');
+							<?php $data = array('name' => 'InvoiceNO', 'value' => set_value('InvoiceNO'), 'id' => 'Invoice_No',  'class' => 'form-control', 'required' =>true);
 							echo form_input($data);
 							?>
 						</div>
@@ -343,7 +343,7 @@
 						<div class="form-group">
 							<label class="col-form-label">Invoice Date <span class="text-danger">*</span></label>
 							<?php
-							$data = array('name' => 'InvoiceDate', 'value' => set_value('InvoiceDate'), 'id' => 'Invoice_Date',  'class' => 'form-control', 'required=>"true"');
+							$data = array('name' => 'InvoiceDate', 'value' => set_value('InvoiceDate'), 'id' => 'Invoice_Date',  'class' => 'form-control', 'required' =>true);
 							echo form_input($data);
 							?>
 						</div>
@@ -352,7 +352,7 @@
 						<div class="form-group">
 							<label class="col-form-label">Material Received Date <span class="text-danger">*</span></label>
 							<?php
-							$data = array('name' => 'MaterialRcvdDate', 'value' => set_value('MaterialRcvdDate'), 'id' => 'MaterialRcvdDate',  'class' => 'form-control');
+							$data = array('name' => 'MaterialRcvdDate', 'value' => set_value('MaterialRcvdDate'), 'id' => 'MaterialRcvdDate',  'class' => 'form-control' ,'required' =>true);
 							echo form_input($data);
 							?>
 						</div>
@@ -408,9 +408,9 @@
 					</div>
 					<div class="col-md-3">
 						<div class="form-group">
-							<label class="col-form-label">Remark</label>
+							<label class="col-form-label">Remark<span class="text-danger">*</span></label>
 								<?php
-										$data = array('name' => 'MasterRemarks', 'value' => set_value('MasterRemarks'), 'id' => 'MasterRemarks',  'class' => 'form-control', 'autocomplete' => 'off','rows' => 3);
+										$data = array('name' => 'MasterRemarks', 'value' => set_value('MasterRemarks'), 'id' => 'MasterRemarks',  'class' => 'form-control', 'autocomplete' => 'off','rows' => 3,'required' =>true);
 										echo form_textarea($data);
 								?>
 						</div>
@@ -972,6 +972,16 @@
 		});
 	});
 	$('#draftIGR').click(function() {
+		let remarks = $('#MasterRemarks').val().trim();
+		let rcvdDate = $('#MaterialRcvdDate').val().trim();
+		let invoiceDate = $('#InvoiceDate').val().trim();
+		let invoiceNo = $('#Invoice_No').val().trim();
+
+		// any are empty
+		if (!remarks || !rcvdDate || !invoiceDate || !invoiceNo) {
+			alert("Please fill all the required fields");
+			return; // Stop 
+		}
 		// $('#content').loader('show');
 		var igrno = $("#IGRNO1").val();
 		var pono = $("#PONO1").val();
@@ -1035,7 +1045,16 @@
 		});
 	});
 	$('#generateIGR').click(function() {
-		
+		let remarks = $('#MasterRemarks').val().trim();
+		let rcvdDate = $('#MaterialRcvdDate').val().trim();
+		let invoiceDate = $('#InvoiceDate').val().trim();
+		let invoiceNo = $('#Invoice_No').val().trim();
+
+		// any are empty
+		if (!remarks || !rcvdDate || !invoiceDate || !invoiceNo) {
+			alert("Please fill all the required fields");
+			return; // Stop 
+		}
 		var igrno = $("#IGRNO1").val();
 		var pono = $("#PONO1").val();
 		var status = 1;
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 @@
+<!-- deliver_perform.php  -->
+<script>
+	$(document).ready(function() {
+		$("#financialyear").select2();
+		$("#month").select2();
+	});
+</script>
 
-
- 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
 
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-					 .col-md-offset-1 {
-				margin-left: 2.333333%;
-			   
-				padding-top: 5px;
-			}
-			   
-	 </style>
-	  <div class="content-wrapper">
-	 <section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Delivery Performance</b><br>
-			   <?php
-			  
-			  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 ' ';
-			  }
-			 
-			  ?>
-			  </p></h3></center>
-			 
-			</div>
-			<!-- /.box-header -->
-			<div class="panel-body">
+<style>
+	table {
+		width: auto;
+	}
+</style>
 
-                    <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Report</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Delivery Performance
+												<?php echo isset($month) ? '(' . $month . ')' : ''; ?>
+												<?php echo isset($financialyear) ? '(' . $financialyear . ')' : ''; ?>
+											</b></h4>
+									</li>
+								</ol>
+							</div>
 
-                        <div class="form-group has-feedback">
-						
-						
-						
-                       <div class="col-md-2">
-							 <label for="to_date">
-                                <?php echo 'Year'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="financialyear" name="financialyear">
-								 <option value="">Select Year</option>
-								 <?php 
-								 
-								
-								  foreach($fy as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
-                            </div>
-								<div class="col-md-2">
-								<label for="to_date">
-                                <?php echo 'Month'; ?>
-                                </label>
-                                <div class="input-group">
-                                 <select class="form-control" id="month" name="month">
-								  <option value="">Select Month</option>
-								 <option value="January">January</option>
-								 <option value="February">February</option>
-								 <option value="March">March</option>
-								 <option value="April">April</option>
-								 <option value="May">May</option>
-								 <option value="June">June</option>
-								 <option value="July">July</option>
-								 <option value="August">August</option>
-								 <option value="September">September</option>
-								 <option value="October">October</option>
-								 <option value="November">November</option>
-								 <option value="December">December</option>
-								 </select>
-                              </div>
-                      
-						
-
-             </div>
-						<div class="col-md-2 col-md-offset-1"><br>
-                        <input type="submit" class="btn btn-success" name="btn_submit"
-                               value="View Report">
-                        
-							</div>  
-							 
-                    </form>
-
-               
-
-            </div>	
-			  </div>	
-			<div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				   <tr>
-				   
-				       
-						<!-- <th>S.No</th> -->
-						<th>OrderedDate</th>            
-						<th>DispatchDate</th>
-						<th>CustomerName</th>
-						<th>InvoiceNumber</th>            
-						<th>OrderedQuantity</th>
-					    <th>DispatchQuantity</th>            
-						<th>Rating</th>
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($per)){
-					  $tr1=0;
-					  $tr2=0; 
-					  // $last = $this->uri->total_segments();
-		     //           $ab=$this->uri->segment($last);
-		               $i=0;
-					   foreach($per as $rel)
-					    {				
-					   ?> 
-					  <tr>
-                      
-						<!-- <td style="text-align:left;"><span><?php echo  ++$i;?></span></td> -->
-						   <td ><?php  
-                $itemdate=date("d-m-Y",strtotime($rel->invoice_date_created));
-                echo $itemdate;
-                 ?>
-                </td>
-                   <td ><?php  
-                $invoicedate=date("d-m-Y",strtotime($rel->invoice_date_created));
-                echo $invoicedate;
-                 ?>
-                </td>
-
-              <td style="text-align:left;"><?php echo ($rel->client_name);?></td>
-              <td style="text-align:center;"><?php echo ($rel->invoice_number); ?></td> 
-
-
-                   <td class="amount" style="text-align:right;"><?php
-                    $tr1= $tr1 + round($rel->qty);
-                  echo number_format(round($rel->qty));
-               ?></td>
-                
-                <td class="amount" style="text-align:right;"><?php
-                  $tr2= $tr2 + round($rel->qty);
-                  echo number_format(round($rel->qty));
-                ?></td>
-
-
-
-
-                <td style="text-align:right;"><?php 
-                $OrderedQuantity= round($rel->qty);
-                   $DispatchQuantity= round($rel->qty);
-                   $Rating =@($DispatchQuantity / $OrderedQuantity )*100;
-
-
-                echo number_format($Rating, 2, '.', ' ') ;  ?></td>
-						
-						</tr>
-			           <?php
-					    }
-						
-					  ?>
-			        </tbody>
-					<tfoot  width="100%">
-
-                         
-						   <td><strong>&nbsp</strong></td>
-						   <td><strong>&nbsp</strong></td>
-						   <td><strong>&nbsp</strong></td>
-						     <td><strong>Total</strong></td>
-						   <td><strong>&nbsp</strong></td>
-						   
-							<td class="amount" style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo $tr1;
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td>  
-								<td class="amount" style="text-align:right"><strong>
-								 <?php 
-								 {
-								 echo $tr2;
-								
-								  } 
-								 ?>  
-								</strong>	 
-								</td> 
-								<td><strong>&nbsp</strong></td>
-						 
-					
-					 </tfoot>
-					  <?php
-					    }
-						
-					  ?>
-			      </table>
-			 
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+
+								<form method="post" action="<?php echo base_url("DeliveryPerformance"); ?>">
+									<div class="form-group">
+
+										<div class="row">
+											<div class="col-3">
+												<label for="financialyear">
+													<?php echo 'Year'; ?>
+												</label>
+												<select class="form-control" id="financialyear" name="financialyear">
+													<option value="">Select Year</option>
+													<?php
+
+
+													foreach ($fy as $item): { ?>
+
+															<option value="<?php echo $item->financial_year; ?>" <?php if (isset($financialyear) && ($financialyear == $item->financial_year)) {
+																														echo 'selected';
+																													} ?>><?php echo $item->financial_year;  ?></option>
+
+
+													<?php }
+													endforeach; ?>
+												</select>
+											</div>
+
+											<div class="col-3">
+												<label for="month">
+													<?php echo 'Month'; ?>
+												</label>
+
+												<select class="form-control" id="month" name="month">
+													<option value="">Select Month</option>
+													<option value="January" <?php if (isset($month) && ($month == "January")) {
+																				echo 'selected';
+																			} ?>>January</option>
+													<option value="February" <?php if (isset($month) && ($month == "February")) {
+																					echo 'selected';
+																				} ?>>February</option>
+													<option value="March" <?php if (isset($month) && ($month == "March")) {
+																				echo 'selected';
+																			} ?>>March</option>
+													<option value="April" <?php if (isset($month) && ($month == "April")) {
+																				echo 'selected';
+																			} ?>>April</option>
+													<option value="May" <?php if (isset($month) && ($month == "May")) {
+																			echo 'selected';
+																		} ?>>May</option>
+													<option value="June" <?php if (isset($month) && ($month == "June")) {
+																				echo 'selected';
+																			} ?>>June</option>
+													<option value="July" <?php if (isset($month) && ($month == "July")) {
+																				echo 'selected';
+																			} ?>>July</option>
+													<option value="August" <?php if (isset($month) && ($month == "August")) {
+																				echo 'selected';
+																			} ?>>August</option>
+													<option value="September" <?php if (isset($month) && ($month == "September")) {
+																					echo 'selected';
+																				} ?>>September</option>
+													<option value="October" <?php if (isset($month) && ($month == "October")) {
+																				echo 'selected';
+																			} ?>>October</option>
+													<option value="November" <?php if (isset($month) && ($month == "November")) {
+																					echo 'selected';
+																				} ?>>November</option>
+													<option value="December" <?php if (isset($month) && ($month == "December")) {
+																					echo 'selected';
+																				} ?>>December</option>
+												</select>
+
+
+											</div>
+
+
+											<div class="col-md-6 text-right">
+												<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('DeliveryPerformance') ?>';">
+
+
+												<input type="submit" class="btn btn-success m-2" name="btn_submit" value="View Report">
+											</div>
+
+										</div>
+									</div>
+									<div class="form-group has-feedback">
+
+									</div>
+
+
+								</form>
+								<table id="cc" class="table table-bordered table-hover mb-0 nowrap w-100"
+									style="background-color:#fff; font-size:12px;">
+
+
+
+									<thead>
+										<tr>
+
+
+											<!-- <th>S.No</th> -->
+											<th>OrderedDate</th>
+											<th>DispatchDate</th>
+											<th>CustomerName</th>
+											<th>InvoiceNumber</th>
+											<th>OrderedQuantity</th>
+											<th>DispatchQuantity</th>
+											<th>Rating</th>
+
+										</tr>
+									</thead>
+									<tbody>
+										<?php if (!empty($per)) {
+											$tr1 = 0;
+											$tr2 = 0;
+											// $last = $this->uri->total_segments();
+											//           $ab=$this->uri->segment($last);
+											$i = 0;
+											foreach ($per as $rel) {
+										?>
+												<tr>
+
+													<!-- <td style="text-align:left;"><span><?php echo  ++$i; ?></span></td> -->
+													<td><?php
+														$itemdate = date("d-m-Y", strtotime($rel->invoice_date_created));
+														echo $itemdate;
+														?>
+													</td>
+													<td><?php
+														$invoicedate = date("d-m-Y", strtotime($rel->invoice_date_created));
+														echo $invoicedate;
+														?>
+													</td>
+
+													<td style="text-align:left;"><?php echo ($rel->client_name); ?></td>
+													<td style="text-align:center;"><?php echo ($rel->invoice_number); ?></td>
+
+
+													<td class="amount" style="text-align:right;"><?php
+																									$tr1 = $tr1 + round($rel->qty);
+																									echo number_format(round($rel->qty));
+																									?></td>
+
+													<td class="amount" style="text-align:right;"><?php
+																									$tr2 = $tr2 + round($rel->qty);
+																									echo number_format(round($rel->qty));
+																									?></td>
+
+
+
+
+													<td style="text-align:right;"><?php
+																					$OrderedQuantity = round($rel->qty);
+																					$DispatchQuantity = round($rel->qty);
+																					$Rating = @($DispatchQuantity / $OrderedQuantity) * 100;
+
+
+																					echo number_format($Rating, 2, '.', ' ');  ?></td>
+
+												</tr>
+											<?php
+											}
+
+											?>
+									</tbody>
+									<tfoot width="100%">
+
+
+										<td><strong>&nbsp</strong></td>
+										<td><strong>&nbsp</strong></td>
+										<td><strong>&nbsp</strong></td>
+										<td><strong>Total</strong></td>
+										<td><strong>&nbsp</strong></td>
+
+										<td class="amount" style="text-align:right"><strong>
+												<?php {
+													echo $tr1;
+												}
+												?>
+											</strong>
+										</td>
+										<td class="amount" style="text-align:right"><strong>
+												<?php {
+													echo $tr2;
+												}
+												?>
+											</strong>
+										</td>
+										<td><strong>&nbsp</strong></td>
+
+
+									</tfoot>
+								<?php
+										}
+
+								?>
+								</table>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
 				</div>
-			   </div>
 			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-	  </div>
-	  </section>
-	  </div>
-	 
+		</div> <!-- container -->
+	</div> <!-- content -->
+</div>
 
 
-	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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() {
 
-<script> 
-	
 
-// Bootstrap datepicker
-// Set up your table
-$(document).ready(function() {
-		  $.fn.dataTable.moment( 'DD-MM-YYYY' );
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":     "<center> Data Not Found ! </center>"
-        },
-        "aaSorting": [[ 1, "desc" ]],
-        "autoWidth": false,
-        orderCellsTop: true,
-
-        "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'
-        ],
-		"footerCallback": function ( row, data, start, end, display ) {
-            var api = this.api(), data;
- 
-            // Remove the formatting to get integer data for summation
-            var intVal = function ( i ) {
-                 return typeof i === 'string' ?
-				 parseFloat(i.replace(/[^0-9]+/g,"")*1) :
-                     typeof i === 'number' ?
-					 parseFloat(i) : 0;
-            };
-
-			TotalPOCount = api
-                 .column( 5, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 5 ).footer() ).html( TotalPOCount.toFixed().bold() );
-			
-			TotalQTY = api
-                 .column( 6, { search:'applied' } )
-                 .data()
-                 .reduce( function (a, b) {
-                     return intVal(a) + intVal(b);
-                 }, 0 );
-
-             $( api.column( 6 ).footer() ).html( TotalQTY.toFixed().bold() );			 
-
-        }
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
-        .column(4)
-        .search(this.value)
-        .draw();
-    });
-	
-	$( function() {
-		//var dateFormat = "mm/dd/yy",
-			from = $( "#min-date" )
-				.datepicker({
-					dateFormat: "dd-mm-yy", 
-					defaultDate: "+0d",
-					changeMonth: true,
-					//numberOfMonths: 1
-					
-				})
-				.on( "change", function() {
-					to.datepicker("option", "minDate", getDate( this ) );
-				}),
-			to = $( "#max-date" ).datepicker({
-				dateFormat: "dd-mm-yy", 
-				defaultDate: "+0d",
-				changeMonth: true,
-				//numberOfMonths: 1
-				
-			})
-			.on( "change", function() {
-				from.datepicker( "option", "maxDate", getDate( this ) );
-			});
-
-		function getDate( element ) {
-			var date;
-			 
-			try {
-				date = $.datepicker.parseDate( dateFormat, element.value );
-				 
-			} catch( error ) {
-				date = null;
+		// Initialize the DataTable
+		var table = $('#cc').DataTable({
+			dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+			buttons: ['excel'],
+			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: '<i class="fas fa-angle-right"></i>', // Next button icon
+					previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+				}
 			}
-
-			return date;
-		}
-	} );
-
-   function Reset()
-{
-	 $('#mySelect').val('');
-	
-}
-
-	</script>
-	
-	
-	
\ No newline at end of file
+		});
+	});
+</script>
\ 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 @@
                             <input type="text" class="form-control" id="no_of_days" name="no_of_days" readonly>
                         </div>    
                     </div><!--/. r o w 5 -->
-                    <div class="row mt-2 security-restricted labstaff-restricted stock-restricted">
+                    <div class="row mt-2 auditor-restricted security-restricted labstaff-restricted stock-restricted">
                         <div class="col-md-2" style="text-align: end; align-content: center;">
                             <label class="form" for="status_val">Status</label>
                         </div>
@@ -258,10 +258,10 @@
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal"
                     value="Cancel">Cancel</button>
-                <span class="auditor-restricted labstaff-restricted security-restricted">
+                
                 <button type="button" class="btn btn-info waves-effect waves-light tempClick"
                     id="tempClick">Submit</button>
-                </span>
+                
             </div>
         </div><!-- /. m o d a l-c o n t e n t -->
     </div><!-- /.m o d a l-d i a l o g -->
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 @@
                             </div>
 			
            
-            <a class="btn btn-success" href="<?php echo base_url(); ?>emppaydate/addemppaydate">Create New Loan</a>
+            <a class="btn btn-success auditor-restricted-btn" href="<?php echo base_url(); ?>emppaydate/addemppaydate">Create New Loan</a>
           </div>
         </div>
       </div>
diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php
index e4ce954d..5b91579b 100755
--- a/app/Views/inwardgateregister.php
+++ b/app/Views/inwardgateregister.php
@@ -145,7 +145,7 @@
 										?>
 									</div>
 									<div class="form-group col-md-3">
-										<label class="col-form-label">Remark</label>
+										<label class="col-form-label">Remark<span class="text-danger">*</span></label>
 										<?php
 										$data = array('name' => 'MasterRemarks', 'value' => set_value('MasterRemarks'), 'id' => 'MasterRemarks',  'class' => 'form-control', 'autocomplete' => 'off','rows' => 3);
 										echo form_textarea($data);
@@ -167,7 +167,7 @@
 													<th>Received Quantity</th>
 													<th>Balance Quantity</th>
 													<th>Invoice Quantity<span class="text-danger">*</span></th>
-													<th>Remarks<span class="text-danger">*</span></th>
+													<th>Remarks</th>
 													<th> </th>
 												</tr>
 											</thead>
@@ -307,6 +307,19 @@
 		}
 
 		$('#IGRLink, #IGRDraftLink').on('click', function(e) {
+			let remarks = $('#MasterRemarks').val().trim();
+			let rcvdDate = $('#MaterialRcvdDate').val().trim();
+			let invoiceDate = $('#InvoiceDate').val().trim();
+			let invoiceNo = $('#InvoiceNo').val().trim();
+			let pono = $('#PONO').val().trim();
+			
+
+			// any are empty
+			if (!pono || !remarks || !rcvdDate || !invoiceDate || !invoiceNo) {
+				alert("Please fill all the required fields");
+				return; // Stop 
+			}
+			console.log("All fields filled. Proceeding...");
 			e.preventDefault();
 			const $btn = $(this);
 			const strMsg = $btn.is('#IGRLink') 
@@ -517,7 +530,12 @@
 								value: item.MaterialCode,
 								name: 'MaterialCode' + i
 							}).appendTo('form');
-
+							$('<input>').attr({
+								type: 'hidden',
+								id: 'LineItemNo' + i,
+								value: item.LineItemNo,
+								name: 'LineItemNo' + i
+							}).appendTo('form');
 							$('<input>').attr({
 								type: 'hidden',
 								id: 'txtQuantityAsPerInvoice' + i,
@@ -639,17 +657,10 @@
 	}
 
 	function validateReceivedQuantity(Rowid) {
-		//alert(Rowid);
 		var InvoiceQty = parseFloat($('#QuantityAsPerInvoice' + Rowid).val() == '' ? '0.00' : $('#QuantityAsPerInvoice' + Rowid).val());
 		var PendingQty = parseFloat($('#PendingQuantity' + Rowid).text() == '' ? '0.00' : $('#PendingQuantity' + Rowid).text());
 		var RecQty = parseFloat($('#txtReceivedQuantity' + Rowid).val() == '' ? '0.00' : $('#txtReceivedQuantity' + Rowid).val());
 		var OrderedQty = parseFloat($("#Quantity_1" + Rowid).text());
-		var r = $("#Remark" + Rowid).val();
-		if (r == '') {
-			alert("Please Enter the Remark")
-			$("#Remark" + Rowid).focus();
-			return false;
-		}
 		var isOpenOrder = parseInt($("#hiddenIsOpenOrder").val(), 2);
 		var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? 0 : 1;
 		if (formatted_IsOpenOrder == 0) {
diff --git a/app/Views/report_emp.php b/app/Views/report_emp.php
index 63c4588a..9e8f9c59 100755
--- a/app/Views/report_emp.php
+++ b/app/Views/report_emp.php
@@ -1,303 +1,297 @@
+<script>
+	$(document).ready(function() {
 
+		$("#client_name").select2();
+		$("#item_name").select2();
+		$("#purchaseorder_number").select2();
+
+
+	});
+</script>
 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
-      <style> 
-          .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;
+<style>
+	
+	table{
+		width:auto;
+	}
 
-                           }
-			 .btn-success {
-								background-color:   #00d976;;
-								border-color:   #00d976;;
-							}			   
-					 .col-md-offset-1 {
-				margin-left: 2.333333%;
-			   
-				padding-top: 5px;
-			}
-			   
-	 </style>
-	 <div class="content-wrapper">
-		 <section class="content">
- <div class="row" style="min-height: 600px;">
-        <!-- Left col -->
-        <div class="col-md-12">
-        <!-- TABLE: LATEST ORDERS -->
-          <div class="box box-info">
-            <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:  #00d976;"><b>Employee Performance</b><br>
-			   <?php
-			  
-			  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 ' ';
-			  }
-			 
-			  ?>
-			  </p></h3></center>
-			 
-			</div>
-			<!-- /.box-header -->
-			<div class="panel-body">
+	.dataTables_filter input {
+		padding: 4px;
+	}
 
-                    <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
+	.dataTables_filter {
+		/* width: 50%; */
+		float: right;
+		text-align: right;
+	}
 
-                        <div class="form-group has-feedback">
-						
-						
-						
-                       <div class="col-md-2">
-							 <label for="to_date">
-                                <?php echo 'Year'; ?>
-                            </label>
-                            <div class="input-group">
-                                 <select class="form-control" id="financialyear" name="financialyear" required>
-								 
-								 <option value="">Select Year</option>
-								 <?php 
-								 
-								
-								  foreach($fy as $item):
-										 
-										 {?>
-										
-										<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
-										
-												 
-										 <?php } endforeach; ?>
-								  
-								   </select>
-							   </div>
+	.dataTables_paginate {
+		width: 50%;
+		float: right;
+		text-align: right;
+	}
+
+	div.dt-buttons {
+		position: relative;
+		/* float: right; */
+
+	}
+</style>
+
+<div class="content-page">
+	<div class="content">
+		<!-- Start Content-->
+		<div class="container-fluid">
+			<!-- start page title -->
+			<div>
+				<div class="row">
+					<div class="col-12">
+						<div class="page-title-box page-title-box-alt">
+						<div class="page-title-right">
+                                <ol class="breadcrumb m-0">
+                                    <li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
+                                    <li class="breadcrumb-item"><a href="javascript: void(0);"></a> Attendance</li>
+                                    <li class="breadcrumb-item active">
+                                    <h4 class="page-title"><b> Employee Performance  </b></h4>
+                                    </li>
+                                </ol>
                             </div>
-								<div class="col-md-2">
-								<label for="to_date">
-                                <?php echo 'Month'; ?>
-                                </label>
-                                <div class="input-group">
-                                 <select class="form-control" id="month" name="month" required>
-								  <option value="">Select Month</option>
-								 
-								 <option value="April">April</option>
-								 <option value="May">May</option>
-								 <option value="June">June</option>
-								 <option value="July">July</option>
-								 <option value="August">August</option>
-								 <option value="September">September</option>
-								 <option value="October">October</option>
-								 <option value="November">November</option>
-								 <option value="December">December</option>
-								 <option value="January">January</option>
-								 <option value="February">February</option>
-								 <option value="March">March</option>
-								 </select>
-                              </div>
-                      
-						
-
-             </div>
-						<div class="col-md-2 col-md-offset-1"><br>
-                        <input type="submit" class="btn btn-success" name="btn_submit"
-                               value="View Report">
-                        
-							</div>  
-							 
-                    </form>
-
-               
-
-            </div>	
-			  </div>	
-			<div class="box-body">
-              <div>
-                <table class="table table-bordered table-hover" id="cc" style="font-size:14px;">
-                   <thead>
-				   <tr>
-				        <th rowspan="2">EmpID</th> 
-						<th rowspan="2">Employee Name </th>
-						<th rowspan="2">Status</th>
-				        <th colspan="3"><center>Month</center></th> 
-				        <th colspan="3"><center>Year</center></th> 
-				   
-				   </tr>
-                     <tr>
-				       
-						<th>Total Days</th>
-						<th>Present Days</th>            
-						<th>Percentage</th>
-						<th>Total Days</th>
-						<th>Present Days</th>            
-						<th>Percentage</th>
-								   
-					 
-                      </tr>
-                    </thead>
-				    <tbody>
-				       <?php if(!empty($per)){
-					  $tr3=0;
-					  $tr4=0; 
-					  $last = $this->uri->total_segments();
-		               $ab=$this->uri->segment($last);
-					   foreach($per as $index =>$rel)
-					    {				
-						//echo $index;
-						//echo 
-					   ?> 
-					  <tr>
-                        <td><span>
-						<?php echo $rel->Eid;?>
-						</span></td>
-						<td><span><?php echo $rel->ename;?></span></td>
-						<td style="text-align:right"><span><?php 
-						if($rel->active == 1){
-						echo 'Active';
-						}else
-						{
-							echo 'In Active';
-						}
-						?></span></td>
-						
-						<td style="text-align:right"><span><?php 
-						echo $cur_month;?></span></td>
-						<td style="text-align:right"><span><?php echo $rel->monthworked;?></span></td>
-						<td style="text-align:right"><span><?php echo $rel->monthpercentage;?></span></td>
-						<td style="text-align:right"><span><?php echo $yeardays[$index];?></span></td>
-						<td style="text-align:right"><span><?php echo $dayworked[$index];?></span></td>
-						<td style="text-align:right"><span><?php echo $yearpercentage[$index];?></span></td>
-						</tr>
-			           <?php
-					    }
-						
-					  ?>
-			        </tbody>
-					<tfoot  width="100%">
-					
-					 </tfoot>
-					  <?php
-					    }
-						
-					  ?>
-			      </table>
-			 
-				</div>
-			   </div>
-			</div>
-          <!-- /.box -->
-        </div>
-        <!-- /.col -->
-	  </div>
-					</section>
+							
+						</div>
 					</div>
+				</div>
+				<div class="row">
+					<div class="col-12">
+						<div class="card">
+							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
+
+							<div class="card-body">
+							<form method="post" action="<?php echo base_url('Empperform') ?>">
+
+									<div class="form-group has-feedback">
+
+
+									<div class="row">
+										<div class="col-3">
+											<label for="to_date">
+												<?php echo 'Year'; ?>
+											</label>
+											<div class="input-group">
+												<select class="form-control" id="financialyear" name="financialyear" required>
+												
+												<option value="">Select Year</option>
+												<?php 
+												
+												
+												foreach($fy as $item):
+														
+														{?>
+
+
+														
+														<option 
+														<?php echo isset($ab) && $ab == $item->financial_year ? "selected" : ""?>
+														value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
+														
+																
+														<?php } endforeach; ?>
+												
+												</select>
+											</div>
+										</div>
+
+										<div class="col-md-3">
+												<label for="to_date">
+												<?php echo 'Month'; ?>
+												</label>
+												<div class="input-group">
+												<select class="form-control" id="month" name="month" required>
+												<option value="">Select Month</option>
+
+												<?php 
+												$months=[
+													"April",
+													"May",
+													"June",
+													"July",
+													"August",
+													"September",
+													"October",
+													"November",
+													"December",
+													"January",
+													"February",
+													"March",
+												]
+												?>
+
+												<?php
+												foreach($months as $month){ ?>
+
+												<option 
+												    <?php echo isset($m) && $m == $month ? "selected" : "" ?>
+													value="<?=$month?>">
+													<?=$month?>
+												</option>
+
+
+
+												<?php } 
+												?>
+											
+												</select>
+											</div>
+
+
+
+										</div>
+
+										<div class="col-md-6 text-right"><br>
+											<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Empperform') ?>';">
+											<input type="submit" class="btn btn-success" name="btn_submit"
+												value="View Report">
+
+											</div> 
+									</div>
+
+										
+									</form>
+								<table id="cc" class="table table-bordered table-hover wrap" style="background-color:#fff;width: 100% !important;">
+
+									<!-- <table class="table table-bordered table-hover" id="asset_list_table" style="background-color:#fff;font-size:12px;"> -->
+									<thead>
+											<tr>
+													<th rowspan="2">EmpID</th> 
+													<th rowspan="2">Employee Name </th>
+													<th rowspan="2">Status</th>
+													<th colspan="3"><center>Month</center></th> 
+													<th colspan="3"><center>Year</center></th> 
+											
+											</tr>
+												<tr>
+												
+													<th>Total Days</th>
+													<th>Present Days</th>            
+													<th>Percentage</th>
+													<th>Total Days</th>
+													<th>Present Days</th>            
+													<th>Percentage</th>
+															
+												
+												</tr>
+									</thead>
+				   
+									<tbody>
+									<tbody>
+										<?php if(!empty($per)){
+										$tr3=0;
+										$tr4=0; 
+										
+										foreach($per as $index =>$rel)
+											{				
+											//echo $index;
+											//echo 
+										?> 
+										<tr>
+											<td><span>
+											<?php echo $rel->Eid;?>
+											</span></td>
+											<td><span><?php echo $rel->ename;?></span></td>
+											<td style="text-align:right"><span><?php 
+											if($rel->active == 1){
+											echo 'Active';
+											}else
+											{
+												echo 'In Active';
+											}
+											?></span></td>
+											
+											<td style="text-align:right"><span><?php 
+											echo $cur_month;?></span></td>
+											<td style="text-align:right"><span><?php echo $rel->monthworked;?></span></td>
+											<td style="text-align:right"><span><?php echo $rel->monthpercentage;?></span></td>
+											<td style="text-align:right"><span><?php echo $yeardays[$index];?></span></td>
+											<td style="text-align:right"><span><?php echo $dayworked[$index];?></span></td>
+											<td style="text-align:right"><span><?php echo $yearpercentage[$index];?></span></td>
+											</tr>
+										<?php
+											}
+										}
+										?>
+
+			                        </tbody>
+                                        <tfoot  width="100%">
+
+                                        </tfoot>
+								</table>
+							</div> <!-- end card body-->
+						</div> <!-- end card -->
+					</div><!-- end col-->
+				</div>
+			</div>
+		</div> <!-- container -->
+	</div> <!-- content -->
+</div>
+
+
+<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+<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 src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-	<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> 
 	
 
 // Bootstrap datepicker
 // Set up your table
+
 $(document).ready(function() {
-    table = $('#cc').DataTable( {
-		"language": {
-        "emptyTable":     "<center> Data Not Found ! </center>"
-        },
-        "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'
-        ]
-    } );
-} );
- $('#mySelect').on('change',function(){
-       
-		 table
+    // 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+                previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+            }
+        }
+    });
+});
+
+
+
+	$('#mySelect').on('change',function(){  
+		table
         .column(4)
         .search(this.value)
         .draw();
     });
-	
-	$( function() {
-		//var dateFormat = "mm/dd/yy",
-			from = $( "#min-date" )
-				.datepicker({
-					dateFormat: "dd-mm-yy", 
-					defaultDate: "+0d",
-					changeMonth: true,
-					//numberOfMonths: 1
-					
-				})
-				.on( "change", function() {
-					to.datepicker("option", "minDate", getDate( this ) );
-				}),
-			to = $( "#max-date" ).datepicker({
-				dateFormat: "dd-mm-yy", 
-				defaultDate: "+0d",
-				changeMonth: true,
-				//numberOfMonths: 1
-				
-			})
-			.on( "change", function() {
-				from.datepicker( "option", "maxDate", getDate( this ) );
-			});
-
-		function getDate( element ) {
-			var date;
-			 
-			try {
-				date = $.datepicker.parseDate( dateFormat, element.value );
-				 
-			} catch( error ) {
-				date = null;
-			}
-
-			return date;
-		}
-	} );
 
    function Reset()
-{
-	 $('#mySelect').val('');
-	
-}
+	{
+		$('#mySelect').val('');
+		
+	}
+
 
 	</script>
-	
-	
 	
\ No newline at end of file
diff --git a/app/Views/report_pendingreqst.php b/app/Views/report_pendingreqst.php
index 6988c8ee..2eeb4087 100755
--- a/app/Views/report_pendingreqst.php
+++ b/app/Views/report_pendingreqst.php
@@ -1,6 +1,3 @@
-
-	
-
 <script>
 	$(document).ready(function() {
 
@@ -14,9 +11,8 @@
 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
 <style>
-	
-	table{
-		width:auto;
+	table {
+		width: auto;
 	}
 
 	.dataTables_filter input {
@@ -51,16 +47,16 @@
 				<div class="row">
 					<div class="col-12">
 						<div class="page-title-box page-title-box-alt">
-						<div class="page-title-right">
-                                <ol class="breadcrumb m-0">
-                                    <li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
-                                    <li class="breadcrumb-item"><a href="javascript: void(0);">Requisation</a></li>
-                                    <li class="breadcrumb-item active">
-                                    <h4 class="page-title"><b>  Pending </b></h4>
-                                    </li>
-                                </ol>
-                            </div>
-							
+							<div class="page-title-right">
+								<ol class="breadcrumb m-0">
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Requisation</a></li>
+									<li class="breadcrumb-item active">
+										<h4 class="page-title"><b> Pending </b></h4>
+									</li>
+								</ol>
+							</div>
+
 						</div>
 					</div>
 				</div>
@@ -71,53 +67,72 @@
 
 							<div class="card-body">
 
-							    <form method="post" action="<?php echo base_url('reportpending'); ?>">
-									
+								<form method="post" action="<?php echo base_url('reportpending'); ?>">
+
 									<div class="row form-group has-feedback">
 										<div class="col-md-3">
-										<label for="to_date">
-											<?php echo 'Year'; ?>
-										</label>
-										<div class="input-group">
-											<select class="form-control" id="financialyear" name="financialyear">
-											<option value="">Select Year</option>
-											<?php 
-											
-											
-											foreach($finyear as $item):
-													
-													{?>
-													
-													<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ;  ?></option>
-													
-															
-													<?php } endforeach; ?>
-											
+											<label for="to_date">
+												<?php echo 'Year'; ?>
+											</label>
+											<div class="input-group">
+												<select class="form-control" id="financialyear" name="financialyear">
+													<option value="">Select Year</option>
+													<?php
+
+
+
+													foreach ($finyear as $item): {; ?>
+
+															<option
+																<?php echo (isset($givenYear) && $item->financial_year == $givenYear) ? "selected" : ""; ?>
+
+																value="<?php echo $item->financial_year; ?>">
+
+																<?php echo $item->financial_year;  ?>
+
+															</option>
+
+
+													<?php }
+													endforeach; ?>
+
 												</select>
 											</div>
 										</div>
 
 										<div class="col-md-3">
 											<label for="to_date">
-											<?php echo 'Month'; ?>
+												<?php echo 'Month'; ?>
 											</label>
 											<div class="input-group">
-											<select class="form-control" id="month" name="month">
-											<option value="">Select Month</option>
-											<option value="January">January</option>
-											<option value="February">February</option>
-											<option value="March">March</option>
-											<option value="April">April</option>
-											<option value="May">May</option>
-											<option value="June">June</option>
-											<option value="July">July</option>
-											<option value="August">August</option>
-											<option value="September">September</option>
-											<option value="October">October</option>
-											<option value="November">November</option>
-											<option value="December">December</option>
-											</select>
-										</div>
+												<select class="form-control" id="month" name="month">
+
+													<?php $monthArray = [
+														'January',
+														"February",
+														"March",
+														"April",
+														"May",
+														"June",
+														"July",
+														"August",
+														"September",
+														"October",
+														"November",
+														"December"
+													] ?>
+
+													<option value="">Select Month</option>
+													<?php foreach ($monthArray as $month): ?>
+														<option value="<?= $month ?>" <?php if (isset($givenMonth) && $givenMonth == $month) {
+																						echo 'selected';
+																					} ?>>
+															<?= $month ?>
+														</option>
+													<?php endforeach ?>
+
+												</select>
+											</div>
 										</div>
 
 										<div class="col-md-3">
@@ -126,55 +141,56 @@
 											</label>
 											<div class="input-group">
 												<input name="aging_from" id="aging_from" style="padding:4px;" class="form-control">
-											</span>
+												</span>
 											</div>
 										</div>
-				
-							
+
+
 										<div class="col-md-3">
 											<label for="Aging_To">
 												<?php echo 'Aging To'; ?>
-											</label>  
+											</label>
 											<div class="input-group">
 												<input name="aging_to" id="aging_to" style="padding:4px;" class="form-control">
-											</span>
+												</span>
 											</div>
-										
+
 										</div>
 									</div>
-									
-									
 
-										<div class="row">
-											<div class="col-md-3">
-												<label for="from_date">
-													<?php echo 'From Date'; ?>
-												</label>
-												<div class="input-group">
-													<input name="from_date" id="max-date" class="form-control datepicker">
-													
-												</div>
-											</div>
-					
-								
-											<div class="col-md-3">
-												<label for="to_date">
-													<?php echo 'To Date'; ?>
-												</label>  
-												<div class="input-group">
-													<input name="to_date" id="min-date" class="form-control datepicker">
-											
-												</div>
-											
-											</div>
-											<div class="col-md-3"></div>
-											<div class="col-md-3 "><br>
-												<input type="submit" class="btn btn-success" name="btn_submit"
-														value="View Report">
+
+
+									<div class="row">
+										<div class="col-md-3">
+											<label for="from_date">
+												<?php echo 'From Date'; ?>
+											</label>
+											<div class="input-group">
+												<input name="from_date" id="max-date" class="form-control datepicker"
+													value="<?php echo isset($givenFrm) ? $givenFrm : ""  ?>">
 											</div>
 										</div>
-									  
-									 
+
+
+										<div class="col-md-3">
+											<label for="to_date">
+												<?php echo 'To Date'; ?>
+											</label>
+											<div class="input-group">
+												<input name="to_date" id="min-date" class="form-control datepicker"
+													value="<?php echo isset($givenTo) ? $givenTo : ""  ?>">
+											</div>
+
+										</div>
+
+										<div class="col-md-6 text-right"><br>
+											<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('reportpending') ?>';">
+											<input type="submit" class="btn btn-success" name="btn_submit"
+												value="View Report">
+										</div>
+									</div>
+
+
 								</form>
 								<table id="cc" class="table table-bordered table-hover wrap" style="background-color:#fff;width: 100% !important;">
 
@@ -191,30 +207,29 @@
 									</thead>
 									<tbody>
 
-									<?php if(!empty($pending_list)){
-										foreach($pending_list as $lis)
-											{				
-										?> 
-										<tr>
-										<!-- <td><span><?php //$date = new DateTime($lis->ReqDate);echo $date->format('d-m-Y'); ?></span></td>-->
-											<td><span><?php echo $lis->ReqDate?></span></td>
-											<td><span><?php echo $lis->ReqNo?></span></td>
-											<td><span><?php echo $lis->Requestedby?></span></td>
-											<td><span><?php echo $lis->DepartmentName?></span></td>
-											<td><span><?php echo $lis->ReqType?></span></td>
-											<td align="right"><span><?php echo $lis->Aging?></span></td>
-										
-										</tr>
+										<?php if (!empty($pending_list)) {
+											foreach ($pending_list as $lis) {
+										?>
+												<tr>
+													<!-- <td><span><?php //$date = new DateTime($lis->ReqDate);echo $date->format('d-m-Y'); 
+																	?></span></td>-->
+													<td><span><?php echo $lis->ReqDate ?></span></td>
+													<td><span><?php echo $lis->ReqNo ?></span></td>
+													<td><span><?php echo $lis->Requestedby ?></span></td>
+													<td><span><?php echo $lis->DepartmentName ?></span></td>
+													<td><span><?php echo $lis->ReqType ?></span></td>
+													<td align="right"><span><?php echo $lis->Aging ?></span></td>
+
+												</tr>
 										<?php
 											}
-											
 										}
 										?>
 
-			                        </tbody>
-                                        <tfoot  width="100%">
+									</tbody>
+									<tfoot width="100%">
 
-                                        </tfoot>
+									</tfoot>
 								</table>
 							</div> <!-- end card body-->
 						</div> <!-- end card -->
@@ -237,140 +252,140 @@
 	// Bootstrap datepicker
 	// Set up your table
 	$(document).ready(function() {
-    // Initialize the DataTable with only pagination enabled
-    var table = $('#cc').DataTable({
-        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: '<i class="fas fa-angle-right"></i>', // Next button icon
-                previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
-            }
-        }
-    });
-});
+		// 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: '<i class="fas fa-angle-right"></i>', // Next button icon
+					previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+				}
+			}
+		});
+	});
 
 
-$( function() {
+	$(function() {
 		//var dateFormat = "mm/dd/yy",
-			from = $( "#min-date" )
-				.datepicker({
-					dateFormat: "dd-mm-yy", 
-					defaultDate: "+0d",
-					changeMonth: true,
-					//numberOfMonths: 1
-					
-				})
-				.on( "change", function() {
-					to.datepicker("option", "minDate", getDate( this ) );
-				}),
-			to = $( "#max-date" ).datepicker({
-				dateFormat: "dd-mm-yy", 
+		from = $("#min-date")
+			.datepicker({
+				format: "mm/dd/yyyy",
 				defaultDate: "+0d",
 				changeMonth: true,
+				orientation: "bottom"
 				//numberOfMonths: 1
-				
+
 			})
-			.on( "change", function() {
-				from.datepicker( "option", "maxDate", getDate( this ) );
+			.on("change", function() {
+				to.datepicker("option", "minDate", getDate(this));
+			}),
+			to = $("#max-date").datepicker({
+				defaultDate: "+0d",
+				changeMonth: true,
+				orientation: "bottom"
+				//numberOfMonths: 1
+
+			})
+			.on("change", function() {
+				from.datepicker("option", "maxDate", getDate(this));
 			});
 
-		function getDate( element ) {
+		function getDate(element) {
 			var date;
-			 
+
 			try {
-				date = $.datepicker.parseDate( dateFormat, element.value );
-				 
-			} catch( error ) {
+				date = $.datepicker.parseDate(dateFormat, element.value);
+
+			} catch (error) {
 				date = null;
 			}
 
 			return date;
 		}
-	} );
+	});
 
 
-//$('.input-daterange').each(function() {
- // $(this).datepicker('clearDates');
-//});
+	//$('.input-daterange').each(function() {
+	// $(this).datepicker('clearDates');
+	//});
 
 
-// Extend dataTables search
-$.fn.dataTable.ext.search.push(
-  function(settings, data, dataIndex) {
-    var min = (moment($('#min-date').val(), "DD/MM/YYYY").isValid()) ? ~~moment($('#min-date').val(), "DD/MM/YYYY").format("X") : null;
-    var max = (moment($('#max-date').val(), "DD/MM/YYYY").isValid()) ? ~~moment($('#max-date').val(), "DD/MM/YYYY").format("X") : null;
-    var ReqDate = ~~moment(data[0], "DD/MM/YYYY").format("X"); // Our date column in the table
-   //  alert(min);
-     if (min == null && max == null) {
-            return true;
-        }
-        if (min == null && ReqDate <= max) {
-            return true;
-        }
-        if (max == null && ReqDate >= min) {
-            return true;
-        }
-        if (ReqDate <= max && ReqDate >= min) {
-            return true;
-        }
-        return false;
-    }
-);
+	// Extend dataTables search
+	$.fn.dataTable.ext.search.push(
+		function(settings, data, dataIndex) {
+			var min = (moment($('#min-date').val(), "DD/MM/YYYY").isValid()) ? ~~moment($('#min-date').val(), "DD/MM/YYYY").format("X") : null;
+			var max = (moment($('#max-date').val(), "DD/MM/YYYY").isValid()) ? ~~moment($('#max-date').val(), "DD/MM/YYYY").format("X") : null;
+			var ReqDate = ~~moment(data[0], "DD/MM/YYYY").format("X"); // Our date column in the table
+			//  alert(min);
+			if (min == null && max == null) {
+				return true;
+			}
+			if (min == null && ReqDate <= max) {
+				return true;
+			}
+			if (max == null && ReqDate >= min) {
+				return true;
+			}
+			if (ReqDate <= max && ReqDate >= min) {
+				return true;
+			}
+			return false;
+		}
+	);
 
-// Re-draw the table when the a date range filter changes
-$('#min-date, #max-date').change(function() {
-  table.draw();
-});
+	// Re-draw the table when the a date range filter changes
+	$('#min-date, #max-date').change(function() {
+		table.draw();
+	});
 
-$('#my-table_filter').hide();
+	$('#my-table_filter').hide();
 
-//total order value range
-$.fn.dataTable.ext.search.push(
-    function( settings, data, dataIndex ) {
-        var min = parseInt( $('#min').val(), 10 );
-        var max = parseInt( $('#max').val(), 10 );
-        var Aging = parseFloat( data[5] ) || 0; 
- 
-        if ( ( isNaN( min ) && isNaN( max ) ) ||
-             ( isNaN( min ) && Aging <= max ) ||
-             ( min <= Aging   && isNaN( max ) ) ||
-             ( min <= Aging   && Aging <= max ) )
-        {
-            return true;
-        }
-        return false;
-    }
-);
- 
-$(document).ready(function() {
-    //var table = $('#qdetails').DataTable();
-     
-    // Event listener to the two range filtering inputs to redraw on input
-    $('#min, #max').keyup( function() {
-        table.draw();
-    } );
-} );
+	//total order value range
+	$.fn.dataTable.ext.search.push(
+		function(settings, data, dataIndex) {
+			var min = parseInt($('#min').val(), 10);
+			var max = parseInt($('#max').val(), 10);
+			var Aging = parseFloat(data[5]) || 0;
+
+			if ((isNaN(min) && isNaN(max)) ||
+				(isNaN(min) && Aging <= max) ||
+				(min <= Aging && isNaN(max)) ||
+				(min <= Aging && Aging <= max)) {
+				return true;
+			}
+			return false;
+		}
+	);
+
+	$(document).ready(function() {
+		//var table = $('#qdetails').DataTable();
+
+		// Event listener to the two range filtering inputs to redraw on input
+		$('#min, #max').keyup(function() {
+			table.draw();
+		});
+	});
 
 
-//for clear button
-function Reset()
-{
-	 $('#min').val('');
-	 $('#max').val('');
-	 $('#min-date').val('');
-	 $('#max-date').val('');
-}
-
-
-
-
-
-
-
-	</script>
+	//for clear button
+	function Reset() {
+		$('#min').val('');
+		$('#max').val('');
+		$('#min-date').val('');
+		$('#max-date').val('');
+		$('#financialyear').val('');
+	}
+</script>
\ No newline at end of file
diff --git a/app/Views/reportslink.php b/app/Views/reportslink.php
index a136b0b2..ca030c4e 100644
--- a/app/Views/reportslink.php
+++ b/app/Views/reportslink.php
@@ -34,31 +34,32 @@
                                     </div>
                                     <div class="col-md-3">
                                         <h4><span class="fa fa-layer-group">&nbsp; Material Master </span></h4>
-                                            <p class="uk-text uk-margin-remove">Material Master - supplier wise</p>
-                                            <p class="uk-text uk-margin-remove">Material Master - Item wise</p>
-                                            <p class="uk-text uk-margin-remove">Material Master - Receipt Value</p>
+                                        <a href="<?php echo base_url(); ?>Report_Material_Supplier"     target="_blank"><p class="uk-text uk-margin-remove">Material Master - supplier wise</p></a>
+                                        <a href="<?php echo base_url(); ?>Report_Material_Item"         target="_blank"><p class="uk-text uk-margin-remove">Material Master - Item wise</p></a>
+                                        <a href="<?php echo base_url(); ?>Report_Material_ReceiptValue" target="_blank"><p class="uk-text uk-margin-remove">Material Master - Receipt Value</p></a>
                                     </div>
                                     <div class="col-md-3">
                                         <h4><span class="fa fa-truck">&nbsp; Inward</span></h4>
-                                        <p class="uk-text-meta uk-margin-remove">Inward Details</p>
-                                        <p class="uk-text-meta uk-margin-remove">Inward Summary</p>
-                                        <p class="uk-text-meta uk-margin-remove">Year Wise-Inward</p>
-                                        <p class="uk-text-meta uk-margin-remove">Inward-Supplier Wise</p>
-                                        <p class="uk-text-meta uk-margin-remove">Consolidate Report-Inward</p>
-                                        <p class="uk-text-meta uk-margin-remove">Cumulative Report-Inward</p>
-                                        <p class="uk-text-meta uk-margin-remove">Cumulative Report - Category Wise-Inward</p>
-                                        <p class="uk-text-meta uk-margin-remove">Consolidate Report - Category Wise-Inward</p>
-                                        <p class="uk-text-meta uk-margin-remove">Report - DeliveryPerformance</p>
+                                        <a href="<?php echo base_url(); ?>Report_purchase_inward"      target="_blank"  >Inward Details<p class="uk-text uk-margin-remove"></p></a>
+                                        <a href="<?php echo base_url(); ?>Report_purchase_attach"      target="_blank"  >Inward Summary<p class="uk-text uk-margin-remove"></p></a>
+                                        <a href="<?php echo base_url(); ?>Report_year_wise_inward"     target="_blank"  >Year Wise-Inward<p class="uk-text-meta uk-margin-remove"></p></a>
+                                        <a href="<?php echo base_url(); ?>Report_supplier_inward"      target="_blank"  >Inward-Supplier Wise<p class="uk-text uk-margin-remove"></p></a>
+                                        <a href="<?php echo base_url(); ?>Report_consolidate_inward"   target="_blank"  >Consolidate Report-Inward<p class="uk-text-meta uk-margin-remove"></p></a>
+                                        <a href="<?php echo base_url(); ?>Report_cumulative_inward"    target="_blank"  >Cumulative Report-Inward<p class="uk-text uk-margin-remove"></p></a>
+                                        <a href="<?php echo base_url(); ?>Report_cumulative_raw"       target="_blank" >Cumulative Report - Category Wise-Inward<p class="uk-text uk-margin-remove"></p></a>
+                                        <a href="<?php echo base_url(); ?>Report_consolidate_category" target="_blank" >Consolidate Report - Category Wise-Inward<p class="uk-text-meta uk-margin-remove"></p></a>
+                                        <a href="<?php echo base_url(); ?>DeliveryPerformance"         target="_blank" > Report - DeliveryPerformance<p class="uk-text-meta uk-margin-remove"></p></a>
                                     </div>
                             </div>
                             <hr>
                             <div class="row">
                                     <div class="col-md-3">
                                         <h4><span class="fa fa-money-bill-alt">&nbsp; Finance Reports </span></h4>
-                                        <p class="uk-text uk-margin-remove">Cost Cente</p>
-                                        <p class="uk-text uk-margin-remove">Production Salary Cost</p>
+                                        <a href="<?php echo base_url(); ?>Report_costcenter" target="_blank"><p class="uk-text uk-margin-remove">Cost Center</p></a>
+                                        <!-- <p class="uk-text uk-margin-remove">Production Salary Cost</p> -->
                                     </div>
 
+
                                     <!-- 
                                     currently not used in Ria..!!
                                     <div class="col-md-3">
@@ -69,9 +70,12 @@
                                         <a href="<?php // echo base_url(); ?>cashbookmonthlyexpenses" target="_blank"  ><p class="uk-text uk-margin-remove">Cashbook Monthly Expenses</p></a>
                                             <a href="<?php //echo base_url(); ?>cashbookyearlyexpenses" target="_blank"  ><p class="uk-text uk-margin-remove">Cashbook Yearly Expenses</p></a>
                                     </div> -->
+
+
                                     <div class="col-md-3">
                                         <h4><span class="fa fa-mail-bulk ">&nbsp; GST Reports </span></h4>
-                                        <p class="uk-text uk-margin-remove" target="_blank"> Monthly GST Summary Report </p>
+                                        <a href="<?php echo base_url(); ?>Report_monthly_gst" target="_blank"><p class="uk-text uk-margin-remove">Monthly GST Summary Report</p></a>
+                      
                                     </div>
                                     <div class="col-md-3">
                                         <h4><span class="fa fa-newspaper">&nbsp; Sales Reports </span></h4>
@@ -81,14 +85,10 @@
                             </div>
                             <hr>
                             <div class="row">
-                                    <div class="col-md-3">
-                                        <h4><span class="fa fa-credit-card">&nbsp; PayRoll </span></h4>
-                                        <p class="uk-text uk-margin-remove" target="_blank">Employee Payroll</p>
-                                    </div>
+                                    
                                     <div class="col-md-3">
                                         <h4><span class="fa fa-calendar">&nbsp; Attendance </span></h4>
-                                        <p class="uk-text uk-margin-remove" target="_blank">Employee Attendance</p>
-                                        <p class="uk-text uk-margin-remove" target="_blank">Employee Performance</p>
+                                        <a href="<?php echo base_url(); ?>Empperform" target="_blank"><p class="uk-text uk-margin-remove">Employee Performance</p></a>
                                         <a href="<?php echo base_url(); ?>leavereports" target="_blank"><p class="uk-text uk-margin-remove">Leave Report</p></a>
                                     </div>
                             </div>
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..f5b2da8f 100644
--- a/app/Views/stock/dieselStockDetails.php
+++ b/app/Views/stock/dieselStockDetails.php
@@ -1,4 +1,7 @@
 <style type="text/css">
+
+
+
     .num {
         text-align: right;
     }
@@ -421,7 +424,7 @@ foreach ($period as $day) {
                                                 ------------------------------------------------------------>
 
                                     <div>
-                                        <div class="modal fade" id="customizeModalId" tabindex="-1" role="dialog" aria-labelledby="customizeModalLabel" aria-hidden="true">
+                                        <div class="modal fade  " id="customizeModalId" tabindex="-1" role="dialog" aria-labelledby="customizeModalLabel" aria-hidden="true">
                                             <div class="modal-dialog modal-md">
                                                 <div class="modal-content">
                                                     <div class="modal-header">
@@ -1890,6 +1893,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;
@@ -1981,6 +1991,29 @@ foreach ($period as $day) {
 </script>
 
 
+<script>
+    $(document).ready(function() {
+        function moveModalBackdropToFullscreen() {
+            setTimeout(() => {
+                $('.modal-backdrop').appendTo('#fullscreenDiv'); // Move backdrop inside fullscreen
+            }, 10); // Small delay ensures backdrop is created first
+        }
+
+        // Move the modal backdrop when a modal opens
+        $('#bs-example-modal-lg, #customizeModalId').on('show.bs.modal', function() {
+            moveModalBackdropToFullscreen();
+        });
+
+        // Ensure modals work properly in fullscreen mode
+        document.addEventListener("fullscreenchange", function() {
+            setTimeout(() => {
+                $('.modal-backdrop').remove(); // Remove any existing backdrops
+                moveModalBackdropToFullscreen();
+            }, 200);
+        });
+    });
+</script>
+
 
 <script>
     $(document).ready(function() {
@@ -2004,37 +2037,6 @@ foreach ($period as $day) {
     });
 </script>
 
-<script>
-    //getting modal backdrop inside full screen
-    $(document).ready(function() {
-    $('#fullscreenBtn').click(function() {
-        // Show fullscreen container
-        $('#fullscreenDiv').show();
-
-        // Request fullscreen
-        if (document.fullscreenElement == null) {
-            document.getElementById('fullscreenDiv').requestFullscreen();
-        }
-
-        // Add custom backdrop
-        $('#fullscreenDiv').prepend('<div class="custom-backdrop"></div>');
-
-        // Move modal into fullscreen div and show it manually
-        $('#fullscreenDiv').append($('#customizeModalId'));
-        $('#customizeModalId').modal('show');
-    });
-
-    // On modal close, clean up
-    $('#customizeModalId').on('hidden.bs.modal', function () {
-        $('.custom-backdrop').remove();
-        $('#fullscreenDiv').hide();
-        if (document.fullscreenElement) {
-            document.exitFullscreen();
-        }
-    });
-});
-
-</script>
 
 
 <script>
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 @@
                                                 <td class="celda_normal consumption" 
                                                 data-id="footer consumption"><?= $summary['consumption'] == 0 ? "" : $summary['consumption'] ?></td>
                                                 <td class="celda_normal balanceStock" 
-                                                data-id="footer balanceStock" ><?=  $summary['total'] - $summary['consumption'] == 0 ? "" : $summary['total'] - $summary['consumption'] ?></td>
+                                                data-id="footer balanceStock" ></td>
                                                 <td class="celda_normal tenTonGasConsumption" 
                                                 data-id="footer tenTonGasConsumption"><?= $summary['drierMachineGasConsumption'] == 0 ? "" : $summary['drierMachineGasConsumption'] ?></td>
                                                 <td class="celda_normal sandDried" 
diff --git a/app/Views/stock/powerConsumptionDetails.php b/app/Views/stock/powerConsumptionDetails.php
index 342599b1..ed5d812c 100644
--- a/app/Views/stock/powerConsumptionDetails.php
+++ b/app/Views/stock/powerConsumptionDetails.php
@@ -1765,6 +1765,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/resinStockDetails.php b/app/Views/stock/resinStockDetails.php
index 8056653e..e7ffe34c 100644
--- a/app/Views/stock/resinStockDetails.php
+++ b/app/Views/stock/resinStockDetails.php
@@ -1389,6 +1389,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/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php
index 2387b09e..0b5bbf59 100755
--- a/app/Views/viewinwardgateregister.php
+++ b/app/Views/viewinwardgateregister.php
@@ -410,7 +410,7 @@
 					<div class="col-md-3">
 						<div class="form-group">
 							<label class="col-form-label">Invoice Number <span class="text-danger">*</span></label>
-							<?php $data = array('name' => 'InvoiceNO', 'value' => set_value('InvoiceNO'), 'id' => 'Invoice_No',  'class' => 'form-control', 'required=>"true"');
+							<?php $data = array('name' => 'InvoiceNO', 'value' => set_value('InvoiceNO'), 'id' => 'Invoice_No',  'class' => 'form-control', 'required' =>true);
 							echo form_input($data);
 							?>
 						</div>
@@ -483,9 +483,9 @@
 					</div>
 					<div class="col-md-3">
 						<div class="form-group">
-							<label class="col-form-label">Remark</label>
+							<label class="col-form-label">Remark<span class="text-danger">*</span></label>
 								<?php
-										$data = array('name' => 'MasterRemarks', 'value' => set_value('MasterRemarks'), 'id' => 'MasterRemarks',  'class' => 'form-control', 'autocomplete' => 'off','rows' => 3);
+										$data = array('name' => 'MasterRemarks', 'value' => set_value('MasterRemarks'), 'id' => 'MasterRemarks',  'class' => 'form-control', 'autocomplete' => 'off','rows' => 3,'required' =>true);
 										echo form_textarea($data);
 								?>
 						</div>
@@ -510,7 +510,7 @@
 										<th style="width: 50px;">Tax (%)</th>
 										<th style="width: 50px;">Taxable Amt</th>
 										<th style="width: 50px;">Total Amt</th>
-										<th style="width: 150px;">Remarks <span class="text-danger">*</span></th>
+										<th style="width: 150px;">Remarks </th>
 										<th style="width: 25px;">Net Weight</th>
 										<th style="width: 25px; display:none" id="gasShortageHeader">Add Gas Shortage</th>
 										<th style="width: 25px; display:none" id="gasShortageListHeader">Gas Shortage list</th>
@@ -1495,6 +1495,17 @@
 		});
 	});
 	$('#draftIGR').click(function() {
+		let remarks = $('#MasterRemarks').val().trim();
+		let rcvdDate = $('#MaterialRcvdDate').val().trim();
+		let invoiceDate = $('#InvoiceDate').val().trim();
+		let invoiceNo = $('#Invoice_No').val().trim();
+
+		// any are empty
+		if (!remarks || !rcvdDate || !invoiceDate || !invoiceNo) {
+			alert("Please fill all the required fields");
+			return; // Stop 
+		}
+  		console.log("All fields filled. Proceeding...");
 		// $('#content').loader('show');
 		var igrno = $("#IGRNO1").val();
 		var pono = $("#PONO1").val();
@@ -1553,12 +1564,23 @@
 			success: function(data) {
 				
 				alert(data);
-				// location.reload();
+				location.reload();
 			}
 		});
 	});
 	$('#generateIGR').click(function() {
-		
+		let remarks = $('#MasterRemarks').val().trim();
+		let rcvdDate = $('#MaterialRcvdDate').val().trim();
+		let invoiceDate = $('#InvoiceDate').val().trim();
+		let invoiceNo = $('#Invoice_No').val().trim();
+
+		// any are empty
+		if (!remarks || !rcvdDate || !invoiceDate || !invoiceNo) {
+			alert("Please fill all the required fields");
+			return; // Stop 
+		}
+  		console.log("All fields filled. Proceeding...");
+
 		var igrno = $("#IGRNO1").val();
 		var pono = $("#PONO1").val();
 		var status = 1;
@@ -2009,9 +2031,9 @@
 			$('#PendingQuantity' + Rowid).text(PendingQty.toFixed(0));
 			$('#txtPendingQty' + Rowid).val(PendingQty.toFixed(0));
 			$('#txtQuantityAsPerInvoice' + Rowid).val(InvoiceQty.toFixed(2));
-			$('#amount' + Rowid).text(amount);
-			$('#tax_amount' + Rowid).text(tax_amount);
-			$('#grand_total_amount' + Rowid).text(grand_total_amount);
+			$('#amount' + Rowid).text(amount.toFixed(2));
+			$('#tax_amount' + Rowid).text(tax_amount.toFixed(2));
+			$('#grand_total_amount' + Rowid).text(grand_total_amount.toFixed(2));
 			return true;
 		} else {
 			if (parseInt(OrderedQty) !== 0) {
@@ -2022,18 +2044,18 @@
 				} else if ((InvoiceQty) - OrderedQty > 0.00) {
 					alert("Order is completed.");
 					$("#QuantityAsPerInvoice" + Rowid).focus().val('');
-					$('#amount' + Rowid).text(amount);
-					$('#tax_amount' + Rowid).text(tax_amount);
-					$('#grand_total_amount' + Rowid).text(grand_total_amount);
+					$('#amount' + Rowid).text(amount.toFixed(2));
+					$('#tax_amount' + Rowid).text(tax_amount.toFixed(2));
+					$('#grand_total_amount' + Rowid).text(grand_total_amount.toFixed(2));
 					return false;
 				} else {
 					var PendingQty = OrderedQty - (InvoiceQty);
 					$('#PendingQuantity' + Rowid).text(PendingQty.toFixed(0));
 					$('#txtPendingQty' + Rowid).val(PendingQty.toFixed(0));
 					$('#txtQuantityAsPerInvoice' + Rowid).val(InvoiceQty.toFixed(2));
-					$('#amount' + Rowid).text(amount);
-					$('#tax_amount' + Rowid).text(tax_amount);
-					$('#grand_total_amount' + Rowid).text(grand_total_amount);
+					$('#amount' + Rowid).text(amount.toFixed(2));
+					$('#tax_amount' + Rowid).text(tax_amount.toFixed(2));
+					$('#grand_total_amount' + Rowid).text(grand_total_amount.toFixed(2));
 					return true;
 				}
 			} else {
@@ -2041,9 +2063,9 @@
 				$('#PendingQuantity' + Rowid).text(PendingQty.toFixed(0));
 				$('#txtPendingQty' + Rowid).val(PendingQty.toFixed(0));
 				$('#txtQuantityAsPerInvoice' + Rowid).val(InvoiceQty.toFixed(2));
-				$('#amount' + Rowid).text(amount);
-				$('#tax_amount' + Rowid).text(tax_amount);
-				$('#grand_total_amount' + Rowid).text(grand_total_amount);
+				$('#amount' + Rowid).text(amount.toFixed(2));
+				$('#tax_amount' + Rowid).text(tax_amount.toFixed(2));
+				$('#grand_total_amount' + Rowid).text(grand_total_amount.toFixed(2));
 				return true;
 			}
 		}