diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 30f04bf9..124541b9 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -16,6 +16,7 @@ $routes->add('loginMe', 'Login::loginMe');
 $routes->get('logout', 'User::logout');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'loadChangePass', 'User::loadChangePass');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'changePassword', 'User::changePassword');
+$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'userChangePassword', 'User::userChangePassword');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'pageNotFound', 'User::pageNotFound');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'checkEmailExists', 'User::checkEmailExists');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'forgotPassword', 'Login::forgotPassword');
diff --git a/app/Controllers/Configurationctrl.php b/app/Controllers/Configurationctrl.php
index a67b2275..51a7b3eb 100644
--- a/app/Controllers/Configurationctrl.php
+++ b/app/Controllers/Configurationctrl.php
@@ -61,6 +61,8 @@ class Configurationctrl extends BaseController
 
 	function saveconfig()
 	{
+		// echo "<pre>";
+		// dd($this->request->getPost());
 		$ConfigName = $this->request->getPost('configurationname');
 		$Rowcount =  $this->request->getPost('txtRowCount');
 		$Comments = $this->request->getPost('Comments');
@@ -90,14 +92,15 @@ class Configurationctrl extends BaseController
 		$data['child'] = $this->configmodel->GetConfigCenterDetails($ConfigID);
 		
 		$this->global['pageTitle'] = 'Edit Config';
-		
+		// echo "<pre>";
+		// print_r($data);die;
 		$this->loadViews("editconfig", $this->global, $data, NULL);
 	
 	}
 
 	function updateconfig()
 	{
-		
+		// dd($this->request->getPost());
 		$ConfigId = $this->request->getPost('ConfigId');
 		$ConfigName = $this->request->getPost('ConfigName');
 		$Comments = $this->request->getPost('Remarks');
diff --git a/app/Controllers/Expense.php b/app/Controllers/Expense.php
index 64c0d7ab..ce09ab38 100644
--- a/app/Controllers/Expense.php
+++ b/app/Controllers/Expense.php
@@ -46,11 +46,12 @@ class Expense extends BaseController
             'transporter_file' => $fileName,
             'supplier_id' => $this->request->getPost('supplierid'),
             'remarks' => $this->request->getPost('remarks'),
+            'item_description' => $this->request->getPost('item_description'),
             'cost' => $this->request->getPost('cost'),
-            'gst' => $this->request->getPost('gst'),
-            'total' => (int)$this->request->getPost('gst') + (int)$this->request->getPost('cost'),
-            'status' => $status,
-            'payment_method' => $paymentMethod
+            'cgst' => $this->request->getPost('cgst'),
+            'sgst' => $this->request->getPost('sgst'),
+            'igst' => $this->request->getPost('igst'),
+            'total' => $this->request->getPost('total'),
         ];
 
         $insert_id = $this->expense_model->insertExpense($data);
@@ -92,16 +93,16 @@ class Expense extends BaseController
         $data = [
             'supplier_id' => $this->request->getPost('supplierid'),
             'remarks' => $this->request->getPost('remarks'),
+            'item_description' => $this->request->getPost('item_description'),
             'cost' => $this->request->getPost('cost'),
-            'gst' => $this->request->getPost('gst'),
-            'total' => (int)$this->request->getPost('gst') + (int)$this->request->getPost('cost'),
-            'status' => $status,
-            'payment_method' => $paymentMethod
+            'cgst' => $this->request->getPost('cgst'),
+            'sgst' => $this->request->getPost('sgst'),
+            'igst' => $this->request->getPost('igst'),
+            'total' => $this->request->getPost('total'),
         ];
         if(!empty($fileName)){
             $data['transporter_file'] = $fileName;
         }
-            $data['payment_method'] = $this->request->getPost('payment_method');
        
 
         if ($id) {
diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php
index d25e7e54..83c8101b 100644
--- a/app/Controllers/Purchaseorder.php
+++ b/app/Controllers/Purchaseorder.php
@@ -291,7 +291,7 @@ class Purchaseorder extends BaseController
   {
     $PONO =  $this->request->getVar('PONO');
 
-  
+
     $ReqType =  $this->request->getVar('ReqType');
 
     if ($ReqType == SERVICE) {
@@ -325,7 +325,7 @@ class Purchaseorder extends BaseController
       $data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetailsForPDF($PONO);
     } else if ($ReqType == CAPITAL) {
       $data['POItem'] = $this->purchaseorder_model->GetCapitalPurchaseOrderDetailsForPDF($PONO);
-    }    
+    }
     // print_r($data['POItem']);die;
     $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
     $data['CurrencySymbol'] = $this->purchaseorder_model->GerCurrencyCodeName('INR');
@@ -345,37 +345,39 @@ class Purchaseorder extends BaseController
 
     $data['TotalAmountInWords'] = $this->convertNumber($totalAmt);
     $data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO);
-// echo '<pre>';
-// print_r($data);
-// echo '</pre>';
-// die;
-    $mpdf = new \Mpdf\Mpdf(['mode' => 'utf-8',
-    'format' => 'A4',  
-    'default_font' => 'sans-serif',
-    'margin_header' => 0,
-    'margin_top' => -30,
-    'margin_right' => 14,
-    'margin_left' => 5,
-    'margin_footer' => -30,
-    'orientation' => 'P']);
+    // echo '<pre>';
+    // print_r($data);
+    // echo '</pre>';
+    // die;
+    $mpdf = new \Mpdf\Mpdf([
+      'mode' => 'utf-8',
+      'format' => 'A4',
+      'default_font' => 'sans-serif',
+      'margin_header' => 0,
+      'margin_top' => -30,
+      'margin_right' => 14,
+      'margin_left' => 5,
+      'margin_footer' => -30,
+      'orientation' => 'P'
+    ]);
     // Set PDF properties 
     $mpdf->SetTitle('Invoice');
     $mpdf->SetAuthor($data['CompanyDetails'][0]->CompanyName);
     $mpdf->SetCreator('Venba');
 
-   
+
     // Generate the PDF content (HTML)
     // if ($PoStatus == PO_RELEASED || $PoStatus == PO_SERVICE_COMPLETED || $PoStatus == MRIR_APPROVED || $PoStatus == MRIR_REJECTED || $PoStatus == IGR_CREATED || $PoStatus == '' || $PoStatus == SPECIAL_PO) {
     //   $mpdf->SetWatermarkText('');
     // } else {
     //   $mpdf->SetWatermarkText('DRAFT');
     // }
-    
-    
+
+
     // Set auto margins
     $mpdf->setAutoTopMargin = 'stretch';
     $mpdf->setAutoBottomMargin = 'stretch';
-$mpdf->use_kwt = true;
+    $mpdf->use_kwt = true;
     // Set HTML header
     // $HtmlHeading = view('includes/pdfheader', $data);
     // $mpdf->SetHTMLHeader($HtmlHeading);
@@ -394,7 +396,7 @@ $mpdf->use_kwt = true;
     // Output PDF
     $mpdf->Output('POReport' . $PONO . '.pdf', 'D');
   }
-  public function poprint2($PONO,$ReqType)
+  public function poprint2($PONO, $ReqType)
   {
 
     // Load all views as normal
@@ -405,21 +407,21 @@ $mpdf->use_kwt = true;
     $Depcode = '';
     $Currencycode = '';
     $PoStatus = '';
-    $PaiseVal = '';   
+    $PaiseVal = '';
     $SymbolCurrency = '';
     $SymbolCurrencyName = '';
     $TotalOrderValue = 0.00;
-    $AdvanceAmount = 0.00; 
+    $AdvanceAmount = 0.00;
     $ProductPrice = '';
     $TotaltoPay = 0.00;
 
 
     $data['AmendmentPDF'] = $this->purchaseorder_model->amendpdf($PONO);
-   
+
     $data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO);
 
     $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformationforPDF();
-   
+
     $data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO);
 
     $data['DEPCODE'] = $this->purchaseorder_model->GerRequesterDep($Depcode);
@@ -429,19 +431,19 @@ $mpdf->use_kwt = true;
     $data['CurrencySymbol'] = $this->purchaseorder_model->GerCurrencyCodeName($Currencycode);
     $data['Requestername'] = $this->purchaseorder_model->GerRequesterName($Requester);
 
-   
 
-   
-// print_r($data['POItem']);die;
+
+
+    // print_r($data['POItem']);die;
     $CapitalRange = 1;
-    
-   
+
+
     if (!empty($data['CurrencySymbol']) > 0) {
       $SymbolCurrency = $data['CurrencySymbol'][0]->FontCode2000;
       $SymbolCurrencyName = $data['CurrencySymbol'][0]->Currency;
       $PaiseVal = $data['CurrencySymbol'][0]->PaiseVal;
     }
-    
+
     if (!empty($data['POItem'])) {
       foreach ($data['POItem'] as $POI) {
         $Currencycode = $POI->CurrencyType;
@@ -450,8 +452,6 @@ $mpdf->use_kwt = true;
         $TotalOrderValue = $POI->TotalOrderValue;
         $PoStatus = $POI->Status;
         $Requester = isset($POI->Requestedby) ? $POI->Requestedby : "";
-  
-  
       }
     }
 
@@ -463,34 +463,36 @@ $mpdf->use_kwt = true;
       $Depcode = $ReqDep->Departmentcode;
     }
 
-   
 
 
 
 
-    $mpdf = new \Mpdf\Mpdf(['mode' => 'utf-8',
-    'format' => 'A4',  
-    'default_font' => 'sans-serif',
-    'margin_header' => 0,
-    'margin_top' => -30,
-    'margin_right' => 14,
-    'margin_left' => 5,
-    'margin_footer' => -30,
-    'orientation' => 'P']);
+
+    $mpdf = new \Mpdf\Mpdf([
+      'mode' => 'utf-8',
+      'format' => 'A4',
+      'default_font' => 'sans-serif',
+      'margin_header' => 0,
+      'margin_top' => -30,
+      'margin_right' => 14,
+      'margin_left' => 5,
+      'margin_footer' => -30,
+      'orientation' => 'P'
+    ]);
     // Set PDF properties 
     $mpdf->SetTitle('Invoice');
     $mpdf->SetAuthor($data['CompanyDetails'][0]->CompanyName);
     $mpdf->SetCreator('Venba');
 
-   
+
     // Generate the PDF content (HTML)
     // if ($PoStatus == PO_RELEASED || $PoStatus == PO_SERVICE_COMPLETED || $PoStatus == MRIR_APPROVED || $PoStatus == MRIR_REJECTED || $PoStatus == IGR_CREATED || $PoStatus == '' || $PoStatus == SPECIAL_PO) {
     //   $mpdf->SetWatermarkText('');
     // } else {
     //   $mpdf->SetWatermarkText('DRAFT');
     // }
-    
-    
+
+
     // Set auto margins
     $mpdf->setAutoTopMargin = 'stretch';
     $mpdf->setAutoBottomMargin = 'stretch';
@@ -511,7 +513,7 @@ $mpdf->use_kwt = true;
     // $mpdf->setFooter('' . "Page {PAGENO} of {nb}");
 
     // Output PDF
-    $mpdf->Output($ReqType.'_' . $PONO . '.pdf', 'D');
+    $mpdf->Output($ReqType . '_' . $PONO . '.pdf', 'D');
   }
 
 
@@ -538,12 +540,12 @@ $mpdf->use_kwt = true;
 
   function EditPurchaseOrder()
   {
-    
+
     $PONO =  $this->request->getVar('PONO');
     $ReqType =  $this->request->getVar('ReqType');
 
     $Req = $this->purchaseorder_model->getRequistionNoFromPO($PONO);
-  
+
     $data['ReqList'] = $Req;
 
     $result = array();
@@ -620,14 +622,14 @@ $mpdf->use_kwt = true;
     if ($ReqType == SERVICE) {
 
       $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO);
-// print_r($data['POItem']);die;
+      // print_r($data['POItem']);die;
       $data['getdata'] = $this->purchaseorder_model->getfunction($PONO);
       //$data['billfile'] = $this->purchaseorder_model->getbillfiesr($pono);
 
       //s print_r($data['getdata']);
       $data['getlogpodtl'] = $this->purchaseorder_model->getlogpodtl($PONO);
 
-      
+
       $data['PaymentTerms'] = $this->purchaseorder_model->GetPaymentTerms($PONO);
       //$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019');
 
@@ -1062,151 +1064,151 @@ $mpdf->use_kwt = true;
   //This used to Create Revenue Purchase Order
   function addNewPurchaseOrder()
   {
-      try {
-          // Extract POST data
-          $POdt = $this->request->getPost('PODate');
-          $PODate = get_date_time_format($POdt);
-          $SupplierID = $this->request->getPost('drpSupplier');
-          $DeliveryAddr = $this->request->getPost('DeliveryAddr');
-          $dt = $this->request->getPost('Deliverydt');
-          $POType = $this->request->getPost('POType');
-          $DeliveryOption = $this->request->getPost('DateRange');
-          if ($DeliveryOption == 1) {
-              $Deliverydt = '';
-              $DeliverySchedule = $this->request->getPost('Scheduleby');
-          } else {
-              $Deliverydt = get_date_time_format($dt);
-              $DeliverySchedule = '';
-          }
-          $BudgetType = $this->request->getPost('Budget');
-          $Modeofshipment = $this->request->getPost('addmodeofshipment');
-          $supplierreference = $this->request->getPost('addsupplierreference');
-          $supplieroffno = $this->request->getPost('addsupplierofferno');
-          $otherreference = $this->request->getPost('addotherreference');
-          $fincap = "";//$this->request->getPost('addfincap');
-          $revenuetype = $this->request->getPost('PoTypeOptions');
-          $insurancestatus = $this->request->getPost('insurance');
-          $InsuranceNumber = ($insurancestatus == 1) ? $this->request->getPost('InsuranceNumber') : '';
-          $SpcialInstruction = $this->request->getPost('SpcialInstruction');
-          $TotalOrderValueSummary = $this->request->getPost('txtTotalOrderValueSummary');
-          $POStatus = $this->request->getPost('txtStatus');
-          $CreateBy = $this->session->get('userId');
-          $RowCount = $this->request->getPost('txtRowCount');
-          $DeletedRow = $this->request->getPost('txtDeletedRow');
-          $comma_separated = ($DeletedRow !== null && is_string($DeletedRow)) ? explode(':', $DeletedRow) : [];
-          $createddt = get_current_date_time();
-          $PaymentTerms = $this->request->getPost('PaymentTerms');
-          $OtherPayment = $this->request->getPost('Otherpayment');
-          $Local_Interstate = $this->request->getPost('Range');
-          $Qualitycheck = 1;
-          $IsOpenOrder = ($this->request->getPost('IsOpenOrder') !== null && !empty($this->request->getPost('IsOpenOrder')) && $this->request->getPost('IsOpenOrder') === '1') ? $this->request->getPost('IsOpenOrder') : null;
-         
-    
-          $file = $this->request->getFile('POFile');
-          $requestfilename = NULL;    
-          if (!empty($file)) {
-              if ($file->isValid() && !$file->hasMoved()) {
-                $requestfilename = $file->getName();    
-                $path = ROOTPATH.'public/uploads/POfiles/';
-                if(!is_dir($path)) { mkdir($path, 0777, true); }
-                if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
-                  log_message('error', 'File already exists in the database'.$requestfilename);
-                  $requestfilename = "";
-                }
-                else{
-                  $file->move($path, $requestfilename);    
-                }
-              }else{
-                $requestfilename = "";
-              }
-              
-            }
-  
-          // Generate PO Number
-          $lastPONO = $this->purchaseorder_model->lastPONO();
-          $newPONO = generate_po_number($lastPONO); 
-          log_message('debug', 'newPONO returned: ' . $newPONO);
-          // PO Master
-          $POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'Status' => $POStatus, 'PORange' => $Local_Interstate, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'POType' => $POType, 'CapitalRange' => $Local_Interstate, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $supplierreference, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'POSubType' => $revenuetype, 'InsuranceNumber' => $InsuranceNumber, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder,'POFile'=>$requestfilename);
-          $POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $revenuetype);
-          $PONO = '';
-          if (count($POMaster) > 0) {
-              $PONO = $POMaster[0]['PONO'];
-          } else {
-              throw new \Exception('Error occurred while creating PO Master');
-          }
-          log_message('error', 'CTRL PONO : ' . $PONO);
-
-          // PO Line Items
-          $LineItemStatus = REQITEM_NEW;
-  
-          for ($i = 1; $i <= $RowCount; $i++) {
-              $MaterialCode = $this->request->getPost('materialCode' . $i);
-              $Quantity = $this->request->getPost('quantity' . $i);
-              $Reqnumber = $this->request->getPost('Reqnumber' . $i);
-              $itemRate = $this->request->getPost('itemRate' . $i);
-              $per = $this->request->getPost('per' . $i);
-  
-              $DiscountType = $this->request->getPost('DisType' . $i);
-              $DiscountValue = $this->request->getPost('DisVal' . $i);
-              $AfterDiscount = $this->request->getPost('AfterDisVal' . $i);
-              $PackagingOption = $this->request->getPost('PackOption' . $i);
-              $PackagingType = $this->request->getPost('PackType' . $i);
-              $PackagingValue = $this->request->getPost('PackVal' . $i);
-              $AfterPackagingValue = $this->request->getPost('AfterPackVal' . $i);
-  
-              $FreightType = $this->request->getPost('FreightType' . $i);
-              $FreightValue = $this->request->getPost('FreightVal' . $i);
-              $AfterFreightValue = $this->request->getPost('AfterFreightVal' . $i);
-              $NOOfTrip = $this->request->getPost('NoOfTrip' . $i);
-              $InsuranceValue = $this->request->getPost('Insval' . $i);
-              $TotalOrderValue = $this->request->getPost('TotalOrderValue' . $i);
-              $revenuedescription = $this->request->getPost('Service_Description' . $i);
-              $CostCenter = $this->request->getPost('costCode' . $i);
-              $Cgst = $this->request->getPost('RevenueCgst' . $i);
-              $Sgst = $this->request->getPost('RevenueSgst' . $i);
-              $Igst = $this->request->getPost('RevenueIgst' . $i);
-              $AfterCgst = $this->request->getPost('RevenueAfterCgst' . $i);
-              $AfterSgst = $this->request->getPost('RevenueAfterSgst' . $i);
-              $AfterIgst = $this->request->getPost('RevenueAfterIgst' . $i);
-  
-              $SkipInsert = "False";
-              if (count($comma_separated) > 0) {
-                  for ($j = 1; $j < count($comma_separated); $j++) {
-                      $deletedRow = $comma_separated[$j];
-                      if ($deletedRow == $i) {
-                          $SkipInsert = "True";
-                          break;
-                      }
-                  }
-              }
-              if ($SkipInsert == "False") {
-                  
-                  $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Per' => $per, 'ServiceMaterialDescription' => $revenuedescription, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter);
-                  $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
-                  $LineItemNo = '';
-                  if (count($POLineItem) > 0) {
-                      $LineItemNo = $POLineItem[0]['LineItemNo'];
-                  } else {
-                      throw new \Exception('Error occurred while creating PO Line Item');
-                  }
-  
-                  if (trim((string)$POType) == REVENUE) {
-                      $RevenueTaxList = array('LineItemNo' => $LineItemNo, 'DiscountType' => $DiscountType, 'DiscountValue' => $DiscountValue, 'AfterDiscount' => $AfterDiscount, 'PackagingType' => $PackagingType, 'PackagingValue' => $PackagingValue, 'PackagingCalulatedOn' => $PackagingOption, 'AfterPackagingValue' => $AfterPackagingValue, 'FreightType' => $FreightType, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'Insurance' => $InsuranceValue, 'TotalValue' => $TotalOrderValue, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CGST' => $Cgst, 'AfterCGST' => $AfterCgst, 'SGST' => $Sgst, 'AfterSGST' => $AfterSgst, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'NoOfTrip' => $NOOfTrip);
-                      $RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
-                      if (!$RevenueList) {
-                          throw new \Exception('Error occurred while creating Revenue Tax');
-                      }
-                  }
-              }
-          }
-          echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO;
-      } catch (\Exception $e) {
-          log_message('error', 'Exception occurred: ' . $e->getMessage());
-          echo 'An error occurred while creating the purchase order. Please try again.';
+    try {
+      // Extract POST data
+      $POdt = $this->request->getPost('PODate');
+      $PODate = get_date_time_format($POdt);
+      $SupplierID = $this->request->getPost('drpSupplier');
+      $DeliveryAddr = $this->request->getPost('DeliveryAddr');
+      $dt = $this->request->getPost('Deliverydt');
+      $POType = $this->request->getPost('POType');
+      $DeliveryOption = $this->request->getPost('DateRange');
+      if ($DeliveryOption == 1) {
+        $Deliverydt = '';
+        $DeliverySchedule = $this->request->getPost('Scheduleby');
+      } else {
+        $Deliverydt = get_date_time_format($dt);
+        $DeliverySchedule = '';
       }
+      $BudgetType = $this->request->getPost('Budget');
+      $Modeofshipment = $this->request->getPost('addmodeofshipment');
+      $supplierreference = $this->request->getPost('addsupplierreference');
+      $supplieroffno = $this->request->getPost('addsupplierofferno');
+      $otherreference = $this->request->getPost('addotherreference');
+      $fincap = ""; //$this->request->getPost('addfincap');
+      $revenuetype = $this->request->getPost('PoTypeOptions');
+      $insurancestatus = $this->request->getPost('insurance');
+      $InsuranceNumber = ($insurancestatus == 1) ? $this->request->getPost('InsuranceNumber') : '';
+      $SpcialInstruction = $this->request->getPost('SpcialInstruction');
+      $TotalOrderValueSummary = $this->request->getPost('txtTotalOrderValueSummary');
+      $POStatus = $this->request->getPost('txtStatus');
+      $CreateBy = $this->session->get('userId');
+      $RowCount = $this->request->getPost('txtRowCount');
+      $DeletedRow = $this->request->getPost('txtDeletedRow');
+      $comma_separated = ($DeletedRow !== null && is_string($DeletedRow)) ? explode(':', $DeletedRow) : [];
+      $createddt = get_current_date_time();
+      $PaymentTerms = $this->request->getPost('PaymentTerms');
+      $OtherPayment = $this->request->getPost('Otherpayment');
+      $Local_Interstate = $this->request->getPost('Range');
+      $Qualitycheck = 1;
+      $IsOpenOrder = ($this->request->getPost('IsOpenOrder') !== null && !empty($this->request->getPost('IsOpenOrder')) && $this->request->getPost('IsOpenOrder') === '1') ? $this->request->getPost('IsOpenOrder') : null;
+
+
+      $file = $this->request->getFile('POFile');
+      $requestfilename = NULL;
+      if (!empty($file)) {
+        if ($file->isValid() && !$file->hasMoved()) {
+          $requestfilename = $file->getName();
+          $path = ROOTPATH . 'public/uploads/POfiles/';
+          if (!is_dir($path)) {
+            mkdir($path, 0777, true);
+          }
+          if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+            log_message('error', 'File already exists in the database' . $requestfilename);
+            $requestfilename = "";
+          } else {
+            $file->move($path, $requestfilename);
+          }
+        } else {
+          $requestfilename = "";
+        }
+      }
+
+      // Generate PO Number
+      $lastPONO = $this->purchaseorder_model->lastPONO();
+      $newPONO = generate_po_number($lastPONO);
+      log_message('debug', 'newPONO returned: ' . $newPONO);
+      // PO Master
+      $POList = array('PONO' => $newPONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'Status' => $POStatus, 'PORange' => $Local_Interstate, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'POType' => $POType, 'CapitalRange' => $Local_Interstate, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $supplierreference, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'POSubType' => $revenuetype, 'InsuranceNumber' => $InsuranceNumber, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType, 'IsOpenOrder' => $IsOpenOrder, 'POFile' => $requestfilename);
+      $POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $revenuetype);
+      $PONO = '';
+      if (count($POMaster) > 0) {
+        $PONO = $POMaster[0]['PONO'];
+      } else {
+        throw new \Exception('Error occurred while creating PO Master');
+      }
+      log_message('error', 'CTRL PONO : ' . $PONO);
+
+      // PO Line Items
+      $LineItemStatus = REQITEM_NEW;
+
+      for ($i = 1; $i <= $RowCount; $i++) {
+        $MaterialCode = $this->request->getPost('materialCode' . $i);
+        $Quantity = $this->request->getPost('quantity' . $i);
+        $Reqnumber = $this->request->getPost('Reqnumber' . $i);
+        $itemRate = $this->request->getPost('itemRate' . $i);
+        $per = $this->request->getPost('per' . $i);
+
+        $DiscountType = $this->request->getPost('DisType' . $i);
+        $DiscountValue = $this->request->getPost('DisVal' . $i);
+        $AfterDiscount = $this->request->getPost('AfterDisVal' . $i);
+        $PackagingOption = $this->request->getPost('PackOption' . $i);
+        $PackagingType = $this->request->getPost('PackType' . $i);
+        $PackagingValue = $this->request->getPost('PackVal' . $i);
+        $AfterPackagingValue = $this->request->getPost('AfterPackVal' . $i);
+
+        $FreightType = $this->request->getPost('FreightType' . $i);
+        $FreightValue = $this->request->getPost('FreightVal' . $i);
+        $AfterFreightValue = $this->request->getPost('AfterFreightVal' . $i);
+        $NOOfTrip = $this->request->getPost('NoOfTrip' . $i);
+        $InsuranceValue = $this->request->getPost('Insval' . $i);
+        $TotalOrderValue = $this->request->getPost('TotalOrderValue' . $i);
+        $revenuedescription = $this->request->getPost('Service_Description' . $i);
+        $CostCenter = $this->request->getPost('costCode' . $i);
+        $Cgst = $this->request->getPost('RevenueCgst' . $i);
+        $Sgst = $this->request->getPost('RevenueSgst' . $i);
+        $Igst = $this->request->getPost('RevenueIgst' . $i);
+        $AfterCgst = $this->request->getPost('RevenueAfterCgst' . $i);
+        $AfterSgst = $this->request->getPost('RevenueAfterSgst' . $i);
+        $AfterIgst = $this->request->getPost('RevenueAfterIgst' . $i);
+
+        $SkipInsert = "False";
+        if (count($comma_separated) > 0) {
+          for ($j = 1; $j < count($comma_separated); $j++) {
+            $deletedRow = $comma_separated[$j];
+            if ($deletedRow == $i) {
+              $SkipInsert = "True";
+              break;
+            }
+          }
+        }
+        if ($SkipInsert == "False") {
+
+          $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Per' => $per, 'ServiceMaterialDescription' => $revenuedescription, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter);
+          $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
+          $LineItemNo = '';
+          if (count($POLineItem) > 0) {
+            $LineItemNo = $POLineItem[0]['LineItemNo'];
+          } else {
+            throw new \Exception('Error occurred while creating PO Line Item');
+          }
+
+          if (trim((string)$POType) == REVENUE) {
+            $RevenueTaxList = array('LineItemNo' => $LineItemNo, 'DiscountType' => $DiscountType, 'DiscountValue' => $DiscountValue, 'AfterDiscount' => $AfterDiscount, 'PackagingType' => $PackagingType, 'PackagingValue' => $PackagingValue, 'PackagingCalulatedOn' => $PackagingOption, 'AfterPackagingValue' => $AfterPackagingValue, 'FreightType' => $FreightType, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'Insurance' => $InsuranceValue, 'TotalValue' => $TotalOrderValue, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CGST' => $Cgst, 'AfterCGST' => $AfterCgst, 'SGST' => $Sgst, 'AfterSGST' => $AfterSgst, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'NoOfTrip' => $NOOfTrip);
+            $RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
+            if (!$RevenueList) {
+              throw new \Exception('Error occurred while creating Revenue Tax');
+            }
+          }
+        }
+      }
+      echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO;
+    } catch (\Exception $e) {
+      log_message('error', 'Exception occurred: ' . $e->getMessage());
+      echo 'An error occurred while creating the purchase order. Please try again.';
+    }
   }
- 
+
   //This used to Edit the Revenue Purchase Order
   function EditRevenuePurchaseOrder()
   {
@@ -1239,7 +1241,7 @@ $mpdf->use_kwt = true;
     $supplierreference = $this->request->getPost('editsupplierreference');
     $supplieroffno = $this->request->getPost('editsupplierofferno');
     $otherreference = $this->request->getPost('editotherreference');
-    $fincap = "";// $this->request->getPost('editfincap');
+    $fincap = ""; // $this->request->getPost('editfincap');
     $revenuetype = $this->request->getPost('PoTypeOptions');
     $insurancestatus = $this->request->getPost('insurancestatus');
     if ($insurancestatus == 1) {
@@ -1284,24 +1286,25 @@ $mpdf->use_kwt = true;
       $POList['ReleasedOn'] = get_current_date_time();
       $POList['ReleasedBy'] = $this->session->get('userId');
     }
-          $file = $this->request->getFile('POFile');
-          $requestfilename = NULL;    
-          if (!empty($file)) {
-                if ($file && $file->isValid() && !$file->hasMoved()) {
-                  $requestfilename = $file->getName();    
+    $file = $this->request->getFile('POFile');
+    $requestfilename = NULL;
+    if (!empty($file)) {
+      if ($file && $file->isValid() && !$file->hasMoved()) {
+        $requestfilename = $file->getName();
+
+        $path = ROOTPATH . 'public/uploads/POfiles/';
+        if (!is_dir($path)) {
+          mkdir($path, 0777, true);
+        }
+        if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+          log_message('error', 'File already exists in the database' . $requestfilename);
+        } else {
+          $file->move($path, $requestfilename);
+          $POList['POFile'] = $requestfilename;
+        }
+      }
+    }
 
-                    $path = ROOTPATH.'public/uploads/POfiles/';
-                    if(!is_dir($path)) { mkdir($path, 0777, true); }
-                    if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
-                      log_message('error', 'File already exists in the database'.$requestfilename);
-                    }
-                    else{
-                      $file->move($path, $requestfilename);  
-                      $POList['POFile'] = $requestfilename;
-                    }
-                }
-          }
-  
     $POMaster  = $this->purchaseorder_model->updatePOMaster($PONO, $POList);
 
 
@@ -1438,7 +1441,6 @@ $mpdf->use_kwt = true;
       if ($SkipInsert == "False") {
 
         if (strlen((string)$POLineItemNo) == 0) {
-          
         } else {
 
           $LineItemNo = $POLineItemNo;
@@ -1449,7 +1451,6 @@ $mpdf->use_kwt = true;
         }
         $isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo);
         if (count($isExists) == 0) {
-          
         } else {
 
           $RevenueTaxList = array('DiscountType' => $DiscountType, 'DiscountValue' => $DiscountValue, 'AfterDiscount' => $AfterDiscount, 'PackagingType' => $PackagingType, 'PackagingValue' => $PackagingValue, 'PackagingCalulatedOn' => $PackagingOption, 'AfterPackagingValue' => $AfterPackagingValue, 'FreightType' => $FreightType, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'Insurance' => $InsuranceValue, 'TotalValue' => $TotalOrderValue, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt, 'CGST' => $Cgst, 'AfterCGST' => $AfterCgst, 'SGST' => $Sgst, 'AfterSGST' => $AfterSgst, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'CreatedBy' => $updatedBy, 'NoOfTrip' => $NOOfTrip);
@@ -1460,8 +1461,8 @@ $mpdf->use_kwt = true;
 
     echo 'Purchase Order Updated Successfully! PO Number Is: ' . $PONO;
   }
-  
-  
+
+
   public function revenuepoprint($PONO)
   {
 
@@ -1531,10 +1532,10 @@ $mpdf->use_kwt = true;
     } else {
       $mpdf->SetWatermarkText('DRAFT');
     }
-    
-    $WatermarkImage = base_url()."public/assets/images/mpdf.png";
+
+    $WatermarkImage = base_url() . "public/assets/images/mpdf.png";
     $mpdf->SetWatermarkImage($WatermarkImage, 8, 10);
-    
+
     $mpdf->showWatermarkImage = true;
     $mpdf->watermark_font = 'DejaVuSansCondensed';
     $mpdf->showWatermarkText = true;
@@ -1653,7 +1654,7 @@ $mpdf->use_kwt = true;
     // Output PDF
     $mpdf->Output('ServicePOReport' . $PONO . '.pdf', 'D');
   }
-     
+
   public function importpoprint($PONO)
   {
     // echo $PONO;
@@ -1841,185 +1842,184 @@ $mpdf->use_kwt = true;
 
   function addNewImportPurchaseOrder()
   {
-      try {
-          $POdt = $this->request->getPost('PODate');
-          $PODate = get_date_time_format($POdt);
-          $SupplierID = $this->request->getPost('drpSupplier');
-          $DeliveryAddr = $this->request->getPost('DeliveryAddr');
-  
-          $POType = $this->request->getPost('POType');
-          $PoRange = $this->request->getPost('txtPoRange');
-  
-          $DeliveryOption = $this->request->getPost('DateRange');
-  
-          $DeliverySchedule = '';
-          $Dispatch = '';
-          if ($DeliveryOption == 1) {
-              $Dispatch = '';
-              $DeliverySchedule = $this->request->getPost('Scheduleby');
-          } else {
-              $Dispatch = $this->request->getPost('Dispatch');
-              $DeliverySchedule = '';
-          }
-  
-          $SpcialInstruction = $this->request->getPost('txtSpcialInstruction');
-          $TotalOrder = $this->request->getPost('txtToatlOrder');
-          $POStatus = $this->request->getVar('textStatus');
-  
-          $BudgetType = $this->request->getPost('Budget');
-  
-          $CreateBy = $this->session->get('userId');
-          $RowCount = $this->request->getVar('txtRowCount');
-  
-          $DeletedRow = $this->request->getVar('txtDeletedRow');
-          $comma_separated = ($DeletedRow !== null && is_string($DeletedRow))
-              ? explode(':', $DeletedRow)
-              : [];
-  
-          $createddt = get_current_date_time();
-          $Exchangerate = $this->request->getPost('ExchangeRate');
-          $Edt = $this->request->getPost('Exchangerateon');
-          $ExchangeRateCalculatedon = get_date_time_format($Edt);
-  
-          $CurrencyType = $this->request->getPost('currencytype');
-  
-          $PaymentTerms = $this->request->getPost('PaymentTerms');
-          $OtherPayment = $this->request->getPost('Otherpayment');
-          $Palaceoforigin = $this->request->getPost('PlaceOforigin');
-  
-          $Shipmentmode = $this->request->getPost('addmodeofshipment');
-          $SupplierRef = $this->request->getPost('addsupplierreference');
-          $SupplierOffer = $this->request->getPost('addsupplierofferno');
-          $otherRef = $this->request->getPost('addotherreference');
-          $finCap = "";//$this->request->getPost('addfincap');
-  
-          $importoption = $this->request->getPost('Importoption');
-          $Insurance = $this->request->getPost('Insurance');
-  
-          if ($Insurance == 1) {
-              $InsuranceNumber = $this->request->getPost('InsuranceNumber');
-          } else {
-              $InsuranceNumber = '';
-          }
-  
-          $Qualitycheck = 1;
-          $IsOpenOrder = ($this->request->getPost('IsOpenOrder') !== null && !empty($this->request->getPost('IsOpenOrder')) && $this->request->getPost('IsOpenOrder') === '1') ? $this->request->getPost('IsOpenOrder') : null;
-  
-          $lastPONO = $this->purchaseorder_model->lastPONO();
-          $newPONO = generate_po_number($lastPONO);
-          $file = $this->request->getFile('POFile');
-          $requestfilename = NULL; 
-          if (!empty($file)) {
-              
-              if ($file->isValid() && !$file->hasMoved()) {
-                $requestfilename = $file->getName();    
-                $path = ROOTPATH.'public/uploads/POfiles/';
-                if(!is_dir($path)) { mkdir($path, 0777, true); }
-                if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
-                  log_message('error', 'File already exists in the database'.$requestfilename);
-                  $requestfilename = "";
-                }
-                else{
-                  $file->move($path, $requestfilename);    
-                }
-              }else{
-                $requestfilename = "";
-              }
-              
-            }
+    try {
+      $POdt = $this->request->getPost('PODate');
+      $PODate = get_date_time_format($POdt);
+      $SupplierID = $this->request->getPost('drpSupplier');
+      $DeliveryAddr = $this->request->getPost('DeliveryAddr');
 
-          $POList = array('PONO' => $newPONO,'SupplierID' => $SupplierID,'TotalOrderValue' => $TotalOrder,'PODate' => $PODate,'Status' => $POStatus,'PORange' => $PoRange,'ServiceDescription' => $SpcialInstruction,'CreatedBy' => $CreateBy,'DeliveryAddress' => $DeliveryAddr,'Import_DispatchDetails' => $Dispatch,'CreatedDate' => $createddt,'DeliverySchedule' => $DeliverySchedule,'DeliveryOption' => $DeliveryOption,'ExchangeRate' => $Exchangerate,'ExchangeRateCalculatedon' => $ExchangeRateCalculatedon,'CurrencyType' => $CurrencyType,'PaymentTerms' => $PaymentTerms,'POType' => $POType,'Import_PlaceofOrgin' => $Palaceoforigin,'PaymentOtherDescription' => $OtherPayment,'Mode_Of_Shipment' => $Shipmentmode,'Supplier_Reference' => $SupplierRef,'Supplier_Offer_No' => $SupplierOffer,'Other_Reference' => $otherRef,'Fincap' => $finCap,'InsuranceStatus' => $Insurance,'InsuranceNumber' => $InsuranceNumber,'POSubType' => $importoption,'IsQualityChkReqired' => $Qualitycheck,'BudgetType' => $BudgetType,'IsOpenOrder' => $IsOpenOrder);
-          $POList['POFile'] = $requestfilename;
-          $POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $importoption);
-          $PONO = '';
-          if (count($POMaster) > 0) {
-              $PONO = $POMaster[0]['PONO'];
-          } else {
-              throw new \Exception('Error occurred while creating PO Master');
-          }
-  
-          $LineItemStatus = REQITEM_NEW;
-  
-          for ($i = 1; $i <= $RowCount; $i++) {
-              $MaterialCode = $this->request->getPost('materialCode' . $i);
-              $Quantity = $this->request->getPost('quantity' . $i);
-              $Reqnumber = $this->request->getPost('Reqnumber' . $i);
-              $itemRate = $this->request->getPost('itemRate' . $i);
-  
-              $BasicPriceinmton = $this->request->getPost('BasicPriceinUS' . $i);
-              $Productprice = $this->request->getPost('BasicAmt' . $i);
-              $LandingCharge = $this->request->getPost('LandingChargee' . $i);
-              $AfterLandingCharge = $this->request->getPost('AfterLandingChargee' . $i);
-              $CustomDuty = $this->request->getPost('Customduty' . $i);
-              $AfterCustomDuty = $this->request->getPost('AfterCustomduty' . $i);
-              $CustomEd = $this->request->getPost('CustomEDcess' . $i);
-              $AfterCustomEd = $this->request->getPost('AfterCustomEDcess' . $i);
-              $CustomSH = $this->request->getPost('CustomSHcess' . $i);
-              $AfterCustomSH = $this->request->getPost('AfterCustomSHcess' . $i);
-              $Grossdutypayable = $this->request->getPost('Grossdutypayable' . $i);
-              $CustomDutyExpensesPerKG = $this->request->getPost('CustomDutyExpenses' . $i);
-  
-              $QuantityKG = $this->request->getPost('PurQuantity' . $i);
-              $Totalvalueitem = $this->request->getPost('TotalExp' . $i);
-              $CostCenter = $this->request->getPost('costCode' . $i);
-              $AssessableValue = $this->request->getPost('AfterAssessable' . $i);
-              $Subtotal = $this->request->getPost('Subtotal' . $i);
-              $Igst = $this->request->getPost('Igst' . $i);
-              $AfterIgst = $this->request->getPost('AfterIgst' . $i);
-              $Dutyimpact = $this->request->getPost('Dutyimpact' . $i);
-              $Clearingcharge = $this->request->getPost('ClearingCharges' . $i);
-              $Nettvalue = $this->request->getPost('Nett' . $i);
-  
-              $FreightType = $this->request->getPost('FreightType' . $i);
-              $nooftrip = $this->request->getPost('NoofTrip' . $i);
-              $Freightrate = $this->request->getPost('FreightRate' . $i);
-              $Freightamount = $this->request->getPost('AfterFreightRate' . $i);
-  
-              $specialinstruction = $this->request->getPost('Addinstruction' . $i);
-              $per = $this->request->getPost('Per' . $i);
-  
-              $SkipInsert = "False";
-              if (count($comma_separated) > 0) {
-                  for ($j = 1; $j < count($comma_separated); $j++) {
-                      $deletedRow = $comma_separated[$j];
-  
-                      if ($deletedRow == $i) {
-                          $SkipInsert = "True";
-                          break;
-                      }
-                  }
-              }
-  
-              if ($SkipInsert == "False") {
-                  $POLineItemList = array('PONO' => $PONO,'ReqNo' => $Reqnumber,'MaterialCode' => $MaterialCode,'Quantity' => $Quantity,'Rate' => $itemRate,'Status' => $LineItemStatus,'CreatedBy' => $CreateBy,'CreatedDate' => $createddt,'CostCenterCode' => $CostCenter,'Per' => $per,'ServiceMaterialDescription' => $specialinstruction);
-  
-                  $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
-  
-                  $LineItemNo = '';
-                  if (count($POLineItem) > 0) {
-                    $LineItemNo = $POLineItem[0]['LineItemNo'];
-                  } else {
-                      throw new \Exception('Error occurred while creating PO Line Item');
-                  }
-  
-                  if (trim((string)$POType) == IMPORT) {
-                      $ImportTaxList = array('LineItemNo' => $LineItemNo,'BasicPriceInMTon' => $BasicPriceinmton,'ProductPrice' => $Productprice,'LandingCharge' => $LandingCharge,'AfterLandingCharge' => $AfterLandingCharge,'CustomDuty' => $CustomDuty,'AfterCustomDuty' => $AfterCustomDuty,'CustomEdCess' => $CustomEd,'CustomSHCess' => $CustomSH,'CreatedBy' => $CreateBy,'CreatedDate' => $createddt,'Grossdutypayable' => $Grossdutypayable,'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG,'QuantityKG' => $QuantityKG,'AfterCustomSHCess' => $AfterCustomSH,'AfterCustomEdCess' => $AfterCustomEd,'TotalValue' => $Totalvalueitem,'FreightType' => $FreightType,'NoOfTrip' => $nooftrip,'FreightValue' => $Freightrate,'AfterFreightValue' => $Freightamount,'AssessableValue' => $AssessableValue,'SubTotal' => $Subtotal,'IGST' => $Igst,'AfterIGST' => $AfterIgst,'DutyImpact' => $Dutyimpact,'ClearingCharge' => $Clearingcharge,'NetValue' => $Nettvalue);
-                      $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
-                      if (!$ImportList) {
-                        throw new \Exception('Error occurred while creating Import Tax');
-                    }
-                  }
-              }
-          }
-  
-          echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO;
-      } catch (\Exception $e) {
-        log_message('error', 'Exception occurred: ' . $e->getMessage());
-        echo 'An error occurred while creating the purchase order. Please try again.';
+      $POType = $this->request->getPost('POType');
+      $PoRange = $this->request->getPost('txtPoRange');
 
+      $DeliveryOption = $this->request->getPost('DateRange');
+
+      $DeliverySchedule = '';
+      $Dispatch = '';
+      if ($DeliveryOption == 1) {
+        $Dispatch = '';
+        $DeliverySchedule = $this->request->getPost('Scheduleby');
+      } else {
+        $Dispatch = $this->request->getPost('Dispatch');
+        $DeliverySchedule = '';
       }
+
+      $SpcialInstruction = $this->request->getPost('txtSpcialInstruction');
+      $TotalOrder = $this->request->getPost('txtToatlOrder');
+      $POStatus = $this->request->getVar('textStatus');
+
+      $BudgetType = $this->request->getPost('Budget');
+
+      $CreateBy = $this->session->get('userId');
+      $RowCount = $this->request->getVar('txtRowCount');
+
+      $DeletedRow = $this->request->getVar('txtDeletedRow');
+      $comma_separated = ($DeletedRow !== null && is_string($DeletedRow))
+        ? explode(':', $DeletedRow)
+        : [];
+
+      $createddt = get_current_date_time();
+      $Exchangerate = $this->request->getPost('ExchangeRate');
+      $Edt = $this->request->getPost('Exchangerateon');
+      $ExchangeRateCalculatedon = get_date_time_format($Edt);
+
+      $CurrencyType = $this->request->getPost('currencytype');
+
+      $PaymentTerms = $this->request->getPost('PaymentTerms');
+      $OtherPayment = $this->request->getPost('Otherpayment');
+      $Palaceoforigin = $this->request->getPost('PlaceOforigin');
+
+      $Shipmentmode = $this->request->getPost('addmodeofshipment');
+      $SupplierRef = $this->request->getPost('addsupplierreference');
+      $SupplierOffer = $this->request->getPost('addsupplierofferno');
+      $otherRef = $this->request->getPost('addotherreference');
+      $finCap = ""; //$this->request->getPost('addfincap');
+
+      $importoption = $this->request->getPost('Importoption');
+      $Insurance = $this->request->getPost('Insurance');
+
+      if ($Insurance == 1) {
+        $InsuranceNumber = $this->request->getPost('InsuranceNumber');
+      } else {
+        $InsuranceNumber = '';
+      }
+
+      $Qualitycheck = 1;
+      $IsOpenOrder = ($this->request->getPost('IsOpenOrder') !== null && !empty($this->request->getPost('IsOpenOrder')) && $this->request->getPost('IsOpenOrder') === '1') ? $this->request->getPost('IsOpenOrder') : null;
+
+      $lastPONO = $this->purchaseorder_model->lastPONO();
+      $newPONO = generate_po_number($lastPONO);
+      $file = $this->request->getFile('POFile');
+      $requestfilename = NULL;
+      if (!empty($file)) {
+
+        if ($file->isValid() && !$file->hasMoved()) {
+          $requestfilename = $file->getName();
+          $path = ROOTPATH . 'public/uploads/POfiles/';
+          if (!is_dir($path)) {
+            mkdir($path, 0777, true);
+          }
+          if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+            log_message('error', 'File already exists in the database' . $requestfilename);
+            $requestfilename = "";
+          } else {
+            $file->move($path, $requestfilename);
+          }
+        } else {
+          $requestfilename = "";
+        }
+      }
+
+      $POList = array('PONO' => $newPONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrder, 'PODate' => $PODate, 'Status' => $POStatus, 'PORange' => $PoRange, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'Import_DispatchDetails' => $Dispatch, 'CreatedDate' => $createddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ExchangeRate' => $Exchangerate, 'ExchangeRateCalculatedon' => $ExchangeRateCalculatedon, 'CurrencyType' => $CurrencyType, 'PaymentTerms' => $PaymentTerms, 'POType' => $POType, 'Import_PlaceofOrgin' => $Palaceoforigin, 'PaymentOtherDescription' => $OtherPayment, 'Mode_Of_Shipment' => $Shipmentmode, 'Supplier_Reference' => $SupplierRef, 'Supplier_Offer_No' => $SupplierOffer, 'Other_Reference' => $otherRef, 'Fincap' => $finCap, 'InsuranceStatus' => $Insurance, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $importoption, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType, 'IsOpenOrder' => $IsOpenOrder);
+      $POList['POFile'] = $requestfilename;
+      $POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $importoption);
+      $PONO = '';
+      if (count($POMaster) > 0) {
+        $PONO = $POMaster[0]['PONO'];
+      } else {
+        throw new \Exception('Error occurred while creating PO Master');
+      }
+
+      $LineItemStatus = REQITEM_NEW;
+
+      for ($i = 1; $i <= $RowCount; $i++) {
+        $MaterialCode = $this->request->getPost('materialCode' . $i);
+        $Quantity = $this->request->getPost('quantity' . $i);
+        $Reqnumber = $this->request->getPost('Reqnumber' . $i);
+        $itemRate = $this->request->getPost('itemRate' . $i);
+
+        $BasicPriceinmton = $this->request->getPost('BasicPriceinUS' . $i);
+        $Productprice = $this->request->getPost('BasicAmt' . $i);
+        $LandingCharge = $this->request->getPost('LandingChargee' . $i);
+        $AfterLandingCharge = $this->request->getPost('AfterLandingChargee' . $i);
+        $CustomDuty = $this->request->getPost('Customduty' . $i);
+        $AfterCustomDuty = $this->request->getPost('AfterCustomduty' . $i);
+        $CustomEd = $this->request->getPost('CustomEDcess' . $i);
+        $AfterCustomEd = $this->request->getPost('AfterCustomEDcess' . $i);
+        $CustomSH = $this->request->getPost('CustomSHcess' . $i);
+        $AfterCustomSH = $this->request->getPost('AfterCustomSHcess' . $i);
+        $Grossdutypayable = $this->request->getPost('Grossdutypayable' . $i);
+        $CustomDutyExpensesPerKG = $this->request->getPost('CustomDutyExpenses' . $i);
+
+        $QuantityKG = $this->request->getPost('PurQuantity' . $i);
+        $Totalvalueitem = $this->request->getPost('TotalExp' . $i);
+        $CostCenter = $this->request->getPost('costCode' . $i);
+        $AssessableValue = $this->request->getPost('AfterAssessable' . $i);
+        $Subtotal = $this->request->getPost('Subtotal' . $i);
+        $Igst = $this->request->getPost('Igst' . $i);
+        $AfterIgst = $this->request->getPost('AfterIgst' . $i);
+        $Dutyimpact = $this->request->getPost('Dutyimpact' . $i);
+        $Clearingcharge = $this->request->getPost('ClearingCharges' . $i);
+        $Nettvalue = $this->request->getPost('Nett' . $i);
+
+        $FreightType = $this->request->getPost('FreightType' . $i);
+        $nooftrip = $this->request->getPost('NoofTrip' . $i);
+        $Freightrate = $this->request->getPost('FreightRate' . $i);
+        $Freightamount = $this->request->getPost('AfterFreightRate' . $i);
+
+        $specialinstruction = $this->request->getPost('Addinstruction' . $i);
+        $per = $this->request->getPost('Per' . $i);
+
+        $SkipInsert = "False";
+        if (count($comma_separated) > 0) {
+          for ($j = 1; $j < count($comma_separated); $j++) {
+            $deletedRow = $comma_separated[$j];
+
+            if ($deletedRow == $i) {
+              $SkipInsert = "True";
+              break;
+            }
+          }
+        }
+
+        if ($SkipInsert == "False") {
+          $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter, 'Per' => $per, 'ServiceMaterialDescription' => $specialinstruction);
+
+          $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
+
+          $LineItemNo = '';
+          if (count($POLineItem) > 0) {
+            $LineItemNo = $POLineItem[0]['LineItemNo'];
+          } else {
+            throw new \Exception('Error occurred while creating PO Line Item');
+          }
+
+          if (trim((string)$POType) == IMPORT) {
+            $ImportTaxList = array('LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'Grossdutypayable' => $Grossdutypayable, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $nooftrip, 'FreightValue' => $Freightrate, 'AfterFreightValue' => $Freightamount, 'AssessableValue' => $AssessableValue, 'SubTotal' => $Subtotal, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'DutyImpact' => $Dutyimpact, 'ClearingCharge' => $Clearingcharge, 'NetValue' => $Nettvalue);
+            $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
+            if (!$ImportList) {
+              throw new \Exception('Error occurred while creating Import Tax');
+            }
+          }
+        }
+      }
+
+      echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO;
+    } catch (\Exception $e) {
+      log_message('error', 'Exception occurred: ' . $e->getMessage());
+      echo 'An error occurred while creating the purchase order. Please try again.';
+    }
   }
-  
+
 
 
   function EditImportPurchaseOrder()
@@ -2102,7 +2102,7 @@ $mpdf->use_kwt = true;
     $SupplierRef = $this->request->getPost('editsupplierreference');
     $SupplierOffer = $this->request->getPost('editsupplierofferno');
     $otherRef = $this->request->getPost('editotherreference');
-    $finCap = "";//$this->request->getPost('editfincap');
+    $finCap = ""; //$this->request->getPost('editfincap');
 
 
 
@@ -2135,23 +2135,24 @@ $mpdf->use_kwt = true;
       $POList['ReleasedBy'] = $this->session->get('userId');
     }
     $file = $this->request->getFile('POFile');
-    $requestfilename = NULL;    
+    $requestfilename = NULL;
+
+    if (!empty($file)) {
+      if ($file && $file->isValid() && !$file->hasMoved()) {
+        $requestfilename = $file->getName();
+        $path = ROOTPATH . 'public/uploads/POfiles/';
+        if (!is_dir($path)) {
+          mkdir($path, 0777, true);
+        }
+        if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+          log_message('error', 'File already exists in the database' . $requestfilename);
+        } else {
+          $file->move($path, $requestfilename);
+          $POList['POFile'] = $requestfilename;
+        }
+      }
+    }
 
-          if (!empty($file)) {
-                if ($file && $file->isValid() && !$file->hasMoved()) {
-                  $requestfilename = $file->getName();    
-                    $path = ROOTPATH.'public/uploads/POfiles/';
-                    if(!is_dir($path)) { mkdir($path, 0777, true); }
-                    if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
-                      log_message('error', 'File already exists in the database'.$requestfilename);
-                    }
-                    else{
-                      $file->move($path, $requestfilename);  
-                      $POList['POFile'] = $requestfilename;
-                    }
-                }
-          }
-  
     //echo $PONO;
     //echo $TotalOrder;
     //print_r($POList);
@@ -2443,8 +2444,8 @@ $mpdf->use_kwt = true;
     $userID =  $this->session->get('userId');
     //print_r($data['Status']);echo "CON";
     $appList = $this->purchaseorder_model->getPOList($q);
-    $filteredAppList = array_filter($appList, function($item) {
-        return $item->Status !== PO_DRAFT;
+    $filteredAppList = array_filter($appList, function ($item) {
+      return $item->Status !== PO_DRAFT;
     });
     $data['AppList'] = $filteredAppList;
     $this->loadViews("porelease_view", $this->global, $data, NULL);
@@ -2478,17 +2479,17 @@ $mpdf->use_kwt = true;
   function addNewCapitalPurchaseOrder()
   {
 
-try{
-    $POdt = $this->request->getPost('PODate');
-    $PODate =  get_date_time_format($POdt);
-    $SupplierID = $this->request->getPost('drpSupplier');
-    $DeliveryAddr = $this->request->getPost('DeliveryAddr');
-    $dt = $this->request->getPost('Deliverydate');
+    try {
+      $POdt = $this->request->getPost('PODate');
+      $PODate =  get_date_time_format($POdt);
+      $SupplierID = $this->request->getPost('drpSupplier');
+      $DeliveryAddr = $this->request->getPost('DeliveryAddr');
+      $dt = $this->request->getPost('Deliverydate');
 
-    $POType = $this->request->getPost('POType');
-    $PoRange = $this->request->getPost('txtPoRange');
+      $POType = $this->request->getPost('POType');
+      $PoRange = $this->request->getPost('txtPoRange');
 
-    /* $DeliveryOption = $this->request->getPost('DateRange');
+      /* $DeliveryOption = $this->request->getPost('DateRange');
                    if($DeliveryOption==1){
                   $Deliverydt = '';
                   $DeliverySchedule = $this->request->getPost('Scheduleby');
@@ -2498,249 +2499,248 @@ try{
                   $DeliverySchedule = '';
                   } */
 
-    $DeliveryOption = $this->request->getPost('DateRange');
+      $DeliveryOption = $this->request->getPost('DateRange');
 
 
-    $DeliverySchedule = '';
-    $Dispatch = '';
-    $Deliverydt = '';
-    if ($DeliveryOption == 1) {
+      $DeliverySchedule = '';
       $Dispatch = '';
       $Deliverydt = '';
-      $DeliverySchedule = $this->request->getPost('Scheduleby');
-    } else if ($DeliveryOption == 2) {
-      $Deliverydt = '';
-      $DeliverySchedule = '';
-      $Dispatch = $this->request->getPost('Dispatch');
-    } else {
-      $Dispatch = '';
-      $DeliverySchedule = '';
-      $Deliverydt = get_date_time_format($dt);
-    }
-    $capitalType = $this->request->getPost('capitalType');
-    if ($capitalType == 'Domestic') {
-      $CapitalRange = '1';
-      $ExchangeRateOn = '';
-      $ExchangeRate = '';
-      $Palaceoforigin = '';
-    } else {
+      if ($DeliveryOption == 1) {
+        $Dispatch = '';
+        $Deliverydt = '';
+        $DeliverySchedule = $this->request->getPost('Scheduleby');
+      } else if ($DeliveryOption == 2) {
+        $Deliverydt = '';
+        $DeliverySchedule = '';
+        $Dispatch = $this->request->getPost('Dispatch');
+      } else {
+        $Dispatch = '';
+        $DeliverySchedule = '';
+        $Deliverydt = get_date_time_format($dt);
+      }
+      $capitalType = $this->request->getPost('capitalType');
+      if ($capitalType == 'Domestic') {
+        $CapitalRange = '1';
+        $ExchangeRateOn = '';
+        $ExchangeRate = '';
+        $Palaceoforigin = '';
+      } else {
 
-      $CapitalRange = '0';
-      $ExchangeRateBeforeFormat = $this->request->getPost('Exchangerateon');
-      $ExchangeRateOn = get_date_time_format($ExchangeRateBeforeFormat);
-      $ExchangeRate = $this->request->getPost('ExchangeRt');
-      $Palaceoforigin = $this->request->getPost('PlaceOforigin');
-    }
-    $ModeOfShipment = $this->request->getPost('addmodeofshipment');
-    $SupplierReference = $this->request->getPost('addsupplierreference');
-    $SuppliersOfferNo = $this->request->getPost('addsupplierofferno');
-    $OtherReferences = $this->request->getPost('addotherreference');
-    $Fincap = "";//$this->request->getPost('addfincap');
-    $InsuranceOptions = $this->request->getPost('insuranceStatus');
-    $InsuranceNumber = $this->request->getPost('InsuranceNumber');
-    $ServiceTypeOptions = $this->request->getPost('PoTypeOptions');
+        $CapitalRange = '0';
+        $ExchangeRateBeforeFormat = $this->request->getPost('Exchangerateon');
+        $ExchangeRateOn = get_date_time_format($ExchangeRateBeforeFormat);
+        $ExchangeRate = $this->request->getPost('ExchangeRt');
+        $Palaceoforigin = $this->request->getPost('PlaceOforigin');
+      }
+      $ModeOfShipment = $this->request->getPost('addmodeofshipment');
+      $SupplierReference = $this->request->getPost('addsupplierreference');
+      $SuppliersOfferNo = $this->request->getPost('addsupplierofferno');
+      $OtherReferences = $this->request->getPost('addotherreference');
+      $Fincap = ""; //$this->request->getPost('addfincap');
+      $InsuranceOptions = $this->request->getPost('insuranceStatus');
+      $InsuranceNumber = $this->request->getPost('InsuranceNumber');
+      $ServiceTypeOptions = $this->request->getPost('PoTypeOptions');
 
-    $PaymentMethod = $this->request->getPost('PaymentMethod');
-    $OtherPayment = $this->request->getPost('Otherpayment');
+      $PaymentMethod = $this->request->getPost('PaymentMethod');
+      $OtherPayment = $this->request->getPost('Otherpayment');
 
-    $BudgetType = $this->request->getPost('Budget');
+      $BudgetType = $this->request->getPost('Budget');
 
 
 
 
-    $SpcialInstruction = $this->request->getPost('txtSpcialInstruction');
-    $TotalOrder = $this->request->getPost('CapitalToatlOrder');
-    $POStatus = $this->request->getPost('txtStatus');
+      $SpcialInstruction = $this->request->getPost('txtSpcialInstruction');
+      $TotalOrder = $this->request->getPost('CapitalToatlOrder');
+      $POStatus = $this->request->getPost('txtStatus');
 
 
-    $CreateBy = $this->session->get('userId');
-    $RowCount =  $this->request->getPost('txtRowCount');
-    $DeletedRow =  $this->request->getPost('txtDeletedRow');
-    $comma_separated = ($DeletedRow !== null && is_string($DeletedRow))
-      ? explode(':', $DeletedRow)
-      : [];
+      $CreateBy = $this->session->get('userId');
+      $RowCount =  $this->request->getPost('txtRowCount');
+      $DeletedRow =  $this->request->getPost('txtDeletedRow');
+      $comma_separated = ($DeletedRow !== null && is_string($DeletedRow))
+        ? explode(':', $DeletedRow)
+        : [];
 
-    $createddt =  get_current_date_time();
-    $currencytypeID = $this->request->getPost('currencytype');
+      $createddt =  get_current_date_time();
+      $currencytypeID = $this->request->getPost('currencytype');
 
-    $Qualitycheck = 1;
+      $Qualitycheck = 1;
 
-    $IsOpenOrder = ($this->request->getPost('IsOpenOrder') !== null && !empty($this->request->getPost('IsOpenOrder')) && $this->request->getPost('IsOpenOrder') === '1') ? $this->request->getPost('IsOpenOrder') : null;
+      $IsOpenOrder = ($this->request->getPost('IsOpenOrder') !== null && !empty($this->request->getPost('IsOpenOrder')) && $this->request->getPost('IsOpenOrder') === '1') ? $this->request->getPost('IsOpenOrder') : null;
+
+      $lastPONO = $this->purchaseorder_model->lastPONO();
+      $newPONO = generate_po_number($lastPONO);
+      $file = $this->request->getFile('POFile');
+      $requestfilename = NULL;
+      if (!empty($file)) {
 
-    $lastPONO = $this->purchaseorder_model->lastPONO();
-    $newPONO = generate_po_number($lastPONO); 
-    $file = $this->request->getFile('POFile');
-    $requestfilename = NULL;    
-    if (!empty($file)) {
-        
         if ($file->isValid() && !$file->hasMoved()) {
-          $requestfilename = $file->getName();    
-          $path = ROOTPATH.'public/uploads/POfiles/';
-          if(!is_dir($path)) { mkdir($path, 0777, true); }
+          $requestfilename = $file->getName();
+          $path = ROOTPATH . 'public/uploads/POfiles/';
+          if (!is_dir($path)) {
+            mkdir($path, 0777, true);
+          }
           if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
-            log_message('error', 'File already exists in the database'.$requestfilename);
+            log_message('error', 'File already exists in the database' . $requestfilename);
             $requestfilename = "";
+          } else {
+            $file->move($path, $requestfilename);
           }
-          else{
-            $file->move($path, $requestfilename);    
-          }
-        }else{
+        } else {
           $requestfilename = "";
         }
-        
       }
 
-    $POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrder, 'PODate' => $PODate, 'Status' => $POStatus, 'PORange' => $PoRange, 'ExchangeRateCalculatedon' => $ExchangeRateOn, 'ExchangeRate' => $ExchangeRate, 'PaymentTerms' => $PaymentMethod, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'CreatedDate' => $createddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'CapitalRange' => $CapitalRange, 'POType' => $POType, 'CurrencyType' => $currencytypeID, 'DeliverySchedule' => $DeliverySchedule, 'Import_PlaceofOrgin' => $Palaceoforigin, 'Import_DispatchDetails' => $Dispatch, 'DeliveryDate' => $Deliverydt, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder);
-    $POList['POFile'] = $requestfilename;
-    // $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin);
+      $POList = array('PONO' => $newPONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrder, 'PODate' => $PODate, 'Status' => $POStatus, 'PORange' => $PoRange, 'ExchangeRateCalculatedon' => $ExchangeRateOn, 'ExchangeRate' => $ExchangeRate, 'PaymentTerms' => $PaymentMethod, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'CreatedDate' => $createddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'CapitalRange' => $CapitalRange, 'POType' => $POType, 'CurrencyType' => $currencytypeID, 'DeliverySchedule' => $DeliverySchedule, 'Import_PlaceofOrgin' => $Palaceoforigin, 'Import_DispatchDetails' => $Dispatch, 'DeliveryDate' => $Deliverydt, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType, 'IsOpenOrder' => $IsOpenOrder);
+      $POList['POFile'] = $requestfilename;
+      // $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin);
 
 
-    $POMaster  = $this->purchaseorder_model->addPOMaster($POList, $POType, $ServiceTypeOptions);
-    $PONO = '';
-    if (count($POMaster) > 0) {
+      $POMaster  = $this->purchaseorder_model->addPOMaster($POList, $POType, $ServiceTypeOptions);
+      $PONO = '';
+      if (count($POMaster) > 0) {
         $PONO = $POMaster[0]['PONO'];
-    } else {
-        throw new \Exception('Error occurred while creating PO Master');
-    }
-
-    $LineItemStatus = REQITEM_NEW;
-
-    for ($i = 1; $i <= $RowCount; $i++) {
-
-      $MaterialCode = $this->request->getPost('materialCode' . $i);
-      $Quantity = $this->request->getPost('quantity' . $i);
-      $Reqnumber = $this->request->getPost('Reqnumber' . $i);
-      $itemRate = $this->request->getPost('itemRate' . $i);
-
-
-      $BasicPriceinmton = $this->request->getPost('rateInUs' . $i);
-      $Productprice = $this->request->getPost('basicvalInINR' . $i);
-      $LandingCharge = $this->request->getPost('beforeLanding' . $i);
-      $AfterLandingCharge = $this->request->getPost('landingCharge' . $i);
-
-
-      $CustomDuty = $this->request->getPost('beforeCustomDuty' . $i);
-      $AfterCustomDuty = $this->request->getPost('CustomDuty' . $i);
-
-
-      $CustomEd = $this->request->getPost('beforeCustomEDCess' . $i);
-      $AfterCustomEd = $this->request->getPost('CustomEDCess' . $i);
-
-      $CustomSH = $this->request->getPost('beforeCustomSHCess' . $i);
-      $AfterCustomSH = $this->request->getPost('CustomSHCess' . $i);
-
-
-      $Grossdutypayable = $this->request->getPost('GrossDutyPayable' . $i);
-
-
-
-      $QuantityKG = $this->request->getPost('PurQuantity' . $i);
-      $FreightType = $this->request->getPost('FreightType' . $i);
-      $FreightValue = $this->request->getPost('FreightVal' . $i);
-      $AfterFreightValue = $this->request->getPost('AfterFreightVal' . $i);
-      $NOOfTrip = $this->request->getPost('NoOfTrip' . $i);
-
-      $Totalvalueitem = $this->request->getPost('PerKgExpense' . $i);
-
-      //echo $BasicPriceinmton;
-      $CostCenter = $this->request->getPost('CPCostCode' . $i);
-
-      $TotalOrderValue = $this->request->getPost('basicvalInINR' . $i);
-      $Cgst = $this->request->getPost('Cgst' . $i);
-      $Sgst = $this->request->getPost('Sgst' . $i);
-      $Igst = $this->request->getPost('Igst' . $i);
-      $AfterCgst = $this->request->getPost('AfterCgst' . $i);
-      $AfterSgst = $this->request->getPost('AfterSgst' . $i);
-      $AfterIgst = $this->request->getPost('AfterIgst' . $i);
-      $DiscountType = $this->request->getPost('DisType' . $i);
-      $DiscountValue = $this->request->getPost('DisVal' . $i);
-      $AfterDiscount = $this->request->getPost('AfterDisVal' . $i);
-      $OtherAmt = $this->request->getPost('OtherAmt' . $i);
-
-      $FreightTypeloc = $this->request->getPost('FreightTypeloc' . $i);
-      $FreightNoofTriploc = $this->request->getPost('NoofTriploc' . $i);
-      $Freightrateloc = $this->request->getPost('FreightRateloc' . $i);
-      $FreightAmountloc = $this->request->getPost('AfterFreightRateloc' . $i);
-
-      $AssessableValue = $this->request->getPost('AfterAssessable' . $i);
-      $SubTotal = $this->request->getPost('Subtotal' . $i);
-      $IGST = $this->request->getPost('IgstInt' . $i);
-      $AfterIGST = $this->request->getPost('AfterIgstInt' . $i);
-      $DutyImpact = $this->request->getPost('Dutyimpact' . $i);
-      $NetValue = $this->request->getPost('Nett' . $i);
-      $ClearingCharge = $this->request->getPost('ClearingCharges' . $i);
-
-      $CustomDutyExpensesPerKG = $this->request->getPost('CustomDutyExpenses' . $i);
-
-      $TaxtotalOrderValue = (float)$itemRate * (float)$Quantity + (float)$OtherAmt + (float)$AfterCgst + (float)$AfterSgst + (float)$AfterIgst - (float)$AfterDiscount;
-
-      $CapitalItemDescription = $this->request->getPost('CapitalItemDescrition' . $i);
-      $Per = $this->request->getPost('per' . $i);
-      $SkipInsert = "False";
-      if (count($comma_separated) > 0) {
-        for ($j = 1; $j < count($comma_separated); $j++) {
-          $deletedRow =   $comma_separated[$j];
-
-          if ($deletedRow == $i) {
-            $SkipInsert = "True";
-            break;
-          }
-        }
-      }
-      if ($SkipInsert == "False") {
-        $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter, 'ServiceMaterialDescription' => $CapitalItemDescription, 'Per' => $Per);
-
-        $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
-
-        $LineItemNo = '';
-      if (count($POLineItem) > 0) {
-          $LineItemNo = $POLineItem[0]['LineItemNo'];
       } else {
-          throw new \Exception('Error occurred while creating PO Line Item');
+        throw new \Exception('Error occurred while creating PO Master');
       }
 
-        /* --------------------------------------------*/
+      $LineItemStatus = REQITEM_NEW;
 
-        // $logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=> $itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
-        //             $this->purchaseorder_model->newlogpo($logpo); 
-        /* --------------------------------------------*/
-        if (trim((string)$POType) == CAPITAL) {
-          if ($CapitalRange == '1') {
-            $ServiceTaxList = array('LineItemNo' => $LineItemNo, 'CGST' => $Cgst, 'After_CGST' => $AfterCgst, 'SGST' => $Sgst, 'After_SGST' => $AfterSgst, 'IGST' => $Igst, 'After_IGST' => $AfterIgst, 'otherallowance' => $OtherAmt, 'TotalValue' => $TaxtotalOrderValue, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'discount' => $DiscountType, 'discountval' => $DiscountValue, 'Afterdiscountval' => $AfterDiscount, 'FreightType' => $FreightTypeloc, 'NoOfTrip' => $FreightNoofTriploc, 'FreightValue' => $Freightrateloc, 'AfterFreightValue' => $FreightAmountloc);
+      for ($i = 1; $i <= $RowCount; $i++) {
+
+        $MaterialCode = $this->request->getPost('materialCode' . $i);
+        $Quantity = $this->request->getPost('quantity' . $i);
+        $Reqnumber = $this->request->getPost('Reqnumber' . $i);
+        $itemRate = $this->request->getPost('itemRate' . $i);
+
+
+        $BasicPriceinmton = $this->request->getPost('rateInUs' . $i);
+        $Productprice = $this->request->getPost('basicvalInINR' . $i);
+        $LandingCharge = $this->request->getPost('beforeLanding' . $i);
+        $AfterLandingCharge = $this->request->getPost('landingCharge' . $i);
+
+
+        $CustomDuty = $this->request->getPost('beforeCustomDuty' . $i);
+        $AfterCustomDuty = $this->request->getPost('CustomDuty' . $i);
+
+
+        $CustomEd = $this->request->getPost('beforeCustomEDCess' . $i);
+        $AfterCustomEd = $this->request->getPost('CustomEDCess' . $i);
+
+        $CustomSH = $this->request->getPost('beforeCustomSHCess' . $i);
+        $AfterCustomSH = $this->request->getPost('CustomSHCess' . $i);
+
+
+        $Grossdutypayable = $this->request->getPost('GrossDutyPayable' . $i);
 
 
 
+        $QuantityKG = $this->request->getPost('PurQuantity' . $i);
+        $FreightType = $this->request->getPost('FreightType' . $i);
+        $FreightValue = $this->request->getPost('FreightVal' . $i);
+        $AfterFreightValue = $this->request->getPost('AfterFreightVal' . $i);
+        $NOOfTrip = $this->request->getPost('NoOfTrip' . $i);
 
+        $Totalvalueitem = $this->request->getPost('PerKgExpense' . $i);
 
-            $ServiceTax = $this->purchaseorder_model->addServiceTax($ServiceTaxList);
-            if (!$ServiceTax) {
-              throw new \Exception('Error occurred while creating Capital national Tax');
+        //echo $BasicPriceinmton;
+        $CostCenter = $this->request->getPost('CPCostCode' . $i);
+
+        $TotalOrderValue = $this->request->getPost('basicvalInINR' . $i);
+        $Cgst = $this->request->getPost('Cgst' . $i);
+        $Sgst = $this->request->getPost('Sgst' . $i);
+        $Igst = $this->request->getPost('Igst' . $i);
+        $AfterCgst = $this->request->getPost('AfterCgst' . $i);
+        $AfterSgst = $this->request->getPost('AfterSgst' . $i);
+        $AfterIgst = $this->request->getPost('AfterIgst' . $i);
+        $DiscountType = $this->request->getPost('DisType' . $i);
+        $DiscountValue = $this->request->getPost('DisVal' . $i);
+        $AfterDiscount = $this->request->getPost('AfterDisVal' . $i);
+        $OtherAmt = $this->request->getPost('OtherAmt' . $i);
+
+        $FreightTypeloc = $this->request->getPost('FreightTypeloc' . $i);
+        $FreightNoofTriploc = $this->request->getPost('NoofTriploc' . $i);
+        $Freightrateloc = $this->request->getPost('FreightRateloc' . $i);
+        $FreightAmountloc = $this->request->getPost('AfterFreightRateloc' . $i);
+
+        $AssessableValue = $this->request->getPost('AfterAssessable' . $i);
+        $SubTotal = $this->request->getPost('Subtotal' . $i);
+        $IGST = $this->request->getPost('IgstInt' . $i);
+        $AfterIGST = $this->request->getPost('AfterIgstInt' . $i);
+        $DutyImpact = $this->request->getPost('Dutyimpact' . $i);
+        $NetValue = $this->request->getPost('Nett' . $i);
+        $ClearingCharge = $this->request->getPost('ClearingCharges' . $i);
+
+        $CustomDutyExpensesPerKG = $this->request->getPost('CustomDutyExpenses' . $i);
+
+        $TaxtotalOrderValue = (float)$itemRate * (float)$Quantity + (float)$OtherAmt + (float)$AfterCgst + (float)$AfterSgst + (float)$AfterIgst - (float)$AfterDiscount;
+
+        $CapitalItemDescription = $this->request->getPost('CapitalItemDescrition' . $i);
+        $Per = $this->request->getPost('per' . $i);
+        $SkipInsert = "False";
+        if (count($comma_separated) > 0) {
+          for ($j = 1; $j < count($comma_separated); $j++) {
+            $deletedRow =   $comma_separated[$j];
+
+            if ($deletedRow == $i) {
+              $SkipInsert = "True";
+              break;
             }
           }
-          if ($CapitalRange == '0') {
+        }
+        if ($SkipInsert == "False") {
+          $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter, 'ServiceMaterialDescription' => $CapitalItemDescription, 'Per' => $Per);
 
-            $ImportTaxList = array('LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'Grossdutypayable' => $Grossdutypayable, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $NOOfTrip, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'AssessableValue' => $AssessableValue, 'SubTotal' => $SubTotal, 'IGST' => $IGST, 'AfterIGST' => $AfterIGST, 'DutyImpact' => $DutyImpact, 'NetValue' => $NetValue, 'ClearingCharge' => $ClearingCharge, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG);
+          $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
+
+          $LineItemNo = '';
+          if (count($POLineItem) > 0) {
+            $LineItemNo = $POLineItem[0]['LineItemNo'];
+          } else {
+            throw new \Exception('Error occurred while creating PO Line Item');
+          }
+
+          /* --------------------------------------------*/
+
+          // $logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=> $itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
+          //             $this->purchaseorder_model->newlogpo($logpo); 
+          /* --------------------------------------------*/
+          if (trim((string)$POType) == CAPITAL) {
+            if ($CapitalRange == '1') {
+              $ServiceTaxList = array('LineItemNo' => $LineItemNo, 'CGST' => $Cgst, 'After_CGST' => $AfterCgst, 'SGST' => $Sgst, 'After_SGST' => $AfterSgst, 'IGST' => $Igst, 'After_IGST' => $AfterIgst, 'otherallowance' => $OtherAmt, 'TotalValue' => $TaxtotalOrderValue, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'discount' => $DiscountType, 'discountval' => $DiscountValue, 'Afterdiscountval' => $AfterDiscount, 'FreightType' => $FreightTypeloc, 'NoOfTrip' => $FreightNoofTriploc, 'FreightValue' => $Freightrateloc, 'AfterFreightValue' => $FreightAmountloc);
+
+
+
+
+
+              $ServiceTax = $this->purchaseorder_model->addServiceTax($ServiceTaxList);
+              if (!$ServiceTax) {
+                throw new \Exception('Error occurred while creating Capital national Tax');
+              }
+            }
+            if ($CapitalRange == '0') {
+
+              $ImportTaxList = array('LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'Grossdutypayable' => $Grossdutypayable, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $NOOfTrip, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'AssessableValue' => $AssessableValue, 'SubTotal' => $SubTotal, 'IGST' => $IGST, 'AfterIGST' => $AfterIGST, 'DutyImpact' => $DutyImpact, 'NetValue' => $NetValue, 'ClearingCharge' => $ClearingCharge, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG);
 
 
 
 
 
 
-            $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
-            if (!$ImportList) {
-              throw new \Exception('Error occurred while creating Capital international Tax');
+              $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
+              if (!$ImportList) {
+                throw new \Exception('Error occurred while creating Capital international Tax');
+              }
             }
           }
         }
       }
-    }
 
-    echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO;
+      echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO;
     } catch (\Exception $e) {
-        log_message('error', 'Exception occurred: ' . $e->getMessage());
-        echo 'An error occurred while creating the purchase order. Please try again.';
+      log_message('error', 'Exception occurred: ' . $e->getMessage());
+      echo 'An error occurred while creating the purchase order. Please try again.';
     }
-
   }
 
   /*Edit Capital po*/
@@ -2829,7 +2829,7 @@ try{
     $SupplierReference = $this->request->getPost('editsupplierreference');
     $SuppliersOfferNo = $this->request->getPost('editsupplierofferno');
     $OtherReferences = $this->request->getPost('editotherreference');
-    $Fincap = "";//$this->request->getPost('editfincap');
+    $Fincap = ""; //$this->request->getPost('editfincap');
     $InsuranceOptions = $this->request->getPost('insuranceStatus');
     $InsuranceNumber = $this->request->getPost('InsuranceNumber');
     $ServiceTypeOptions = $this->request->getPost('PoTypeOptions');
@@ -2858,20 +2858,21 @@ try{
       $POList['ReleasedBy'] = $this->session->get('userId');
     }
     $file = $this->request->getFile('POFile');
-    $requestfilename = NULL;    
+    $requestfilename = NULL;
     if (!empty($file)) {
-          if ($file && $file->isValid() && !$file->hasMoved()) {
-            $requestfilename = $file->getName();    
-              $path = ROOTPATH.'public/uploads/POfiles/';
-              if(!is_dir($path)) { mkdir($path, 0777, true); }
-              if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
-                log_message('error', 'File already exists in the database'.$requestfilename);
-              }
-              else{
-                $file->move($path, $requestfilename);  
-                $POList['POFile'] = $requestfilename;
-              }
-          }
+      if ($file && $file->isValid() && !$file->hasMoved()) {
+        $requestfilename = $file->getName();
+        $path = ROOTPATH . 'public/uploads/POfiles/';
+        if (!is_dir($path)) {
+          mkdir($path, 0777, true);
+        }
+        if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+          log_message('error', 'File already exists in the database' . $requestfilename);
+        } else {
+          $file->move($path, $requestfilename);
+          $POList['POFile'] = $requestfilename;
+        }
+      }
     }
 
     $POMaster  = $this->purchaseorder_model->updatePOMaster($PONO, $POList);
@@ -3073,8 +3074,34 @@ try{
             }
             if ($capitalType == '0') {
               $ImportTaxList = array(
-                'LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'Grossdutypayable' => $Grossdutypayable, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $NOOfTrip, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'AssessableValue' => $AssessableValue, 'SubTotal' => $SubTotal, 'IGST' => $IGST,
-                'AfterIGST' => $AfterIGST, 'DutyImpact' => $DutyImpact, 'NetValue' => $NetValue, 'ClearingCharge' => $ClearingCharge
+                'LineItemNo' => $LineItemNo,
+                'BasicPriceInMTon' => $BasicPriceinmton,
+                'ProductPrice' => $Productprice,
+                'LandingCharge' => $LandingCharge,
+                'AfterLandingCharge' => $AfterLandingCharge,
+                'CustomDuty' => $CustomDuty,
+                'AfterCustomDuty' => $AfterCustomDuty,
+                'CustomEdCess' => $CustomEd,
+                'CustomSHCess' => $CustomSH,
+                'CreatedBy' => $CreateBy,
+                'CreatedDate' => $createddt,
+                'Grossdutypayable' => $Grossdutypayable,
+                'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG,
+                'QuantityKG' => $QuantityKG,
+                'AfterCustomSHCess' => $AfterCustomSH,
+                'AfterCustomEdCess' => $AfterCustomEd,
+                'TotalValue' => $Totalvalueitem,
+                'FreightType' => $FreightType,
+                'NoOfTrip' => $NOOfTrip,
+                'FreightValue' => $FreightValue,
+                'AfterFreightValue' => $AfterFreightValue,
+                'AssessableValue' => $AssessableValue,
+                'SubTotal' => $SubTotal,
+                'IGST' => $IGST,
+                'AfterIGST' => $AfterIGST,
+                'DutyImpact' => $DutyImpact,
+                'NetValue' => $NetValue,
+                'ClearingCharge' => $ClearingCharge
               );
 
               $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
@@ -3094,8 +3121,34 @@ try{
           }
           if ($capitalType == '0') {
             $ImportTaxList = array(
-              'LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'Grossdutypayable' => $Grossdutypayable, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $NOOfTrip, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'AssessableValue' => $AssessableValue, 'SubTotal' => $SubTotal, 'IGST' => $IGST,
-              'AfterIGST' => $AfterIGST, 'DutyImpact' => $DutyImpact, 'NetValue' => $NetValue, 'ClearingCharge' => $ClearingCharge
+              'LineItemNo' => $LineItemNo,
+              'BasicPriceInMTon' => $BasicPriceinmton,
+              'ProductPrice' => $Productprice,
+              'LandingCharge' => $LandingCharge,
+              'AfterLandingCharge' => $AfterLandingCharge,
+              'CustomDuty' => $CustomDuty,
+              'AfterCustomDuty' => $AfterCustomDuty,
+              'CustomEdCess' => $CustomEd,
+              'CustomSHCess' => $CustomSH,
+              'CreatedBy' => $CreateBy,
+              'CreatedDate' => $createddt,
+              'Grossdutypayable' => $Grossdutypayable,
+              'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG,
+              'QuantityKG' => $QuantityKG,
+              'AfterCustomSHCess' => $AfterCustomSH,
+              'AfterCustomEdCess' => $AfterCustomEd,
+              'TotalValue' => $Totalvalueitem,
+              'FreightType' => $FreightType,
+              'NoOfTrip' => $NOOfTrip,
+              'FreightValue' => $FreightValue,
+              'AfterFreightValue' => $AfterFreightValue,
+              'AssessableValue' => $AssessableValue,
+              'SubTotal' => $SubTotal,
+              'IGST' => $IGST,
+              'AfterIGST' => $AfterIGST,
+              'DutyImpact' => $DutyImpact,
+              'NetValue' => $NetValue,
+              'ClearingCharge' => $ClearingCharge
             );
 
 
@@ -3285,28 +3338,65 @@ try{
     $i = 0;
     $str = array();
     $words = array(
-      '0' => '', '1' => 'one', '2' => 'two',
-      '3' => 'three', '4' => 'four', '5' => 'five', '6' => 'six',
-      '7' => 'seven', '8' => 'eight', '9' => 'nine',
-      '10' => 'ten', '11' => 'eleven', '12' => 'twelve',
-      '13' => 'thirteen', '14' => 'fourteen',
-      '15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
-      '18' => 'eighteen', '19' => 'nineteen', '20' => 'twenty',
-      '30' => 'thirty', '40' => 'fourty', '50' => 'fifty',
-      '60' => 'sixty', '70' => 'seventy',
-      '80' => 'eighty', '90' => 'ninety', '06' => 'Zero Six', '01' => 'Zero One', '02' => 'Zero Two', '03' => 'Zero Three', '04' => 'Zero Four', '05' => 'Zero Five', '07' => 'Zero Seven', '08' => 'Zero Eight', '09' => 'Zero Nine'
+      '0' => '',
+      '1' => 'one',
+      '2' => 'two',
+      '3' => 'three',
+      '4' => 'four',
+      '5' => 'five',
+      '6' => 'six',
+      '7' => 'seven',
+      '8' => 'eight',
+      '9' => 'nine',
+      '10' => 'ten',
+      '11' => 'eleven',
+      '12' => 'twelve',
+      '13' => 'thirteen',
+      '14' => 'fourteen',
+      '15' => 'fifteen',
+      '16' => 'sixteen',
+      '17' => 'seventeen',
+      '18' => 'eighteen',
+      '19' => 'nineteen',
+      '20' => 'twenty',
+      '30' => 'thirty',
+      '40' => 'fourty',
+      '50' => 'fifty',
+      '60' => 'sixty',
+      '70' => 'seventy',
+      '80' => 'eighty',
+      '90' => 'ninety',
+      '06' => 'Zero Six',
+      '01' => 'Zero One',
+      '02' => 'Zero Two',
+      '03' => 'Zero Three',
+      '04' => 'Zero Four',
+      '05' => 'Zero Five',
+      '07' => 'Zero Seven',
+      '08' => 'Zero Eight',
+      '09' => 'Zero Nine'
     );
     $words1 = array(
       '2' => 'twenty',
-      '3' => 'thirty', '4' => 'fourty',
-      '5' => 'fifty', '6' => 'sixty', '7' => 'seventy',
-      '8' => 'eighty', '9' => 'ninety'
+      '3' => 'thirty',
+      '4' => 'fourty',
+      '5' => 'fifty',
+      '6' => 'sixty',
+      '7' => 'seventy',
+      '8' => 'eighty',
+      '9' => 'ninety'
     );
     $words12 = array(
       '11' => 'eleven',
-      '12' => 'twelve', '13' => 'thirteen', '14' => 'fourteen',
-      '15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
-      '18' => 'eighteen', '19' => 'nineteen', '20' => 'twenty',
+      '12' => 'twelve',
+      '13' => 'thirteen',
+      '14' => 'fourteen',
+      '15' => 'fifteen',
+      '16' => 'sixteen',
+      '17' => 'seventeen',
+      '18' => 'eighteen',
+      '19' => 'nineteen',
+      '20' => 'twenty',
     );
     $digits = array('', 'hundred', 'thousand', 'lakh', 'crore');
     while ($i < $digits_1) {
@@ -3373,28 +3463,56 @@ try{
     $i = 0;
     $str = array();
     $words = array(
-      '0' => '', '1' => 'one', '2' => 'two',
-      '3' => 'three', '4' => 'four', '5' => 'five', '6' => 'six',
-      '7' => 'seven', '8' => 'eight', '9' => 'nine',
-      '10' => 'ten', '11' => 'eleven', '12' => 'twelve',
-      '13' => 'thirteen', '14' => 'fourteen',
-      '15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
-      '18' => 'eighteen', '19' => 'nineteen', '20' => 'twenty',
-      '30' => 'thirty', '40' => 'fourty', '50' => 'fifty',
-      '60' => 'sixty', '70' => 'seventy',
-      '80' => 'eighty', '90' => 'ninety'
+      '0' => '',
+      '1' => 'one',
+      '2' => 'two',
+      '3' => 'three',
+      '4' => 'four',
+      '5' => 'five',
+      '6' => 'six',
+      '7' => 'seven',
+      '8' => 'eight',
+      '9' => 'nine',
+      '10' => 'ten',
+      '11' => 'eleven',
+      '12' => 'twelve',
+      '13' => 'thirteen',
+      '14' => 'fourteen',
+      '15' => 'fifteen',
+      '16' => 'sixteen',
+      '17' => 'seventeen',
+      '18' => 'eighteen',
+      '19' => 'nineteen',
+      '20' => 'twenty',
+      '30' => 'thirty',
+      '40' => 'fourty',
+      '50' => 'fifty',
+      '60' => 'sixty',
+      '70' => 'seventy',
+      '80' => 'eighty',
+      '90' => 'ninety'
     );
     $words1 = array(
       '2' => 'twenty',
-      '3' => 'thirty', '4' => 'fourty',
-      '5' => 'fifty', '6' => 'sixty', '7' => 'seventy',
-      '8' => 'eighty', '9' => 'ninety'
+      '3' => 'thirty',
+      '4' => 'fourty',
+      '5' => 'fifty',
+      '6' => 'sixty',
+      '7' => 'seventy',
+      '8' => 'eighty',
+      '9' => 'ninety'
     );
     $words12 = array(
       '11' => 'eleven',
-      '12' => 'twelve', '13' => 'thirteen', '14' => 'fourteen',
-      '15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
-      '18' => 'eighteen', '19' => 'nineteen', '20' => 'twenty',
+      '12' => 'twelve',
+      '13' => 'thirteen',
+      '14' => 'fourteen',
+      '15' => 'fifteen',
+      '16' => 'sixteen',
+      '17' => 'seventeen',
+      '18' => 'eighteen',
+      '19' => 'nineteen',
+      '20' => 'twenty',
     );
     $digits = array('', 'hundred', 'thousand', 'lakh', 'crore');
     while ($i < $digits_1) {
@@ -3991,7 +4109,7 @@ try{
     }
   }
 
-  
+
   public function adfile()
   {
     $picture = '';
diff --git a/app/Controllers/User.php b/app/Controllers/User.php
index b0640664..c1c74bd3 100644
--- a/app/Controllers/User.php
+++ b/app/Controllers/User.php
@@ -901,7 +901,7 @@ class User extends BaseController
         $data['userRecords'] = $this->user_model->userListing();
 
         $this->global['pageTitle'] = 'User Listing';
-
+        // dd($data);
         $this->loadViews("userListing", $this->global, $data, NULL);
         //}
     }
@@ -1095,10 +1095,10 @@ class User extends BaseController
         $data['EmpRole'] =   $this->user_model->GetRoleNameByUserID($Uid);
         $data['AccessDept'] = $this->costcenter_model->getaccessDept($Empid);
 
-        // $data['userInfo'] = $this->user_model->getUserInfo($userId);
+        // $data['userInfo'] = $this->user_model->getUserInfo($Uid);
+        $data['userId'] = $Uid;
 
         $this->global['pageTitle'] = 'Edit User';
-
         $this->loadViews("editOld", $this->global, $data, NULL);
         //}
     }
@@ -1126,7 +1126,7 @@ class User extends BaseController
         // } else {
         $EmpID = $this->request->getPost('EmpList');
         $role = $this->request->getPost('role');
-        $password = $this->request->getPost('password');
+        // $password = $this->request->getPost('password');
 
         $updatedDate =  get_current_date_time();
 
@@ -1134,7 +1134,8 @@ class User extends BaseController
 
         $userInfo = array();
 
-        $userInfo = array('password' => getHashedPassword($password), 'roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate);
+        // $userInfo = array('password' => getHashedPassword($password), 'roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate);
+        $userInfo = array('roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate);
 
         $result = $this->user_model->editUser($userInfo,  $EmpID);
 
@@ -1168,6 +1169,34 @@ class User extends BaseController
         echo 'Succssfully change the user status to InAcive';
     }
 
+    
+    function userChangePassword()
+    {
+        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');
+                }
+
+                return redirect()->route('userListing');
+        } else {
+            $this->session->setFlashdata('error', 'New Password and Confirm Password Not Same');
+            return redirect()->route('userListing');
+        }
+    }
+
     /**
      * This function is used to load the change password screen
      */
@@ -1191,10 +1220,11 @@ class User extends BaseController
         // $this->validator->setRules(['cNewPassword', 'Confirm new password'=> 'required|matches[newPassword]|max_length[20]']);
 
         // if ($this->validator->run() == FALSE) {
-            $oldPassword = $this->request->getPost('oldPassword');
-            $newPassword = $this->request->getPost('newPassword');
-            $cNewPassword = $this->request->getPost('newPassword');
-        if($newPassword === $cNewPassword && $oldPassword != $newPassword) {
+        $oldPassword = $this->request->getPost('oldPassword');
+        $newPassword = $this->request->getPost('newPassword');
+        $cNewPassword = $this->request->getPost('cNewPassword');
+
+        if ($newPassword == $cNewPassword) {
             $resultPas = $this->user_model->matchOldPassword($this->vendorId, $oldPassword);
             if (empty($resultPas)) {
                 $this->session->setFlashdata('nomatch', 'Your old password not correct');
@@ -1205,7 +1235,6 @@ class User extends BaseController
                     'updatedBy' => $this->vendorId,
                     'updatedDtm' => date('Y-m-d H:i:sa')
                 );
-                $this->session->setFlashdata('error', 'Password updation failed');
                 $result = $this->user_model->changePassword($this->vendorId, $usersData);
                 if ($result > 0) {
                     $this->session->setFlashdata('success', 'Password updation successful');
@@ -1215,6 +1244,9 @@ class User extends BaseController
 
                 return redirect()->route('loadChangePass');
             }
+        } else {
+            $this->session->setFlashdata('error', 'New Password and Confirm Password Not Same');
+            return redirect()->route('loadChangePass');
         }
     }
 
diff --git a/app/Models/Expense_model.php b/app/Models/Expense_model.php
index 24c0a807..f3090317 100644
--- a/app/Models/Expense_model.php
+++ b/app/Models/Expense_model.php
@@ -9,7 +9,7 @@ class Expense_model extends Model
     protected $primaryKey = 'id'; // Primary key
 
     protected $allowedFields = [
-        'transporter_file', 'supplier_id', 'remarks', 'cost', 'gst', 'total', 'status', 'payment_method'
+        'transporter_file', 'supplier_id', 'remarks', 'item_description', 'cost', 'cgst', 'sgst', 'igst', 'total', 
     ];
 
     // Retrieve all active expenses
diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index 116e905e..d319407e 100644
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -868,7 +868,7 @@ if (!empty($getlogpodtl)) {
 										<label>Delivery Date<span class="text-danger">*</span></label>
 										<div>
 											<?php
-											$data = array('type'=>'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+											$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
 											echo form_input($data);
 											?>
 										</div>
diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php
index 50414640..0aba698f 100644
--- a/app/Views/addEmployeenew.php
+++ b/app/Views/addEmployeenew.php
@@ -377,20 +377,20 @@
 </script>
 <div class="content-page">
     <div class="content">
+        <div class="row">
+            <div class="col-6">
+                <div class="page-title-box page-title-box-alt">
+                    <h4 class="page-title">Add Employee</h4>
+                </div>
+            </div>
+            <div class="col-6 text-right">
+                <a class=" btn btn-dark waves-effect waves-light" href="<?php echo base_url() ?>employeeListing"><span class="bold">Back</span></a>
+            </div>
+        </div>
         <div class="row">
             <div class="col-xl-12">
                 <div class="card">
                     <div class="card-body">
-                        <div class="row">
-                            <div class="col-6">
-                                <div class="page-title-box page-title-box-alt">
-                                    <h4 class="page-title">Add Employee</h4>
-                                </div>
-                            </div>
-                            <div class="col-6 text-right">
-                                <a class=" btn btn-dark waves-effect waves-light" href="<?php echo base_url() ?>employeeListing"><span class="bold">Back</span></a>
-                            </div>
-                        </div>
                         <div id="rootwizard">
                             <ul class="nav nav-pills nav-justified form-wizard-header mb-3">
                                 <li class="nav-item" data-target-form="#accountForm">
@@ -411,7 +411,7 @@
                                     <a href="#third" data-toggle="tab" class="nav-link">
                                         <!-- <a data-toggle="tab" class="nav-link"> -->
                                         <span class="number">3</span>
-                                        <span class="d-none d-sm-inline">Bank Details & Emp Benefits</span>
+                                        <span class="d-none d-sm-inline">Bank & Emp Benefits</span>
                                     </a>
                                 </li>
                                 <li class="nav-item" data-target-form="#proofForm">
@@ -450,29 +450,30 @@
                                             </div>
                                             <div class="col-md-10">
                                                 <div class="row">
-                                                    <div class="col-md-2 pad">
+                                                    <div class="col-md-4 pad">
                                                         <span>Full Name</span><span class="badge">*</span>
                                                         <input type="text" name="FirstName"
                                                             onkeypress="return onlyAlphabets(event);" maxlength="100"
                                                             id="FirstName" class="form-control" required>
                                                     </div>
 
-                                                    <div class="col-md-2 pad"><span>Father / Husband Name</span><span
+                                                    <div class="col-md-4 pad"><span>Father / Husband Name</span><span
                                                             class="badge">*</span>
                                                         <input type="text" name="FatherName"
                                                             onkeypress="return onlyAlphabets(event);" id="FatherName"
                                                             maxlength="200" class="form-control" required>
                                                     </div>
 
-                                                    <div class="col-md-2 pad"><span>Contact Number</span><span
+                                                    <div class="col-md-4 pad"><span>Contact Number</span><span
                                                             class="badge">*</span>
                                                         <input type="text" name="ContactNumber"
                                                             onchange="return getMobileValidation();" id="ContactNumber"
                                                             required pattern="(.){10,10}" maxlength="10"
                                                             class="form-control" onkeypress="return isNumberKey(event)">
                                                     </div>
-
-                                                    <div class="col-md-2 pad"><span>Gender</span><span
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col-md-4 pad"><span>Gender</span><span
                                                             class="badge">*</span>
                                                         <select id="gender" name="gender" type="text" required
                                                             class="form-control select2">
@@ -489,27 +490,27 @@
                                                             ?>
                                                         </select>
                                                     </div>
-                                                    <div class="col-md-2 pad"><span>Date Of Birth</span><span
+                                                    <div class="col-md-4 pad"><span>Date Of Birth</span><span
                                                             class="badge">*</span>
                                                         <input id="DateofBirth" required name="DateofBirth"
                                                             onkeypress="return false;" maxlength="10"
                                                             onchange="getAge();" class="form-control " data-provide="datepicker" data-date-format="dd-mm-yyyy">
                                                     </div>
-                                                </div>
-                                                <div class="row">
-                                                    <div class="col-md-2 pad"><span>Age</span>
+                                                    <div class="col-md-4 pad"><span>Age</span>
                                                         <input type="text" name="age" id="age" class="form-control"
                                                             readonly>
                                                     </div>
-                                                    <div class="col-md-2 pad"><span>Personal Email ID</span>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col-md-4 pad"><span>Personal Email ID</span><span class="badge">*</span>
                                                         <input type="email" name="emailid" id="emailid" maxlength="100"
-                                                            class="form-control">
+                                                            class="form-control" required>
                                                     </div>
-                                                    <div class="col-md-2 pad"> <span>Official Email ID</span>
+                                                    <div class="col-md-4 pad"> <span>Official Email ID</span>
                                                         <input type="email" name="comemailid" id="mail" maxlength="100"
                                                             class="form-control">
                                                     </div>
-                                                    <div class="col-md-2 pad">
+                                                    <div class="col-md-4 pad">
 
                                                         <span>Blood group</span><span class="badge">*</span>
                                                         <select id="bloodgroup" name="bloodgroup" required
@@ -527,8 +528,9 @@
                                                             ?>
                                                         </select>
                                                     </div>
-
-                                                    <div class="col-md-2 pad">
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col-md-4 pad">
                                                         <span>Marital Status</span><span class="badge">*</span>
                                                         <select id="MartialStatus" name="MartialStatus" type="text"
                                                             required placeholder="Marital status"
@@ -546,17 +548,17 @@
                                                             ?>
                                                         </select>
                                                     </div>
-                                                </div>
-                                                <div class="row">
                                                     <div class="col-md-4 pad">
                                                         <span>Current Address</span><span class="badge">*</span>
                                                         <input type="text" id="currentaddress" required name="currentaddress"
                                                             pattern=".{0,500}" maxlength="500" class="form-control">
                                                     </div>
-                                                    <div class="col-md-2 pad" style="margin-top: 18px;">
+                                                    <div class="col-md-4 pad" style="margin-top: 18px;">
                                                         <input type="checkbox" id="checksame" name="sameaddress"
                                                             onclick="CheckClick"> Current address same as permanent address
                                                     </div>
+                                                    </div>
+                                                <div class="row">
                                                     <div class="col-md-4 pad">
                                                         <span>Permanent Address</span><span
                                                             class="badge">*</span>
@@ -564,16 +566,15 @@
                                                             name="permanentaddress" pattern=".{0,500}" maxlength="500"
                                                             class="form-control">
                                                     </div>
-                                                </div>
-                                                <div class="row">
-                                                    <div class="col-md-3 pad">
+                                            
+                                                    <div class="col-md-4 pad">
                                                         <span>Emergency Contact Name</span>
                                                         <input type="text" id="emergencycontactname"
                                                             onkeypress="return onlyAlphabets(event);" maxlength="100"
                                                             name="emergencycontactname" class="form-control">
                                                     </div>
 
-                                                    <div class="col-md-3">
+                                                    <div class="col-md-4">
                                                         <span>Emergency Contact Number</span>
                                                         <input type="text" id="emergencycontactnumber"
                                                             name="emergencycontactnumber"
@@ -594,7 +595,7 @@
                                 </div>
 
                                 <div class="tab-pane fade" id="second">
-                                    <form id="profileForm" method="post" action="#" class="form-horizontal">
+                                    <form id="profileForm" method="post" action="#" class="form-horizontal" style="height: 250px;">
                                         <div class="row">
                                             <div class="col-md-1">
                                             </div>
@@ -679,8 +680,7 @@
                                                             onchange=" return getValidReferNumber();" maxlength="10"
                                                             onkeypress="return isNumberKey(event)" class="form-control">
                                                     </div>
-                                                </div>
-                                                <div class="row" style="margin-bottom: 20px;">
+                                               
 
                                                     <div class="col-md-3"><span>Work Location</span><span class="badge">*</span>
                                                         <select type="text" id="work_location" name="work_location" required
@@ -966,7 +966,7 @@
                                 </div>
 
                                 <div class="tab-pane fade" id="fivth">
-                                    <form id="fileForm" method="post" action="#" class="form-horizontal" enctype="multipart/form-data">
+                                    <form id="fileForm" method="post" action="#" class="form-horizontal" enctype="multipart/form-data" style="height: 250px;">
                                         <div class="row">
                                             <div class="col-md-1">
                                             </div>
diff --git a/app/Views/addUser.php b/app/Views/addUser.php
index b1a13a43..6002edf2 100644
--- a/app/Views/addUser.php
+++ b/app/Views/addUser.php
@@ -10,7 +10,7 @@
                     </div>
                 </div>
                 <div class="col-6 text-right">
-                <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
+                    <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
                 </div>
             </div>
             <!-- end page title -->
@@ -159,48 +159,49 @@
         $('#EmpList').select2();
 
         $("#EmpList").change(function() {
-        var empID = $(this).val();
-        console.log(empID);
-        
-        if (empID) {
-            $.ajax({
-                url: "<?php echo base_url() ?>fetchEmployeeDetails", 
-                type: 'POST',
-                data: { EmpID: empID },
-                success: function(data) {
-                    console.log(data);
-                    
-                    if (data.success) {
-                        console.log(data.userInfo[0].FirstName);
-                        
-                        $("#FirstName").val(data.userInfo[0].FirstName);
-                        $("#LastName").val(data.userInfo[0].LastName);
-                        $("#Designation").val(data.userInfo[0].Designation);
-                        $("#MailID").val(data.userInfo[0].EmailId);
-                        $("#ContactNo").val(data.userInfo[0].ContactNumber);
-                    } else {
-                        alert('Employee not found');
+            var empID = $(this).val();
+            console.log(empID);
+
+            if (empID) {
+                $.ajax({
+                    url: "<?php echo base_url() ?>fetchEmployeeDetails",
+                    type: 'POST',
+                    data: {
+                        EmpID: empID
+                    },
+                    success: function(data) {
+                        console.log(data);
+
+                        if (data.success) {
+                            console.log(data.userInfo[0].FirstName);
+
+                            $("#FirstName").val(data.userInfo[0].FirstName);
+                            $("#LastName").val(data.userInfo[0].LastName);
+                            $("#Designation").val(data.userInfo[0].Designation);
+                            $("#MailID").val(data.userInfo[0].EmailId);
+                            $("#ContactNo").val(data.userInfo[0].ContactNumber);
+                        } else {
+                            alert('Employee not found');
+                        }
+                    },
+                    error: function() {
+                        alert('Failed to fetch employee details');
                     }
-                },
-                error: function() {
-                    alert('Failed to fetch employee details');
-                }
-            });
-        } else {
-            // Clear fields if no employee ID is selected
-            $("#FirstName").val('');
-            $("#LastName").val('');
-            $("#Designation").val('');
-            $("#MailID").val('');
-            $("#ContactNo").val('');
-        }
-    });
+                });
+            } else {
+                // Clear fields if no employee ID is selected
+                $("#FirstName").val('');
+                $("#LastName").val('');
+                $("#Designation").val('');
+                $("#MailID").val('');
+                $("#ContactNo").val('');
+            }
+        });
     });
 
     $('#addPop').click(function() {
         if ($('#distriList option:selected').val() != null) {
-            if ($('#distriList option:selected').val() == 0) {
-            } else {
+            if ($('#distriList option:selected').val() == 0) {} else {
                 var tempSelect = $('#distriList option:selected').val();
                 var tempText = $('#distriList option:selected').text();
                 var o = new Option(tempText, tempSelect);
@@ -227,30 +228,29 @@
 </script>
 
 <script>
-function Validate() {
-    var isValid = true;
+    function Validate() {
+        var isValid = true;
 
-    var fname = document.getElementById('FirstName').value;
-    if (!fname) {
-        alert('First Name is required');
-        isValid = false;
+        var fname = document.getElementById('FirstName').value;
+        if (!fname) {
+            alert('First Name is required');
+            isValid = false;
+        }
+
+        var email = document.getElementById('MailID').value;
+        var emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+        if (!emailPattern.test(email)) {
+            alert('Invalid email address');
+            isValid = false;
+        }
+
+        var password = document.getElementById('password').value;
+        var cpassword = document.getElementById('cpassword').value;
+        if (password !== cpassword) {
+            alert('Passwords do not match');
+            isValid = false;
+        }
+
+        return isValid;
     }
-
-    var email = document.getElementById('MailID').value;
-    var emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    if (!emailPattern.test(email)) {
-        alert('Invalid email address');
-        isValid = false;
-    }
-
-    var password = document.getElementById('password').value;
-    var cpassword = document.getElementById('cpassword').value;
-    if (password !== cpassword) {
-        alert('Passwords do not match');
-        isValid = false;
-    }
-
-    return isValid;
-}
-</script>
-
+</script>
\ No newline at end of file
diff --git a/app/Views/addconfig.php b/app/Views/addconfig.php
index 20cd98e4..92fae60c 100644
--- a/app/Views/addconfig.php
+++ b/app/Views/addconfig.php
@@ -3,13 +3,15 @@
 		background-color: #ddd;
 	}
 </style>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.13.6/underscore-min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.min.js"></script>
 
 <div class="content-page">
 	<div class="content">
 		<!-- Start Content-->
 		<div class="container-fluid">
 			<!-- start page title -->
-			<div class="row"  style="margin-bottom: 10px;">
+			<div class="row" style="margin-bottom: 10px;">
 				<div class="col-6">
 					<div class="page-title-box page-title-box-alt">
 						<h4 class="page-title"> Add Config Details</h4>
@@ -58,7 +60,7 @@
 										echo form_input($data);
 										?>
 									</div>
-								</div> 
+								</div>
 								<div class="form-row" style="margin-top:10px">
 									<div class="col-md-12 text-right">
 										<a data-toggle="modal" href="#AddConfiguration" style="margin-right: 10px;" class="btn btn-success"><i class="fa fa-plus"></i>&nbsp;&nbsp;Add Configuration</a>
@@ -90,6 +92,7 @@
 									</div>
 								</div>
 								<div class="col-md-12 text-right">
+									<input type="hidden" name="txtRowCount" id="txtRowCount" />
 									<input type="reset" id="reset" class="btn btn-reset" style="background-color: red;color: white;    margin-right: 15px;width: 80px;" value="Reset" />
 									<input type="submit" onclick="return Validate();" value="Submit" class="btn btn-success">
 								</div>
@@ -118,8 +121,7 @@
 					<?php echo session()->getFlashdata('success'); ?>
 				</div>
 			<?php } ?>
-		</div>
-		t <!-- end row -->
+		</div> <!-- end row -->
 	</div> <!-- container -->
 </div> <!-- content -->
 
@@ -128,9 +130,9 @@
 		<div class="modal-content">
 			<!-- Modal Header -->
 			<div class="modal-header">
-			<h4 class="modal-title" id="myModalLabel">Add Configuration</h4>
-                <button type="button" class="close" data-dismiss="modal"
-                    aria-hidden="true">×</button> 
+				<h4 class="modal-title" id="myModalLabel">Add Configuration</h4>
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true">×</button>
 			</div>
 
 			<!-- Modal Body -->
@@ -145,7 +147,7 @@
 							</div>
 							<div class="col-md-5">
 
-								<input class="form-control" name="ConfigValue" class="form-control" id="ConfigValue" type="text">
+								<input class="form-control" name="ConfigValue" class="form-control" required="true" id="ConfigValue" type="text">
 
 							</div>
 						</div>
@@ -156,8 +158,8 @@
 
 			<!-- Modal Footer -->
 			<div class="modal-footer">
-				<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-				<a class="btn btn-success font tempClickAdd" ID="tempClickAdd" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
+				<a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px" data-dismiss="modal" value="Cancel">Cancel</a>
+				<a class="btn btn-success font tempClickAdd" ID="tempClickAdd"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
 			</div>
 		</div>
 	</div>
@@ -194,7 +196,7 @@
 			</div>
 			<!-- Modal Footer -->
 			<div class="modal-footer">
-				<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+				<a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
 				<a class="btn btn-success font tempClickEdit" ID="tempClickEdit" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a>
 			</div>
 		</div>
@@ -213,162 +215,172 @@
 
 
 		<td>
-			<a data-target='#Edit' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#Edit"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ConfigValue%> Budget details"></i>&nbsp;&nbsp;&nbsp;</a>
+			<a class="editConfig" data-target='#Edit' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#Edit"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ConfigValue%> Budget details"></i>&nbsp;&nbsp;&nbsp;</a>
 
 
 		</td>
 	</tr>
 </script>
 <script>
-	var index = '1';
-	var numbers = /^[0-9]+$/;
-	var userid = '';
+	$(document).ready(function() {
 
-	$("#Edit").on("shown.bs.modal", function(e) {
-		userid = $(e.relatedTarget).data('userid');
-		var s = $('#configtable tr:eq(' + userid + ') td:eq(1)').text()
-		$("#EditConfigValue").val(s);
-	});
+		var index = '1';
+		var numbers = /^[0-9]+$/;
+		var userid = '';
+
+		$("#Edit").on("shown.bs.modal", function(e) {
+			userid = $(e.relatedTarget).data('userid');
+
+			var s = $('#configtable tr:eq(' + userid + ') td:eq(1)').text()
+			$("#EditConfigValue").val(s);
+		});
 
 
-	$('.tempClickAdd').click(function() {
+		$('.tempClickAdd').click(function() {
+			if ($("#ConfigValue").val() != '-1' && $("#ConfigValue").val() != null && $("#ConfigValue").val() != '') {
 
-		if ($("#ConfigValue").val() != '-1') {
-
-			$('#ConfigValue').show();
-			var temp = index;
-			var ConfigValue = $("#ConfigValue").val();
+				$('#ConfigValue').show();
+				var temp = index;
+				var ConfigValue = $("#ConfigValue").val();
 
 
 
-			$('#ConfigValue').val('');
+				$('#ConfigValue').val('');
 
 
-			index = parseInt(index) + 1;
+				index = parseInt(index) + 1;
 
 
 
-			var template = jQuery("#tempList").html();
+				var template = jQuery("#tempList").html();
+				var html = `
+	            <tr id="${temp}">
+                    <td>${temp}</td>
+                    <td>${ConfigValue}</td>
+                    <td>
+                            <a class="editConfig" data-target='#Edit' data-id="${temp}" data-index="${index}" data-userid="${temp}" data-toggle="modal" href="#Edit">
+                                <i class="ri-pencil-fill"></i>
+                                &nbsp;&nbsp;&nbsp;
+                            </a> 
+                        </td>
+                </tr>`;
+				$('#tempAppend').append(html);
+
+				var theForm = $("#addconfig");
+
+				addHidden(theForm, "ConfigValue" + temp, ConfigValue);
 
 
-			$('#tempAppend').append(_.template(template, {
-				index: temp,
-				ConfigValue: ConfigValue
-			}));
+				$('#txtRowCount').val(temp);
 
+				$('#AddConfiguration').modal('hide');
+				//CountRows();
+			} else {
+				alert('Please enter a value');
 
-			var theForm = $(".addconfig");
-
-			addHidden(theForm, "ConfigValue" + temp, ConfigValue);
-
-
-			$('#txtRowCount').val(temp);
-
-			//CountRows();
-		} else {
-			alert('Please enter all the values');
-
-		}
-
-	});
-
-	function addHidden(theForm, key, value) {
-		// Create a hidden input element, and append it to the form:
-		var input = document.createElement('input');
-		input.type = 'hidden';
-		input.name = key;
-		'name-as-seen-at-the-server';
-		input.value = value;
-		input.id = key;
-		theForm.append(input);
-	}
-
-
-	$('.tempClickEdit').click(function() {
-
-
-		if ($("#EditConfigValue").val() != '') {
-
-
-			var temp = index;
-			var ConfigValue = $("#EditConfigValue").val();
-			//alert(userid);
-
-			$('#configtable tr:eq(' + userid + ') td:eq(1)').text(ConfigValue);
-
-			//alert($('#hConfigValue'+userid).val());
-			//$('#hConfigValue'+userid).val(ConfigValue);
-			$("#ConfigValue" + userid).val(ConfigValue); //ConfigValue2
-
-
-
-
-		} else {
-			alert('Please enter all the values');
-
-		}
-
-	});
-
-
-
-	function ConfirmDelete() {
-		var x = confirm("Are you sure you want to delete?");
-		if (x)
-			return true;
-		else
-			return false;
-	}
-
-	function isNumberKey(evt) {
-		var charCode = (evt.which) ? evt.which : evt.keyCode;
-		if (charCode != 46 && charCode > 31 &&
-			(charCode < 48 || charCode > 57))
-			return false;
-
-		return true;
-	}
-
-
-	function Rowcount() {
-		var rowCount = $('#configtable').length;
-		if (rowCount == '4') {
-			$("#AddConfiguration").modal('hide');
-
-		} else {
-
-			$("#AddConfiguration").modal('show');
-		}
-
-	}
-
-
-	var totalRowCount = 0;
-	var rowCount = 0;
-	var table = document.getElementById("configtable");
-	var rows = table.getElementsByTagName("tr");
-
-	function CountRows() {
-		totalRowCount = 0;
-		rowCount = 0;
-		table = document.getElementById("ConfigValue");
-		rows = table.getElementsByTagName("tr")
-		for (var i = 0; i < rows.length; i++) {
-			totalRowCount++;
-			if (rows[i].getElementsByTagName("td").length > 0) {
-				rowCount++;
 			}
+
+		});
+
+		function addHidden(theForm, key, value) {
+			// Create a hidden input element, and append it to the form:
+			var input = document.createElement('input');
+			input.type = 'hidden';
+			input.name = key;
+			// 'name-as-seen-at-the-server';
+			input.value = value;
+			input.id = key;
+			$(theForm).append(input);
 		}
 
 
-		var message = "Total Row Count: " + totalRowCount;
-		message += "\nRow Count: " + rowCount;
-		//alert(message);
-		if (totalRowCount > "4") {
-			$("#AddConfiguration").modal('hide');
-		} else {
-			return false;
+		$('.tempClickEdit').click(function() {
+
+
+			if ($("#EditConfigValue").val() != '') {
+
+
+				var temp = index;
+				var ConfigValue = $("#EditConfigValue").val();
+				//alert(userid);
+
+				$('#configtable tr:eq(' + userid + ') td:eq(1)').text(ConfigValue);
+
+				//alert($('#hConfigValue'+userid).val());
+				//$('#hConfigValue'+userid).val(ConfigValue);
+				$("#ConfigValue" + userid).val(ConfigValue); //ConfigValue2
+
+
+
+				$("#AddConfiguration").modal('hide');
+
+			} else {
+				alert('Please enter all the values');
+
+			}
+
+		});
+
+
+
+		function ConfirmDelete() {
+			var x = confirm("Are you sure you want to delete?");
+			if (x)
+				return true;
+			else
+				return false;
 		}
 
-	}
+		function isNumberKey(evt) {
+			var charCode = (evt.which) ? evt.which : evt.keyCode;
+			if (charCode != 46 && charCode > 31 &&
+				(charCode < 48 || charCode > 57))
+				return false;
+
+			return true;
+		}
+
+
+		function Rowcount() {
+			var rowCount = $('#configtable').length;
+			if (rowCount == '4') {
+				$("#AddConfiguration").modal('hide');
+
+			} else {
+
+				$("#AddConfiguration").modal('show');
+			}
+
+		}
+
+
+		var totalRowCount = 0;
+		var rowCount = 0;
+		var table = document.getElementById("configtable");
+		var rows = table.getElementsByTagName("tr");
+
+		function CountRows() {
+			totalRowCount = 0;
+			rowCount = 0;
+			table = document.getElementById("ConfigValue");
+			rows = table.getElementsByTagName("tr")
+			for (var i = 0; i < rows.length; i++) {
+				totalRowCount++;
+				if (rows[i].getElementsByTagName("td").length > 0) {
+					rowCount++;
+				}
+			}
+
+
+			var message = "Total Row Count: " + totalRowCount;
+			message += "\nRow Count: " + rowCount;
+			//alert(message);
+			if (totalRowCount > "4") {
+				$("#AddConfiguration").modal('hide');
+			} else {
+				return false;
+			}
+
+		}
+	});
 </script>
\ No newline at end of file
diff --git a/app/Views/companyview.php b/app/Views/companyview.php
index 1a887da5..a0e71b17 100644
--- a/app/Views/companyview.php
+++ b/app/Views/companyview.php
@@ -1,6 +1,6 @@
 <?php
 $CompID = '';
-$CompanyName= '';
+$CompanyName = '';
 $Address = '';
 $ContactNumber = '';
 $AlternateContactNumber = '';
@@ -21,99 +21,87 @@ $CreatedDate = '';
 $UpdatedBy = '';
 $Updatedon = '';
 $ProfilePic = '';
-$companywebsite ='';
+$companywebsite = '';
 //$ceoname='';
 //$companystartedon='';
 //$partnerdetails='';
 $firstname = '';
 //$files ='';
-$financialyear='';
-$filename='';
-$ID='';
-$filedescription1='';
-$financialstart='';
-$financialend='';
-$bankname='';
-$bankifsc='';
-$bankaddress='';
-$bank_isactive = 1 ;
+$financialyear = '';
+$filename = '';
+$ID = '';
+$filedescription1 = '';
+$financialstart = '';
+$financialend = '';
+$bankname = '';
+$bankifsc = '';
+$bankaddress = '';
+$bank_isactive = 1;
 $MSME = '';
 //print_r($userRecords);die();
-if(!empty($userRecords))
-{
-    foreach ($userRecords as $uf)
-    {
-		$CompID = $uf->CompID;
-        $CompanyName = $uf->CompanyName;
-        $Address = $uf->Address;
-        $ContactNumber = $uf->ContactNumber;
-		$AlternateContactNumber = $uf->AlternateContactNumber;
-		$EmailAddress= $uf->EmailAddress;
-		$Exiseregistration= $uf->Exiseregistration;
-		$TIN	= $uf->TIN;
-		$PAN= $uf->PAN;
-		$GSTNO = $uf->GSTNO;
-		$GSTRange = $uf->GSTRange;
-		$CollectrateAddress = $uf->CollectrateAddress;
-		$UANumber = $uf->UANumber;
-		$PaymentTerms = $uf->PaymentTerms  ;
+if (!empty($userRecords)) {
+  foreach ($userRecords as $uf) {
+    $CompID = $uf->CompID;
+    $CompanyName = $uf->CompanyName;
+    $Address = $uf->Address;
+    $ContactNumber = $uf->ContactNumber;
+    $AlternateContactNumber = $uf->AlternateContactNumber;
+    $EmailAddress = $uf->EmailAddress;
+    $Exiseregistration = $uf->Exiseregistration;
+    $TIN  = $uf->TIN;
+    $PAN = $uf->PAN;
+    $GSTNO = $uf->GSTNO;
+    $GSTRange = $uf->GSTRange;
+    $CollectrateAddress = $uf->CollectrateAddress;
+    $UANumber = $uf->UANumber;
+    $PaymentTerms = $uf->PaymentTerms;
     $PaymentId = $uf->paymentID;
     $MSME = $uf->MSME;
-		//$PaymentDays  = $uf->PaymentDays  ;
-		//$PayableAT  = $uf->PayableAT ;
-		$Createdby = $uf->Createdby;
-		//$CreatedDate = $uf->CreatedDate;
-		$UpdatedBy = $uf->UpdatedBy;
-		$Updatedon = $uf->Updatedon;
-		$ProfilePic = $uf->ProfilePic;
-    $companywebsite = $uf->companyWebsite; 
-		//$companywebsite = $uf->companywebsite;	
-		//$ceoname = $uf->ceoname;	
-		//$mdname = $uf->mdname;
+    //$PaymentDays  = $uf->PaymentDays  ;
+    //$PayableAT  = $uf->PayableAT ;
+    $Createdby = $uf->Createdby;
+    //$CreatedDate = $uf->CreatedDate;
+    $UpdatedBy = $uf->UpdatedBy;
+    $Updatedon = $uf->Updatedon;
+    $ProfilePic = $uf->ProfilePic;
+    $companywebsite = $uf->companyWebsite;
+    //$companywebsite = $uf->companywebsite;	
+    //$ceoname = $uf->ceoname;	
+    //$mdname = $uf->mdname;
     //$companystartedon = $uf->companystartedon;	
     //$partnerdetails = $uf->partnerdetails;		
     $firstname = $uf->firstname;
-		//$financialstart= $uf->FiscalYearStartOn;
+    //$financialstart= $uf->FiscalYearStartOn;
     //$financialend= $uf->FiscalYearEndsOn;
     //$files = $uf->files;
     //$financialyear = $uf->financialyear;
 
-        
-        $FStartDt = $uf->FiscalYearStartOn;
-    if($FStartDt != '' && $FStartDt != '0000-00-00 00:00:00' )
-      {
-        $FSdate = new DateTime($FStartDt);
-        $financialstart =  $FSdate->format('d-m-Y');
-      }
-      else
-      {
-        $financialstart = "";
-      }
-     
-    $FEndDt = $uf->FiscalYearEndsOn;
-      if($FEndDt != '' && $FEndDt != '0000-00-00 00:00:00' )
-      {
-        $FEdate = new DateTime($FEndDt);
-        $financialend =  $FEdate ->format('d-m-Y');
-      }
-      else
-      {
-        $financialend = "";
-      }
-       
-	}
-	
-  }
 
-if(!empty($filenames))
-{
-    foreach ($filenames as $uf)
-    {
-		 $filedescription1=$uf->filedescription;
-		 $filename=$uf->filename;
-		 $createdDate=$uf->createdDate;
-	}
-}	
+    $FStartDt = $uf->FiscalYearStartOn;
+    if ($FStartDt != '' && $FStartDt != '0000-00-00 00:00:00') {
+      $FSdate = new DateTime($FStartDt);
+      $financialstart =  $FSdate->format('d-m-Y');
+    } else {
+      $financialstart = "";
+    }
+
+    $FEndDt = $uf->FiscalYearEndsOn;
+    if ($FEndDt != '' && $FEndDt != '0000-00-00 00:00:00') {
+      $FEdate = new DateTime($FEndDt);
+      $financialend =  $FEdate->format('d-m-Y');
+    } else {
+      $financialend = "";
+    }
+  }
+}
+
+if (!empty($filenames)) {
+  foreach ($filenames as $uf) {
+    $filedescription1 = $uf->filedescription;
+    $filename = $uf->filename;
+    $createdDate = $uf->createdDate;
+  }
+}
 
 // if(!empty($bankdetails))
 // {
@@ -127,808 +115,751 @@ if(!empty($filenames))
 // }
 
 ?>
-<script src="<?php echo base_url()?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
-<script src="<?php echo base_url()?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script> 
+<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
+<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
 <script>
-$(document).ready(function(){
-         $("#PaymentTerms").select2();
-         $("#filedescription").select2();
-         
-       });
+  $(document).ready(function() {
+    $("#PaymentTerms").select2();
+    $("#filedescription").select2();
+
+  });
 </script>
 
 <script>
-function readURL(input,num) {
-	
-	if (num==0)
-  {
-            if (input.files && input.files[0]) {
-                var reader = new FileReader();
+  function readURL(input, num) {
 
-                reader.onload = function (e) {
-                    $('#profilepicture')
-                        .attr('src', e.target.result)
-                        .width(166)
-                        .height(166);
-            //alert(e.target.result);
-                };
+    if (num == 0) {
+      if (input.files && input.files[0]) {
+        var reader = new FileReader();
 
-                reader.readAsDataURL(input.files[0]);
+        reader.onload = function(e) {
+          $('#profilepicture')
+            .attr('src', e.target.result)
+            .width(166)
+            .height(166);
+          //alert(e.target.result);
+        };
+
+        reader.readAsDataURL(input.files[0]);
         $('#ModifyImage').val(input.files[0]['name']);
-            }
+      }
+    } else {
+      if (input.files && input.files[0]) {
+        var reader = new FileReader();
+
+        reader.onload = function(e) {
+          $('#file')
+            .attr('src', e.target.result)
+            .width(166)
+            .height(166);
+        };
+
+        reader.readAsDataURL(input.files[0]);
+      }
+    }
   }
-  	else
-	{
-	 if (input.files && input.files[0]) {
-                var reader = new FileReader();
-
-                reader.onload = function (e) {
-                    $('#file')
-                        .attr('src', e.target.result)
-                        .width(166)
-                        .height(166);
-                };
-
-                reader.readAsDataURL(input.files[0]);
-            }	
-	}
-        }
 
 
-        function isNumberKey(evt){
-          var charCode = (evt.which) ? evt.which : evt.keyCode;
-          if (charCode != 46 && charCode != 45 &&charCode != 32 && charCode >= 33 
-            && (charCode < 48 || charCode > 57))
-             return false;
+  function isNumberKey(evt) {
+    var charCode = (evt.which) ? evt.which : evt.keyCode;
+    if (charCode != 46 && charCode != 45 && charCode != 32 && charCode >= 33 &&
+      (charCode < 48 || charCode > 57))
+      return false;
 
-          return true;
-       }
+    return true;
+  }
 
-function onlyAlphabets(evt) {
-        var charCode;
-        if (window.event)
-            charCode = window.event.keyCode;  //for IE
-        else
-            charCode = evt.which;  //for firefox
-        if (charCode == 32) //for &lt;space&gt; symbol
-            return true;
-        if (charCode > 31 && charCode < 65) //for characters before 'A' in ASCII Table
-            return false;
-        if (charCode > 90 && charCode < 97) //for characters between 'Z' and 'a' in ASCII Table
-            return false;
-        if (charCode > 122) //for characters beyond 'z' in ASCII Table
-            return false;
+  function onlyAlphabets(evt) {
+    var charCode;
+    if (window.event)
+      charCode = window.event.keyCode; //for IE
+    else
+      charCode = evt.which; //for firefox
+    if (charCode == 32) //for &lt;space&gt; symbol
+      return true;
+    if (charCode > 31 && charCode < 65) //for characters before 'A' in ASCII Table
+      return false;
+    if (charCode > 90 && charCode < 97) //for characters between 'Z' and 'a' in ASCII Table
+      return false;
+    if (charCode > 122) //for characters beyond 'z' in ASCII Table
+      return false;
+    return true;
+  }
+
+  function validateEmail() {
+    var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
+
+    var email = $('#EmailAddress').val();
+    if (email != "") {
+      if (reg.test(email) == false) {
+        alert('Please Enter Valid Email Address');
+        return (false);
+      } else {
         return true;
+      }
+    }
   }
 
-function validateEmail() {
- var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
-          
-			var email = $('#EmailAddress').val();
-			if(email != "")
-			{
-            if (reg.test(email) == false) 
-            {
-                alert('Please Enter Valid Email Address');
-                return (false);
-            }
-			else
-			{
-				return true;
-			}
-			}
-}
-function validatePAN() {
- //var reg = /(?=.*[A-Z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Z]).{1,}$/;
- //var reg = /(?=.*[a-zA-Z]).{5}(?=.*[0-9]).{4}(?=.*[a-zA-Z]).{1}$/; 
-      var regpan = /^([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){1}?$/;      
-			var PAN = $('#PAN').val();
-			
-			if(PAN != '')
-			{
-				if (regpan.test(PAN) == false) 
-				{
-					alert('Please Enter Valid PAN Number');
-					return (false);
-				}
-				else
-				{
-					return true;
-				}
-			}
-			
-}
-function validateGST() {
-var reg = /^([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}?$/;
-         //alert('gst');
-            var GST = $('#GSTNO').val();
-            
-            if(GST != '')
-            {
-                if (reg.test(GST) == false) 
-                {
-                    alert('Please Enter Valid GST Number Format should be 22AAAAA1111S1Z1 or 22AAAAA1111S1ZA ');
-                    return (false);
-                }
-                else
-                {
-                    return true;
-                }
-            }
-            else
-            {
-                alert('Please Enter GST Number');
-                return (false);
-            }
-            
-}
- 
-   //var selDiv = "";
-       
-   //document.addEventListener("DOMContentLoaded", init, false);
-   
-//   function getMobileValidation()
-//   {
-// 	var contactNumber = $('#ContactNumber').val().length;
-// 	if(contactNumber < 10)
-// 	{
-// 		alert('Please Enter valid Contact Number');
-// 		return false;
-// 	}
-// 	else
-// 	{
-// 		return true;
-// 	}
-// }
+  function validatePAN() {
+    //var reg = /(?=.*[A-Z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Z]).{1,}$/;
+    //var reg = /(?=.*[a-zA-Z]).{5}(?=.*[0-9]).{4}(?=.*[a-zA-Z]).{1}$/; 
+    var regpan = /^([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){1}?$/;
+    var PAN = $('#PAN').val();
 
-function getMobileValidation(){
-        // alert('mobile number and telephone phone');
-         
-         var contactNumber = $('#ContactNumber').val();
-         var telephone =/^[0-9]{3,5}\s[0-9]{6,8}$/.test(contactNumber);
-         var mobilephone = /^[0-9]{10}$/.test(contactNumber);
-
-        // alert('telephone:'+telephone);//alert('other telephone:'+regex);
-        // alert('mobilephone:'+mobilephone);//alert('input value:'+contactNumber);
-
-        if(contactNumber!=''){
-         
-         if(telephone){
-                // alert(' telephone number'+contactNumber);
-                 return true;
-             }
-         else if(mobilephone){
-                // alert('mobile number'+contactNumber);
-                 return true;
-             }
-
-         else{
-                alert('Please Enter valid Contact Number ex: 044 12345678 , 0444 1234567,04444 123456 and 9876543210');//alert('need to change:'+contactNumber);
-                return false;
-            }
-        }
-       else{
-           
-            alert(' Please enter correct format of contact number');
-            //alert('invalid'+contactNumber);
-            return false;
-        }
+    if (PAN != '') {
+      if (regpan.test(PAN) == false) {
+        alert('Please Enter Valid PAN Number');
+        return (false);
+      } else {
+        return true;
       }
-function ValidateExno() {
+    }
 
-  var regexno = /^([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){3}([0-9]){3}?$/;     
-      var ECC = $('#ExiseRegistration1').val();
-      
-      if(ECC != '')
-      {
-        if (regexno.test(ECC) == false) 
-        {
-          alert('Please Enter Valid Excise Control Code Number');
-          return (false);
-        }
-        else
-        {
-          return true;
-        }
+  }
+
+  function validateGST() {
+    var reg = /^([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}?$/;
+    //alert('gst');
+    var GST = $('#GSTNO').val();
+
+    if (GST != '') {
+      if (reg.test(GST) == false) {
+        alert('Please Enter Valid GST Number Format should be 22AAAAA1111S1Z1 or 22AAAAA1111S1ZA ');
+        return (false);
+      } else {
+        return true;
       }
-      
-}
+    } else {
+      alert('Please Enter GST Number');
+      return (false);
+    }
 
+  }
 
-function ValidateAlternateContact(){
-        // alert('phone');
-         
-         var AlternateContactNumber = $('#AlternateContactNumber').val();
+  //var selDiv = "";
 
-         var telephone =/^[0-9]{3,5}\s[0-9]{6,8}$/.test(AlternateContactNumber);
-         var mobilephone = /^[0-9]{10}$/.test(AlternateContactNumber);
+  //document.addEventListener("DOMContentLoaded", init, false);
 
-        // alert('chennai telephone:'+telephone);//alert('other telephone:'+regex);
-        // alert('mobilephone:'+mobilephone);//alert('input value:'+contactNumber);
+  //   function getMobileValidation()
+  //   {
+  // 	var contactNumber = $('#ContactNumber').val().length;
+  // 	if(contactNumber < 10)
+  // 	{
+  // 		alert('Please Enter valid Contact Number');
+  // 		return false;
+  // 	}
+  // 	else
+  // 	{
+  // 		return true;
+  // 	}
+  // }
 
-        if(AlternateContactNumber!=''){
-         
-         if(telephone){
-                // alert(' telephone number chennai district successfully inserted'+AlternateContactNumber);
-                return true;
-             }
-         else if(mobilephone){
-              // alert('mobile number successfully inserted'+AlternateContactNumber);
-                return true;
-             }
-         else{
-                alert('Please Enter valid Contact Number ex: 044 12345678 , 0444 1234567,04444 123456 and 9876543210');//alert('need to change:'+contactNumber);
-                return false;
-            }
-        }
-       else{
-           
-            alert('Please enter correct format of contact number');
-            //alert('invalid'+AlternateContactNumber);
-            return false;
-        }
+  function getMobileValidation() {
+    // alert('mobile number and telephone phone');
+
+    var contactNumber = $('#ContactNumber').val();
+    var telephone = /^[0-9]{3,5}\s[0-9]{6,8}$/.test(contactNumber);
+    var mobilephone = /^[0-9]{10}$/.test(contactNumber);
+
+    // alert('telephone:'+telephone);//alert('other telephone:'+regex);
+    // alert('mobilephone:'+mobilephone);//alert('input value:'+contactNumber);
+
+    if (contactNumber != '') {
+
+      if (telephone) {
+        // alert(' telephone number'+contactNumber);
+        return true;
+      } else if (mobilephone) {
+        // alert('mobile number'+contactNumber);
+        return true;
+      } else {
+        alert('Please Enter valid Contact Number ex: 044 12345678 , 0444 1234567,04444 123456 and 9876543210'); //alert('need to change:'+contactNumber);
+        return false;
       }
+    } else {
 
+      alert(' Please enter correct format of contact number');
+      //alert('invalid'+contactNumber);
+      return false;
+    }
+  }
 
+  function ValidateExno() {
 
-function ValidateUA() {
+    var regexno = /^([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){3}([0-9]){3}?$/;
+    var ECC = $('#ExiseRegistration1').val();
 
-        var reguano = /^([a-zA-Z]){5}([0-9]){10}?$/;     
-            var UA = $('#UANumber').val();
-            
-            if(UA != '')
-            {
-              if (reguano.test(UA) == false) 
-              {
-                alert('Please Enter Valid UA Number');
-                return (false);
-              }
-              else
-              {
-                return true;
-              }
-            }
-            
+    if (ECC != '') {
+      if (regexno.test(ECC) == false) {
+        alert('Please Enter Valid Excise Control Code Number');
+        return (false);
+      } else {
+        return true;
       }
-  
-</script> 
+    }
+
+  }
+
+
+  function ValidateAlternateContact() {
+    // alert('phone');
+
+    var AlternateContactNumber = $('#AlternateContactNumber').val();
+
+    var telephone = /^[0-9]{3,5}\s[0-9]{6,8}$/.test(AlternateContactNumber);
+    var mobilephone = /^[0-9]{10}$/.test(AlternateContactNumber);
+
+    // alert('chennai telephone:'+telephone);//alert('other telephone:'+regex);
+    // alert('mobilephone:'+mobilephone);//alert('input value:'+contactNumber);
+
+    if (AlternateContactNumber != '') {
+
+      if (telephone) {
+        // alert(' telephone number chennai district successfully inserted'+AlternateContactNumber);
+        return true;
+      } else if (mobilephone) {
+        // alert('mobile number successfully inserted'+AlternateContactNumber);
+        return true;
+      } else {
+        alert('Please Enter valid Contact Number ex: 044 12345678 , 0444 1234567,04444 123456 and 9876543210'); //alert('need to change:'+contactNumber);
+        return false;
+      }
+    } else {
+
+      alert('Please enter correct format of contact number');
+      //alert('invalid'+AlternateContactNumber);
+      return false;
+    }
+  }
+
+
+
+  function ValidateUA() {
+
+    var reguano = /^([a-zA-Z]){5}([0-9]){10}?$/;
+    var UA = $('#UANumber').val();
+
+    if (UA != '') {
+      if (reguano.test(UA) == false) {
+        alert('Please Enter Valid UA Number');
+        return (false);
+      } else {
+        return true;
+      }
+    }
+
+  }
+</script>
 <script>
-      $(function() {
-  var d = new Date();
+  $(function() {
+    var d = new Date();
 
-  var month = d.getMonth();
-  var day = d.getDate();
-  var year = d.getFullYear()  ;
- // var SIAStartYear = year - 2015;
-  var mindt = year-70;
-  var maxdt =  year-15;
-  
-//   $("#financialstart").datepicker({
-//   maxDate :'now',
-//   //maxDate : new Date(maxdt,1,1),
-//   dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-1:+1'
+    var month = d.getMonth();
+    var day = d.getDate();
+    var year = d.getFullYear();
+    // var SIAStartYear = year - 2015;
+    var mindt = year - 70;
+    var maxdt = year - 15;
+
+    //   $("#financialstart").datepicker({
+    //   maxDate :'now',
+    //   //maxDate : new Date(maxdt,1,1),
+    //   dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-1:+1'
 
 
-// });
-  
-//       $("#financialend").datepicker({dateFormat: 'dd-mm-yy',minDate :'now',changeMonth: true, changeYear: true,yearRange: '-1:+1'
-// });
+    // });
 
-// $("#financialstart").datepicker({
-//             dateFormat: 'dd-mm-yy',
-//             onSelect: function(selectedDate) {
-//                 var minDate = $(this).datepicker("getDate");
-//                 $("#toDate").datepicker("option", "minDate", minDate);
-//             }
-//         });
+    //       $("#financialend").datepicker({dateFormat: 'dd-mm-yy',minDate :'now',changeMonth: true, changeYear: true,yearRange: '-1:+1'
+    // });
 
-//         $("#financialend").datepicker({
-//             dateFormat: 'dd-mm-yy',
-//             onSelect: function(selectedDate) {
-//                 var maxDate = $(this).datepicker("getDate");
-//                 $("#fromDate").datepicker("option", "maxDate", maxDate);
-//             }
-//         });
-   
-});
-</script> 
- 
- <style>
- /* legend{
+    // $("#financialstart").datepicker({
+    //             dateFormat: 'dd-mm-yy',
+    //             onSelect: function(selectedDate) {
+    //                 var minDate = $(this).datepicker("getDate");
+    //                 $("#toDate").datepicker("option", "minDate", minDate);
+    //             }
+    //         });
+
+    //         $("#financialend").datepicker({
+    //             dateFormat: 'dd-mm-yy',
+    //             onSelect: function(selectedDate) {
+    //                 var maxDate = $(this).datepicker("getDate");
+    //                 $("#fromDate").datepicker("option", "maxDate", maxDate);
+    //             }
+    //         });
+
+  });
+</script>
+
+<style>
+  /* legend{
  color:#00c0ef ! important;
  }  */
-   th{
+  th {
     background-color: #ddd;
-   }
- .form-group
- {
-	 padding-bottom:4%;
-   }
-   .pad{
-	   padding-bottom:1%;
-   }
-    .badge
-   {
-	   color:red; background-color:#fff;
-   }
- </style>
+  }
+
+  .form-group {
+    padding-bottom: 4%;
+  }
+
+  .pad {
+    padding-bottom: 1%;
+  }
+
+  .badge {
+    color: red;
+    background-color: #fff;
+  }
+</style>
 
 
 <div class="content-page">
-    <div class="content">
-        <!-- Start Content-->
-        <div class="container-fluid">
-            <!-- start page title -->
-            <?php
-              helper('form');
-              $error = session()->getFlashdata('error');
-              if ($error) {
-              ?>
-                <div class="alert alert-danger alert-dismissable">
-                  <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-                  <?php echo session()->getFlashdata('error'); ?>
-                </div>
-              <?php } ?>
-              <?php
-              $success = session()->getFlashdata('success');
-              if ($success) {
-              ?>
-                <div class="alert alert-info alert-dismissable">
-                  <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-                  <?php echo session()->getFlashdata('success'); ?>
-                </div>
-              <?php } ?>
-            <div class="row" style="margin-bottom: 10px;">
-                <div class="col-6">
-                    <div class="page-title-box page-title-box-alt">
-                        <h4 class="page-title">Business Settings</h4>
+  <div class="content">
+    <!-- Start Content-->
+    <div class="container-fluid">
+      <!-- start page title -->
+      <?php
+      helper('form');
+      $error = session()->getFlashdata('error');
+      if ($error) {
+      ?>
+        <div class="alert alert-danger alert-dismissable">
+          <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+          <?php echo session()->getFlashdata('error'); ?>
+        </div>
+      <?php } ?>
+      <?php
+      $success = session()->getFlashdata('success');
+      if ($success) {
+      ?>
+        <div class="alert alert-info alert-dismissable">
+          <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+          <?php echo session()->getFlashdata('success'); ?>
+        </div>
+      <?php } ?>
+      <div class="row" style="margin-bottom: 10px;">
+        <div class="col-6">
+          <div class="page-title-box page-title-box-alt">
+            <h4 class="page-title">Business Settings</h4>
+          </div>
+        </div>
+        <div class="col-6 text-right">
+          <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>supplierlisting"><span class="bold">Back</span></a>
+        </div>
+      </div>
+      <!-- end page title -->
+      <div class="row">
+        <div class="col-12">
+          <div class="card">
+            <div class="card-body" style="padding: 1rem 2rem !important;">
+              <div class="row">
+                <div class="col-12">
+                  <form class="form-horizontal" role="form" id="addemployee" action="<?php echo base_url() ?>Updatecompany" method="post" role="form" enctype="multipart/form-data">
+                    <div class="box-body">
+                      <!-- Supplier Information -->
+                      <legend style="margin-left:-10px;color: #4f7c97;;color: #4f7c97;">Business Information</legend>
+                      <div class="col-md-12" style="margin-bottom: 27px;">
+                        <div class="form-row">
+                          <div class=" col-md-3">
+                            <img id="profilepicture" src="<?= base_url() . 'public/uploads/images/avatar.png'; ?>" alt="your image" style="width: 139px;" /><br />
+                            <input type='file' input accept=".JPG,.PNG" onchange="readURL(this,0);" id="photo" value="<?php echo $ProfilePic; ?>" name="photo" />
+                            <label for="photo">Select Company Logo<br /><small>(only .jpg or .png)</small></label>
+                            <input type="hidden" name="Image" id="Image" value="<?php echo $ProfilePic; ?>" class="form-control" readonly>
+                            <input type="hidden" name="ModifyImage" id="ModifyImage" class="form-control" readonly>
+                          </div>
+                          <div class=" col-md-3">
+                            <label class="col-form-label" for="CompanyID">CompanyID<span class="badge">*</span></label>
+                            <input type="text" name="CompanyID" maxlength="100" id="CompanyID" value="<?php echo $CompID; ?>" class="form-control" readonly>
+                          </div>
+                          <div class="col-md-3">
+                            <label class="col-form-label" for="CompanyName">CompanyName</label>
+                            <input type="text" name="CompanyName" onkeypress="return onlyAlphabets(event);" maxlength="100" id="CompanyName" class="form-control" required value="<?php echo $CompanyName; ?>">
+                          </div>
+                          <div class="col-md-3">
+                            <label class="col-form-label" for="ContactNumber">Contact Number<span class="badge">*</span></label>
+                            <input type="text" name="ContactNumber" onchange="getMobileValidation();" id="ContactNumber" maxlength="12" class="form-control" value="<?php echo $ContactNumber; ?>" required onkeypress="return isNumberKey(event)">
+                          </div>
+                        </div>
+                        <div class="form-row">
+                          <div class="col-md-3" style="margin-top:20px">
+                            <label for="AlternateContactNumber">Alternate Contact Number</label><!--<span class="badge">*</span>-->
+                            <input type="text" name="AlternateContactNumber" onchange="ValidateAlternateContact();" id="AlternateContactNumber" maxlength="12" class="form-control" value="<?php echo $AlternateContactNumber; ?>" required>
+                          </div>
+                          <div class="col-md-3" style="margin-top:20px">
+                            <label for="EmailAddress">Email Address</label><!--<span class="badge">*</span>-->
+                            <input type="email" name="EmailAddress" onchange="validateEmail();" id="EmailAddress" class="form-control" value="<?php echo $EmailAddress; ?>">
+                          </div>
+                          <div class="col-md-3" style="margin-top:20px">
+                            <label for="ExciseRegistration">Excise Registration</label><!--<span class="badge">*</span>-->
+                            <input type="text" name="Exiseregistration1" id="ExiseRegistration1" maxlength="15" class="form-control" value="<?php echo $Exiseregistration; ?>" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([A-Za-z]){2}([0-9]){3}" required onchange="ValidateExno();" style="text-transform: uppercase">
+                          </div>
+                          <div class="col-md-3" style="margin-top:20px">
+                            <label for="AlternateContactNumber">Company Website</label><!--<span class="badge">*</span>-->
+                            <input type="text" name="companywebsite" id="companywebsite" maxlength="100" class="form-control" value="<?php echo $companywebsite; ?>" required>
+                          </div>
+                        </div>
+                        <?php
+                        $financialstartFormatted = date('Y-m-d', strtotime($financialstart));
+                        $financialendFormatted = date('Y-m-d', strtotime($financialend));
+                        ?>
+
+                        <div class="form-row">
+                          <div class="col-md-3" style="margin-top:20px">
+                            <label for="FinancialYearStartON">Financial Year StartON</label><!--<span class="badge">*</span>-->
+                            <input type="date" name="financialstart" id="financialstart" class="form-control" value="<?php echo $financialstartFormatted; ?>" required>
+                          </div>
+                          <div class="col-md-3" style="margin-top:20px">
+                            <label for="FinancialYearEndON">Financial Year EndON</label><!--<span class="badge">*</span>-->
+                            <input type="date" name="financialend" id="financialend" maxlength="10" class="form-control" value="<?php echo $financialendFormatted; ?>" required>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+
+                    <!-- Address Section -->
+                    <legend style="margin-left:-10px;color: #4f7c97;">Address Details</legend>
+                    <div class="col-md-12" style="margin-bottom: 27px;">
+                      <div class="form-row">
+                        <div class=" col-md-6">
+                          <label class="col-form-label" for="Address">Address<span class="badge">*</span></label>
+                          <textarea id="Address" name="Address" maxlength="500" class="form-control" rows="3" required><?php echo $Address; ?></textarea>
+                        </div>
+                      </div>
+                    </div>
+
+                    <!-- Tax Related Data -->
+                    <legend style="margin-left:-10px;color: #4f7c97;">Tax Related Data</legend>
+                    <!-- Text input-->
+                    <div class="col-md-12" style="margin-bottom: 27px;">
+                      <div class="form-row" style="margin-bottom: 20px;">
+                        <div class=" col-md-4">
+                          <label class="col-form-label" for="GSTNo">Payable Terms</label>
+                          <select class="form-control required" id="PaymentTerms" name="PaymentTerms" onchange="payment_hidden();">
+                            <option value="<?php echo $PaymentTerms; ?>"><?php echo $PaymentTerms; ?></option>
+                            <?php
+                            if (!empty($payment)) {
+                              foreach ($payment as $rl) {
+                            ?>
+                                <option value="<?php echo $rl->PaymentID ?>"><?php echo $rl->PaymentTerms ?></option>
+                            <?php
+                              }
+                            }
+                            ?>
+                          </select>
+                          <input type="hidden" id="paymentid" name="paymentid" value="<?php echo $PaymentId; ?>">
+                        </div>
+                      </div>
+
+
+                    </div>
+
+                    <!-- Bank Details-->
+                    <legend style="margin-left:-10px;color: #4f7c97;">ID Proof</legend>
+
+                    <div class="col-md-12" style="margin-bottom: 27px;">
+                      <div class="form-row" style="margin-bottom: 20px;">
+                        <div class=" col-md-4">
+                          <label class="col-form-label" for="UANumber">UA Number<span class="badge">*</span></label>
+                          <input type="text" id="UANumber" name="UANumber" onchange="ValidateUA();" maxlength="15" class="form-control" value="<?php echo $UANumber; ?>" pattern="([a-zA-Z]){5}([0-9]){10}" style="text-transform: uppercase">
+                        </div>
+                        <div class=" col-md-4">
+                          <label class="col-form-label" for="TINNumber">TIN Number<span class="badge">*</span></label>
+                          <input type="text" id="TIN" name="TIN" maxlength="11" class="form-control" value="<?php echo $TIN; ?>" pattern="(.){11,11}" onkeypress="return isNumberKey(event)" title="Please Enter 11 digit Number">
+                        </div>
+                        <div class=" col-md-4">
+                          <label class="col-form-label" for="MSMENumber">MSME Number</label>
+                          <input type="text" id="MSME" name="MSME" class="form-control" value="<?php echo $MSME; ?>" title="Please Enter MSME" style="text-transform: uppercase">
+                        </div>
+                      </div>
+                      <div class="form-row" style="margin-top:20px">
+                        <div class=" col-md-4">
+                          <label class="col-form-label" for="GSTRange">GST Range<span class="badge">*</span></label>
+                          <input type="text" id="GSTRange" name="GSTRange" maxlength="100" class="form-control" value="<?php echo $GSTRange; ?>">
+                        </div>
+                        <div class=" col-md-4">
+                          <label class="col-form-label" for="GSTNumber">GST Number<span class="badge">*</span></label>
+                          <input type="text" id="GSTNO" maxlength="15" onchange="validateGST();" name="GSTNO" class="form-control" style="text-transform: uppercase" value="<?php echo $GSTNO; ?>" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" required title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and should be 'Z' only and 1 Number">
+                        </div>
+                        <div class=" col-md-4">
+                          <label class="col-form-label" for="PANNumber">PAN Number<span class="badge">*</span></label>
+                          <input type="text" id="PAN" maxlength="10" name="PAN" onchange="validatePAN();" class="form-control" style="text-transform: uppercase" value="<?php echo $PAN; ?>" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" required>
+                        </div>
+                        <div class=" col-md-4">
+                          <label class="col-form-label" for="CollectrateAddress">Collectrate Address<span class="badge">*</span></label>
+                          <input type="text" id="CollectrateAddress" required name="CollectrateAddress" maxlength="500" class="form-control" value="<?php echo $CollectrateAddress; ?>" required>
+                        </div>
+                      </div>
+                    </div>
+
+
+                    <legend style="margin-left:-10px;color: #4f7c97;">Bank Details</legend>
+                    <div class="col-md-12" style="margin-bottom: 27px;">
+                      <!-- Text input-->
+                      <div class="form-row" style="margin-bottom: 27px;">
+                        <div class="col-md-3">
+                          <span for="BankName">Bank Name</span>
+                          <input type="text" id="BankName" name="BankName" maxlength="500" class="form-control" value="<?php echo $bankname; ?>">
+                        </div>
+                        <div class="col-md-3">
+                          <span for="IFSC">IFSC</span>
+                          <input type="text" id="IFSC" name="IFSC" maxlength="500" class="form-control" value="<?php echo $bankifsc; ?>">
+                        </div>
+                        <div class="col-md-3">
+                          <span for="BankAccountNumber">Bank Account Number</span>
+                          <input type="text" id="BankAccno" name="BankAccno" maxlength="500" class="form-control" onkeypress="return isNumberKey(event)">
+                        </div>
+                        <div class="col-md-3">
+                          <span for="BankName">Bank Address</span>
+                          <input type="text" id="BankAddress" name="BankAddress" maxlength="500" class="form-control" value="<?php echo $bankaddress; ?>">
+                        </div>
+                      </div>
+                    </div>
+                    <input type="hidden" id="BankState" name="BankState" class="form-control" value="Yes">
+                    <div class="form-row">
+                      <div class="col-md-12 text-right">
+                        <a class="btn btn-success font Add" ID="Add"> &nbsp;&nbsp;<span class="bold">Add/Update Bank Detail</span></a>&nbsp;&nbsp;&nbsp;&nbsp;
+                      </div>
+                    </div>
+                    <div class="form-row">
+                      <div class="col-md-12">
+                        <table id="banktable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
+                          <thead>
+                            <tr>
+                              <th>BankName</th>
+                              <th>IFSC</th>
+                              <th>BankAccountNumber</th>
+                              <th>BankAddress</th>
+                              <th>IsActive</th>
+                              <!-- <th>Action</th>                             -->
+                            </tr>
+                          </thead>
+                          <tbody id="databaseAppend">
+                            <?php if (!empty($bankdetails)) {
+                              foreach ($bankdetails as $uf) {  ?>
+                                <tr>
+                                  <td style="width: 15%;"><?php echo $uf->Bank_name ?></td>
+                                  <td style="width: 18%;" contenteditable='true'><?php echo $uf->IFSC ?></td>
+                                  <td style="width: 18%;" contenteditable='true'><?php echo $uf->Bank_AccNo ?></td>
+                                  <td style="width: 40%;" contenteditable='true'><?php echo $uf->Address ?></a></td>
+                                  <td style="width: 10%;" contenteditable='true'>
+                                    <?php if ($uf->Is_Active == 1) {
+                                      echo 'Yes';
+                                    } else {
+                                      echo 'No';
+                                    }
+                                    ?>
+
+                                  </td>
+                                </tr>
+                            <?php  }
+                            }  ?>
+                          </tbody>
+                        </table>
+                      </div>
                     </div>
                 </div>
-                <div class="col-6 text-right">
-                <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>supplierlisting"><span class="bold">Back</span></a>
-                </div>
-            </div>     
-            <!-- end page title --> 
-            <div class="row">
-                <div class="col-12">
-                    <div class="card">
-                        <div class="card-body" style="padding: 1rem 2rem !important;">
-                            <div class="row">
-                                <div class="col-12"> 
-                                        <form class="form-horizontal" role="form" id="addemployee" action="<?php echo base_url() ?>Updatecompany" method="post" role="form" enctype="multipart/form-data">
-                                          <div class="box-body">
-                                            <!-- Supplier Information -->
-                                            <legend style="margin-left:-10px;color: #4f7c97;;color: #4f7c97;">Business Information</legend>
-                                            <div class="col-md-12" style="margin-bottom: 27px;">
-                                              <div class="form-row">
-                                                <div class=" col-md-3">
-                                                  <img id="profilepicture" src="<?= base_url().'public/uploads/images/avatar.png'; ?>"  alt="your image"  style="width: 139px;"/><br/>
-                                                  <input type='file' input accept=".JPG,.PNG" onchange="readURL(this,0);"   id="photo" value="<?php echo $ProfilePic ;?>" name="photo"/>  
-                                                  <label for="photo">Select Company Logo<br/><small>(only .jpg or .png)</small></label>
-                                                  <input type="hidden" name="Image" id="Image"  value="<?php echo $ProfilePic ; ?>" class="form-control" readonly>
-                                                  <input type="hidden" name="ModifyImage" id="ModifyImage"    class="form-control" readonly>
-                                                </div>
-                                                <div class=" col-md-3">
-                                                  <label class="col-form-label" for="CompanyID">CompanyID<span class="badge">*</span></label>
-                                                  <input type="text" name="CompanyID"  maxlength="100" id="CompanyID"  value="<?php echo $CompID;?>"  class="form-control" readonly>
-                                                </div>
-                                                <div class="col-md-3">
-                                                  <label class="col-form-label" for="CompanyName">CompanyName</label>
-                                                  <input type="text" name="CompanyName" onkeypress="return onlyAlphabets(event);"  maxlength="100" id="CompanyName"  class="form-control" required  value="<?php echo $CompanyName;?>">
-                                                </div>
-                                                <div class="col-md-3">
-                                                  <label class="col-form-label" for="ContactNumber">Contact Number<span class="badge">*</span></label>
-                                                  <input type="text" name="ContactNumber" onchange="getMobileValidation();" id="ContactNumber" maxlength="12" class="form-control"  value="<?php echo $ContactNumber;?>" required onkeypress="return isNumberKey(event)">
-                                                </div>
-                                              </div>
-                                              <div class="form-row" >
-                                                  <div class="col-md-3" style="margin-top:20px">
-                                                    <label for="AlternateContactNumber">Alternate Contact Number</label><!--<span class="badge">*</span>-->
-                                                    <input type="text" name="AlternateContactNumber" onchange="ValidateAlternateContact();" id="AlternateContactNumber" maxlength="12" class="form-control" value="<?php echo $AlternateContactNumber;?>" required>
-                                                  </div>
-                                                  <div class="col-md-3" style="margin-top:20px">
-                                                    <label for="EmailAddress">Email Address</label><!--<span class="badge">*</span>-->
-                                                    <input type="email"  name="EmailAddress"  onchange="validateEmail();"id="EmailAddress" class="form-control" value="<?php echo $EmailAddress;?>">
-                                                    </div>
-                                                  <div class="col-md-3" style="margin-top:20px">
-                                                    <label for="ExciseRegistration">Excise Registration</label><!--<span class="badge">*</span>-->
-                                                    <input type="text" name="Exiseregistration1" id="ExiseRegistration1"   maxlength="15" class="form-control" value="<?php echo $Exiseregistration ;?>" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([A-Za-z]){2}([0-9]){3}" required onchange="ValidateExno();" style="text-transform: uppercase">
-                                                    </div>
-                                                  <div class="col-md-3" style="margin-top:20px">
-                                                    <label for="AlternateContactNumber">Company Website</label><!--<span class="badge">*</span>-->
-                                                    <input type="text" name="companywebsite" id="companywebsite"   maxlength="100" class="form-control" value="<?php echo $companywebsite ;?>"  required>
-                                                  </div>
-                                              </div>
-                                              <?php
-                                                  $financialstartFormatted = date('Y-m-d', strtotime($financialstart));
-                                                  $financialendFormatted = date('Y-m-d', strtotime($financialend));
-                                                  ?>
 
-                                              <div class="form-row" >
-                                                  <div class="col-md-3" style="margin-top:20px">
-                                                    <label for="FinancialYearStartON">Financial Year StartON</label><!--<span class="badge">*</span>-->
-                                                    <input type="date" name="financialstart" id="financialstart" class="form-control" value="<?php echo $financialstartFormatted; ?>" required>
-                                                    </div>
-                                                  <div class="col-md-3" style="margin-top:20px">
-                                                    <label for="FinancialYearEndON">Financial Year EndON</label><!--<span class="badge">*</span>-->
-                                                    <input type="date" name="financialend" id="financialend"   maxlength="10" class="form-control" value="<?php echo $financialendFormatted ;?>"  required>
-                                                  </div>
-                                              </div>
-                                              </div>
-                                            </div>
-                                            
-                                            <!-- Address Section -->
-                                            <legend style="margin-left:-10px;color: #4f7c97;">Address Details</legend>
-                                            <div class="col-md-12" style="margin-bottom: 27px;">
-                                              <div class="form-row">
-                                                <div class=" col-md-6">
-                                                  <label class="col-form-label" for="Address">Address<span class="badge">*</span></label>
-                                                  <textarea id="Address" name="Address" maxlength="500" class="form-control" rows="3" required><?php echo $Address;?></textarea>
-                                                </div>
-                                              </div>
-                                            </div>
+                <legend style="margin-left:0px;color: #4f7c97;">Upload File</legend>
+                <div class="col-md-12" style="margin-bottom: 27px;">
+                  <div class="form-row">
+                    <div class="col-md-4">
+                      <span for="FileDescription">File Description</span>
+                      <select class="form-control required" id="filedescription" name="filedescription">
+                        <option value="CERTIFICATION">Select File Type</option>
+                        <?php
+                        if (!empty($filetype)) {
+                          foreach ($filetype as $rl) {
+                        ?>
+                            <option value="<?php echo $rl->ConfigValue ?>"><?php echo $rl->ConfigValue ?></option>
+                        <?php
+                          }
+                        }
+                        ?>
+                      </select>
+                    </div>
+                    <div class="col-md-4">
+                      <label style="margin-bottom:0px !important;" for="images">Select Company file<small> (only .pdf,.excel,.doc,.png,.jpg)</small></label>
+                      <input style="margin-top: 5px;" type="file" size="20" input accept=".docx,.pdf,.doc.JPG,.PNG" onchange="readURL(this,1);" id="images" name="images" />
 
-                                            <!-- Tax Related Data -->
-                                            <legend style="margin-left:-10px;color: #4f7c97;">Tax Related Data</legend>
-                                            <!-- Text input-->
-                                            <div class="col-md-12" style="margin-bottom: 27px;">
-                                              <div class="form-row" style="margin-bottom: 20px;">
-                                                <div class=" col-md-4">
-                                                  <label class="col-form-label" for="GSTNo">Payable Terms</label>
-                                                  <select class="form-control required" id="PaymentTerms" name="PaymentTerms" onchange="payment_hidden();">
-                                                    <option value="<?php echo $PaymentTerms;?>" ><?php echo $PaymentTerms;?></option>
-                                                    <?php
-                                                      if(!empty($payment))
-                                                      {
-                                                        foreach ($payment as $rl)
-                                                        {
-                                                    ?>
-                                                          <option value="<?php echo $rl->PaymentID ?>"><?php echo $rl->PaymentTerms ?></option>
-                                                    <?php
-                                                          }
-                                                      }
-                                                    ?>
-                                                  </select>
-                                                  <input type="hidden" id="paymentid" name="paymentid" value="<?php echo $PaymentId;?>" >                                                </div>
-                                              </div>
+                    </div>
+                  </div>
+                  <div class="form-row">
+                    <div class="col-md-12 text-right">
+                      <input type="submit" id="submit" onclick="valid();" class="btn btn-success" value="Submit" />
+                    </div>
+                  </div>
+                  <div class="form-row">
+                    <div class="col-md-12">
+                      <table id="datatable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
+                        <thead>
 
-                                             
-                                            </div>
-                                              
-                                            <!-- Bank Details-->
-                                            <legend style="margin-left:-10px;color: #4f7c97;">ID Proof</legend>
-
-                                            <div class="col-md-12" style="margin-bottom: 27px;">
-                                                  <div class="form-row" style="margin-bottom: 20px;">
-                                                    <div class=" col-md-4">
-                                                      <label class="col-form-label" for="UANumber">UA Number<span class="badge">*</span></label>
-                                                      <input type="text" id="UANumber" name="UANumber" onchange="ValidateUA();" maxlength="15" class="form-control" value="<?php echo $UANumber;?>" pattern="([a-zA-Z]){5}([0-9]){10}" style="text-transform: uppercase">                                                </div>
-                                                    <div class=" col-md-4">
-                                                      <label class="col-form-label" for="TINNumber">TIN Number<span class="badge">*</span></label>
-                                                      <input type="text" id="TIN" name="TIN" maxlength="11"   class="form-control" value="<?php echo $TIN;?>" pattern="(.){11,11}" onkeypress="return isNumberKey(event)"  title="Please Enter 11 digit Number">                                                </div>
-                                                    <div class=" col-md-4">
-                                                      <label class="col-form-label" for="MSMENumber">MSME Number</label>
-                                                      <input type="text" id="MSME" name="MSME"  class="form-control" value="<?php echo $MSME;?>" title="Please Enter MSME" style="text-transform: uppercase">                                                </div>
-                                                  </div>
-                                                  <div class="form-row" style="margin-top:20px">
-                                                        <div class=" col-md-4">
-                                                          <label class="col-form-label" for="GSTRange">GST Range<span class="badge">*</span></label>
-                                                          <input type="text" id="GSTRange" name="GSTRange" maxlength="100"  class="form-control" value="<?php echo $GSTRange;?>">
-                                                        </div>
-                                                        <div class=" col-md-4">
-                                                          <label class="col-form-label" for="GSTNumber">GST Number<span class="badge">*</span></label>
-                                                          <input type="text" id="GSTNO"  maxlength="15" onchange="validateGST();" name="GSTNO" class="form-control" style="text-transform: uppercase" value="<?php echo $GSTNO;?>" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" required title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and should be 'Z' only and 1 Number">      
-                                                        </div>
-                                                        <div class=" col-md-4">
-                                                            <label class="col-form-label" for="PANNumber">PAN Number<span class="badge">*</span></label>
-                                                            <input type="text" id="PAN"  maxlength="10"  name="PAN"  onchange="validatePAN();" class="form-control" style="text-transform: uppercase" value="<?php echo $PAN;?>"  pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" required>              
-                                                        </div>
-                                                        <div class=" col-md-4">
-                                                          <label class="col-form-label" for="CollectrateAddress">Collectrate Address<span class="badge">*</span></label>
-                                                          <input type="text" id="CollectrateAddress" required name="CollectrateAddress"  maxlength="500"   class="form-control" value="<?php echo $CollectrateAddress;?>" required >
-                                                        </div>
-                                                </div>
-                                            </div>
-
-
-                                            <legend style="margin-left:-10px;color: #4f7c97;">Bank Details</legend>
-                                            <div class="col-md-12" style="margin-bottom: 27px;">
-                                            <!-- Text input-->
-                                            <div class="form-row" style="margin-bottom: 27px;">
-                                              <div class="col-md-3">
-                                                <span for="BankName">Bank Name</span>
-                                                <input type="text" id="BankName" name="BankName" maxlength="500" class="form-control" value="<?php echo $bankname;?>">
-                                              </div>
-                                              <div class="col-md-3">
-                                                <span for="IFSC">IFSC</span>
-                                                <input type="text" id="IFSC" name="IFSC" maxlength="500" class="form-control" value="<?php echo $bankifsc;?>">                                              </div>
-                                              <div class="col-md-3">
-                                                <span for="BankAccountNumber">Bank Account Number</span>
-                                                <input type="text" id="BankAccno" name="BankAccno" maxlength="500" class="form-control" onkeypress="return isNumberKey(event)">                                              </div>
-                                              <div class="col-md-3">
-                                                <span for="BankName">Bank Address</span>
-                                                <input type="text" id="BankAddress" name="BankAddress" maxlength="500" class="form-control" value="<?php echo $bankaddress;?>">                                              </div>
-                                              </div>
-                                            </div>
-                                            <input type="hidden" id="BankState" name="BankState" class="form-control" value="Yes">
-                                            <div class="form-row" >
-                                              <div class="col-md-12 text-right">
-                                                <a class="btn btn-success font Add"  ID="Add"> &nbsp;&nbsp;<span class="bold">Add/Update Bank Detail</span></a>&nbsp;&nbsp;&nbsp;&nbsp;
-                                              </div>
-                                            </div>
-                                            <div class="form-row" >
-                                              <div class="col-md-12">
-                                                <table id="banktable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
-                                                  <thead >
-                                                    <tr>
-                                                      <th>BankName</th>
-                                                      <th>IFSC</th>
-                                                      <th>BankAccountNumber</th>
-                                                      <th>BankAddress</th>
-                                                      <th>IsActive</th>
-                                                      <!-- <th>Action</th>                             -->
-                                                    </tr>
-                                                  </thead>
-                                                  <tbody id="databaseAppend">
-                                                    <?php if(!empty($bankdetails)){
-                                                      foreach ($bankdetails as $uf) {  ?>
-                                                    <tr>
-                                                      <td style="width: 15%;"><?php echo $uf->Bank_name ?></td>  
-                                                      <td style="width: 18%;" contenteditable='true'><?php echo $uf->IFSC ?></td>
-                                                      <td style="width: 18%;" contenteditable='true'><?php echo $uf->Bank_AccNo ?></td>
-                                                      <td style="width: 40%;" contenteditable='true'><?php echo $uf->Address ?></a></td>
-                                                      <td style="width: 10%;" contenteditable='true'>
-                                                      <?php if($uf->Is_Active == 1 )
-                                                      {
-                                                          echo 'Yes';
-                                                      }
-                                                      else
-                                                      {
-                                                          echo 'No';
-                                                      }
-                                                      ?>
-
-                                                      </td>
-                                                    </tr>
-                                                    <?php  }  }  ?>
-                                                  </tbody>
-                                                </table>
-                                              </div>
-                                            </div>
-                                                    </div>
-
-                                            <legend style="margin-left:0px;color: #4f7c97;">Upload File</legend>
-                                            <div class="col-md-12" style="margin-bottom: 27px;">
-                                            <div class="form-row" >
-                                              <div class="col-md-4">
-                                                <span for="FileDescription">File Description</span>
-                                                <select class="form-control required" id="filedescription" name="filedescription">
-                                                  <option value="CERTIFICATION" >Select File Type</option>
-                                                  <?php
-                                                  if(!empty($filetype))
-                                                  {
-                                                    foreach ($filetype as $rl)
-                                                    {
-                                                      ?>
-                                                      <option value="<?php echo $rl->ConfigValue ?>"><?php echo $rl->ConfigValue ?></option>
-                                                      <?php
-                                                    }
-                                                  }
-                                                  ?>
-                                              </select> 
-                                              </div>
-                                              <div class="col-md-4">
-                                                <label style="margin-bottom:0px !important;" for="images">Select Company file<small> (only .pdf,.excel,.doc,.png,.jpg)</small></label>
-                                                <input style="margin-top: 5px;" type = "file"  size = "20" input accept=".docx,.pdf,.doc.JPG,.PNG" onchange="readURL(this,1);"   id="images" name="images"/> 
-                                                
-                                              </div>
-                                            </div>
-                                            <div class="form-row" >
-                                              <div class="col-md-12 text-right">
-                                                <input type="submit" id="submit" onclick="valid();" class="btn btn-success" value="Submit" />           
-                                              </div>
-                                            </div>
-                                            <div class="form-row">
-                                              <div class="col-md-12">
-                                              <table id="datatable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
-                                      <thead >
-                                      
                           <tr>
-                              <th>filedescription</th>
-                              <th>filename</th>
-                                <th>uploadedby</th>
-                                          <th>uploadedon</th>
-                                          <th>Actions</th>              
+                            <th>filedescription</th>
+                            <th>filename</th>
+                            <th>uploadedby</th>
+                            <th>uploadedon</th>
+                            <th>Actions</th>
                           </tr>
                         </thead>
                         <tbody>
-                                  <?php
-                        
-                                  if(!empty($filenames))
-                                    {
-                            
-                                      foreach ($filenames as $uf)
-                            
-                                          {  
-                                          
-                                  ?>
-                                  <tr>
-                            <td ><?php echo $uf->filedescription ?></td>  
-                                      <td><?php echo $uf->filename ?></a></td>
-                            <td><?php echo $firstname;?></td>
-                            <td><?php echo $uf->createdDate ?></td>
-                            <td>
-                                        <!--<a href="<?php echo base_url().'user/editOld?UID='.$uf->filename;?>"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>-->
-                                        <a  onclick="deletefile(<?php echo $uf->ID;?>)"><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>
-                            <a href="<?php echo  base_url().'public/uploads/files/'?><?php echo $uf->filename ?>"><i class="fa fa-download" ></i></a>
-                                    </td>
-                                  </tr>
-                                  <?php
-                                      }
-                                  }
-                                  ?>
+                          <?php
+
+                          if (!empty($filenames)) {
+
+                            foreach ($filenames as $uf) {
+
+                          ?>
+                              <tr>
+                                <td><?php echo $uf->filedescription ?></td>
+                                <td><?php echo $uf->filename ?></a></td>
+                                <td><?php echo $firstname; ?></td>
+                                <td><?php echo $uf->createdDate ?></td>
+                                <td>
+                                  <!--<a href="<?php echo base_url() . 'user/editOld?UID=' . $uf->filename; ?>"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>-->
+                                  <a onclick="deletefile(<?php echo $uf->ID; ?>)"><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>
+                                  <a href="<?php echo  base_url() . 'public/uploads/files/' ?><?php echo $uf->filename ?>"><i class="fa fa-download"></i></a>
+                                </td>
+                              </tr>
+                          <?php
+                            }
+                          }
+                          ?>
                         </tbody>
-                                </table>
-                                              </div>
-                                            </div>
-                                </div>
-                                            <div class="col-md-12 text-right">
-                                              <input type="reset" id="reset" class="btn btn-reset" style="background-color: red;color: white;    margin-right: 15px;width: 80px;" value="Reset" />
-                                              <!-- <input type="submit" onclick="return Validate();" value="Submit" class="btn btn-success"> -->
-                                              <input type="submit" value="Submit" class="btn btn-success">
-                                          </div>
-                                          </div>
-                                        </form> 
-                                </div>
-                            </div>
-                            <!-- end row -->
-                        </div>
-                    </div> <!-- end card -->
-                </div><!-- end col -->
+                      </table>
+                    </div>
+                  </div>
+                </div>
+                <div class="col-md-12 text-right">
+                  <input type="reset" id="reset" class="btn btn-reset" style="background-color: red;color: white;    margin-right: 15px;width: 80px;" value="Reset" />
+                  <!-- <input type="submit" onclick="return Validate();" value="Submit" class="btn btn-success"> -->
+                  <input type="submit" value="Submit" class="btn btn-success">
+                </div>
+              </div>
+              </form>
             </div>
-            <!-- end row -->            
-        </div> <!-- container -->
-    </div> <!-- content -->
+          </div>
+          <!-- end row -->
+        </div>
+      </div> <!-- end card -->
+    </div><!-- end col -->
+  </div>
+  <!-- end row -->
+</div> <!-- container -->
+</div> <!-- content -->
 </div>
 
 <script src="<?php echo base_url(); ?>public/assets/js/addUser.js" type="text/javascript"></script>
 <script>
+  function payment_hidden() {
+    //alert("worked");
+    var term = document.getElementById("PaymentTerms");
+    var termid = term.options[term.selectedIndex].value;
+    $("#paymentid").val(termid);
+  }
 
-function payment_hidden()
-{
-  //alert("worked");
-   var term = document.getElementById("PaymentTerms");
-   var termid = term.options[term.selectedIndex].value;
-     $("#paymentid").val(termid);
-}
-
-function deletefile(filename)
-  {
+  function deletefile(filename) {
     var answer = confirm(" Do you want to delete the user from the List?")
-    if (answer) 
-    {   
-    $.ajax({ 
-      data:{id:filename},
-      type:"POST",
-      url:"<?php echo base_url() ?>companycontroller/deletefile", 
-      success:function(data) {
-      if(data)
-      {
-        $('#content').loader('hide'); 
-        alert(data);
-                
-         location.reload(); 
-        
-      
-      }
-      else
-      {
-        alert("Error"); 
-      }     
-    
-    }}); 
+    if (answer) {
+      $.ajax({
+        data: {
+          id: filename
+        },
+        type: "POST",
+        url: "<?php echo base_url() ?>companycontroller/deletefile",
+        success: function(data) {
+          if (data) {
+            $('#content').loader('hide');
+            alert(data);
+
+            location.reload();
+
+
+          } else {
+            alert("Error");
+          }
+
+        }
+      });
     }
   }
-  
 
-function valid(){
-  
-if ( $("#CompanyName").val().length < 1)
-{
-   alert('Please Enter Company Name');
-   $('#CompanyName').focus();
-   return false;
-   } 
- if ( $('#ContactNumber').val().length < 1 )
-   {
-     alert('Please Enter  Contact Number');
-    return false;
-   }
-   else if(!getMobileValidation())
-   { 
-    return false; 
-   }
-  if ( $('#AlternateContactNumber').val().length < 1 )
-   {
-     alert('Please Enter Alternate Contact Number');
-     return false;
-   }
-   else if(!ValidateAlternateContact())
-  { 
-    return false; 
-  } 
-  // else if($("#EmailAddress").val().length < 1)
-  //  {
-  //    alert('Please Enter  Email ID');
-  //   $("#EmailAddress").focus(); 
-  //   //return false;
-  //  }
-  //  else if(!validateEmail()) 
-  //  {
-  //    return false;
-  //  }
-  if ( $('#ExiseRegistration1').val().length < 1 )
- {
-   alert('Please Enter Excise Registration Number');
-   $('#ExiseRegistration1').focus();
-   return false;
- }
- else if(!ValidateExno())
-     { 
-       $('#ExiseRegistration1').focus();
-      return false; 
+
+  function valid() {
+
+    if ($("#CompanyName").val().length < 1) {
+      alert('Please Enter Company Name');
+      $('#CompanyName').focus();
+      return false;
+    }
+    if ($('#ContactNumber').val().length < 1) {
+      alert('Please Enter  Contact Number');
+      return false;
+    } else if (!getMobileValidation()) {
+      return false;
+    }
+    if ($('#AlternateContactNumber').val().length < 1) {
+      alert('Please Enter Alternate Contact Number');
+      return false;
+    } else if (!ValidateAlternateContact()) {
+      return false;
+    }
+    // else if($("#EmailAddress").val().length < 1)
+    //  {
+    //    alert('Please Enter  Email ID');
+    //   $("#EmailAddress").focus(); 
+    //   //return false;
+    //  }
+    //  else if(!validateEmail()) 
+    //  {
+    //    return false;
+    //  }
+    if ($('#ExiseRegistration1').val().length < 1) {
+      alert('Please Enter Excise Registration Number');
+      $('#ExiseRegistration1').focus();
+      return false;
+    } else if (!ValidateExno()) {
+      $('#ExiseRegistration1').focus();
+      return false;
     }
 
-if ( $('#companywebsite').val().length < 1 )
- {
-   alert('please Enter Company Website');
-   $('#companywebsite').focus();
-   return false;
- }
-  if ( $('#Address').val().length < 1 )
- {
-   alert('please Enter Address');
-   $('#Address').focus();
-   return false;
- }
-   if($("#PAN").val().length < 1)
-   {
-    alert('Please Enter  PAN ID');
-    $("#PAN").focus();
-    return false;
-   }
-   else if(!validatePAN()) 
-   {
-    //alert('validation');
-    $("#PAN").focus();
-     return false;
-   }
-   
+    if ($('#companywebsite').val().length < 1) {
+      alert('please Enter Company Website');
+      $('#companywebsite').focus();
+      return false;
+    }
+    if ($('#Address').val().length < 1) {
+      alert('please Enter Address');
+      $('#Address').focus();
+      return false;
+    }
+    if ($("#PAN").val().length < 1) {
+      alert('Please Enter  PAN ID');
+      $("#PAN").focus();
+      return false;
+    } else if (!validatePAN()) {
+      //alert('validation');
+      $("#PAN").focus();
+      return false;
+    }
 
-  if(!validateGST())
-{
-    $('#GSTNO').focus();
-    return false;
-}
- if( $('#CollectrateAddress').val().length < 1 )
- {
-   alert('please Enter Collectrate Address');
-   $('#CollectrateAddress').focus();
-   return false;
- }
 
-  
-}
+    if (!validateGST()) {
+      $('#GSTNO').focus();
+      return false;
+    }
+    if ($('#CollectrateAddress').val().length < 1) {
+      alert('please Enter Collectrate Address');
+      $('#CollectrateAddress').focus();
+      return false;
+    }
 
- 
-          
 
- 
+  }
 </script>
- <script type="text/javascript">
-   
-  $(function () {
-   
+<script type="text/javascript">
+  $(function() {
+
     $('#datatable').DataTable({
       "paging": true,
       "lengthChange": true,
@@ -936,99 +867,103 @@ if ( $('#companywebsite').val().length < 1 )
       "ordering": true,
       "info": true,
       "autoWidth": true
-     
-    }); 
+
+    });
   });
-  
 </script>
 
 <script type="text/html" id="addList">
-<tr  id="<%=index%>">
- <td style="width: 15%;" align="left"><%=BankName%></td>
- <td style="width: 18%;" align="left" contenteditable="true"><%=IFSC%></td>
- <td style="width: 18%;" align="left" contenteditable="true"><%=BankAccountNumber%></td>
- <td style="width: 40%;" align="left" contenteditable="true"><%=BankAddress%></td>
- <td style="width: 10%;" align="left" contenteditable="true"><%=IsActive%></td>
- </tr>  
+  <tr id="<%=index%>">
+    <td style="width: 15%;" align="left"><%=BankName%></td>
+    <td style="width: 18%;" align="left" contenteditable="true"><%=IFSC%></td>
+    <td style="width: 18%;" align="left" contenteditable="true"><%=BankAccountNumber%></td>
+    <td style="width: 40%;" align="left" contenteditable="true"><%=BankAddress%></td>
+    <td style="width: 10%;" align="left" contenteditable="true"><%=IsActive%></td>
+  </tr>
 </script>
 <script>
-var index     = '1';
-$('.Add').click(function(){
+  var index = '1';
+  $('.Add').click(function() {
     //alert("addonclick");
-     var temp = index;
-     var bankname = $('#BankName').val();
-     var ifsccode = $('#IFSC').val();
-     var bankaccno = $('#BankAccno').val();
-     var bankaddress = $('#BankAddress').val();
-     var isactive = $('#BankState').val();
-     // var isactive = <?php echo $bank_isactive ?>;
-     //alert(isactive);
-     
-     if(bankname != '' || ifsccode != '' || bankaddress != '' )
-     {
-        //alert('both insert and update operation evaluated');
-            if(bankname == ''){
-  
-              $("#BankName").focus(); 
-              return false;
+    var temp = index;
+    var bankname = $('#BankName').val();
+    var ifsccode = $('#IFSC').val();
+    var bankaccno = $('#BankAccno').val();
+    var bankaddress = $('#BankAddress').val();
+    var isactive = $('#BankState').val();
+    // var isactive = <?php echo $bank_isactive ?>;
+    //alert(isactive);
 
-              }
-              else if (ifsccode == ''){
-                
-              $('#IFSC').focus(); 
-              return false;
-                
-              }
-              else if (bankaccno == ''){
-                
-              $('#BankAccno').focus();
-              return false;
-                
-              }
-              else if (bankaddress == ''){
-                
-              $('#BankAddress').focus();
-              return false;
-                
-              }
-              else{
-                //alert(isactive);
-  
-        
-                    var template = jQuery("#addList").html();
-                    index = parseInt(index)+1;   
-                    $('#databaseAppend').append(_.template(template,{index:temp,BankName:bankname,IFSC:ifsccode,BankAccountNumber:bankaccno,BankAddress:bankaddress,IsActive:isactive}));   
-                  }//else closed
-                }//if closed
-                   var tablevalue = $('#banktable').tableToJSON(); // Convert the table into a javascript object
-                   var value = JSON.stringify(tablevalue);
-                
-                  //if(bankname != '' || ifsccode != '' || bankaddress != '' )
-                  //{
-                     $('#content').loader('show');
-                     $.ajax({
+    if (bankname != '' || ifsccode != '' || bankaddress != '') {
+      //alert('both insert and update operation evaluated');
+      if (bankname == '') {
 
-                       data:{id:value},
-                       type:"POST",
-                       url:"<?php echo base_url() ?>companycontroller/bankdtl",
-                    
-                       success:function(data){
-                              
-                                  $('#content').loader('hide');
-                                   alert(data);
-                             
+        $("#BankName").focus();
+        return false;
 
-                         }//success function closed
+      } else if (ifsccode == '') {
 
-                       });//ajax function closed
-                   
-                $('#BankName').val('');
-                $('#IFSC').val('');
-                $('#BankAccno').val('');
-                $('#BankAddress').val('');
+        $('#IFSC').focus();
+        return false;
 
-              
-    });//add click function closed
+      } else if (bankaccno == '') {
+
+        $('#BankAccno').focus();
+        return false;
+
+      } else if (bankaddress == '') {
+
+        $('#BankAddress').focus();
+        return false;
+
+      } else {
+        //alert(isactive);
 
 
+        var template = jQuery("#addList").html();
+        index = parseInt(index) + 1;
+
+        var html = `
+	            <tr id="${temp}">
+                    <td>${bankname}</td>
+                    <td>${ifsccode}</td>
+                    <td>${bankaccno}</td>
+                    <td>${bankaddress}</td>
+                    <td>${isactive}</td>
+                </tr>`;
+        $('#databaseAppend').append(html);
+
+      } //else closed
+    } //if closed
+    var tablevalue = $('#banktable').tableToJSON(); // Convert the table into a javascript object
+    var value = JSON.stringify(tablevalue);
+
+    //if(bankname != '' || ifsccode != '' || bankaddress != '' )
+    //{
+    $('#content').loader('show');
+    $.ajax({
+
+      data: {
+        id: value
+      },
+      type: "POST",
+      url: "<?php echo base_url() ?>companycontroller/bankdtl",
+
+      success: function(data) {
+
+        $('#content').loader('hide');
+        alert(data);
+
+
+      } //success function closed
+
+    }); //ajax function closed
+
+    $('#BankName').val('');
+    $('#IFSC').val('');
+    $('#BankAccno').val('');
+    $('#BankAddress').val('');
+
+
+  }); //add click function closed
 </script>
\ No newline at end of file
diff --git a/app/Views/editOld.php b/app/Views/editOld.php
index b2b8d5d8..d7915a30 100644
--- a/app/Views/editOld.php
+++ b/app/Views/editOld.php
@@ -1,5 +1,3 @@
-
-
 <?php
 
 $EmpId = '';
@@ -9,28 +7,22 @@ $ContactNo = '';
 $EmailId = '';
 $Role = '';
 $Designation = '';
- $RoleName = '';
-if(!empty($EmpRole))
-{
-    foreach ($EmpRole as $Er)
-    {
-		$Role =  $Er->roleId;
-                $RoleName =  $Er->role;
-	}
+$RoleName = '';
+if (!empty($EmpRole)) {
+    foreach ($EmpRole as $Er) {
+        $Role =  $Er->roleId;
+        $RoleName =  $Er->role;
+    }
 }
 
-if(!empty($EmpList))
-{
-    foreach ($EmpList as $Emp)
-    {
+if (!empty($EmpList)) {
+    foreach ($EmpList as $Emp) {
         $EmpId = $Emp->EmpID;
         $FirstName = $Emp->FirstName;
         $LastName = $Emp->LastName;
         $ContactNo = $Emp->ContactNumber;
         $EmailId = $Emp->EmailId;
-        
-		$Designation = $Emp->Designation;
-		
+        $Designation = $Emp->Designation;
     }
 }
 
@@ -38,20 +30,19 @@ if(!empty($EmpList))
 
 <div class="content-page">
     <div class="content">
-        <!-- Start Content-->
         <div class="container-fluid">
-            <!-- start page title -->
             <div class="row" style="margin-bottom: 10px;">
                 <div class="col-6">
                     <div class="page-title-box page-title-box-alt">
-                        <h4 class="page-title">Edit User <?= ' - '.$EmpId; ?> Details</h4>
+                        <h4 class="page-title">Edit User <?= ' - ' . $EmpId; ?> Details</h4>
                     </div>
                 </div>
                 <div class="col-6 text-right">
-                <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
+                    <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
                 </div>
             </div>
-            <!-- end page title -->
+
+            <!-- User Details Form -->
             <div class="row">
                 <div class="col-12">
                     <div class="card">
@@ -77,7 +68,6 @@ if(!empty($EmpList))
                                         </div>
                                     </div>
                                     <div class="form-row">
-                                        
                                         <div class="col-md-3">
                                             <label for="MailID">Email address</label>
                                             <input type="text" class="form-control required email" value="<?php echo $EmailId ?>" readonly id="MailID" name="MailID" maxlength="128">
@@ -86,18 +76,23 @@ if(!empty($EmpList))
                                             <label for="ContactNo">Contact Number</label>
                                             <input type="text" class="form-control required digits" value="<?php echo $ContactNo ?>" readonly id="ContactNo" name="ContactNo" minlength="10" maxlength="10">
                                         </div>
-                                    </div>
-                                    <div class="form-row">
-                                    <div class="col-md-3">
-                                            <label for="password">Password</label>
-                                            <input type="password" class="form-control" id="password" required name="password" maxlength="10">
-                                        </div>
                                         <div class="col-md-3">
-                                            <label for="cpassword">Confirm Password</label>
-                                            <input type="password" class="form-control equalTo" id="cpassword" name="cpassword" maxlength="10">
+                                            <label for="Role">Role</label>
+                                            <select class="form-control required" id="role" name="role" required>
+                                                <option value="0">Select Role</option>
+                                                <?php
+                                                if (!empty($roles)) {
+                                                    foreach ($roles as $rl) {
+                                                        $selected = ($rl->roleId == $Role) ? 'selected' : '';
+                                                ?>
+                                                        <option value="<?php echo $rl->roleId ?>" <?php echo $selected; ?>><?php echo $rl->role ?></option>
+                                                <?php
+                                                    }
+                                                }
+                                                ?>
+                                            </select>
                                         </div>
                                     </div>
-                                    
                                 </div>
                                 <div class="form-group text-right mt-3">
                                     <input type="hidden" name="txtEmpid" id="txtEmpid" value="<?php echo $EmpId ?>">
@@ -105,6 +100,8 @@ if(!empty($EmpList))
                                     <input type="submit" class="btn btn-success" value="Submit">
                                 </div>
                             </form>
+
+                            <!-- Flash messages for errors and success -->
                             <?php
                             $listErrors = session()->getFlashdata('listErrors');
                             if ($listErrors) {
@@ -114,6 +111,7 @@ if(!empty($EmpList))
                                     <?php echo session()->getFlashdata('listErrors'); ?>
                                 </div>
                             <?php } ?>
+
                             <?php
                             $error = session()->getFlashdata('error');
                             if ($error) {
@@ -123,6 +121,7 @@ if(!empty($EmpList))
                                     <?php echo session()->getFlashdata('error'); ?>
                                 </div>
                             <?php } ?>
+
                             <?php
                             $success = session()->getFlashdata('success');
                             if ($success) {
@@ -134,152 +133,160 @@ if(!empty($EmpList))
                             <?php } ?>
                         </div>
                     </div>
-                </div> <!-- end card -->
-            </div><!-- end col -->
+                </div>
+            </div>
+
+            <!-- Change Password Form -->
+            <div class="row">
+                <div class="col-12">
+                    <div class="card">
+                        <div class="card-body">
+                            <form role="form" action="<?php echo base_url() ?>userChangePassword" method="post" id="changePasswordForm">
+                                <input type="hidden" class="form-control" id="userId" name="userId" value="<?= $userId ?>">
+                                <div class="form-row">
+                                    <div class="col-md-3">
+                                        <label for="password">New Password</label>
+                                        <input type="password" class="form-control" id="password" required name="password" maxlength="10">
+                                    </div>
+                                    <div class="col-md-3">
+                                        <label for="cpassword">Confirm New Password</label>
+                                        <input type="password" class="form-control equalTo" id="cpassword" name="cpassword" maxlength="10">
+                                    </div>
+                                </div>
+                                <div class="form-group text-right mt-3">
+                                    <input type="hidden" name="txtEmpid" id="txtEmpid" value="<?php echo $EmpId ?>">
+                                    <input type="submit" class="btn btn-primary" value="Change Password">
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
-        <!-- end row -->
-    </div> <!-- container -->
-</div> <!-- content -->
+    </div>
+</div>
+
 
 
 <script src="<?php echo base_url(); ?>public/assets/js/editUser.js" type="text/javascript"></script>
 
 <script type="text/javascript">
-    
+    $('#addPop').click(function() {
+        if ($('#distriList option:selected').val() != null) {
+            if ($('#distriList option:selected').val() == 0) {} else {
+                var tempSelect = $('#distriList option:selected').val();
+                var Eid = $('#txtEmpid').val();
+                var tempText = $('#distriList option:selected').text();
+
+                var o = new Option(tempText, tempSelect);
+                var hidval = tempSelect;
+                //salert(orgVal);
+                var Selectedval = ''
+
+                if (orgVal != '') {
+                    Selectedval = orgVal + ':' + hidval;
+                } else {
+                    Selectedval = hidval
+                }
+
+
+
+                $(o).html(tempText);
+                $("#selectDistriList").append(o);
+
+
+                $('#distriList option:selected').remove();
+                $("#distriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
+                $("#selectDistriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
+
+
+
+                $('#content').loader('show');
+                $.ajax({
+                    data: {
+                        Eid: Eid
+                    },
+
+                    type: "POST",
+                    url: "<?php echo base_url() ?>user/Adduserdepartment",
+                    success: function(data) {
+                        if (data) {
+                            $('#content').loader('hide');
+                            alert(data);
+                            $('#txtRowCount').val('');
+
+                            //window.location = baseurl + 'CostCenter/CostListing';
+                        }
+
+                    }
+                });
+                //$('#content').loader('hide'); 
+
+
+
+                tempSelect = '';
+                tempText = '';
+                Selectedval = '';
+
+
 
 
 
-      $('#addPop').click(function () {
-          if ($('#distriList option:selected').val() != null) {
-            if($('#distriList option:selected').val()==0 ){
             }
-            else{
-              var tempSelect = $('#distriList option:selected').val();
-              var Eid= $('#txtEmpid').val();
-               var tempText = $('#distriList option:selected').text();
-          
-              var o = new Option(tempText,tempSelect);
-              var hidval = tempSelect;
-              //salert(orgVal);
-              var Selectedval = ''
-            
-              if(orgVal != '')
-              {
-                  Selectedval =  orgVal + ':' + hidval;
-              }
-              else
-              {
-                  Selectedval = hidval
-              }
-
-              
-              
-              $(o).html(tempText);
-              $("#selectDistriList").append(o);
-              
-            
-              $('#distriList option:selected').remove();
-              $("#distriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
-            $("#selectDistriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
+        } else {
+            alert("Before add please select any position.");
+        }
+    });
+
+
+
+
+    $('#removePop').click(function() {
+        if ($('#selectDistriList option:selected').val() != null) {
+            if ($('#selectDistriList option:selected').val() == 0) {
+                //alert('cannot removed');
+            } else {
+                var tempSelect = $('#selectDistriList option:selected').val();
+
+                var Eid = $('#txtEmpid').val();
+
+
+                $('#selectDistriList option:selected').remove().appendTo('#distriList');
+                $("#selectDistriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
+                $("#distriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
+
+                $("#distriList").val(tempSelect);
+                tempSelect = '';
+
 
 
-             
                 $('#content').loader('show');
-                $.ajax({ 
-                data:{Eid:Eid},    
-                
-                type:"POST",
-                url:"<?php echo base_url() ?>user/Adduserdepartment", 
-                success:function(data) {
-                if(data)
-                {
-                $('#content').loader('hide'); 
-                alert(data);
-                $('#txtRowCount').val('');
-                
-                //window.location = baseurl + 'CostCenter/CostListing';
-                }               
-            
+                $.ajax({
+                    data: {
+                        Eid: Eid
+                    },
+                    type: "POST",
+                    url: "<?php echo base_url() ?>user/Deleteuserdepartment",
+                    success: function(data) {
+                        if (data) {
+                            $('#content').loader('hide');
+                            alert(data);
+                            $('#txtRowCount').val('');
+
+                            //window.location = baseurl + 'CostCenter/CostListing';
+                        }
+
+                    }
+                });
+                //$('#content').loader('hide'); 
+
+
+
+
+            }
+
+        } else {
+            alert("Before remove please select any position.");
         }
-        });
-        //$('#content').loader('hide'); 
-       
-           
-        
-              tempSelect = '';
-              tempText = '';
-              Selectedval = '';
-
-              
-
-
-
-          } 
-     }
-          else {
-              alert("Before add please select any position.");
-          }
-      });
-
-
-
-
-      $('#removePop').click(function () {
-          if ($('#selectDistriList option:selected').val() != null) {
-            if($('#selectDistriList option:selected').val() == 0){
-              //alert('cannot removed');
-             }
-            else{
-              var tempSelect = $('#selectDistriList option:selected').val();
-
-              var Eid= $('#txtEmpid').val();
-
-
-              $('#selectDistriList option:selected').remove().appendTo('#distriList');
-              $("#selectDistriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
-              $("#distriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
-            
-              $("#distriList").val(tempSelect);
-              tempSelect = '';
-
-              
-             
-                $('#content').loader('show');
-                $.ajax({ 
-                data:{Eid:Eid},  
-                type:"POST",
-                url:"<?php echo base_url() ?>user/Deleteuserdepartment", 
-                success:function(data) {
-                if(data)
-                {
-                $('#content').loader('hide'); 
-                alert(data);
-                $('#txtRowCount').val('');
-                
-                //window.location = baseurl + 'CostCenter/CostListing';
-                }               
-            
-        }
-        });
-        //$('#content').loader('hide'); 
-    
-               
-              
-
-        }
-
-          } 
-
-          else 
-          {
-              alert("Before remove please select any position.");
-          }
-      });
-
-
-
-
-
-
-
-</script>>
+    });
+</script>>
\ No newline at end of file
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index a746a8bd..a9e75c39 100644
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -1958,7 +1958,7 @@ if (!empty($getlogpodtl)) {
 										<label>Delivery Date<span class="text-danger">*</span></label>
 										<div class="form-group">
 											<?php
-											$data = array('type' => 'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+											$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
 											echo form_input($data);
 											?>
 
@@ -1986,7 +1986,7 @@ if (!empty($getlogpodtl)) {
 										<label>Purchase Order Date</label>
 										<div class="form-group">
 											<?php
-											$data = array('type'=>'date','name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+											$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
 											echo form_input($data);
 											?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
 										</div>
diff --git a/app/Views/editconfig.php b/app/Views/editconfig.php
index 544396c2..eac454ff 100644
--- a/app/Views/editconfig.php
+++ b/app/Views/editconfig.php
@@ -1,8 +1,8 @@
 <script>
-	//window.onload=al();
-	function al() {
-		alert($('#ConfigId').val());
-	}
+    //window.onload=al();
+    function al() {
+        alert($('#ConfigId').val());
+    }
 </script>
 <?php
 $ConfigId = '';
@@ -11,11 +11,11 @@ $Comments = '';
 $ConfigValue = '';
 
 if (!empty($master)) {
-	foreach ($master as $con) {
-		$ConfigId = $con->Config_ID;
-		$ConfigName = $con->ConfigName;
-		$Comments = $con->Comments;
-	}
+    foreach ($master as $con) {
+        $ConfigId = $con->Config_ID;
+        $ConfigName = $con->ConfigName;
+        $Comments = $con->Comments;
+    }
 }
 ?>
 
@@ -31,7 +31,7 @@ if (!empty($master)) {
                     </div>
                 </div>
                 <div class="col-6 text-right">
-                <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>configlisting"><span class="bold">Back</span></a>
+                    <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>configlisting"><span class="bold">Back</span></a>
                 </div>
             </div>
 
@@ -132,10 +132,10 @@ if (!empty($master)) {
                             </div>
 
                             <div class="form-row text-right" style="margin-top:10px; text-align:right">
-								<div class="col-md-12 text-right">
-                                	<a href="<?php echo base_url() ?>configlisting" class="btn btn-cancel">Cancel</a>
-                                	<input type="submit" class="btn btn-success" value="Update" />
-                            	</div>
+                                <div class="col-md-12 text-right">
+                                    <a href="<?php echo base_url() ?>configlisting" class="btn btn-cancel">Cancel</a>
+                                    <input type="submit" class="btn btn-success" value="Update" />
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -148,9 +148,9 @@ if (!empty($master)) {
                     <div class="modal-content">
                         <!-- Modal Header -->
                         <div class="modal-header">
-                        <h4 class="modal-title" id="myModalLabel">Add Configuration</h4>
-                <button type="button" class="close" data-dismiss="modal"
-                    aria-hidden="true">×</button>  
+                            <h4 class="modal-title" id="myModalLabel">Add Configuration</h4>
+                            <button type="button" class="close" data-dismiss="modal"
+                                aria-hidden="true">×</button>
                         </div>
 
                         <!-- Modal Body -->
@@ -171,7 +171,7 @@ if (!empty($master)) {
 
                         <!-- Modal Footer -->
                         <div class="modal-footer">
-                            <a class="btn btn-cancel" data-dismiss="modal">Cancel</a>
+                            <a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px" data-dismiss="modal">Cancel</a>
                             <a class="btn btn-success font tempClickAdd" id="tempClickAdd"><i class="fa fa-plus"></i>&nbsp;&nbsp;Add</a>
                         </div>
                     </div>
@@ -184,9 +184,9 @@ if (!empty($master)) {
                     <div class="modal-content">
                         <!-- Modal Header -->
                         <div class="modal-header">
-                        <h4 class="modal-title" id="myModalLabel">Edit Config</h4>
-                <button type="button" class="close" data-dismiss="modal"
-                    aria-hidden="true">×</button>  
+                            <h4 class="modal-title" id="myModalLabel">Edit Config</h4>
+                            <button type="button" class="close" data-dismiss="modal"
+                                aria-hidden="true">×</button>
                         </div>
 
                         <!-- Modal Body -->
@@ -238,7 +238,7 @@ if (!empty($master)) {
 
                         <!-- Modal Footer -->
                         <div class="modal-footer">
-                            <a class="btn btn-cancel" data-dismiss="modal">Cancel</a>
+                            <a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px" data-dismiss="modal">Cancel</a>
                             <a class="btn btn-success font tempClickUpdate" id="tempClickUpdate"><i class="fa fa-pencil"></i>&nbsp;&nbsp;Update</a>
                         </div>
                     </div>
@@ -250,168 +250,176 @@ if (!empty($master)) {
 
 
 <script type="text/html" id="tempList">
-	<tr id="<%=index%>">
+    <tr id="<%=index%>">
 
-		<?php
-		$data = array('name' => '"configVal[<%=index%>][index]"',  'value' => set_value('<%=index%>'), 'id' => '"configVal[<%=index%>][index]"',  'class' => 'form-control', 'type' => 'hidden');
-		echo form_input($data);
-		?>
-		<td align="left"><%=index%></td>
-		<td align="left"><%=ConfigValue%></td>
+        <?php
+        $data = array('name' => '"configVal[<%=index%>][index]"',  'value' => set_value('<%=index%>'), 'id' => '"configVal[<%=index%>][index]"',  'class' => 'form-control', 'type' => 'hidden');
+        echo form_input($data);
+        ?>
+        <td align="left"><%=index%></td>
+        <td align="left"><%=ConfigValue%></td>
 
 
-		<td>
-			<a data-target='#Edit' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#Edit"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ConfigValue%> Budget details"></i>&nbsp;&nbsp;&nbsp;</a>
-		</td>
-	</tr>
+        <td>
+            <a data-target='#Edit' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#Edit"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ConfigValue%> Budget details"></i>&nbsp;&nbsp;&nbsp;</a>
+        </td>
+    </tr>
 </script>
 <script>
-	var index = $('#txtRowCount').val();
-	var userid = '';
+    $(document).ready(function() {
 
-	$("#Edit").on("shown.bs.modal", function(e) {
-		userid = $(e.relatedTarget).data('userid');
-		$('#key').val($('#configtable tr:eq(' + userid + ') td:eq(0)').text());
-		$('#Config_ID').val($('#ConfigId').val());
-		$('#EditConfigValue').val($('#configtable tr:eq(' + userid + ') td:eq(1)').text());
-		$('#ConfigVal' + userid).val($('#configtable tr:eq(' + userid + ') td:eq(1)').text());
+        var index = $('#txtRowCount').val();
+        var userid = '';
 
-	});
+        $("#Edit").on("shown.bs.modal", function(e) {
+            userid = $(e.relatedTarget).data('userid');
+            $('#key').val($('#configtable tr:eq(' + userid + ') td:eq(0)').text());
+            $('#Config_ID').val($('#ConfigId').val());
+            $('#configValue').val($('#configtable tr:eq(' + userid + ') td:eq(1)').text());
+            $('#ConfigVal' + userid).val($('#configtable tr:eq(' + userid + ') td:eq(1)').text());
 
-	$('.tempClickAdd').click(function() {
+        });
 
-		var cid = $('#ConfigId').val()
+        $('.tempClickAdd').click(function() {
 
-		if ($("#AddConfigValue").val() != '-1') {
+            var cid = $('#ConfigId').val()
+			if ($("#AddConfigValue").val() != '-1' && $("#AddConfigValue").val() != null && $("#AddConfigValue").val() != '') {
 
-			$('#AddConfigValue').show();
+                $('#AddConfigValue').show();
+
+                var ConfigValue = $("#AddConfigValue").val();
+
+                $('#AddConfigValue').val('');
 
 
-			var ConfigValue = $("#AddConfigValue").val();
-
-			$('#AddConfigValue').val('');
+                index = parseInt(index) + 1;
+                var temp = index;
 
 
-			index = parseInt(index) + 1;
-			var temp = index;
+                var template = jQuery("#tempList").html();
+                var html = `
+	            <tr id="${temp}">
+                    <td>${temp}</td>
+                    <td>${ConfigValue}</td>
+                    <td>
+                            <a class="editConfig" data-target='#Edit' data-id="${temp}" data-index="${index}" data-userid="${temp}" data-toggle="modal" href="#Edit">
+                                <i class="ri-pencil-fill"></i>
+                                &nbsp;&nbsp;&nbsp;
+                            </a> 
+                        </td>
+                </tr>`;
+                $('#tempAppend').append(html);
+
+                var theForm = $(".editConfig");
+
+                addHidden(theForm, "DbKey" + temp, 0);
+                addHidden(theForm, "configVal" + temp, ConfigValue);
+
+                $('#txtRowCount').val(temp);
+
+                //CountRows();
+                $('#AddConfiguration').modal('hide');
+
+            } else {
+                alert('Please enter all the values');
+
+            }
+
+        });
 
 
-			var template = jQuery("#tempList").html();
+        function addHidden(theForm, key, value) {
+            // Create a hidden input element, and append it to the form:
+            var input = document.createElement('input');
+            input.type = 'hidden';
+            input.name = key;
+            'name-as-seen-at-the-server';
+            input.value = value;
+            theForm.append(input);
+        }
 
-			$('#tempAppend').append(_.template(template, {
-				index: temp,
-				ConfigValue: ConfigValue,
-			}));
-
-			var theForm = $(".editConfig");
-
-			addHidden(theForm, "DbKey" + temp, 0);
-			addHidden(theForm, "configVal" + temp, ConfigValue);
-
-			$('#txtRowCount').val(temp);
-
-			//CountRows();
-		} else {
-			alert('Please enter all the values');
-
-		}
-
-	});
+        $('.tempClickUpdate').click(function() {
 
 
-	function addHidden(theForm, key, value) {
-		// Create a hidden input element, and append it to the form:
-		var input = document.createElement('input');
-		input.type = 'hidden';
-		input.name = key;
-		'name-as-seen-at-the-server';
-		input.value = value;
-		theForm.append(input);
-	}
-
-	$('.tempClickEdit').click(function() {
+            if ($("#configValue").val() != '') {
 
 
-		if ($("#EditConfigValue").val() != '') {
+                var temp = index;
+                var ConfigValue = $("#configValue").val();
+                //alert(userid);
+
+                $('#configtable tr:eq(' + userid + ') td:eq(1)').text(ConfigValue);
+
+                //alert($('#hConfigValue'+userid).val());
+                //$('#hConfigValue'+userid).val(ConfigValue);
+
+                $('#Config_ID' + userid).val($('#ConfigId').val());
+                $('#configValue' + userid).val(ConfigValue);
+                $("#configVal" + userid).val(ConfigValue);
+
+                $('#Edit').modal('hide');
+            } else {
+                alert('Please enter all the values');
+
+            }
+
+        });
 
 
-			var temp = index;
-			var ConfigValue = $("#EditConfigValue").val();
-			//alert(userid);
+        function ConfirmDelete() {
+            var x = confirm("Are you sure you want to delete?");
+            if (x)
+                return true;
+            else
+                return false;
+        }
 
-			$('#configtable tr:eq(' + userid + ') td:eq(1)').text(ConfigValue);
+        function isNumberKey(evt) {
+            var charCode = (evt.which) ? evt.which : evt.keyCode;
+            if (charCode != 46 && charCode > 31 &&
+                (charCode < 48 || charCode > 57))
+                return false;
 
-			//alert($('#hConfigValue'+userid).val());
-			//$('#hConfigValue'+userid).val(ConfigValue);
+            return true;
+        }
 
-			$('#Config_ID' + userid).val($('#ConfigId').val());
-			$('#EditConfigValue' + userid).val(ConfigValue);
-			$("#configVal" + userid).val(ConfigValue);
+        //var baseurl = "<?php print base_url(); ?>";
+        $(".editConfig").submit(function(e) {
+            if (validate()) {
+
+                $('#content').loader('show');
+                $.ajax({
+                    data: $('.editConfig').serialize(),
+                    type: 'POST',
+                    url: "<?php echo base_url(); ?>configurationctrl/configedit",
+                    success: function(data) {
+                        //alert(data);
+                        if (data) {
+                            $('#content').loader('hide');
+                            //alert(data);
+                            $('#txtSelectedDepartment').val('');
+                            $('#txtRowCount').val('');
+
+                            //window.location =	baseurl + 'CostCenter/CostListing';
+
+                        }
+
+                    }
+                });
+                //$('#content').loader('hide'); 
+            }
+
+        });
 
 
-		} else {
-			alert('Please enter all the values');
+        function validate() {
+            if ($("option:selected", $("#ApprovedBy")).val() == '-1') {
+                alert('Please Select Approver Names');
+                return false;
+            } else {
+                return true;
+            }
 
-		}
-
-	});
-
-
-	function ConfirmDelete() {
-		var x = confirm("Are you sure you want to delete?");
-		if (x)
-			return true;
-		else
-			return false;
-	}
-
-	function isNumberKey(evt) {
-		var charCode = (evt.which) ? evt.which : evt.keyCode;
-		if (charCode != 46 && charCode > 31 &&
-			(charCode < 48 || charCode > 57))
-			return false;
-
-		return true;
-	}
-</script>
-
-<script>
-	//var baseurl = "<?php print base_url(); ?>";
-	$(".editConfig").submit(function(e) {
-		if (validate()) {
-
-			$('#content').loader('show');
-			$.ajax({
-				data: $('.editConfig').serialize(),
-				type: 'POST',
-				url: "<?php echo base_url(); ?>configurationctrl/configedit",
-				success: function(data) {
-					//alert(data);
-					if (data) {
-						$('#content').loader('hide');
-						//alert(data);
-						$('#txtSelectedDepartment').val('');
-						$('#txtRowCount').val('');
-
-						//window.location =	baseurl + 'CostCenter/CostListing';
-
-					}
-
-				}
-			});
-			//$('#content').loader('hide'); 
-		}
-
-	});
-
-
-	function validate() {
-		if ($("option:selected", $("#ApprovedBy")).val() == '-1') {
-			alert('Please Select Approver Names');
-			return false;
-		} else {
-			return true;
-		}
-
-	}
+        }
+    });
 </script>
\ No newline at end of file
diff --git a/app/Views/expense_list.php b/app/Views/expense_list.php
index c521e501..27269df7 100644
--- a/app/Views/expense_list.php
+++ b/app/Views/expense_list.php
@@ -9,6 +9,11 @@
         padding-bottom: 0%;
     }
 
+    .expandable-td {
+        cursor: pointer;
+    }
+
+
     .Date-filter-form {
         display: flex;
         align-items: center;
@@ -86,15 +91,16 @@
                                 <table class="table table-bordered table-hover" id="expense_list_table" style="background-color:#fff;">
                                     <thead>
                                         <tr>
-                                            <th align="right">Created Date</th>
+                                            <th align="right" style="width: 10%;">Created Date</th>
                                             <!-- <th align="right">Expense Id</th> -->
-                                            <th align="right">Supplier Name</th>
-                                            <th align="right">Cost</th>
-                                            <th align="right">GST</th>
-                                            <th align="right">Total</th>
-                                            <th align="right">Payment Method</th>
-                                            <th align="right">Status</th>
-                                            <th>Action</th>
+                                            <th align="right" style="width: 20%;">Supplier Name</th>
+                                            <th align="right" style="width: 25%;">Item Description</th>
+                                            <th align="right" style="width: 7%;">Cost</th>
+                                            <th align="right" style="width: 5%;">CGST</th>
+                                            <th align="right" style="width: 5%;">SGST</th>
+                                            <th align="right" style="width: 5%;">IGST</th>
+                                            <th align="right" style="width: 7%;">Total</th>
+                                            <th align="right" style="width: 8%;">Action</th>
                                         </tr>
                                     </thead>
                                     <tbody>
@@ -118,12 +124,23 @@
                                                     ?>
                                                     <td><?php echo $cdate; ?></td>
                                                     <!-- <td><?php echo $record['id']; ?></td> -->
-                                                    <td><?php echo $record['SupplierName']; ?></td>
+                                                    <td class="expandable-td">
+                                                        <div class="text-container" style="max-height: 20px; overflow: hidden;">
+                                                            <?php echo $record['SupplierName']; ?>
+                                                        </div>
+                                                    </td>
+
+                                                    <!-- Item Description with Clickable TD for Expand/Collapse -->
+                                                    <td class="expandable-td">
+                                                        <div class="text-container" style="max-height: 20px; overflow: hidden;">
+                                                            <?php echo $record['item_description']; ?>
+                                                        </div>
+                                                    </td>
                                                     <td><?php echo $record['cost']; ?></td>
-                                                    <td><?php echo $record['gst']; ?></td>
+                                                    <td><?php echo $record['cgst']; ?></td>
+                                                    <td><?php echo $record['sgst']; ?></td>
+                                                    <td><?php echo $record['igst']; ?></td>
                                                     <td><?php echo $record['total']; ?></td>
-                                                    <td><?php echo $record['payment_method']; ?></td>
-                                                    <td><?php echo $record['status']; ?></td>
                                                     <td>
                                                         <?php if ($fileExists == 1) { ?>
                                                             <button title="Download FIle" class="download_button" onclick="downloadFile('<?php echo $record['id']; ?>', '<?php echo $record['transporter_file']; ?>')" style="border: none;background-color: white;color: #02a8b5;">
@@ -166,62 +183,82 @@
                 <form id="expenseForm" class="form-horizontal" role="form">
                     <input type="hidden" name="id" id="id">
                     <div class="form-group row">
+                        <div class="col-md-3">
+                            <label for="supplierid" class="col-form-label">Supplier </label>
+                        </div>
                         <div class="col-md-5">
+                            <select name="supplierid" id="supplierid" class="form-control" required>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-3">
+                            <label for="supplierid" class="col-form-label">Item Description </label>
+                        </div>
+                        <div class="col-md-5">
+                            <textarea name="item_description" id="item_description" class="form-control"></textarea>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-3">
+                            <label for="cost" class="col-form-label">Cost</label>
+                        </div>
+                        <div class="col-md-5">
+                            <input type="number" name="cost" id="cost" class="form-control" onchange="totalCalculate()">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-3">
+                            <label for="cost" class="col-form-label">CGST</label>
+                        </div>
+                        <div class="col-md-5">
+                            <input type="number" name="cgst" id="cgst" class="form-control" onchange="totalCalculate()">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-3">
+                            <label for="cost" class="col-form-label">SGST</label>
+                        </div>
+                        <div class="col-md-5">
+                            <input type="number" name="sgst" id="sgst" class="form-control" onchange="totalCalculate()">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-3">
+                            <label for="igst" class="col-form-label">IGST</label>
+                        </div>
+                        <div class="col-md-5">
+                            <input type="number" name="igst" id="igst" class="form-control" onchange="totalCalculate()">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-3">
+                            <label for="cost" class="col-form-label">Total</label>
+                        </div>
+                        <div class="col-md-5">
+                            <input type="number" name="total" id="total" class="form-control">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-3">
                             <label for="transporterfile" class="col-form-label">Transporter File</label>
+
+                        </div>
+                        <div class="col-md-5">
                             <input type="file" name="transporterfile" id="transporterfile" class="form-control">
                             <input type="hidden" name="transporterfile_name" id="transporterfile_name">
                             <small id="fileHelp" class="form-text text-muted">
                                 Current file: <span id="currentFileName"></span>
                             </small>
                         </div>
-                        <div class="col-md-1">
-                        </div>
-                        <div class="col-md-5">
-                            <label for="supplierid" class="col-form-label">Supplier </label>
-                            <select name="supplierid" id="supplierid" class="form-control" required>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <div class="col-md-5">
-                            <label for="cost" class="col-form-label">Cost</label>
-                            <input type="number" name="cost" id="cost" class="form-control">
-                        </div>
-                        <div class="col-md-1">
-                        </div>
-                        <div class="col-md-5">
-                            <label for="gst" class="col-form-label">Tax</label>
-                            <input type="number" name="gst" id="gst" class="form-control">
-                        </div>
                     </div>
                     <div class="form-group row">
-                        <div class="col-md-5">
-                            <label for="status" class="col-form-label">Status</label>
-                            <select name="status" id="status_id" class="form-control" required>
-                                <option>Select Status</option>
-                                <option value="Payment Pending">Payment Pending</option>
-                                <option value="Paid">Paid</option>
-                            </select>
-                        </div>
-                        <div class="col-md-1">
+                        <div class="col-md-3">
+                            <label for="note" class="col-form-label">Notes</label>
                         </div>
                         <div class="col-md-5">
-                            <label for="payment_method" class="col-form-label">Payment Method</label>
-                            <select name="payment_method" id="payment_method" class="form-control" required>
-                                <option>Select Payment Method</option>
-                                <option value="Cash">Cash</option>
-                                <option value="Online">Online</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <div class="col-md-12">
-                            <label for="remarks" class="col-form-label">Remarks</label>
-                            <!-- <input type="text" name="remarks" id="remarks" class="form-control"> -->
                             <textarea name="remarks" id="remarks" class="form-control"></textarea>
                         </div>
-
                     </div>
                 </form>
             </div>
@@ -305,11 +342,13 @@
                     $('#currentFileName').text(''); // Clear the file name display
                     $('#supplierid').val(expense.supplier_id).trigger('change');
                     $('#remarks').val(expense.remarks);
+                    $('#item_description').val(expense.item_description);
                     $('#cost').val(expense.cost);
-                    $('#gst').val(expense.gst);
+                    $('#cgst').val(expense.cgst);
+                    $('#sgst').val(expense.sgst);
+                    $('#igst').val(expense.igst);
                     $('#total').val(expense.total);
                     $('#status_id').val(expense.status);
-                    $('#payment_method').val(expense.payment_method);
 
                     // Clear any existing file link and delete button
                     $('#transporterfile').next('.download_button').remove();
@@ -411,10 +450,8 @@
                 [10, 20, 30, 50, -1],
                 [10, 20, 30, 50, "All"]
             ],
-            responsive: true,
-            order: [
-                [0, 'desc']
-            ],
+            // responsive: true,
+            order: [],
             language: {
                 paginate: {
                     next: '<i class="fas fa-angle-right"></i>',
@@ -497,12 +534,34 @@
             }
         });
     });
-</script>
 
-
-<script>
     document.getElementById('transporterfile').addEventListener('change', function() {
         var fileName = this.files[0].name;
         document.getElementById('currentFileName').textContent = fileName;
     });
+
+    function totalCalculate() {
+        var cost = parseFloat($('#cost').val()) || 0;
+        var cgst = parseFloat($('#cgst').val()) || 0;
+        var sgst = parseFloat($('#sgst').val()) || 0;
+        var igst = parseFloat($('#igst').val()) || 0;
+
+        var total = cgst + sgst + igst + cost;
+        // var totalTaxAmount = (cost * totalTaxPercentage) / 100;
+        // var total = cost + totalTaxAmount;
+        $('#total').val(total.toFixed(2));
+    }
+
+    $(document).ready(function() {
+        $('.expandable-td').on('click', function() {
+            var $textContainer = $(this).find('.text-container');
+            if ($textContainer.css('max-height') === '20px') {
+                // Expand the content
+                $textContainer.css('max-height', 'none');
+            } else {
+                // Collapse the content
+                $textContainer.css('max-height', '20px');
+            }
+        });
+    });
 </script>
\ No newline at end of file
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php
index 8305ff9f..d6cd862b 100644
--- a/app/Views/includes/new_header.php
+++ b/app/Views/includes/new_header.php
@@ -1,140 +1,156 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
-        <meta charset="utf-8" />
-        <title><?php echo $pageTitle; ?></title>
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <meta content="A fully featured admin theme which can be used to build CRM, CMS, etc." name="description" />
-        <meta content="Coderthemes" name="author" />
-        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-        <!-- App favicon -->
-        <link rel="shortcut icon" href="<?php echo base_url(); ?>public/new_assets/images/RI_favicon.png">
+
+<head>
+    <meta charset="utf-8" />
+    <title><?php echo $pageTitle; ?></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta content="A fully featured admin theme which can be used to build CRM, CMS, etc." name="description" />
+    <meta content="Coderthemes" name="author" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <!-- App favicon -->
+    <link rel="shortcut icon" href="<?php echo base_url(); ?>public/new_assets/images/RI_favicon.png">
 
 
 
-        <!-- third party css -->
-        <link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
-        <link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" rel="stylesheet" type="text/css" />
-        <link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css" rel="stylesheet" type="text/css" />
-        <link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-select-bs4/css//select.bootstrap4.min.css" rel="stylesheet" type="text/css" />
-        <!-- third party css end -->
-        
-		<!-- App css -->
-		<link href="<?php echo base_url(); ?>public/new_assets/css/bootstrap-creative.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
-		<link href="<?php echo base_url(); ?>public/new_assets/css/app-creative.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
+    <!-- third party css -->
+    <link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+    <link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+    <link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+    <link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-select-bs4/css//select.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+    <!-- third party css end -->
 
-		<link href="<?php echo base_url(); ?>public/new_assets/css/bootstrap-creative-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
-		<link href="<?php echo base_url(); ?>public/new_assets/css/app-creative-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" />
+    <!-- App css -->
+    <link href="<?php echo base_url(); ?>public/new_assets/css/bootstrap-creative.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
+    <link href="<?php echo base_url(); ?>public/new_assets/css/app-creative.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
 
-		<!-- icons -->
-		<link href="<?php echo base_url(); ?>public/new_assets/css/icons.min.css" rel="stylesheet" type="text/css" />
-        <link href="<?php echo base_url(); ?>public/new_assets/libs/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
+    <link href="<?php echo base_url(); ?>public/new_assets/css/bootstrap-creative-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
+    <link href="<?php echo base_url(); ?>public/new_assets/css/app-creative-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" />
 
-        <link href="<?php echo base_url(); ?>public/new_assets/libs/c3/c3.min.css" rel="stylesheet" type="text/css" />
+    <!-- icons -->
+    <link href="<?php echo base_url(); ?>public/new_assets/css/icons.min.css" rel="stylesheet" type="text/css" />
+    <link href="<?php echo base_url(); ?>public/new_assets/libs/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
 
-        <!-- Latest jQuery -->
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
-       
+    <link href="<?php echo base_url(); ?>public/new_assets/libs/c3/c3.min.css" rel="stylesheet" type="text/css" />
 
-        <!-- Chart.js -->
-        <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-
-                
-
-        <!-- DataTables CSS -->
-        <link href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css" rel="stylesheet">
-        <link href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css" rel="stylesheet">
-            
-        <!-- DataTables JS -->
-        <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
-        <script src="https://cdn.datatables.net/buttons/2.3.6/js/dataTables.buttons.min.js"></script>
-        <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.html5.min.js"></script>
-        <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.print.min.js"></script>
+    <!-- Latest jQuery -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
 
 
-        <!-- JSZip for Excel export -->
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+    <!-- Chart.js -->
+    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
 
-        <!-- pdfmake for PDF export -->
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/pdfmake.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/vfs_fonts.js"></script>
 
-        <!-- Additional Styles -->
-        <link href="https://cdn.jsdelivr.net/npm/remixicon@2.5.0/fonts/remixicon.css" rel="stylesheet">
-        <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet">
 
-        <!-- Scroll the table left to right -->
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js"></script>
-     
+    <!-- DataTables CSS -->
+    <link href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css" rel="stylesheet">
+    <link href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css" rel="stylesheet">
 
-        <link href="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
+    <!-- DataTables JS -->
+    <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/2.3.6/js/dataTables.buttons.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.html5.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.print.min.js"></script>
+
+
+    <!-- JSZip for Excel export -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+
+    <!-- pdfmake for PDF export -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/pdfmake.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/vfs_fonts.js"></script>
+
+    <!-- Additional Styles -->
+    <link href="https://cdn.jsdelivr.net/npm/remixicon@2.5.0/fonts/remixicon.css" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet">
+
+    <!-- Scroll the table left to right -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js"></script>
+
+
+    <link href="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
 
     <style>
         ::-webkit-scrollbar {
-			width: 5px;
-			height: 5px;
-			background-color: #f5f5f5;
-		}
-		::-webkit-scrollbar-thumb {
-			background-color: #797a7c;
-			border-radius: 15px;
-			height: 5px;
-		}
-		::-webkit-scrollbar-track {
-			background-color: #f5f5f5;
-		}
+            width: 5px;
+            height: 5px;
+            background-color: #f5f5f5;
+        }
+
+        ::-webkit-scrollbar-thumb {
+            background-color: #797a7c;
+            border-radius: 15px;
+            height: 5px;
+        }
+
+        ::-webkit-scrollbar-track {
+            background-color: #f5f5f5;
+        }
 
         /* Select2  Input Hight Set */
-        .select2-selection.select2-selection--single{
+        .select2-selection.select2-selection--single {
             height: calc(1.5em + .9rem + 2px);
         }
+
         .select2-container--default .select2-selection--single .select2-selection__rendered {
             line-height: 37px;
         }
+
         .select2-container--default .select2-selection--single .select2-selection__arrow {
             top: 7px;
         }
+
         /* Select2 Height End */
-        .navbar-custom{
+        .navbar-custom {
             height: 55px;
         }
+
         .logo-box .logo {
             line-height: 55px;
         }
-        .navbar-custom .topnav-menu .nav-link{
+
+        .navbar-custom .topnav-menu .nav-link {
             max-height: 55px;
             line-height: 55px;
         }
+
         @media (min-width: 992px) {
-        .topnav {
-            height: 45px;
-            margin-top: 55px;
+            .topnav {
+                height: 45px;
+                margin-top: 55px;
+            }
         }
-        }
-        .topnav .navbar-nav .nav-link{
+
+        .topnav .navbar-nav .nav-link {
             line-height: 15px;
         }
+
         .navbar-custom {
             background-color: #4f7c97 !important;
         }
+
         /* th{
             background-color: #ddd !important;
         } */
-        .btn.btn-secondary.buttons-html5 , .btn.btn-secondary.buttons-print{
+        .btn.btn-secondary.buttons-html5,
+        .btn.btn-secondary.buttons-print {
             border: 1px solid grey;
             border-radius: 4px !important;
         }
+
         legend {
             border-bottom: 2px solid #FFF !important;
             margin-left: -2%;
         }
-       
+
         .badge {
             color: red;
             background-color: #fff;
         }
+
         .btn-cancel {
-            background-color: grey; /* Red color */
+            background-color: grey;
+            /* Red color */
             color: white;
             padding: 10px 20px;
             text-align: center;
@@ -145,22 +161,25 @@
         }
 
         .btn-cancel:hover {
-            background-color: #02a8b5; /* Darker red on hover */
+            background-color: #02a8b5;
+            /* Darker red on hover */
             color: white;
         }
-</style>
+    </style>
 
     <style>
-        .date_range{
-            width:auto;
+        .date_range {
+            width: auto;
         }
-        .range_search_button{
+
+        .range_search_button {
             background-color: blue;
             color: #fff;
             width: 55px;
             border-radius: 5px;
         }
-        .range_reset_button{
+
+        .range_reset_button {
             background-color: red;
             color: #fff;
             width: 55px;
@@ -168,9 +187,11 @@
             padding: 8px;
             text-align: center;
         }
+
         .content-page {
             padding: 20px;
         }
+
         #loader_wrapper {
             display: none;
             position: fixed;
@@ -182,49 +203,60 @@
             z-index: 9999;
             text-align: center;
         }
+
         #loadingDiv {
             position: absolute;
             top: 50%;
             left: 50%;
             transform: translate(-50%, -50%);
         }
+
         .small-box {
             border-radius: 5px;
             padding: 20px;
             color: #fff;
             margin-bottom: 20px;
         }
+
         .bg-yellow {
             background-color: #f39c12;
         }
+
         .small-box .inner {
             padding: 10px;
         }
+
         .small-box .icon {
             font-size: 60px;
             line-height: 60px;
-            color: rgba(0,0,0,0.2);
+            color: rgba(0, 0, 0, 0.2);
         }
+
         .small-box-footer {
             display: block;
-            background: rgba(0,0,0,0.1);
+            background: rgba(0, 0, 0, 0.1);
             color: #fff;
             text-align: center;
             padding: 10px;
             text-decoration: none;
         }
+
         .btn-success {
             margin: 10px 0;
         }
     </style>
     <style>
-        .dataTables_wrapper .dataTables_paginate .paginate_button{
+        .dataTables_wrapper .dataTables_paginate .paginate_button {
             padding: .0em 0em !important;
         }
-       .dataTables_wrapper .dataTables_paginate .paginate_button:hover {
-            color: black !important; /* Text color */
-            border: 1px solid white; /* Light border color */
-            background-color: white; /* White background */
+
+        .dataTables_wrapper .dataTables_paginate .paginate_button:hover {
+            color: black !important;
+            /* Text color */
+            border: 1px solid white;
+            /* Light border color */
+            background-color: white;
+            /* White background */
             background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #f0f0f0));
             background: -webkit-linear-gradient(top, white 0%, #f0f0f0 100%);
             background: -moz-linear-gradient(top, white 0%, #f0f0f0 100%);
@@ -232,21 +264,26 @@
             background: -o-linear-gradient(top, white 0%, #f0f0f0 100%);
             background: linear-gradient(to bottom, white 0%, #f0f0f0 100%);
         }
-
     </style>
     <style>
         /* Style for DataTable buttons */
         .dt-buttons .btn {
-            background-color: white; /* White background for buttons */
-            color: black; /* Black text color */
-            border: 1px solid white; /* Light gray border */
-            padding: 5px 10px; /* Padding for buttons */
-            margin-right: 10px; /* Space between buttons */
+            background-color: white;
+            /* White background for buttons */
+            color: black;
+            /* Black text color */
+            border: 1px solid white;
+            /* Light gray border */
+            padding: 5px 10px;
+            /* Padding for buttons */
+            margin-right: 10px;
+            /* Space between buttons */
         }
 
         /* Space between buttons and length menu */
         .dataTables_length {
-            margin-left: 20px; /* Adjust this value for spacing */
+            margin-left: 20px;
+            /* Adjust this value for spacing */
         }
 
         /* Additional button hover styles */
@@ -255,154 +292,156 @@
             background-color: #d8eaf1;
             border-color: #cfe5ed;
         }
+
         div.dataTables_wrapper div.dataTables_length select {
             width: 87px !important;
             display: inline-block;
         }
     </style>
-<style>
+    <style>
+        .card_font_colorset_green {
+            font-size: 23.7215px;
+            font-weight: 500;
+            line-height: 1.2;
+            position: relative;
+            z-index: 1;
+            color: rgb(86, 166, 75);
+        }
 
-    .card_font_colorset_green{
-        font-size: 23.7215px;
-        font-weight: 500;
-        line-height: 1.2;
-        position: relative;
-        z-index: 1;
-        color: rgb(86, 166, 75);
-    }
-    .card_font_colorset_bule{
-        font-size: 23.7215px;
-        font-weight: 500;
-        line-height: 1.2;
-        position: relative;
-        z-index: 1;
-        color: rgb(31, 96, 196);
-    }
-    .card_font_colorset_red{
-        font-size: 23.7215px;
-        font-weight: 500;
-        line-height: 1.2;
-        position: relative;
-        z-index: 1;
-        color: rgb(173, 3, 23);
-    }
-    
-</style>
+        .card_font_colorset_bule {
+            font-size: 23.7215px;
+            font-weight: 500;
+            line-height: 1.2;
+            position: relative;
+            z-index: 1;
+            color: rgb(31, 96, 196);
+        }
 
-    </head>
-   
-    <body class="loading" data-layout-mode="horizontal" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": true}'>
+        .card_font_colorset_red {
+            font-size: 23.7215px;
+            font-weight: 500;
+            line-height: 1.2;
+            position: relative;
+            z-index: 1;
+            color: rgb(173, 3, 23);
+        }
+    </style>
 
-        <!-- Begin page -->
-        <div id="wrapper">
+</head>
 
-            <!-- Topbar Start -->
-            <div class="navbar-custom">
-                <div class="container-fluid">
-    
-                    <ul class="list-unstyled topnav-menu float-right mb-0">
+<body class="loading" data-layout-mode="horizontal" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": true}'>
 
-                        <li class="dropdown d-none d-lg-inline-block">
-                            <a class="nav-link dropdown-toggle arrow-none waves-effect waves-light" data-toggle="fullscreen" href="#">
-                                <i class="fe-maximize noti-icon"></i>
-                            </a>
-                        </li>
-    
-                        <li class="dropdown notification-list topbar-dropdown">
-                            <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
-                                <img src="<?php echo base_url(); ?>public/new_assets/images/avatar.png" alt="user-image" class="rounded-circle">
-                                <span class="pro-user-name ml-1">
-                                    <?php echo $name; ?> <i class="mdi mdi-chevron-down"></i> 
-                                </span>
-                            </a>
-                            <div class="dropdown-menu dropdown-menu-right profile-dropdown ">
-                                <!-- item-->
-                                <div class="dropdown-header noti-title">
-                                    <h6 class="text-overflow m-0"><?php echo "Welcome ".$name." !"; ?><?php //echo $role; ?></h6>     
-                                    <!-- <h6 class="text-overflow m-0"><?php echo "Welcome ".$role_text." !"; ?><?php //echo $role; ?></h6>      -->
-                                </div>
-    
-                                <!-- item-->
-                                <a href="<?php echo base_url(); ?>loadChangePass" class="dropdown-item notify-item">
-                                    <i class="ri-account-circle-line"></i>
-                                    <span>Change Password</span>
-                                </a>
+    <!-- Begin page -->
+    <div id="wrapper">
 
-                                <!-- item-->
-                        
-                                <div class="dropdown-divider"></div>
+        <!-- Topbar Start -->
+        <div class="navbar-custom">
+            <div class="container-fluid">
 
-                                <!-- item-->
-                                <a href="<?php echo base_url(); ?>logout" class="dropdown-item notify-item">
-                                    <i class="ri-logout-box-line"></i>
-                                    <span>Logout</span>
-                                </a>
-    
+                <ul class="list-unstyled topnav-menu float-right mb-0">
+
+                    <li class="dropdown d-none d-lg-inline-block">
+                        <a class="nav-link dropdown-toggle arrow-none waves-effect waves-light" data-toggle="fullscreen" href="#">
+                            <i class="fe-maximize noti-icon"></i>
+                        </a>
+                    </li>
+
+                    <li class="dropdown notification-list topbar-dropdown">
+                        <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
+                            <img src="<?php echo base_url(); ?>public/new_assets/images/avatar.png" alt="user-image" class="rounded-circle">
+                            <span class="pro-user-name ml-1">
+                                <?php echo $name; ?> <i class="mdi mdi-chevron-down"></i>
+                            </span>
+                        </a>
+                        <div class="dropdown-menu dropdown-menu-right profile-dropdown ">
+                            <!-- item-->
+                            <div class="dropdown-header noti-title">
+                                <h6 class="text-overflow m-0"><?php echo "Welcome " . $name . " !"; ?><?php //echo $role; 
+                                                                                                        ?></h6>
+                                <!-- <h6 class="text-overflow m-0"><?php echo "Welcome " . $role_text . " !"; ?><?php //echo $role; 
+                                                                                                                ?></h6>      -->
                             </div>
-                        </li>
-    
-    
-                    </ul>
 
-                    <!-- LOGO -->
-                    <div class="logo-box">
-                        <a href="index.html" class="logo logo-dark text-center">
-                            <span class="logo-sm">
-                                <img src="<?php echo base_url(); ?>public/new_assets/images/logo-sm-dark.png" alt="" height="24">
-                                <!-- <span class="logo-lg-text-light">Minton</span> -->
-                            </span>
-                            <span class="logo-lg">
-                                <img src="<?php echo base_url(); ?>public/new_assets/images/logo-dark.png" alt="" height="20">
-                                <!-- <span class="logo-lg-text-light">M</span> -->
-                            </span>
-                        </a>
-
-                        <a href="index.html" class="logo logo-light text-center">
-                            <span class="logo-sm">
-                                <img src="<?php echo base_url(); ?>public/new_assets/images/RI.png" alt="" height="30">
-                            </span>
-                            <span class="logo-lg">
-                                <img src="<?php echo base_url(); ?>public/new_assets/images/RESICO (2).png" alt="" height="30">
-                            </span>
-                        </a>
-                    </div>
-    
-                    <ul class="list-unstyled topnav-menu topnav-menu-left m-0">
-                        <li>
-                            <button class="button-menu-mobile waves-effect waves-light">
-                                <i class="fe-menu"></i>
-                            </button>
-                        </li>
-
-                        <li>
-                            <!-- Mobile menu toggle (Horizontal Layout)-->
-                            <a class="navbar-toggle nav-link" data-toggle="collapse" data-target="#topnav-menu-content">
-                                <div class="lines">
-                                    <span></span>
-                                    <span></span>
-                                    <span></span>
-                                </div>
+                            <!-- item-->
+                            <a href="<?php echo base_url(); ?>loadChangePass" class="dropdown-item notify-item">
+                                <i class="ri-account-circle-line"></i>
+                                <span>Change Password</span>
                             </a>
-                            <!-- End mobile menu toggle-->
-                        </li>   
-                    </ul>
-                    <div class="clearfix"></div>
+
+                            <!-- item-->
+
+                            <div class="dropdown-divider"></div>
+
+                            <!-- item-->
+                            <a href="<?php echo base_url(); ?>logout" class="dropdown-item notify-item">
+                                <i class="ri-logout-box-line"></i>
+                                <span>Logout</span>
+                            </a>
+
+                        </div>
+                    </li>
+
+
+                </ul>
+
+                <!-- LOGO -->
+                <div class="logo-box">
+                    <a href="index.html" class="logo logo-dark text-center">
+                        <span class="logo-sm">
+                            <img src="<?php echo base_url(); ?>public/new_assets/images/logo-sm-dark.png" alt="" height="24">
+                            <!-- <span class="logo-lg-text-light">Minton</span> -->
+                        </span>
+                        <span class="logo-lg">
+                            <img src="<?php echo base_url(); ?>public/new_assets/images/logo-dark.png" alt="" height="20">
+                            <!-- <span class="logo-lg-text-light">M</span> -->
+                        </span>
+                    </a>
+
+                    <a href="index.html" class="logo logo-light text-center">
+                        <span class="logo-sm">
+                            <img src="<?php echo base_url(); ?>public/new_assets/images/RI.png" alt="" height="30">
+                        </span>
+                        <span class="logo-lg">
+                            <img src="<?php echo base_url(); ?>public/new_assets/images/RESICO (2).png" alt="" height="30">
+                        </span>
+                    </a>
                 </div>
+
+                <ul class="list-unstyled topnav-menu topnav-menu-left m-0">
+                    <li>
+                        <button class="button-menu-mobile waves-effect waves-light">
+                            <i class="fe-menu"></i>
+                        </button>
+                    </li>
+
+                    <li>
+                        <!-- Mobile menu toggle (Horizontal Layout)-->
+                        <a class="navbar-toggle nav-link" data-toggle="collapse" data-target="#topnav-menu-content">
+                            <div class="lines">
+                                <span></span>
+                                <span></span>
+                                <span></span>
+                            </div>
+                        </a>
+                        <!-- End mobile menu toggle-->
+                    </li>
+                </ul>
+                <div class="clearfix"></div>
             </div>
-            <!-- end Topbar -->
+        </div>
+        <!-- end Topbar -->
 
-            <div class="topnav">
-                <div class="container-fluid">
-                    <nav class="navbar navbar-light navbar-expand-lg topnav-menu">
+        <div class="topnav">
+            <div class="container-fluid">
+                <nav class="navbar navbar-light navbar-expand-lg topnav-menu">
 
-                        <div class="collapse navbar-collapse" id="topnav-menu-content">
-                            <ul class="navbar-nav">
-                                <li class="nav-item dropdown">
-                                      <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>sales_dashboard" role="button"
-                                        aria-expanded="false">
-                                        <i class="ri-dashboard-line mr-1"></i> DASHBOARD
-                                    </a>
-                                    <!-- <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-dashboard" role="button"
+                    <div class="collapse navbar-collapse" id="topnav-menu-content">
+                        <ul class="navbar-nav">
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>sales_dashboard" role="button"
+                                    aria-expanded="false">
+                                    <i class="ri-dashboard-line mr-1"></i>DASHBOARD</a>
+                                <!-- <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-dashboard" role="button"
                                         data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                         <i class="ri-dashboard-line mr-1"></i> DASHBOARD <div class="arrow-down"></div>
                                     </a>
@@ -411,141 +450,151 @@
                                         <a href="https://vu.venbait.in/d/d9eb820b-60aa-4fe6-9de0-531924185b77/sales-at-a-glance?orgId=2&from=1715215911333&to=1715237511333" class="dropdown-item">Sales</a>
                                         <a href="<?php echo base_url(); ?>sales_dashboard" class="dropdown-item">Sales</a>
                                     </div> -->
-                                </li>
-                                
-                                <li class="nav-item dropdown">
-                                    <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-hr" role="button"
-                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                        <i class="ri-file-paper-2-line mr-1"></i>  SALES <div class="arrow-down"></div>
-                                    </a>
-                                    <div class="dropdown-menu" aria-labelledby="topnav-hr">
-                                        <a href="<?php echo base_url(); ?>sales_invoice" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i>Invoice</a>                                       
-                                        <a href="<?php echo base_url(); ?>dashboard"  class="dropdown-item"><i class="ri-refresh-line align-middle mr-1"></i>Sync With Zoho Books</a>
-                                    </div>
-                                </li>
-                                
-                                <li class="nav-item dropdown">
-                                    <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-purchase" role="button"
-                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                        <i class="ri-shopping-cart-2-line mr-1"></i>  PURCHASE <div class="arrow-down"></div>
-                                    </a>
-                                    <div class="dropdown-menu" aria-labelledby="topnav-purchase">
+                            </li>
 
-                                        <div class="dropdown">
-                                            <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-requisition"
-                                                role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                <i class="ri-pushpin-2-line align-middle mr-1"></i> Requisition <div class="arrow-down"></div>
-                                            </a>
-                                            <div class="dropdown-menu" aria-labelledby="topnav-requisition">
-                                                <a href="<?php echo base_url(); ?>Requisition" class="dropdown-item">Raise Requisition </a>
-                                                <a href="<?php echo base_url(); ?>CreatePO" class="dropdown-item">Purchase Order From Requisition</a>
-                                            </div>
-                                        </div>
-                                        <div class="dropdown">
-                                            <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-po"
-                                                role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                <i class="ri-align-justify align-middle mr-1"></i> Purchase order <div class="arrow-down"></div>
-                                            </a>
-                                            <div class="dropdown-menu" aria-labelledby="topnav-po">
-                                                <a href="<?php echo base_url(); ?>purchaseorderListing" class="dropdown-item">Purchase Order List</a>
-                                                <a href="<?php echo base_url(); ?>PORelease" class="dropdown-item">Approve Purchase Order</a>
-                                                <a href="<?php echo base_url(); ?>EmergencyPO" class="dropdown-item">Emergency Purchase Order  </a>
-                                                <a href="<?php echo base_url(); ?>Report_pending_purchase" class="dropdown-item">Pending Purchase Order </a>
-                                                <a href="<?php echo base_url(); ?>amendmentpurchaseorder" class="dropdown-item">Amendment Purchase Order</a>
-                                            </div>
-                                        </div>
-                                        <div class="dropdown">
-                                            <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-inward"
-                                                role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                <i class="ri-task-line align-middle mr-1"></i> Inward <div class="arrow-down"></div>
-                                            </a>
-                                            <div class="dropdown-menu" aria-labelledby="topnav-inward">
-                                                <a href="<?php echo base_url(); ?>AddIGR" class="dropdown-item">Inward Gate Register Entry</a>
-                                                <a href="<?php echo base_url(); ?>ViewIGR" class="dropdown-item">View Inward Gate Register</a>
-                                            </div>
-                                        </div>
-                                        <div class="dropdown">
-                                            <a href="<?php echo base_url(); ?>ListIGR" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i> Non IGR / Expense</a>                                       
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-hr" role="button"
+                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <i class="ri-file-paper-2-line mr-1"></i> SALES <div class="arrow-down"></div>
+                                </a>
+                                <div class="dropdown-menu" aria-labelledby="topnav-hr">
+                                    <a href="<?php echo base_url(); ?>sales_invoice" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i>Invoice</a>
+                                    <a href="<?php echo base_url(); ?>dashboard" class="dropdown-item"><i class="ri-refresh-line align-middle mr-1"></i>Sync With Zoho Books</a>
+                                </div>
+                            </li>
+
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-purchase" role="button"
+                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <i class="ri-shopping-cart-2-line mr-1"></i> PURCHASE <div class="arrow-down"></div>
+                                </a>
+                                <div class="dropdown-menu" aria-labelledby="topnav-purchase">
+
+                                    <div class="dropdown">
+                                        <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-requisition"
+                                            role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <i class="ri-pushpin-2-line align-middle mr-1"></i> Requisition <div class="arrow-down"></div>
+                                        </a>
+                                        <div class="dropdown-menu" aria-labelledby="topnav-requisition">
+                                            <a href="<?php echo base_url(); ?>Requisition" class="dropdown-item">Raise Requisition </a>
+                                            <a href="<?php echo base_url(); ?>CreatePO" class="dropdown-item">Purchase Order From Requisition</a>
                                         </div>
                                     </div>
-                                </li>             
-
-                                <li class="nav-item dropdown">
-                                    <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-hr" role="button"
-                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                        <i class="ri-contacts-book-line mr-1"></i>  HR <div class="arrow-down"></div>
-                                    </a>
-                                    <div class="dropdown-menu" aria-labelledby="topnav-hr">
-                                        <a href="<?php echo base_url(); ?>employeeListing" class="dropdown-item"><i class="ri-shield-user-line align-middle mr-1"></i> Employee Details</a>
-                                        <a href="<?php echo base_url(); ?>attendance" class="dropdown-item"><i class=" ri-time-line align-middle mr-1"></i> Attendance</a>
-
-                                        <div class="dropdown">
-                                            <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-payslip"
-                                                role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                <i class="ri-secure-payment-line align-middle mr-1"></i>  PaySlip <div class="arrow-down"></div>
-                                            </a>
-                                            <div class="dropdown-menu" aria-labelledby="topnav-payslip">
-                                                <a href="<?php echo base_url(); ?>monthlypay" class="dropdown-item">Monthly Pay Information </a>
-                                                <a href="<?php echo base_url(); ?>ViewPay" class="dropdown-item">PaySlip Generator</a>
-                                                <!-- <a href="<?php echo base_url(); ?>PaysilpListing" class="dropdown-item">Edit Payslip</a> -->
-                                                <a href="<?php echo base_url(); ?>emppayListings" class="dropdown-item">Employee Loan Details</a>
-
-                                            </div>
-                                        </div>
-                                        <div class="dropdown">
-                                            <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-leave"
-                                                role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                <i class="fas fa-calendar-times align-middle mr-1"></i>  Leave <div class="arrow-down"></div>
-                                            </a>
-                                            <div class="dropdown-menu" aria-labelledby="topnav-leave">
-                                                <a href="<?php echo base_url(); ?>publicholidays" class="dropdown-item">Public Holidays</a>
-                                                <a href="<?php echo base_url(); ?>leavereports" class="dropdown-item"> Reports</a>
-
-                                            </div>
-                                        </div>
-                                       
-                                    </div>
-                                </li>
-
-                                <li class="nav-item dropdown">
-                                    <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-others" role="button"
-                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                        <i class="ri-database-2-line align-middle mr-1"></i> OTHERS <div class="arrow-down"></div>
-                                    </a>
-                                    <div class="dropdown-menu" aria-labelledby="topnav-others">
-                                        <div class="dropdown">
-                                            <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-master"
-                                                role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                <i class="ri-list-settings-line align-middle mr-1"></i> Master Details <div class="arrow-down"></div>
-                                            </a>
-                                            <div class="dropdown-menu" aria-labelledby="topnav-master">
-                                                <a href="<?php echo base_url(); ?>supplierlisting" class="dropdown-item">Supplier Details</a>
-                                                <a href="<?php echo base_url(); ?>transporterListing" class="dropdown-item">Transporter Details</a>
-                                                <a href="<?php echo base_url(); ?>costListing" class="dropdown-item">Cost Details</a>
-                                                <a href="<?php echo base_url(); ?>assetListing" class="dropdown-item">Asset Details</a>
-                                                <a href="<?php echo base_url(); ?>companyview" class="dropdown-item">Business Settings</a>
-                                                <a href="<?php echo base_url(); ?>configlisting" class="dropdown-item">Config Details</a>
-                                                <a href="<?php echo base_url(); ?>departmentListing" class="dropdown-item">Department Details</a>
-                                                <a href="<?php echo base_url(); ?>rawmaterialListing" class="dropdown-item">Material Details</a>
-                                                <a href="<?php echo base_url(); ?>userListing" class="dropdown-item">Users</a>
-                                            </div>
+                                    <div class="dropdown">
+                                        <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-po"
+                                            role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <i class="ri-align-justify align-middle mr-1"></i> Purchase order <div class="arrow-down"></div>
+                                        </a>
+                                        <div class="dropdown-menu" aria-labelledby="topnav-po">
+                                            <a href="<?php echo base_url(); ?>purchaseorderListing" class="dropdown-item">Purchase Order List</a>
+                                            <a href="<?php echo base_url(); ?>PORelease" class="dropdown-item">Approve Purchase Order</a>
+                                            <a href="<?php echo base_url(); ?>EmergencyPO" class="dropdown-item">Emergency Purchase Order </a>
+                                            <a href="<?php echo base_url(); ?>Report_pending_purchase" class="dropdown-item">Pending Purchase Order </a>
+                                            <a href="<?php echo base_url(); ?>amendmentpurchaseorder" class="dropdown-item">Amendment Purchase Order</a>
                                         </div>
                                     </div>
-                                </li>
+                                    <div class="dropdown">
+                                        <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-inward"
+                                            role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <i class="ri-task-line align-middle mr-1"></i> Inward <div class="arrow-down"></div>
+                                        </a>
+                                        <div class="dropdown-menu" aria-labelledby="topnav-inward">
+                                            <a href="<?php echo base_url(); ?>AddIGR" class="dropdown-item">Inward Gate Register Entry</a>
+                                            <a href="<?php echo base_url(); ?>ViewIGR" class="dropdown-item">View Inward Gate Register</a>
+                                        </div>
+                                    </div>
+                                    <div class="dropdown">
+                                        <a href="<?php echo base_url(); ?>ListIGR" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i> Non IGR / Expense</a>
+                                    </div>
+                                </div>
+                            </li>
 
-                                <li class="nav-item dropdown">
-                                    <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>reports" role="button"
-                                        aria-expanded="false">
-                                        <i class="ri-keyboard-line mr-1"></i> REPORT LISTS
-                                    </a>
-                                </li>
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-hr" role="button"
+                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <i class="ri-contacts-book-line mr-1"></i> HR <div class="arrow-down"></div>
+                                </a>
+                                <div class="dropdown-menu" aria-labelledby="topnav-hr">
+                                    <a href="<?php echo base_url(); ?>employeeListing" class="dropdown-item"><i class="ri-shield-user-line align-middle mr-1"></i> Employee Details</a>
+                                    <a href="<?php echo base_url(); ?>attendance" class="dropdown-item"><i class=" ri-time-line align-middle mr-1"></i> Attendance</a>
 
-                            </ul> <!-- end navbar-->
-                        </div> <!-- end .collapsed-->
-                    </nav>
-                </div> <!-- end container-fluid -->
-            </div> <!-- end topnav-->
+                                    <div class="dropdown">
+                                        <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-payslip"
+                                            role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <i class="ri-secure-payment-line align-middle mr-1"></i> PaySlip <div class="arrow-down"></div>
+                                        </a>
+                                        <div class="dropdown-menu" aria-labelledby="topnav-payslip">
+                                            <a href="<?php echo base_url(); ?>monthlypay" class="dropdown-item">Monthly Pay Information </a>
+                                            <a href="<?php echo base_url(); ?>ViewPay" class="dropdown-item">PaySlip Generator</a>
+                                            <!-- <a href="<?php echo base_url(); ?>PaysilpListing" class="dropdown-item">Edit Payslip</a> -->
+                                            <a href="<?php echo base_url(); ?>emppayListings" class="dropdown-item">Employee Loan Details</a>
 
-            <!-- ============================================================== -->
-            <!-- Start Page Content here -->
-            <!-- ============================================================== -->
\ No newline at end of file
+                                        </div>
+                                    </div>
+                                    <div class="dropdown">
+                                        <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-leave"
+                                            role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <i class="fas fa-calendar-times align-middle mr-1"></i> Leave <div class="arrow-down"></div>
+                                        </a>
+                                        <div class="dropdown-menu" aria-labelledby="topnav-leave">
+                                            <a href="<?php echo base_url(); ?>publicholidays" class="dropdown-item">Public Holidays</a>
+                                            <a href="<?php echo base_url(); ?>leavereports" class="dropdown-item"> Reports</a>
+
+                                        </div>
+                                    </div>
+
+                                </div>
+                            </li>
+
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-others" role="button"
+                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <i class="ri-database-2-line align-middle mr-1"></i> OTHERS <div class="arrow-down"></div>
+                                </a>
+                                <div class="dropdown-menu" aria-labelledby="topnav-others">
+                                    <div class="dropdown">
+                                        <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-master"
+                                            role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <i class="ri-list-settings-line align-middle mr-1"></i> Master Details <div class="arrow-down"></div>
+                                        </a>
+                                        <div class="dropdown-menu" aria-labelledby="topnav-master">
+                                            <!-- <a href="<?php echo base_url(); ?>supplierlisting" class="dropdown-item">Supplier Details</a> -->
+                                            <a href="<?php echo base_url(); ?>transporterListing" class="dropdown-item">Transporter Details</a>
+                                            <a href="<?php echo base_url(); ?>costListing" class="dropdown-item">Cost Details</a>
+                                            <a href="<?php echo base_url(); ?>assetListing" class="dropdown-item">Asset Details</a>
+                                            <a href="<?php echo base_url(); ?>companyview" class="dropdown-item">Business Settings</a>
+                                            <a href="<?php echo base_url(); ?>configlisting" class="dropdown-item">Config Details</a>
+                                            <a href="<?php echo base_url(); ?>departmentListing" class="dropdown-item">Department Details</a>
+                                            <!-- <a href="<?php echo base_url(); ?>rawmaterialListing" class="dropdown-item">Material Details</a> -->
+                                            <a href="<?php echo base_url(); ?>userListing" class="dropdown-item">Users</a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>supplierlisting" role="button" aria-expanded="false">
+                                    <i class="fas fa-truck mr-1" style="color: gray;"></i>Supplier
+                                </a>
+                            </li>
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>rawmaterialListing" role="button" aria-expanded="false">
+                                    <i class="fas fa-cubes mr-1"></i>Material
+                                </a>
+                            </li>
+
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>reports" role="button"
+                                    aria-expanded="false">
+                                    <i class="ri-keyboard-line mr-1"></i> REPORT LISTS
+                                </a>
+                            </li>
+
+                        </ul> <!-- end navbar-->
+                    </div> <!-- end .collapsed-->
+                </nav>
+            </div> <!-- end container-fluid -->
+        </div> <!-- end topnav-->
+
+        <!-- ============================================================== -->
+        <!-- Start Page Content here -->
+        <!-- ============================================================== -->
\ No newline at end of file
diff --git a/app/Views/publicholidays.php b/app/Views/publicholidays.php
index 29ecb08a..24a10dcc 100644
--- a/app/Views/publicholidays.php
+++ b/app/Views/publicholidays.php
@@ -93,7 +93,7 @@
                 </table>
                 <p>&nbsp;</p>
                 <div class="row">
-                  <div class="col-md-4" id="savebutton">
+                  <div class="col-md-12 text-right" id="savebutton">
                     <input type="button" id="submit" value="Save" class="btn btn-success">
                   </div>
                 </div>