diff --git a/app/Config/Routes.php b/app/Config/Routes.php index a6c7e695..929c4b0b 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -204,6 +204,7 @@ $routes->post('validateDateRange', 'Monthlypay::validateDateRange'); $routes->match(['GET', 'POST'], 'leaveApplicationPDF/(:any)', 'Monthlypay::leaveApplicationPDF/$1'); $routes->match(['GET', 'POST'], 'overTimeDetails', 'Monthlypay::overTimeDetails'); $routes->get('exportMonthlyPayInputs/(:any)', 'Payslip::exportMonthlyPayInputs/$1'); +$routes->get('leaveStatus/(:any)/(:any)', 'Monthlypay::leaveStatus/$1/$2'); $routes->get('emppaydate/addemppaydate', 'Emppaydate::addemppaydate'); diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 696df7f7..e42414ab 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -299,8 +299,9 @@ class Inwardgateregister extends BaseController $PO = $this->request->getPost('id'); $CreatedBy = $this->session->get('userId'); - $this->inwardgateregister_model->UpdatePOMaster($PO, $CreatedBy,IGR_CREATED); + // $this->inwardgateregister_model->UpdatePOMaster($PO, $CreatedBy,IGR_CREATED); $data = $this->inwardgateregister_model->viewpurchaseorder($PO); + // echo "
"; print_r($data);die;
 
     echo json_encode($data);
   }
diff --git a/app/Controllers/Monthlypay.php b/app/Controllers/Monthlypay.php
index 453ffa6c..9ec20dd5 100755
--- a/app/Controllers/Monthlypay.php
+++ b/app/Controllers/Monthlypay.php
@@ -1041,6 +1041,26 @@ class Monthlypay extends BaseController
 
     }
 
+    public function leaveStatus($leave_application_id, $status)
+    {
+        if (!empty($leave_application_id)) {
+            $data = [
+                'status' => $status,
+                'updated_by' => session()->get('userId')
+            ];
+
+            $affectedRows = $this->monthlypay_model->saveleaveApplicationForm($data, $leave_application_id);
+            $message = ($affectedRows > 0) 
+                ? "Leave Application updated successfully." 
+                : "No changes were made.";
+
+            return $this->response->setJSON(['status' => true, 'message' => $message]);
+        } else {
+            return $this->response->setJSON(['status' => false, 'message' => 'Invalid leave application ID.']);
+        }
+    }
+
+
     public function leaveApplicationPDF($leave_application_id){
         
       
diff --git a/app/Controllers/Payslip.php b/app/Controllers/Payslip.php
index 26810657..d493ed23 100755
--- a/app/Controllers/Payslip.php
+++ b/app/Controllers/Payslip.php
@@ -587,7 +587,23 @@ class Payslip extends BaseController
 			}
 		}
 		unset($o_item);
-		
+
+		foreach ($finalFooter as &$topLevelArray) {
+			if (is_array($topLevelArray)) {
+				foreach ($topLevelArray as &$employeeArray) {  // Changed from $finalFooter to $employeeArray
+					if (is_array($employeeArray)) {            // Check $employeeArray instead of $x
+						foreach ($keysToRemove as $key) {
+							if (array_key_exists($key, $employeeArray)) {
+								unset($employeeArray[$key]);
+							}
+						}
+					}
+				}
+				unset($employeeArray); // Break the reference
+			}
+		}
+		unset($topLevelArray); // Break the reference
+	
 		$xl[] = array_values($tds_info);
 		$xl[] = array_values($esi_or_pf_info);
 		$xl[] = array_values($location_info);
diff --git a/app/Controllers/Requisitionform.php b/app/Controllers/Requisitionform.php
index 287dee63..df083ed1 100755
--- a/app/Controllers/Requisitionform.php
+++ b/app/Controllers/Requisitionform.php
@@ -130,18 +130,7 @@ class Requisitionform extends BaseController
 		// echo 'ReqType'.$ReqPOType;
 		$data['ReqPOType'] =  $ReqPOType == '' ? $ReqType : $ReqPOType;
 		$data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo);
-		
 		$data['description'] = '';
-		foreach ($data['LineItem'] as $key => $line) {
-			$description = isset($line->MaterialDescription) ? $line->MaterialDescription : null;
-		
-			$data['LineItem'][$key]->CategoryName = $line->MaterialCode 
-				? $this->requistion_model->getCategoryName($line->MaterialCode) 
-				: "";
-		}
-
-
-
 		$data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID);
 		// $data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo, $ReqType); // Old Based on Type..
 		$data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo);
@@ -163,7 +152,7 @@ class Requisitionform extends BaseController
 		}
 
 		$this->requistion_model->DeleteRequistionLineItem($ReqNo, $MaterialCode);
-		return $this->response->setJSON("Successfully Deleted the Line item" . $ReqNo);
+		return $this->response->setJSON("Successfully Deleted the Line item " . $ReqNo);
 	}
 
 	/**
@@ -298,7 +287,9 @@ class Requisitionform extends BaseController
 			for ($j = 0; $j < count($MaterialCode); $j++) {
 				$Code = $MaterialCode[$j]['MaterialCode'];
 				$Name = $MaterialCode[$j]['MaterialName'];
-				$HTML .= "";
+				$HSN = $MaterialCode[$j]['HSNCODE'] ? $MaterialCode[$j]['HSNCODE']." - " : "";
+				// $HTML .= "";
+				$HTML .= "";
 			}
 			$MaterialName = $MaterialCode[0]['MaterialName'];
 			$UOM = $MaterialCode[0]['UOM'];
diff --git a/app/Models/Config_model.php b/app/Models/Config_model.php
index cd16446c..34fb88c8 100755
--- a/app/Models/Config_model.php
+++ b/app/Models/Config_model.php
@@ -337,6 +337,7 @@ return $result;
 
         $result = $this->db->table('t_configdetails')
         ->where('Config_ID','C023')
+        ->where('isActive',1)
         ->get()
         ->getResultArray();
 
diff --git a/app/Models/Employeedetails_model.php b/app/Models/Employeedetails_model.php
index 9e2348e0..fd8e6aa6 100755
--- a/app/Models/Employeedetails_model.php
+++ b/app/Models/Employeedetails_model.php
@@ -264,7 +264,8 @@ class Employeedetails_model extends Model
             ->join('t_employee_details as emp', 'emp.empid=tbl.empid', 'left')
             ->join('tbl_users as tbl1', ' ed.UpdatedBy = tbl1.userid', 'left')
             ->join('t_employee_details as emp1', 'emp1.empid=tbl1.empid', 'left')
-            ->join('t_emp_pay_data', 'ed.EmpID=t_emp_pay_data.EmpID', 'left');
+            ->join('t_emp_pay_data', 'ed.EmpID=t_emp_pay_data.EmpID', 'left')
+            ->groupBy('ed.EmpID');
             
         return $builder->get()->getResultArray();
 
diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php
index a7983aa8..db7dbb13 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,POL.Rate
+		$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
              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
@@ -568,7 +568,7 @@ class Inwardgateregister_model extends Model
 			->distinct()
 			->select("
 			igr.IGRNO,igr.*,igrd.*,
-			MM.MaterialName,MM.UOM,
+			MM.MaterialName,MM.UOM,MM.HSNCODE,
 			sup.Address,sup.SupplierName,
 			POL.Rate,
 			POM.ServiceDescription,POL.Quantity,POM.POType,POM.IsOpenOrder,
diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php
index 8ce9adcd..82deffbd 100755
--- a/app/Models/Purchaseorder_model.php
+++ b/app/Models/Purchaseorder_model.php
@@ -1096,7 +1096,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 	{
 
 		$subQuery = 'SELECT distinct LineItem.LineitemAuditorNotes,LineItem.LineItemNo,LineItem.ReqNo,LineItem.Per,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,LineItem.Quantity,ReceivedQuantity,Rate,LineItem.Status,(LineItem.Quantity *Rate) as BasicValue ,(After_CGST + After_SGST + After_IGST) as Taxamount,Dept.DepartmentName
-				,TotalValue,CGST,After_CGST,SGST,After_SGST,IGST,After_IGST,otherallowance,LineItem.CostCenterCode,LineItem.ServiceFrequency,LineItem.ServiceMaterialDescription,Req.Schedule_Type,Req.NumberOfService,Req.Service_Period,ReqDet.MaterialDescription
+				,TotalValue,CGST,After_CGST,SGST,After_SGST,IGST,After_IGST,otherallowance,LineItem.CostCenterCode,LineItem.ServiceFrequency,LineItem.ServiceMaterialDescription,Req.Schedule_Type,Req.NumberOfService,Req.Service_Period,ReqDet.MaterialDescription,Mat.HSNCODE
 				FROM t_purchaseorder_lineitem LineItem 
 			   left join t_materialmaster Mat on Mat.MaterialCode = LineItem.MaterialCode
 			   left join t_service_tax Tax on Tax.LineItemNo = LineItem.LineItemNo
@@ -1142,7 +1142,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 	{
 
 		$subQuery = 'SELECT distinct LineItem.LineitemAuditorNotes,LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Quantity,Per,ServiceMaterialDescription,ReceivedQuantity,Rate,Req.Status,(Quantity *Rate) as BasicValue , (( AfterSGST + AfterCGST + 
-			AfterIGST )) as  Taxamount ,TotalValue,Tax.*,Req.CostCenterCode,Dept.DepartmentName,LineItem.LineitemAuditorNotes
+			AfterIGST )) as  Taxamount ,TotalValue,Tax.*,Req.CostCenterCode,Dept.DepartmentName,LineItem.LineitemAuditorNotes,Mat.HSNCODE
                                 FROM t_purchaseorder_lineitem LineItem 
 				join t_materialmaster Mat on Mat.MaterialCode = LineItem.MaterialCode
 				left join t_revenue_tax Tax on Tax.LineItemNo = LineItem.LineItemNo
@@ -1337,7 +1337,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 					ExciseDutySHCess, AfterCustomEdCess, ROUND((Quantity * Rate), 2) AS TotalOrderValue, 
 					ROUND((POMast.ExchangeRate * BasicPriceInMTon), 2) AS BasicINRValue, TotalValue, CurrencyType, 
 					ReceivedQuantity, Tax.*, LineItem.ServiceMaterialDescription, Req.CostCenterCode, 
-					Dept.DepartmentName 
+					Dept.DepartmentName,Mat.HSNCODE
 				
 					FROM t_purchaseorder_lineitem LineItem 
 					LEFT JOIN t_purchaseorder_master POMast ON POMast.PONO = LineItem.PONO 
@@ -1743,7 +1743,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 					$subQuery = 'SELECT distinct LineItem.LineItemNo,LineItem.Per,LineItem.ServiceMaterialDescription,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
 								Mat.UOM,Quantity,ReceivedQuantity,Rate,Req.Status,Tax.*,
 								ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount,LandingCharge,HighSeasSalesCharge,CustomDuty,ExciseDuty,ExciseDutyEdCess,CustomEdCess,POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,AfterLandingCharge,AfterHighSeasSalesCharge,AfterCustomDuty,AfterExciseDuty,AfterExciseDutyEdCess,AddlExciseDuty,AfterAddlExciseDuty,Grossdutypayable,AvailableModvat,Grossexpensesduetocustomduty,purchaseratePerKG,CustomDutyExpensesPerKG,RMCIncludingCustomersPerKG,QuantityKG,BasicPriceInMTon,ProductPrice,CustomSHCess,AfterCustomSHCess,AfterExciseDutySHCess,ExciseDutySHCess,AfterCustomEdCess,ROUND((POMast.ExchangeRate*BasicPriceInMTon*Quantity),2) as BasicINRValue,Tax.TotalValue as ImportTotalValue,Tax.FreightType,Tax.NoOfTrip,Tax.FreightValue,Tax.AfterFreightValue,POMast.CurrencyType,
-								LineItem.LineitemAuditorNotes,
+								LineItem.LineitemAuditorNotes,Mat.HSNCODE,
 								Req.CostCenterCode,Dept.DepartmentName FROM t_purchaseorder_lineitem LineItem 
 								join t_purchaseorder_master POMast on POMast.PONO = LineItem.PONO
 								join t_materialmaster Mat on Mat.MaterialCode = LineItem.MaterialCode 
@@ -1802,7 +1802,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 					Mat.UOM,Quantity,ReceivedQuantity,Rate,Req.Status,ROUND((ServiceTax.After_CGST + ServiceTax.After_SGST + ServiceTax.After_IGST),2) as ServiceTaxamount
 							,ServiceTax.TotalValue,ServiceTax.CGST,ServiceTax.After_CGST,ServiceTax.SGST,ServiceTax.After_SGST,ServiceTax.IGST,ServiceTax.After_IGST,ServiceTax.otherallowance,ServiceTax.discount,ServiceTax.discountval,ServiceTax.Afterdiscountval,
 					POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,ROUND((POMast.TotalOrderValue),2) as BasicINRValue,POMast.CurrencyType,FreightType as Ftype,NoOfTrip as NoTrip,FreightValue as Fvalue,AfterFreightValue as Afvalue,
-					LineItem.LineitemAuditorNotes,
+					LineItem.LineitemAuditorNotes,Mat.HSNCODE,
 					Req.CostCenterCode,Dept.DepartmentName FROM t_purchaseorder_lineitem LineItem 
 					join t_purchaseorder_master POMast on POMast.PONO = LineItem.PONO
 					join t_materialmaster Mat on Mat.MaterialCode = LineItem.MaterialCode 
diff --git a/app/Models/Rawmaterialdetails_model.php b/app/Models/Rawmaterialdetails_model.php
index 51e60c69..8017f97e 100755
--- a/app/Models/Rawmaterialdetails_model.php
+++ b/app/Models/Rawmaterialdetails_model.php
@@ -444,7 +444,7 @@ where (CurrentStock+OpeningStock)db->table('t_materialmaster MM')
-                ->select('MM.MaterialCode,MM.MaterialName,MM.MaterialType,MM.Category,MM.IsActive,MM.UOM')
+                ->select('MM.MaterialCode,MM.MaterialName,MM.MaterialType,MM.Category,MM.IsActive,MM.UOM,MM.HSNCODE')
                 ->where('MM.Category' , $configKey);
 
         $query = $builder->get();
diff --git a/app/Models/Requistion_model.php b/app/Models/Requistion_model.php
index e4cfd50b..d2fe8011 100755
--- a/app/Models/Requistion_model.php
+++ b/app/Models/Requistion_model.php
@@ -155,7 +155,7 @@ class Requistion_model extends Model
 	
     // This function also called in store req. also $reqType not removed.....
     function EditMaterialCode($ReqNo, $ReqType = NULL){
-        $subQuery = 'SELECT Mat.MaterialCode, Mat.MaterialName, Mat.UOM FROM t_materialmaster Mat
+        $subQuery = 'SELECT Mat.MaterialCode, Mat.MaterialName, Mat.UOM,Mat.HSNCODE FROM t_materialmaster Mat
                      WHERE Mat.MaterialCode NOT IN (
                             SELECT Req.MaterialCode FROM t_requestion_details Req
                             JOIN t_requestion_master mast ON Req.ReqNo = mast.ReqNo 
@@ -175,7 +175,7 @@ class Requistion_model extends Model
 	function GetMaterialCode($ReqType,$NotArray='')
     {
         $builder = $this->db->table('t_materialmaster')
-		 ->select('MaterialCode, MaterialName,UOM,material_rate')
+		 ->select('MaterialCode, MaterialName,UOM,material_rate,HSNCODE')
          
          ->where('IsActive',1);
 		 //->where('MaterialType',$ReqType );
@@ -197,7 +197,7 @@ class Requistion_model extends Model
 	function getRawMaterialList($MaterialCode)
     {	
         $builder = $this->db->table('t_materialmaster MM')
-        ->select('MM.MaterialName,MM.UOM,MM.Category,CD.ConfigValue as CategoryName')
+        ->select('MM.MaterialName,MM.UOM,MM.Category,CD.ConfigValue as CategoryName,MM.HSNCODE')
         ->join('t_configdetails CD', 'CD.Key = MM.Category', 'left')
 		->where('MM.MaterialCode',$MaterialCode );		
         $query = $builder->get();
@@ -587,7 +587,7 @@ class Requistion_model extends Model
     function getCategoryName($materialCode){
         $subQuery ='SELECT MM.MaterialCode,MM.MaterialName,MM.MaterialType,MM.Category,MM.IsActive,CD.ConfigValue
                     from t_materialmaster as MM
-                    left join t_configdetails as CD on CD.Key = MM.Category 
+                    left join t_configdetails as CD on CD.Key = MM.Category
                     where MM.MaterialCode = '.$materialCode;
 
         $categoryName = $this->db->query($subQuery)->getRow()->ConfigValue;
diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index 401b562d..2ee52d2a 100755
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -861,7 +861,7 @@ if (!empty($getlogpodtl)) {
 		$('#EditAfterServiceTax').val('');
 		$('#EditAfterKrishiTax').val('');
 		$('#EditAfterSwachhTax').val('');
-		$('#EditTotalOrderValue ').val('');
+		$('#EditTotalOrderValue').val('');
 		$('#EditRate').val('');
 
 		$("#EditItemName").val('');
@@ -1274,6 +1274,7 @@ if (!empty($getlogpodtl)) {
 												Requisition No
 												Item Code
 												Item Description
+												HSN/SAC
 												Line Item Specs
 												Quantity
 												UOM
@@ -1309,6 +1310,7 @@ if (!empty($getlogpodtl)) {
 														MaterialCode ?>
 														MaterialName, 0, 13, "...");
 																								echo $shortName; ?>
+														HSNCODE ?>
 														
 															
 																;
+		var openOrder = ;
 		if(openOrder){
 			$('#Quantity').val(0);
 			$('#Quantity').removeAttr('required');
@@ -2583,7 +2585,7 @@ if (!empty($getlogpodtl)) {
 
 
 	$('#EditotherDescription').hide();
-	$('#otherdescription').hide()
+	$('#otherdescription').hide();
 
 
 
@@ -2597,6 +2599,14 @@ if (!empty($getlogpodtl)) {
 			var AvilBudget = $('#AvlBudAmt').val();
 			var costCode = $('#CostCenter').val();
 			var materialCode = $('#MaterialCode').val();
+			var selectedText = $('#MaterialCode option:selected').text();
+			var parts = selectedText.split('-');
+			var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim()) 
+						? parts[0].trim() 
+						: '';
+
+
+			
 			var materialName = $("#ItemName").val();
 			var uom = $("#UOM").val();
 			var addPer = '';
@@ -2666,7 +2676,8 @@ if (!empty($getlogpodtl)) {
 						${temp}
 						${Reqnumber}
 						${materialCode}
-						${shorten}`;
+						${shorten}
+						${HSN}`;
 			if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") {
 				rowHtml += `;
+			var openOrder = ;
 		    if(!openOrder){
 				if ($('#Quantity').val() == '') {
 					alert('Please Enter the Quantity value');
@@ -3356,6 +3373,7 @@ if (!empty($getlogpodtl)) {
 
 		//If others is the payment terms to display mandatory field
 		$(document).ready(function() {
+			$('#otherdescription').hide();
 			$("#PaymentTerms").change(function() {
 				var otherPayment = '';
 				if ($('#PaymentTerms').val().trim() == 'PT08') {
@@ -3417,8 +3435,8 @@ if (!empty($getlogpodtl)) {
 						if (obj.materialCode == materialCode) {
 							$("#MaterialCode").val('');
 						} else {
-							$("#MaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-
+							var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+							$("#MaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
 						}
 
 
@@ -3469,8 +3487,9 @@ if (!empty($getlogpodtl)) {
 
 							if (isAdded == "0") {
 
-
-								$("#MaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+								var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+								$("#MaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
+								// $("#MaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
 							}
 
 						}
@@ -3514,7 +3533,7 @@ if (!empty($getlogpodtl)) {
 				RateValue = $('#itemRate' + userid).val();
 				RateValue = parseFloat(RateValue).toFixed(2)
 				$('#EditRate').val(RateValue);
-				$('#txtEditBasicValue').val(cellval[8].innerHTML);
+				$('#txtEditBasicValue').val(cellval[9].innerHTML);
 				$('#EditCgst').val($('#Cgst' + userid).val());
 				$('#EditSgst').val($('#Sgst' + userid).val());
 				$('#EditIgst').val($('#Igst' + userid).val());
@@ -3544,7 +3563,7 @@ if (!empty($getlogpodtl)) {
 					$("#EditFrequencyNo").val($('#FrequencyValue' + userid).val());
 				}
 
-				$('#EditTotalOrderValue').val(cellval[10].innerHTML);
+				$('#EditTotalOrderValue').val(cellval[11].innerHTML);
 				$('#EditOtherAllowances').val($('#OtherAmt' + userid).val());
 				tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
 				RequistQuantity = $('#quantity' + userid).val();
@@ -3552,9 +3571,14 @@ if (!empty($getlogpodtl)) {
 
 
 				$("#EditMaterialCode").empty();
+				var P0 = cellval[4].innerHTML;
+                var P1 = (P0) ? P0 + "  -  " : "";
+				var P2 = P1 + $('#materialName' + userid).val() ;
+				var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
+
 				$("#EditMaterialCode").append($('')
 					.val($('#materialCode' + userid).val())
-					.html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val())
+					.html(P3)
 					.prop('selected', true)
 				);
 				// Make the select element read-only (disable it)
@@ -3589,8 +3613,9 @@ if (!empty($getlogpodtl)) {
 
 
 							if (isAdded == "0") {
-
-								$("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+								// $("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+								var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+								$("#EditMaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
 							}
 
 						}
@@ -3627,7 +3652,7 @@ if (!empty($getlogpodtl)) {
 				RateValue = $('#itemRate' + userid).val();
 				RateValue = parseFloat(RateValue).toFixed(2)
 				$('#ViewRate').val(RateValue);
-				$('#txtViewBasicValue').val(cellval[8].innerHTML);
+				$('#txtViewBasicValue').val(cellval[9].innerHTML);
 				$('#ViewCgst').val($('#Cgst' + userid).val());
 				$('#ViewSgst').val($('#Sgst' + userid).val());
 				$('#ViewIgst').val($('#Igst' + userid).val());
@@ -3654,7 +3679,7 @@ if (!empty($getlogpodtl)) {
 					$("#ViewFrequencyNo").val($('#FrequencyValue' + userid).val());
 				}
 
-				$('#ViewTotalOrderValue').val(cellval[10].innerHTML);
+				$('#ViewTotalOrderValue').val(cellval[11].innerHTML);
 				$('#ViewOtherAllowances').val($('#OtherAmt' + userid).val());
 
 				tinyMCE.get('ViewtxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
diff --git a/app/Views/accountsDashboard.php b/app/Views/accountsDashboard.php
index 534550c1..efe753ab 100644
--- a/app/Views/accountsDashboard.php
+++ b/app/Views/accountsDashboard.php
@@ -209,7 +209,7 @@
                                                 if(!empty($draft)){
 										?>
 										
-											 
+											 
 											 
 												IGRNO ?>
 											
@@ -218,7 +218,7 @@
 											
 											SupplierName ?>
 											DeliveryChellanOrInvoiceNo ?>
-											DeliveryChellanDate;
 													if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){
 														echo "";
@@ -427,6 +427,7 @@
 									SNo
 										Item Code
 										Item Description
+										HSN/SAC
 										UOM
 										Ordered Qty
 										Received Qty
@@ -804,6 +805,7 @@
 									'' + i + '' +
 									'' + item.MaterialCode + '' +
 									'' + item.MaterialName + '' +
+									'' + ((item.HSNCODE) ? item.HSNCODE : '') + '' +
 									'' + item.UOM + '' +
 									'' + parseInt(item.Quantity) + '' +
 									'' +
@@ -843,6 +845,7 @@
 										'' + i + '' +
 										'' + item.MaterialCode + '' +
 										'' + item.MaterialName + '' +
+										'' + ((item.HSNCODE) ? item.HSNCODE : '') + '' +
 										'' + item.UOM + '' +
 										'' + parseInt(item.Quantity) + '' +
 										'' +
@@ -878,6 +881,7 @@
 										'' + i + '' +
 										'' + item.MaterialCode + '' +
 										'' + item.MaterialName + '' +
+										'' + ((item.HSNCODE) ? item.HSNCODE : '') + '' +
 										'' + item.UOM + '' +
 										'' + item.Quantity + '' +
 										'' + item.QuantityAsPerInvoice + '' +
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index 03e67068..ffea7946 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -2222,8 +2222,8 @@ if (!empty($INRSYMBOL)) {
                                 $("#ServiceMaterialCode").append($('').val("0").html("Select Item Code"));
 
                                 $.each(JSON.parse(data), function (index, value) {
-                                    $("#ServiceMaterialCode").append($('').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
-
+                                    var HSNCODE = value.HSNCODE ? value.HSNCODE+" - " : "";
+								    $("#ServiceMaterialCode").append($('').val(value.MaterialCode).html( HSNCODE + value.MaterialName+ " ( "+value.MaterialCode+" ) "));
 
                                 });
                             } else if (input == 'REVENUE') {
@@ -2233,9 +2233,8 @@ if (!empty($INRSYMBOL)) {
                                 $("#MaterialCode").append($('').val("0").html("Select Item Code"));
 
                                 $.each(JSON.parse(data), function (index, value) {
-                                    $("#MaterialCode").append($('').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
-
-
+                                    var HSNCODE = value.HSNCODE ? value.HSNCODE+"-" : "";
+								    $("#MaterialCode").append($('').val(value.MaterialCode).html( HSNCODE + value.MaterialName+ " ( "+value.MaterialCode+" ) "));
                                 });
                             } else {
 
@@ -2366,7 +2365,8 @@ if (!empty($INRSYMBOL)) {
             //This function is used to add material list after delete           
             $.each(JSON.parse(materialData), function (index, value) {
                 if (value.MaterialCode == materialCode) {
-                    $("#MaterialCode").append($('').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
+                            var HSNCODE = value.HSNCODE ? value.HSNCODE+"-" : "";
+							$("#MaterialCode").append($('').val(value.MaterialCode).html( HSNCODE + value.MaterialName+ " ( "+value.MaterialCode+" ) "));
                 }
             });
 
@@ -2950,6 +2950,7 @@ if (!empty($INRSYMBOL)) {
                                                 Requisition No
                                                 Item Code
                                                 Item Description
+                                                HSN/SAC
                                                 Line Item Specs
                                                 Quantity
                                                 UOM
@@ -6080,6 +6081,12 @@ if (!empty($INRSYMBOL)) {
 
             // $('#ReqNo').val(Reqnumber).remove();
             // $('#ReqNo option[value='+Reqnumber+']').remove();
+            var selectedRText = $('#MaterialCode option:selected').text();
+            var Rparts = selectedRText.split('-');
+			var RHSN = selectedRText.includes('-') && /^\d+$/.test(Rparts[0].trim()) 
+						? Rparts[0].trim() 
+						: '';
+
             $('#MaterialCode option[value=' + materialCode + ']').remove();
 
 
@@ -6100,6 +6107,7 @@ if (!empty($INRSYMBOL)) {
                     ${Reqnumber}
                     ${materialCode}
                     ${rshorten}
+                    ${RHSN}
                     -
@@ -6748,6 +6756,12 @@ if (!empty($INRSYMBOL)) {
             var AvilBudget = $('#AvalBuget').val();
             var costCode = $('#CostCenterName').val();
             var materialCode = $('#ServiceMaterialCode').val();
+            var SselectedText = $('#ServiceMaterialCode option:selected').text();
+			var Sparts = SselectedText.split('-');
+			var SHSN = SselectedText.includes('-') && /^\d+$/.test(Sparts[0].trim()) 
+						? Sparts[0].trim() 
+						: '';
+
             var materialName = $("#ServiceDescription").val();
             var uom = $("#ServiceUOM").val();
             var addPer = '';
@@ -6804,6 +6818,7 @@ if (!empty($INRSYMBOL)) {
                     ${Reqnumber}
                     ${materialCode}
                     ${sshorten}
+                    ${SHSN}
                     -
@@ -7007,14 +7022,14 @@ if (!empty($INRSYMBOL)) {
             $('#EditEmergPer').val($('#Serviceper' + userid).val());
             $('#EditQuantity').val($('#quantity' + userid).val());
             $('#EditRate').val($('#itemRate' + userid).val());
-            $('#txtEditBasicValue').val(cellval[8].innerHTML);
+            $('#txtEditBasicValue').val(cellval[9].innerHTML);
             $('#EditAfterCgst').val($('#AfterCgst' + userid).val());
             $('#EditAfterSgst').val($('#AfterSgst' + userid).val());
             $('#EditAfterIgst').val($('#AfterIgst' + userid).val());
             $('#EditCgst').val($('#Cgst' + userid).val());
             $('#EditSgst').val($('#Sgst' + userid).val());
             $('#EditIgst').val($('#Igst' + userid).val());
-            $('#EditTotalOrderValue').val(cellval[10].innerHTML);
+            $('#EditTotalOrderValue').val(cellval[11].innerHTML);
             $('#EditOtherAllowances').val($('#OtherAmt' + userid).val());
 
             tinyMCE.get('EdittxtSpcialInstructionSingle').setContent($('#ItemServiceDescription' + userid).val());
@@ -7026,7 +7041,11 @@ if (!empty($INRSYMBOL)) {
 
             $("#EditMaterialCode").empty();
             // $('#EditMaterialCode').val("").select2();
-            $("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+            var P0 = cellval[4].innerHTML;
+            var P1 = (P0) ? P0 + "  -  " : "";
+			var P2 = P1 + $('#materialName' + userid).val() ;
+			var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
+            $("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html(P3));
 
             if (typeof materialData !== 'undefined' && materialData !== null && materialData !== '') {
                 var parsedMaterialData = JSON.parse(materialData);
@@ -7034,7 +7053,9 @@ if (!empty($INRSYMBOL)) {
                 $.each(parsedMaterialData, function (index, value) {
                     // Assuming userid is defined somewhere in your code
                     if ($('#materialCode' + userid).val() != value.MaterialCode) {
-                        $("#EditMaterialCode").append($('').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
+                        // $("#EditMaterialCode").append($('').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
+                        var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+						$("#EditMaterialCode").append($('').val(value.MaterialCode).html( HSNCODE + value.MaterialName+ " ( "+value.MaterialCode+" ) "));
                     }
                 });
             } else {
@@ -7127,17 +7148,23 @@ if (!empty($INRSYMBOL)) {
             var TotalTaxValue = calculateEditTaxValue();
 
 
+            var editselectedText = $('#EditMaterialCode option:selected').text();
+            var editparts = editselectedText.split('-');
+			var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim()) 
+						? editparts[0].trim() 
+						: '';
 
             var tr = document.getElementById(userid);
             var cellval = tr.cells;
             cellval[2].innerHTML = editMaterialCode;
             cellval[3].innerHTML = editDescription;
-            cellval[5].innerHTML = editQuantity;
-            cellval[6].innerHTML = editUOM;
-            cellval[7].innerHTML = itemRate;
-            cellval[8].innerHTML = basicval;
-            cellval[9].innerHTML = TotalTaxValue;
-            cellval[10].innerHTML = TotalOrderValue;
+            cellval[4].innerHTML = editHSN;
+            cellval[6].innerHTML = editQuantity;
+            cellval[7].innerHTML = editUOM;
+            cellval[8].innerHTML = itemRate;
+            cellval[9].innerHTML = basicval;
+            cellval[10].innerHTML = TotalTaxValue;
+            cellval[11].innerHTML = TotalOrderValue;
 
 
             $('#materialCode' + userid).val(editMaterialCode);
@@ -7674,7 +7701,7 @@ if (!empty($INRSYMBOL)) {
             $('#EditRevenueQuantity').val($('#quantity' + userid).val());
             $('#EditRevenueRate').val($('#itemRate' + userid).val());
             $('#editrevenueEmergPer').val($('#per' + userid).val());
-            $('#txtEditRevenueBasicValue').val(cellval[8].innerHTML);
+            $('#txtEditRevenueBasicValue').val(cellval[9].innerHTML);
             RequistQuantity = $('#quantity' + userid).val();
             $('#txtEditDiscount').val($('#DisVal' + userid).val());
             $('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
@@ -7708,14 +7735,18 @@ if (!empty($INRSYMBOL)) {
 
 
             $("#EditRevenueMaterialCode").empty();
-
-            $("#EditRevenueMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+            var P0 = cellval[4].innerHTML;
+            var P1 = (P0) ? P0 + "  -  " : "";
+			var P2 = P1 + $('#materialName' + userid).val() ;
+			var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
+            $("#EditRevenueMaterialCode").append($('').val($('#materialCode' + userid).val()).html(P3));
             if (typeof materialData !== 'undefined' && materialData !== null && materialData !== '') {
                 var parsedMaterialData = JSON.parse(materialData);
 
                 $.each(parsedMaterialData, function (index, value) {
                     if ($('#materialCode' + userid).val() != value.MaterialCode) {
-                        $("#EditRevenueMaterialCode").append($('').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
+                        var HSNCODE = value.HSNCODE ? value.HSNCODE+" - " : "";
+						$("#EditRevenueMaterialCode").append($('').val(value.MaterialCode).html( HSNCODE + value.MaterialName+ " ( "+obj.MaterialCode+" ) "));
                     }
                 });
             } else {
@@ -7733,6 +7764,12 @@ if (!empty($INRSYMBOL)) {
 
         var editselectedMaterialCode = '';
         editselectedMaterialCode = $("#EditRevenueMaterialCode").val();
+        var selectedRevenuText = $('#EditRevenueMaterialCode option:selected').text();
+        var editRevenuparts = selectedRevenuText.split('-');
+        var editRevenueHSN = editselectedText.includes('-') && /^\d+$/.test(editRevenuparts[0].trim()) 
+						? editRevenuparts[0].trim() 
+						: '';
+		
 
         $.each(JSON.parse(materialData), function (index, value) {
             if (editselectedMaterialCode == value.MaterialCode) {
@@ -7806,15 +7843,23 @@ if (!empty($INRSYMBOL)) {
             var userid = $("#hiddenRevenueuserid").val();
 
             var tr = document.getElementById(userid);
+
+            var editRselectedText = $('#EditRevenueMaterialCode option:selected').text();
+            var editRparts = editRselectedText.split('-');
+            var editRHSN = editRselectedText.includes('-') && /^\d+$/.test(editRparts[0].trim()) 
+                            ? editRparts[0].trim() 
+                            : '';
+		
             var cellval = tr.cells;
             cellval[2].innerHTML = editMaterialCode;
             cellval[3].innerHTML = editDescription;
-            cellval[5].innerHTML = parseFloat(editQuantity).toFixed(2);
-            cellval[6].innerHTML = editUOM;
-            cellval[7].innerHTML = parseFloat(itemRate).toFixed(2);
-            cellval[8].innerHTML = parseFloat(basicval).toFixed(2);
-            cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
-            cellval[10].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
+            cellval[4].innerHTML = editRHSN;
+            cellval[6].innerHTML = parseFloat(editQuantity).toFixed(2);
+            cellval[7].innerHTML = editUOM;
+            cellval[8].innerHTML = parseFloat(itemRate).toFixed(2);
+            cellval[9].innerHTML = parseFloat(basicval).toFixed(2);
+            cellval[10].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
+            cellval[11].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
 
 
             $('#materialCode' + userid).val(editMaterialCode);
diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php
index d9eff2ad..d9c3e40a 100755
--- a/app/Views/capitalpurchaseorder.php
+++ b/app/Views/capitalpurchaseorder.php
@@ -804,6 +804,7 @@ if (!empty($INRSYMBOL)) {
                                                 Requisition No
                                                 Item Code
                                                 Item Description
+                                                HSN/SAC
                                                 Line Item Specs
                                                 Quantity
                                                 UOM
@@ -2643,8 +2644,9 @@ if (!empty($INRSYMBOL)) {
 
 
                             if (isAdded == "0") {
-
-                                $("#MaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+                                var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+								$("#MaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
+                                // $("#MaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
                             }
 
                         }
@@ -3443,6 +3445,11 @@ if (!empty($INRSYMBOL)) {
 
 
 
+            var selectedText = $('#MaterialCode option:selected').text();
+            var parts = selectedText.split('-');
+			var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim()) 
+						? parts[0].trim() 
+						: '';
 
 
             $('#MaterialCode option[value=' + materialCode + ']').remove();
@@ -3484,6 +3491,7 @@ if (!empty($INRSYMBOL)) {
                         ${Reqnumber}
                         ${materialCode}
                         ${shorten}
+                        ${HSN}
                         
 						-
@@ -3992,8 +4000,8 @@ if (!empty($INRSYMBOL)) {
 
 
                     if (value.MaterialCode == materialCode) {
-
-                        $("#MaterialCode").append($('').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
+                        var HSNCODE = value.HSNCODE ? value.HSNCODE+"-" : "";
+                        $("#MaterialCode").append($('').val(value.MaterialCode).html( HSNCODE + value.MaterialName+ " ( "+value.MaterialCode+" ) "));
                     }
 
 
@@ -4298,7 +4306,7 @@ if (!empty($INRSYMBOL)) {
 
             console.log($('#Igst' + userid).val());
 
-            $('#EdittxtTotalOrderValue').val(cellval[10].innerHTML);
+            $('#EdittxtTotalOrderValue').val(cellval[11].innerHTML);
             $('#EditCgst').val($('#Cgst' + userid).val());
             $('#EditAfterCgst').val($('#AfterCgst' + userid).val());
             $('#EditSgst').val($('#Sgst' + userid).val());
@@ -4375,13 +4383,23 @@ if (!empty($INRSYMBOL)) {
             var Material = ;
 
             $("#EditMaterialCode").empty();
+            var P0 = cellval[4].innerHTML;
+                var P1 = (P0) ? P0 + "  -  " : "";
+				var P2 = P1 + $('#materialName' + userid).val() ;
+				var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
 
-            $("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+				$("#EditMaterialCode").append($('')
+					.val($('#materialCode' + userid).val())
+					.html(P3)
+					.prop('selected', true)
+				);
+            // $("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
             $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EditUOM + ')');
             for (i = 0; i < Material.length; i++) {
                 $.each(Material[i], function(idx, obj) {
                     if (obj.MaterialCode != $('#materialCode' + userid).val()) {
-                        $("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+                            var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+							$("#EditMaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
 
                     }
                 });
@@ -4923,6 +4941,12 @@ if (!empty($INRSYMBOL)) {
             $('#ClearingCharges' + userid).val(Clearing);
             $('#Subtotal' + userid).val(Subtotal);
 
+            var editselectedText = $('#EditMaterialCode option:selected').text();
+            var editparts = editselectedText.split('-');
+			var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim()) 
+						? editparts[0].trim() 
+						: '';
+
             if (capitalType == 'International') {
                 TotalTaxValue = 0.00;
                 Total = basicval;
@@ -4930,13 +4954,14 @@ if (!empty($INRSYMBOL)) {
 
             cellval[2].innerHTML = materialCode;
             cellval[3].innerHTML = materialName;
+            cellval[4].innerHTML = editHSN;
 
-            cellval[5].innerHTML = quantity;
-            cellval[6].innerHTML = uom;
-            cellval[7].innerHTML = itemRate;
-            cellval[8].innerHTML = basicval;
-            cellval[9].innerHTML = TotalTaxValue;
-            cellval[10].innerHTML = Total;
+            cellval[6].innerHTML = quantity;
+            cellval[7].innerHTML = uom;
+            cellval[8].innerHTML = itemRate;
+            cellval[9].innerHTML = basicval;
+            cellval[10].innerHTML = TotalTaxValue;
+            cellval[11].innerHTML = Total;
 
 
             $('#EDITCAPITAL').modal('hide');
diff --git a/app/Views/driverPayslipGeneratePrint.php b/app/Views/driverPayslipGeneratePrint.php
index 916654aa..6002e57b 100755
--- a/app/Views/driverPayslipGeneratePrint.php
+++ b/app/Views/driverPayslipGeneratePrint.php
@@ -19,65 +19,88 @@
 
 
 
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Name driver_name; ?>Employee ID EmpID ?>
Designation  Designation ?>Department DeptName ?>
Date Of Joining  DOJ))  ?>No Of Loads  no_of_loads  ?>
Bank Name BankName   ?>PAN Number  Pan;?> 
Bank Acc No  BankAccountNumber  ?> Aadhar NumberAadharNo);?>
Bank IFSC IFSCCode  ?>Loan Balance  BalanceAdvance  ?>
 Diesel  diesel_amount;   ?>
 Shed Duty Amount  shed_amount;  ?>

+    
+        
+            
+            
+            
+            
+            
+            
+            
+        
+        
+        
+            
+            
+            
+            
+            
+            
+            
+        
+        
+        
+            
+            
+            
+            
+            
+            
+            
+        
+        
+        
+            
+            
+            
+            
+            
+            
+            
+        
+        
+        
+            
+            
+            
+            
+            
+            
+            
+        
+        
+        
+            
+            
+            
+            
+            
+            
+            
+        
+        
+        
+            
+            
+            
+            
+			
+            
+            
+        
+        
+        
+            
+            
+            
+            
+			
+            
+            
+        
+    
Name:driver_name; ?>Employee ID:EmpID ?>
Designation:Designation ?>Department:DeptName ?>
Date Of Joining:DOJ)) ?>No Of Loads:no_of_loads ?>
Bank Name:BankName ?>PAN Number:Pan; ?>
Bank Acc No:BankAccountNumber ?>Aadhar Number:AadharNo); ?>
Bank IFSC:IFSCCode ?>Loan Balance:₹BalanceAdvance ?>
Diesel Amount:₹diesel_amount; ?>
Shed Duty Amount:₹shed_amount; ?>

 

 
 
@@ -85,7 +108,7 @@
 
-
+
diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php
index fb7a822a..92e28978 100755
--- a/app/Views/editCapitalAmendPO.php
+++ b/app/Views/editCapitalAmendPO.php
@@ -888,6 +888,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                                 
+                                                
@@ -913,6 +914,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                                         
+                                                        
+                          
@@ -976,6 +977,7 @@ $(document).ready(function () {
                               
+                              
-                `;
+                
+                `;
       if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") {
         rowHtml += `
+                                                
@@ -1304,6 +1305,7 @@ if (!empty($RequistionDetails)) {
                                                         
+                                                        
+												
@@ -1341,6 +1342,7 @@ if (!empty($INRSYMBOL)) {
 														
+														
+                                            
@@ -2355,8 +2367,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
 
                         if (isAdded == "0") {
-
-                            $("#MaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+                            var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+                            $("#MaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
+                            
                         }
 
                     }
@@ -3439,6 +3452,14 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
             var AvilBudget = $('#AvlBudAmt').val();
             var costCode = $('#CostCenter').val();
             var materialCode = $('#MaterialCode').val();
+            var selectedText = $('#MaterialCode option:selected').text();
+			var parts = selectedText.split('-');
+			var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim()) 
+						? parts[0].trim() 
+						: '';
+
+
+			
             var materialName = $("#ItemName").val();
             var uom = $("#UOM").val();
             var quantity = $("#Quantity").val();
@@ -3533,6 +3554,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
         
+        
+													
@@ -297,13 +298,35 @@
 
 		$(".searchabledropdown").select2();
 
-		$('#IGRLink').on('click', function() {
-			filecheck(1);
+		function debounce(func, timeout = 300) {
+			let timer;
+			return (...args) => {
+				clearTimeout(timer);
+				timer = setTimeout(() => { func.apply(this, args); }, timeout);
+			};
+		}
+
+		$('#IGRLink, #IGRDraftLink').on('click', function(e) {
+			e.preventDefault();
+			const $btn = $(this);
+			const strMsg = $btn.is('#IGRLink') 
+				? 'Generate IGR?' 
+				: 'Save as draft IGR?';
+			
+			if (confirm('Are you sure? ' + strMsg)) {
+				$btn.prop("disabled", true)
+					.html(' Processing...');
+				filecheck($btn.is('#IGRLink') ? 1 : 0);
+			}
 		});
 
-		$('#IGRDraftLink').on('click', function() {
-			filecheck(0);
-		});
+		// $('#IGRLink').on('click', function() {
+		// 	filecheck(1);
+		// });
+
+		// $('#IGRDraftLink').on('click', function() {
+		// 	filecheck(0);
+		// });
 
 		function filecheck(status) {
 			$('#hideIGRStatus').val(status);
@@ -320,9 +343,19 @@
 		// 	}
 		// }
 		function Save() {
-				$("#IGRLink, #IGRDraftLink").prop("disabled", true);
+			
+				$("#IGRLink, #IGRDraftLink")
+				.prop("disabled", true)
+				.html(' Processing...');
 				if (validate()) { $("#IGRForm").submit(); } 
-				else { $("#IGRLink, #IGRDraftLink").prop("disabled", false); }
+				else { 
+					// Re-enable buttons and restore original text
+						$("#IGRLink, #IGRDraftLink")
+						.prop("disabled", false)
+						.text(function() {
+							return $(this).attr('id') === 'IGRLink' ? 'Generate IGR' : 'Save as Draft IGR';
+						});
+    			}
 		}
 	});
 
@@ -466,6 +499,7 @@
 								'' +
 								'' +
 								'' +
+								'' +
 								'' +
 								'' +
 								'' +
@@ -898,6 +932,7 @@
 								'' +
 								'' +
 								'' +
+								'' +
 								'' +
 								'' +
 								'' +
diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php
index 72935ced..8dbe100b 100755
--- a/app/Views/purchaseorder.php
+++ b/app/Views/purchaseorder.php
@@ -406,8 +406,9 @@ if (!empty($INRSYMBOL)) {
 
 
 							if (isAdded == "0") {
-
-								$("#MaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+								var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+								$("#MaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
+								// $("#MaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
 							}
 
 						}
@@ -2191,6 +2192,7 @@ if (!empty($INRSYMBOL)) {
 												
+												
@@ -3311,7 +3313,7 @@ if (!empty($INRSYMBOL)) {
 			} else {
 				$('#EditPer').val($('#uom' + userid).val());
 			}
-			$('#txtEditBasicValue').val(cellval[8].innerHTML);
+			$('#txtEditBasicValue').val(cellval[9].innerHTML);
 			RequistQuantity = $('#quantity' + userid).val();
 			$('#txtEditDiscount').val($('#DisVal' + userid).val());
 			$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
@@ -3346,7 +3348,17 @@ if (!empty($INRSYMBOL)) {
 			$("#EditMaterialCode").empty();
 			var Material = ;
 			// For Binding Material list center for the selected Requistion Number	
-			$("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+			// $("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+			var P0 = cellval[4].innerHTML;
+                var P1 = (P0) ? P0 + "  -  " : "";
+				var P2 = P1 + $('#materialName' + userid).val() ;
+				var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
+
+				$("#EditMaterialCode").append($('')
+					.val($('#materialCode' + userid).val())
+					.html(P3)
+					.prop('selected', true)
+				);
 
 			var isAdded = "0";
 			for (i = 0; i < Material.length; i++) {
@@ -3373,7 +3385,9 @@ if (!empty($INRSYMBOL)) {
 
 						if (isAdded == "0") {
 
-							$("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+							var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+							$("#EditMaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
+							// $("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
 						}
 
 					}
@@ -3443,6 +3457,12 @@ if (!empty($INRSYMBOL)) {
 
 			// $('#ReqNo').val(Reqnumber).remove();
 			// $('#ReqNo option[value='+Reqnumber+']').remove();
+			var selectedText = $('#MaterialCode option:selected').text();
+			var parts = selectedText.split('-');
+			var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim()) 
+						? parts[0].trim() 
+						: '';
+
 
 			$('#MaterialCode option[value=' + materialCode + ']').remove();
 
@@ -3485,6 +3505,7 @@ if (!empty($INRSYMBOL)) {
 		
+		

 
EarningsAmount ₹DeductionsAmount ₹

 
 BASIC BASIC
 BASIC;   ?> 
  PF
  SNo
 												Requisition No
 												Item DescriptionHSN/SAC
                                                 Line Item Specs
                                                 Quantity
 												UOMReqNo ?>
                                                         MaterialName, 0, 13, "...");
 																							echo $shortName; ?>HSNCODE ?>
                                                         
 																').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+                                var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+							    $("#MaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
+                                // $("#MaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
                             }
 
                         }
@@ -3345,7 +3348,7 @@ Calculate Landing charge
             $('#EditOtherAllowances').val($('#otherallowance' + userid).val());
             //$('#Editservicetotalordervaue').val($('#totalservicevalue'+userid).val());
 
-            $('#Editservicetotalordervaue').val(cellval[9].innerHTML);
+            $('#Editservicetotalordervaue').val(cellval[10].innerHTML);
 
 
 
@@ -3433,12 +3436,22 @@ Calculate Landing charge
 
             $("#EditMaterialCode").empty();
 
-            $("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+                var P0 = cellval[3].innerHTML;
+                var P1 = (P0) ? P0 + " - " : "";
+				var P2 = P1 + $('#materialName' + userid).val() ;
+				var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
+
+				$("#EditMaterialCode").append($('')
+					.val($('#materialCode' + userid).val())
+					.html(P3)
+					.prop('selected', true)
+				);
 
             for (i = 0; i < Material.length; i++) {
                 $.each(Material[i], function (idx, obj) {
                     if (obj.MaterialCode != $('#materialCode' + userid).val()) {
-                        $("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+                        var HSN  = (obj.HSNCODE) ? obj.HSNCODE+" - " : "";
+                        $("#EditMaterialCode").append($('').val(obj.MaterialCode).html(HSN + obj.MaterialName + " ( "+obj.MaterialCode+" ) "));
 
                     }
                 });
@@ -4056,19 +4069,26 @@ Calculate Landing charge
             $('#DisVal' + userid).val(DisVal);
             $('#AfterDisVal' + userid).val(AfterDisVal);
             var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName;  
+            var editselectedText = $('#EditMaterialCode option:selected').text();
+			var editparts = editselectedText.split('-');
+			var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim()) 
+						? editparts[0].trim() 
+						: '';
+
             cellval[2].innerHTML = shorten;
             //alert(materialName);
-            cellval[4].innerHTML = parseFloat(quantity).toFixed(2);
+            cellval[4].innerHTML = editHSN;
+            cellval[5].innerHTML = parseFloat(quantity).toFixed(2);
             //alert(quantity);
-            cellval[5].innerHTML = uom;
+            cellval[6].innerHTML = uom;
             //alert(uom);
-            cellval[6].innerHTML = parseFloat(itemRate).toFixed(2);
+            cellval[7].innerHTML = parseFloat(itemRate).toFixed(2);
             //alert(itemRate);
-            cellval[7].innerHTML = parseFloat(basicval).toFixed(2);
+            cellval[8].innerHTML = parseFloat(basicval).toFixed(2);
             //alert(basicval);
-            cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
+            cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
             //alert(TotalTaxValue);
-            cellval[9].innerHTML = parseFloat(totalservicevalue).toFixed(2);
+            cellval[10].innerHTML = parseFloat(totalservicevalue).toFixed(2);
             //alert(basicval);
 
 
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index ba8ab4c0..f8ad6ac1 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -943,6 +943,7 @@ $(document).ready(function () {
                           Requisition No
                           Item Code
                           Item DescriptionHSN/SAC
                           Line Item Specs
                           Quantity
                           UOMMaterialCode ?>
                               MaterialName, 0, 13, "...");
                                   echo $shortName; ?>HSNCODE ?>
                               
                                 
                                   ').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+                var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+								$("#MaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
               }
 
             }
@@ -4802,6 +4804,14 @@ $(document).ready(function () {
       var costCode = $('#CostCenter').val();
 
       var materialCode = $('#MaterialCode').val();
+      var selectedText = $('#MaterialCode option:selected').text();
+      var parts = selectedText.split('-');
+			var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim()) 
+						? parts[0].trim() 
+						: '';
+
+
+
       var materialName = $("#CapitalItemName").val();
       var uom = $("#CPUOM").val();
       var addPer = '';
@@ -4942,7 +4952,8 @@ $(document).ready(function () {
                 ${temp}
                 ${Reqnumber}
                 ${materialCode}${shorten}${shorten}${HSN}').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
+            var HSNCODE = value.HSNCODE ? value.HSNCODE+"-" : "";
+            $("#MaterialCode").append($('').val(value.MaterialCode).html( HSNCODE + value.MaterialName+ " ( "+value.MaterialCode+" ) "));
           }
 
 
@@ -5835,7 +5845,7 @@ $(document).ready(function () {
       $('#EditCustomDutyExpenses').val($('#CustomDutyExpenses' + userid).val());
       //$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val());
 
-      $('#EdittxtTotalOrderValue').val(cellval[10].innerHTML);
+      $('#EdittxtTotalOrderValue').val(cellval[11].innerHTML);
 
 
 
@@ -5887,13 +5897,25 @@ $(document).ready(function () {
       var Material = ;
 
       $("#EditMaterialCode").empty();
+        var P0 = cellval[4].innerHTML;
+        var P1 = (P0) ? P0 + "  -  " : "";
+				var P2 = P1 + $('#materialName' + userid).val() ;
+				var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
 
-      $("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+				$("#EditMaterialCode").append($('')
+					.val($('#materialCode' + userid).val())
+					.html(P3)
+					.prop('selected', true)
+				);
+
+      // $("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
 
       for (i = 0; i < Material.length; i++) {
         $.each(Material[i], function(idx, obj) {
           if (obj.MaterialCode != $('#materialCode' + userid).val()) {
-            $("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+            // $("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+            var HSN  = (obj.HSNCODE) ? obj.HSNCODE+" - " : "";
+                        $("#EditMaterialCode").append($('').val(obj.MaterialCode).html(HSN + obj.MaterialName + " ( "+obj.MaterialCode+" ) "));
 
           }
         });
@@ -5942,7 +5964,7 @@ $(document).ready(function () {
       $('#ViewAfterSgst').val($('#AfterSgst' + userid).val());
       $('#ViewAfterIgst').val($('#AfterIgst' + userid).val());
       $('#ViewOtherAllowances').val($('#OtherAmt' + userid).val());
-      $('#ViewTotalAmountlocal').val(cellval[10].innerHTML);
+      $('#ViewTotalAmountlocal').val(cellval[11].innerHTML);
 
 
       $('#drpFreightviewloc').val($("#Ftype" + userid).val());
@@ -6715,19 +6737,24 @@ $(document).ready(function () {
       $('#DutyImpact' + userid).val(DutyImpact);
       $('#NetValue' + userid).val(Nett);
       $('#ClearingCharge' + userid).val(ClearingCharges);
+      var editselectedText = $('#EditMaterialCode option:selected').text();      
+			var editparts = editselectedText.split('-');
+			var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim()) 
+						? editparts[0].trim() 
+						: '';
 
 
       var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName;
 
       cellval[2].innerHTML = materialCode;
       cellval[3].innerHTML = shorten;
-
-      cellval[5].innerHTML = quantity;
-      cellval[6].innerHTML = uom;
-      cellval[7].innerHTML = parseFloat(itemRate).toFixed(2);
-      cellval[8].innerHTML = parseFloat(basicval).toFixed(2);
-      cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2); // what should i display here ?? if international means
-      cellval[10].innerHTML = parseFloat(Total).toFixed(2);
+      cellval[4].innerHTML = editHSN;
+      cellval[6].innerHTML = quantity;
+      cellval[7].innerHTML = uom;
+      cellval[8].innerHTML = parseFloat(itemRate).toFixed(2);
+      cellval[9].innerHTML = parseFloat(basicval).toFixed(2);
+      cellval[10].innerHTML = parseFloat(TotalTaxValue).toFixed(2); // what should i display here ?? if international means
+      cellval[11].innerHTML = parseFloat(Total).toFixed(2);
 
 
 
diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php
index 1500d30e..4e38583b 100755
--- a/app/Views/editImportAmendPO.php
+++ b/app/Views/editImportAmendPO.php
@@ -1279,6 +1279,7 @@ if (!empty($RequistionDetails)) {
                                                 SNo
                                                 Requisition No
                                                 Item DescriptionHSN/SAC
                                                 Line Item Specs
                                                 Quantity
                                                 UOMReqNo ?>
                                                         MaterialName, 0, 13, "...");
 																							echo $shortName; ?>HSNCODE ?>
                                                         
 																').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+                                var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+								$("#MaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
                         }
 
                     }
@@ -2678,10 +2680,19 @@ if (!empty($RequistionDetails)) {
 
 
 
-            $('#EditTotalOrderValue').val(cellval[6].innerHTML);
+            $('#EditTotalOrderValue').val(cellval[7].innerHTML);
             $("#EditMaterialCode").empty();
             var Material = ;
-            $("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+                var P0 = cellval[3].innerHTML;
+                var P1 = (P0) ? P0 + "  -  " : "";
+				var P2 = P1 + $('#materialName' + userid).val() ;
+				var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
+
+				$("#EditMaterialCode").append($('')
+					.val($('#materialCode' + userid).val())
+					.html(P3)
+					.prop('selected', true)
+				);
             var isAdded = "0";
             for (i = 0; i < Material.length; i++) {
                 $.each(Material[i], function(idx, obj) {
@@ -2724,6 +2735,13 @@ if (!empty($RequistionDetails)) {
             var CostCode = $("#EditCostCenter").val();
             var AvilBudget = $('#EditAvlBudAmt').val();
             var editMaterialCode = $("#EditMaterialCode").val();
+            
+            var editselectedText = $('#EditMaterialCode option:selected').text();
+			var editparts = editselectedText.split('-');
+			var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim()) 
+						? editparts[0].trim() 
+						: '';
+
             var edititemname = $("#EditItemName").val();
             var editUOM = $('#EditUOM').val();
             var editQuantity = $('#EditQuantity').val();
@@ -2799,11 +2817,11 @@ if (!empty($RequistionDetails)) {
             var tr = document.getElementById(userid);
             var cellval = tr.cells;
 
-
-            cellval[4].innerHTML = editQuantity;
-            cellval[5].innerHTML = editUOM;
-            cellval[6].innerHTML = itemRate;
-            cellval[7].innerHTML = BasicValue;
+            cellval[4].innerHTML = editHSN;
+            cellval[5].innerHTML = editQuantity;
+            cellval[6].innerHTML = editUOM;
+            cellval[7].innerHTML = itemRate;
+            cellval[8].innerHTML = BasicValue;
 
             $('#materialCode' + userid).val(editMaterialCode);
             $('#materialName' + userid).val(edititemname);
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php
index 5fd2ce98..91c73689 100755
--- a/app/Views/editRevenueAmendPO.php
+++ b/app/Views/editRevenueAmendPO.php
@@ -1316,6 +1316,7 @@ if (!empty($INRSYMBOL)) {
 												SNo
 												Requisition No
 												Item DescriptionHSN/SAC
 												Line Item Specs
 												Quantity
 												UOMReqNo ?>
 														MaterialName, 0, 13, "...");
 																							echo $shortName; ?>HSNCODE ?>
 														
 																';
 			userid = $(e.relatedTarget).data('userid');
+
 			$('#isEdit').val(1);
 			$('#isEdit').val(1);
-			if (tempUserId == 0) {
 				var tr = document.getElementById(userid);
 				var cellval = tr.cells;
 				var id = $('#Reqnumber' + userid).val();
@@ -2364,6 +2366,7 @@ if (!empty($INRSYMBOL)) {
 				$('#EditAvlBudAmt').val(AvlBudAmt);
 
 				$('#EditMaterialCode').val($('#materialCode' + userid).val());
+
 				$('#EditItemName').val($('#materialName' + userid).val());
 				$('#EditUOM').val($('#uom' + userid).val());
 				$('#EditQuantity').val($('#quantity' + userid).val());
@@ -2372,7 +2375,7 @@ if (!empty($INRSYMBOL)) {
 				var EdititemRate = parseFloat($('#itemRate' + userid).val()).toFixed(2);
 				$('#EditRate').val(EdititemRate);
 
-				$('#txtEditBasicValue').val(parseFloat(cellval[7].innerHTML).toFixed(2));
+				$('#txtEditBasicValue').val(parseFloat(cellval[8].innerHTML).toFixed(2));
 				RequistQuantity = $('#quantity' + userid).val();
 				$('#txtEditDiscount').val($('#DisVal' + userid).val());
 				$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
@@ -2400,7 +2403,16 @@ if (!empty($INRSYMBOL)) {
 				$("#EditMaterialCode").empty();
 				var Material = ;
 				// For Binding Material list center for the selected Requistion Number	
-				$("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+				var P0 = cellval[3].innerHTML;
+                var P1 = (P0) ? P0 + " - " : "";
+				var P2 = P1 + $('#materialName' + userid).val() ;
+				var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
+
+				$("#EditMaterialCode").append($('')
+					.val($('#materialCode' + userid).val())
+					.html(P3)
+					.prop('selected', true)
+				);
 				var isAdded = "0";
 				for (i = 0; i < Material.length; i++) {
 					$.each(Material[i], function (idx, obj) {
@@ -2416,7 +2428,8 @@ if (!empty($INRSYMBOL)) {
 								}
 							});
 							if (isAdded == "0") {
-								$("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+								var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+								$("#EditMaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
 							}
 						}
 					});
@@ -2428,7 +2441,7 @@ if (!empty($INRSYMBOL)) {
 				$("input:radio[name='optExcise'][value='" + $('#ExciseOption' + userid).val() + "']").prop('checked', 'checked');
 				$("input:radio[name='optVat'][value='" + $('#VatOption' + userid).val() + "']").prop('checked', 'checked');
 				$("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked');
-			}
+			
 
 			if (userid) {
 				tempUserId = userid;
@@ -2487,18 +2500,23 @@ if (!empty($INRSYMBOL)) {
 				var TotalOrderValue = $("#txtEditTotalOrderValue").val();
 				var Service_Description = $("#Edit_Service_Description").val();
 				var TotalTaxValue = calculateEditTaxValue();
+				var editselectedText = $('#EditMaterialCode option:selected').text();
+				var editparts = editselectedText.split('-');
+				var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim()) 
+						? editparts[0].trim() 
+						: '';
 
 				var tr = document.getElementById(userid);
 				var cellval = tr.cells;
 				var shorten = editDescription.length > 13 ? editDescription.slice(0, 13) + "..." : editDescription;  
 				cellval[2].innerHTML = shorten;
-
-				cellval[4].innerHTML = parseFloat(editQuantity).toFixed(2);
-				cellval[5].innerHTML = editUOM;
-				cellval[6].innerHTML = parseFloat(itemRate).toFixed(2);
-				cellval[7].innerHTML = parseFloat(basicval).toFixed(2);
-				cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
-				cellval[9].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
+				cellval[3].innerHTML = editHSN;
+				cellval[5].innerHTML = parseFloat(editQuantity).toFixed(2);
+				cellval[6].innerHTML = editUOM;
+				cellval[7].innerHTML = parseFloat(itemRate).toFixed(2);
+				cellval[8].innerHTML = parseFloat(basicval).toFixed(2);
+				cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
+				cellval[10].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
 
 				$('#materialCode' + userid).val(editMaterialCode);
 				$('#materialName' + userid).val(editDescription);
@@ -2865,7 +2883,7 @@ if (!empty($INRSYMBOL)) {
 
 
+
+ 
diff --git a/app/Views/importpo.php b/app/Views/importpo.php
index 56790240..4d034d64 100755
--- a/app/Views/importpo.php
+++ b/app/Views/importpo.php
@@ -322,10 +322,19 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                 $('#editTripsValue').hide();
             }
             $('#EditPer').val($('#Per' + userid).val());
-            $('#EditTotalOrderValue').val(cellval[9].innerHTML);
+            $('#EditTotalOrderValue').val(cellval[10].innerHTML);
             $("#EditMaterialCode").empty();
             var Material = ;
-            $("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+                var P0 = cellval[4].innerHTML;
+                var P1 = (P0) ? P0 + "  -  " : "";
+				var P2 = P1 + $('#materialName' + userid).val() ;
+				var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
+
+				$("#EditMaterialCode").append($('')
+					.val($('#materialCode' + userid).val())
+					.html(P3)
+					.prop('selected', true)
+				);
             var isAdded = "0";
             for (i = 0; i < Material.length; i++) {
                 $.each(Material[i], function(idx, obj) {
@@ -341,7 +350,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                             }
                         });
                         if (isAdded == "0") {
-                            $("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+                            var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+							$("#EditMaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
+                            // $("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
                         }
                     }
                 });
@@ -842,6 +853,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                             Requisition No
 											Item Code
                                             Item DescriptionHSN/SAC
                                             Line Item Specs
                                             Quantity
                                             UOM${Reqnumber}
         ${materialCode}
         ${shorten}${HSN}
         
 						-
@@ -3873,13 +3895,20 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
             if (FreightTypename != "PER TRIP") {
                 Nooftrip = '';
             }
+            
+            var editselectedText = $('#EditMaterialCode option:selected').text();
+			var editparts = editselectedText.split('-');
+			var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim()) 
+						? editparts[0].trim() 
+						: '';
 
             var tr = document.getElementById(userid);
             var cellval = tr.cells;
-            cellval[5].innerHTML = editQuantity;
-            cellval[6].innerHTML = editUOM;
-            cellval[7].innerHTML = itemRate;
-            cellval[8].innerHTML = BasicValue;
+            cellval[4].innerHTML = editHSN;
+            cellval[6].innerHTML = editQuantity;
+            cellval[7].innerHTML = editUOM;
+            cellval[8].innerHTML = itemRate;
+            cellval[9].innerHTML = BasicValue;
 
             $('#materialCode' + userid).val(editMaterialCode);
             $('#materialName' + userid).val(edititemname);
diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php
index ba94d820..9ca75e3d 100755
--- a/app/Views/inwardgateregister.php
+++ b/app/Views/inwardgateregister.php
@@ -160,6 +160,7 @@
 													#
 													Item Code
 													Item DescriptionHSN/SAC
 													Rate
 													UOM
 													Ordered Quantity' + j + '' + item.MaterialCode + '' + item.MaterialName + '' + ((item.HSNCODE) ? item.HSNCODE : '') + '' + Number(item.Rate).toFixed(2) + '' + item.UOM + '' + item.Quantity + '' + j + '' + item.MaterialCode + '' + item.MaterialName + '' + ((item.HSNCODE) ? item.HSNCODE : '') + '' + Number(item.Rate).toFixed(2) + '' + item.UOM + '' + item.Quantity + 'Requisition No
 												Item Code
                                             	Item DescriptionHSN/SAC
 												Line Item Specs
 												Quantity
 												UOM${Reqnumber}
 		${materialCode}
 		${shorten}${HSN}
 		
 						-
@@ -3602,17 +3623,23 @@ if (!empty($INRSYMBOL)) {
 			var Service_Description = $("#Edit_Service_Description").val();
 			var TotalTaxValue = calculateEditTaxValue();
 
-
+			var editselectedText = $('#EditMaterialCode option:selected').text();
+			var editparts = editselectedText.split('-');
+			var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim()) 
+						? editparts[0].trim() 
+						: '';
+			
 			var tr = document.getElementById(userid);
 			var cellval = tr.cells;
 			cellval[2].innerHTML = editMaterialCode;
 			cellval[3].innerHTML = editDescription;
-			cellval[5].innerHTML = editQuantity;
-			cellval[6].innerHTML = editUOM;
-			cellval[7].innerHTML = itemRate;
-			cellval[8].innerHTML = basicval;
-			cellval[9].innerHTML = TotalTaxValue;
-			cellval[10].innerHTML = TotalOrderValue;
+			cellval[4].innerHTML = editHSN;
+			cellval[6].innerHTML = editQuantity;
+			cellval[7].innerHTML = editUOM;
+			cellval[8].innerHTML = itemRate;
+			cellval[9].innerHTML = basicval;
+			cellval[10].innerHTML = TotalTaxValue;
+			cellval[11].innerHTML = TotalOrderValue;
 
 
 			$('#materialCode' + userid).val(editMaterialCode);
diff --git a/app/Views/rawmaterialListing.php b/app/Views/rawmaterialListing.php
index 565072ef..ae25f7b5 100755
--- a/app/Views/rawmaterialListing.php
+++ b/app/Views/rawmaterialListing.php
@@ -315,7 +315,7 @@ $(document).ready(function () {
           let result = JSON.parse(response);
           if (result.length > 0) {
                     let tableHtml = `
-                        
+                        

@@ -337,12 +337,12 @@ $(document).ready(function () {
 
                         tableHtml += `
                             
-                                
+                                
-                                
-                                
+                                
+												
@@ -205,6 +206,7 @@ if (!empty($Emp)) {
 						
+					
 					

 						

 							

@@ -215,7 +217,7 @@ if (!empty($Emp)) {
 									//print_r(  $options);
 									if (!empty($MaterialList)) {
 										foreach ($MaterialList as $MID) :
-											$options[$MID->MaterialCode] =  $MID->MaterialCode . ' ' . ' - ' . ' ' . $MID->MaterialName;
+											$options[$MID->MaterialCode] =  $MID->HSNCODE . ' ' . ' - ' . ' ' . $MID->MaterialName.' ( '.$MID->MaterialCode.' )';
 										endforeach;
 									}
 									echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode" class="form-control searchabledropdown" ');
@@ -299,9 +301,10 @@ if (!empty($Emp)) {
 						

 							

 								

+									
 									
 									 set_value('EditMaterialCode'), 'id' => 'EditMaterialCode', 'class' => 'form-control', 'readonly' => 'true');
+									$data = array('value' => set_value('EditMaterialType'), 'id' => 'EditMaterialType', 'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
 
 									?>
@@ -677,6 +680,11 @@ if (!empty($Emp)) {
 			var uom = $("#UOM").val();
 			var quantity = $("#Quantity").val();
 			var materialdescription = $('#otherD').val();
+			var selectedText = $('#MaterialCode option:selected').text();
+			var parts = selectedText.split('-');
+			var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim()) 
+						? parts[0].trim() 
+						: '';
 
 
 			$('#MaterialCode option[value=' + materialCode + ']').remove();
@@ -695,6 +703,7 @@ if (!empty($Emp)) {
 					

+					
 
 
-                                                    
+                                                    
+												
@@ -1824,7 +1833,7 @@ if (!empty($INRSYMBOL)) {
 				$('#EditQuantity').val($('#quantity' + userid).val());
 				RequistQuantity = $('#quantity' + userid).val();
 				$('#EditRate').val($('#itemRate' + userid).val());
-				$('#txtEditBasicValue').val(cellval[7].innerHTML);
+				$('#txtEditBasicValue').val(cellval[9].innerHTML);
 				$('#EditCgst').val($('#Cgst' + userid).val());
 				$('#EditAfterCgst').val($('#AfterCgst' + userid).val());
 				$('#EditSgst').val($('#Sgst' + userid).val());
@@ -1842,7 +1851,7 @@ if (!empty($INRSYMBOL)) {
 					$("#EditFrequencyNo").val($('#FrequencyValue' + userid).val());
 				}
 
-				$('#EditTotalOrderValue').val(cellval[9].innerHTML);
+				$('#EditTotalOrderValue').val(cellval[11].innerHTML);
 				$('#EditOtherAllowances').val($('#OtherAmt' + userid).val());
 
 				$('#EditOtheritemDescription').val($('#OtherServiceDescription' + userid).val());
@@ -1863,7 +1872,12 @@ if (!empty($INRSYMBOL)) {
 				$("#EditMaterialCode").empty();
 				var Material = ;
 				// For Binding Material list center for the selected Requistion Number	
-				$("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+				var P0 = cellval[4].innerHTML;
+                var P1 = (P0) ? P0 + "  -  " : "";
+				var P2 = P1 + $('#materialName' + userid).val() ;
+				var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
+				
+				$("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html(P3));
 				var isAdded = "0";
 				for (i = 0; i < Material.length; i++) {
 					$.each(Material[i], function(idx, obj) {
@@ -1891,8 +1905,8 @@ if (!empty($INRSYMBOL)) {
 
 
 							if (isAdded == "0") {
-
-								$("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+								var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+								$("#EditMaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
 							}
 
 						}
@@ -1919,6 +1933,11 @@ if (!empty($INRSYMBOL)) {
 			var AvilBudget = $('#AvlBudAmt').val();
 			var costCode = $('#CostCenter').val();
 			var materialCode = $('#MaterialCode').val();
+			var selectedText = $('#MaterialCode option:selected').text();
+			var parts = selectedText.split('-');
+			var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim()) 
+						? parts[0].trim() 
+						: '';
 
 			var materialName = $("#ItemName").val();
 			var uom = $("#UOM").val();
@@ -1991,6 +2010,7 @@ if (!empty($INRSYMBOL)) {
 					
+					
-											 
+											
-											
+										
@@ -1253,6 +1254,7 @@
 									'' +
 									'' +
 									'' +
+									'' +
 									'' +
 									'' +
 									'' +
@@ -1307,6 +1309,7 @@
 										'' +
 										'' +
 										'' +
+										'' +
 										'' +
 										'';
 										if (userRole == 5) { // 5 - lab staff
@@ -1367,6 +1370,7 @@
 										'' +
 										'' +
 										'' +
+										'' +
 										'' +
 										'' ;
 										if (userRole == 5) { // 5 - lab staff


                             
                                 

                                      Date
${CreatedDate}${CreatedDate}
                                 ${item.SupplierName}
+                                
                                     ${item.PONO}
                                 ${item.POType}${item.POType}
                                 ${TotalOrderValue}
                                 
                                   
diff --git a/app/Views/requisitionform.php b/app/Views/requisitionform.php
index 50e95219..b14c6f0c 100755
--- a/app/Views/requisitionform.php
+++ b/app/Views/requisitionform.php
@@ -155,6 +155,7 @@ if (!empty($Emp)) {
 												Material Code
 												Material Name
 												Material CategoryHSN/SAC
 												Uom
 												Quantity
 												Action
 					${materialCode}
 					${materialName}
 					${categoryName}${HSN}
 					${uom}
 					${quantity}
 					
@@ -760,11 +769,14 @@ if (!empty($Emp)) {
 			var userid = $triggerElement.data('userid');
 			var $tr = $('#' + userid);
 			var $cells = $tr.find('td');
+			var HSN = $cells.eq(4).text()?$cells.eq(4).text()+'-':'';
+			var MaterialType = HSN+$cells.eq(2).text()+' ( '+$cells.eq(1).text()+ ' ) ';
 			$('#EditMaterialCode').val($cells.eq(1).text());
+			$('#EditMaterialType').val(MaterialType);
 			$('#EditDescription').val($cells.eq(2).text());
 			$('#EditCategory').val($cells.eq(3).text());
-			$('#EditUOM').val($cells.eq(4).text());
-			$('#EditQuantity').val($cells.eq(5).text());
+			$('#EditUOM').val($cells.eq(5).text());
+			$('#EditQuantity').val($cells.eq(6).text());
 			$('#Edituserid').val(userid);
 		});
 	});
@@ -783,6 +795,13 @@ if (!empty($Emp)) {
 			var editMaterialCode = $("#EditMaterialCode").val();
 			var editDescription = $("#EditDescription").val();
 			var editCategory = $("#EditCategory").val();
+			
+			var editMaterialType = $('#EditMaterialType').val();
+			var editparts = editMaterialType.split('-');
+			var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim()) 
+						? editparts[0].trim() 
+						: '';
+
 			var editUOM = $('#EditUOM').val();
 			var editQuantity = $('#EditQuantity').val();
 
@@ -791,8 +810,9 @@ if (!empty($Emp)) {
 			cells.eq(1).text(editMaterialCode);
 			cells.eq(2).text(editDescription);
 			cells.eq(3).text(editCategory);
-			cells.eq(4).text(editUOM);
-			cells.eq(5).text(editQuantity);
+			cells.eq(4).text(editHSN);
+			cells.eq(5).text(editUOM);
+			cells.eq(6).text(editQuantity);
 
 			$('#MaterialCode' + edituserid).val(editMaterialCode);
 			$('#Description' + edituserid).val(editDescription);
diff --git a/app/Views/requisitionlisting.php b/app/Views/requisitionlisting.php
index 8cc36bac..aa7686a2 100755
--- a/app/Views/requisitionlisting.php
+++ b/app/Views/requisitionlisting.php
@@ -170,7 +170,7 @@ if (!empty($Status)) {
                                                      newLineItem ?>StatusName); ?>StatusName); ?>
 
                                                      ').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+								var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
+								$("#MaterialCode").append($('').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
 							}
 
 						}
@@ -686,6 +686,13 @@ if (!empty($INRSYMBOL)) {
 				var CostCode = $("#EditCostCenter").val();
 				var AvilBudget = $('#EditAvlBudAmt').val();
 				var editMaterialCode = $("#EditMaterialCode").val();
+				var selectedText = $('#EditMaterialCode option:selected').text();
+				var editselectedText = $('#EditMaterialCode option:selected').text();
+				var editparts = editselectedText.split('-');
+				var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim()) 
+						? editparts[0].trim() 
+						: '';
+
 				var editDescription = $("#EditItemName").val();
 				var editUOM = $('#EditUOM').val();
 				var editPer = '';
@@ -725,12 +732,13 @@ if (!empty($INRSYMBOL)) {
 
 				cellval[2].innerHTML = editMaterialCode;
 				cellval[3].innerHTML = editDescription;
-				cellval[5].innerHTML = editQuantity;
-				cellval[6].innerHTML = editUOM;
-				cellval[7].innerHTML = parseFloat(itemRate).toFixed(2);
-				cellval[8].innerHTML = parseFloat(basicval).toFixed(2);
-				cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
-				cellval[10].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
+				cellval[4].innerHTML = editHSN;
+				cellval[6].innerHTML = editQuantity;
+				cellval[7].innerHTML = editUOM;
+				cellval[8].innerHTML = parseFloat(itemRate).toFixed(2);
+				cellval[9].innerHTML = parseFloat(basicval).toFixed(2);
+				cellval[10].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
+				cellval[11].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
 
 
 				$('#materialCode' + userid).val(editMaterialCode);
@@ -1069,6 +1077,7 @@ if (!empty($INRSYMBOL)) {
 												Requisition No
 												Item Code
                                             	Item DescriptionHSN/SAC
 												Line Item Specs
 												Quantity
 												UOM${Reqnumber}
 					${materialCode}
 					${shorten}${HSN}
 					
                             -
diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php
index f1e04c44..34f49cb0 100755
--- a/app/Views/viewinwardgateregister.php
+++ b/app/Views/viewinwardgateregister.php
@@ -248,7 +248,7 @@
 												$time = $createddate->format('h:i A');
 										?>
 										
 
 											 
 											
 
@@ -267,7 +267,7 @@
 											
 											SupplierName ?>
 											DeliveryChellanOrInvoiceNo ?>DeliveryChellanDate;
 											        if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){
 														echo "";
@@ -497,6 +497,7 @@
 										SNo
 										Item Code
 										Item DescriptionHSN/SAC
 										UOM
 										Ordered Qty
 										Received Qty' + i + '' + item.MaterialCode + '' + item.MaterialName + '' + ((item.HSNCODE) ? item.HSNCODE : '') + '' + item.UOM + '' + parseInt(item.Quantity) + '' + i + '' + item.MaterialCode + '' + item.MaterialName + '' + ((item.HSNCODE) ? item.HSNCODE : '') + '' + item.UOM + '' + parseInt(item.Quantity) + '' + i + '' + item.MaterialCode + '' + item.MaterialName + '' + ((item.HSNCODE) ?item.HSNCODE : '') + '' + item.UOM + '' + item.Quantity + '