diff --git a/app/Controllers/Amendmentpurchaseorder.php b/app/Controllers/Amendmentpurchaseorder.php
index 4d154ed3..61d43ece 100755
--- a/app/Controllers/Amendmentpurchaseorder.php
+++ b/app/Controllers/Amendmentpurchaseorder.php
@@ -31,9 +31,8 @@ class Amendmentpurchaseorder extends BaseController
     $this->costcenter_model = new Costcenter_model();
     $this->session = session();
     // $this->session = \CodeIgniter\Config\Factories::libraries('session');
-    helper(['form']);  
+    helper(['form']);
     $this->isLoggedIn();
-    
   }
 
   /**
@@ -210,7 +209,7 @@ class Amendmentpurchaseorder extends BaseController
    */
   function EditRevenuePurchaseOrder()
   {
-
+    // print_r($this->request->getPost());die;
     $NewPO = '';
     $MAD = '';
     $PONO = $this->request->getPost('txtPONO');
@@ -232,12 +231,11 @@ class Amendmentpurchaseorder extends BaseController
       $Deliverydt = get_date_time_format($dt);
       $DeliverySchedule = '';
     }
-
     $Modeofshipment = $this->request->getPost('addmodeofshipment');
     $supplierreference = $this->request->getPost('amendsupplierreference');
     $supplieroffno = $this->request->getPost('amendsupplierofferno');
     $otherreference = $this->request->getPost('amendotherreference');
-    $fincap = "";//$this->request->getPost('amendfincap');
+    $fincap = ""; //$this->request->getPost('amendfincap');
     $revenuetype = $this->request->getPost('PoTypeOptions');
     $insurancestatus = $this->request->getPost('insurancestatus');
     if ($insurancestatus == 1) {
@@ -289,31 +287,39 @@ class Amendmentpurchaseorder extends BaseController
     }
     $AmendmentNewPoNo = generate_amendment_po_number($PONO);
 
-    $POMaster = array('PONO' =>$AmendmentNewPoNo,'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $PoRange, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Reference' => $supplierreference, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $revenuetype, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpecialInstruction, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'IsQualityChkReqired' => $qtycheckresult);
+    $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $PoRange, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Reference' => $supplierreference, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $revenuetype, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpecialInstruction, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'IsQualityChkReqired' => $qtycheckresult);
     $file = $this->request->getFile('POFile');
     $requestfilename = $file->getName();
-    $PrePOFile = $this->request->getPost('PrePOFile');    
+    $PrePOFile = $this->request->getPost('PrePOFile');
     if (!empty($requestfilename)) {
       if ($file && $file->isValid() && !$file->hasMoved()) {
-          $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);
-              $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; 
-            }
-            else{
-              $file->move($path, $requestfilename);  
-              $POMaster['POFile'] = $requestfilename;
-            }
-      }else{
-        $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; 
+        $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);
+          $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
+        } else {
+          $file->move($path, $requestfilename);
+          $POMaster['POFile'] = $requestfilename;
+        }
+      } else {
+        $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
+      }
+    } else {
+      $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
+    }
+    // print_r($POMaster);die;
+
+    $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO);
+    // dd($LastPO);
+    if(!empty($LastPO)){
+      if (count($LastPO) > 0) {
+        $NewPO =  $LastPO[0]['PONO'];
       }
     }else{
-      $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; 
-    }
-    $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO);
-    if (count($LastPO) > 0) {
-      $NewPO =  $LastPO[0]['PONO'];
+      $NewPO = "";
     }
 
     $PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS
@@ -611,7 +617,7 @@ class Amendmentpurchaseorder extends BaseController
     $SupplierReference = $this->request->getPost('amendsupplierreference');
     $SuppliersOfferNo = $this->request->getPost('amendsupplierofferno');
     $OtherReferences = $this->request->getPost('amendotherreference');
-    $Fincap = "";//$this->request->getPost('amendfincap');
+    $Fincap = ""; //$this->request->getPost('amendfincap');
     $InsuranceOptions = $this->request->getPost('insuranceStatus');
     $InsuranceNumber = $this->request->getPost('InsuranceNumber');
     $ServiceTypeOptions = $this->request->getPost('PoTypeOptions');
@@ -623,7 +629,7 @@ class Amendmentpurchaseorder extends BaseController
     $updatedBy = $this->session->get('userId');
     $RowCount =  $this->request->getPost('txtRowCount');
 
-    
+
     $updateddt =  get_current_date_time();
     $WorkStatus = $this->request->getPost('workstatus');
 
@@ -642,27 +648,28 @@ class Amendmentpurchaseorder extends BaseController
     }
     $AmendmentNewPoNo = generate_amendment_po_number($PONO);
 
-    $POMaster = array('PONO' =>$AmendmentNewPoNo,'ParentPO' => $PONO, 'POType' => $POType, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $scopeofwork, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $updateddt, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'ServiceWorkStatus' => $WorkStatus, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => strip_tags((string)$DescriptionOfPo), 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
+    $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'POType' => $POType, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $scopeofwork, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $updateddt, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'ServiceWorkStatus' => $WorkStatus, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => strip_tags((string)$DescriptionOfPo), 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
     $file = $this->request->getFile('POFile');
     $PrePOFile = $this->request->getPost('PrePOFile');
-    $requestfilename = $file->getName();    
+    $requestfilename = $file->getName();
     if (!empty($requestfilename)) {
-          if ($file && $file->isValid() && !$file->hasMoved()) {
-              $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);
-                  $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; 
-                }
-                else{
-                  $file->move($path, $requestfilename);  
-                  $POMaster['POFile'] = $requestfilename;
-                }
-          }else{
-            $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; 
-          }
-    }else{
-      $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; 
+      if ($file && $file->isValid() && !$file->hasMoved()) {
+        $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);
+          $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
+        } else {
+          $file->move($path, $requestfilename);
+          $POMaster['POFile'] = $requestfilename;
+        }
+      } else {
+        $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
+      }
+    } else {
+      $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
     }
 
     $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO);
@@ -892,7 +899,7 @@ class Amendmentpurchaseorder extends BaseController
     $SupplierReference = $this->request->getPost('amendsupplierreference');
     $SuppliersOfferNo = $this->request->getPost('amendsupplierofferno');
     $OtherReferences = $this->request->getPost('amendotherreference');
-    $Fincap = "";//$this->request->getPost('amendfincap');
+    $Fincap = ""; //$this->request->getPost('amendfincap');
     $InsuranceOptions = $this->request->getPost('insuranceStatus');
     $InsuranceNumber = $this->request->getPost('InsuranceNumber');
     $ServiceTypeOptions = $this->request->getPost('PoTypeOptions');
@@ -962,32 +969,33 @@ class Amendmentpurchaseorder extends BaseController
     }
     $updatedBy = $this->session->get('userId');
     $AmendmentNewPoNo = generate_amendment_po_number($PONO);
-    $POMaster = array('PONO' =>$AmendmentNewPoNo,'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $FinalTotalOrder, 'POType' => $POType, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'CapitalRange' => $PoRange, 'ExchangeRate' => $ExchangeRate, 'ExchangeRateCalculatedon' => $ExchangeRateOn, 'PaymentTerms' => $PaymentMethod, 'PaymentOtherDescription' => $Otherpayment, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'CurrencyType' => $currencytypeID, 'AmendedDetails' => $MAD, 'Import_DispatchDetails' => $curdispatch, 'Import_PlaceofOrgin' => $PlaceOforigin, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
+    $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $FinalTotalOrder, 'POType' => $POType, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'CapitalRange' => $PoRange, 'ExchangeRate' => $ExchangeRate, 'ExchangeRateCalculatedon' => $ExchangeRateOn, 'PaymentTerms' => $PaymentMethod, 'PaymentOtherDescription' => $Otherpayment, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'CurrencyType' => $currencytypeID, 'AmendedDetails' => $MAD, 'Import_DispatchDetails' => $curdispatch, 'Import_PlaceofOrgin' => $PlaceOforigin, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
     $file = $this->request->getFile('POFile');
-    $requestfilename = $file->getName();    
+    $requestfilename = $file->getName();
     $PrePOFile = $this->request->getPost('PrePOFile');
     if (!empty($requestfilename)) {
-          if ($file && $file->isValid() && !$file->hasMoved()) {
-              $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);
-                  $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; 
-                }
-                else{
-                  $file->move($path, $requestfilename);  
-                  $POMaster['POFile'] = $requestfilename;
-                }
-          }else{
-            $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; 
-          }
-    }else{
-      $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; 
+      if ($file && $file->isValid() && !$file->hasMoved()) {
+        $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);
+          $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
+        } else {
+          $file->move($path, $requestfilename);
+          $POMaster['POFile'] = $requestfilename;
+        }
+      } else {
+        $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
+      }
+    } else {
+      $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
     }
 
-   
+
     $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO);
-  
+
     if (count($LastPO) > 0) {
       $NewPO =  $LastPO[0]['PONO'];
     }
@@ -1309,11 +1317,11 @@ class Amendmentpurchaseorder extends BaseController
 
     $CreateBy = $this->session->get('userId');
     $RowCount =  $this->request->getPost('txtRowCount');
-    
+
     $createddt =  get_current_date_time();
     $updateddt =  get_current_date_time();
 
-    
+
 
     $PaymentTerms = $this->request->getPost('PaymentTerms');
     $beforePaymentTerms = $this->request->getPost('beforePaymentterms');
@@ -1322,7 +1330,7 @@ class Amendmentpurchaseorder extends BaseController
     $SupplierRef = $this->request->getPost('amendsupplierreference');
     $SupplierOffer = $this->request->getPost('amendsupplierofferno');
     $otherRef = $this->request->getPost('amendotherreference');
-    $finCap = "";//$this->request->getPost('amendfincap');
+    $finCap = ""; //$this->request->getPost('amendfincap');
 
     $OtherPayment = $this->request->getPost('Otherpayment');
 
@@ -1358,36 +1366,37 @@ class Amendmentpurchaseorder extends BaseController
       $MAD .= $MAD . "Current Place of Origin:&nbsp;&nbsp;" . $beforePalaceoforigin . "<br>";
     }
     $AmendmentNewPoNo = generate_amendment_po_number($PONO);
-    $POMaster = array('PONO' =>$AmendmentNewPoNo,'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, '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, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'Import_PlaceofOrgin' => $Palaceoforigin, 'Mode_Of_Shipment' => $Shipmentmode, 'Supplier_Reference' => $SupplierRef, 'Supplier_Offer_No' => $SupplierOffer, 'Other_Reference' => $otherRef, 'Fincap' => $finCap, 'AmendedDetails' => $MAD, 'PaymentOtherDescription' => $OtherPayment, 'InsuranceStatus' => $insurestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $importoption, 'IsQualityChkReqired' => $qtycheckresult);
+    $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, '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, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'Import_PlaceofOrgin' => $Palaceoforigin, 'Mode_Of_Shipment' => $Shipmentmode, 'Supplier_Reference' => $SupplierRef, 'Supplier_Offer_No' => $SupplierOffer, 'Other_Reference' => $otherRef, 'Fincap' => $finCap, 'AmendedDetails' => $MAD, 'PaymentOtherDescription' => $OtherPayment, 'InsuranceStatus' => $insurestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $importoption, 'IsQualityChkReqired' => $qtycheckresult);
     $file = $this->request->getFile('POFile');
-    $requestfilename = $file->getName();    
+    $requestfilename = $file->getName();
     $PrePOFile = $this->request->getPost('PrePOFile');
     if (!empty($requestfilename)) {
-          if ($file && $file->isValid() && !$file->hasMoved()) {
-              $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);
-                  $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; 
-                }
-                else{
-                  $file->move($path, $requestfilename);  
-                  $POMaster['POFile'] = $requestfilename;
-                }
-          }else{
-            $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; 
-          }
-    }else{
-      $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; 
+      if ($file && $file->isValid() && !$file->hasMoved()) {
+        $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);
+          $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
+        } else {
+          $file->move($path, $requestfilename);
+          $POMaster['POFile'] = $requestfilename;
+        }
+      } else {
+        $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
+      }
+    } else {
+      $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
     }
     $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO);
     $NewPO = '';
     // if (count($LastPO) > 0) {
     //   $NewPO =  $LastPO[0]['PONO'];
     // }
-        foreach ($LastPO as $PO) :
-          $NewPO = $PO['PONO'];
-        endforeach;
+    foreach ($LastPO as $PO) :
+      $NewPO = $PO['PONO'];
+    endforeach;
     $PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS
 
     $APO = $this->purchaseorder_model->updateAmendPOMaster($PONO, $PODetail);
@@ -1635,5 +1644,4 @@ class Amendmentpurchaseorder extends BaseController
 
     echo 'Purchase Order is' . $PONO . 'Amended Successfully! New PO Number is: ' . $NewPO;
   }
-
 }
diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php
index f7094784..d99a697b 100755
--- a/app/Controllers/Inwardgateregister.php
+++ b/app/Controllers/Inwardgateregister.php
@@ -321,9 +321,9 @@ class Inwardgateregister extends BaseController
     $IsThisOpenOrderPO = $this->request->getPost('hiddenIsOpenOrder');
     $DeliveryChellanOrInvoiceNo = $this->request->getPost('InvoiceNo');
     $DeliveryChellan = (string)$this->request->getPost('InvoiceDate');
-    $DeliveryChellanDate = get_date_time_format($DeliveryChellan);
+    $DeliveryChellanDate = get_date_time_format_new($DeliveryChellan);
     $Mat_Rcvd_Dt = (string)$this->request->getPost('MaterialRcvdDate');
-    $MaterialRcvdDt = get_date_time_format($Mat_Rcvd_Dt);
+    $MaterialRcvdDt = get_date_time_format_new($Mat_Rcvd_Dt);
     $VehicleNo = $this->request->getPost('VehicleNo');
     $TransporterId = $this->request->getPost('TransporterId');
     $DriverName = $this->request->getPost('DriverName');
diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php
index 83c8101b..5624d679 100755
--- a/app/Controllers/Purchaseorder.php
+++ b/app/Controllers/Purchaseorder.php
@@ -634,7 +634,8 @@ class Purchaseorder extends BaseController
       //$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019');
 
       $data['WorkStatus'] = $this->purchaseorder_model->getStatus(7);
-      //print_r($data);die;
+      // echo "<pre>";
+      // print_r($data);die;
       $this->global['pageTitle'] = 'Edit Service Purchase order form';
       $this->loadViews("EditservicePurchaseorder", $this->global,  $data, NULL);
     } else if ($ReqType == REVENUE) {
@@ -1212,6 +1213,8 @@ class Purchaseorder extends BaseController
   //This used to Edit the Revenue Purchase Order
   function EditRevenuePurchaseOrder()
   {
+
+ 
     $PONO = $this->request->getPost('txtPONO');
     $POdt = $this->request->getPost('PODate');
     $PODate =  get_date_time_format($POdt);
diff --git a/app/Controllers/Servicepurchaseorder.php b/app/Controllers/Servicepurchaseorder.php
index 3384985b..5e3843aa 100755
--- a/app/Controllers/Servicepurchaseorder.php
+++ b/app/Controllers/Servicepurchaseorder.php
@@ -347,6 +347,7 @@ class Servicepurchaseorder extends BaseController
 		$newSupId = preg_split('[-]', (string)$newsup);
 
 		$POdt = $this->request->getPost('PODate');
+		// print_r($this->request->getPost());die;
 		$PODate =  get_date_time_format($POdt);
 		/*-----------------------------------*/
 		$b4supplier = $this->request->getPost('b4supplier');
diff --git a/app/Helpers/datetime_helper.php b/app/Helpers/datetime_helper.php
index eae19f04..6b5e8772 100755
--- a/app/Helpers/datetime_helper.php
+++ b/app/Helpers/datetime_helper.php
@@ -26,12 +26,20 @@ if (!function_exists('get_current_date')) {
 if (!function_exists('get_date_time_format')) {
     function get_date_time_format($val)
     {        
-        $date = new \DateTime($val, new \DateTimeZone('Asia/Kolkata'));
+        $date = new \DateTime($val, timezone: new \DateTimeZone('Asia/Kolkata'));
 
         return $date->format('Y-m-d H:i:s');
     }
 }
 
+if (!function_exists('get_date_time_format_new')) {
+    function get_date_time_format_new($val)
+    {        
+        $date = \DateTime::createFromFormat('d/m/Y', $val, new \DateTimeZone('Asia/Kolkata'));
+        return $date->format('Y-m-d H:i:s');
+    }
+}
+
 if (!function_exists('get_date_format')) {
     function get_date_format($DateValue)
     {
diff --git a/app/Models/Monthlypay_model.php b/app/Models/Monthlypay_model.php
index 82fa5014..bfdb24f9 100755
--- a/app/Models/Monthlypay_model.php
+++ b/app/Models/Monthlypay_model.php
@@ -39,7 +39,7 @@ class Monthlypay_model extends Model
 		// $this->db->where('t_employee_details.DateofJoining <=',$lastdate);
 		// $this->db->where('Month_Year',$current);
 
-		$sql = "select t_monthly_pay_inputs.*,t_employee_details.FirstName,t_employee_details.LastName,t_loan_master.Loan_ID,t_loan_master.Monthly_Due,t_payroll.Key 
+		$sql = "select t_monthly_pay_inputs.*,t_employee_details.FirstName,t_employee_details.LastName,t_loan_master.Loan_ID,t_loan_master.Monthly_Due,t_payroll.Id
 		from t_monthly_pay_inputs 
 		left join t_employee_details on t_monthly_pay_inputs.EmpID=t_employee_details.EmpID and t_employee_details.DateofJoining <= ? 
 		left join t_payroll on t_monthly_pay_inputs.EmpID=t_payroll.EmpID 
@@ -100,7 +100,7 @@ class Monthlypay_model extends Model
 		//echo $lastdate;
 
 		//left join t_payroll on t_employee_details.EmpID = t_payroll.EmpID and month(t_payroll.PayOn) = month(?) and year(t_payroll.PayOn) = year(?)
-		$sql = "select t_emp_pay_data.EmpID,t_emp_pay_data.*,t_employee_details.FirstName,t_employee_details.DateofJoining,t_employee_details.Designation,t_employee_details.esi_applicable,t_employee_details.pf_applicable,t_employee_details.is_management_team,t_attendance.Days_Worked as Days_worked,t_attendance.Absent as LOP_Days,t_attendance.Paid_Leave as Paid_leave,t_attendance.Total_OTHrs as OT_Hrs_Worked,t_attendance.NoofDays,t_attendance.sunday_count,t_loan_master.Loan_ID,t_loan_master.Monthly_Due,t_loan_master.Due_Start_Date as DueDate,t_loan_master.Loan_Amount,t_loan_master.Paid_Amount,t_payroll.Key,t_monthly_pay_inputs.Loan_Recovered,t_monthly_pay_inputs.Estimate,t_monthly_pay_inputs.Festival_Bonus,t_monthly_pay_inputs.Other_Deductions,t_loan_history .Balance_Amount
+		$sql = "select t_emp_pay_data.EmpID,t_emp_pay_data.*,t_employee_details.FirstName,t_employee_details.DateofJoining,t_employee_details.Designation,t_employee_details.esi_applicable,t_employee_details.pf_applicable,t_employee_details.is_management_team,t_attendance.Days_Worked as Days_worked,t_attendance.Absent as LOP_Days,t_attendance.Paid_Leave as Paid_leave,t_attendance.Total_OTHrs as OT_Hrs_Worked,t_attendance.NoofDays,t_attendance.sunday_count,t_loan_master.Loan_ID,t_loan_master.Monthly_Due,t_loan_master.Due_Start_Date as DueDate,t_loan_master.Loan_Amount,t_loan_master.Paid_Amount,t_payroll.Id,t_monthly_pay_inputs.Loan_Recovered,t_monthly_pay_inputs.Estimate,t_monthly_pay_inputs.Festival_Bonus,t_monthly_pay_inputs.Other_Deductions,t_loan_history .Balance_Amount
                 from t_emp_pay_data
 					left join t_employee_details on t_employee_details.EmpID  = t_emp_pay_data.EmpID
 					left join t_payroll on t_employee_details.EmpID = t_payroll.EmpID and t_payroll.PayOn = ?
diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php
index bf0a0dd0..5266661b 100755
--- a/app/Models/Purchaseorder_model.php
+++ b/app/Models/Purchaseorder_model.php
@@ -829,13 +829,16 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 
 		$insert_id = $this->db->affectedRows();
 		$this->db->transComplete();
-
+		// print_r($insert_id);die;
 		if ($insert_id > 0) {
+
 			$subQuery = 'select PONO  from t_purchaseorder_master where CreatedBy=? and ParentPO=? order by CreatedDate desc limit 1';
 
 			$query = $this->db->query($subQuery, array($CreatedBy, $ParentPO));
 
 			return $query->getResultArray();
+		}else{
+			return false;
 		}
 	}
 
diff --git a/app/Views/AmendPOlist.php b/app/Views/AmendPOlist.php
index c52f4af4..d8c1994e 100755
--- a/app/Views/AmendPOlist.php
+++ b/app/Views/AmendPOlist.php
@@ -1,44 +1,52 @@
 <!-- In this purchase order listing , datatable is used for sorting , pagination and etc.. , new design is used for table fro the theme-->
 
 <style>
-  .pagination {
-    margin: 0px !important;
-  }
+    .pagination {
+        margin: 0px !important;
+    }
 </style>
 <style>
-  
-        .Date-filter-form {
-            display: flex;
-            align-items: center;
-            gap: 10px; /* Adjust the gap as needed */
-        }
-        .Date-filter-form input, .Date-filter-form button {
-            padding: 5px;
-            font-size: 14px;
-        }
-        .Date-filter-form button {
-            background-color: #007bff;
-            color: white;
-            border: none;
-            cursor: pointer;
-        }
-        .Date-filter-form button:hover {
-            background-color: #0056b3;
-        }
-        .icon-button {
-            background: none;
-            border: none;
-            cursor: pointer;
-            color: #007bff;
-            font-size: 18px;
-        }
-        .icon-button:hover {
-            color: #0056b3;
-        }
-		th, td {
-            white-space: nowrap;
-        }
-    </style>
+    .Date-filter-form {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+        /* Adjust the gap as needed */
+    }
+
+    .Date-filter-form input,
+    .Date-filter-form button {
+        padding: 5px;
+        font-size: 14px;
+    }
+
+    .Date-filter-form button {
+        background-color: #007bff;
+        color: white;
+        border: none;
+        cursor: pointer;
+    }
+
+    .Date-filter-form button:hover {
+        background-color: #0056b3;
+    }
+
+    .icon-button {
+        background: none;
+        border: none;
+        cursor: pointer;
+        color: #007bff;
+        font-size: 18px;
+    }
+
+    .icon-button:hover {
+        color: #0056b3;
+    }
+
+    th,
+    td {
+        white-space: nowrap;
+    }
+</style>
 
 
 <div class="content-page">
@@ -53,12 +61,12 @@
                             <h4 class="page-title">Amendment Purchase Order List</h4>
                         </div>
                     </div>
-                </div>  
+                </div>
                 <div class="row">
                     <div class="col-12">
                         <div class="card">
                             <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;">
-                                <input type="hidden"  name="table" value="requisition">
+                                <input type="hidden" name="table" value="requisition">
                                 <label for="fromDate">From:</label>
                                 <input class="form-control date_range" type="date" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
                                 <label for="toDate">To:</label>
@@ -66,9 +74,9 @@
                                 <button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i></button>
                                 <i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
                                 <div class="error" id="error"></div>
-                            </form> 
+                            </form>
                             <div class="card-body">
-                                <table id="amend_po_list" class="table dt-responsive nowrap w-100">
+                                <table id="amend_po_list" class="table dt-responsive wrap w-100">
                                     <thead>
                                         <tr>
                                             <!-- <th>#</th> -->
@@ -85,76 +93,76 @@
                                         </tr>
                                     </thead>
                                     <tbody>
-                                    <?php
-                                if (!empty($POData)) {
-                                    $index = 0;
-                                    foreach ($POData as $record) {
-                                    $index = $index + 1;
-                                ?>
-                                <tr id="<?php echo $index; ?>">
-                                <!-- 	<td align="left"><?php echo $index; ?></td>  -->
-                                    <td align="right"><?php $Pdt =  new DateTime($record->PODate);
+                                        <?php
+                                        if (!empty($POData)) {
+                                            $index = 0;
+                                            foreach ($POData as $record) {
+                                                $index = $index + 1;
+                                        ?>
+                                                <tr id="<?php echo $index; ?>">
+                                                    <!-- 	<td align="left"><?php echo $index; ?></td>  -->
+                                                    <td><?php $Pdt =  new DateTime($record->PODate);
                                                         $PODate =  $Pdt->format('d-m-Y');
                                                         echo $PODate
                                                         ?></td>
-                                    <td><?php echo $record->PONO ?></td>
-                                    <td><?php echo $record->ReqType ?></td>
-                                    <td><?php echo $record->SupplierName ?></td>
-                                    <td align="right"><?php echo $record->TotalOrderValue ?></td>
+                                                    <td><?php echo $record->PONO ?></td>
+                                                    <td><?php echo $record->ReqType ?></td>
+                                                    <td><?php echo $record->SupplierName ?></td>
+                                                    <td><?php echo $record->TotalOrderValue ?></td>
 
-                                <!-- <td><?php echo $record->StatusName ?></td> -->
-                                    <td><?php
-                                        $statusMappings = [
-                                            'PO APPROVED' => 'AWAITING APPROVE',
-                                            'AWAITING RELEASE' => 'AWAITING APPROVE',
-                                            'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-                                            'PO RELEASED' => 'PO APPROVED',
-                                        ];
-                                                        
-                                        if (isset($record->StatusName) && !empty($record->StatusName)) {
-                                            if (isset($statusMappings[$record->StatusName])) {
-                                                echo $statusMappings[$record->StatusName];
-                                            } else {
-                                                echo $record->StatusName;
-                                            }
-                                        } else {
-                                            echo "Status not provided";
+                                                    <!-- <td><?php echo $record->StatusName ?></td> -->
+                                                    <td><?php
+                                                        $statusMappings = [
+                                                            'PO APPROVED' => 'AWAITING APPROVE',
+                                                            'AWAITING RELEASE' => 'AWAITING APPROVE',
+                                                            'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+                                                            'PO RELEASED' => 'PO APPROVED',
+                                                        ];
+
+                                                        if (isset($record->StatusName) && !empty($record->StatusName)) {
+                                                            if (isset($statusMappings[$record->StatusName])) {
+                                                                echo $statusMappings[$record->StatusName];
+                                                            } else {
+                                                                echo $record->StatusName;
+                                                            }
+                                                        } else {
+                                                            echo "Status not provided";
+                                                        }
+                                                        ?>
+                                                    </td>
+                                                    <td><?php $option = 'By Deliver Date';
+                                                        if ($record->DeliveryOption == 1) {
+                                                            $option   = "By Schedule";
+                                                        } else if ($record->DeliveryOption == 2) {
+                                                            $option   = "By Dispatch Instruction";
+                                                        }
+                                                        echo $option ?></td>
+                                                    <td><?php
+                                                                        if ($record->DeliveryOption == 0) {
+                                                                            $Ddt =  new DateTime($record->DeliveryDate);
+                                                                            $Deliverydt =  $Ddt->format('d-m-Y');
+                                                                            echo $Deliverydt;
+                                                                        } else if ($record->DeliveryOption == 1) {
+                                                                            $Deliverydt = '';
+                                                                            echo $Deliverydt;
+                                                                        } ?></td>
+                                                    <td><?php echo $record->DeliverySchedule ?></td>
+
+
+
+
+                                                    <td> <a data-toggle="tooltip" href="<?php echo base_url() . 'EditAmendPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType . '&CapitalRange=' . $record->CapitalRange; ?>"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Edit Purchase Order details"></i>&nbsp;&nbsp;&nbsp;</a>
+
+
+                                                        <a data-toggle="tooltip" href="<?php echo base_url() . 'EditAmendPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType . '&CapitalRange=' . $record->CapitalRange; ?>"> &nbsp;&nbsp;&nbsp; <a data-toggle="tooltip" href="<?php echo base_url() . 'purchaseorder/CreatePOPrint?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType; ?>"><i class="fa fa-print" data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Print the Purchase Order details"></i>&nbsp;&nbsp;&nbsp;</a>
+                                                    </td>
+                                                <?php
+                                            } ?>
+                                                </tr>
+                                            <?php
                                         }
-                                        ?>
-                                    </td>
-                                    <td><?php $option = 'By Deliver Date';
-                                        if ($record->DeliveryOption == 1) {
-                                            $option   = "By Schedule";
-                                        } else if ($record->DeliveryOption == 2) {
-                                            $option   = "By Dispatch Instruction";
-                                        }
-                                    echo $option ?></td>
-                                    <td align="right"><?php
-                                                    if ($record->DeliveryOption == 0) {
-                                                    $Ddt =  new DateTime($record->DeliveryDate);
-                                                    $Deliverydt =  $Ddt->format('d-m-Y');
-                                                    echo $Deliverydt;
-                                                    } else if ($record->DeliveryOption == 1) {
-                                                    $Deliverydt = '';
-                                                    echo $Deliverydt;
-                                                    } ?></td>
-                                <td><?php echo $record->DeliverySchedule ?></td>
 
-
-
-
-                                <td> <a data-toggle="tooltip" href="<?php echo base_url() . 'EditAmendPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType . '&CapitalRange=' . $record->CapitalRange; ?>"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Edit Purchase Order details"></i>&nbsp;&nbsp;&nbsp;</a>
-
-
-                                    <a data-toggle="tooltip" href="<?php echo base_url() . 'EditAmendPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType . '&CapitalRange=' . $record->CapitalRange; ?>"> &nbsp;&nbsp;&nbsp; <a data-toggle="tooltip" href="<?php echo base_url() . 'purchaseorder/CreatePOPrint?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType; ?>"><i class="fa fa-print" data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Print the Purchase Order details"></i>&nbsp;&nbsp;&nbsp;</a>
-                                </td>
-                                <?php
-                                    } ?>
-                                </tr>
-                            <?php
-                                }
-
-                            ?>
+                                            ?>
                                     </tbody>
                                 </table>
                             </div> <!-- end card body-->
@@ -187,85 +195,96 @@
 </script> -->
 <script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
 <script>
-$(document).ready(function() {
-    $.fn.dataTable.ext.type.order['date-eu-pre'] = function (date) {
-        var dateSplit = date.split('-');
-        return (dateSplit[2] + dateSplit[1] + dateSplit[0]) * 1;
-    };
-});
+    $(document).ready(function() {
+        $.fn.dataTable.ext.type.order['date-eu-pre'] = function(date) {
+            var dateSplit = date.split('-');
+            return (dateSplit[2] + dateSplit[1] + dateSplit[0]) * 1;
+        };
+    });
 
-$(document).ready(function() {
-    // Initialize the DataTable
-    var table = $('#amend_po_list').DataTable({
-        dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
-        buttons: [
-            'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
-        ],
-        pageLength: 10, // Default rows per page
-        lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
-        responsive: true, // Responsive table
-        order: [], // Default ordering (column index 0, descending)
-        language: {
-            paginate: {
-                next: '<i class="fas fa-angle-right"></i>', // Next button icon
-                previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+    $(document).ready(function() {
+        $(document).on('click', '.text-truncate', function() {
+            $(this).toggleClass('expanded');
+        });
+        // Initialize the DataTable
+        var table = $('#amend_po_list').DataTable({
+            dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+            buttons: [
+                'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
+            ],
+            pageLength: 10, // Default rows per page
+            lengthMenu: [
+                [10, 20, 30, 50, -1],
+                [10, 20, 30, 50, "All"]
+            ], // Rows per page options
+            responsive: true, // Responsive table
+            order: [], // Default ordering (column index 0, descending)
+            columnDefs: [{
+                    targets: '_all',
+                    className: 'text-truncate'
+                }, // Apply truncation to all columns
+            ],
+            language: {
+                paginate: {
+                    next: '<i class="fas fa-angle-right"></i>', // Next button icon
+                    previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+                }
             }
-        }
-    });
+        });
 
-    // Date range filter function
-    $.fn.dataTable.ext.search.push(
-        function(settings, data, dataIndex) {
-            var fromDate = $('#fromDate').val();
-            var toDate = $('#toDate').val();
-            
-            if (!fromDate || !toDate) {
-                return true; // If no dates selected, don't filter
+        // Date range filter function
+        $.fn.dataTable.ext.search.push(
+            function(settings, data, dataIndex) {
+                var fromDate = $('#fromDate').val();
+                var toDate = $('#toDate').val();
+
+                if (!fromDate || !toDate) {
+                    return true; // If no dates selected, don't filter
+                }
+
+                var dateStr = data[0]; // Assuming the date is in the first column
+                var dateParts = dateStr.split("-");
+                var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object
+
+                var startDate = new Date(fromDate);
+                var endDate = new Date(toDate);
+
+                // Adjust startDate to include the day before the selected fromDate
+                startDate.setDate(startDate.getDate() - 1);
+
+                // Ensure endDate includes the entire end date by setting time to the end of the day
+                endDate.setHours(23, 59, 59, 999);
+
+                // Return true if the date is within the range
+                return date >= startDate && date <= endDate;
             }
-            
-            var dateStr = data[0]; // Assuming the date is in the first column
-            var dateParts = dateStr.split("-");
-            var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object
-            
-            var startDate = new Date(fromDate);
-            var endDate = new Date(toDate);
-            
-            // Adjust startDate to include the day before the selected fromDate
-            startDate.setDate(startDate.getDate() - 1);
-            
-            // Ensure endDate includes the entire end date by setting time to the end of the day
-            endDate.setHours(23, 59, 59, 999);
+        );
 
-            // Return true if the date is within the range
-            return date >= startDate && date <= endDate;
-        }
-    );
+        // Handle form submission for the date range filter
+        $("#DateRangeFilter").submit(function(e) {
+            e.preventDefault();
+            table.draw(); // Redraw the table to apply the filter
+        });
 
-    // Handle form submission for the date range filter
-    $("#DateRangeFilter").submit(function(e) {
-        e.preventDefault();
-        table.draw(); // Redraw the table to apply the filter
+        // Reset button functionality
+        $("#resetButton").click(function() {
+            $("#fromDate").val('');
+            $("#toDate").val('');
+            table.draw(); // Redraw the table to clear the filter
+        });
+
+        // Automatically focus and open the To Date picker when From Date is selected
+        document.getElementById('fromDate').addEventListener('change', function() {
+            var fromDate = this.value;
+            var toDateInput = document.getElementById('toDate');
+
+            // Set the min attribute of the To Date input to the selected From Date
+            toDateInput.min = fromDate;
+
+            // Optionally reset the To Date input if the current value is before the new min date
+            if (toDateInput.value < fromDate) {
+                toDateInput.value = fromDate;
+            }
+        });
     });
-
-    // Reset button functionality
-    $("#resetButton").click(function() {
-        $("#fromDate").val('');
-        $("#toDate").val('');
-        table.draw(); // Redraw the table to clear the filter
-    });
-
-    // Automatically focus and open the To Date picker when From Date is selected
-    document.getElementById('fromDate').addEventListener('change', function() {
-        var fromDate = this.value;
-        var toDateInput = document.getElementById('toDate');
-        
-        // Set the min attribute of the To Date input to the selected From Date
-        toDateInput.min = fromDate;
-
-        // Optionally reset the To Date input if the current value is before the new min date
-        if (toDateInput.value < fromDate) {
-            toDateInput.value = fromDate;
-        }
-    });
-});
 </script>
\ No newline at end of file
diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index d319407e..803ab4d6 100755
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -759,7 +759,7 @@ if (!empty($getlogpodtl)) {
 						<?php } else { ?>
 							<h4><?= "Amended Service Purchase Order - $PONO "; ?></h4>
 						<?php } ?>
-						<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-success" id="back" value="Back">Back</a>
+						<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-secondary" id="back" value="Back">Back</a>
 					</div>
 				</div>
 			</div>
@@ -1197,7 +1197,8 @@ if (!empty($getlogpodtl)) {
 																	<?php
 
 																	if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?>
-																		<td> <a data-target='#EDITSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
+																		<td> <a data-target='#EDITSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="ri-pencil-fill" title="Click here to view/Edit the . <?php echo $record->ReqNo; ?> .Requisition details"></i></a>
+																		 <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
 																		<?php
 																	} else { ?>
 																		<td> <a data-target='#VIEWSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWSERVICE"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?>  -  Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
@@ -1436,7 +1437,7 @@ if (!empty($getlogpodtl)) {
 																<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
 															</div> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
 															<input type="hidden" name="txtStatus" id="txtStatus" />
-															<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index; ?>">
+															<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if(isset($index)){ echo $index; }?>">
 															<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
 
 															<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
@@ -1460,11 +1461,11 @@ if (!empty($getlogpodtl)) {
 
 													</div>
 
-													<label>Request On : </label><?php echo $Reqon; ?><br />
-													<?php if ($RequesterName != '' || $RequesterName != null) { ?>
+													<label>Request On : </label><?php if(isset($Reqon)){ echo $Reqon; } ?><br />
+													<?php if(isset($RequesterName)){ if ($RequesterName != '' || $RequesterName != null) { ?>
 														<label>Request By : </label><?php echo $RequesterName; ?><br />
 													<?php
-													} ?>
+													}} ?>
 													<!-- <label>Status : </label><?php echo $StatusName; ?> -->
 													<label>Status : </label><?php
 																			$statusMappings = [
@@ -2023,7 +2024,7 @@ if (!empty($getlogpodtl)) {
 						</div>
 							<div class="modal-footer">
 								<div class="form-row">
-									<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
+									<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin:10px;">Cancel</a>
 									<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
 								</div>
 							</div>
@@ -2336,7 +2337,7 @@ if (!empty($getlogpodtl)) {
 			</tr>
 		</script> -->
 		<script>
-			var index = <?php echo $index; ?>;
+			var index = <?php if(isset($index)){ echo $index; } ?>;
 			var userid = '';
 			var SelectedMaterialCode = [];
 			var CollIndex = 0;
@@ -2512,9 +2513,7 @@ $('#ServiceAppend').append(rowHtml);
 			}
 			$('.EditService').click(function() {
 				tinyMCE.triggerSave();
-
 				if (validateEditServiceTax()) {
-
 					var CostCode = $("#EditCostCenter").val();
 					var AvilBudget = $('#EditAvlBudAmt').val();
 					var editMaterialCode = $("#EditMaterialCode").val();
@@ -2581,6 +2580,7 @@ $('#ServiceAppend').append(rowHtml);
 					$('#ItemDescription' + userid).val(ServiceDescription);
 					$('#OtherAmt' + userid).val(OtherAmt);
 					populateValueMainFormForEditServiceTax();
+					$('#EDITSERVICE').modal('hide');
 				}
 
 			});
@@ -2805,7 +2805,7 @@ $('#ServiceAppend').append(rowHtml);
 							url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
 							success: function(data) {
 								if (data) {
-									$('#content').loader('hide');
+									// $('#content').loader('hide');
 									alert(data);
 								} else {
 									alert("Error");
@@ -2999,7 +2999,7 @@ $('#ServiceAppend').append(rowHtml);
 						$('#editdescofpo').focus();
 						return false;
 					} else {
-						$('#content').loader('show');
+						// $('#content').loader('show');
 						var formData = new FormData($('.ServicePO')[0]);
 						$.ajax({
 							// data: $('.ServicePO').serialize(),
@@ -3010,7 +3010,7 @@ $('#ServiceAppend').append(rowHtml);
 							contentType: false,
 							success: function(data) {
 								if (data) {
-									$('#content').loader('hide');
+									// $('#content').loader('hide');
 									alert(data);
 									$('#txtRowCount').val('');
 									$('#txtDeletedRow').val('');
@@ -3020,7 +3020,7 @@ $('#ServiceAppend').append(rowHtml);
 									window.location = "purchaseorderListing";
 
 								} else {
-									$('#content').loader('hide');
+									// $('#content').loader('hide');
 									alert("Error");
 								}
 
@@ -3288,7 +3288,7 @@ $('#ServiceAppend').append(rowHtml);
 				var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
 				// For Binding Material list center for the selected Requistion Number	
 
-				$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+				// $("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
 
 				var isAdded = "0";
 				for (i = 0; i < Material.length; i++) {
@@ -3467,7 +3467,7 @@ $('#ServiceAppend').append(rowHtml);
 				// 		formData.append('param5',param5);
 				// formData.append('param6',param6);
 
-				$('.content').loader('show');
+				// $('.content').loader('show');
 				$.ajax({
 					data: formData,
 					type: "POST",
@@ -3479,7 +3479,7 @@ $('#ServiceAppend').append(rowHtml);
 						if (data) {
 							alert(data);
 							window.location.reload();
-							$('.content').loader('hide');
+							// $('.content').loader('hide');
 							//$('#spl').find('td').eq(1).text(filename[2]);
 							$('#EditServiceSplPOModel').modal('hide');
 						}
@@ -3519,7 +3519,7 @@ $('#ServiceAppend').append(rowHtml);
 				formData.append('count', counter);
 				// formData.append('igr',igr);
 
-				$('.content').loader('show');
+				// $('.content').loader('show');
 				$.ajax({
 					data: formData,
 					type: "POST",
@@ -3531,7 +3531,7 @@ $('#ServiceAppend').append(rowHtml);
 						if (data) {
 							alert(data);
 							window.location.reload();
-							$('.content').loader('hide');
+							// $('.content').loader('hide');
 							// $('#spl').find('td').eq(5).text(filename[2]);
 							$('#EditServiceSplPOModel').modal('hide');
 						}
diff --git a/app/Views/POlist.php b/app/Views/POlist.php
index 66ffaf2c..c98b5ee4 100755
--- a/app/Views/POlist.php
+++ b/app/Views/POlist.php
@@ -1,60 +1,72 @@
 <style>
-  
-        .Date-filter-form {
-            display: flex;
-            align-items: center;
-            gap: 10px; /* Adjust the gap as needed */
-        }
-        .Date-filter-form input, .Date-filter-form button {
-            padding: 5px;
-            font-size: 14px;
-        }
-        .Date-filter-form button {
-            background-color: #007bff;
-            color: white;
-            border: none;
-            cursor: pointer;
-        }
-        .Date-filter-form button:hover {
-            background-color: #0056b3;
-        }
-        .icon-button {
-            background: none;
-            border: none;
-            cursor: pointer;
-            color: #007bff;
-            font-size: 18px;
-        }
-        .icon-button:hover {
-            color: #0056b3;
-        }
-		th, td {
-            white-space: nowrap;
-        }
-    </style> 
-      <style>
-        .dataTables_wrapper .top {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-        .dataTables_wrapper .dataTables_length {
-            /* float: left; */
-        }
-        .dataTables_wrapper .dt-buttons,
-        .dataTables_wrapper .dataTables_filter {
-            /* float: right; */
-            /* margin-left: 10px; */
-        }
-        .dataTables_wrapper .dt-buttons {
-            /* margin-top: 10px; */
-            /* margin-bottom: 10px; */
-        }
-        .dataTables_wrapper .dataTables_filter {
-            /* margin-top: 10px; */
-            /* margin-bottom: 10px; */
-        }
-    </style>
+    .Date-filter-form {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+        /* Adjust the gap as needed */
+    }
+
+    .Date-filter-form input,
+    .Date-filter-form button {
+        padding: 5px;
+        font-size: 14px;
+    }
+
+    .Date-filter-form button {
+        background-color: #007bff;
+        color: white;
+        border: none;
+        cursor: pointer;
+    }
+
+    .Date-filter-form button:hover {
+        background-color: #0056b3;
+    }
+
+    .icon-button {
+        background: none;
+        border: none;
+        cursor: pointer;
+        color: #007bff;
+        font-size: 18px;
+    }
+
+    .icon-button:hover {
+        color: #0056b3;
+    }
+
+    th,
+    td {
+        white-space: nowrap;
+    }
+</style>
+<style>
+    .dataTables_wrapper .top {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+
+    .dataTables_wrapper .dataTables_length {
+        /* float: left; */
+    }
+
+    .dataTables_wrapper .dt-buttons,
+    .dataTables_wrapper .dataTables_filter {
+        /* float: right; */
+        /* margin-left: 10px; */
+    }
+
+    .dataTables_wrapper .dt-buttons {
+        /* margin-top: 10px; */
+        /* margin-bottom: 10px; */
+    }
+
+    .dataTables_wrapper .dataTables_filter {
+        /* margin-top: 10px; */
+        /* margin-bottom: 10px; */
+    }
+</style>
 
 
 <div class="content-page">
@@ -69,35 +81,36 @@
                             <h4 class="page-title">Purchase Order List</h4>
                         </div>
                     </div>
-                </div>  <?php
-                    helper('form');
-                            $error = session()->getFlashdata('error');
-                    if($error){
-                        $type = "error";
-                        echo show_alert($type, $error);
-                    }
-                    $success = session()->getFlashdata('success');
-                    if($success){
-                        $type = "success";
-                        echo show_alert($type, $success);
-                    }
-                    ?>
+                </div> <?php
+                        helper('form');
+                        $error = session()->getFlashdata('error');
+                        if ($error) {
+                            $type = "error";
+                            echo show_alert($type, $error);
+                        }
+                        $success = session()->getFlashdata('success');
+                        if ($success) {
+                            $type = "success";
+                            echo show_alert($type, $success);
+                        }
+                        ?>
                 <div class="row">
                     <div class="col-12">
                         <div class="card">
                             <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;">
-                                    <input type="hidden"  name="table" value="requisition">
-                                    <label for="fromDate">From:</label>
-                                    <input class="form-control date_range" type="date" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
+                                <input type="hidden" name="table" value="requisition">
+                                <label for="fromDate">From:</label>
+                                <input class="form-control date_range" type="date" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
 
-                                    <label for="toDate">To:</label>
-                                    <input class="form-control date_range" type="date" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
+                                <label for="toDate">To:</label>
+                                <input class="form-control date_range" type="date" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
 
-                                    <button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i></button>
-                                    <i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>                                    <div class="error" id="error"></div>
-                                </form>
+                                <button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i></button>
+                                <i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
+                                <div class="error" id="error"></div>
+                            </form>
                             <div class="card-body">
-                                <table id="po_list" class="table dt-responsive nowrap w-100">
+                                <table id="po_list" class="table dt-responsive wrap w-100">
                                     <thead>
                                         <tr>
                                             <th>PO Date</th>
@@ -117,99 +130,99 @@
                                         if (!empty($POData)) {
                                             $index = 0;
                                             foreach ($POData as $record) {
-                                            $index = $index + 1;
+                                                $index = $index + 1;
                                         ?>
-                                        <tr id="<?php echo $index; ?>">
-                                        <td align="right"><?php $Pdt =  new DateTime($record->PODate);
-                                                            $PODate =  $Pdt->format('d-m-Y');
-                                                            echo $PODate
-                                                            ?></td>
-                                        <td><?php echo $record->PONO ?></td>
-                                        <td><?php echo $record->ReqType ?></td>
-                                        
-                                        <td><?php echo $record->SupplierName ?></td>
-                                        <td align="right"><?php echo $record->TotalOrderValue ?></td>
+                                                <tr id="<?php echo $index; ?>">
+                                                    <td><?php $Pdt =  new DateTime($record->PODate);
+                                                                        $PODate =  $Pdt->format('d-m-Y');
+                                                                        echo $PODate
+                                                                        ?></td>
+                                                    <td><?php echo $record->PONO ?></td>
+                                                    <td><?php echo $record->ReqType ?></td>
 
-                                        <!-- <td><?php echo $record->StatusName ?></td> -->
-                                        <td><?php
-                                        $statusMappings = [
-                                                                    'PO APPROVED' => 'AWAITING APPROVE',
-                                                                    'AWAITING RELEASE' => 'AWAITING APPROVE',
-                                                                    'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-                                                                    'PO RELEASED' => 'PO APPROVED',
-                                                                ];
-                                                                
-                                                                if (isset($record->StatusName) && !empty($record->StatusName)) {
-                                                                    if (isset($statusMappings[$record->StatusName])) {
-                                                                        echo $statusMappings[$record->StatusName];
-                                                                    } else {
-                                                                        echo $record->StatusName;
-                                                                    }
-                                                                } else {
-                                                                    echo "Status not provided";
-                                                                }
-                                        ?></td>
-                                        <td><?php $option = 'By Deliver Date';
-                                            if ($record->DeliveryOption == 1) {
-                                                $option   = "By Schedule";
-                                            } else if ($record->DeliveryOption == 2) {
-                                                $option   = "By Dispatch Instruction";
-                                            }
-                                            echo $option ?></td>
-                                        <td align="right"><?php
-                                                            if ($record->DeliveryOption == 0) {
-                                                            $Ddt =  new DateTime($record->DeliveryDate);
-                                                            $Deliverydt =  $Ddt->format('d-m-Y');
-                                                            echo $Deliverydt;
-                                                            } else if ($record->DeliveryOption == 1) {
-                                                            $Deliverydt = '';
-                                                            echo $Deliverydt;
-                                                            } ?></td>
-                                        <td><?php echo $record->DeliverySchedule ?></td>
+                                                    <td><?php echo $record->SupplierName ?></td>
+                                                    <td><?php echo $record->TotalOrderValue ?></td>
 
-                                        <?php $statusCode =  $record->StatusCode;
+                                                    <!-- <td><?php echo $record->StatusName ?></td> -->
+                                                    <td><?php
+                                                        $statusMappings = [
+                                                            'PO APPROVED' => 'AWAITING APPROVE',
+                                                            'AWAITING RELEASE' => 'AWAITING APPROVE',
+                                                            'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+                                                            'PO RELEASED' => 'PO APPROVED',
+                                                        ];
 
-                                            if ($statusCode == PO_DRAFT || $statusCode == PO_CREATED) { 
-                                                
-                                              
-                                                
-                                                ?>
+                                                        if (isset($record->StatusName) && !empty($record->StatusName)) {
+                                                            if (isset($statusMappings[$record->StatusName])) {
+                                                                echo $statusMappings[$record->StatusName];
+                                                            } else {
+                                                                echo $record->StatusName;
+                                                            }
+                                                        } else {
+                                                            echo "Status not provided";
+                                                        }
+                                                        ?></td>
+                                                    <td><?php $option = 'By Deliver Date';
+                                                        if ($record->DeliveryOption == 1) {
+                                                            $option   = "By Schedule";
+                                                        } else if ($record->DeliveryOption == 2) {
+                                                            $option   = "By Dispatch Instruction";
+                                                        }
+                                                        echo $option ?></td>
+                                                    <td><?php
+                                                                        if ($record->DeliveryOption == 0) {
+                                                                            $Ddt =  new DateTime($record->DeliveryDate);
+                                                                            $Deliverydt =  $Ddt->format('d-m-Y');
+                                                                            echo $Deliverydt;
+                                                                        } else if ($record->DeliveryOption == 1) {
+                                                                            $Deliverydt = '';
+                                                                            echo $Deliverydt;
+                                                                        } ?></td>
+                                                    <td><?php echo $record->DeliverySchedule ?></td>
 
-                                            <td> 
+                                                    <?php $statusCode =  $record->StatusCode;
 
-                                                <a data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Edit Purchase Order details"
-                                            href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType 
-                                            . '&CapitalRange=' . $record->CapitalRange; ?>">
-                                            <i class="fa fa-pencil-alt" data-toggle="tooltip" > </i>
-                                             &nbsp;&nbsp;&nbsp;</a> 
+                                                    if ($statusCode == PO_DRAFT || $statusCode == PO_CREATED) {
 
-                                            </td>
-                                        <?php
-                                            } else {
-                                               
-                                                ?>
-                                            <td> 
 
-                                           
 
-                                                <a data-toggle="tooltip" href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType 
-                                                . '&CapitalRange=' . $record->CapitalRange; ?>"><i class="fa fa-eye" data-toggle="tooltip" 
-                                                title="<?php echo $record->PONO; ?>  -  Click here to view Purchase Order details"></i>
-                                                &nbsp;&nbsp;&nbsp;</a> &nbsp;&nbsp;&nbsp;
+                                                    ?>
 
-                                                 <a data-toggle="tooltip" href="<?php echo base_url() . 'purchaseorder/CreatePOPrint?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType; ?>" 
-                                                 target="new"><i class="fa fa-print" data-toggle="tooltip" title="<?php echo $record->PONO; ?> 
+                                                        <td>
+
+                                                            <a data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Edit Purchase Order details"
+                                                                href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType
+                                                                            . '&CapitalRange=' . $record->CapitalRange; ?>">
+                                                                <i class="fa fa-pencil-alt" data-toggle="tooltip"> </i>
+                                                                &nbsp;&nbsp;&nbsp;</a>
+
+                                                        </td>
+                                                    <?php
+                                                    } else {
+
+                                                    ?>
+                                                        <td>
+
+
+
+                                                            <a data-toggle="tooltip" href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType
+                                                                                                . '&CapitalRange=' . $record->CapitalRange; ?>"><i class="fa fa-eye" data-toggle="tooltip"
+                                                                    title="<?php echo $record->PONO; ?>  -  Click here to view Purchase Order details"></i>
+                                                                &nbsp;&nbsp;&nbsp;</a> &nbsp;&nbsp;&nbsp;
+
+                                                            <a data-toggle="tooltip" href="<?php echo base_url() . 'purchaseorder/CreatePOPrint?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType; ?>"
+                                                                target="new"><i class="fa fa-print" data-toggle="tooltip" title="<?php echo $record->PONO; ?> 
                                                   -  Click here to Print the Purchase Order details"></i>
-                                                  &nbsp;&nbsp;&nbsp;
-                                                </a> 
-                                            </td>
+                                                                &nbsp;&nbsp;&nbsp;
+                                                            </a>
+                                                        </td>
+                                                    <?php
+                                                    } ?>
+                                                </tr>
                                         <?php
-                                            } ?>
-                                        </tr>
-                                    <?php
                                             }
                                         }
-                                    ?>
+                                        ?>
                                     </tbody>
                                 </table>
                             </div> <!-- end card body-->
@@ -229,87 +242,98 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
 <script src="https://cdn.datatables.net/plug-ins/1.13.6/sorting/datetime-moment.js"></script>
-    
+
 
 
 <script>
-$(document).ready(function() {
-    // Initialize the DataTable
-    var table = $('#po_list').DataTable({
-        dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
-        buttons: [
-            'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
-        ],
-        pageLength: 10, // Default rows per page
-        lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
-        responsive: true, // Responsive table
-        order: [], // Default ordering (column index 0, descending)
-        language: {
-            paginate: {
-                next: '<i class="fas fa-angle-right"></i>', // Next button icon
-                previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+    $(document).ready(function() {
+        $(document).on('click', '.text-truncate', function() {
+            $(this).toggleClass('expanded');
+        });
+
+        // Initialize the DataTable
+        var table = $('#po_list').DataTable({
+            dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+            buttons: [
+                'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
+            ],
+            pageLength: 10, // Default rows per page
+            lengthMenu: [
+                [10, 20, 30, 50, -1],
+                [10, 20, 30, 50, "All"]
+            ], // Rows per page options
+            responsive: true, // Responsive table
+            order: [], // Default ordering (column index 0, descending)
+            columnDefs: [{
+                    targets: '_all',
+                    className: 'text-truncate'
+                }, // Apply truncation to all columns
+            ],
+            language: {
+                paginate: {
+                    next: '<i class="fas fa-angle-right"></i>', // Next button icon
+                    previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+                }
             }
-        }
-    });
+        });
 
-    // Date range filter function
-    $.fn.dataTable.ext.search.push(
-        function(settings, data, dataIndex) {
-            var fromDate = $('#fromDate').val();
-            var toDate = $('#toDate').val();
-            
-            if (!fromDate || !toDate) {
-                return true; // If no dates selected, don't filter
+        // Date range filter function
+        $.fn.dataTable.ext.search.push(
+            function(settings, data, dataIndex) {
+                var fromDate = $('#fromDate').val();
+                var toDate = $('#toDate').val();
+
+                if (!fromDate || !toDate) {
+                    return true; // If no dates selected, don't filter
+                }
+
+                var dateStr = data[0]; // Assuming the date is in the first column
+                var dateParts = dateStr.split("-");
+                var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object
+
+                var startDate = new Date(fromDate);
+                var endDate = new Date(toDate);
+
+                // Adjust startDate to include the day before the selected fromDate
+                startDate.setDate(startDate.getDate() - 1);
+
+                // Ensure endDate includes the entire end date by setting time to the end of the day
+                endDate.setHours(23, 59, 59, 999);
+
+                // Return true if the date is within the range
+                return date >= startDate && date <= endDate;
             }
-            
-            var dateStr = data[0]; // Assuming the date is in the first column
-            var dateParts = dateStr.split("-");
-            var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object
-            
-            var startDate = new Date(fromDate);
-            var endDate = new Date(toDate);
-            
-            // Adjust startDate to include the day before the selected fromDate
-            startDate.setDate(startDate.getDate() - 1);
-            
-            // Ensure endDate includes the entire end date by setting time to the end of the day
-            endDate.setHours(23, 59, 59, 999);
+        );
 
-            // Return true if the date is within the range
-            return date >= startDate && date <= endDate;
-        }
-    );
+        // Handle form submission for the date range filter
+        $("#DateRangeFilter").submit(function(e) {
+            e.preventDefault();
+            table.draw(); // Redraw the table to apply the filter
+        });
 
-    // Handle form submission for the date range filter
-    $("#DateRangeFilter").submit(function(e) {
-        e.preventDefault();
-        table.draw(); // Redraw the table to apply the filter
+        // Reset button functionality
+        $("#resetButton").click(function() {
+            $("#fromDate").val('');
+            $("#toDate").val('');
+            table.draw(); // Redraw the table to clear the filter
+        });
+
+        // Automatically focus and open the To Date picker when From Date is selected
+        document.getElementById('fromDate').addEventListener('change', function() {
+            var fromDate = this.value;
+            var toDateInput = document.getElementById('toDate');
+
+            // Set the min attribute of the To Date input to the selected From Date
+            toDateInput.min = fromDate;
+
+            // Optionally reset the To Date input if the current value is before the new min date
+            if (toDateInput.value < fromDate) {
+                toDateInput.value = fromDate;
+            }
+        });
     });
 
-    // Reset button functionality
-    $("#resetButton").click(function() {
-        $("#fromDate").val('');
-        $("#toDate").val('');
-        table.draw(); // Redraw the table to clear the filter
+    $(document).ready(function() {
+        $('[data-toggle="tooltip"]').tooltip();
     });
-
-    // Automatically focus and open the To Date picker when From Date is selected
-    document.getElementById('fromDate').addEventListener('change', function() {
-        var fromDate = this.value;
-        var toDateInput = document.getElementById('toDate');
-        
-        // Set the min attribute of the To Date input to the selected From Date
-        toDateInput.min = fromDate;
-
-        // Optionally reset the To Date input if the current value is before the new min date
-        if (toDateInput.value < fromDate) {
-            toDateInput.value = fromDate;
-        }
-    });
-});
-
-$(document).ready(function(){
-    $('[data-toggle="tooltip"]').tooltip();
-});
-
 </script>
\ No newline at end of file
diff --git a/app/Views/Report_pending_purchase.php b/app/Views/Report_pending_purchase.php
index 03bc0e6f..de33aaef 100755
--- a/app/Views/Report_pending_purchase.php
+++ b/app/Views/Report_pending_purchase.php
@@ -10,15 +10,19 @@
 
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
 <style>
-	th{
-		width:auto !important;
+	th {
+		/* width: auto !important; */
 	}
+	table{
+		width:auto;
+	}
+
 	.dataTables_filter input {
 		padding: 4px;
 	}
 
 	.dataTables_filter {
-		width: 50%;
+		/* width: 50%; */
 		float: right;
 		text-align: right;
 	}
@@ -57,106 +61,106 @@
 							<!-- <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> -->
 
 							<div class="card-body">
-								
-							<form method="post" action="<?php echo base_url("Report_pending_purchase"); ?>">
-								<div class="form-group">
-									<div class="row">
-										<div class="col-4">
-											<label for="client_name">
-												<?php echo 'Supplier'; ?>
-											</label>
-											<select class="form-control" id="client_name" name="client_name">
-												<option value="">Select Supplier</option>
-												<?php
-												foreach ($cust as $item): { ?>
-												<option value="<?php echo $item->SupplierName; ?>"><?php echo $item->SupplierName;  ?></option>
-												<?php }
-												endforeach; ?>
-											</select>
-										</div>
-										<div class="col-4">
-											<label for="client_name">
-												<?php echo 'Material'; ?>
-											</label>
-											<select class="form-control" id="item_name" name="item_name">
+
+								<form method="post" action="<?php echo base_url("Report_pending_purchase"); ?>">
+									<div class="form-group">
+										<div class="row">
+											<div class="col-4">
+												<label for="client_name">
+													<?php echo 'Supplier'; ?>
+												</label>
+												<select class="form-control" id="client_name" name="client_name">
+													<option value="">Select Supplier</option>
+													<?php
+													foreach ($cust as $item): { ?>
+															<option value="<?php echo $item->SupplierName; ?>"><?php echo $item->SupplierName;  ?></option>
+													<?php }
+													endforeach; ?>
+												</select>
+											</div>
+											<div class="col-4">
+												<label for="client_name">
+													<?php echo 'Material'; ?>
+												</label>
+												<select class="form-control" id="item_name" name="item_name">
 													<option value="">Select Material</option>
 													<?php
 													foreach ($material as $it): { ?>
-												<option value="<?php echo $it->MaterialName; ?>"><?php echo $it->MaterialName;  ?></option>
-												<?php }
-												endforeach; ?>
-											</select>
-										</div>
-										<div class="col-2">
-											<label for="to_date">
-												<?php echo 'Year'; ?>
-											</label>
-											<select class="form-control" id="financialyear" name="financialyear">
-												<option value="">Select Year</option>
-												<?php
-												foreach ($finyear as $item): { ?>
-												<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year;  ?></option>
-												<?php }
-												endforeach; ?>
-											</select>
-										</div>
-										<div class="col-2">
-											<label for="to_date">
-												<?php echo 'Month'; ?>
-											</label>
-											<div class="input-group">
-												<select class="form-control" id="month" name="month">
-													<option value="">Select Month</option>
-													<option value="January">January</option>
-													<option value="February">February</option>
-													<option value="March">March</option>
-													<option value="April">April</option>
-													<option value="May">May</option>
-													<option value="June">June</option>
-													<option value="July">July</option>
-													<option value="August">August</option>
-													<option value="September">September</option>
-													<option value="October">October</option>
-													<option value="November">November</option>
-													<option value="December">December</option>
+															<option value="<?php echo $it->MaterialName; ?>"><?php echo $it->MaterialName;  ?></option>
+													<?php }
+													endforeach; ?>
 												</select>
 											</div>
-										</div>
-									</div>
-									<div class="row">
-										<div class="col-4">
-											<label for="from_date">
-												<?php echo 'From Date'; ?>
-											</label>
-											<div class="input-group">
-												<input name="from_date" id="max-date" class="form-control datepicker">
-											
+											<div class="col-2">
+												<label for="to_date">
+													<?php echo 'Year'; ?>
+												</label>
+												<select class="form-control" id="financialyear" name="financialyear">
+													<option value="">Select Year</option>
+													<?php
+													foreach ($finyear as $item): { ?>
+															<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year;  ?></option>
+													<?php }
+													endforeach; ?>
+												</select>
+											</div>
+											<div class="col-2">
+												<label for="to_date">
+													<?php echo 'Month'; ?>
+												</label>
+												<div class="input-group">
+													<select class="form-control" id="month" name="month">
+														<option value="">Select Month</option>
+														<option value="January">January</option>
+														<option value="February">February</option>
+														<option value="March">March</option>
+														<option value="April">April</option>
+														<option value="May">May</option>
+														<option value="June">June</option>
+														<option value="July">July</option>
+														<option value="August">August</option>
+														<option value="September">September</option>
+														<option value="October">October</option>
+														<option value="November">November</option>
+														<option value="December">December</option>
+													</select>
+												</div>
 											</div>
 										</div>
-										<div class="col-4">
-											<label for="to_date">
-												<?php echo 'To Date'; ?>
-											</label>
-											<div class="input-group">
-												<input name="to_date" id="min-date" class="form-control datepicker">
+										<div class="row">
+											<div class="col-4">
+												<label for="from_date">
+													<?php echo 'From Date'; ?>
+												</label>
+												<div class="input-group">
+													<input name="from_date" id="max-date" class="form-control datepicker">
+
+												</div>
+											</div>
+											<div class="col-4">
+												<label for="to_date">
+													<?php echo 'To Date'; ?>
+												</label>
+												<div class="input-group">
+													<input name="to_date" id="min-date" class="form-control datepicker">
+												</div>
+
+											</div>
+											<div class="col-md-2"></div>
+											<div class="col-md-2 text-right"><br>
+												<input type="submit" class="btn btn-success" name="btn_submit"
+													value="View Report">
 											</div>
 
 										</div>
-										<div class="col-md-2"></div>
-										<div class="col-md-2 text-right"><br>
-											<input type="submit" class="btn btn-success" name="btn_submit"
-												value="View Report">
-										</div>
+									</div>
+									<div class="form-group has-feedback">
 
 									</div>
-								</div>
-								<div class="form-group has-feedback">
-									
-								</div>
 
-								<!-- </form> -->
+									<!-- </form> -->
 
-								<!-- <input type="hidden" name="table" value="requisition">
+									<!-- <input type="hidden" name="table" value="requisition">
 								<label for="fromDate">From:</label>
 								<input class="form-control date_range" type="date" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
 
@@ -166,20 +170,20 @@
 								<button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i></button>
 								<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
 								<div class="error" id="error"></div> -->
-							</form>
-							<table id="cc" class="table table-bordered table-hover" style="background-color:#fff;">
+								</form>
+								<table id="cc" class="table table-bordered table-hover wrap" style="background-color:#fff;width: 100% !important;">
 
-								<!-- <table class="table table-bordered table-hover" id="asset_list_table" style="background-color:#fff;font-size:12px;"> -->
-									<thead >
+									<!-- <table class="table table-bordered table-hover" id="asset_list_table" style="background-color:#fff;font-size:12px;"> -->
+									<thead>
 										<tr>
-											<th style="text-align:center" >PO Date</th>
-											<th style="text-align:center">PO No</th>
-											<th style="text-align:center">Supplier Name</th>
-											<th style="text-align:center">Material Name</th>
-											<th style="text-align:center">Category</th>
-											<th style="text-align:center">Ordered Quantity</th>
-											<th style="text-align:center">Received Quantity</th>
-											<th style="text-align:center">Pending Quantity</th>
+											<th style="text-align:center, width:10%">PO Date</th>
+											<th style="text-align:center,  width:14%">PO No</th>
+											<th style="text-align:center,  width:15%">Supplier Name</th>
+											<th style="text-align:center, width:17%">Material Name</th>
+											<th style="text-align:center,  width:10%">Category</th>
+											<th style="text-align:center,  width:9%">Ordered Quantity</th>
+											<th style="text-align:center,  width:9%">Received Quantity</th>
+											<th style="text-align:center,  width:10%">Pending Quantity</th>
 										</tr>
 									</thead>
 									<tbody>
@@ -419,9 +423,14 @@
 				'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
 			],
 			pageLength: 10, // Default rows per page
-			lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
+			lengthMenu: [
+				[10, 20, 30, 50, -1],
+				[10, 20, 30, 50, "All"]
+			], // Rows per page options
 			responsive: true, // Responsive table
-			order: [[0, 'desc']], // Default ordering (column index 0, descending)
+			order: [
+				[0, 'desc']
+			], // Default ordering (column index 0, descending)
 			language: {
 				paginate: {
 					next: '<i class="fas fa-angle-right"></i>', // Next button icon
@@ -439,40 +448,30 @@
 	});
 
 	$(function() {
-		//var dateFormat = "mm/dd/yy",
-		from = $("#min-date")
-			.datepicker({
-				dateFormat: "dd-mm-yy",
-				defaultDate: "+0d",
-				changeMonth: true,
-				//numberOfMonths: 1
+    var dateFormat = 'dd-mm-yyyy';
 
-			})
-			.on("change", function() {
-				to.datepicker("option", "minDate", getDate(this));
-			}),
-			to = $("#max-date").datepicker({
-				dateFormat: "dd-mm-yy",
-				defaultDate: "+0d",
-				changeMonth: true,
-				//numberOfMonths: 1
+    // Initialize min-date (Start Date)
+    var from = $("#min-date").datepicker({
+        format: dateFormat,
+        autoclose: true,
+        todayHighlight: true,
+        clearBtn: true
+    }).on('changeDate', function(e) {
+        // When a date is selected in #min-date, update the minDate option for #max-date
+        // to.datepicker('setStartDate', e.date);
+    });
 
-			})
-			.on("change", function() {
-				from.datepicker("option", "maxDate", getDate(this));
-			});
+    // Initialize max-date (End Date)
+    var to = $("#max-date").datepicker({
+        format: dateFormat,
+        // startDate: new Date(), // Start date cannot be in the past
+        autoclose: true,
+        todayHighlight: true,
+        clearBtn: true
+    }).on('changeDate', function(e) {
+        // When a date is selected in #max-date, update the endDate option for #min-date
+        from.datepicker('setStartDate', e.date);
+    });
+});
 
-		function getDate(element) {
-			var date;
-
-			try {
-				date = $.datepicker.parseDate(dateFormat, element.value);
-
-			} catch (error) {
-				date = null;
-			}
-
-			return date;
-		}
-	});
 </script>
\ No newline at end of file
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index f10c9456..9a346e5e 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -36,6 +36,9 @@ if (!empty($INRSYMBOL)) {
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
 <style>
+    .txtSpcialInstruction{
+        background-color: #f4f9fb;
+    }
     #packagingcalmodel {
         margin-top: 200px;
         z-index: 1080 !important;
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index 80ce61df..be146fa2 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -432,7 +432,7 @@
                 <?php } else { ?>
                   <h4><?= "Amended Capital Purchase Order - $PONO "; ?></h4>
                 <?php } ?>
-                <a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-success" id="back" value="Back">Back</a>
+                <a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-secondary" id="back" value="Back">Back</a>
               </div>
             </div>
           </div>
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php
index 3f595542..61c201d8 100755
--- a/app/Views/editRevenueAmendPO.php
+++ b/app/Views/editRevenueAmendPO.php
@@ -409,7 +409,7 @@ if (!empty($INRSYMBOL)) {
 			$('#SGSTEditModel').removeAttr("style");
 			$('#IGSTViewModel').attr("style", "display:none;");
 			$('#SGSTViewModel').removeAttr("style");
-			$('#CGSTArea').attr("style", "display:block;");
+			$('#CGSTArea').attr("style", "display:flex;");
 			$('#IGSTAddModel').attr("style", "display:none;");
 			$('#SGSTAddModel').removeAttr("style");
 			$('#CGSTshow').attr("style", "display:block;");
@@ -926,52 +926,52 @@ if (!empty($INRSYMBOL)) {
 							?>
 
 							<div class="form-row">
-									<div class="form-group col-md-3">
-										<label>Requistion No</label>
-										<?php
-										$options = array("0" => 'Selected Requisition Numbers');
-										if (!empty($ReqList)) {
-											foreach ($ReqList as $SID) :
+								<div class="form-group col-md-3">
+									<label>Requistion No</label>
+									<?php
+									$options = array("0" => 'Selected Requisition Numbers');
+									if (!empty($ReqList)) {
+										foreach ($ReqList as $SID) :
 
-												$options[$SID->ReqNo] = $SID->ReqNo;
-											//$ReqType = $SID->ReqType;
-											endforeach;
-										}
-										echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"');
+											$options[$SID->ReqNo] = $SID->ReqNo;
+										//$ReqType = $SID->ReqType;
+										endforeach;
+									}
+									echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"');
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Purchase Order Type</label>
+									<?php
+									$data = array('name' => 'POType', 'value' => set_value('POType', REVENUE), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Select Supplier<span class="text-danger">*</span></label>
+									<?php
+									$options = array("0" => 'Select Supplier');
+									//print_r(  $options);
+
+									if (!empty($Suplist)) {
+										foreach ($Suplist as $SID) :
+											$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
+										endforeach;
+									}
+
+									echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier" required="true" class="form-control select2" readonly');
+
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Supplier Address</label>
+									<div>
+										<?php
+										$data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
+										echo Form_textarea($data);
 										?>
 									</div>
-									<div class="form-group col-md-3">
-										<label>Purchase Order Type</label>
-										<?php
-										$data = array('name' => 'POType', 'value' => set_value('POType', REVENUE), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
-										echo form_input($data);
-										?>
-									</div>
-									<div class="form-group col-md-3">
-										<label>Select Supplier<span class="text-danger">*</span></label>
-										<?php
-										$options = array("0" => 'Select Supplier');
-										//print_r(  $options);
-
-										if (!empty($Suplist)) {
-											foreach ($Suplist as $SID) :
-												$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
-											endforeach;
-										}
-
-										echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier" required="true" class="form-control select2" disabled readonly');
-
-										?>
-									</div>
-									<div class="form-group col-md-3">
-										<label>Supplier Address</label>
-										<div>
-											<?php
-											$data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
-											echo Form_textarea($data);
-											?>
-										</div>
-									</div>
+								</div>
 							</div>
 							<div class="form-row">
 								<div class="form-group col-md-3">
@@ -1000,7 +1000,7 @@ if (!empty($INRSYMBOL)) {
 									<label>Delivery Date<span class="text-danger">*</span></label>
 									<div>
 										<?php
-										$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;','min' => date('d-m-Y'),);
+										$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;', 'min' => date('d-m-Y'),);
 										echo form_input($data);
 										?>
 									</div>
@@ -1153,173 +1153,173 @@ if (!empty($INRSYMBOL)) {
 								</div>
 							</div>
 							<div class="form-row">
-									<div class="form-group col-md-3">
-										<label for="insurance">Insurance<span class="text-danger">*</span></label>
+								<div class="form-group col-md-3">
+									<label for="insurance">Insurance<span class="text-danger">*</span></label>
+									<?php
+									$optionsnew = array('1' => 'Yes', '0' => 'No');
+									echo form_dropdown('insurancestatus', $optionsnew, set_value('insurancestatus'), 'id="insurancestatus" required="true" class="form-control select2"');
+									?>
+								</div>
+								<div class="form-group col-md-3" id="InsuranceNumberdiv" style="display:block;">
+									<label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
+									<div>
 										<?php
-										$optionsnew = array('1' => 'Yes', '0' => 'No');
-										echo form_dropdown('insurancestatus', $optionsnew, set_value('insurancestatus'), 'id="insurancestatus" required="true" class="form-control select2"');
+										$data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
+										echo form_input($data);
 										?>
 									</div>
-									<div class="form-group col-md-3" id="InsuranceNumberdiv" style="display:block;">
-										<label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
-										<div>
-											<?php
-											$data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
-									<div class="form-group col-md-3">
-										<label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
-										<select id='BudgetType' name='BudgetType' class="form-control">
-											<?php if ($BudgetType == 'CAPITAL') {
-												$opt1 = 'CAPITAL';
-												$opt2 = 'REVENUE';
-											} else {
-												$opt1 = 'REVENUE';
-												$opt2 = 'CAPITAL';
-											} ?>
+								</div>
+								<div class="form-group col-md-3">
+									<label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
+									<select id='BudgetType' name='BudgetType' class="form-control">
+										<?php if ($BudgetType == 'CAPITAL') {
+											$opt1 = 'CAPITAL';
+											$opt2 = 'REVENUE';
+										} else {
+											$opt1 = 'REVENUE';
+											$opt2 = 'CAPITAL';
+										} ?>
 
 
-											<option value=<?php echo $opt1; ?>><?php echo $opt1; ?></option>
-											<option value=<?php echo $opt2; ?>><?php echo $opt2; ?></option>
-										</select>
+										<option value=<?php echo $opt1; ?>><?php echo $opt1; ?></option>
+										<option value=<?php echo $opt2; ?>><?php echo $opt2; ?></option>
+									</select>
 
 
-									</div>
-									<div class="form-group col-md-3">
-									</div>
+								</div>
+								<div class="form-group col-md-3">
+								</div>
 							</div>
 							<br>
 							<div class="form-row">
-									<div class="table-responsive">
-										<table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
-											<thead>
-							
-										<tr>
-											<th>SNo</th>
-											<th>Requisition No</th>
-											<th>Item Name</th>
-											<th>Quantity</th>
-											<th>UOM</th>
-											<th>Rate<?php echo "($INRSYM)" ?></th>
-											<th>Basic Amount<?php echo "($INRSYM)" ?></th>
-											<th>Tax Amount<?php echo "($INRSYM)" ?></th>
-											<th>Total Order Amount<?php echo "($INRSYM)" ?></th>
-											<th>Action</th>
-										</tr>
-									</thead>
+								<div class="table-responsive">
+									<table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
+										<thead>
 
-									<tbody id='RevenueAppend'>
-										<?php
-										if (!empty($POItem)) {
-											$index = 0;
+											<tr>
+												<th>SNo</th>
+												<th>Requisition No</th>
+												<th>Item Name</th>
+												<th>Quantity</th>
+												<th>UOM</th>
+												<th>Rate<?php echo "($INRSYM)" ?></th>
+												<th>Basic Amount<?php echo "($INRSYM)" ?></th>
+												<th>Tax Amount<?php echo "($INRSYM)" ?></th>
+												<th>Total Order Amount<?php echo "($INRSYM)" ?></th>
+												<th>Action</th>
+											</tr>
+										</thead>
 
-											foreach ($POItem as $record) {
-												//print_r($POItem);
-												$index = $index + 1;
-										?>
-												<tr id="<?php echo $index; ?>">
-													<td align="left"><?php echo $index; ?></td>
-													<td><?php echo $record->ReqNo ?></td>
-													<td><?php echo $record->MaterialName ?></td>
-													<td align="right"><?php echo $record->Quantity ?></td>
-													<td><?php echo $record->UOM ?></td>
-													<td align="right"><?php echo $record->Rate ?></td>
+										<tbody id='RevenueAppend'>
+											<?php
+											if (!empty($POItem)) {
+												$index = 0;
 
-													<td align="right"><?php echo number_format($record->BasicValue, 2, '.', '') ?></td>
+												foreach ($POItem as $record) {
+													//print_r($POItem);
+													$index = $index + 1;
+											?>
+													<tr id="<?php echo $index; ?>">
+														<td align="left"><?php echo $index; ?></td>
+														<td><?php echo $record->ReqNo ?></td>
+														<td><?php echo $record->MaterialName ?></td>
+														<td align="right"><?php echo $record->Quantity ?></td>
+														<td><?php echo $record->UOM ?></td>
+														<td align="right"><?php echo $record->Rate ?></td>
 
-													<td align="right"><?php echo $record->Taxamount ?></td>
-													<td align="right"><?php echo $record->TotalValue ?></td>
-													<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
-													<input type="hidden" name="<?php echo 'departmentName' . $index ?>" id="<?php echo 'departmentName' . $index ?>" value="<?php echo $record->DepartmentName; ?>" />
-													<input type="hidden" name="<?php echo 'AvlAmount' . $index ?>" id="<?php echo 'AvlAmount' . $index ?>" value="<?php echo $AvlAmount; ?>" />
-													<input type="hidden" name="<?php echo 'LineItemNo' . $index ?>" id="<?php echo 'LineItemNo' . $index ?>" value="<?php echo $record->LineItemNo; ?>" />
-													<input type="hidden" name="<?php echo 'costCode' . $index ?>" id="<?php echo 'costCode' . $index ?>" value="<?php echo $record->CostCenterCode; ?>" />
-													<input type="hidden" name="<?php echo 'materialCode' . $index ?>" id="<?php echo 'materialCode' . $index ?>" value="<?php echo $record->MaterialCode; ?>" />
-													<input type="hidden" name="<?php echo 'materialName' . $index ?>" id="<?php echo 'materialName' . $index ?>" value="<?php echo $record->MaterialName; ?>" />
-													<input type="hidden" name="<?php echo 'uom' . $index ?>" id="<?php echo 'uom' . $index ?>" value="<?php echo $record->UOM; ?>" />
-													<input type="hidden" name="<?php echo 'quantity' . $index ?>" id="<?php echo 'quantity' . $index ?>" value="<?php echo $record->Quantity; ?>" />
+														<td align="right"><?php echo number_format($record->BasicValue, 2, '.', '') ?></td>
 
-													<input type="hidden" name="<?php echo 'itemRate' . $index ?>" id="<?php echo 'itemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
-													<input type="hidden" name="<?php echo 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
-													<input type="hidden" name="<?php echo 'service_description' . $index ?>" id="<?php echo 'service_description' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
+														<td align="right"><?php echo $record->Taxamount ?></td>
+														<td align="right"><?php echo $record->TotalValue ?></td>
+														<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
+														<input type="hidden" name="<?php echo 'departmentName' . $index ?>" id="<?php echo 'departmentName' . $index ?>" value="<?php echo $record->DepartmentName; ?>" />
+														<input type="hidden" name="<?php echo 'AvlAmount' . $index ?>" id="<?php echo 'AvlAmount' . $index ?>" value="<?php echo $AvlAmount; ?>" />
+														<input type="hidden" name="<?php echo 'LineItemNo' . $index ?>" id="<?php echo 'LineItemNo' . $index ?>" value="<?php echo $record->LineItemNo; ?>" />
+														<input type="hidden" name="<?php echo 'costCode' . $index ?>" id="<?php echo 'costCode' . $index ?>" value="<?php echo $record->CostCenterCode; ?>" />
+														<input type="hidden" name="<?php echo 'materialCode' . $index ?>" id="<?php echo 'materialCode' . $index ?>" value="<?php echo $record->MaterialCode; ?>" />
+														<input type="hidden" name="<?php echo 'materialName' . $index ?>" id="<?php echo 'materialName' . $index ?>" value="<?php echo $record->MaterialName; ?>" />
+														<input type="hidden" name="<?php echo 'uom' . $index ?>" id="<?php echo 'uom' . $index ?>" value="<?php echo $record->UOM; ?>" />
+														<input type="hidden" name="<?php echo 'quantity' . $index ?>" id="<?php echo 'quantity' . $index ?>" value="<?php echo $record->Quantity; ?>" />
 
-													<input type="hidden" name="<?php echo 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
-													<input type="hidden" name="<?php echo 'beforeDisType' . $index ?>" id="<?php echo 'beforeDisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
-													<input type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
-													<input type="hidden" name="<?php echo 'beforeDisVal' . $index ?>" id="<?php echo 'beforeDisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
-													<input type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
-													<input type="hidden" name="<?php echo 'beforeAfterDisVal' . $index ?>" id="<?php echo 'beforeAfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
-													<input type="hidden" name="<?php echo 'PackOption' . $index ?>" id="<?php echo 'PackOption' . $index ?>" value="<?php echo $record->PackagingCalulatedOn; ?>" />
-													<input type="hidden" name="<?php echo 'PackType' . $index ?>" id="<?php echo 'PackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
-													<input type="hidden" name="<?php echo 'beforePackType' . $index ?>" id="<?php echo 'beforePackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
-													<input type="hidden" name="<?php echo 'PackVal' . $index ?>" id="<?php echo 'PackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
-													<input type="hidden" name="<?php echo 'beforePackVal' . $index ?>" id="<?php echo 'beforePackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
-													<input type="hidden" name="<?php echo 'AfterPackVal' . $index ?>" id="<?php echo 'AfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
-													<input type="hidden" name="<?php echo 'beforeAfterPackVal' . $index ?>" id="<?php echo 'beforeAfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
-													<input type="hidden" name="<?php echo 'VatOption' . $index ?>" id="<?php echo 'VatOption' . $index ?>" value="<?php echo isset($record->VatCalulatedOn) ? $record->VatCalulatedOn : ''; ?>" />
-													<input type="hidden" name="<?php echo 'VatVal' . $index ?>" id="<?php echo 'VatVal' . $index ?>" value="<?php echo $record->SGST; ?>" /> <!-- SGST-->
-													<input type="hidden" name="<?php echo 'beforeVatVal' . $index ?>" id="<?php echo 'beforeVatVal' . $index ?>" value="<?php echo $record->SGST; ?>" /><!-- SGST-->
-													<input type="hidden" name="<?php echo 'AfterVatVal' . $index ?>" id="<?php echo 'AfterVatVal' . $index ?>" value="<?php echo $record->AfterSGST; ?>" /><!-- SGST-->
-													<input type="hidden" name="<?php echo 'beforeAfterVatVal' . $index ?>" id="<?php echo 'beforeAfterVatVal' . $index ?>" value="<?php echo $record->AfterSGST; ?>" /><!-- SGST-->
-													<input type="hidden" name="<?php echo 'GSTVal' . $index ?>" id="<?php echo 'GSTVal' . $index ?>" value="<?php echo $record->CGST; ?>" /><!-- CGST-->
-													<input type="hidden" name="<?php echo 'beforeGSTVal' . $index ?>" id="<?php echo 'beforeGSTVal' . $index ?>" value="<?php echo $record->CGST; ?>" /><!-- CGST-->
-													<input type="hidden" name="<?php echo 'AfterGSTVal' . $index ?>" id="<?php echo 'AfterGSTVal' . $index ?>" value="<?php echo $record->AfterCGST; ?>" /><!-- CGST-->
-													<input type="hidden" name="<?php echo 'beforeAfterGSTVal' . $index ?>" id="<?php echo 'beforeAfterGSTVal' . $index ?>" value="<?php echo $record->AfterCGST; ?>" /><!-- CGST-->
-													<input type="hidden" name="<?php echo 'OtherTaxVal' . $index ?>" id="<?php echo 'OtherTaxVal' . $index ?>" value="<?php echo $record->IGST; ?>" /><!-- IGST-->
-													<input type="hidden" name="<?php echo 'beforeOtherTaxVal' . $index ?>" id="<?php echo 'beforeOtherTaxVal' . $index ?>" value="<?php echo $record->IGST; ?>" /><!-- IGST-->
-													<input type="hidden" name="<?php echo 'AfterOtherTaxVal' . $index ?>" id="<?php echo 'AfterOtherTaxVal' . $index ?>" value="<?php echo $record->AfterIGST; ?>" /><!-- IGST-->
-													<input type="hidden" name="<?php echo 'beforeAfterOtherTaxVal' . $index ?>" id="<?php echo 'beforeAfterOtherTaxVal' . $index ?>" value="<?php echo $record->AfterIGST; ?>" /><!-- IGST-->
-													<!-- <input type="hidden" name="<?php echo 'FreightOption' . $index ?>" id="<?php echo 'FreightOption' . $index ?>" value="<?php echo isset($record->FreightCalulatedOn) ? $record->FreightCalulatedOn : ''; ?>" /> -->
-													<input type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
-													<input type="hidden" name="<?php echo 'beforeFreightType' . $index ?>" id="<?php echo 'beforeFreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
-													<input type="hidden" name="<?php echo 'FreightVal' . $index ?>" id="<?php echo 'FreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
-													<input type="hidden" name="<?php echo 'beforeFreightVal' . $index ?>" id="<?php echo 'beforeFreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
-													<input type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>" id="<?php echo 'AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
-													<input type="hidden" name="<?php echo 'beforeAfterFreightVal' . $index ?>" id="<?php echo 'before-AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
-													<input type="hidden" name="<?php echo 'Nooftrips' . $index ?>" id="<?php echo 'Nooftrips' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
-													<input type="hidden" name="<?php echo 'beforeNooftrips' . $index ?>" id="<?php echo 'beforeNooftrips' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
-													<input type="hidden" name="<?php echo 'basicval' . $index ?>" id="<?php echo 'basicval' . $index ?>" value="<?php echo $record->BasicValue; ?>" />
-													<input type="hidden" name="<?php echo 'Insval' . $index ?>" id="<?php echo 'Insval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
-													<input type="hidden" name="<?php echo 'beforeInsval' . $index ?>" id="<?php echo 'beforeInsval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
-													<input type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
-													<input type="hidden" name="<?php echo 'beforeqty' . $index ?>" id="<?php echo 'beforeqty' . $index ?>" value="<?php echo $record->Quantity; ?>" />
-													<input type="hidden" name="<?php echo 'beforeitemRate' . $index ?>" id="<?php echo 'beforeitemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
+														<input type="hidden" name="<?php echo 'itemRate' . $index ?>" id="<?php echo 'itemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
+														<input type="hidden" name="<?php echo'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
+														<input type="hidden" name="<?php echo 'service_description' . $index ?>" id="<?php echo 'service_description' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
+
+														<input type="hidden" name="<?php echo 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
+														<input type="hidden" name="<?php echo 'beforeDisType' . $index ?>" id="<?php echo 'beforeDisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
+														<input type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
+														<input type="hidden" name="<?php echo 'beforeDisVal' . $index ?>" id="<?php echo 'beforeDisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
+														<input type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
+														<input type="hidden" name="<?php echo 'beforeAfterDisVal' . $index ?>" id="<?php echo 'beforeAfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
+														<input type="hidden" name="<?php echo 'PackOption' . $index ?>" id="<?php echo 'PackOption' . $index ?>" value="<?php echo $record->PackagingCalulatedOn; ?>" />
+														<input type="hidden" name="<?php echo 'PackType' . $index ?>" id="<?php echo 'PackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
+														<input type="hidden" name="<?php echo 'beforePackType' . $index ?>" id="<?php echo 'beforePackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
+														<input type="hidden" name="<?php echo 'PackVal' . $index ?>" id="<?php echo 'PackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
+														<input type="hidden" name="<?php echo 'beforePackVal' . $index ?>" id="<?php echo 'beforePackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
+														<input type="hidden" name="<?php echo 'AfterPackVal' . $index ?>" id="<?php echo 'AfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
+														<input type="hidden" name="<?php echo 'beforeAfterPackVal' . $index ?>" id="<?php echo 'beforeAfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
+														<input type="hidden" name="<?php echo 'VatOption' . $index ?>" id="<?php echo 'VatOption' . $index ?>" value="<?php echo isset($record->VatCalulatedOn) ? $record->VatCalulatedOn : ''; ?>" />
+														<input type="hidden" name="<?php echo 'VatVal' . $index ?>" id="<?php echo 'VatVal' . $index ?>" value="<?php echo $record->SGST; ?>" /> <!-- SGST-->
+														<input type="hidden" name="<?php echo 'beforeVatVal' . $index ?>" id="<?php echo 'beforeVatVal' . $index ?>" value="<?php echo $record->SGST; ?>" /><!-- SGST-->
+														<input type="hidden" name="<?php echo 'AfterVatVal' . $index ?>" id="<?php echo 'AfterVatVal' . $index ?>" value="<?php echo $record->AfterSGST; ?>" /><!-- SGST-->
+														<input type="hidden" name="<?php echo 'beforeAfterVatVal' . $index ?>" id="<?php echo 'beforeAfterVatVal' . $index ?>" value="<?php echo $record->AfterSGST; ?>" /><!-- SGST-->
+														<input type="hidden" name="<?php echo 'GSTVal' . $index ?>" id="<?php echo 'GSTVal' . $index ?>" value="<?php echo $record->CGST; ?>" /><!-- CGST-->
+														<input type="hidden" name="<?php echo 'beforeGSTVal' . $index ?>" id="<?php echo 'beforeGSTVal' . $index ?>" value="<?php echo $record->CGST; ?>" /><!-- CGST-->
+														<input type="hidden" name="<?php echo 'AfterGSTVal' . $index ?>" id="<?php echo 'AfterGSTVal' . $index ?>" value="<?php echo $record->AfterCGST; ?>" /><!-- CGST-->
+														<input type="hidden" name="<?php echo 'beforeAfterGSTVal' . $index ?>" id="<?php echo 'beforeAfterGSTVal' . $index ?>" value="<?php echo $record->AfterCGST; ?>" /><!-- CGST-->
+														<input type="hidden" name="<?php echo 'OtherTaxVal' . $index ?>" id="<?php echo 'OtherTaxVal' . $index ?>" value="<?php echo $record->IGST; ?>" /><!-- IGST-->
+														<input type="hidden" name="<?php echo 'beforeOtherTaxVal' . $index ?>" id="<?php echo 'beforeOtherTaxVal' . $index ?>" value="<?php echo $record->IGST; ?>" /><!-- IGST-->
+														<input type="hidden" name="<?php echo 'AfterOtherTaxVal' . $index ?>" id="<?php echo 'AfterOtherTaxVal' . $index ?>" value="<?php echo $record->AfterIGST; ?>" /><!-- IGST-->
+														<input type="hidden" name="<?php echo 'beforeAfterOtherTaxVal' . $index ?>" id="<?php echo 'beforeAfterOtherTaxVal' . $index ?>" value="<?php echo $record->AfterIGST; ?>" /><!-- IGST-->
+														<!-- <input type="hidden" name="<?php echo 'FreightOption' . $index ?>" id="<?php echo 'FreightOption' . $index ?>" value="<?php echo isset($record->FreightCalulatedOn) ? $record->FreightCalulatedOn : ''; ?>" /> -->
+														<input type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
+														<input type="hidden" name="<?php echo 'beforeFreightType' . $index ?>" id="<?php echo 'beforeFreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
+														<input type="hidden" name="<?php echo 'FreightVal' . $index ?>" id="<?php echo 'FreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
+														<input type="hidden" name="<?php echo 'beforeFreightVal' . $index ?>" id="<?php echo 'beforeFreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
+														<input type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>" id="<?php echo 'AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
+														<input type="hidden" name="<?php echo 'beforeAfterFreightVal' . $index ?>" id="<?php echo 'before-AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
+														<input type="hidden" name="<?php echo 'Nooftrips' . $index ?>" id="<?php echo 'Nooftrips' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
+														<input type="hidden" name="<?php echo 'beforeNooftrips' . $index ?>" id="<?php echo 'beforeNooftrips' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
+														<input type="hidden" name="<?php echo 'basicval' . $index ?>" id="<?php echo 'basicval' . $index ?>" value="<?php echo $record->BasicValue; ?>" />
+														<input type="hidden" name="<?php echo 'Insval' . $index ?>" id="<?php echo 'Insval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
+														<input type="hidden" name="<?php echo 'beforeInsval' . $index ?>" id="<?php echo 'beforeInsval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
+														<input type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
+														<input type="hidden" name="<?php echo 'beforeqty' . $index ?>" id="<?php echo 'beforeqty' . $index ?>" value="<?php echo $record->Quantity; ?>" />
+														<input type="hidden" name="<?php echo 'beforeitemRate' . $index ?>" id="<?php echo 'beforeitemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
 
 
 
-													<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="ri-pencil-fill"></i></a>
+														<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="ri-pencil-fill"></i></a>
 
-														<!--	<td>   <a  	data-toggle="tooltip"  href="#"><i class="ri-pencil-fill" data-toggle="tooltip" title="<?php //echo $record->ReqNo; 
+															<!--	<td>   <a  	data-toggle="tooltip"  href="#"><i class="ri-pencil-fill" data-toggle="tooltip" title="<?php //echo $record->ReqNo; 
 																																											?>  -  Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a>  </td>  -->
 
-													</td>
-												</tr>
+														</td>
+													</tr>
+												<?php
+
+
+													$totBasicAmt  = $totBasicAmt + $record->BasicValue;
+													$totDiscountAmt  = $totDiscountAmt + $record->AfterDiscount;
+													$totPackagingAmt  = $totPackagingAmt + $record->AfterPackagingValue;
+													$totExciseAmt  = isset($record->AfterExciseDuty) ? $totExciseAmt + $record->AfterExciseDuty : "";
+													$totVATAmt  = $totVATAmt + $record->AfterSGST;
+													//$totCSTAmt  = $totCSTAmt + $record->AfterCST;
+													$totGSTAmt  = $totGSTAmt + $record->AfterCGST;
+
+													$totOtherTaxAmt   = $totOtherTaxAmt + $record->AfterIGST;
+													$totFreightAmt   = $totFreightAmt + $record->AfterFreightValue;
+													$totInsuranceAmt   = $totInsuranceAmt + $record->Insurance;
+													$totOrderSummaryAmt   = $totOrderSummaryAmt + $record->TotalValue;
+												}
+												?>
 											<?php
-
-
-												$totBasicAmt  = $totBasicAmt + $record->BasicValue;
-												$totDiscountAmt  = $totDiscountAmt + $record->AfterDiscount;
-												$totPackagingAmt  = $totPackagingAmt + $record->AfterPackagingValue;
-												$totExciseAmt  = isset($record->AfterExciseDuty) ? $totExciseAmt + $record->AfterExciseDuty : "";
-												$totVATAmt  = $totVATAmt + $record->AfterSGST;
-												//$totCSTAmt  = $totCSTAmt + $record->AfterCST;
-												$totGSTAmt  = $totGSTAmt + $record->AfterCGST;
-
-												$totOtherTaxAmt   = $totOtherTaxAmt + $record->AfterIGST;
-												$totFreightAmt   = $totFreightAmt + $record->AfterFreightValue;
-												$totInsuranceAmt   = $totInsuranceAmt + $record->Insurance;
-												$totOrderSummaryAmt   = $totOrderSummaryAmt + $record->TotalValue;
+												$RowCount =   $index;
 											}
 											?>
-										<?php
-											$RowCount =   $index;
-										}
-										?>
-									</tbody>
-								</table>
-									</div>
+										</tbody>
+									</table>
+								</div>
 							</div>
 							<br>
 							<div class="form-row">
@@ -1445,31 +1445,31 @@ if (!empty($INRSYMBOL)) {
 							</div>
 							<div class="form-row">
 								<div class="form-group col-md-12">
-								<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
-								$Reqon = $Reqon->format('d-m-Y'); ?>
-								<label>Request On :</label><?php echo $Reqon; ?><br>
-								<?php if ($RequesterName != '' || $RequesterName != null) { ?>
-									<label>Request By : </label><?php echo $RequesterName; ?><br />
-								<?php } ?>
-								<label>Status : </label><?php
-														$statusMappings = [
-															'PO APPROVED' => 'AWAITING APPROVE',
-															'AWAITING RELEASE' => 'AWAITING APPROVE',
-															'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-															'PO RELEASED' => 'PO APPROVED',
-														];
+									<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
+									$Reqon = $Reqon->format('d-m-Y'); ?>
+									<label>Request On :</label><?php echo $Reqon; ?><br>
+									<?php if ($RequesterName != '' || $RequesterName != null) { ?>
+										<label>Request By : </label><?php echo $RequesterName; ?><br />
+									<?php } ?>
+									<label>Status : </label><?php
+															$statusMappings = [
+																'PO APPROVED' => 'AWAITING APPROVE',
+																'AWAITING RELEASE' => 'AWAITING APPROVE',
+																'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+																'PO RELEASED' => 'PO APPROVED',
+															];
 
-														if (isset($POStatus) && !empty($POStatus)) {
-															if (isset($statusMappings[$POStatus])) {
-																echo $statusMappings[$POStatus];
+															if (isset($POStatus) && !empty($POStatus)) {
+																if (isset($statusMappings[$POStatus])) {
+																	echo $statusMappings[$POStatus];
+																} else {
+																	echo $POStatus;
+																}
 															} else {
-																echo $POStatus;
+																echo "Status not provided";
 															}
-														} else {
-															echo "Status not provided";
-														}
-														?>
-														</div>
+															?>
+								</div>
 							</div>
 
 						</div> <!-- end card body-->
@@ -1613,7 +1613,7 @@ if (!empty($INRSYMBOL)) {
 									?>
 								</div>
 							</div>
-							<div class="form-group col-md-1">
+							<div class="form-group col-md-2">
 								<label>UOM</label>
 								<div>
 									<?php
@@ -1622,80 +1622,84 @@ if (!empty($INRSYMBOL)) {
 									?>
 								</div>
 							</div>
-								<div class="form-group col-md-2">
-									<label>Quantity<span class="text-danger">*</span></label>
-									<div>
-										<?php
-										$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
-										echo form_input($data);
-										?>
+							<div class="form-group col-md-6">
+								<div class="form-row">
+									<div class="form-group col-md-3">
+										<label>Quantity<span class="text-danger">*</span></label>
+										<div>
+											<?php
+											$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
+											echo form_input($data);
+											?>
 
+										</div>
+									</div>
+									<div class="form-group col-md-3">
+										<label>Rate <?php echo "($INRSYM)" ?><span class="text-danger">*</span></label>
+										<div>
+											<?php
+											$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
+											echo form_input($data);
+											?>
+										</div>
+									</div>
+									<div class="form-group col-md-3">
+										<label>Per</label> <?php
+															$data = array('name' => 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer',  'class' => 'form-control');
+															echo form_input($data); ?>
+									</div>
+									<div class="form-group col-md-3" style="padding-left: 0px;">
+										<label>Basic Amt <?php echo "($INRSYM)" ?></label>
+										<div>
+											<?php
+											$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+											echo form_input($data);
+											?>
+										</div>
 									</div>
 								</div>
-								<div class="form-group col-md-2">
-									<label>Rate <?php echo "($INRSYM)" ?><span class="text-danger">*</span></label>
-									<div>
-										<?php
-										$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
-										echo form_input($data);
-										?>
-									</div>
-								</div>
-								<div class="form-group col-md-1">
-									<label>Per</label> <?php
-														$data = array('name' => 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer',  'class' => 'form-control');
-														echo form_input($data); ?>
-								</div>
-								<div class="form-group col-md-2" style="padding-left: 0px;">
-									<label>Basic Amt <?php echo "($INRSYM)" ?></label>
-									<div>
-										<?php
-										$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-										echo form_input($data);
-										?>
-									</div>
-								</div>
+							</div>
 						</div>
 
 						<div class="form-row">
 							<div class="form-group col-md-4"></div>
 							<div class="form-group col-md-4">
 								<label>Discount Type </label>
-								
-									<?php
-									$options = array("0" => 'Select Discount Type');
-									//print_r(  $options);
 
-									if (!empty($TaxType)) {
-										foreach ($TaxType as $SID) :
+								<?php
+								$options = array("0" => 'Select Discount Type');
+								//print_r(  $options);
+
+								if (!empty($TaxType)) {
+									foreach ($TaxType as $SID) :
 
 
-											$options[$SID->ConfigValue] =  $SID->ConfigValue;
+										$options[$SID->ConfigValue] =  $SID->ConfigValue;
 
-										endforeach;
-									}
+									endforeach;
+								}
 
-									echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType" class="form-control"');
+								echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType" class="form-control"');
 
-									?>
+								?>
 							</div>
 							<div class="form-group col-md-2">
 								<label>Discount Rate </label>
-								
-									<?php
-									$data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount();', 'style' => 'text-align:right;');
-									echo form_input($data);
-									?>
-								
+
+								<?php
+								$data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount();', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+
 							</div>
 							<div class="form-group col-md-2">
 								<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
-								
-									<?php
-									$data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-									echo form_input($data);
-									?>
-							
+
+								<?php
+								$data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
+
 							</div>
 						</div>
 						<div class="form-row">
@@ -1783,47 +1787,47 @@ if (!empty($INRSYMBOL)) {
 							</div>
 							<div class="form-group col-md-2">
 								<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
-									<?php
-									$data = array('name' => 'txtEditAfterPackaging', 'value' => set_value('txtEditAfterPackaging'), 'id' => 'txtEditAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-									echo form_input($data);
-									?>
+								<?php
+								$data = array('name' => 'txtEditAfterPackaging', 'value' => set_value('txtEditAfterPackaging'), 'id' => 'txtEditAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
 							</div>
 						</div>
 
 						<div class="form-row" id="CGSTArea">
-							<div class="form-group col-md-8"></div>
+							<div class="form-group col-md-8"> </div>
 							<div class="form-group col-md-2">
 								<label>CGST in %</label>
-								
-									<?php
-									$data = array('name' => 'txtEditGST', 'value' => set_value('txtEditGST'), 'id' => 'txtEditGST',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(1);', 'style' => 'text-align:right;');
-									echo form_input($data);
-									?>
+
+								<?php
+								$data = array('name' => 'txtEditGST', 'value' => set_value('txtEditGST'), 'id' => 'txtEditGST',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(1);', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
 							</div>
 							<div class="form-group col-md-2">
 								<label>CGST Amt <?php echo "($INRSYM)" ?></label>
-									<?php
-									$data = array('name' => 'txtEditAfterGST', 'value' => set_value('txtEditAfterGST'), 'id' => 'txtEditAfterGST',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-									echo form_input($data);
-									?>
+								<?php
+								$data = array('name' => 'txtEditAfterGST', 'value' => set_value('txtEditAfterGST'), 'id' => 'txtEditAfterGST',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
 							</div>
 						</div>
 						<div class="form-row" id="SGSTModel">
 							<div class="form-group col-md-8"></div>
 							<div class="form-group col-md-2">
 								<label>SGST in %</label>
-								
-									<?php
-									$data = array('name' => 'txtEditVat', 'value' => set_value('txtEditVat'), 'id' => 'txtEditVat',  'class' => 'form-control num', 'onchange' => 'calculateVat();', 'style' => 'text-align:right;');
-									echo form_input($data);
-									?>
+
+								<?php
+								$data = array('name' => 'txtEditVat', 'value' => set_value('txtEditVat'), 'id' => 'txtEditVat',  'class' => 'form-control num', 'onchange' => 'calculateVat();', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
 							</div>
 							<div class="form-group col-md-2">
 								<label>SGST Amt <?php echo "($INRSYM)" ?></label>
-									<?php
-									$data = array('name' => 'txtEditAfterVat', 'value' => set_value('txtEditAfterVat'), 'id' => 'txtEditAfterVat',  'class' => 'form-control num', 'readonly' => 'true', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;');
-									echo form_input($data);
-									?>
+								<?php
+								$data = array('name' => 'txtEditAfterVat', 'value' => set_value('txtEditAfterVat'), 'id' => 'txtEditAfterVat',  'class' => 'form-control num', 'readonly' => 'true', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
 							</div>
 						</div>
 						<div class="form-row" id="IGSTModel" style="display:none;">
@@ -1865,16 +1869,16 @@ if (!empty($INRSYMBOL)) {
 						<div class="form-row">
 							<div class="form-group col-md-12">
 								<label>Total Order Amt <?php echo "($INRSYM)" ?></label>
-									<?php
-									$data = array('name' => 'txtEditTotalOrderValue', 'value' => set_value('txtEditTotalOrderValue'), 'id' => 'txtEditTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-									echo form_input($data);
-									?>
+								<?php
+								$data = array('name' => 'txtEditTotalOrderValue', 'value' => set_value('txtEditTotalOrderValue'), 'id' => 'txtEditTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
 							</div>
 						</div>
 						<div class="form-row">
-						<div class="form-group col-md-12">
+							<div class="form-group col-md-12">
 
-							<label><?php echo "Revenue Description"; ?></label>
+								<label><?php echo "Revenue Description"; ?></label>
 								<?php
 								$data = array('name' => 'Edit_Service_Description', 'value' => set_value('Edit_Service_Description'), 'id' => 'Edit_Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
 								echo form_textarea($data);;
@@ -1885,7 +1889,7 @@ if (!empty($INRSYMBOL)) {
 					</div>
 				</div>
 				<div class="modal-footer">
-					<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
+					<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin:10px;">Cancel</a>
 					<a class="btn btn-success EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
 				</div>
 			</form>
@@ -2006,371 +2010,353 @@ if (!empty($INRSYMBOL)) {
 	</tr>
 </script> -->
 <script>
-	var index = '1';
-	var userid = '';
-
-	$('#BudgetType').attr("style", "pointer-events: none;");
-
-
-	$("#EDITREVENUE").on("shown.bs.modal", function(e) {
-		
-		var AvlBudAmt = '<?php echo $AvlAmount ?>';
-
-		AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
-		userid = $(e.relatedTarget).data('userid');
-		$('#isEdit').val(1);
-		//alert(userid);
-		var tr = document.getElementById(userid);
-		var cellval = tr.cells;
-		var id = $('#Reqnumber' + userid).val();
-
-		$('#EditReqNo').val($('#Reqnumber' + userid).val());
-		$('#EditdeptName').val($('#departmentName' + userid).val());
-		$("#EditCostCenter").val($('#costCode' + userid).val());
-		$('#EditAvlBudAmt').val(AvlBudAmt);
-
-		$('#EditMaterialCode').val($('#materialCode' + userid).val());
-		$('#EditItemName').val($('#materialName' + userid).val());
-		$('#EditUOM').val($('#uom' + userid).val());
-		$('#EditQuantity').val($('#quantity' + userid).val());
-		$('#EditAmendPer').val($('#per' + userid).val());
-		tinyMCE.get('Edit_Service_Description').setContent($('#service_description' + userid).val());
-
-		$('#EditRate').val($('#itemRate' + userid).val());
-
-		$('#txtEditBasicValue').val(parseFloat(cellval[6].innerHTML).toFixed(2));
-		RequistQuantity = $('#quantity' + userid).val();
-		$('#txtEditDiscount').val($('#DisVal' + userid).val());
-		$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
-		$('#txtEditVat').val($('#VatVal' + userid).val());
-		$('#txtEditAfterVat').val($('#AfterVatVal' + userid).val());
-
-
-		$('#txtEditPackaging').val($('#PackVal' + userid).val());
-		$('#txtEditAfterPackaging').val($('#AfterPackVal' + userid).val());
-		$('#txtEditGST').val($('#GSTVal' + userid).val());
-		$('#txtEditAfterGST').val($('#AfterGSTVal' + userid).val());
-
-		$('#txtEditOtherTax').val($('#OtherTaxVal' + userid).val());
-		$('#txtEditAfterOtherTax').val($('#AfterOtherTaxVal' + userid).val());
-
-		if ($('#FreightType' + userid).val() == 'PER TRIP') {
-			$('#EditTripsValue').show();
-			$('#EditNOOfTrips').val($('#Nooftrips' + userid).val());
-		}
-		$('#txtEditFreight').val($('#FreightVal' + userid).val());
-		$('#txtEditAfterFreight').val($('#AfterFreightVal' + userid).val());
-		$('#txtEditInsurance').val($('#Insval' + userid).val());
-
-		$('#txtEditTotalOrderValue').val($('#TotalOrderValue' + userid).val());
-
-
-
-
-		$("#EditMaterialCode").empty();
-		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-		// For Binding Material list center for the selected Requistion Number	
-		$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
-		var isAdded = "0";
-		for (i = 0; i < Material.length; i++) {
-			$.each(Material[i], function(idx, obj) {
-
-				if (obj.ReqNo === id) {
-
-					$.each(SelectedMaterialList.Mat, function(idx1, el) {
-						if (id == el.ReqNo) {
-
-							if (el.materialCode == obj.MaterialCode) {
-
-								isAdded = "1";
-								return false;
-							} else {
-								isAdded = "0";
-							}
-
-						}
-
-
-					});
-
-
-					if (isAdded == "0") {
-
-						$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-					}
-
-				}
-
-
-			});
-		}
-
-		$("#EditDiscountType").val($('#DisType' + userid).val());
-		$("#drpEditFreight").val($('#FreightType' + userid).val());
-		$("#EditPackagingType").val($('#PackType' + userid).val())
-
-		$("input:radio[name='optPackaging'][value='" + $('#PackOption' + userid).val() + "']").prop('checked', 'checked');
-		$("input:radio[name='optExcise'][value='" + $('#ExciseOption' + userid).val() + "']").prop('checked', 'checked');
-		$("input:radio[name='optVat'][value='" + $('#VatOption' + userid).val() + "']").prop('checked', 'checked');
-		$("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked');
-
-
-	});
-
-
-
-	$('.editrevenue').click(function() {
-
-		//alert('inside Functioon');
-		tinyMCE.triggerSave();
-		if (validateEditRevenueTax() && validateEditExceedLimit()) {
-			// alert('inside IF');			
-			var CostCode = $("#EditCostCenter").val();
-			var AvilBudget = $('#EditAvlBudAmt').val();
-			var editMaterialCode = $("#EditMaterialCode").val();
-			var editDescription = $("#EditItemName").val();
-			var editUOM = $('#EditUOM').val();
-			var editQuantity = $('#EditQuantity').val();
-
-			var itemRate = $("#EditRate").val();
-			var per = $("#EditAmendPer").val();
-			if (per == '') {
-				per = $('#EditUOM').val();
-			}
-
-			var DisType = $("#EditDiscountType").val();
-			var DisVal = $("#txtEditDiscount").val();
-			var AfterDisVal = $("#txtEditAfterDiscount").val();
-
-			var PackOption = PackagingCalculation;
-			var PackType = $("#EditPackagingType").val();
-			var PackVal = $("#txtEditPackaging").val();
-			var AfterPackVal = $("#txtEditAfterPackaging").val();
-
-			// var ExciseOption = ExciseCalculation ;
-			// var ExciseVal = $("#txtEditExciseDuty").val();
-			// var AfterExciseVal = $("#txtEditAfterExciseDuty").val();
-
-			var VatOption = VatCalculation; //SGST
-			var VatVal = $("#txtEditVat").val();
-			var AfterVatVal = $("#txtEditAfterVat").val();
-
-			// var CSTOption = CSTCalculation ;
-			// var CSTVal = $("#txtCST").val();
-			// var AfterCSTVal = $("#txtEditAfterCST").val();
-
-			var GSTVal = $("#txtEditGST").val(); //CGST
-			var AfterGSTVal = $("#txtEditAfterGST").val();
-
-			var OtherTaxVal = $("#txtEditOtherTax").val(); //IGST
-			var AfterOtherTaxVal = $("#txtEditAfterOtherTax").val();
-			var Trips = $('#EditNOOfTrips').val();
-
-			// var FreightOption = FreightCalculation ;
-			var FreightType = $("#drpEditFreight").val();
-			var FreightVal = $("#txtEditFreight").val();
-			var AfterFreightVal = $("#txtEditAfterFreight").val();
-
-			var basicval = $("#txtEditBasicValue").val();
-			var Insval = $("#txtEditInsurance").val();
-			var TotalOrderValue = $("#txtEditTotalOrderValue").val();
-			var Service_Description = $("#Edit_Service_Description").val();
-			var TotalTaxValue = calculateEditTaxValue();
-			//alert(TotalTaxValue);
-
+	$(document).ready(function() {
 
+		var index = '1';
+		var userid = '';
+		$("#EDITREVENUE").on("shown.bs.modal", function(e) {
 
+			var AvlBudAmt = '<?php echo $AvlAmount ?>';
 
+			AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
+			userid = $(e.relatedTarget).data('userid');
+			$('#isEdit').val(1);
+			//alert(userid);
 			var tr = document.getElementById(userid);
 			var cellval = tr.cells;
+			var id = $('#Reqnumber' + userid).val();
 
-			cellval[2].innerHTML = editDescription;
-			cellval[3].innerHTML = parseFloat(editQuantity).toFixed(2);
-			cellval[4].innerHTML = editUOM;
-			cellval[5].innerHTML = parseFloat(itemRate).toFixed(2);
-			cellval[6].innerHTML = parseFloat(basicval).toFixed(2);
-			cellval[7].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
-			cellval[8].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
+			$('#EditReqNo').val($('#Reqnumber' + userid).val());
+			$('#EditdeptName').val($('#departmentName' + userid).val());
+			$("#EditCostCenter").val($('#costCode' + userid).val());
+			$('#EditAvlBudAmt').val(AvlBudAmt);
+
+			$('#EditMaterialCode').val($('#materialCode' + userid).val());
+			$('#EditItemName').val($('#materialName' + userid).val());
+			$('#EditUOM').val($('#uom' + userid).val());
+			$('#EditQuantity').val($('#quantity' + userid).val());
+			$('#EditAmendPer').val($('#per' + userid).val());
+			tinyMCE.get('Edit_Service_Description').setContent($('#service_description' + userid).val());
+
+			$('#EditRate').val($('#itemRate' + userid).val());
+
+			$('#txtEditBasicValue').val(parseFloat(cellval[6].innerHTML).toFixed(2));
+			RequistQuantity = $('#quantity' + userid).val();
+			$('#txtEditDiscount').val($('#DisVal' + userid).val());
+			$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
+			$('#txtEditVat').val($('#VatVal' + userid).val());
+			$('#txtEditAfterVat').val($('#AfterVatVal' + userid).val());
 
 
-			$('#materialCode' + userid).val(editMaterialCode);
-			$('#materialName' + userid).val(editDescription);
-			$('#uom' + userid).val(editUOM);
-			$('#quantity' + userid).val(editQuantity);
-			$('#itemRate' + userid).val(itemRate);
-			$('#DisType' + userid).val(DisType);
-			$('#DisVal' + userid).val(DisVal);
-			$('#AfterDisVal' + userid).val(AfterDisVal);
-			$('#PackOption' + userid).val(PackOption);
-			$('#PackType' + userid).val(PackType);
-			$('#PackVal' + userid).val(PackVal);
-			$('#AfterPackVal' + userid).val(AfterPackVal);
-			//	$('#ExciseOption'+userid).val(ExciseOption);
-			//	$('#ExciseVal'+userid).val(ExciseVal);
-			//			$('#AfterExciseVal'+userid).val(AfterExciseVal);
-			//$('#VatOption'+userid).val(VatOption);
-			$('#VatVal' + userid).val(VatVal);
-			$('#AfterVatVal' + userid).val(AfterVatVal);
-			//	$('#CSTOption'+userid).val(CSTOption);	
-			//	$('#CSTVal'+userid).val(CSTVal);
-			//$('#AfterCSTVal'+userid).val(AfterCSTVal);
-			$('#GSTVal' + userid).val(GSTVal);
-			$('#AfterGSTVal' + userid).val(AfterGSTVal);
-			$('#OtherTaxVal' + userid).val(OtherTaxVal);
-			$('#AfterOtherTaxVal' + userid).val(AfterOtherTaxVal);
-			//$('#FreightOption'+userid).val(FreightOption);
-			$('#FreightType' + userid).val(FreightType);
-			$('#Nooftrips' + userid).val(Trips);
-			//alert($('#Nooftrips'+userid).val());
-			$('#FreightVal' + userid).val(FreightVal);
-			$('#AfterFreightVal' + userid).val(AfterFreightVal);
-			$('#basicval' + userid).val(basicval);
-			$('#Insval' + userid).val(Insval);
-			$('#AvilBudget' + userid).val(AvilBudget);
-			$('#costCode' + userid).val(CostCode);
-			$('#TotalOrderValue' + userid).val(TotalOrderValue);
-			$('#service_description' + userid).val(Service_Description);
+			$('#txtEditPackaging').val($('#PackVal' + userid).val());
+			$('#txtEditAfterPackaging').val($('#AfterPackVal' + userid).val());
+			$('#txtEditGST').val($('#GSTVal' + userid).val());
+			$('#txtEditAfterGST').val($('#AfterGSTVal' + userid).val());
 
-			populateValueMainFormForEditRevenueTax();
-		}
+			$('#txtEditOtherTax').val($('#OtherTaxVal' + userid).val());
+			$('#txtEditAfterOtherTax').val($('#AfterOtherTaxVal' + userid).val());
 
-	});
-
-	function populateValueMainFormForRevenue() {
-		var Packaging = $('#txtAfterPackaging').val() == '' ? '0.00' : $('#txtAfterPackaging').val();
-
-		var Vat = $('#txtAfterVat').val() == '' ? '0.00' : $('#txtAfterVat').val(); //SGST
-
-		var GST = $('#txtAfterGST').val() == '' ? '0.00' : $('#txtAfterGST').val(); //CGST
-		var OtherTax = $('#txtAfterOtherTax').val() == '' ? '0.00' : $('#txtAfterOtherTax').val(); //IGST
-		var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val();
-		var Insurance = $('#txtInsurance').val() == '' ? '0.00' : $('#txtInsurance').val();
-		var Discount = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
-		var BasicVal = $('#txtBasicValue').val() == '' ? '0.00' : $('#txtBasicValue').val();
-		var TotalVal = $('#txtTotalOrderValue').val() == '' ? '0.00' : $('#txtTotalOrderValue').val();
-
-		var TotalOrderValueSummary = $('#txtTotalOrderValueSummary').val() == '' ? '0.00' : $('#txtTotalOrderValueSummary').val();
-
-		var totBasicAmt = $('#txtTotBasicAmount').val() == '' ? '0.00' : $('#txtTotBasicAmount').val();
-		alert(totBasicAmt);
-		var totDiscountAmt = $('#txtTotalDiscount').val() == '' ? '0.00' : $('#txtTotalDiscount').val();
-		var totPackagingAmt = $('#txtTotalPackaing').val() == '' ? '0.00' : $('#txtTotalPackaing').val();
-
-		var totVATAmt = $('#txtTotalVat').val() == '' ? '0.00' : $('#txtTotalVat').val(); //SGST
-
-		var totGSTAmt = $('#txtTotalGST').val() == '' ? '0.00' : $('#txtTotalGST').val(); //CGST
-		var totOtherTaxAmt = $('#txtTotalOtherTaxes').val() == '' ? '0.00' : $('#txtTotalOtherTaxes').val(); //IGST
-		var totFreightAmt = $('#txtTotalFreight').val() == '' ? '0.00' : $('#txtTotalFreight').val();
-		var totInsuranceAmt = $('#txtTotalInsurance').val() == '' ? '0.00' : $('#txtTotalInsurance').val();
-		var totOrderSummaryAmt = $('#txtTotalOrderValueSummary').val() == '' ? '0.00' : $('#txtTotalOrderValueSummary').val();
-
-		$('#txtTotBasicAmount').val(parseFloat(totBasicAmt) + parseFloat(BasicVal));
-		$('#txtTotalDiscount').val(parseFloat(totDiscountAmt) + parseFloat(Discount));
-		$('#txtTotalPackaing').val(parseFloat(totPackagingAmt) + parseFloat(Packaging));
-
-		$('#txtTotalVat').val(parseFloat(totVATAmt) + parseFloat(Vat)); //SGST
-
-		$('#txtTotalGST').val(parseFloat(totGSTAmt) + parseFloat(GST)); //CGST
-		$('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt) + parseFloat(OtherTax)); //IGST
-		$('#txtTotalFreight').val(parseFloat(totFreightAmt) + parseFloat(Freight));
-		$('#txtTotalInsurance').val(parseFloat(totInsuranceAmt) + parseFloat(Insurance));
-		$('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt) + parseFloat(TotalVal));
-
-	}
-
-	function populateValueMainFormForEditRevenueTax() {
-
-		var rows = document.getElementById('revenueTax').rows.length;
-		//alert(rows);
-		var totBasicAmt = 0;
-		var totDiscountAmt = 0;
-		var totPackagingAmt = 0;
-
-		var totVATAmt = 0; //SGST
-
-		var totGSTAmt = 0; //CGST
-		var totOtherTaxAmt = 0; //IGST
-		var totFreightAmt = 0;
-		var totInsuranceAmt = 0;
-		var totOrderSummaryAmt = 0;
-		var i = 0;
-		do {
-			i += 1;
-
-
-			var tr = document.getElementById(i);
-			//alert(tr);
-			if (tr != null) {
-				cells = tr.getElementsByTagName('td');
-
-
-				var rowid = cells[0].innerHTML;
-				// alert(rowid);
-				var Packaging = $('#AfterPackVal' + rowid).val() == '' ? '0.00' : $('#AfterPackVal' + rowid).val();
-
-				var Vat = $('#AfterVatVal' + rowid).val() == '' ? '0.00' : $('#AfterVatVal' + rowid).val(); //SGST
-
-				var GST = $('#AfterGSTVal' + rowid).val() == '' ? '0.00' : $('#AfterGSTVal' + rowid).val(); //CGST
-				var OtherTax = $('#AfterOtherTaxVal' + rowid).val() == '' ? '0.00' : $('#AfterOtherTaxVal' + rowid).val(); //IGST
-				var Freight = $('#AfterFreightVal' + rowid).val() == '' ? '0.00' : $('#AfterFreightVal' + rowid).val();
-				var Insurance = $('#Insval' + rowid).val() == '' ? '0.00' : $('#Insval' + rowid).val();
-				var Discount = $('#AfterDisVal' + rowid).val() == '' ? '0.00' : $('#AfterDisVal' + rowid).val();
-				var BasicVal = $('#basicval' + rowid).val() == '' ? '0.00' : $('#basicval' + rowid).val();
-				var TotalVal = $('#TotalOrderValue' + rowid).val() == '' ? '0.00' : $('#TotalOrderValue' + rowid).val();
-				//alert(TotalVal);
-
-
-				totBasicAmt = parseFloat(totBasicAmt) + parseFloat(BasicVal);
-				totDiscountAmt = parseFloat(totDiscountAmt) + parseFloat(Discount);
-				totPackagingAmt = parseFloat(totPackagingAmt) + parseFloat(Packaging);
-
-				totVATAmt = parseFloat(totVATAmt) + parseFloat(Vat); //SGST
-
-				totGSTAmt = parseFloat(totGSTAmt) + parseFloat(GST); //CGST
-				totOtherTaxAmt = parseFloat(totOtherTaxAmt) + parseFloat(OtherTax); //IGST
-				totFreightAmt = parseFloat(totFreightAmt) + parseFloat(Freight);
-				totInsuranceAmt = parseFloat(totInsuranceAmt) + parseFloat(Insurance);
-				totOrderSummaryAmt = parseFloat(totOrderSummaryAmt) + parseFloat(TotalVal);
+			if ($('#FreightType' + userid).val() == 'PER TRIP') {
+				$('#EditTripsValue').show();
+				$('#EditNOOfTrips').val($('#Nooftrips' + userid).val());
 			}
+			$('#txtEditFreight').val($('#FreightVal' + userid).val());
+			$('#txtEditAfterFreight').val($('#AfterFreightVal' + userid).val());
+			$('#txtEditInsurance').val($('#Insval' + userid).val());
 
-		} while (i < rows);
+			$('#txtEditTotalOrderValue').val($('#TotalOrderValue' + userid).val());
+			$("#EditMaterialCode").empty();
+			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+			// For Binding Material list center for the selected Requistion Number	
+			$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+			var isAdded = "0";
+			for (i = 0; i < Material.length; i++) {
+				$.each(Material[i], function(idx, obj) {
+					if (obj.ReqNo === id) {
+						$.each(SelectedMaterialList.Mat, function(idx1, el) {
+							if (id == el.ReqNo) {
+								if (el.materialCode == obj.MaterialCode) {
+									isAdded = "1";
+									return false;
+								} else {
+									isAdded = "0";
+								}
+							}
+						});
+						if (isAdded == "0") {
+							$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+						}
+					}
+				});
+			}
+			$("#EditDiscountType").val($('#DisType' + userid).val());
+			$("#drpEditFreight").val($('#FreightType' + userid).val());
+			$("#EditPackagingType").val($('#PackType' + userid).val())
+			$("input:radio[name='optPackaging'][value='" + $('#PackOption' + userid).val() + "']").prop('checked', 'checked');
+			$("input:radio[name='optExcise'][value='" + $('#ExciseOption' + userid).val() + "']").prop('checked', 'checked');
+			$("input:radio[name='optVat'][value='" + $('#VatOption' + userid).val() + "']").prop('checked', 'checked');
+			$("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked');
+		});
+		$('#BudgetType').attr("style", "pointer-events: none;");
 
-		// alert(totOrderSummaryAmt);
-		$('#txtTotBasicAmount').val(parseFloat(totBasicAmt).toFixed(2));
-		$('#txtTotalDiscount').val(parseFloat(totDiscountAmt).toFixed(2));
-		$('#txtTotalPackaing').val(parseFloat(totPackagingAmt).toFixed(2));
+		$('#EditRevenue').click(function() {
 
-		$('#txtTotalVat').val(parseFloat(totVATAmt).toFixed(2)); //SGST
+			// alert('inside Functioon');
+			tinyMCE.triggerSave();
+			if (validateEditRevenueTax() && validateEditExceedLimit()) {
+				// alert('inside IF');			
+				var CostCode = $("#EditCostCenter").val();
+				var AvilBudget = $('#EditAvlBudAmt').val();
+				var editMaterialCode = $("#EditMaterialCode").val();
+				var editDescription = $("#EditItemName").val();
+				var editUOM = $('#EditUOM').val();
+				var editQuantity = $('#EditQuantity').val();
 
-		$('#txtTotalGST').val(parseFloat(totGSTAmt).toFixed(2)); //CGST
-		$('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt).toFixed(2)); //IGST
-		$('#txtTotalFreight').val(parseFloat(totFreightAmt).toFixed(2));
-		$('#txtTotalInsurance').val(parseFloat(totInsuranceAmt).toFixed(2));
-		$('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt).toFixed(2));
+				var itemRate = $("#EditRate").val();
+				var per = $("#EditAmendPer").val();
+				if (per == '') {
+					per = $('#EditUOM').val();
+				}
 
-	}
+				var DisType = $("#EditDiscountType").val();
+				var DisVal = $("#txtEditDiscount").val();
+				var AfterDisVal = $("#txtEditAfterDiscount").val();
+
+				var PackOption = PackagingCalculation;
+				var PackType = $("#EditPackagingType").val();
+				var PackVal = $("#txtEditPackaging").val();
+				var AfterPackVal = $("#txtEditAfterPackaging").val();
+
+				// var ExciseOption = ExciseCalculation ;
+				// var ExciseVal = $("#txtEditExciseDuty").val();
+				// var AfterExciseVal = $("#txtEditAfterExciseDuty").val();
+
+				var VatOption = VatCalculation; //SGST
+				var VatVal = $("#txtEditVat").val();
+				var AfterVatVal = $("#txtEditAfterVat").val();
+
+				// var CSTOption = CSTCalculation ;
+				// var CSTVal = $("#txtCST").val();
+				// var AfterCSTVal = $("#txtEditAfterCST").val();
+
+				var GSTVal = $("#txtEditGST").val(); //CGST
+				var AfterGSTVal = $("#txtEditAfterGST").val();
+
+				var OtherTaxVal = $("#txtEditOtherTax").val(); //IGST
+				var AfterOtherTaxVal = $("#txtEditAfterOtherTax").val();
+				var Trips = $('#EditNOOfTrips').val();
+
+				// var FreightOption = FreightCalculation ;
+				var FreightType = $("#drpEditFreight").val();
+				var FreightVal = $("#txtEditFreight").val();
+				var AfterFreightVal = $("#txtEditAfterFreight").val();
+
+				var basicval = $("#txtEditBasicValue").val();
+				var Insval = $("#txtEditInsurance").val();
+				var TotalOrderValue = $("#txtEditTotalOrderValue").val();
+				var Service_Description = $("#Edit_Service_Description").val();
+				var TotalTaxValue = calculateEditTaxValue();
+				//alert(TotalTaxValue);
+
+
+
+				// console.log(userid);
+
+				var tr = document.getElementById(userid);
+				var cellval = tr.cells;
+				// console.log(tr);
+				
+				cellval[2].innerHTML = editDescription;
+				cellval[3].innerHTML = parseFloat(editQuantity).toFixed(2);
+				cellval[4].innerHTML = editUOM;
+				cellval[5].innerHTML = parseFloat(itemRate).toFixed(2);
+				cellval[6].innerHTML = parseFloat(basicval).toFixed(2);
+				cellval[7].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
+				cellval[8].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
+				
+				// alert("late");
+				$('#materialCode' + userid).val(editMaterialCode);
+				$('#materialName' + userid).val(editDescription);
+				$('#uom' + userid).val(editUOM);
+				$('#quantity' + userid).val(editQuantity);
+				$('#itemRate' + userid).val(itemRate);
+				$('#DisType' + userid).val(DisType);
+				$('#DisVal' + userid).val(DisVal);
+				$('#AfterDisVal' + userid).val(AfterDisVal);
+				$('#PackOption' + userid).val(PackOption);
+				$('#PackType' + userid).val(PackType);
+				$('#PackVal' + userid).val(PackVal);
+				$('#AfterPackVal' + userid).val(AfterPackVal);
+				//	$('#ExciseOption'+userid).val(ExciseOption);
+				//	$('#ExciseVal'+userid).val(ExciseVal);
+				//			$('#AfterExciseVal'+userid).val(AfterExciseVal);
+				//$('#VatOption'+userid).val(VatOption);
+				$('#VatVal' + userid).val(VatVal);
+				$('#AfterVatVal' + userid).val(AfterVatVal);
+				//	$('#CSTOption'+userid).val(CSTOption);	
+				//	$('#CSTVal'+userid).val(CSTVal);
+				//$('#AfterCSTVal'+userid).val(AfterCSTVal);
+				$('#GSTVal' + userid).val(GSTVal);
+				$('#AfterGSTVal' + userid).val(AfterGSTVal);
+				$('#OtherTaxVal' + userid).val(OtherTaxVal);
+				$('#AfterOtherTaxVal' + userid).val(AfterOtherTaxVal);
+				//$('#FreightOption'+userid).val(FreightOption);
+				$('#FreightType' + userid).val(FreightType);
+				$('#Nooftrips' + userid).val(Trips);
+				//alert($('#Nooftrips'+userid).val());
+				$('#FreightVal' + userid).val(FreightVal);
+				$('#AfterFreightVal' + userid).val(AfterFreightVal);
+				$('#basicval' + userid).val(basicval);
+				$('#Insval' + userid).val(Insval);
+				$('#AvilBudget' + userid).val(AvilBudget);
+				$('#costCode' + userid).val(CostCode);
+				$('#TotalOrderValue' + userid).val(TotalOrderValue);
+				$('#service_description' + userid).val(Service_Description);
+				populateValueMainFormForEditRevenueTax();
+				setTimeout(() => {
+					$('#EDITREVENUE').modal('hide');
+				}, 1000);
+			}
+			// alert('outside IF');			
+
+		});
+
+		function populateValueMainFormForRevenue() {
+			var Packaging = $('#txtAfterPackaging').val() == '' ? '0.00' : $('#txtAfterPackaging').val();
+
+			var Vat = $('#txtAfterVat').val() == '' ? '0.00' : $('#txtAfterVat').val(); //SGST
+
+			var GST = $('#txtAfterGST').val() == '' ? '0.00' : $('#txtAfterGST').val(); //CGST
+			var OtherTax = $('#txtAfterOtherTax').val() == '' ? '0.00' : $('#txtAfterOtherTax').val(); //IGST
+			var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val();
+			var Insurance = $('#txtInsurance').val() == '' ? '0.00' : $('#txtInsurance').val();
+			var Discount = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
+			var BasicVal = $('#txtBasicValue').val() == '' ? '0.00' : $('#txtBasicValue').val();
+			var TotalVal = $('#txtTotalOrderValue').val() == '' ? '0.00' : $('#txtTotalOrderValue').val();
+
+			var TotalOrderValueSummary = $('#txtTotalOrderValueSummary').val() == '' ? '0.00' : $('#txtTotalOrderValueSummary').val();
+
+			var totBasicAmt = $('#txtTotBasicAmount').val() == '' ? '0.00' : $('#txtTotBasicAmount').val();
+			alert(totBasicAmt);
+			var totDiscountAmt = $('#txtTotalDiscount').val() == '' ? '0.00' : $('#txtTotalDiscount').val();
+			var totPackagingAmt = $('#txtTotalPackaing').val() == '' ? '0.00' : $('#txtTotalPackaing').val();
+
+			var totVATAmt = $('#txtTotalVat').val() == '' ? '0.00' : $('#txtTotalVat').val(); //SGST
+
+			var totGSTAmt = $('#txtTotalGST').val() == '' ? '0.00' : $('#txtTotalGST').val(); //CGST
+			var totOtherTaxAmt = $('#txtTotalOtherTaxes').val() == '' ? '0.00' : $('#txtTotalOtherTaxes').val(); //IGST
+			var totFreightAmt = $('#txtTotalFreight').val() == '' ? '0.00' : $('#txtTotalFreight').val();
+			var totInsuranceAmt = $('#txtTotalInsurance').val() == '' ? '0.00' : $('#txtTotalInsurance').val();
+			var totOrderSummaryAmt = $('#txtTotalOrderValueSummary').val() == '' ? '0.00' : $('#txtTotalOrderValueSummary').val();
+
+			$('#txtTotBasicAmount').val(parseFloat(totBasicAmt) + parseFloat(BasicVal));
+			$('#txtTotalDiscount').val(parseFloat(totDiscountAmt) + parseFloat(Discount));
+			$('#txtTotalPackaing').val(parseFloat(totPackagingAmt) + parseFloat(Packaging));
+
+			$('#txtTotalVat').val(parseFloat(totVATAmt) + parseFloat(Vat)); //SGST
+
+			$('#txtTotalGST').val(parseFloat(totGSTAmt) + parseFloat(GST)); //CGST
+			$('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt) + parseFloat(OtherTax)); //IGST
+			$('#txtTotalFreight').val(parseFloat(totFreightAmt) + parseFloat(Freight));
+			$('#txtTotalInsurance').val(parseFloat(totInsuranceAmt) + parseFloat(Insurance));
+			$('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt) + parseFloat(TotalVal));
 
-	function validateEditRevenueTax() {
-		if ($('#EditCostCenter').val() == "") {
-			alert('Please select the Cost center');
-			$('#EditCostCenter').focus();
-			return false;
-		} else if ($('#EditMaterialCode').val() == "0") {
-			alert('Please select the Material Code');
-			$('#EditMaterialCode').focus();
-			return false;
-		} else if ($('#EditQuantity').val() == '' || $('#EditQuantity').val() == 0) {
-			alert('Please Enter the Quantity value');
-			$('#EditQuantity').focus();
-			return false;
-		} else if ($('#EditRate').val() == '') {
-			alert('Please Enter the Rate of the Item');
-			$('#EditRate').focus();
-			return false;
-		} else {
-			return true;
 		}
-	}
+
+		function populateValueMainFormForEditRevenueTax() {
+
+			var rows = document.getElementById('revenueTax').rows.length;
+			// alert(rows);
+			var totBasicAmt = 0;
+			var totDiscountAmt = 0;
+			var totPackagingAmt = 0;
+
+			var totVATAmt = 0; //SGST
+
+			var totGSTAmt = 0; //CGST
+			var totOtherTaxAmt = 0; //IGST
+			var totFreightAmt = 0;
+			var totInsuranceAmt = 0;
+			var totOrderSummaryAmt = 0;
+			var i = 0;
+			do {
+				i += 1;
+
+
+				var tr = document.getElementById(i);
+				//alert(tr);
+				if (tr != null) {
+					cells = tr.getElementsByTagName('td');
+
+
+					var rowid = cells[0].innerHTML;
+					// alert(rowid);
+					var Packaging = $('#AfterPackVal' + rowid).val() == '' ? '0.00' : $('#AfterPackVal' + rowid).val();
+
+					var Vat = $('#AfterVatVal' + rowid).val() == '' ? '0.00' : $('#AfterVatVal' + rowid).val(); //SGST
+
+					var GST = $('#AfterGSTVal' + rowid).val() == '' ? '0.00' : $('#AfterGSTVal' + rowid).val(); //CGST
+					var OtherTax = $('#AfterOtherTaxVal' + rowid).val() == '' ? '0.00' : $('#AfterOtherTaxVal' + rowid).val(); //IGST
+					var Freight = $('#AfterFreightVal' + rowid).val() == '' ? '0.00' : $('#AfterFreightVal' + rowid).val();
+					var Insurance = $('#Insval' + rowid).val() == '' ? '0.00' : $('#Insval' + rowid).val();
+					var Discount = $('#AfterDisVal' + rowid).val() == '' ? '0.00' : $('#AfterDisVal' + rowid).val();
+					var BasicVal = $('#basicval' + rowid).val() == '' ? '0.00' : $('#basicval' + rowid).val();
+					var TotalVal = $('#TotalOrderValue' + rowid).val() == '' ? '0.00' : $('#TotalOrderValue' + rowid).val();
+					//alert(TotalVal);
+
+
+					totBasicAmt = parseFloat(totBasicAmt) + parseFloat(BasicVal);
+					totDiscountAmt = parseFloat(totDiscountAmt) + parseFloat(Discount);
+					totPackagingAmt = parseFloat(totPackagingAmt) + parseFloat(Packaging);
+
+					totVATAmt = parseFloat(totVATAmt) + parseFloat(Vat); //SGST
+
+					totGSTAmt = parseFloat(totGSTAmt) + parseFloat(GST); //CGST
+					totOtherTaxAmt = parseFloat(totOtherTaxAmt) + parseFloat(OtherTax); //IGST
+					totFreightAmt = parseFloat(totFreightAmt) + parseFloat(Freight);
+					totInsuranceAmt = parseFloat(totInsuranceAmt) + parseFloat(Insurance);
+					totOrderSummaryAmt = parseFloat(totOrderSummaryAmt) + parseFloat(TotalVal);
+				}
+
+			} while (i < rows);
+
+			// alert(totOrderSummaryAmt);
+			$('#txtTotBasicAmount').val(parseFloat(totBasicAmt).toFixed(2));
+			$('#txtTotalDiscount').val(parseFloat(totDiscountAmt).toFixed(2));
+			$('#txtTotalPackaing').val(parseFloat(totPackagingAmt).toFixed(2));
+
+			$('#txtTotalVat').val(parseFloat(totVATAmt).toFixed(2)); //SGST
+
+			$('#txtTotalGST').val(parseFloat(totGSTAmt).toFixed(2)); //CGST
+			$('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt).toFixed(2)); //IGST
+			$('#txtTotalFreight').val(parseFloat(totFreightAmt).toFixed(2));
+			$('#txtTotalInsurance').val(parseFloat(totInsuranceAmt).toFixed(2));
+			$('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt).toFixed(2));
+
+		}
+
+		function validateEditRevenueTax() {
+			if ($('#EditCostCenter').val() == "") {
+				alert('Please select the Cost center');
+				$('#EditCostCenter').focus();
+				return false;
+			} else if ($('#EditMaterialCode').val() == "0") {
+				alert('Please select the Material Code');
+				$('#EditMaterialCode').focus();
+				return false;
+			} else if ($('#EditQuantity').val() == '' || $('#EditQuantity').val() == 0) {
+				alert('Please Enter the Quantity value');
+				$('#EditQuantity').focus();
+				return false;
+			} else if ($('#EditRate').val() == '') {
+				alert('Please Enter the Rate of the Item');
+				$('#EditRate').focus();
+				return false;
+			} else {
+				return true;
+			}
+		}
+	})
 </script>
 <script>
 	function validateBudgetExceedLimit() {
@@ -2455,7 +2441,7 @@ if (!empty($INRSYMBOL)) {
 			//                }
 			else {
 				//alert('final else for store data');	
-				$('.content').loader('show');
+				// $('.content').loader('show');
 				var formData = new FormData($('.CreatePO')[0]);
 
 				$.ajax({
@@ -2467,7 +2453,7 @@ if (!empty($INRSYMBOL)) {
 					contentType: false,
 					success: function(data) {
 						if (data) {
-							$('.content').loader('hide');
+							// $('.content').loader('hide');
 							alert(data);
 							$('#txtRowCount').val('');
 							$('#txtDeletedRow').val('');
@@ -2477,7 +2463,7 @@ if (!empty($INRSYMBOL)) {
 							window.location = "amendmentpurchaseorder";
 
 						} else {
-							$('.content').loader('hide');
+							// $('.content').loader('hide');
 							alert("Error");
 						}
 
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index 5f405610..ca8f5e53 100755
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -2137,13 +2137,13 @@ if (!empty($getlogpodtl)) {
 								</div>
 								<div class="form-row">
 									<div align="form-group col-md-12" align="right">
-										<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>					
-												<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-														<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
-													
-												<?php }  ?>
-													<!-- <a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a> -->
-													<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-primary" id="abcd">Select Line Item</button> </a>
+										<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
+											<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
+												<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
+
+											<?php }  ?>
+											<!-- <a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a> -->
+											<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-primary" id="abcd">Select Line Item</button> </a>
 										<?php } ?>
 									</div>
 								</div>
@@ -2152,117 +2152,118 @@ if (!empty($getlogpodtl)) {
 									<div class="table-responsive">
 										<table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
 											<thead>
-									
-											<tr>
-												<th>SNo</th>
-												<th>Requisition No</th>
-												<th>Item Code</th>
-												<th>Item Description</th>
-												<th>Quantity</th>
-												<th>UOM</th>
-												<th>Rate <?php echo "($INRSYM)" ?></th>
-												<th>Basic Amount <?php echo "($INRSYM)" ?></th>
-												<th>Tax Amount <?php echo "($INRSYM)" ?></th>
-												<th>Total Order Amount <?php echo "($INRSYM)" ?></th>
-												<!-- <th>Actual Quantity</th>
+
+												<tr>
+													<th>SNo</th>
+													<th>Requisition No</th>
+													<th>Item Code</th>
+													<th>Item Description</th>
+													<th>Quantity</th>
+													<th>UOM</th>
+													<th>Rate <?php echo "($INRSYM)" ?></th>
+													<th>Basic Amount <?php echo "($INRSYM)" ?></th>
+													<th>Tax Amount <?php echo "($INRSYM)" ?></th>
+													<th>Total Order Amount <?php echo "($INRSYM)" ?></th>
+													<!-- <th>Actual Quantity</th>
 													<th>Received Quantity</th>
 													<th>Pending Quantity</th> -->
-												<th>Action</th>
-											</tr>
-										</thead>
-										<tbody id='RevenueAppend'>
-											<?php
-											if (!empty($POItem)) {
-												$index = 0;
+													<th>Action</th>
+												</tr>
+											</thead>
+											<tbody id='RevenueAppend'>
+												<?php
+												if (!empty($POItem)) {
+													$index = 0;
 
-												foreach ($POItem as $record) {
-													$index = $index + 1;
-											?>
-													<tr id="<?php echo $index; ?>">
-														<td align="left"><?php echo $index; ?></td>
-														<td><?php echo $record->ReqNo ?></td>
-														<td><?php echo $record->MaterialCode ?></td>
-														<td><?php echo $record->MaterialName ?></td>
-														<td align="right"><?php echo $record->Quantity ?></td>
-														<td><?php echo $record->UOM ?></td>
-														<td align="right"><?php echo $record->Rate ?></td>
+													foreach ($POItem as $record) {
+														$index = $index + 1;
+												?>
+														<tr id="<?php echo $index; ?>">
+															<td align="left"><?php echo $index; ?></td>
+															<td><?php echo $record->ReqNo ?></td>
+															<td><?php echo $record->MaterialCode ?></td>
+															<td><?php echo $record->MaterialName ?></td>
+															<td align="left"><?php echo $record->Quantity ?></td>
+															<td><?php echo $record->UOM ?></td>
+															<td align="left"><?php echo $record->Rate ?></td>
 
-														<td align="right"><?php echo number_format($record->BasicValue, 2, '.', ''); ?></td>
+															<td align="left"><?php echo number_format($record->BasicValue, 2, '.', ''); ?></td>
 
-														<td align="right"><?php echo $record->Taxamount ?></td>
-														<td align="right"><?php echo $record->TotalValue ?></td>
-														<!-- <td align="right"><?php echo $record->Quantity ?></td>
+															<td align="left"><?php echo $record->Taxamount ?></td>
+															<td align="left"><?php echo $record->TotalValue ?></td>
+															<!-- <td align="right"><?php echo $record->Quantity ?></td>
 											<td align="right"><?php echo $record->ReceivedQuantity ?></td>
 											<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> -->
-														<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
-														<input type="hidden" name="<?php echo 'departmentName' . $index ?>" id="<?php echo 'departmentName' . $index ?>" value="<?php echo $record->DepartmentName; ?>" />
-														<input type="hidden" name="<?php echo 'AvilBudget' . $index ?>" id="<?php echo 'AvilBudget' . $index ?>" value="<?php echo $AvlAmount; ?>" />
-														<input type="hidden" name="<?php echo 'LineItemNo' . $index ?>" id="<?php echo 'LineItemNo' . $index ?>" value="<?php echo $record->LineItemNo; ?>" />
-														<input type="hidden" name="<?php echo 'costCode' . $index ?>" id="<?php echo 'costCode' . $index ?>" value="<?php echo $record->CostCenterCode; ?>" />
-														<input type="hidden" name="<?php echo 'materialCode' . $index ?>" id="<?php echo 'materialCode' . $index ?>" value="<?php echo $record->MaterialCode; ?>" />
-														<input type="hidden" name="<?php echo 'materialName' . $index ?>" id="<?php echo 'materialName' . $index ?>" value="<?php echo htmlentities($record->MaterialName); ?>" />
-														<input type="hidden" name="<?php echo 'uom' . $index ?>" id="<?php echo 'uom' . $index ?>" value="<?php echo $record->UOM; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'quantity' . $index ?>" id="<?php echo 'quantity' . $index ?>" value="<?php echo $record->Quantity; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'b4qty' . $index ?>" id="<?php echo 'b4qty' . $index ?>" value="<?php echo $record->Quantity; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'itemRate' . $index ?>" id="<?php echo 'itemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'b4rate' . $index ?>" id="<?php echo 'b4rate' . $index ?>" value="<?php echo $record->Rate; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'service_description' . $index ?>" id="<?php echo 'service_description' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
+															<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
+															<input type="hidden" name="<?php echo 'departmentName' . $index ?>" id="<?php echo 'departmentName' . $index ?>" value="<?php echo $record->DepartmentName; ?>" />
+															<input type="hidden" name="<?php echo 'AvilBudget' . $index ?>" id="<?php echo 'AvilBudget' . $index ?>" value="<?php echo $AvlAmount; ?>" />
+															<input type="hidden" name="<?php echo 'LineItemNo' . $index ?>" id="<?php echo 'LineItemNo' . $index ?>" value="<?php echo $record->LineItemNo; ?>" />
+															<input type="hidden" name="<?php echo 'costCode' . $index ?>" id="<?php echo 'costCode' . $index ?>" value="<?php echo $record->CostCenterCode; ?>" />
+															<input type="hidden" name="<?php echo 'materialCode' . $index ?>" id="<?php echo 'materialCode' . $index ?>" value="<?php echo $record->MaterialCode; ?>" />
+															<input type="hidden" name="<?php echo 'materialName' . $index ?>" id="<?php echo 'materialName' . $index ?>" value="<?php echo htmlentities($record->MaterialName); ?>" />
+															<input type="hidden" name="<?php echo 'uom' . $index ?>" id="<?php echo 'uom' . $index ?>" value="<?php echo $record->UOM; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'quantity' . $index ?>" id="<?php echo 'quantity' . $index ?>" value="<?php echo $record->Quantity; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'b4qty' . $index ?>" id="<?php echo 'b4qty' . $index ?>" value="<?php echo $record->Quantity; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'itemRate' . $index ?>" id="<?php echo 'itemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'b4rate' . $index ?>" id="<?php echo 'b4rate' . $index ?>" value="<?php echo $record->Rate; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'service_description' . $index ?>" id="<?php echo 'service_description' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
 
-														<input align="right" type="hidden" name="<?php echo 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'PackOption' . $index ?>" id="<?php echo 'PackOption' . $index ?>" value="<?php echo $record->PackagingCalulatedOn; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'PackType' . $index ?>" id="<?php echo 'PackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'PackVal' . $index ?>" id="<?php echo 'PackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'AfterPackVal' . $index ?>" id="<?php echo 'AfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'RevenueCgst' . $index ?>" id="<?php echo 'RevenueCgst' . $index ?>" value="<?php echo $record->CGST; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'RevenueAfterCgst' . $index ?>" id="<?php echo 'RevenueAfterCgst' . $index ?>" value="<?php echo $record->AfterCGST; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'RevenueSgst' . $index ?>" id="<?php echo 'RevenueSgst' . $index ?>" value="<?php echo $record->SGST; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'RevenueAfterSgst' . $index ?>" id="<?php echo 'RevenueAfterSgst' . $index ?>" value="<?php echo $record->AfterSGST; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'RevenueIgst' . $index ?>" id="<?php echo 'RevenueIgst' . $index ?>" value="<?php echo $record->IGST; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'RevenueAfterIgst' . $index ?>" id="<?php echo 'RevenueAfterIgst' . $index ?>" value="<?php echo $record->AfterIGST; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'NoOfTrip' . $index ?>" id="<?php echo 'NoOfTrip' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'FreightVal' . $index ?>" id="<?php echo 'FreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>" id="<?php echo 'AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'basicval' . $index ?>" id="<?php echo 'basicval' . $index ?>" value="<?php echo $record->BasicValue; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'Insval' . $index ?>" id="<?php echo 'Insval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
-														<input align="right" type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
-														<?php
-
-														if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?>
-															<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="ri-pencil-fill" ></i></a> 
-															&nbsp;&nbsp;&nbsp;
-															     <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
+															<input align="right" type="hidden" name="<?php echo 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'PackOption' . $index ?>" id="<?php echo 'PackOption' . $index ?>" value="<?php echo $record->PackagingCalulatedOn; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'PackType' . $index ?>" id="<?php echo 'PackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'PackVal' . $index ?>" id="<?php echo 'PackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'AfterPackVal' . $index ?>" id="<?php echo 'AfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'RevenueCgst' . $index ?>" id="<?php echo 'RevenueCgst' . $index ?>" value="<?php echo $record->CGST; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'RevenueAfterCgst' . $index ?>" id="<?php echo 'RevenueAfterCgst' . $index ?>" value="<?php echo $record->AfterCGST; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'RevenueSgst' . $index ?>" id="<?php echo 'RevenueSgst' . $index ?>" value="<?php echo $record->SGST; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'RevenueAfterSgst' . $index ?>" id="<?php echo 'RevenueAfterSgst' . $index ?>" value="<?php echo $record->AfterSGST; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'RevenueIgst' . $index ?>" id="<?php echo 'RevenueIgst' . $index ?>" value="<?php echo $record->IGST; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'RevenueAfterIgst' . $index ?>" id="<?php echo 'RevenueAfterIgst' . $index ?>" value="<?php echo $record->AfterIGST; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'NoOfTrip' . $index ?>" id="<?php echo 'NoOfTrip' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'FreightVal' . $index ?>" id="<?php echo 'FreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>" id="<?php echo 'AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'basicval' . $index ?>" id="<?php echo 'basicval' . $index ?>" value="<?php echo $record->BasicValue; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'Insval' . $index ?>" id="<?php echo 'Insval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
+															<input align="right" type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
 															<?php
-														} else { ?>
-															<td> <a data-target='#VIEWREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWREVENUE"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
 
-														<?php
-														} ?>
-													</tr>
+															if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?>
+																<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="ri-pencil-fill"></i></a>
+																	&nbsp;&nbsp;&nbsp;
+																	<a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
+																<?php
+															} else { ?>
+																<td> <a data-target='#VIEWREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWREVENUE"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
+
+															<?php
+															} ?>
+														</tr>
+													<?php
+
+
+														$totBasicAmt  = $totBasicAmt + $record->BasicValue;
+														$totDiscountAmt  = $totDiscountAmt + $record->AfterDiscount;
+														$totPackagingAmt  = $totPackagingAmt + $record->AfterPackagingValue;
+														$totCgst  = $totCgst + $record->AfterCGST;
+														$totSgst  = $totSgst + $record->AfterSGST;
+														$totIgst  = $totIgst + $record->AfterIGST;
+
+														$totFreightAmt   = $totFreightAmt + $record->AfterFreightValue;
+														$totInsuranceAmt   = $totInsuranceAmt + $record->Insurance;
+														$totOrderSummaryAmt   = $totOrderSummaryAmt + $record->TotalValue;
+													}
+													?>
 												<?php
 
-
-													$totBasicAmt  = $totBasicAmt + $record->BasicValue;
-													$totDiscountAmt  = $totDiscountAmt + $record->AfterDiscount;
-													$totPackagingAmt  = $totPackagingAmt + $record->AfterPackagingValue;
-													$totCgst  = $totCgst + $record->AfterCGST;
-													$totSgst  = $totSgst + $record->AfterSGST;
-													$totIgst  = $totIgst + $record->AfterIGST;
-
-													$totFreightAmt   = $totFreightAmt + $record->AfterFreightValue;
-													$totInsuranceAmt   = $totInsuranceAmt + $record->Insurance;
-													$totOrderSummaryAmt   = $totOrderSummaryAmt + $record->TotalValue;
 												}
 												?>
-											<?php
-
-											}
-											?>
-										</tbody>
-									</table><br></div>
+											</tbody>
+										</table><br>
+									</div>
 								</div>
 								<div class="form-row">
 									<div class="form-group col-md-3">
@@ -2401,7 +2402,7 @@ if (!empty($getlogpodtl)) {
 															<input type="hidden" id="courierno<?= $row ?>" value="<?= $gd->CourierNo ?>">
 															<input type="hidden" id="MaterialRcvdDate<?= $row ?>" value="<?= $gd->MaterialRcvdDate ?>">
 
-															<td><span onclick="openmodel(<?= $row ?>);"><i class="ri-pencil-fill" ></i></span>
+															<td><span onclick="openmodel(<?= $row ?>);"><i class="ri-pencil-fill"></i></span>
 
 															</td>
 														</tr>
@@ -2463,7 +2464,7 @@ if (!empty($getlogpodtl)) {
 
 
 
-																<td><span onclick="openbillmodel(<?php echo $index ?>);"><i class="ri-pencil-fill" ></i></span>
+																<td><span onclick="openbillmodel(<?php echo $index ?>);"><i class="ri-pencil-fill"></i></span>
 																	<?php if (!empty($gd->FilePath)) { ?>
 																		<a target="_blank" href="<?php echo  base_url() . 'public/uploads/BillFiles/' ?><?php echo $gd->FilePath ?>"><i class="fa fa-download"></i></a>
 																	<?php } ?>
@@ -2579,31 +2580,31 @@ if (!empty($getlogpodtl)) {
 									</div><br />
 								</div>
 								<div class="form-row">
-										<div class="form-group col-md-12">
+									<div class="form-group col-md-12">
 
-											<label>Request On : </label><?php echo $Reqon; ?><br />
-											<?php if ($RequesterName != '' || $RequesterName != null) { ?>
-												<label>Request By : </label><?php echo $RequesterName; ?><br />
-											<?php } ?>
-											<label>Status : </label><?php
-																	$statusMappings = [
-																		'PO APPROVED' => 'AWAITING APPROVE',
-																		'AWAITING RELEASE' => 'AWAITING APPROVE',
-																		'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-																		'PO RELEASED' => 'PO APPROVED',
-																	];
+										<label>Request On : </label><?php echo $Reqon; ?><br />
+										<?php if ($RequesterName != '' || $RequesterName != null) { ?>
+											<label>Request By : </label><?php echo $RequesterName; ?><br />
+										<?php } ?>
+										<label>Status : </label><?php
+																$statusMappings = [
+																	'PO APPROVED' => 'AWAITING APPROVE',
+																	'AWAITING RELEASE' => 'AWAITING APPROVE',
+																	'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+																	'PO RELEASED' => 'PO APPROVED',
+																];
 
-																	if (isset($StatusName) && !empty($StatusName)) {
-																		if (isset($statusMappings[$StatusName])) {
-																			echo $statusMappings[$StatusName];
-																		} else {
-																			echo $StatusName;
-																		}
+																if (isset($StatusName) && !empty($StatusName)) {
+																	if (isset($statusMappings[$StatusName])) {
+																		echo $statusMappings[$StatusName];
 																	} else {
-																		echo "Status not provided";
+																		echo $StatusName;
 																	}
-																	?>
-										</div>
+																} else {
+																	echo "Status not provided";
+																}
+																?>
+									</div>
 								</div>
 							</div>
 						</div> <!-- end card body-->
@@ -2931,10 +2932,10 @@ if (!empty($getlogpodtl)) {
 						<div class="form-group col-md-8"></div>
 						<div class="form-group col-md-4">
 							<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
-								<?php
-								$data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue'), 'id' => 'txtTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
-								echo form_input($data);
-								?>
+							<?php
+							$data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue'), 'id' => 'txtTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
+							echo form_input($data);
+							?>
 						</div>
 
 
@@ -3043,38 +3044,38 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-							<div class="form-group col-md-2">
-								<label>Quantity<span class="text-danger">*</span></label>
-								<div class="form-group">
-									<?php
-									$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
-									echo form_input($data);
-									?>
-								</div>
+						<div class="form-group col-md-2">
+							<label>Quantity<span class="text-danger">*</span></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
 							</div>
-							<div class="form-group col-md-2">
-								<label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
-								<div class="form-group">
-									<?php
-									$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
-									echo form_input($data);
-									?>
-								</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
 							</div>
-							<div class="form-group col-md-1">
-								<label>Per</label> <?php
-													$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
-													echo form_input($data); ?>
-							</div>
-							<div class="form-group col-md-2">
-								<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
-								<div class="form-group">
-									<?php
-									$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-									echo form_input($data);
-									?>
-								</div>
+						</div>
+						<div class="form-group col-md-1">
+							<label>Per</label> <?php
+												$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
+												echo form_input($data); ?>
+						</div>
+						<div class="form-group col-md-2">
+							<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+								echo form_input($data);
+								?>
 							</div>
+						</div>
 
 					</div>
 
@@ -3303,10 +3304,10 @@ if (!empty($getlogpodtl)) {
 					<div class="form-row">
 						<div class="form-group col-md-12">
 							<label><?php echo "Revenue Description"; ?></label>
-								<?php
-								$data = array('name' => 'Edit_Service_Description', 'value' => set_value('Edit_Service_Description'), 'id' => 'Edit_Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
-								echo form_textarea($data);;
-								?>
+							<?php
+							$data = array('name' => 'Edit_Service_Description', 'value' => set_value('Edit_Service_Description'), 'id' => 'Edit_Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
+							echo form_textarea($data);;
+							?>
 						</div>
 					</div>
 
@@ -3869,9 +3870,9 @@ if (!empty($getlogpodtl)) {
 
 		</td>
 	</tr> -->
-	</div>
-	</section>
-	</div>
+</div>
+</section>
+</div>
 </script>
 <script>
 	var index = <?php echo $index; ?>;
@@ -4021,7 +4022,7 @@ if (!empty($getlogpodtl)) {
 		</td>
 	</tr>
 `;
-$('#RevenueAppend').append(rowHtml);
+			$('#RevenueAppend').append(rowHtml);
 
 
 
@@ -4454,8 +4455,7 @@ $('#RevenueAppend').append(rowHtml);
 		$('#ViewAfterIGST').val(TAXval);
 		return TAXval; //  $('#AfterServiceTax').val(TAXval);
 	}
-</script>
-<script>
+
 	function validateBudgetExceedLimit() {
 		var rows = document.getElementById('revenueTax').rows.length;
 		var ReqType = '<?php echo REVENUE ?>';
@@ -4635,82 +4635,6 @@ $('#RevenueAppend').append(rowHtml);
 
 	}
 
-	function Save(status) {
-		if (status == '0') {
-			stat = '<?php echo PO_DRAFT; ?>';
-		} else if (status == '1') {
-			stat = '<?php echo PO_CREATED; ?>';
-		} else if (status == '4') {
-			stat = '<?php echo PO_RELEASED; ?>';
-		} else {
-			stat = '<?php echo $PONOStatus; ?>';
-		}
-		var deladd = $('#DeliveryAddr').val();
-		$('#txtStatus').val(stat);
-		tinyMCE.triggerSave();
-		var splinstr = $('#txtSpcialInstruction').val();
-		$('#SpcialInstruction').val(splinstr);
-		$('#txtDeliveryAddress').val(deladd);
-		var AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
-		var txtTotalbasicamount = $('#txtTotBasicAmount').val();
-		var totaldiscount = $('#txtTotalDiscount').val();
-		//alert(txtTotalbasicamount+'-'+totaldiscount);
-		//alert(txtTotalbasicamount-totaldiscount);
-		if (validate()) {
-			if (document.getElementById('revenueTax').rows.length < 2) {
-				alert('Please Select Line item to Create PO');
-				$('#Deliverydt').focus();
-				return false;
-			}
-			//else if(validateBudgetExceedLimit())
-			//{
-			//	return false;
-			//}
-			//          else if(parseInt(AvlBudAmt) < (parseInt(txtTotalbasicamount)- parseInt(totaldiscount))){
-			// alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
-
-			//        return false;
-			//     }
-			else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') {
-				alert('Please Enter Payable Terms Description');
-				$('#Otherpayment').focus();
-				return false;
-			} else if ($('#insurancestatus').val() == 1 && $('#InsuranceNumber').val() == '') {
-				alert('Please Enter Insurance No / Insurance Details..!');
-				$('#insurance').focus();
-				return false;
-			} else {
-				var formData = new FormData($('.CreatePO')[0]);
-				$.ajax({
-					type: "POST",
-					url: "<?php echo base_url() ?>purchaseorder/EditRevenuePurchaseOrder",
-					data: formData,
-					processData: false,
-					contentType: false,
-					success: function(data) {
-						if (data) {
-							alert(data);
-							$('#txtRowCount').val('');
-							$('#txtDeletedRow').val('');
-							$('#txtStatus').val('');
-							$('#SpcialInstruction').val('');
-							$('#txtDeliveryAddress').val('')
-							window.location = "purchaseorderListing";
-
-						} else {
-							alert("Error");
-						}
-
-					},
-					error: function(jqXHR, textStatus, errorThrown) {
-						console.error("AJAX Error: " + textStatus + ": " + errorThrown);
-						alert("Error: " + textStatus);
-					}
-
-				});
-			}
-		}
-	}
 	// this function is used to clear data changing schedule option
 	$('#Scheduleby').change(function() {
 
@@ -4906,185 +4830,265 @@ $('#RevenueAppend').append(rowHtml);
 		id = '';
 
 	});
-	$(document).ready(function() {
 
-	$("#EDITREVENUE").on("shown.bs.modal", function(e) {
-		var AvlBudAmt = '<?php echo $AvlAmount ?>';
+	function Save(status) {
+		console.log("status");
+		console.log(status);
 
-		AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
-		userid = $(e.relatedTarget).data('userid');
-		$('#isEdit').val(1);
-		//alert(userid);
-		var tr = document.getElementById(userid);
-		var cellval = tr.cells;
-		var id = $('#Reqnumber' + userid).val();
-
-		$('#EditReqNo').val($('#Reqnumber' + userid).val());
-		$('#EditdeptName').val($('#departmentName' + userid).val());
-		$("#EditCostCenter").val($('#costCode' + userid).val());
-		$('#EditAvlBudAmt').val(AvlBudAmt);
-		//
-
-		$('#EditItemName').val($('#materialName' + userid).val());
-		$('#EditUOM').val($('#uom' + userid).val());
-		$('#EditQuantity').val($('#quantity' + userid).val());
-		tinyMCE.get('Edit_Service_Description').setContent($('#service_description' + userid).val());
-		$('#EditRate').val($('#itemRate' + userid).val());
-		var per = $('#per' + userid).val()
-		if (per == '') {
-			$('#EditPer').val($('#uom' + userid).val());
+		if (status == '0') {
+			stat = '<?php echo PO_DRAFT; ?>';
+		} else if (status == '1') {
+			stat = '<?php echo PO_CREATED; ?>';
+		} else if (status == '4') {
+			stat = '<?php echo PO_RELEASED; ?>';
 		} else {
-			$('#EditPer').val($('#per' + userid).val());
+			stat = '<?php echo $PONOStatus; ?>';
 		}
-		$('#txtEditBasicValue').val(cellval[7].innerHTML);
-		RequistQuantity = $('#quantity' + userid).val();
-		$('#txtEditDiscount').val($('#DisVal' + userid).val());
-		$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
+		var deladd = $('#DeliveryAddr').val();
+		$('#txtStatus').val(stat);
+		tinyMCE.triggerSave();
+		var splinstr = $('#txtSpcialInstruction').val();
+		$('#SpcialInstruction').val(splinstr);
+		$('#txtDeliveryAddress').val(deladd);
+		var AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
+		var txtTotalbasicamount = $('#txtTotBasicAmount').val();
+		var totaldiscount = $('#txtTotalDiscount').val();
+		//alert(txtTotalbasicamount+'-'+totaldiscount);
+		//alert(txtTotalbasicamount-totaldiscount);
+		if (validate()) {
+			if (document.getElementById('revenueTax').rows.length < 2) {
+				alert('Please Select Line item to Create PO');
+				$('#Deliverydt').focus();
+				return false;
+			}
+			//else if(validateBudgetExceedLimit())
+			//{
+			//	return false;
+			//}
+			//          else if(parseInt(AvlBudAmt) < (parseInt(txtTotalbasicamount)- parseInt(totaldiscount))){
+			// alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
 
-		$('#txtEditPackaging').val($('#PackVal' + userid).val());
-		$('#txtEditAfterPackaging').val($('#AfterPackVal' + userid).val());
+			//        return false;
+			//     }
+			else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') {
+				alert('Please Enter Payable Terms Description');
+				$('#Otherpayment').focus();
+				return false;
+			} else if ($('#insurancestatus').val() == 1 && $('#InsuranceNumber').val() == '') {
+				alert('Please Enter Insurance No / Insurance Details..!');
+				$('#insurance').focus();
+				return false;
+			} else {
+				var formData = new FormData($('.CreatePO')[0]);
+				$.ajax({
+					type: "POST",
+					url: "<?php echo base_url() ?>purchaseorder/EditRevenuePurchaseOrder",
+					data: formData,
+					processData: false,
+					contentType: false,
+					success: function(data) {
+						console.log(data);
+						// if (data) {
+						// 	alert(data);
+						// 	$('#txtRowCount').val('');
+						// 	$('#txtDeletedRow').val('');
+						// 	$('#txtStatus').val('');
+						// 	$('#SpcialInstruction').val('');
+						// 	$('#txtDeliveryAddress').val('')
+						// 	window.location = "purchaseorderListing";
 
-		$('#txtEditFreight').val($('#FreightVal' + userid).val());
-		$('#txtEditAfterFreight').val($('#AfterFreightVal' + userid).val());
-		var FreightType = $('#FreightType' + userid).val();
-		$('#EditNOOfTrips').val($('#NoOfTrip' + userid).val());
-		if (FreightType == "PER TRIP") {
-			$('#EditTripsValue').show();
-		} else {
-			$('#EditTripsValue').hide();
-		}
-		$('#txtEditInsurance').val($('#Insval' + userid).val());
+						// } else {
+						// 	alert("Error");
+						// }
 
-		$('#txtEditTotalOrderValue').val($('#TotalOrderValue' + userid).val());
-		var x = $("input:radio[name='Range']:checked").val();
-
-		$('#EditAfterCgst').val($('#RevenueAfterCgst' + userid).val());
-		$('#EditAfterSgst').val($('#RevenueAfterSgst' + userid).val());
-		$('#EditAfterIgst').val($('#RevenueAfterIgst' + userid).val());
-		$('#EditCgst').val($('#RevenueCgst' + userid).val());
-		$('#EditSgst').val($('#RevenueSgst' + userid).val());
-		$('#EditIgst').val($('#RevenueIgst' + userid).val());
-
-
-
-		$("#EditMaterialCode").empty();
-		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-		// For Binding Material list center for the selected Requistion Number
-		$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
-		var isAdded = "0";
-		for (i = 0; i < Material.length; i++) {
-			$.each(Material[i], function(idx, obj) {
-
-				if (obj.ReqNo === id) {
-
-					$.each(SelectedMaterialList.Mat, function(idx1, el) {
-						if (id == el.ReqNo) {
-
-							if (el.materialCode == obj.MaterialCode) {
-
-								isAdded = "1";
-								return false;
-							} else {
-								isAdded = "0";
-							}
-
-						}
-
-
-					});
-
-
-					if (isAdded == "0") {
-
-						$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+					},
+					error: function(jqXHR, textStatus, errorThrown) {
+						console.error("AJAX Error: " + textStatus + ": " + errorThrown);
+						alert("Error: " + textStatus);
 					}
 
-				}
-
-
-			});
+				});
+			}
 		}
+	}
+	$(document).ready(function() {
+		$("#EDITREVENUE").on("shown.bs.modal", function(e) {
+			var AvlBudAmt = '<?php echo $AvlAmount ?>';
 
-		$("#EditDiscountType").val($('#DisType' + userid).val());
-		$("#drpEditFreight").val($('#FreightType' + userid).val());
-		$("#EditPackagingType").val($('#PackType' + userid).val())
+			AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
+			userid = $(e.relatedTarget).data('userid');
+			$('#isEdit').val(1);
+			//alert(userid);
+			var tr = document.getElementById(userid);
+			var cellval = tr.cells;
+			var id = $('#Reqnumber' + userid).val();
 
-		$("input:radio[name='optPackaging'][value='" + $('#PackOption' + userid).val() + "']").prop('checked', 'checked');
-		$("input:radio[name='optExcise'][value='" + $('#ExciseOption' + userid).val() + "']").prop('checked', 'checked');
-		$("input:radio[name='optVat'][value='" + $('#VatOption' + userid).val() + "']").prop('checked', 'checked');
-		$("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked');
+			$('#EditReqNo').val($('#Reqnumber' + userid).val());
+			$('#EditdeptName').val($('#departmentName' + userid).val());
+			$("#EditCostCenter").val($('#costCode' + userid).val());
+			$('#EditAvlBudAmt').val(AvlBudAmt);
+			//
+
+			$('#EditItemName').val($('#materialName' + userid).val());
+			$('#EditUOM').val($('#uom' + userid).val());
+			$('#EditQuantity').val($('#quantity' + userid).val());
+			tinyMCE.get('Edit_Service_Description').setContent($('#service_description' + userid).val());
+			$('#EditRate').val($('#itemRate' + userid).val());
+			var per = $('#per' + userid).val()
+			if (per == '') {
+				$('#EditPer').val($('#uom' + userid).val());
+			} else {
+				$('#EditPer').val($('#per' + userid).val());
+			}
+			$('#txtEditBasicValue').val(cellval[7].innerHTML);
+			RequistQuantity = $('#quantity' + userid).val();
+			$('#txtEditDiscount').val($('#DisVal' + userid).val());
+			$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
+
+			$('#txtEditPackaging').val($('#PackVal' + userid).val());
+			$('#txtEditAfterPackaging').val($('#AfterPackVal' + userid).val());
+
+			$('#txtEditFreight').val($('#FreightVal' + userid).val());
+			$('#txtEditAfterFreight').val($('#AfterFreightVal' + userid).val());
+			var FreightType = $('#FreightType' + userid).val();
+			$('#EditNOOfTrips').val($('#NoOfTrip' + userid).val());
+			if (FreightType == "PER TRIP") {
+				$('#EditTripsValue').show();
+			} else {
+				$('#EditTripsValue').hide();
+			}
+			$('#txtEditInsurance').val($('#Insval' + userid).val());
+
+			$('#txtEditTotalOrderValue').val($('#TotalOrderValue' + userid).val());
+			var x = $("input:radio[name='Range']:checked").val();
+
+			$('#EditAfterCgst').val($('#RevenueAfterCgst' + userid).val());
+			$('#EditAfterSgst').val($('#RevenueAfterSgst' + userid).val());
+			$('#EditAfterIgst').val($('#RevenueAfterIgst' + userid).val());
+			$('#EditCgst').val($('#RevenueCgst' + userid).val());
+			$('#EditSgst').val($('#RevenueSgst' + userid).val());
+			$('#EditIgst').val($('#RevenueIgst' + userid).val());
 
 
+
+			$("#EditMaterialCode").empty();
+			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+			// For Binding Material list center for the selected Requistion Number
+			$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+			var isAdded = "0";
+			for (i = 0; i < Material.length; i++) {
+				$.each(Material[i], function(idx, obj) {
+
+					if (obj.ReqNo === id) {
+
+						$.each(SelectedMaterialList.Mat, function(idx1, el) {
+							if (id == el.ReqNo) {
+
+								if (el.materialCode == obj.MaterialCode) {
+
+									isAdded = "1";
+									return false;
+								} else {
+									isAdded = "0";
+								}
+
+							}
+
+
+						});
+
+
+						if (isAdded == "0") {
+
+							$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+						}
+
+					}
+
+
+				});
+			}
+
+			$("#EditDiscountType").val($('#DisType' + userid).val());
+			$("#drpEditFreight").val($('#FreightType' + userid).val());
+			$("#EditPackagingType").val($('#PackType' + userid).val())
+
+			$("input:radio[name='optPackaging'][value='" + $('#PackOption' + userid).val() + "']").prop('checked', 'checked');
+			$("input:radio[name='optExcise'][value='" + $('#ExciseOption' + userid).val() + "']").prop('checked', 'checked');
+			$("input:radio[name='optVat'][value='" + $('#VatOption' + userid).val() + "']").prop('checked', 'checked');
+			$("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked');
+
+
+		});
+		$("#VIEWREVENUE").on("shown.bs.modal", function(e) {
+			var AvlBudAmt = '<?php echo $AvlAmount ?>';
+
+			AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
+			userid = $(e.relatedTarget).data('userid');
+			$('#isEdit').val(1);
+			//alert(userid);
+			var tr = document.getElementById(userid);
+			var cellval = tr.cells;
+			var id = $('#Reqnumber' + userid).val();
+
+			$('#ViewReqNo').val($('#Reqnumber' + userid).val());
+			$('#ViewdeptName').val($('#departmentName' + userid).val());
+			$("#ViewCostCenter").val($('#costCode' + userid).val());
+			$('#ViewAvlBudAmt').val(AvlBudAmt);
+			//
+
+			$('#ViewItemName').val($('#materialName' + userid).val());
+			$('#ViewUOM').val($('#uom' + userid).val());
+			$('#ViewQuantity').val($('#quantity' + userid).val());
+			$('#ViewRate').val($('#itemRate' + userid).val());
+			$('#ViewPer').val($('#per' + userid).val());
+			$('#txtViewBasicValue').val(cellval[7].innerHTML);
+			RequistQuantity = $('#quantity' + userid).val();
+			$('#txtViewDiscount').val($('#DisVal' + userid).val());
+			$('#txtViewAfterDiscount').val($('#AfterDisVal' + userid).val());
+
+			tinyMCE.get('View_Service_Description').setContent($('#service_description' + userid).val());
+			$('#txtViewPackaging').val($('#PackVal' + userid).val());
+			$('#txtViewAfterPackaging').val($('#AfterPackVal' + userid).val());
+
+			$('#txtViewFreight').val($('#FreightVal' + userid).val());
+			$('#txtViewAfterFreight').val($('#AfterFreightVal' + userid).val());
+			$('#txtViewInsurance').val($('#Insval' + userid).val());
+			var FreightType = $('#FreightType' + userid).val();
+			$('#ViewNOOfTrips').val($('#NoOfTrip' + userid).val());
+			if (FreightType == "PER TRIP") {
+				$('#ViewTripsValue').show();
+			} else {
+				$('#ViewTripsValue').hide();
+			}
+			$('#txtViewTotalOrderValue').val($('#TotalOrderValue' + userid).val());
+			$('#ViewAfterCGST').val($('#RevenueAfterCgst' + userid).val());
+			$('#ViewAfterSGST').val($('#RevenueAfterSgst' + userid).val());
+			$('#ViewAfterIGST').val($('#RevenueAfterIgst' + userid).val());
+			$('#ViewCGST').val($('#RevenueCgst' + userid).val());
+			$('#ViewSGST').val($('#RevenueSgst' + userid).val());
+			$('#ViewIGST').val($('#RevenueIgst' + userid).val());
+
+
+
+			$("#ViewMaterialCode").empty();
+			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+			// For Binding Material list center for the selected Requistion Number
+			$("#ViewMaterialCode").val($('#materialCode' + userid).val());
+
+
+			$("#ViewDiscountType").val($('#DisType' + userid).val());
+			$("#drpViewFreight").val($('#FreightType' + userid).val());
+			$("#ViewPackagingType").val($('#PackType' + userid).val())
+
+			$("input:radio[name='optPackaging'][value='" + $('#PackOption' + userid).val() + "']").prop('checked', 'checked');
+			$("input:radio[name='optExcise'][value='" + $('#ExciseOption' + userid).val() + "']").prop('checked', 'checked');
+			$("input:radio[name='optVat'][value='" + $('#VatOption' + userid).val() + "']").prop('checked', 'checked');
+			$("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked');
+
+
+		});
 	});
-	$("#VIEWREVENUE").on("shown.bs.modal", function(e) {
-		var AvlBudAmt = '<?php echo $AvlAmount ?>';
-
-		AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
-		userid = $(e.relatedTarget).data('userid');
-		$('#isEdit').val(1);
-		//alert(userid);
-		var tr = document.getElementById(userid);
-		var cellval = tr.cells;
-		var id = $('#Reqnumber' + userid).val();
-
-		$('#ViewReqNo').val($('#Reqnumber' + userid).val());
-		$('#ViewdeptName').val($('#departmentName' + userid).val());
-		$("#ViewCostCenter").val($('#costCode' + userid).val());
-		$('#ViewAvlBudAmt').val(AvlBudAmt);
-		//
-
-		$('#ViewItemName').val($('#materialName' + userid).val());
-		$('#ViewUOM').val($('#uom' + userid).val());
-		$('#ViewQuantity').val($('#quantity' + userid).val());
-		$('#ViewRate').val($('#itemRate' + userid).val());
-		$('#ViewPer').val($('#per' + userid).val());
-		$('#txtViewBasicValue').val(cellval[7].innerHTML);
-		RequistQuantity = $('#quantity' + userid).val();
-		$('#txtViewDiscount').val($('#DisVal' + userid).val());
-		$('#txtViewAfterDiscount').val($('#AfterDisVal' + userid).val());
-
-		tinyMCE.get('View_Service_Description').setContent($('#service_description' + userid).val());
-		$('#txtViewPackaging').val($('#PackVal' + userid).val());
-		$('#txtViewAfterPackaging').val($('#AfterPackVal' + userid).val());
-
-		$('#txtViewFreight').val($('#FreightVal' + userid).val());
-		$('#txtViewAfterFreight').val($('#AfterFreightVal' + userid).val());
-		$('#txtViewInsurance').val($('#Insval' + userid).val());
-		var FreightType = $('#FreightType' + userid).val();
-		$('#ViewNOOfTrips').val($('#NoOfTrip' + userid).val());
-		if (FreightType == "PER TRIP") {
-			$('#ViewTripsValue').show();
-		} else {
-			$('#ViewTripsValue').hide();
-		}
-		$('#txtViewTotalOrderValue').val($('#TotalOrderValue' + userid).val());
-		$('#ViewAfterCGST').val($('#RevenueAfterCgst' + userid).val());
-		$('#ViewAfterSGST').val($('#RevenueAfterSgst' + userid).val());
-		$('#ViewAfterIGST').val($('#RevenueAfterIgst' + userid).val());
-		$('#ViewCGST').val($('#RevenueCgst' + userid).val());
-		$('#ViewSGST').val($('#RevenueSgst' + userid).val());
-		$('#ViewIGST').val($('#RevenueIgst' + userid).val());
-
-
-
-		$("#ViewMaterialCode").empty();
-		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-		// For Binding Material list center for the selected Requistion Number
-		$("#ViewMaterialCode").val($('#materialCode' + userid).val());
-
-
-		$("#ViewDiscountType").val($('#DisType' + userid).val());
-		$("#drpViewFreight").val($('#FreightType' + userid).val());
-		$("#ViewPackagingType").val($('#PackType' + userid).val())
-
-		$("input:radio[name='optPackaging'][value='" + $('#PackOption' + userid).val() + "']").prop('checked', 'checked');
-		$("input:radio[name='optExcise'][value='" + $('#ExciseOption' + userid).val() + "']").prop('checked', 'checked');
-		$("input:radio[name='optVat'][value='" + $('#VatOption' + userid).val() + "']").prop('checked', 'checked');
-		$("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked');
-
-
-	});
-    });
 </script>
 <script>
 	$('#insurancestatus').change(function() {
@@ -5123,6 +5127,7 @@ $('#RevenueAppend').append(rowHtml);
 			processData: false,
 			success: function(data) {
 				if (data) {
+					console.log(data);
 					alert(data);
 					window.location.reload();
 					// $('#spl').find('td').eq(5).text(filename[2]);
@@ -5166,6 +5171,7 @@ $('#RevenueAppend').append(rowHtml);
 			processData: false,
 			success: function(data) {
 				if (data) {
+					console.log(data);
 					alert(data);
 					window.location.reload();
 					// $('#spl').find('td').eq(5).text(filename[2]);
@@ -5199,6 +5205,7 @@ $('#RevenueAppend').append(rowHtml);
 			processData: false,
 			success: function(data) {
 				if (data) {
+					console.log(data);
 					alert(data);
 					window.location.reload();
 					// $('#spl').find('td').eq(5).text(filename[2]);
@@ -5219,16 +5226,11 @@ $('#RevenueAppend').append(rowHtml);
 			$('#billimag').val('');
 		}
 	}
-</script>
 
-<script>
 	var counter = 0;
 
 	//var counterConstant = 0;
 
-
-
-
 	$("#addmorebutton").click(function() {
 
 		counter++;
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index 95e071f6..4d06754d 100755
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -370,7 +370,7 @@ if (!empty($getlogpodtl)) {
                         <?php } else { ?>
                             <h4><?= "Amended Import Purchase Order - $PONO "; ?></h4>
                         <?php } ?>
-                        <a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-success" id="back" value="Back">Back</a>
+                        <a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-secondary" id="back" value="Back">Back</a>
                     </div>
                 </div>
             </div>
@@ -5338,7 +5338,7 @@ if (!empty($getlogpodtl)) {
                     url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
                     success: function(data) {
                         if (data) {
-                            $('#content').loader('hide');
+                            // $('#content').loader('hide');
                             alert(data);
                         } else {
                             alert("Error");
@@ -5512,7 +5512,7 @@ if (!empty($getlogpodtl)) {
                 return false;
             } else {
                 //alert();
-                $('#content').loader('show');
+                // $('#content').loader('show');
                 var formData = new FormData($('.ImportPO')[0]);
                 formData.append('txtRowCount', Row);
                 formData.append('txtDeletedRow', txtDeletedRow);
@@ -5527,7 +5527,7 @@ if (!empty($getlogpodtl)) {
                     url: "<?php echo base_url() ?>purchaseorder/EditImportPurchaseOrder",
                     success: function(data) {
                         if (data) {
-                            $('#content').loader('hide');
+                            // $('#content').loader('hide');
                             alert(data);
                             $('#txtRowCount').val('');
                             $('#txtDeletedRow').val('');
diff --git a/app/Views/importpo.php b/app/Views/importpo.php
index 3e359e4d..93e4d417 100755
--- a/app/Views/importpo.php
+++ b/app/Views/importpo.php
@@ -12,8 +12,7 @@ $Terms = '';
 
 $t = '';
 if (!empty($staticspecialinstruction)) {
-    $t=$staticspecialinstruction[0]->ConfigValue;
-
+    $t = $staticspecialinstruction[0]->ConfigValue;
 }
 
 
@@ -81,49 +80,200 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
 <script>
     $(document).ready(function() {
-        $("#PaymentTerms").select2();
 
+
+        $('#drpSupplier').change(function() {
+            var id = $('#drpSupplier').val();
+            $("#SupAddress").val('');
+
+
+            if (id != '0') {
+                var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
+                var Payment = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
+                var PaymentID = '';
+                $('#PaymentTerms').empty();
+
+                $.each(y, function(idx, obj) {
+                    if (obj.SupplierID === id) {
+                        if (obj.MSME) {
+                            $("#SupAddress").val("MSME : " + obj.MSME + "\n" + obj.Address);
+                        } else {
+                            $("#SupAddress").val(obj.Address);
+                        }
+                        PaymentID = obj.PaymentID;
+                        //PaymentID = obj.PaymentID;
+                        $('#PaymentTerms').val(obj.PaymentTerms);
+                    }
+                });
+
+
+                if (PaymentID == 'PT08') {
+                    $('#otheroptiondiv').show();
+                    $('#Otherpayment').val('');
+                } else {
+                    $('#otheroptiondiv').hide();
+                    $('#Otherpayment').show();
+                }
+
+                $('#PaymentTerms').empty();
+                var paymentList = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
+
+
+                $.each(paymentList, function(pay, payobj)
+
+                    {
+                        if (payobj.PaymentID == PaymentID) {
+
+                            $("#PaymentTerms").append($('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
+
+                        }
+                        // else
+                        // {
+                        //   // $("#PaymentTerms").append( $('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
+
+                        // }
+
+                    });
+
+                $.each(Payment, function(pay, payobj) {
+                    if (payobj.PaymentID == PaymentID) {
+
+                    } else {
+                        $("#PaymentTerms").append($('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
+
+                    }
+
+                });
+
+
+
+
+            } else {
+                alert('Please select the SupplierID');
+                return false;
+            }
+
+        });
+        $("#editimportpomodel").on("shown.bs.modal", function(e) {
+            userid = $(e.relatedTarget).data('userid');
+            var tr = document.getElementById(userid);
+            var cellval = tr.cells;
+            var id = $('#Reqnumber' + userid).val();
+            $('#EditReqNo').val($('#Reqnumber' + userid).val());
+            $('#EditdeptName').val($('#departmentName' + userid).val());
+            $("#EditCostCenter").val($('#costCode' + userid).val());
+            $('#EditAvlBudAmt').val($('#AvilBudget' + userid).val());
+            $('#EditItemName').val($('#materialName' + userid).val());
+            $('#EditUOM').val($('#uom' + userid).val());
+            var uom = parseFloat($('#uom' + userid).val());
+            $('#EditQuantity').val($('#quantity' + userid).val());
+            RequistQuantity = $('#quantity' + userid).val();
+            var editrate = parseFloat($('#itemRate' + userid).val()).toFixed(2);
+            $('#EditRate').val(editrate);
+            //$('#EditRate').val($('#itemRate'+userid).val());
+            var basic = parseFloat($('#BasicAmt' + userid).val()).toFixed(2);
+            //$('#EdittxtBasicValue').val($('#BasicAmt'+userid).val());
+            //$('#EditimBasicPrice').val($("#BasicAmt"+userid).val());
+            $('#EdittxtBasicValue').val(basic);
+            $('#EditimBasicPrice').val(basic);
+            var inrbasicval = parseFloat($('#BasicPriceINR' + userid).val()).toFixed(2);
+            // $('#EditINRBasicvalue').val($("#BasicPriceINR"+userid).val());
+            $('#EditINRBasicvalue').val(inrbasicval);
+            $('#EditLandingCharge').val($("#LandingChargee" + userid).val());
+            $('#EditAfterLandingCharge').val($("#AfterLandingChargee" + userid).val());
+            $('#EditAfterAssessable').val($("#AfterAssessable" + userid).val());
+            $('#EditCustomduty').val($("#Customduty" + userid).val());
+            $('#EditAfterCustomduty').val($("#AfterCustomduty" + userid).val());
+
+            $('#EditCustomEDcess').val($("#CustomEDcess" + userid).val());
+            $('#EditAfterCustomEDcess').val($("#AfterCustomEDcess" + userid).val());
+            $('#EditCustomSHcess').val($("#CustomSHcess" + userid).val());
+            $('#EditAfterCustomSHcess').val($("#AfterCustomSHcess" + userid).val());
+            $('#EditSubtotal').val($("#Subtotal" + userid).val());
+            $('#EditIgst').val($("#Igst" + userid).val());
+            $('#EditAfterIgst').val($("#AfterIgst" + userid).val());
+            $('#EditGrossdutypayable').val($("#Grossdutypayable" + userid).val());
+            $('#EditGrossexpenses').val($("#Grossexpenses" + userid).val());
+            $('#EditPurQuantity').val($("#PurQuantity" + userid).val());
+            $('#EditCustomDutyExpenses').val($("#CustomDutyExpenses" + userid).val());
+            $('#EditDutyImpact').val($("#Dutyimpact" + userid).val());
+            $('#EditClearingCharges').val($("#ClearingCharges" + userid).val());
+            $('#EditNett').val($("#Nett" + userid).val());
+            var basicinr = parseFloat($('#AfterBasicPriceTax' + userid).val()).toFixed(2);
+            // $('#EditAfterBasicPriceTax').val($("#AfterBasicPriceTax"+userid).val());
+            $('#EditAfterBasicPriceTax').val(basicinr);
+            $('#EditTotalExp').val($("#TotalExp" + userid).val());
+            $('#drpeditFreight').val($('#FreightType' + userid).val());
+            $('#editNOOfTrips').val($('#NoofTrip' + userid).val());
+            $('#txtEditFreight').val($('#FreightRate' + userid).val());
+            $('#edittxtAfterFreight').val($('#AfterFreightRate' + userid).val());
+
+            //$('#edittxtInstruction').val($('#Addinstruction'+userid).val());
+            tinyMCE.get('edittxtInstruction').setContent($('#Addinstruction' + userid).val());
+            var FreightType = $('#drpeditFreight').val();
+            if (FreightType == "PER TRIP") {
+                $('#editTripsValue').show();
+            } else { //alert();
+                $('#editTripsValue').hide();
+            }
+            $('#EditPer').val($('#Per' + userid).val());
+            $('#EditTotalOrderValue').val(cellval[8].innerHTML);
+            $("#EditMaterialCode").empty();
+            var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+            $("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
+            var isAdded = "0";
+            for (i = 0; i < Material.length; i++) {
+                $.each(Material[i], function(idx, obj) {
+                    if (obj.ReqNo === id) {
+                        $.each(SelectedMaterialList.Mat, function(idx1, el) {
+                            if (id == el.ReqNo) {
+                                if (el.materialCode == obj.MaterialCode) {
+                                    isAdded = "1";
+                                    return false;
+                                } else {
+                                    isAdded = "0";
+                                }
+                            }
+                        });
+                        if (isAdded == "0") {
+                            $("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+                        }
+                    }
+                });
+            }
+        });
+        $("#PaymentTerms").select2();
         tinymce.init({
             selector: "textarea#txtSpcialInstruction",
-
             menubar: false,
             statusbar: false,
             toolbar: false,
-
             setup: function(ed) {
-                
                 ed.on('init', function(evt) {
                     ed.setContent('<?php echo $t; ?>');
                 });
             }
         });
 
-
         tinymce.init({
             selector: "textarea#addtxtInstruction",
-
             menubar: false,
             statusbar: false,
             toolbar: false
         });
 
-
-
         tinymce.init({
             selector: "textarea#edittxtInstruction",
-
             menubar: false,
             statusbar: false,
             toolbar: false
         });
         //Initialize Select2 Elements for currency type
         $("#currencytype").select2();
-
         var POMaxDate = '<?php echo $MaxPoDate; ?>';
         var d = new Date(POMaxDate);
         var t = '<?php echo $CurrentDate; ?>';
         var m = new Date(t);
-
         $("#PODate").datepicker({
             minDate: d,
             maxDate: 'now',
@@ -250,7 +400,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                 <div class="col-12">
                     <div class="page-title-box page-title-box-alt">
                         <h4><?= "Import Purchase Order"; ?></h4>
-                        <a href="<?php echo base_url() ?>CreatePO" class="btn btn-success" id="back" value="Back">Back</a>
+                        <a href="<?php echo base_url() ?>CreatePO" class="btn btn-secondary" id="back" value="Back">Back</a>
                     </div>
                 </div>
             </div>
@@ -267,20 +417,22 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                             <div class="form-row">
                                 <div class="form-group col-md-3">
                                     <label>Requistion No</label>
-                                    <?php
+                                    <div>
+                                        <?php
 
-                                    $options = array("0" => 'Selected Requisition Numbers');
-                                    if (!empty($ReqList)) {
-                                        foreach ($ReqList as $SID) :
+                                        $options = array("0" => 'Selected Requisition Numbers');
+                                        if (!empty($ReqList)) {
+                                            foreach ($ReqList as $SID) :
 
-                                            // print_r($SID->ReqNo);
-                                            $options[$SID->ReqNo] = $SID->ReqNo . "-" . $SID->ReqBy;
-                                            $ReqType = $SID->ReqType;
-                                        endforeach;
-                                    }
-                                    echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo" required="true"');
+                                                // print_r($SID->ReqNo);
+                                                $options[$SID->ReqNo] = $SID->ReqNo . "-" . $SID->ReqBy;
+                                                $ReqType = $SID->ReqType;
+                                            endforeach;
+                                        }
+                                        echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo" class="form-control" required="true"');
 
-                                    ?>
+                                        ?>
+                                    </div>
                                 </div>
                                 <div class="form-group col-md-3">
                                     <label>Purchase Order Type</label>
@@ -562,11 +714,11 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                 </div>
                             </div>
                             <div class="form-row">
-								<div class="form-group col-md-12 text-right">
+                                <div class="form-group col-md-12 text-right">
                                     <!-- <input type="checkbox" id="IsOpenOrder"  name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT -->
                                     <a data-toggle="modal" class="btn btn-success" data-dismiss="modal" onclick="openModal();">Select Line Item </a>
-								</div>
-							</div>
+                                </div>
+                            </div>
                             <br />
                             <div class="form-row">
                                 <table id="ImportTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
@@ -683,7 +835,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                             </div>
 
 
-                          
+
 
 
 
@@ -691,12 +843,18 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                             <div class="form-row">
                                 <div class="form-group col-md-12">
                                     <label>Special Instructions :</label>
-                                     <?php
-                                        
-                                        $data = array('name' => 'txtSpcialInstruction', 'value' => set_value(field: 'txtSpcialInstruction'),
-                                         'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
-                                        echo form_textarea(data: $data);
-                                        ?>
+                                    <?php
+
+                                    $data = array(
+                                        'name' => 'txtSpcialInstruction',
+                                        'value' => set_value(field: 'txtSpcialInstruction'),
+                                        'id' => 'txtSpcialInstruction',
+                                        'class' => 'form-control',
+                                        'rows' => '10',
+                                        'cols' => '40'
+                                    );
+                                    echo form_textarea(data: $data);
+                                    ?>
                                 </div>
 
 
@@ -705,14 +863,14 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
 
 
-                           
+
                             <div class="form-row">
                                 <div class="form-group col-md-12">
-                                <label>
-                                   Select Purchase Order File
-                                </label>
-                                <br>
-                                  <input type="file" name="POFile" id="POFile"><br>
+                                    <label>
+                                        Select Purchase Order File
+                                    </label>
+                                    <br>
+                                    <input type="file" name="POFile" id="POFile"><br>
                                 </div>
                             </div>
                             <br><br>
@@ -720,35 +878,35 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
 
 
-                            <div class="form-row" >
+                            <div class="form-row">
 
-                             <div class="form-group col-md-4">
-                                <a class="btn btn-success Save" ID="Save" onclick="Save(0)"> 
-                                    <span class="bold">Save as Draft</span> 
-                                </a>
-                             </div>
+                                <div class="form-group col-md-4">
+                                    <a class="btn btn-success Save" ID="Save" onclick="Save(0)">
+                                        <span class="bold">Save as Draft</span>
+                                    </a>
+                                </div>
 
-                             <div class="form-group col-md-4">
-                           
-                             </div>
+                                <div class="form-group col-md-4">
+
+                                </div>
 
                                 <div class="form-group col-md-4" align="right">
-                                   
-                                    <input type="hidden" name="txtPoRange" id="txtPoRange"/>
-                                    <input type="hidden" name="isEdit" id="isEdit" value="0"/>
-                                    <input type="hidden" name="txtStatus" id="txtStatus"/>
-                                    <input type="hidden" name="txtRowCount" id="txtRowCount"/>
-                                    <input type="hidden" name="txtDeletedRow" id="txtDeletedRow"/>
+
+                                    <input type="hidden" name="txtPoRange" id="txtPoRange" />
+                                    <input type="hidden" name="isEdit" id="isEdit" value="0" />
+                                    <input type="hidden" name="txtStatus" id="txtStatus" />
+                                    <input type="hidden" name="txtRowCount" id="txtRowCount" />
+                                    <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
 
                                     <input type="hidden" name="Budget" id="Budget" />
                                     <input type="reset" class="btn btn-success" value="Reset" onclick="window.location.reload()">
-                                   
+
                                     <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">
                                         <span class="bold">Submit</span>
                                     </a>
 
                                 </div>
-                                
+
                             </div>
                         </div> <!-- end card body-->
                     </div> <!-- end card -->
@@ -844,7 +1002,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
                             </div>
 
-                           <div class="form-group col-md-3">
+                            <div class="form-group col-md-3">
                                 <label>Item Name</label>
                                 <div>
                                     <?php
@@ -862,65 +1020,65 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                     ?>
                                 </div>
                             </div>
-                            
-                                <div class="form-group col-md-3">
-                                    <label>Quantity<span class="text-danger">*</span></label>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange(),ExceedQuantityCheck(),calculateFreight(0)');
-                                        echo form_input($data);
 
-                                        ?>
-                                    </div>
-                                
+                            <div class="form-group col-md-3">
+                                <label>Quantity<span class="text-danger">*</span></label>
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange(),ExceedQuantityCheck(),calculateFreight(0)');
+                                    echo form_input($data);
+
+                                    ?>
+                                </div>
+
 
 
                             </div>
                         </div>
 
                         <div class="form-row">
-                             
-                        <div class="form-group col-md-3">
 
-                        </div> 
+                            <div class="form-group col-md-3">
 
-                        <div class="form-group col-md-3">
-                                    <!-- <P id=labelRate> --> <label id=labelRate><?php echo "Rate in"; ?> <span class="text-danger">*</span></label><!-- </P> -->
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange(),validateExceedLimit(),calculateFreight(0)');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
+                            </div>
+
+                            <div class="form-group col-md-3">
+                                <!-- <P id=labelRate> --> <label id=labelRate><?php echo "Rate in"; ?> <span class="text-danger">*</span></label><!-- </P> -->
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange(),validateExceedLimit(),calculateFreight(0)');
+                                    echo form_input($data);
+                                    ?>
                                 </div>
+                            </div>
 
-                                <div class="form-group col-md-3">
-                                    <label>Per</label> <?php
-                                                        $data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer',  'class' => 'form-control');
-                                                        echo form_input($data); ?>
-                                </div>
-
-                                <div class="form-group col-md-3" >
-                                    <!--<label>Basic Amount </label>-->
-                                    <!--  <p id=label2> --> <label id=label2><?php echo "Basic Value In"; ?></label><!-- </p> -->
-                                    <div>
-                                        <?php
-                                        //$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
-
-                                        $data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
+                            <div class="form-group col-md-3">
+                                <label>Per</label> <?php
+                                                    $data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer',  'class' => 'form-control');
+                                                    echo form_input($data); ?>
+                            </div>
+
+                            <div class="form-group col-md-3">
+                                <!--<label>Basic Amount </label>-->
+                                <!--  <p id=label2> --> <label id=label2><?php echo "Basic Value In"; ?></label><!-- </p> -->
+                                <div>
+                                    <?php
+                                    //$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
+
+                                    $data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
                                 </div>
+                            </div>
                         </div>
 
 
 
                         <div class="form-row">
 
-                        <div class="form-group col-md-3">
-                            
-                            </div> 
+                            <div class="form-group col-md-3">
+
+                            </div>
 
                             <div class="form-group col-md-3">
                                 <!--  <p id=labelBasicpriceus>  --> <label id=labelBasicpriceus><?php echo "Basic Price  In"; ?></label><!-- </p> -->
@@ -967,382 +1125,380 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                              <a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
                                      </div>-->
 
-                          
+
                         </div>
 
 
                         <div class="form-row " style="border:1px solid #000;padding:10px;margin-top:15px;">
-                                <br />
-                                <div class="form-group col-md-6" style="padding:15px;">
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!--  Basic Price: -->
-                                            <label>Basic Price (<?php echo $INR ?>)</label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div style="display:none;">
-                                                <?php
-                                                $data = array('name' => 'BasicPriceTax', 'value' => set_value('BasicPriceTax'), 'id' => 'BasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Landing charge -->
-                                            <label><?php echo "Landing Charge ($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'LandingCharge', 'value' => set_value('LandingCharge', 0), 'id' => 'LandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Calculateloadingcharge()');
-                                                echo form_input($data);
-
-
-
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge', 0), 'id' => 'AfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- High seas sales charge -->
-                                            <label><?php echo "Assessable Value (A)($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div style="display: none">
-                                                <?php
-                                                $data = array('name' => 'Assessable ', 'value' => set_value('Assessable', 0), 'id' => 'Assessable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateHighseassalescharge()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'AfterAssessable', 'value' => set_value('AfterAssessable', 0), 'id' => 'AfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Custom duty : (a) -->
-                                            <label><?php echo "Custom duty (B)($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'Customduty', 'value' => set_value('Customduty', 0), 'id' => 'Customduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomduty()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'AfterCustomduty', 'value' => set_value('AfterCustomduty', 0), 'id' => 'AfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-
-
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Custom ED_cess : (e) -->
-                                            <label><?php echo "Custom ED_cess (C) ($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'CustomEDcess', 'value' => set_value('CustomEDcess', 0), 'id' => 'CustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomEdcess()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess', 0), 'id' => 'AfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Custom S & H cess : (f) -->
-                                            <label><?php echo "Custom S & H cess (D)($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'CustomSHcess', 'value' => set_value('CustomSHcess', 0), 'id' => 'CustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomSHcess()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'AfterCustomSHcess', 'value' => set_value('AfterCustomSHcess', 0), 'id' => 'AfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="form-group col-md-6" style="padding:15px;">
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Additional Excise duty : (g) -->
-                                            <label><?php echo "Subtotal (E)($INR)  (A+B+C+D)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div style="display: none;">
-                                                <?php
-                                                $data = array('name' => 'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty', 0), 'id' => 'AdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateaddlExciseDuty(),CalculateAvlModvat(),CalculateGrossExpense()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'Subtotal', 'value' => set_value('Subtotal', 0), 'id' => 'Subtotal',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Additional Excise duty : (g) -->
-                                            <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'Igst ', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateIgst()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <div class="form-row">
-                                        <div class="form-group col-md-8">
-                                            <!-- Gross duty payable -->
-                                            <label><?php echo "Total Duty (G)($INR)   (B+C+D+F)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'Grossdutypayable ', 'value' => set_value('Grossdutypayable', 0), 'id' => 'Grossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'onchange' => 'CalculateAvlModvat()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-
-
-                                    <br>
-
-                                    <div class="form-row" style="padding:0px;">
-                                        <div class="form-group col-md-4">
-                                            <label>Freight Type </label>
-                                            <div>
-                                                <?php
-                                                $options = array("0" => 'Select Freight Type');
-                                                //print_r(  $options);
-
-                                                if (!empty($FreightType)) {
-                                                    foreach ($FreightType as $SID) :
-
-
-                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-                                                    endforeach;
-                                                }
-
-                                                echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
-
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-3" id="TripsValue" style="display:none;">
-                                            <label>NO Of Trips</label>
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <label>Freight Rate </label>
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
-                                        <div class="form-group col-md-4" style="padding-left: 0px;">
-                                            <label>Freight Amt In <?php echo $INR; ?></label>
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
-                                    </div>
-
-                                    <br>
-                                    <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
-                                    <hr>
-                                    <br>
-                                   
-
-                                    
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <label>Duty Impact</label>
-
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact', 0), 'id' => 'DutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4" style="margin-top: -4.8%">
-                                            <label>Quantity</label>
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
-                                    </div>
-
-                                    <div class="form-row">
-
-                                        <div class="form-group col-md-4">
-                                            <!-- Custom Duty Expenses -->
-                                            <label><?php echo "Custom Duty($INR)/UOM"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses', 0), 'id' => 'CustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
-                                    </div>
-
-                                    <div class="form-row mt-2">
-                                        <div class="form-group col-md-4">
-                                            <!-- RMC Including Customers -->
-                                            <label><?php echo "Clearing Charges($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges', 0), 'id' => 'ClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
-                                
-                                        <div class="form-group col-md-4" style="margin-top: -4.8%">
-                                             <!-- RMC Including Customers -->
-                                        <label><?php echo "Nett per UOM($INR)"; ?></label>
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
-
-
-
-
-                                        <div class="form-group col-md-4" style="display:none;">
-                                            <!--  Total Amount: -->
-
-                                            <label id=labelTotalAmount>Total Amount</label>
-                                        </div>
-                                        <div class="form-group col-md-4" style="display: none;">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'TotalExp', 'value' => set_value('TotalExp', 0), 'id' => 'TotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
-                                    </div>
-
-
-
-
-                                </div>
-                            </div>
-
-
-                            <div class="form-row mt-3">
+                            <br />
+                            <div class="form-group col-md-6" style="padding:15px;">
                                 <div class="form-row">
-                                    <label style="text-align: left;">Import Description :</label>
-                                    <?php
-                                    $data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
-                                    echo form_textarea($data);
-                                    ?>
+                                    <div class="form-group col-md-4">
+                                        <!--  Basic Price: -->
+                                        <label>Basic Price (<?php echo $INR ?>)</label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display:none;">
+                                            <?php
+                                            $data = array('name' => 'BasicPriceTax', 'value' => set_value('BasicPriceTax'), 'id' => 'BasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Landing charge -->
+                                        <label><?php echo "Landing Charge ($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'LandingCharge', 'value' => set_value('LandingCharge', 0), 'id' => 'LandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Calculateloadingcharge()');
+                                            echo form_input($data);
+
+
+
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge', 0), 'id' => 'AfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- High seas sales charge -->
+                                        <label><?php echo "Assessable Value (A)($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display: none">
+                                            <?php
+                                            $data = array('name' => 'Assessable ', 'value' => set_value('Assessable', 0), 'id' => 'Assessable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateHighseassalescharge()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'AfterAssessable', 'value' => set_value('AfterAssessable', 0), 'id' => 'AfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Custom duty : (a) -->
+                                        <label><?php echo "Custom duty (B)($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'Customduty', 'value' => set_value('Customduty', 0), 'id' => 'Customduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomduty()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'AfterCustomduty', 'value' => set_value('AfterCustomduty', 0), 'id' => 'AfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Custom ED_cess : (e) -->
+                                        <label><?php echo "Custom ED_cess (C) ($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'CustomEDcess', 'value' => set_value('CustomEDcess', 0), 'id' => 'CustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomEdcess()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess', 0), 'id' => 'AfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Custom S & H cess : (f) -->
+                                        <label><?php echo "Custom S & H cess (D)($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'CustomSHcess', 'value' => set_value('CustomSHcess', 0), 'id' => 'CustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomSHcess()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'AfterCustomSHcess', 'value' => set_value('AfterCustomSHcess', 0), 'id' => 'AfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
 
+                            <div class="form-group col-md-6" style="padding:15px;">
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Additional Excise duty : (g) -->
+                                        <label><?php echo "Subtotal (E)($INR)  (A+B+C+D)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display: none;">
+                                            <?php
+                                            $data = array('name' => 'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty', 0), 'id' => 'AdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateaddlExciseDuty(),CalculateAvlModvat(),CalculateGrossExpense()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'Subtotal', 'value' => set_value('Subtotal', 0), 'id' => 'Subtotal',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Additional Excise duty : (g) -->
+                                        <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'Igst ', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateIgst()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-8">
+                                        <!-- Gross duty payable -->
+                                        <label><?php echo "Total Duty (G)($INR)   (B+C+D+F)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'Grossdutypayable ', 'value' => set_value('Grossdutypayable', 0), 'id' => 'Grossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'onchange' => 'CalculateAvlModvat()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+
+                                <br>
+
+                                <div class="form-row" style="padding:0px;">
+                                    <div class="form-group col-md-4">
+                                        <label>Freight Type </label>
+                                        <div>
+                                            <?php
+                                            $options = array("0" => 'Select Freight Type');
+                                            //print_r(  $options);
+
+                                            if (!empty($FreightType)) {
+                                                foreach ($FreightType as $SID) :
+
+
+                                                    $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+                                                endforeach;
+                                            }
+
+                                            echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
+
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-3" id="TripsValue" style="display:none;">
+                                        <label>NO Of Trips</label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <label>Freight Rate </label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group col-md-4" style="padding-left: 0px;">
+                                        <label>Freight Amt In <?php echo $INR; ?></label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+
+                                <br>
+                                <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
+                                <hr>
+                                <br>
+
+
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <label>Duty Impact</label>
+
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact', 0), 'id' => 'DutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4" style="margin-top: -4.8%">
+                                        <label>Quantity</label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+
+                                <div class="form-row">
+
+                                    <div class="form-group col-md-4">
+                                        <!-- Custom Duty Expenses -->
+                                        <label><?php echo "Custom Duty($INR)/UOM"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses', 0), 'id' => 'CustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+
+                                <div class="form-row mt-2">
+                                    <div class="form-group col-md-4">
+                                        <!-- RMC Including Customers -->
+                                        <label><?php echo "Clearing Charges($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges', 0), 'id' => 'ClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+
+                                    <div class="form-group col-md-4" style="margin-top: -4.8%">
+                                        <!-- RMC Including Customers -->
+                                        <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+
+
+
+
+                                    <div class="form-group col-md-4" style="display:none;">
+                                        <!--  Total Amount: -->
+
+                                        <label id=labelTotalAmount>Total Amount</label>
+                                    </div>
+                                    <div class="form-group col-md-4" style="display: none;">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'TotalExp', 'value' => set_value('TotalExp', 0), 'id' => 'TotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+
+
+
+
+                            </div>
+                        </div>
+
+
+                        <div class="form-group col-md-4" style="margin-top:10px;">
+                            <label>Import Description </label>
+                            <?php
+                            $data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
+                            echo form_textarea($data);
+                            ?>
+                        </div>
+
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -1465,57 +1621,57 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                 </div>
                             </div>
                             <div class="form-group col-md-3">
-                                    <label>Quantity<span class="text-danger">*</span></label>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),ExceedEditQuantityCheck(),calculateFreight(1)');
-                                        echo form_input($data);
+                                <label>Quantity<span class="text-danger">*</span></label>
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),ExceedEditQuantityCheck(),calculateFreight(1)');
+                                    echo form_input($data);
 
-                                        ?>
-                                    </div>
+                                    ?>
                                 </div>
-                          
+                            </div>
+
                         </div>
 
                         <div class="form-row">
                             <div class="form-group col-md-3"></div>
-                              <div class="form-group col-md-3">
-                                   <!-- <P id=labelEditRate> --> <label id=labelEditRate><?php echo "Rate in"; ?> <span class="text-danger">*</span></label><!-- </P> -->
-                                   <!-- <label>Rate </label> -->
-                                   <div>
-                                       <?php
-                                       $data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),calculateFreight(1)');
-                                       echo form_input($data);
+                            <div class="form-group col-md-3">
+                                <!-- <P id=labelEditRate> --> <label id=labelEditRate><?php echo "Rate in"; ?> <span class="text-danger">*</span></label><!-- </P> -->
+                                <!-- <label>Rate </label> -->
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),calculateFreight(1)');
+                                    echo form_input($data);
 
 
 
 
-                                       ?>
-                                   </div>
-                               </div>
-                               <div class="form-group col-md-3">
-                                   <label>Per</label> <?php
-                                                       $data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
-                                                       echo form_input($data); ?>
-                               </div>
-                               <div class="form-group col-md-3" >
-                                   <!-- <p id=label3> --><label id=label3><?php echo "Basic Value In"; ?></label><!-- </p> -->
-                                   <div>
-                                       <?php
-                                       //$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="form-group col-md-3">
+                                <label>Per</label> <?php
+                                                    $data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
+                                                    echo form_input($data); ?>
+                            </div>
+                            <div class="form-group col-md-3">
+                                <!-- <p id=label3> --><label id=label3><?php echo "Basic Value In"; ?></label><!-- </p> -->
+                                <div>
+                                    <?php
+                                    //$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
 
-                                       $data = array('name' => 'EdittxtBasicValue', 'value' => set_value('EdittxtBasicValue'), 'id' => 'EdittxtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
-                                       echo form_input($data);
-                                       ?>
-                                   </div>
-                               </div>
+                                    $data = array('name' => 'EdittxtBasicValue', 'value' => set_value('EdittxtBasicValue'), 'id' => 'EdittxtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
                         </div>
 
                         <div class="form-row">
 
-                        <div class="form-group col-md-3">
+                            <div class="form-group col-md-3">
 
-                        </div>
+                            </div>
 
                             <div class="form-group col-md-3">
                                 <!-- <p id=labelEditBasicPriceUs> --><label id=labelEditBasicPriceUs><?php echo "Basic Value In"; ?></label><!-- </p> -->
@@ -1562,365 +1718,365 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                              <a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
                                      </div>-->
 
-                            
+
                         </div>
 
                         <div class="form-row" style="border:1px solid #000;padding:10px;margin-top:15px;">
-                                <br />
-                                <div class="form-group col-md-6" style="padding:15px;">
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Basic Price: -->
-                                            <label><?php echo "Basic Price($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div style="display:none;">
-                                                <?php
-                                                $data = array('name' => 'EditBasicPriceTax', 'value' => set_value('EditBasicPriceTax'), 'id' => 'EditBasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
+                            <br />
+                            <div class="form-group col-md-6" style="padding:15px;">
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Basic Price: -->
+                                        <label><?php echo "Basic Price($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display:none;">
+                                            <?php
+                                            $data = array('name' => 'EditBasicPriceTax', 'value' => set_value('EditBasicPriceTax'), 'id' => 'EditBasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
+                                            echo form_input($data);
+                                            ?>
                                         </div>
                                     </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Landing charge -->
-                                            <label><?php echo "Landing Charge($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateloadingcharge()');
-                                                echo form_input($data);
-
-
-
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- High seas sales charge -->
-                                            <label><?php echo "Assessable Value (A) ($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div style="display: none">
-                                                <?php
-                                                $data = array('name' => 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateHighseassalescharge()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!--  Custom duty : (a) -->
-                                            <label><?php echo "Custom duty (B) ($INR)" ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomduty()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Custom ED_cess : (e) -->
-                                            <label><?php echo "Custom ED_cess (C)($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomEdcess()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Custom S & H cess : (f) -->
-                                            <label><?php echo "Custom S & H cess (D)($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomSHcess()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
                                         </div>
                                     </div>
                                 </div>
-                                <div class="form-group col-md-6" style="padding:15px;">
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Additional Excise duty : (g) -->
-                                            <label><?php echo "Subtotal (E)($INR)  (A+B+C+D)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div style="display: none;">
-                                                <?php
-                                                $data = array('name' => 'EditAdditionalExciseduty ', 'value' => set_value('EditAdditionalExciseduty'), 'id' => 'EditAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Landing charge -->
+                                        <label><?php echo "Landing Charge($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateloadingcharge()');
+                                            echo form_input($data);
+
+
+
+                                            ?>
                                         </div>
                                     </div>
-
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Additional Excise duty : (g) -->
-                                            <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditIgst ', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
                                         </div>
                                     </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-8">
-                                            <!-- Gross duty payable -->
-                                            <label><?php echo "Total Duty (G)($INR)   (B+C+D+E)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- High seas sales charge -->
+                                        <label><?php echo "Assessable Value (A) ($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display: none">
+                                            <?php
+                                            $data = array('name' => 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateHighseassalescharge()');
+                                            echo form_input($data);
+                                            ?>
                                         </div>
                                     </div>
-                                    <!--Start of Adding of Frieght model-->
-                                    <div class="form-row" style="padding:0px;">
-                                        <div class="form-group col-md-3">
-                                            <label>Freight Type </label>
-                                            <div>
-                                                <?php
-                                                $options = array("0" => 'Select Freight Type');
-                                                //print_r(  $options);
-
-                                                if (!empty($FreightType)) {
-                                                    foreach ($FreightType as $SID) :
-
-
-                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-                                                    endforeach;
-                                                }
-
-                                                echo form_dropdown('drpeditFreight', $options, set_value('drpeditFreight'), 'id="drpeditFreight" class="form-control "');
-
-                                                ?>
-                                            </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
                                         </div>
-                                        <div class="form-group col-md-3" id="editTripsValue" style="display:none;">
-                                            <label>NO Of Trips</label>
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'editNOOfTrips', 'value' => set_value('editNOOfTrips'), 'id' => 'editNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
-                                        <div class="form-group col-md-3">
-                                            <label>Freight Rate </label>
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
-                                        <div class="form-group col-md-3" style="padding-left: 0px;">
-                                            <label>Freight Amt In <?php echo $INR; ?></label>
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'edittxtAfterFreight', 'value' => set_value('edittxtAfterFreight'), 'id' => 'edittxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
                                     </div>
-                                    <!--End of Adding of freight in edit model -->
-
-
-                                    <br>
-                                    <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
-                                    <hr>
-                                    <br>
-                                   
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <label>Duty Impact </label>
-                                            <!-- <p id=labelEditPurchaseRate><label><?php echo "purchase rate [Basic]/" ?></label>   -->
-
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4" style="margin-top: -4.8%">
-                                            <label>Quantity</label>
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!--  Custom duty : (a) -->
+                                        <label><?php echo "Custom duty (B) ($INR)" ?></label>
                                     </div>
-                                    <div class="form-row">
-
-                                        <div class="form-group col-md-4">
-                                            <!-- Custom Duty Expenses -->
-                                            <label><?php echo "Custom Duty($INR) /UOM" ?></label>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomduty()');
+                                            echo form_input($data);
+                                            ?>
                                         </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
                                     </div>
-
-                                    <div class="form-row mt-2">
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                  <!-- RMC Including Customers -->
-                                                  <label><?php echo "Clearing Charges ($INR)"; ?></label>
-                                                <?php
-                                                $data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Custom ED_cess : (e) -->
+                                        <label><?php echo "Custom ED_cess (C)($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomEdcess()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Custom S & H cess : (f) -->
+                                        <label><?php echo "Custom S & H cess (D)($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomSHcess()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
                                         </div>
-
-
-
-
-                                        <div class="form-group col-md-4">
-                                            <!-- RMC Including Customers -->
-                                            <label><?php echo "Nett per UOM($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div>
-                                                <?php
-                                                $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
-
-
-
-
-
-
-
-                                        <div class="form-group col-md-4" style="display:none;">
-                                            <!-- Total Amount: -->
-                                            <label id=labelEditTotalAmount>Total Amount</label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div style="display: none;">
-                                                <?php
-                                                $data = array('name' => 'EditTotalExp', 'value' => set_value('EditTotalExp'), 'id' => 'EditTotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
                                     </div>
-
-
                                 </div>
                             </div>
+                            <div class="form-group col-md-6" style="padding:15px;">
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Additional Excise duty : (g) -->
+                                        <label><?php echo "Subtotal (E)($INR)  (A+B+C+D)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display: none;">
+                                            <?php
+                                            $data = array('name' => 'EditAdditionalExciseduty ', 'value' => set_value('EditAdditionalExciseduty'), 'id' => 'EditAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Additional Excise duty : (g) -->
+                                        <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditIgst ', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-8">
+                                        <!-- Gross duty payable -->
+                                        <label><?php echo "Total Duty (G)($INR)   (B+C+D+E)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <!--Start of Adding of Frieght model-->
+                                <div class="form-row" style="padding:0px;">
+                                    <div class="form-group col-md-3">
+                                        <label>Freight Type </label>
+                                        <div>
+                                            <?php
+                                            $options = array("0" => 'Select Freight Type');
+                                            //print_r(  $options);
+
+                                            if (!empty($FreightType)) {
+                                                foreach ($FreightType as $SID) :
+
+
+                                                    $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+                                                endforeach;
+                                            }
+
+                                            echo form_dropdown('drpeditFreight', $options, set_value('drpeditFreight'), 'id="drpeditFreight" class="form-control "');
+
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-3" id="editTripsValue" style="display:none;">
+                                        <label>NO Of Trips</label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'editNOOfTrips', 'value' => set_value('editNOOfTrips'), 'id' => 'editNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group col-md-3">
+                                        <label>Freight Rate </label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group col-md-3" style="padding-left: 0px;">
+                                        <label>Freight Amt In <?php echo $INR; ?></label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'edittxtAfterFreight', 'value' => set_value('edittxtAfterFreight'), 'id' => 'edittxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+                                <!--End of Adding of freight in edit model -->
+
+
+                                <br>
+                                <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
+                                <hr>
+                                <br>
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <label>Duty Impact </label>
+                                        <!-- <p id=labelEditPurchaseRate><label><?php echo "purchase rate [Basic]/" ?></label>   -->
+
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4" style="margin-top: -4.8%">
+                                        <label>Quantity</label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+                                <div class="form-row">
+
+                                    <div class="form-group col-md-4">
+                                        <!-- Custom Duty Expenses -->
+                                        <label><?php echo "Custom Duty($INR) /UOM" ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+
+                                <div class="form-row mt-2">
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <!-- RMC Including Customers -->
+                                            <label><?php echo "Clearing Charges ($INR)"; ?></label>
+                                            <?php
+                                            $data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+
+
+
+                                    <div class="form-group col-md-4">
+                                        <!-- RMC Including Customers -->
+                                        <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+
+
+
+
+
+
+
+                                    <div class="form-group col-md-4" style="display:none;">
+                                        <!-- Total Amount: -->
+                                        <label id=labelEditTotalAmount>Total Amount</label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display: none;">
+                                            <?php
+                                            $data = array('name' => 'EditTotalExp', 'value' => set_value('EditTotalExp'), 'id' => 'EditTotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+
+
+                            </div>
+                        </div>
 
                         <div class="form-row mt-3">
                             <div class="form-row">
@@ -2054,84 +2210,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
 
 
-    $('#drpSupplier').change(function() {
-
-        var id = $('#drpSupplier').val();
-        $("#SupAddress").val('');
-
-
-        if (id != '0') {
-            var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
-            var Payment = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
-            var PaymentID = '';
-            $('#PaymentTerms').empty();
-
-            $.each(y, function(idx, obj) {
-                if (obj.SupplierID === id) {
-                    if (obj.MSME) {
-                        $("#SupAddress").val("MSME : " + obj.MSME + "\n" + obj.Address);
-                    } else {
-                        $("#SupAddress").val(obj.Address);
-                    }
-                    PaymentID = obj.PaymentID;
-                    //PaymentID = obj.PaymentID;
-                    $('#PaymentTerms').val(obj.PaymentTerms);
-                }
-            });
-
-
-            if (PaymentID == 'PT08') {
-                $('#otheroptiondiv').show();
-                $('#Otherpayment').val('');
-            } else {
-                $('#otheroptiondiv').hide();
-                $('#Otherpayment').show();
-            }
-
-            $('#PaymentTerms').empty();
-            var paymentList = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
-
-
-            $.each(paymentList, function(pay, payobj)
-
-                {
-                    if (payobj.PaymentID == PaymentID) {
-
-                        $("#PaymentTerms").append($('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
-
-                    }
-                    // else
-                    // {
-                    //   // $("#PaymentTerms").append( $('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
-
-                    // }
-
-                });
-
-            $.each(Payment, function(pay, payobj) {
-                if (payobj.PaymentID == PaymentID) {
-
-                } else {
-                    $("#PaymentTerms").append($('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
-
-                }
-
-            });
-
-
-
-
-        } else {
-            alert('Please select the SupplierID');
-            return false;
-        }
-
-    });
-
-
-
-
-
     $('#currencytype').change(function() {
         $('#ExchangeRate').val('');
     });
@@ -2347,7 +2425,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
     }
 
     function Ratechange() {
-        //alert();
+        // alert();
         // if($('#ReqNo').val() == "0")
         //      {
         //          alert('Please select the Requisition Number');
@@ -3274,7 +3352,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
     $('.AddImport').click(function() {
 
-        //alert('out');
+        // alert('out');
         if (validateImport() && ExceedQuantityCheck() && validateExceedLimit() && QtyZerocheck()) {
             //alert('in');
 
@@ -3374,33 +3452,33 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
             //     PendingQty: pendingqty
             // }));
             var rowHtml = `
-    <tr id="${temp}">
-        <td align="left">${temp}</td>
-        <td align="left">${Reqnumber}</td>
-        <td align="left">${materialCode}</td>
-        <td align="left">${materialName}</td>
-        <td align="left">${quantity}</td>
-        <td align="left">${uom}</td>
-        <td align="left">${itemRate}</td>
-        <td align="left">${BasicAmt}</td>
-        <td align="left">${taxexp}</td>
-        <td align="left">${totalexp}</td>
-        <td align="left">${receivedqty}</td>
-        <td align="left">${rejectedqty}</td>
-        <td align="left">${pendingqty}</td>
-        <td>
-            <a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel">
-                <i class="ri-pencil-fill" data-toggle="tooltip"></i>
-            </a>&nbsp;&nbsp;&nbsp;
-            <a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
-                <span class="ri-delete-bin-7-fill"></span>
-            </a>
-        </td>
-    </tr>
-`;
+                <tr id="${temp}">
+                    <td align="left">${temp}</td>
+                    <td align="left">${Reqnumber}</td>
+                    <td align="left">${materialCode}</td>
+                    <td align="left">${materialName}</td>
+                    <td align="left">${quantity}</td>
+                    <td align="left">${uom}</td>
+                    <td align="left">${itemRate}</td>
+                    <td align="left">${BasicAmt}</td>
+                    <td align="left">${taxexp}</td>
+                    <td align="left">${totalexp}</td>
+                    <td align="left">${receivedqty}</td>
+                    <td align="left">${rejectedqty}</td>
+                    <td align="left">${pendingqty}</td>
+                    <td>
+                        <a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel">
+                            <i class="ri-pencil-fill" data-toggle="tooltip"></i>
+                        </a>&nbsp;&nbsp;&nbsp;
+                        <a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
+                            <span class="ri-delete-bin-7-fill"></span>
+                        </a>
+                    </td>
+                </tr>
+            `;
 
-// Append the generated row HTML to the target element
-$('#ImportAppend').append(rowHtml);
+            // Append the generated row HTML to the target element
+            $('#ImportAppend').append(rowHtml);
 
             //alert(JSON.strigify(BasicAmt));
 
@@ -3481,11 +3559,12 @@ $('#ImportAppend').append(rowHtml);
             //addHidden(theForm,"AfterBasicPriceTax"+temp,AfterBasicPriceTax);
             $('#txtRowCount').val(temp);
             clearTaxField();
-
-
+            $('#IMPORT').modal('hide');
+            setTimeout(() => {
+                alert('Line Item Added SuccesFully..');
+            }, 1000);
         }
 
-
     });
 
 
@@ -3599,10 +3678,10 @@ $('#ImportAppend').append(rowHtml);
 
     function clearTaxField() {
         //$('#AfterBasicPriceTax').val('');
-        // $('#ReqNo').val('');
-        //$('#deptName').val('');
-        //$('#CostCenter').val('');
-        //$('#AvlBudAmt').val('');
+        $('#ReqNo').val('');
+        $('#deptName').val('');
+        $('#CostCenter').val('');
+        $('#AvlBudAmt').val('');
         $('#MaterialCode').val('');
         $('#ItemName').val('');
         $('#UOM').val('');
@@ -3641,18 +3720,11 @@ $('#ImportAppend').append(rowHtml);
         $('#purchaserate').val('');
         $('#CustomDutyExpenses').val('');
         $('#RMCIncludingCustomers').val('');
-
         $('#drpFreight').val('');
-
         $('#NOOfTrips').val('');
-
         $('#txtFreight').val('');
-
         $('#txtAfterFreight').val('');
-
         $('#AddPer').val('');
-
-
         $('#AfterAssessable').val('');
         $('#Subtotal').val('');
         $('#Igst').val(0);
@@ -3660,153 +3732,11 @@ $('#ImportAppend').append(rowHtml);
         $('#DutyImpact').val('');
         $('#ClearingCharges').val('');
         $('#Nett').val('');
-
         //$('#addtxtInstruction').val('');
-
         tinymce.get('addtxtInstruction').setContent('');
     }
 
-
-    $("#editimportpomodel").on("shown.bs.modal", function(e) {
-        userid = $(e.relatedTarget).data('userid');
-        //alert(userid);
-        //alert('inadd');
-        var tr = document.getElementById(userid);
-        //alert(tr);
-        var cellval = tr.cells;
-        //alert(cellval);
-        var id = $('#Reqnumber' + userid).val();
-        //alert(id);
-        $('#EditReqNo').val($('#Reqnumber' + userid).val());
-
-        //alert($('#Reqnumber'+userid).val());  
-        $('#EditdeptName').val($('#departmentName' + userid).val());
-        $("#EditCostCenter").val($('#costCode' + userid).val());
-        $('#EditAvlBudAmt').val($('#AvilBudget' + userid).val());
-
-        $('#EditItemName').val($('#materialName' + userid).val());
-        $('#EditUOM').val($('#uom' + userid).val());
-        var uom = parseFloat($('#uom' + userid).val());
-        //console.log(uom);
-        $('#EditQuantity').val($('#quantity' + userid).val());
-        RequistQuantity = $('#quantity' + userid).val();
-        var editrate = parseFloat($('#itemRate' + userid).val()).toFixed(2);
-        // console.log(editrate);
-        $('#EditRate').val(editrate);
-        //$('#EditRate').val($('#itemRate'+userid).val());
-        var basic = parseFloat($('#BasicAmt' + userid).val()).toFixed(2);
-        //console.log(basic);
-        //$('#EdittxtBasicValue').val($('#BasicAmt'+userid).val());
-        //$('#EditimBasicPrice').val($("#BasicAmt"+userid).val());
-
-        $('#EdittxtBasicValue').val(basic);
-        $('#EditimBasicPrice').val(basic);
-
-        var inrbasicval = parseFloat($('#BasicPriceINR' + userid).val()).toFixed(2);
-
-        // $('#EditINRBasicvalue').val($("#BasicPriceINR"+userid).val());
-        $('#EditINRBasicvalue').val(inrbasicval);
-        $('#EditLandingCharge').val($("#LandingChargee" + userid).val());
-        $('#EditAfterLandingCharge').val($("#AfterLandingChargee" + userid).val());
-
-        $('#EditAfterAssessable').val($("#AfterAssessable" + userid).val());
-
-
-        $('#EditCustomduty').val($("#Customduty" + userid).val());
-        $('#EditAfterCustomduty').val($("#AfterCustomduty" + userid).val());
-
-
-        $('#EditCustomEDcess').val($("#CustomEDcess" + userid).val());
-        $('#EditAfterCustomEDcess').val($("#AfterCustomEDcess" + userid).val());
-        $('#EditCustomSHcess').val($("#CustomSHcess" + userid).val());
-        $('#EditAfterCustomSHcess').val($("#AfterCustomSHcess" + userid).val());
-
-        $('#EditSubtotal').val($("#Subtotal" + userid).val());
-
-
-        $('#EditIgst').val($("#Igst" + userid).val());
-        $('#EditAfterIgst').val($("#AfterIgst" + userid).val());
-
-        $('#EditGrossdutypayable').val($("#Grossdutypayable" + userid).val());
-        $('#EditGrossexpenses').val($("#Grossexpenses" + userid).val());
-        $('#EditPurQuantity').val($("#PurQuantity" + userid).val());
-
-        $('#EditCustomDutyExpenses').val($("#CustomDutyExpenses" + userid).val());
-
-        $('#EditDutyImpact').val($("#Dutyimpact" + userid).val());
-        $('#EditClearingCharges').val($("#ClearingCharges" + userid).val());
-        $('#EditNett').val($("#Nett" + userid).val());
-
-        var basicinr = parseFloat($('#AfterBasicPriceTax' + userid).val()).toFixed(2);
-        // $('#EditAfterBasicPriceTax').val($("#AfterBasicPriceTax"+userid).val());
-        $('#EditAfterBasicPriceTax').val(basicinr);
-
-        $('#EditTotalExp').val($("#TotalExp" + userid).val());
-
-
-        $('#drpeditFreight').val($('#FreightType' + userid).val());
-        $('#editNOOfTrips').val($('#NoofTrip' + userid).val());
-        $('#txtEditFreight').val($('#FreightRate' + userid).val());
-        $('#edittxtAfterFreight').val($('#AfterFreightRate' + userid).val());
-
-        //$('#edittxtInstruction').val($('#Addinstruction'+userid).val());
-
-        tinyMCE.get('edittxtInstruction').setContent($('#Addinstruction' + userid).val());
-
-        var FreightType = $('#drpeditFreight').val();
-        if (FreightType == "PER TRIP") {
-
-            $('#editTripsValue').show();
-        } else { //alert();
-
-            $('#editTripsValue').hide();
-        }
-
-
-        $('#EditPer').val($('#Per' + userid).val());
-
-
-        $('#EditTotalOrderValue').val(cellval[8].innerHTML);
-        $("#EditMaterialCode").empty();
-        var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-        $("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
-        var isAdded = "0";
-        for (i = 0; i < Material.length; i++) {
-            $.each(Material[i], function(idx, obj) {
-
-                if (obj.ReqNo === id) {
-
-                    $.each(SelectedMaterialList.Mat, function(idx1, el) {
-                        if (id == el.ReqNo) {
-
-                            if (el.materialCode == obj.MaterialCode) {
-                                isAdded = "1";
-                                return false;
-                            } else {
-                                isAdded = "0";
-                            }
-
-                        }
-                    });
-
-
-                    if (isAdded == "0") {
-
-                        $("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-                    }
-
-                }
-
-
-            });
-        }
-
-    });
-
-
-
     $('.EditImport').click(function() {
-        //alert('inside edit');
         if (validateEditExceedLimit() && ExceedEditQuantityCheck() && EditQtyZerocheck()) {
             var CostCode = $("#EditCostCenter").val();
             var AvilBudget = $('#EditAvlBudAmt').val();
@@ -3814,7 +3744,6 @@ $('#ImportAppend').append(rowHtml);
             var edititemname = $("#EditItemName").val();
             var editUOM = $('#EditUOM').val();
             var editQuantity = $('#EditQuantity').val();
-            //console.log(editQuantity);
             var itemRate = $("#EditRate").val();
             var BasicValue = $("#EdittxtBasicValue").val();
             var BasicPriceinUS = $('#EditimBasicPrice').val();
@@ -3824,21 +3753,16 @@ $('#ImportAppend').append(rowHtml);
             var AfterBasicPrice = $("#EditAfterBasicPriceTax").val();
             var Landingcharge = $("#EditLandingCharge").val();
             var AfterLanding = $("#EditAfterLandingCharge").val();
-
             var CustomDuty = $("#EditCustomduty").val();
             var AfterCustomDuty = $("#EditAfterCustomduty").val();
-
             var CustomED = $("#EditCustomEDcess").val();
             var AfterCustomED = $("#EditAfterCustomEDcess").val();
             var CustomSH = $("#EditCustomSHcess").val();
             var AfterCustomSH = $("#EditAfterCustomSHcess").val();
             var GrossDuty = $("#EditGrossdutypayable").val();
-
-
             var PurchaseRate = $("#Editpurchaserate").val();
             var Quantity = $("#EditPurQuantity").val();
             var CustomDutyExpense = $("#EditCustomDutyExpenses").val();
-
             var Igst = $('#EditIgst').val();
             var AfterIgst = $('#EditAfterIgst').val();
             var Dutyimpact = $('#EditDutyImpact').val();
@@ -3848,11 +3772,8 @@ $('#ImportAppend').append(rowHtml);
             //console.log(assessble);
             var Subtotal = $('#EditSubtotal').val();
 
-
             var TotalExp = $('#EditTotalExp').val();
 
-
-
             var FreightType = $('#drpeditFreight').val();
             var FreightRate = $('#txtEditFreight').val();
             var FreightRateAmount = $('#edittxtAfterFreight').val();
@@ -3860,30 +3781,16 @@ $('#ImportAppend').append(rowHtml);
             var per = $('#EditPer').val();
 
             var spclins = $.trim(tinymce.get('edittxtInstruction').getContent());
-
-            //console.log(spclins);
-
             if (per == '') {
                 per = $('#EditUOM').val();
             }
-
-
             var FreightTypename = $('#drpeditFreight').val();
             if (FreightTypename != "PER TRIP") {
-
                 Nooftrip = '';
             }
 
-            // console.log(FreightType);
-            // console.log(FreightRate);
-            // console.log(FreightRateAmount);
-            // console.log(Nooftrip);
-
-
             var tr = document.getElementById(userid);
             var cellval = tr.cells;
-
-
             cellval[4].innerHTML = editQuantity;
             cellval[5].innerHTML = editUOM;
             cellval[6].innerHTML = itemRate;
@@ -3901,22 +3808,15 @@ $('#ImportAppend').append(rowHtml);
             $('#AfterBasicPriceTax' + userid).val(AfterBasicPrice);
             $('#LandingChargee' + userid).val(Landingcharge);
             $('#AfterLandingChargee' + userid).val(AfterLanding);
-
             $('#Customduty' + userid).val(CustomDuty);
             $('#AfterCustomduty' + userid).val(AfterCustomDuty);
-
             $('#CustomEDcess' + userid).val(CustomED);
             $('#AfterCustomEDcess' + userid).val(AfterCustomED);
             $('#CustomSHcess' + userid).val(CustomSH);
             $('#AfterCustomSHcess' + userid).val(AfterCustomSH);
-
-
             $('#Grossdutypayable' + userid).val(GrossDuty);
-
-
             $('#PurQuantity' + userid).val(Quantity);
             $('#CustomDutyExpenses' + userid).val(CustomDutyExpense);
-
             $('#Igst' + userid).val(Igst);
             $('#AfterIgst' + userid).val(AfterIgst);
             $('#Dutyimpact' + userid).val(Dutyimpact);
@@ -3924,44 +3824,27 @@ $('#ImportAppend').append(rowHtml);
             $('#Nett' + userid).val(Nett);
             $('#CustomDutyExpenses' + userid).val(CustomDutyExpense);
             $('#Subtotal' + userid).val(Subtotal);
-
             $('#TotalExp' + userid).val(TotalExp);
-
             $('#TotalValue' + userid).val(TotalExp);
-
             $('#FreightType' + userid).val(FreightType);
-
             $('#NoofTrip' + userid).val(Nooftrip);
-
             $('#FreightRate' + userid).val(FreightRate);
-
             $('#AfterFreightRate' + userid).val(FreightRateAmount);
-
             $('#Per' + userid).val(per);
-
             $('#Addinstruction' + userid).val(spclins);
 
-
             //var a=$('#quantity'+userid).val();
             // var b=$('#NoofTrip'+userid).val();
             // var c=$('#FreightRate'+userid).val();
             // var d=$('#AfterFreightRate'+userid).val();
-
-
-            //console.log(a);
-            // console.log(b);
-            // console.log(c);
-            // console.log(d);
-
-
             populateValueMainFormForEditImportTax();
+            $('#editimportpomodel').modal('hide');
+            setTimeout(() => {
+                alert("Line Item Update SuccesFully..");
+            }, 1000);
         }
-
-
-
     });
 
-
     function populateValueMainFormForEditImportTax() {
         var rows = document.getElementById('ImportTax').rows.length;
         var TotalLanding = 0;
@@ -3992,7 +3875,6 @@ $('#ImportAppend').append(rowHtml);
                 var rowid = cells[0].innerHTML;
 
                 var AfterLandingCharge = $('#AfterLandingChargee' + rowid).val() == '' ? '0.00' : $('#AfterLandingChargee' + rowid).val();
-                //console.log(AfterLandingCharge);
                 var AfterCustomduty = $('#AfterCustomduty' + rowid).val() == '' ? '0.00' : $('#AfterCustomduty' + rowid).val();
                 var AfterCustomEDcess = $('#AfterCustomEDcess' + rowid).val() == '' ? '0.00' : $('#AfterCustomEDcess' + rowid).val();
                 var AfterCustomSHcess = $('#AfterCustomSHcess' + rowid).val() == '' ? '0.00' : $('#AfterCustomSHcess' + rowid).val();
@@ -4294,7 +4176,7 @@ $('#ImportAppend').append(rowHtml);
 
     $(function() {
         //$("#revenueTax").DataTable();
-        
+
     });
 
 
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php
index 911ccd95..55d69e6b 100755
--- a/app/Views/includes/new_header.php
+++ b/app/Views/includes/new_header.php
@@ -120,6 +120,7 @@
                 margin-top: 55px;
             }
         }
+
         @media (max-width: 992px) {
             .synczohobooks_button {
                 margin-top: 55px;
@@ -331,6 +332,26 @@
             z-index: 1;
             color: rgb(173, 3, 23);
         }
+
+        /* This CSS is for  Table Cell Expend*/
+        .text-truncate {
+            max-width: 120px;
+            /* Adjust width as needed */
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+        .text-truncate:hover {
+            white-space: normal;
+            overflow: visible;
+            word-wrap: break-word;
+            max-width: none;
+        }
+        .text-truncate.expanded {
+            white-space: normal;
+            max-width: none;
+        }
+        /* This CSS is for  Table Cell Expend*/
     </style>
 
 </head>
@@ -346,11 +367,11 @@
 
                 <ul class="list-unstyled topnav-menu float-right mb-0">
 
-                    <li class="dropdown d-none d-lg-inline-block">
+                    <!-- <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> -->
 
                     <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">
@@ -403,7 +424,7 @@
                         </span>
                     </a>
 
-                    <a href="index.html" class="logo logo-light text-center">
+                    <a href="<?php echo base_url(); ?>sales_dashboard" 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>
@@ -603,4 +624,4 @@
 
         <!-- ============================================================== -->
         <!-- Start Page Content here -->
-        <!-- ============================================================== -->
\ No newline at end of file
+        <!-- ============================================================== -->
diff --git a/app/Views/requisitionform.php b/app/Views/requisitionform.php
index 9cff3aa4..f816cfd8 100755
--- a/app/Views/requisitionform.php
+++ b/app/Views/requisitionform.php
@@ -39,7 +39,7 @@ if (!empty($Emp)) {
 				<div class="col-12">
 					<div class="page-title-box page-title-box-alt">
 						<h4><?= "Add Requisition"; ?></h4>
-						<a href="<?php echo base_url(); ?>Requisition"><button type="button" class="btn btn-dark waves-effect waves-light">Back</button></a>
+						<a href="<?php echo base_url(); ?>Requisition"><button type="button" class="btn btn-secondary">Back</button></a>
 					</div>
 				</div>
 			</div>
diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php
index 00956f24..eba13851 100755
--- a/app/Views/servicePurchaseorder.php
+++ b/app/Views/servicePurchaseorder.php
@@ -538,12 +538,12 @@ if (!empty($INRSYMBOL)) {
 	$(document).ready(function() {
 		$("#Deliverydt").datepicker({
 			format: 'dd-mm-yyyy',
-			startDate: new Date(), 
+			startDate: new Date(),
 			clearBtn: true
 		});
 		$("#PODate").datepicker({
 			format: 'dd-mm-yyyy',
-			startDate: new Date(), 
+			startDate: new Date(),
 			clearBtn: true
 		});
 		$("#PaymentTerms").select2();
@@ -559,6 +559,89 @@ if (!empty($INRSYMBOL)) {
 			$('#Schedulediv').show();
 		});
 		clearTotalItemValues();
+
+		$('#Edit').click(function() {
+		console.log("1111111111111111111");
+
+		// tinyMCE.triggerSave();
+		console.log("2222222222222222");
+
+		if (validateEditServiceTax()) {
+			alert('inside Add');
+			var CostCode = $("#EditCostCenter").val();
+			var AvilBudget = $('#EditAvlBudAmt').val();
+			var editMaterialCode = $("#EditMaterialCode").val();
+			var editDescription = $("#EditItemName").val();
+			var editUOM = $('#EditUOM').val();
+			var editPer = '';
+			if ($("#EditPer").val().trim() == '') {
+				editPer = $("#EditUOM").val();
+			} else {
+				editPer = $("#EditPer").val();
+			}
+			var editQuantity = $('#EditQuantity').val();
+
+			var itemRate = $("#EditRate").val();
+
+
+
+			var Cgst = $("#EditCgst").val();
+			var AfterCgst = $("#EditAfterCgst").val();
+			var Sgst = $("#EditSgst").val();
+			var AfterSgst = $("#EditAfterSgst").val();
+			var Igst = $("#EditIgst").val();
+			var AfterIgst = $("#EditAfterIgst").val();
+
+			var Frequency = $("#EditFrequency").val();
+			var FrequencyValue = $("#EditFrequencyNo").val();
+			var ServiceDescription = $('#EdittxtSpcialInstruction').val();
+			var OtherAmt = $('#EditOtherAllowances').val();
+			var TotalOrderValue = $("#EditTotalOrderValue ").val();
+
+
+			var basicval = $("#txtEditBasicValue").val();
+
+			var TotalTaxValue = calculateEditTaxValue();
+
+
+
+			var tr = document.getElementById(userid);
+			var cellval = tr.cells;
+
+			cellval[2].innerHTML = editMaterialCode;
+			cellval[3].innerHTML = editDescription;
+			cellval[4].innerHTML = editQuantity;
+			cellval[5].innerHTML = editUOM;
+			cellval[6].innerHTML = parseFloat(itemRate).toFixed(2);
+			cellval[7].innerHTML = parseFloat(basicval).toFixed(2);
+			cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
+			cellval[9].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
+
+
+			$('#materialCode' + userid).val(editMaterialCode);
+			$('#materialName' + userid).val(editDescription);
+			$('#uom' + userid).val(editUOM);
+			$('#per' + userid).val(editPer);
+
+			$('#quantity' + userid).val(editQuantity);
+			$('#itemRate' + userid).val(itemRate);
+			$('#Cgst' + userid).val(Cgst);
+			$('#AfterCgst' + userid).val(AfterCgst);
+			$('#Sgst' + userid).val(Sgst);
+			$('#AfterSgst' + userid).val(AfterSgst);
+			$('#Igst' + userid).val(Igst);
+			$('#AfterIgst' + userid).val(AfterIgst);
+			$('#ItemDescription' + userid).val(ServiceDescription);
+			$('#OtherAmt' + userid).val(OtherAmt);
+
+			$('#TotalOrderValue' + userid).val(TotalOrderValue);
+
+			populateValueMainFormForEditServiceTax();
+
+		}
+
+	});
+
 	});
 </script>
 <style>
@@ -1753,28 +1836,28 @@ if (!empty($INRSYMBOL)) {
 			// }));
 
 			var rowHtml = `
-	<tr id="${temp}">
-		<td align="left">${temp}</td>
-		<td align="left">${Reqnumber}</td>
-		<td align="left">${materialCode}</td>
-		<td align="left">${materialName}</td>
-		<td align="left">${quantity}</td>
-		<td align="left">${uom}</td>
-		<td align="left">${itemRate}</td>
-		<td align="left">${basicval}</td>
-		<td align="left">${TotalTaxValue}</td>
-		<td align="left">${TotalOrderValue}</td>
-		<td>
-			<a data-target='#EDITSERVICE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITSERVICE">
-				<i class="ri-pencil-fill" data-toggle="tooltip"></i>
-			</a> 
-			&nbsp;&nbsp;&nbsp;
-			<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
-				<span class="ri-delete-bin-7-fill"></span>
-			</a>
-		</td>
-	</tr>
-`;
+				<tr id="${temp}">
+					<td align="left">${temp}</td>
+					<td align="left">${Reqnumber}</td>
+					<td align="left">${materialCode}</td>
+					<td align="left">${materialName}</td>
+					<td align="left">${quantity}</td>
+					<td align="left">${uom}</td>
+					<td align="left">${itemRate}</td>
+					<td align="left">${basicval}</td>
+					<td align="left">${TotalTaxValue}</td>
+					<td align="left">${TotalOrderValue}</td>
+					<td>
+						<a data-target='#EDITSERVICE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITSERVICE">
+							<i class="ri-pencil-fill" data-toggle="tooltip"></i>
+						</a> 
+						&nbsp;&nbsp;&nbsp;
+						<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
+							<span class="ri-delete-bin-7-fill"></span>
+						</a>
+					</td>
+				</tr>
+			`;
 
 			// Append the generated HTML to your table body
 			$('#ServiceAppend').append(rowHtml);
@@ -1819,84 +1902,6 @@ if (!empty($INRSYMBOL)) {
 
 	});
 
-	$('.EditService').click(function() {
-		tinyMCE.triggerSave();
-
-		if (validateEditServiceTax()) {
-			//alert('inside Add');			
-			var CostCode = $("#EditCostCenter").val();
-			var AvilBudget = $('#EditAvlBudAmt').val();
-			var editMaterialCode = $("#EditMaterialCode").val();
-			var editDescription = $("#EditItemName").val();
-			var editUOM = $('#EditUOM').val();
-			var editPer = '';
-			if ($("#EditPer").val().trim() == '') {
-				editPer = $("#EditUOM").val();
-			} else {
-				editPer = $("#EditPer").val();
-			}
-			var editQuantity = $('#EditQuantity').val();
-
-			var itemRate = $("#EditRate").val();
-
-
-
-			var Cgst = $("#EditCgst").val();
-			var AfterCgst = $("#EditAfterCgst").val();
-			var Sgst = $("#EditSgst").val();
-			var AfterSgst = $("#EditAfterSgst").val();
-			var Igst = $("#EditIgst").val();
-			var AfterIgst = $("#EditAfterIgst").val();
-
-			var Frequency = $("#EditFrequency").val();
-			var FrequencyValue = $("#EditFrequencyNo").val();
-			var ServiceDescription = $('#EdittxtSpcialInstruction').val();
-			var OtherAmt = $('#EditOtherAllowances').val();
-			var TotalOrderValue = $("#EditTotalOrderValue ").val();
-
-
-			var basicval = $("#txtEditBasicValue").val();
-
-			var TotalTaxValue = calculateEditTaxValue();
-
-
-
-			var tr = document.getElementById(userid);
-			var cellval = tr.cells;
-
-			cellval[2].innerHTML = editMaterialCode;
-			cellval[3].innerHTML = editDescription;
-			cellval[4].innerHTML = editQuantity;
-			cellval[5].innerHTML = editUOM;
-			cellval[6].innerHTML = parseFloat(itemRate).toFixed(2);
-			cellval[7].innerHTML = parseFloat(basicval).toFixed(2);
-			cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
-			cellval[9].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
-
-
-			$('#materialCode' + userid).val(editMaterialCode);
-			$('#materialName' + userid).val(editDescription);
-			$('#uom' + userid).val(editUOM);
-			$('#per' + userid).val(editPer);
-
-			$('#quantity' + userid).val(editQuantity);
-			$('#itemRate' + userid).val(itemRate);
-			$('#Cgst' + userid).val(Cgst);
-			$('#AfterCgst' + userid).val(AfterCgst);
-			$('#Sgst' + userid).val(Sgst);
-			$('#AfterSgst' + userid).val(AfterSgst);
-			$('#Igst' + userid).val(Igst);
-			$('#AfterIgst' + userid).val(AfterIgst);
-			$('#ItemDescription' + userid).val(ServiceDescription);
-			$('#OtherAmt' + userid).val(OtherAmt);
-
-			$('#TotalOrderValue' + userid).val(TotalOrderValue);
-
-			populateValueMainFormForEditServiceTax();
-
-		}
-
-	});
 
 	function addHidden(theForm, key, value) {
 		// Create a hidden input element, and append it to the form:
@@ -2189,7 +2194,7 @@ if (!empty($INRSYMBOL)) {
 		// });
 		$("#Deliverydt").datepicker({
 			format: 'dd-mm-yyyy',
-			startDate: new Date(), 
+			startDate: new Date(),
 			yearRange: '0:+10',
 			changeMonth: true,
 			changeYear: true,
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index 2bf9ef30..46b30507 100755
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -250,6 +250,9 @@ if (! function_exists('form_multiselect')) {
         if (stripos($extra, 'multiple') === false) {
             $extra .= ' multiple="multiple"';
         }
+        if (stripos($extra, 'class=') === false) {
+            $extra .= ' class="form-control"'; // Add your desired default class here
+        }
 
         return form_dropdown($name, $options, $selected, $extra);
     }