From 05b764886ec3f9210f3051e7e8fb738c10dc3109 Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavanvalli@gmail.com>
Date: Sat, 31 Aug 2024 14:41:46 +0530
Subject: [PATCH 1/3] CHANGE_EMERGE_PO

---
 app/Controllers/Emergencypurchaseorder.php |   60 +-
 app/Controllers/Purchaseorder.php          |    3 +-
 app/Models/Purchaseorder_model.php         |    1 +
 app/Views/alterpurchaseorder.php           | 1664 +++++++++-----------
 system/Helpers/form_helper.php             |    2 +
 5 files changed, 826 insertions(+), 904 deletions(-)

diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php
index df4d8f5c..38cf1975 100644
--- a/app/Controllers/Emergencypurchaseorder.php
+++ b/app/Controllers/Emergencypurchaseorder.php
@@ -122,7 +122,7 @@ class Emergencypurchaseorder extends BaseController
     //This used to Create Service Purchase Order
     function addNewServicePurchaseOrder()
     {
-
+        // print_r($this->request->getPost());die;
         $txtRowCount = $this->request->getPost('txtRowCount');
         $POdt = $this->request->getPost('PODate');
         $PODate =  get_date_time_format($POdt);
@@ -130,7 +130,7 @@ class Emergencypurchaseorder extends BaseController
         $DeliveryAddr = $this->request->getPost('DeliveryAddr');
         $CostCenterName = $this->request->getPost('CostCenterName');
         $DeliveryOption = $this->request->getPost('DateRange');
-        $DeliverySchedule = '';
+        $DeliverySchedule = $this->request->getPost('Scheduleby');
         $Deliverydt = get_date_time_format($POdt);
 
         $txtsplservice = $this->request->getPost('txtSpecialservice');
@@ -141,9 +141,9 @@ class Emergencypurchaseorder extends BaseController
 
         $SpcialInstruction = $this->request->getPost('ScopeOfWork');
         $RequistionComments = "Created Emergency Service PO";
-        // $TotalOrderValueSummary = $this->request->getPost('TextTotalOrderValueSummaryService');
+        $TotalOrderValueSummary = $this->request->getPost('TextTotalOrderValueSummaryService');
 
-        $TotalOrderValueSummary = $this->request->getPost('txtTotalOrderValueSummaryService');
+        // $TotalOrderValueSummary = $this->request->getPost('txtTotalOrderValueSummaryService');
 
         //$POStatus = $this->request->getPost('TextStatus');
         $CreateBy = $this->session->get('userId');
@@ -161,7 +161,7 @@ class Emergencypurchaseorder extends BaseController
 
         $comma_separated = explode(':', (string)$DeletedRow);
 
-        $BudgetType = $this->request->getPost('Budget');
+        $BudgetType = $this->request->getPost('BudgetType');
 
         $createddt =  get_current_date_time();
         //$PaymentTerms=$this->request->getPost('PaymentMethod');
@@ -209,6 +209,7 @@ class Emergencypurchaseorder extends BaseController
         // PO Master
         $POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'ServiceWorkStatus' => $ServiceWorkStatus, 'POType' => $POType, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => $DescriptionOfPo, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder);
         $file = $this->request->getFile('POFile');
+        if($file !== null){
         $requestfilename = $file->getName();    
         if (!empty($requestfilename)) {
             
@@ -228,7 +229,7 @@ class Emergencypurchaseorder extends BaseController
             
           }
 
-
+        }
         $POMaster  = $this->purchaseorder_model->addPOMaster($POList, $POType, $ServiceTypeOptions);
         $PONO = $POMaster ? $newPONO : "";
         // if (count($POMaster) > 0) {
@@ -376,7 +377,8 @@ class Emergencypurchaseorder extends BaseController
         } else {
             $this->session->setFlashdata('success', 'You Have Successfully Created the Purchase order! '.$PONO);
         }
-        return redirect()->route('purchaseorderListing');        
+        return true;
+        // return redirect()->route('purchaseorderListing');        
     }
 
 
@@ -385,7 +387,7 @@ class Emergencypurchaseorder extends BaseController
     function addNewRevenuePurchaseOrder()
     {
 
-
+        // print_r($this->request->getPost());die;
         $txtspl = $this->request->getPost('txtSpecial');
 
 
@@ -421,7 +423,7 @@ class Emergencypurchaseorder extends BaseController
 
         $SpcialInstruction = $this->request->getPost('txtSpcialInstruction');
         $RequistionComments = "Created Emergency Revenue PO";
-        $TotalOrderValueSummary = $this->request->getPost('txtTotalOrderValueSummary');
+        $TotalOrderValueSummary = $this->request->getPost('TextTotalOrderValueSummaryService');
 
         if ($txtspl == 0) {
             $POStatus = REQITEM_Emergency_PO_CREATED;
@@ -436,7 +438,7 @@ class Emergencypurchaseorder extends BaseController
 
         $RowCount = $this->request->getPost('txtRowCount1');
 
-        $BudgetType = $this->request->getPost('Budget');
+        $BudgetType = $this->request->getPost('BudgetType');
 
         //echo $RowCount;
         // $DeletedRow =  $this->request->getPost('TextDeletedRowCount'); 
@@ -483,24 +485,29 @@ class Emergencypurchaseorder extends BaseController
         $newPONO = generate_po_number($lastPONO); 
         $POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'PORange' => $Local_Interstate, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'POType' => $POType, 'CapitalRange' => $Local_Interstate, 'PaymentOtherDescription' => $OtherPayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Offer_No' => $supplieroffno, 'Supplier_Reference' => $supplierreference, 'Other_Reference' => $otherreference, 'InsuranceNumber' => $InsuranceNumber, 'InsuranceStatus' => $insurancestatus, 'Fincap' => $fincap, 'POSubType' => $revenuetype, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder);
         $file = $this->request->getFile('POFiles');
-        $requestfilename = $file->getName(); 
-        if (!empty($requestfilename)) {
-            
-            if ($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);
-                    $POList['POFile'] = NULL;
+        if($file !== null){
+            $requestfilename = $file->getName(); 
+            if (!empty($requestfilename)) {
+                
+                if ($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);
+                        $POList['POFile'] = NULL;
+                    }else{
+                        $file->move($path, $requestfilename);  
+                        $POList['POFile'] = $requestfilename;
+                    }
                 }else{
-                    $file->move($path, $requestfilename);  
-                    $POList['POFile'] = $requestfilename;
+                    $POList['POFile'] = NULL;
                 }
-            }else{
-                $POList['POFile'] = NULL;
+                
             }
-            
-          }
+        }else{
+
+        }
+          print_r($POList);die;
         $POMaster  = $this->purchaseorder_model->addPOMaster($POList, $POType, $revenuetype);
         $PONO = $POMaster ? $newPONO : "";
         // $PONO = '';
@@ -862,7 +869,8 @@ class Emergencypurchaseorder extends BaseController
 
 
         $this->session->setFlashdata('success', 'You Have Successfully Created the Purchase order! '.$PONO);
-        return redirect()->route('purchaseorderListing');        
+        // return redirect()->route('purchaseorderListing');    
+        return true;    
 
         // echo "<script>alert('You Have Successfully created the Purchase order! $PONO');</script>";
         // redirect('purchaseorder/PurchaseOrderList', 'refresh');
diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php
index d24b205c..f763a120 100644
--- a/app/Controllers/Purchaseorder.php
+++ b/app/Controllers/Purchaseorder.php
@@ -114,7 +114,8 @@ class Purchaseorder extends BaseController
     $this->purchaseorder_model->UpdateRequistionStatus();
 
     $data['POData'] =  $this->purchaseorder_model->purchaseorderListing();
-
+    // echo "<pre>";
+    // print_r($data['POData']);die;
     $this->global['pageTitle'] = 'Purchase Orders';
 
 
diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php
index a0f828cf..9126f9ca 100644
--- a/app/Models/Purchaseorder_model.php
+++ b/app/Models/Purchaseorder_model.php
@@ -788,6 +788,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 	 */
 	function addPOMaster($POMaster, $POType, $revenuetype)
 		{
+			// print_r($POMaster);die;
 			try {
 				$this->db->transStart();
 				$builder = $this->db->table('t_purchaseorder_master');
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index 886e6b22..7b2496d3 100644
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -32,6 +32,7 @@ if (!empty($INRSYMBOL)) {
 
 
 ?>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.13.6/underscore-min.js"></script>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
 <style>
@@ -1439,7 +1440,7 @@ if (!empty($INRSYMBOL)) {
 
             var images = $('#imag').val();
 
-            $('#content').loader('show');
+            // $('#content').loader('show');
 
             if (POcheck == 0) {
                 $('#txtSpecial').val(1);
@@ -1478,7 +1479,7 @@ if (!empty($INRSYMBOL)) {
 
                 //alert('normalemergency');
                 $('#txtSpecial').val(0);
-                $('#content').loader('show');
+                // $('#content').loader('show');
                 RevenueSave(1)
             } else {
                 //window.location.href ="<?php echo base_url() ?>purchaseorder/addNewPurchaseOrder";
@@ -1827,7 +1828,7 @@ if (!empty($INRSYMBOL)) {
             if (PO == 'REVENUE') {
                 //alert('normalemergency');
                 $('#txtSpecial').val(0);
-                $('#content').loader('show');
+                // $('#content').loader('show');
                 RevenueSave(1)
             } else if (PO == 'SERVICE') {
                 ///alert('normal SERVICE emergency');
@@ -1899,6 +1900,244 @@ if (!empty($INRSYMBOL)) {
         }
     }
     $(document).ready(function() {
+        $('#ServiceMaterialCode').change(function() {
+        var selectedMaterialCode = '';
+        selectedMaterialCode = $("#ServiceMaterialCode").val();
+        $.each(JSON.parse(materialData), function(index, value) {
+            if (selectedMaterialCode == value.MaterialCode) {
+                $("#ServiceDescription").val(value.MaterialName);
+                $("#ServiceUOM").val(value.UOM);
+                if ($('#ScheduleType').val().trim() != 'Recurring') {
+                    $('#FrequencyChange').val('One Time');
+
+
+
+                    $('#ServiceNo').val(1);
+                } else {
+                    $('#FrequencyChange').val($('#ScheduleType').val());
+
+                }
+            }
+
+        });
+        var d = $('#drpSupplier').val();
+        $.ajax({
+            url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
+            type: 'POST',
+            data: {
+                supplierid: d,
+                materialcode: selectedMaterialCode
+            },
+            success: function(response) {
+                if (response) alert(response);
+            }
+        });
+
+    });
+        let materialData;
+
+
+        $('#purpose').on('change', function() {
+            console.log("purpose first");
+
+            $('#POType').val(this.value);
+            if (this.value == 'REVENUE') //Revenue po
+            {
+                $("#QualityChecked").show();
+                $("#revenuepotaxes").show();
+                $("#currencyexchange").hide();
+                $("#servicepotaxes").hide();
+                $("#workstatus").hide();
+                $('#DisplayScheduleDiv').hide();
+                $('#EditDisplayScheduleDiv').hide();
+                $('#ServicePeriodOption').hide();
+                //$('#NoServices').hide();
+                $("#Deliveryby").show();
+                // $("#selectdeliveryby").show();
+                $("#txtPoRange").show();
+                $("#emergdescofpoDiv").hide();
+                $('#typeOptions').html('Revenue Type Options');
+            } else if (this.value == 'SERVICE') // Service po  
+            {
+                $("#QualityChecked").hide();
+                $("#servicepotaxes").show();
+                $("#Deliveryby").show();
+                $("#workstatus").show();
+                $("#currencyexchange").hide();
+                // $("#selectdeliveryby").hide();
+                $("#revenuepotaxes").hide();
+                $('#DisplayScheduleDiv').show();
+                $('#EditDisplayScheduleDiv').show();
+                $("#txtPoRange").hide();
+                $("#emergdescofpoDiv").show();
+                $('#typeOptions').html('Service Type Options');
+
+            } else if (this.value == 'IMPORT') // Import po  
+            {
+                $("#currencyexchange").show();
+
+                $("#revenuepotaxes").hide();
+                $("#servicepotaxes").hide();
+                $("#workstatus").hide();
+                $('#typeOptions').html('Import Type Options');
+            } else if (this.value == 'CAPITAL') // Capital po
+            {
+                $("#currencyexchange").show();
+
+                $("#revenuepotaxes").hide();
+                $("#servicepotaxes").hide();
+                $("#workstatus").hide();
+                $('#typeOptions').html('Capital Type Options');
+            } else // Default
+            {
+                $("#currencyexchange").hide();
+
+                $("#revenuepotaxes").hide();
+                $("#servicepotaxes").hide();
+                $("#workstatus").hide();
+            }
+            console.log("purpose Second");
+
+            // $('#purpose').change(function() {
+            console.log("1111111111111");
+
+            var input = '';
+            input = $("#purpose").val();
+            if (input == -1) {
+                $("#POType").val('');
+                console.log("222222222222222222");
+
+            } else {
+                console.log("333333333333333333");
+
+                $("#POType").val(input);
+                // $('#content').loader('show');
+                $.ajax({
+                    data: {
+                        input: input
+                    },
+                    type: "POST",
+                    url: "<?php echo base_url() ?>emergencypurchaseorder/getMaterialCode",
+                    success: function(data) {
+                        console.log("4444444444444444");
+
+                        if (data) {
+                            console.log("55555555");
+                            console.log(data);
+
+                            materialData = data;
+                            console.log("material Data");
+
+                            if (input == 'SERVICE') {
+                                console.log("66666666");
+
+                                $('#ServiceMaterialCode').empty();
+                                $("#ServiceMaterialCode").append($('<option></option>').val("0").html("Select Item Code"));
+
+                                $.each(JSON.parse(data), function(index, value) {
+                                    $("#ServiceMaterialCode").append($('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
+
+
+                                });
+                            } else if (input == 'REVENUE') {
+                                console.log("777777777777777");
+
+                                $('#MaterialCode').empty();
+                                $("#MaterialCode").append($('<option></option>').val("0").html("Select Item Code"));
+
+                                $.each(JSON.parse(data), function(index, value) {
+                                    $("#MaterialCode").append($('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
+
+
+                                });
+                            } else {
+
+                            }
+
+                            // $('#content').loader('hide');
+
+                        }
+
+                    }
+                });
+
+
+
+
+                var id = $('#CostCenterName').val();
+                $("#AvlBudAmt").val(0);
+                var ReqType = $('#purpose').val();
+                if (id != '0' && ReqType != '-1') {
+
+
+                    // $('#content').loader('show');
+                    $.ajax({
+                        data: {
+                            id: id,
+                            type: ReqType
+                        },
+                        type: "POST",
+                        url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
+                        success: function(data) {
+                            if (data) {
+                                // $('#content').loader('hide');
+                                $("#AvalBuget").val(data ? parseFloat(data).toFixed(2) : 0);
+                            } else {
+                                // $('#content').loader('hide');
+                                alert("Error");
+                            }
+
+                        }
+                    });
+                } else {
+                    // alert('Please select Request Type');
+                    return false;
+                }
+
+
+
+            }
+
+        });
+
+
+        /**
+         * getting item name and uom using global variable materialData each change in revenue
+         */
+        $('#MaterialCode').on('change', function() {
+            console.log("111111111111");
+
+            // $('#MaterialCode').change(function() {
+            var selectedRevenueMaterialCode = '';
+            selectedRevenueMaterialCode = $("#MaterialCode").val();
+            console.log(materialData);
+            console.log("materialData - 1111111");
+            $.each(JSON.parse(materialData), function(index, value) {
+                if (selectedRevenueMaterialCode == value.MaterialCode) {
+                    $("#ItemName").val(value.MaterialName);
+                    $("#UOM").val(value.UOM);
+
+                }
+
+            });
+            var d = $('#drpSupplier').val();
+            $.ajax({
+                url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
+                type: 'POST',
+                data: {
+                    supplierid: d,
+                    materialcode: selectedRevenueMaterialCode
+                },
+                success: function(response) {
+                    if (response) alert(response);
+                }
+            });
+
+        });
+
+        /**
+         * get material list when selecting the request type
+         */
 
         $("#PaymentMethod").select2();
 
@@ -1912,7 +2151,7 @@ if (!empty($INRSYMBOL)) {
         $("#MaterialCode").select2();
         $("#ServiceMaterialCode").select2();
         $("#emergency_itemcode").select2();
-    
+
     });
 
 
@@ -2382,7 +2621,7 @@ if (!empty($INRSYMBOL)) {
                                             endforeach;
                                         }
 
-                                        echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2');
+                                        echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'class="form-control select2"', 'required="true"');
 
 
                                         ?>
@@ -2481,87 +2720,54 @@ if (!empty($INRSYMBOL)) {
             <div class="card">
 
 
+                <div id="packagingcalmodel" class="modal fade" tabindex="-1" role="dialog"
+                    aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false" style="display: none;">
+                    <div class="modal-dialog modal-lg">
+                        <div class="modal-content" style="border: 1px solid #ddd; margin-top: 73px; box-shadow: 0 0 40px rgb(0 0 0 / 43%);">
+                            <div class="modal-header">
+                                <h4 class="modal-title">Packing Calculation On <span id="WeightTitle"></span></h4>
+                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                            </div>
+                            <div class="modal-body p-4">
+                                <div class="form-group row">
+                                    <label><input type="radio" name="optPackaging" checked="checked" value="0" id="optPackaging"> Basic Amount</label>
+                                </div>
+                                <div class="form-group row">
+                                    <label><input type="radio" name="optPackaging" id="optPackaging" value="1"> After Discount Amount</label>
+                                </div>
+                            </div>
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</button>
+                                <button type="button" class="btn btn-info waves-effect waves-light" onclick="SetPackagingOption()">Save</button>
+                            </div>
+                        </div>
+                    </div>
+                </div><!-- /.modal -->
 
                 <!-- Modal for Packing Calculation -->
-                <div id="packagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-                    <div class="modal-dialog">
 
-                        <!-- Modal content-->
-                        <div class="modal-content">
-                            <div class="modal-header">
-                                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                                <h4 class="modal-title">Packing Calculation On</h4>
-                            </div>
-                            <div class="modal-body">
-                                <form>
-
-                                    <div class="radio">
-                                        <label><input type="radio" name="optPackaging" checked="checked" value='0' id="optPackaging"> Basic Amount</label>
-                                    </div>
-                                    <div class="radio">
-                                        <label><input type="radio" name="optPackaging" id="optPackaging" value='1'> After Discount Amount</label>
-                                    </div>
-                                </form>
-                            </div>
-                            <div class="modal-footer">
-                                <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-                                <a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-                <div id="packagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-                    <div class="modal-dialog">
-
-                        <!-- Modal content-->
-                        <div class="modal-content">
-                            <div class="modal-header">
-
-                                <h4 class="modal-title">Packing Calculation On</h4>
-                            </div>
-                            <div class="modal-body">
-                                <form>
-
-                                    <div class="radio">
-                                        <label><input type="radio" name="optPackaging" checked="checked" value='0' id="optPackaging"> Basic Amount</label>
-                                    </div>
-                                    <div class="radio">
-                                        <label><input type="radio" name="optPackaging" id="optPackaging" value='1'> After Discount Amount</label>
-                                    </div>
-                                </form>
-                            </div>
-                            <div class="modal-footer">
-                                <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-                                <a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
                 <div id="submitmodel" class="modal fade" data-backdrop-limit="1" role="dialog" aria-labelledby="myModalLabel">
                     <div class="modal-dialog">
 
                         <!-- Modal content-->
-                        <div class="modal-content">
+                        <div class="modal-content" style="margin-left: 210px;">
                             <div class="modal-header">
-
-                                <h4 class="modal-title">Material has been Received</h4>
+                                <h4 class="modal-title">Material has been Received<span id="WeightTitle"></span></h4>
+                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                             </div>
                             <div class="modal-body">
                                 <form>
-
-                                    <div class="radio">
-                                        <label><input type="radio" name="optsubmit" id="optsubmit" value='1'>YES</label>
+                                    <div class="modal-body p-4">
+                                        <div class="form-group row">
+                                            <label><input type="radio" name="optsubmit"  value="1" id="optsubmit"> YES</label>
+                                        </div>
+                                        <div class="form-group row">
+                                            <label><input type="radio" name="optsubmit" checked="checked" id="optsubmit" value="0"> NO</label>
+                                        </div>
                                     </div>
-
-                                    <div class="radio">
-                                        <label><input type="radio" name="optsubmit" checked="checked" value='0' id="optsubmit">NO</label>
-                                    </div>
-
                                     <div class="modal-footer">
-                                        <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-                                        <a class="btn btn-success" ID="PackagingOption" onclick="submitoption();dropdownselect();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+                                        <button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</button>
+                                        <button type="button" class="btn btn-info waves-effect waves-light" ID="PackagingOption" onclick="submitoption();dropdownselect();">Save</button>
                                     </div>
                                 </form>
                             </div>
@@ -2708,8 +2914,8 @@ if (!empty($INRSYMBOL)) {
                         <!-- Modal content-->
                         <div class="modal-content" style="width:950px;">
                             <div class="modal-header">
-
                                 <h4 class="modal-title">SERVICE Bill Details</h4>
+                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                             </div>
                             <div class="modal-body" style="padding:0px;">
                                 <div class="col-md-12">
@@ -2746,11 +2952,8 @@ if (!empty($INRSYMBOL)) {
 
                             <div class="modal-footer">
                                 <div class="col-md-12 text-right">
-
-                                    <div class="col-md-4 col-md-offset-8">
-                                        <a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
+                                        <a class="btn btn-secondary waves-effect" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
                                         <a class="btn btn-success ok" ID="ExciseOption12" onclick="sfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -3571,7 +3774,7 @@ if (!empty($INRSYMBOL)) {
                                     </div>
                                 </div>
                                 <div class="col-md-offset-9 col-md-3">
-                                    <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+                                    <a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>
                                     <a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
                                 </div>
                             </div>
@@ -3605,17 +3808,14 @@ if (!empty($INRSYMBOL)) {
                                                 <h4>Select Revenue Purchase Order Line Item </h4>
                                             </center>
                                         </div>
-                                        <div align="left">
-                                            <div class="col-md-12">
+                                        <div align="left" style="padding: 31px;">
+                                            <div class="row">
                                                 <div class="col-md-2">
                                                     <label>Item Code<span class="badge mandatory">*</span></label>
                                                     <div>
                                                         <?php
                                                         $options = array("0" => 'Item Code');
-
-
                                                         echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control"');
-
                                                         ?>
                                                     </div>
                                                 </div>
@@ -3638,7 +3838,7 @@ if (!empty($INRSYMBOL)) {
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-6" style="padding:0px;">
+                                                <div class="col-md-6" style="padding:0px;display: flex;">
                                                     <div class="col-md-3">
                                                         <label>Quantity<span class="badge mandatory">*</span></label>
                                                         <div class="form-group">
@@ -3676,7 +3876,7 @@ if (!empty($INRSYMBOL)) {
 
                                             <div>
 
-                                                <div class="col-md-12">
+                                                <div class="row">
                                                     <div class="col-md-4"></div>
                                                     <div class="col-md-4">
                                                         <label>Discount Type <span class="badge mandatory"></span></label>
@@ -3718,7 +3918,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-12" style="text-align:left;">
+                                                <div class="row" style="text-align:left;">
                                                     <div class="col-md-4"></div>
                                                     <div class="col-md-4">
                                                         <label>Packaging Type <span class="badge mandatory"></span></label>
@@ -3760,7 +3960,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-12">
+                                                <div class="row">
                                                     <div class="col-md-4"></div>
                                                     <div class="col-md-4">
                                                         <label>Freight Type <span class="badge mandatory"></label>
@@ -3812,7 +4012,7 @@ if (!empty($INRSYMBOL)) {
                                                     </div>
                                                 </div>
 
-                                                <div class="col-md-12">
+                                                <div class="row">
                                                     <div class="col-md-8"></div>
                                                     <div class="col-md-2">
                                                         <label>CGST In %</label>
@@ -3833,30 +4033,28 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-12" style="text-align:left;">
-                                                    <div id="SGSTAddModel">
-                                                        <div class="col-md-8"></div>
-                                                        <div class="col-md-2">
-                                                            <label>SGST In %</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'RevenueSgst', 'value' => set_value('RevenueSgst', 0), 'id' => 'RevenueSgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
+                                                <div class="row" id="SGSTAddModel">
+                                                    <div class="col-md-8"></div>
+                                                    <div class="col-md-2">
+                                                        <label>SGST In %</label>
+                                                        <div class="form-group">
+                                                            <?php
+                                                            $data = array('name' => 'RevenueSgst', 'value' => set_value('RevenueSgst', 0), 'id' => 'RevenueSgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
+                                                            echo form_input($data);
+                                                            ?>
                                                         </div>
-                                                        <div class="col-md-2">
-                                                            <label>SGST Amt <?php echo "($INRSYM)" ?></label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'RevenueAfterSgst', 'value' => set_value('RevenueAfterSgst', 0), 'id' => 'RevenueAfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
+                                                    </div>
+                                                    <div class="col-md-2">
+                                                        <label>SGST Amt <?php echo "($INRSYM)" ?></label>
+                                                        <div class="form-group">
+                                                            <?php
+                                                            $data = array('name' => 'RevenueAfterSgst', 'value' => set_value('RevenueAfterSgst', 0), 'id' => 'RevenueAfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-12" style="text-align:left;">
+                                                <div class="row" style="text-align:left;">
                                                     <div id="IGSTAddModel" style="display:none;">
                                                         <div class="col-md-8"></div>
                                                         <div class="col-md-2">
@@ -3880,7 +4078,7 @@ if (!empty($INRSYMBOL)) {
                                                     </div>
                                                 </div>
 
-                                                <div class="col-md-12">
+                                                <div class="row">
                                                     <div class="col-md-8">
                                                     </div>
                                                     <div class="col-md-4">
@@ -3894,7 +4092,7 @@ if (!empty($INRSYMBOL)) {
                                                     </div>
                                                 </div>
 
-                                                <div class="col-md-12">
+                                                <div class="row">
                                                     <div class="col-md-8">
                                                     </div>
                                                     <div class="col-md-4 ">
@@ -3909,19 +4107,20 @@ if (!empty($INRSYMBOL)) {
 
 
                                                 </div>
-                                                <div class="col-md-12">
+                                                <div class="row">
                                                     <label><?php echo "Revenue Description"; ?></label>
-                                                    <div class="form-group">
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col-12">
                                                         <?php
                                                         $data = array('name' => 'Add_Service_Description', 'value' => set_value('Add_Service_Description'), 'id' => 'Add_Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
                                                         echo form_textarea($data);;
                                                         ?>
 
                                                     </div>
-
                                                 </div>
-                                                <div class="col-md-offset-9 col-md-3">
-                                                    <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+                                                <div class="col-12 text-right">
+                                                    <a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>
                                                     <a class="btn btn-success font AddRevenue" ID="AddRevenue"> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
                                                 </div>
 
@@ -3947,7 +4146,7 @@ if (!empty($INRSYMBOL)) {
                                                 <h4>Add Service Purchase Order Item </h4>
                                             </center>
                                         </div>
-                                        <div align="left">
+                                        <div align="left" style="padding: 31px;">
 
                                             <div class="row">
                                                 <div class="col-md-3">
@@ -4003,6 +4202,138 @@ if (!empty($INRSYMBOL)) {
                                                 </div>
                                             </div>
 
+                                            <div class="row">
+                                                <div class="col-md-3">
+                                                    <label>Quantity<span class="badge mandatory">*</span></label>
+                                                    <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'ServiceQuantity', 'value' => set_value('ServiceQuantity'), 'id' => 'ServiceQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
+                                                    <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'ServiceRate', 'value' => set_value('ServiceRate'), 'id' => 'ServiceRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <label>Per</label> <?php
+                                                                        $data = array('name' => 'AddEmergPer', 'value' => set_value('AddEmergPer'), 'id' => 'AddEmergPer',  'class' => 'form-control');
+                                                                        echo form_input($data); ?>
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <label><?php echo "Basic Amount In ($INRSYM)"; ?></label>
+                                                    <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'ServiceBasAmt', 'value' => set_value('ServiceBasAmt'), 'id' => 'ServiceBasAmt',  'class' => 'form-control num', 'readonly' => 'true');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-md-3">
+
+                                                </div>
+                                                <div class="col-md-3 text-right">
+                                                    CGST In %
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+
+                                                        <?php
+                                                        $data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'Ratechange();ChangeSgst();', 'onkeypress' => 'return isNumberKey(event);');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0), 'id' => 'AfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-md-3">
+                                                </div>
+                                                <div class="col-md-3 text-right">
+                                                    SGST In %
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0), 'id' => 'AfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-md-3">
+
+                                                </div>
+                                                <div class="col-md-3 text-right">
+                                                    IGST In %
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-md-8 text-right">
+                                                    <label>Other Allowances <?php echo "($INRSYM)" ?></label>
+                                                </div>
+                                                <div class="col-md-4">
+                                                    <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'OtherAllowances', 'value' => set_value('OtherAllowances', 0), 'id' => 'OtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-md-8 text-right">
+                                                    <label><?php echo "Total Order Amount In ($INRSYM)"; ?></label>
+                                                </div>
+                                                <div class="col-md-4">
+                                                    <div class="form-group">
+                                                        <?php
+                                                        $data = array('name' => 'TotalOrderValue', 'value' => set_value('TotalOrderValue'), 'id' => 'TotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total value', 'readonly' => 'true');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
+                                                </div>
+                                            </div>
 
                                             <!-- <div class="col-md-12">
                                                 <div class="col-md-4" id="DisplayScheduleDiv" style="display:none;">
@@ -4055,162 +4386,7 @@ if (!empty($INRSYMBOL)) {
                                                          </div>
                                                 </div> -->
 
-                                            <div class="col-md-12">
-
-
-                                                <div class="col-md-3">
-                                                    <label>Quantity<span class="badge mandatory">*</span></label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ServiceQuantity', 'value' => set_value('ServiceQuantity'), 'id' => 'ServiceQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-3">
-                                                    <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ServiceRate', 'value' => set_value('ServiceRate'), 'id' => 'ServiceRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-3">
-                                                    <label>Per</label> <?php
-                                                                        $data = array('name' => 'AddEmergPer', 'value' => set_value('AddEmergPer'), 'id' => 'AddEmergPer',  'class' => 'form-control');
-                                                                        echo form_input($data); ?>
-                                                </div>
-                                                <div class="col-md-3">
-                                                    <label><?php echo "Basic Amount In ($INRSYM)"; ?></label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ServiceBasAmt', 'value' => set_value('ServiceBasAmt'), 'id' => 'ServiceBasAmt',  'class' => 'form-control num', 'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                            </div>
-
-
                                             <div class="col-md-12" style="padding:0px;">
-
-                                                <div class="col-md-12">
-                                                    <div class="col-md-6" align="right">
-
-                                                        CGST In %
-                                                    </div>
-
-                                                    <div class="col-md-3">
-                                                        <div class="form-group">
-
-                                                            <?php
-                                                            $data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'Ratechange();ChangeSgst();', 'onkeypress' => 'return isNumberKey(event);');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-
-                                                    </div>
-                                                    <div class="col-md-3">
-                                                        <div class="form-group">
-
-                                                            <?php
-                                                            $data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0), 'id' => 'AfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-
-                                                    </div>
-
-                                                </div>
-                                                <div class="col-md-12">
-                                                    <div class="col-md-6" align="right">
-
-                                                        SGST In %
-                                                    </div>
-
-                                                    <div class="col-md-3">
-                                                        <div class="form-group">
-
-                                                            <?php
-                                                            $data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-
-                                                    </div>
-                                                    <div class="col-md-3">
-                                                        <div class="form-group">
-
-                                                            <?php
-                                                            $data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0), 'id' => 'AfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-
-                                                    </div>
-
-                                                </div>
-
-                                                <div class="col-md-12">
-                                                    <div class="col-md-6" align="right">
-
-                                                        IGST In %
-                                                    </div>
-
-                                                    <div class="col-md-3">
-                                                        <div class="form-group">
-
-                                                            <?php
-                                                            $data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-
-                                                    </div>
-                                                    <div class="col-md-3">
-                                                        <div class="form-group">
-
-                                                            <?php
-                                                            $data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-
-                                                    </div>
-
-                                                </div>
-                                                <div class="col-md-12">
-                                                    <div class="col-md-8" align="right">
-
-                                                        <label>Other Allowances <?php echo "($INRSYM)" ?></label>
-                                                    </div>
-                                                    <div class="col-md-4">
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'OtherAllowances', 'value' => set_value('OtherAllowances', 0), 'id' => 'OtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-
-                                                </div>
-                                                <div class="col-md-12">
-                                                    <div class="col-md-8" align="right">
-
-                                                        <label><?php echo "Total Order Amount In ($INRSYM)"; ?></label>
-                                                    </div>
-                                                    <div class="col-md-4">
-                                                        <div class="form-group">
-
-                                                            <?php
-                                                            $data = array('name' => 'TotalOrderValue', 'value' => set_value('TotalOrderValue'), 'id' => 'TotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total value', 'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-
-                                                </div>
                                                 <div class="col-md-12" style="padding: 0px 30px 10px 30px;">
                                                     <label>Service Description<span class="badge mandatory">*</span></label> <?php
                                                                                                                                 $data = array('name' => 'txtSpcialInstructionSingle', 'value' => set_value('txtSpcialInstructionSingle'), 'id' => 'txtSpcialInstructionSingle',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
@@ -4220,11 +4396,12 @@ if (!empty($INRSYMBOL)) {
 
                                             </div>
 
-
                                             <div class="modal-footer">
-                                                <div class="col-md-12">
-                                                    <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-                                                    <a class="btn btn-success font AddService" ID="AddService"> &nbsp;&nbsp;<span class="bold">Add Service</span></a>
+                                            </div>
+                                            <div class="modal-footer">
+                                                <div class="col-md-12 text-right">
+                                                    <button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</button>
+                                                    <button type="button" class="btn btn-info waves-effect waves-light font AddService" ID="PackagingOption" ID="AddService">Save</button>
                                                 </div>
                                             </div>
                                         </div>
@@ -5231,7 +5408,7 @@ if (!empty($INRSYMBOL)) {
                     <!-- Revenue po taxes -->
                     <div class="col-md-12" style='border : 1px solid; display:none;' id="revenuepotaxes">
                         <br />
-                        <div class="col-md-12">
+                        <div class="row">
                             <div class="col-md-3">
                                 <label>Basic Amount <?php echo "($INRSYM)" ?> </label>
                                 <?php
@@ -5273,10 +5450,7 @@ if (!empty($INRSYMBOL)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="col-md-12">
-
-
-
+                        <div class="row">
                             <div class="col-md-3">
                                 <label>Total Packaging <?php echo "($INRSYM)" ?> </label>
                                 <?php
@@ -5284,8 +5458,6 @@ if (!empty($INRSYMBOL)) {
                                 echo form_input($data);
                                 ?>
                             </div>
-
-
                             <div class="col-md-3">
                                 <label>Total Insurance <?php echo "($INRSYM)" ?> </label>
                                 <?php
@@ -5293,10 +5465,6 @@ if (!empty($INRSYMBOL)) {
                                 echo form_input($data);
                                 ?>
                             </div>
-
-
-
-
                             <div class="col-md-3">
                                 <label>Total Freight <?php echo "($INRSYM)" ?></label>
                                 <?php
@@ -5304,7 +5472,6 @@ if (!empty($INRSYMBOL)) {
                                 echo form_input($data);
                                 ?>
                             </div>
-
                             <div class="col-md-3">
                                 <label>Total Order Value <?php echo "($INRSYM)" ?></label>
                                 <?php
@@ -5313,7 +5480,7 @@ if (!empty($INRSYMBOL)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="col-md-12">
+                        <div class="row">
                             <div class="col-md-12">
                                 <label>Special Instructions </label>
                                 <?php
@@ -5322,8 +5489,8 @@ if (!empty($INRSYMBOL)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="col-md-12">
-                            <div class="col-md-3 col-md-offset-9"><br />
+                        <div class="row">
+                            <div class="col-md-12 col-md-offset-9 text-right"><br />
                                 <input type="file" name="POFiles" id="POFiles"><br>
                                 <input type="hidden" name="txtPoRange" id="txtPoRange" />
                                 <input type="hidden" name="isEdit" id="isEdit" value="0" />
@@ -5335,111 +5502,87 @@ if (!empty($INRSYMBOL)) {
                                 <input type="hidden" name="txtSpecial" id="txtSpecial" />
                                 <input type="hidden" name="txtQuality" id="txtQuality" />
                                 <!-- <a class="btn btn-success Save"  ID="Save" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
-                                <a class="btn btn-reset Save" ID="Cancel" href="<?php echo base_url() . 'EmergencyPO'; ?>">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                <a class="btn btn-reset Save" ID="Cancel" href="<?php echo base_url() . 'EmergencyPO'; ?>" style="background-color: red;color: white;">&nbsp;&nbsp;<span class="bold">Reset</span></a>
                                 <a class="btn btn-success Submit" ID="Submit" onclick="showsubmit()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
 
 
                             </div>
                         </div>
-                        <div class="col-md-12" style="padding:0px;"><br />
+                        <div class="row" style="padding:0px;"><br />
                         </div>
                     </div>
 
                     <!-- Service po taxes -->
-                    <div class="col-md-12" style="border : 1px solid; display:none;" id="servicepotaxes">
-                        <div class="col-md-12" style="padding:0px;">
-
-                            <div class="col-md-2">
-                                <label>Basic Amount <?php echo "($INRSYM)" ?></label>
-                                <?php
-                                $data = array('name' => 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount'), 'id' => 'txtTotBasicAmount',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
+                    <div class="col-md-12" style="border: 1px solid; display:none;" id="servicepotaxes">
+                        <br>
+                        <div class="row">
+                            <div class="col-md-3">
+                                <label>Basic Amount (₹)</label>
+                                <input type="text" name="txtTotBasicAmount" value="" id="txtTotBasicAmount" class="form-control num" readonly="true">
                             </div>
-                            <div class="col-md-2">
-                                <label>CGST <?php echo "($INRSYM)" ?></label>
-                                <?php
-                                $data = array('name' => 'txtTotCgst', 'value' => set_value('txtTotCgst'), 'id' => 'txtTotCgst',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
+                            <div class="col-md-3">
+                                <label>CGST (₹)</label>
+                                <input type="text" name="txtTotCgst" value="" id="txtTotCgst" class="form-control num" readonly="true">
                             </div>
-
-
-                            <div class="col-md-2">
-                                <label>SGST <?php echo "($INRSYM)" ?></label>
-                                <?php
-                                $data = array('name' => 'txtTotSgst', 'value' => set_value('txtTotSgst'), 'id' => 'txtTotSgst',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
+                            <div class="col-md-3">
+                                <label>SGST (₹)</label>
+                                <input type="text" name="txtTotSgst" value="" id="txtTotSgst" class="form-control num" readonly="true">
                             </div>
-                            <div class="col-md-2">
-                                <label>IGST <?php echo "($INRSYM)" ?> </label>
-                                <?php
-                                $data = array('name' => 'txtTotIgst', 'value' => set_value('txtTotIgst'), 'id' => 'txtTotIgst',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                            <div class="col-md-2">
-                                <label>Other Allowances <?php echo "($INRSYM)" ?></label>
-                                <?php
-                                $data = array('name' => 'txtTotOtherAllo', 'value' => set_value('txtTotOtherAllo'), 'id' => 'txtTotOtherAllo',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-
-
-
-                            <div class="col-md-2">
-
-                                <label>Total Order Value <?php echo "($INRSYM)" ?></label>
-                                <?php
-                                $data = array('name' => 'txtTotalOrderValueSummaryService', 'value' => set_value('txtTotalOrderValueSummaryService'), 'id' => 'txtTotalOrderValueSummaryService',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-
-
+                            <div class="col-md-3">
+                                <label>IGST (₹)</label>
+                                <input type="text" name="txtTotIgst" value="" id="txtTotIgst" class="form-control num" readonly="true">
                             </div>
                         </div>
-                        <!--start new fields 1 sep-->
-                        <div class="col-md-12" id="emergdescofpoDiv" style="display:none;">
-                            <label>Description Of Service<span class="badge mandatory">*</label>
-                            <div class="form-group">
-                                <?php
-                                $data = array('name' => 'emergdescofpo', 'value' => set_value('emergdescofpo'), 'id' => 'emergdescofpo',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-                                echo form_textarea($data);
-                                ?>
+                        <div class="row">
+                            <div class="col-md-3">
+                                <label>Other Allowances (₹)</label>
+                                <input type="text" name="txtTotOtherAllo" value="" id="txtTotOtherAllo" class="form-control num" readonly="true">
                             </div>
-                        </div><!--end new fields 1 sep-->
-                        <div class="col-md-12" style="padding:0px;">
+                            <div class="col-md-3">
+                                <label>Total Order Value (₹)</label>
+                                <input type="text" name="txtTotalOrderValueSummaryService" value="" id="txtTotalOrderValueSummaryService" class="form-control num" readonly="true">
+                            </div>
+                        </div>
+                        <div class="row">
                             <div class="col-md-12">
-                                <label>Scope Of Work</label> <?php
-                                                                $data = array('name' => 'ScopeOfWork', 'value' => set_value('ScopeOfWork'), 'id' => 'ScopeOfWork',  'class' => 'form-control', 'rows' => '8');
-                                                                echo form_textarea($data); ?>
+                                <label>Description Of Service <span class="badge mandatory">*</span></label>
+                                <div class="form-group">
+                                    <?php
+                                    $data = array('name' => 'emergdescofpo', 'value' => set_value('emergdescofpo'), 'id' => 'emergdescofpo',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+                                    echo form_textarea($data);
+                                    ?>
+                                </div>
+
                             </div>
                         </div>
-
-                        <div class="col-md-12">
-                            <div class="row">
-                                <br />
-                                <div align="right" style="padding-right:10px">
-                                    <input type="file" name="POFile" id="POFile"><br>
-                                    <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="SpcialInstruction" id="SpcialInstruction">
-                                    <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress">
-
-
-                                    <input type="hidden" name="txtSpecialservice" id="txtSpecialservice" />
-
-                                    <input type="hidden" name="txtworkstatus" id="txtworkstatus" />
-                                    <a class="btn btn-reset Save" ID="Cancel" href="<?php echo base_url() . 'EmergencyPO'; ?>">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-                                    <a class="btn btn-success Submit" ID="Submit" onclick="showsubmit()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                </div><br />
+                        <div class="row">
+                            <div class="col-md-12">
+                                <label>Scope Of Work</label>
+                                <div class="form-group">
+                                    <?php
+                                    $data = array('name' => 'ScopeOfWork', 'value' => set_value('ScopeOfWork'), 'id' => 'ScopeOfWork',  'class' => 'form-control', 'rows' => '8');
+                                    echo form_textarea($data); ?>
+                                </div>
                             </div>
                         </div>
-                        <br />
+                        <div class="row">
+                            <div class="col-md-12 col-md-offset-9 text-right"><br>
+                                <input type="file" name="POFile" id="POFile"><br>
+                                <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="SpcialInstruction" id="SpcialInstruction">
+                                <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress">
+                                <input type="hidden" name="txtSpecialservice" id="txtSpecialservice">
+                                <input type="hidden" name="txtworkstatus" id="txtworkstatus">
+                                <a class="btn btn-reset Save" id="Cancel" href="http://localhost/ria/EmergencyPO">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                <a class="btn btn-success Submit" id="Submit" onclick="showsubmit()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                            </div>
+                        </div>
+                        <div class="row" style="padding:0px;"><br>
+                        </div>
                     </div>
+
                 </div>
             </div>
 
@@ -5561,20 +5704,25 @@ if (!empty($INRSYMBOL)) {
             index = parseInt(index) + 1;
 
             var template = jQuery("#RevenueList").html();
+            
+            var html = `
+                <tr>
+                    <td>${temp}</td>
+                    <td>${Reqnumber}</td>
+                    <td>${materialCode}</td>
+                    <td>${materialName}</td>
+                    <td>${quantity}</td>
+                    <td>${uom}</td>
+                    <td>${itemRate}</td>
+                    <td>${basicval}</td>
+                    <td>${TotalTaxValue}</td>
+                    <td>${TotalOrderValue}</td>
+                </tr>
+            `;
+            $('#RevenueAppend').empty();
 
-
-            $('#RevenueAppend').append(_.template(template, {
-                index: temp,
-                ReqNo: Reqnumber,
-                MaterialCode: materialCode,
-                MaterialName: materialName,
-                Quantity: quantity,
-                UOM: uom,
-                Rate: itemRate,
-                BasicAmount: basicval,
-                Taxvalue: TotalTaxValue,
-                TotalValue: TotalOrderValue
-            }));
+            $('#RevenueAppend').append(html);
+            // $('#serviceTax').row.add($(html)).draw();
 
 
             var theForm = $(".CreatealterPO");
@@ -5615,7 +5763,7 @@ if (!empty($INRSYMBOL)) {
             addHidden(theForm, "RevenueAfterIgst" + temp, AfterIgst);
             $('#txtRowCount1').val(temp);
             clearRevenueModalFields();
-            // $('#REVENUE').modal('hide');
+            $('#REVENUE').modal('hide');
 
         }
 
@@ -5726,7 +5874,7 @@ if (!empty($INRSYMBOL)) {
     function Save() {
         $('#txtStatus').val('<?php echo PO_DRAFT; ?>');
         if (validate()) {
-            $('#content').loader('show');
+            // $('#content').loader('show');
             var formData = new FormData($('.CreatePO')[0]);
 
             $.ajax({
@@ -5738,7 +5886,7 @@ if (!empty($INRSYMBOL)) {
                 url: "<?php echo base_url() ?>purchaseorder/addNewPurchaseOrder",
                 success: function(data) {
                     if (data) {
-                        $('#content').loader('hide');
+                        // $('#content').loader('hide');
                         alert(data);
                         //$('#txtRowCount').val('');
                         //$('#txtDeletedRow').val('');
@@ -5807,66 +5955,6 @@ if (!empty($INRSYMBOL)) {
         //     yearRange: '-100:+0'
         // });
 
-
-
-        $('#purpose').on('change', function() {
-            if (this.value == 'REVENUE') //Revenue po
-            {
-
-                $("#QualityChecked").show();
-                $("#revenuepotaxes").show();
-                $("#currencyexchange").hide();
-                $("#servicepotaxes").hide();
-                $("#workstatus").hide();
-                $('#DisplayScheduleDiv').hide();
-                $('#EditDisplayScheduleDiv').hide();
-                $('#ServicePeriodOption').hide();
-                //$('#NoServices').hide();
-                $("#Deliveryby").show();
-                // $("#selectdeliveryby").show();
-                $("#txtPoRange").show();
-                $("#emergdescofpoDiv").hide();
-                $('#typeOptions').html('Revenue Type Options');
-            } else if (this.value == 'SERVICE') // Service po  
-            {
-                $("#QualityChecked").hide();
-                $("#servicepotaxes").show();
-                $("#Deliveryby").show();
-                $("#workstatus").show();
-                $("#currencyexchange").hide();
-                // $("#selectdeliveryby").hide();
-                $("#revenuepotaxes").hide();
-                $('#DisplayScheduleDiv').show();
-                $('#EditDisplayScheduleDiv').show();
-                $("#txtPoRange").hide();
-                $("#emergdescofpoDiv").show();
-                $('#typeOptions').html('Service Type Options');
-
-            } else if (this.value == 'IMPORT') // Import po  
-            {
-                $("#currencyexchange").show();
-
-                $("#revenuepotaxes").hide();
-                $("#servicepotaxes").hide();
-                $("#workstatus").hide();
-                $('#typeOptions').html('Import Type Options');
-            } else if (this.value == 'CAPITAL') // Capital po
-            {
-                $("#currencyexchange").show();
-
-                $("#revenuepotaxes").hide();
-                $("#servicepotaxes").hide();
-                $("#workstatus").hide();
-                $('#typeOptions').html('Capital Type Options');
-            } else // Default
-            {
-                $("#currencyexchange").hide();
-
-                $("#revenuepotaxes").hide();
-                $("#servicepotaxes").hide();
-                $("#workstatus").hide();
-            }
-        });
         clearTotalItemValues();
     });
     $(document).ready(function() {
@@ -5944,141 +6032,135 @@ if (!empty($INRSYMBOL)) {
         }
     });
 
-
-
-
-
-
-
-
-
-    $('#drpSupplier').change(function() {
-
-        var id = $('#drpSupplier').val();
-        $("#SupAddress").val('');
-
-        if (id != '0') {
-            var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
-            var supPaymentTerms = '';
-            $.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);
-                    }
-                    supPaymentTerms = obj.PaymentID;
-
-
-
-
-
-                }
-
-            });
-            if (supPaymentTerms != 'PT08') {
-                $('#otheroptiondiv').hide();
-                $('#Otherpayment').val('');
-            } else if (supPaymentTerms == 'PT08') {
-                $('#otheroptiondiv').show();
-
-            }
-            $('#PaymentMethod').empty();
-            var paymentList = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
-
-            $.each(paymentList, function(idx1, obj1) {
-
-
-                if (obj1.PaymentID == supPaymentTerms) {
-                    $("#PaymentMethod").append($('<option></option>').val(obj1.PaymentID).html(obj1.PaymentTerms));
-
-
-
-
-
-                }
-
-
-            });
-
-            $.each(paymentList, function(idx, obj) {
-
-
-                if (obj.PaymentID != supPaymentTerms) {
-                    $("#PaymentMethod").append($('<option></option>').val(obj.PaymentID).html(obj.PaymentTerms));
-
-
-                }
-
-
-            });
-
-        } else {
-            alert('Please select the SupplierID');
-            return false;
-        }
-
-    });
-    /*get cost center name using department*/
-    var CostArray = '';
-    $('#DepartmentName').change(function() {
-        $("#AvalBuget").val('');
-        $('#AlertImg').attr("style", "display:none;");
-        CostArray = '';
-        var id = $('#DepartmentName').val();
-        if (id != '0') {
-            $('#content').loader('show');
-
-
-            $.ajax({
-                data: {
-                    id: id
-                },
-                type: "POST",
-                url: "<?php echo base_url() ?>emergencypurchaseorder/getCostCenterName",
-                success: function(data) {
-                    if (data) {
-                        CostArray = data;
-                        $('#CostCenterName').empty();
-                        $("#CostCenterName").append($('<option></option>').val("0").html("Select Cost Center"));
-
-                        $.each(JSON.parse(data), function(index, value) {
-
-                            $("#CostCenterName").append($('<option></option>').val(value.CostCenterCode).html(value.CostCenterCode + "-" + value.CostCenterName));
-
-
-                        });
-                        $('#content').loader('hide');
-
-
-                    } else {
-                        alert("Error");
-                    }
-
-                }
-
-            });
-
-
-
-
-        } else {
-            alert('Please select the Department');
-            return false;
-        }
-
-    });
-    /**
-     * update available budget calculation using regNo and cost center  
-     */
     $(document).ready(function() {
+
+        $('#drpSupplier').on('change', function() {
+
+            var id = $('#drpSupplier').val();
+            $("#SupAddress").val('');
+
+            if (id != '0') {
+                var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
+                var supPaymentTerms = '';
+                $.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);
+                        }
+                        supPaymentTerms = obj.PaymentID;
+
+
+
+
+
+                    }
+
+                });
+                if (supPaymentTerms != 'PT08') {
+                    $('#otheroptiondiv').hide();
+                    $('#Otherpayment').val('');
+                } else if (supPaymentTerms == 'PT08') {
+                    $('#otheroptiondiv').show();
+
+                }
+                $('#PaymentMethod').empty();
+                var paymentList = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
+
+                $.each(paymentList, function(idx1, obj1) {
+
+
+                    if (obj1.PaymentID == supPaymentTerms) {
+                        $("#PaymentMethod").append($('<option></option>').val(obj1.PaymentID).html(obj1.PaymentTerms));
+
+
+
+
+
+                    }
+
+
+                });
+
+                $.each(paymentList, function(idx, obj) {
+
+
+                    if (obj.PaymentID != supPaymentTerms) {
+                        $("#PaymentMethod").append($('<option></option>').val(obj.PaymentID).html(obj.PaymentTerms));
+
+
+                    }
+
+
+                });
+
+            } else {
+                alert('Please select the SupplierID');
+                return false;
+            }
+
+        });
+        /*get cost center name using department*/
+        var CostArray = '';
+        $('#DepartmentName').change(function() {
+            $("#AvalBuget").val('');
+            $('#AlertImg').attr("style", "display:none;");
+            CostArray = '';
+            var id = $('#DepartmentName').val();
+            if (id != '0') {
+                // $('#content').loader('show');
+
+
+                $.ajax({
+                    data: {
+                        id: id
+                    },
+                    type: "POST",
+                    url: "<?php echo base_url() ?>emergencypurchaseorder/getCostCenterName",
+                    success: function(data) {
+                        if (data) {
+                            CostArray = data;
+                            $('#CostCenterName').empty();
+                            $("#CostCenterName").append($('<option></option>').val("0").html("Select Cost Center"));
+
+                            $.each(JSON.parse(data), function(index, value) {
+
+                                $("#CostCenterName").append($('<option></option>').val(value.CostCenterCode).html(value.CostCenterCode + "-" + value.CostCenterName));
+
+
+                            });
+                            // $('#content').loader('hide');
+
+
+                        } else {
+                            alert("Error");
+                        }
+
+                    }
+
+                });
+
+
+
+
+            } else {
+                alert('Please select the Department');
+                return false;
+            }
+
+        });
+        /**
+         * update available budget calculation using regNo and cost center  
+         */
+
         var id = $('#CostCenterName').val();
         $("#AvlBudAmt").val(0);
         var ReqType = $('#purpose').val();
 
         if (id != '0' && ReqType != '-1') {
 
-            $('#content').loader('show');
+            // $('#content').loader('show');
             $.ajax({
                 data: {
                     id: id,
@@ -6088,10 +6170,10 @@ if (!empty($INRSYMBOL)) {
                 url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
                 success: function(data) {
                     if (data) {
-                        $('#content').loader('hide');
+                        // $('#content').loader('hide');
                         $("#AvalBuget").val(parseFloat(data).toFixed(2));
                     } else {
-                        $('#content').loader('hide');
+                        // $('#content').loader('hide');
                         // alert("Error");
                     }
 
@@ -6115,7 +6197,7 @@ if (!empty($INRSYMBOL)) {
         if (id != '0' && ReqType != '-1') {
 
 
-            $('#content').loader('show');
+            // $('#content').loader('show');
             $.ajax({
                 data: {
                     id: id,
@@ -6125,10 +6207,10 @@ if (!empty($INRSYMBOL)) {
                 url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
                 success: function(data) {
                     if (data) {
-                        $('#content').loader('hide');
+                        // $('#content').loader('hide');
                         $("#AvalBuget").val(data ? parseFloat(data).toFixed(2) : 0);
                     } else {
-                        $('#content').loader('hide');
+                        // $('#content').loader('hide');
                         // alert("Error");
                     }
 
@@ -6143,161 +6225,9 @@ if (!empty($INRSYMBOL)) {
     /**
      * getting item name and uom using global variable materialData each change
      */
-    $('#ServiceMaterialCode').change(function() {
-        var selectedMaterialCode = '';
-        selectedMaterialCode = $("#ServiceMaterialCode").val();
-        $.each(JSON.parse(materialData), function(index, value) {
-            if (selectedMaterialCode == value.MaterialCode) {
-                $("#ServiceDescription").val(value.MaterialName);
-                $("#ServiceUOM").val(value.UOM);
-                if ($('#ScheduleType').val().trim() != 'Recurring') {
-                    $('#FrequencyChange').val('One Time');
 
 
 
-                    $('#ServiceNo').val(1);
-                } else {
-                    $('#FrequencyChange').val($('#ScheduleType').val());
-
-                }
-            }
-
-        });
-        var d = $('#drpSupplier').val();
-        $.ajax({
-            url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
-            type: 'POST',
-            data: {
-                supplierid: d,
-                materialcode: selectedMaterialCode
-            },
-            success: function(response) {
-                if (response) alert(response);
-            }
-        });
-
-    });
-    /**
-     * getting item name and uom using global variable materialData each change in revenue
-     */
-    $('#MaterialCode').change(function() {
-        var selectedRevenueMaterialCode = '';
-        selectedRevenueMaterialCode = $("#MaterialCode").val();
-        $.each(JSON.parse(materialData), function(index, value) {
-            if (selectedRevenueMaterialCode == value.MaterialCode) {
-                $("#ItemName").val(value.MaterialName);
-                $("#UOM").val(value.UOM);
-
-            }
-
-        });
-        var d = $('#drpSupplier').val();
-        $.ajax({
-            url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
-            type: 'POST',
-            data: {
-                supplierid: d,
-                materialcode: selectedRevenueMaterialCode
-            },
-            success: function(response) {
-                if (response) alert(response);
-            }
-        });
-
-    });
-
-    /**
-     * get material list when selecting the request type
-     */
-    var materialData;
-
-    $('#purpose').change(function() {
-        var input = '';
-        input = $("#purpose").val();
-        if (input == -1) {
-            $("#POType").val('');
-
-        } else {
-            $("#POType").val(input);
-            // $('#content').loader('show');
-            $.ajax({
-                data: {
-                    input: input
-                },
-                type: "POST",
-                url: "<?php echo base_url() ?>emergencypurchaseorder/getMaterialCode",
-                success: function(data) {
-
-                    if (data) {
-                        materialData = data;
-                        if (input == 'SERVICE') {
-
-                            $('#ServiceMaterialCode').empty();
-                            $("#ServiceMaterialCode").append($('<option></option>').val("0").html("Select Item Code"));
-
-                            $.each(JSON.parse(data), function(index, value) {
-                                $("#ServiceMaterialCode").append($('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
-
-
-                            });
-                        } else if (input == 'REVENUE') {
-                            $('#MaterialCode').empty();
-                            $("#MaterialCode").append($('<option></option>').val("0").html("Select Item Code"));
-
-                            $.each(JSON.parse(data), function(index, value) {
-                                $("#MaterialCode").append($('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
-
-
-                            });
-                        } else {
-
-                        }
-
-                        $('#content').loader('hide');
-
-                    }
-
-                }
-            });
-
-
-
-
-            var id = $('#CostCenterName').val();
-            $("#AvlBudAmt").val(0);
-            var ReqType = $('#purpose').val();
-            if (id != '0' && ReqType != '-1') {
-
-
-                $('#content').loader('show');
-                $.ajax({
-                    data: {
-                        id: id,
-                        type: ReqType
-                    },
-                    type: "POST",
-                    url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
-                    success: function(data) {
-                        if (data) {
-                            $('#content').loader('hide');
-                            $("#AvalBuget").val(data ? parseFloat(data).toFixed(2) : 0);
-                        } else {
-                            $('#content').loader('hide');
-                            alert("Error");
-                        }
-
-                    }
-                });
-            } else {
-                // alert('Please select Request Type');
-                return false;
-            }
-
-
-
-        }
-
-    });
 
     /**
                used to update cgst % to sgst
@@ -6460,19 +6390,24 @@ if (!empty($INRSYMBOL)) {
 
             var template = jQuery("#ServiceList").html();
 
+            var html = `
+                <tr>
+                    <td>${temp}</td>
+                    <td>${Reqnumber}</td>
+                    <td>${materialCode}</td>
+                    <td>${materialName}</td>
+                    <td>${quantity}</td>
+                    <td>${uom}</td>
+                    <td>${itemRate}</td>
+                    <td>${basicval}</td>
+                    <td>${TotalTaxValue}</td>
+                    <td>${TotalOrderValue}</td>
+                </tr>
+            `;
+            $('#ServiceAppend').empty();
+            $('#ServiceAppend').append(html);
+
 
-            $('#ServiceAppend').append(_.template(template, {
-                index: temp,
-                ReqNo: Reqnumber,
-                MaterialCode: materialCode,
-                MaterialName: materialName,
-                Quantity: quantity,
-                UOM: uom,
-                Rate: itemRate,
-                BasicAmount: basicval,
-                Taxvalue: TotalTaxValue,
-                TotalValue: TotalOrderValue
-            }));
 
             clearServiceModalFields();
 
@@ -6503,6 +6438,7 @@ if (!empty($INRSYMBOL)) {
             addHidden(theForm, "FrequencySchedule" + temp, FrequencySchedule);
 
             $('#txtRowCount').val(temp);
+            $('#SERVICE').modal('hide');
 
         }
 
@@ -6978,8 +6914,8 @@ $('#content').loader('hide');
      */
     function Save(status) {
 
-        // alert('Save fn');
-
+        // Determine the status value based on the input
+        var stat;
         if (status == '0') {
             stat = '<?php echo PO_DRAFT; ?>';
         } else if (status == '1') {
@@ -6988,42 +6924,32 @@ $('#content').loader('hide');
             stat = '<?php echo SPECIAL_PO; ?>';
         }
 
+        // Trigger TinyMCE to save the editor content
         tinyMCE.triggerSave();
+
+        // Update form values with the current values from inputs
         var splinstr = $('#ScopeOfWork').val();
-        $('#ScopeOfWork').val(splinstr);
-
-        var deladd = $('#DeliveryAddr').val();
         $('#SpcialInstruction').val(splinstr);
-        $('#txtDeliveryAddress').val(deladd);
+        $('#txtDeliveryAddress').val($('#DeliveryAddr').val());
         $('#txtStatus').val(stat);
-        var TextRowCount = $('#txtRowCount').val();
-        var TextDeletedRowCount = $('#txtDeletedRow').val();
-        var TextTotalOrderValueSummaryService = $('#txtTotalOrderValueSummaryService').val();
-        var TextSpcialInstruction = $('#ScopeOfWork').val();
-        var TextStatus = stat;
-        var PaymentMethod = $('#PaymentMethod').val();
-
-
-        var workStatus = $('#workstatusValue').val();
-
-        $('#txtworkstatus').val(workStatus);
 
+        // Gather additional form values
+        var formData = new FormData($('#CreatealterPO')[0]);
+        formData.append('TextRowCount', $('#txtRowCount').val());
+        formData.append('TextDeletedRowCount', $('#txtDeletedRow').val());
+        formData.append('TextTotalOrderValueSummaryService', $('#txtTotalOrderValueSummaryService').val());
+        formData.append('TextSpcialInstruction', splinstr);
+        formData.append('TextStatus', stat);
+        formData.append('PaymentMethod', $('#PaymentMethod').val());
+        formData.append('workStatus', $('#workstatusValue').val());
 
+        // Perform form validation
         if (validate()) {
-
             if (document.getElementById('serviceTax').rows.length < 2) {
                 alert('Please Select Line item to Create PO');
                 $('#Deliverydt').focus();
                 return false;
-            }
-
-
-            //    else if(parseInt($('#AvalBuget').val()) < parseInt(TextTotalOrderValueSummaryService)) {
-            // alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
-
-            //        return false;
-            //     }
-            else if ($('#Otherpayment').val() == '' && $('#PaymentMethod').val() == 'PT08') {
+            } else if ($('#Otherpayment').val() == '' && $('#PaymentMethod').val() == 'PT08') {
                 alert('Please Enter Other Payable Terms Description');
                 $('#Otherpayment').focus();
                 return false;
@@ -7035,82 +6961,71 @@ $('#content').loader('hide');
                 alert('Please Select POType');
                 $('#PoTypeOptions').focus();
                 return false;
-
             } else {
-
-                //alert('Save fn');
-                // $('#content').loader('show');
-                // $.ajax({
-                //     data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeletedRowCount="+TextDeletedRowCount+"&TextTotalOrderValueSummaryService="+TextTotalOrderValueSummaryService+"&TextStatus="+TextStatus+"&PaymentMethod="+PaymentMethod+"&workStatus="+workStatus,
-                //     type:"POST",
-                //     url:"<?php echo base_url() ?>emergencypurchaseorder/addNewServicePurchaseOrder",
-                //     success:function(data) {
-                //         if(data)
-                //         {
-                //             $('#content').loader('hide');
-                //             alert(data);
-                //             $('#txtRowCount').val('');
-                //             $('#txtDeletedRow').val('');
-                //             $('#SpcialInstruction').val('');
-                //             $('#txtDeliveryAddress').val('');
-                //            window.location = "purchaseorderListing";
-
-                //         }
-                //         else
-                //         {
-                //             $('#content').loader('hide');
-                //             alert("Error");
-                //         }
-
-                //     }
-
-                // });
-
-                $('#content').loader('show');
-                $("#CreatealterPO").attr("method", "post");
-                $("#CreatealterPO").attr("enctype", "multipart/form-data");
-                $("#CreatealterPO").attr("action", "emergencypurchaseorder/addNewServicePurchaseOrder");
-                $('#CreatealterPO').submit();
-
-
+                // Submit the form using AJAX
+                $.ajax({
+                    url:"<?php echo base_url() ?>emergencypurchaseorder/addNewServicePurchaseOrder",
+                    type: "POST",
+                    data: formData,
+                    processData: false, // Prevent jQuery from automatically transforming the data into a query string
+                    contentType: false, // Prevent jQuery from setting the content type header
+                    success: function(data) {
+                        // Handle the server response
+                        // $('#content').loader('hide');
+                        // alert(data);
+                        console.log(data);
+                        $('#txtRowCount').val('');
+                        $('#txtDeletedRow').val('');
+                        $('#SpcialInstruction').val('');
+                        $('#txtDeliveryAddress').val('');
+                        window.location = "purchaseorderListing";
+                    },
+                    error: function(xhr, status, error) {
+                        // Handle errors
+                        // $('#content').loader('hide');
+                        alert("Error: " + error);
+                    }
+                });
             }
-
         }
     }
 
 
+
     /**
      * This function is used to submit and save the emergency Revenue Po list
      */
     function RevenueSave(status) {
+        // Determine the status value based on the input
+        var stat;
         if (status == '0') {
             stat = '<?php echo PO_DRAFT; ?>';
-        } else if (status == '3') {
-            stat = '<?php echo SPECIAL_PO; ?>';
-        } else if (status == '4') {
+        } else if (status == '3' || status == '4') {
             stat = '<?php echo SPECIAL_PO; ?>';
         } else {
             stat = '<?php echo REQITEM_Emergency_PO_CREATED; ?>';
         }
 
-
+        // Trigger TinyMCE to save the editor content
         tinyMCE.triggerSave();
+
+        // Update form values with the current values from inputs
         var splinstr = $('#txtSpcialInstruction').val();
         $('#SpcialInstruction').val(splinstr);
-        var deladd = $('#DeliveryAddr').val();
-
-        $('#txtDeliveryAddress').val(deladd);
+        $('#txtDeliveryAddress').val($('#DeliveryAddr').val());
         $('#txtStatus1').val(stat);
-        var TextRowCount = $('#txtRowCount1').val();
-        var TextDeletedRowCount = $('#txtDeletedRow1').val();
-        var txtTotBasicAmountRevenue = $('#txtTotBasicAmountRevenue').val();
-        var txtTotalDiscount = $('#txtTotalDiscount').val();
-        var finalbasicamtrate = txtTotBasicAmountRevenue - txtTotalDiscount;
-        var TextSpcialInstruction = $('#txtSpcialInstruction').val();
-        var TextStatus = stat;
-        var PaymentMethod = $('#PaymentMethod').val();
 
+        // Gather additional form values
+        var formData = new FormData($('#CreatealterPO')[0]);
+        formData.append('TextRowCount', $('#txtRowCount1').val());
+        formData.append('TextDeletedRowCount', $('#txtDeletedRow1').val());
+        formData.append('TextTotalOrderValueSummaryService', $('#txtTotalOrderValueSummary').val());
+        formData.append('TextSpcialInstruction', splinstr);
+        formData.append('TextStatus', stat);
+        formData.append('PaymentMethod', $('#PaymentMethod').val());
+        formData.append('workStatus', $('#workstatusValue').val());
 
+        // Perform form validation
         if (validate()) {
             if (document.getElementById('serviceTax').rows.length < 2) {
                 alert('Please Select Line item to Create PO');
@@ -7124,55 +7039,35 @@ $('#content').loader('hide');
                 alert('Please Enter Other Payment Description..!');
 
                 return false;
+            } else {
+                // Submit the form using AJAX
+                $.ajax({
+                    url: "<?php echo base_url() ?>emergencypurchaseorder/addNewRevenuePurchaseOrder",
+                    type: "POST",
+                    data: formData,
+                    processData: false, // Prevent jQuery from automatically transforming the data into a query string
+                    contentType: false, // Prevent jQuery from setting the content type header
+                    success: function(data) {
+                        // Handle the server response
+                        // alert(data);
+                        console.log(data);
+                        
+                        // $('#txtRowCount1').val('');
+                        // $('#txtDeletedRow1').val('');
+                        // $('#SpcialInstruction').val('');
+                        // $('#txtDeliveryAddress').val('');
+                        // window.location = "purchaseorderListing";
+                    },
+                    error: function(xhr, status, error) {
+                        // Handle errors
+                        alert("Error: " + error);
+                    }
+                });
             }
-
-
-            //  else if($('#PoTypeOptions').val()== "0")
-            //  {
-            //     alert('Please Select POType');
-            //    $('#PoTypeOptions').focus();
-            //    return false;
-
-            // }
-            else {
-                // $('#content').loader('show');
-                // $.ajax({
-                //     data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeletedRowCount="+TextDeletedRowCount+"&TextStatus="+TextStatus,
-                //     type:"POST",
-                //     url:"<?php echo base_url() ?>emergencypurchaseorder/addNewRevenuePurchaseOrder",
-                //     success:function(data) {
-                //         if(data)
-                //         {
-                //             $('#content').loader('hide');
-                //             alert(data);
-                //             $('#txtRowCount').val('');
-                //             $('#txtDeletedRow').val('');
-                //             $('#SpcialInstruction').val('');
-                //             $('#txtDeliveryAddress').val('');
-                //             window.location =    "purchaseorderListing";
-
-                //         }
-                //         else
-                //         {
-                //             $('#content').loader('hide');
-                //             alert("Error");
-                //         }
-
-                //     }
-
-                // });
-                //alert("else");
-                var tablevalue = $('#specialtable').tableToJSON(); // Convert the table into a javascript object
-                var jsondata = JSON.stringify(tablevalue);
-                $('#tablevalues').val(jsondata);
-                $("#CreatealterPO").attr("method", "post");
-                $("#CreatealterPO").attr("enctype", "multipart/form-data");
-                $("#CreatealterPO").attr("action", "emergencypurchaseorder/addNewRevenuePurchaseOrder");
-                $('#CreatealterPO').submit();
-            }
-
         }
     }
+
+
     /**
      * This function is used to calculate the total amounts after delete the row
      */
@@ -7258,7 +7153,7 @@ $('#content').loader('hide');
         var EditReqType = $('#EditReqNo').val();
         if (getCostId != '0') {
 
-            $('#content').loader('show');
+            // $('#content').loader('show');
             $.ajax({
                 data: {
                     id: getCostId,
@@ -7268,10 +7163,10 @@ $('#content').loader('hide');
                 url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
                 success: function(data) {
                     if (data) {
-                        $('#content').loader('hide');
+                        // $('#content').loader('hide');
                         $("#EditAvlBudAmt").val(data ? data : 0);
                     } else {
-                        $('#content').loader('hide');
+                        // $('#content').loader('hide');
                         alert("Error");
                     }
 
@@ -8593,4 +8488,19 @@ $('#content').loader('hide');
             }
         }
     });
+
+
+
+    $('select').each(function() {
+        var $this = $(this);
+
+        // Check if the element already has the class, if not add it
+        if (!$this.hasClass('form-control')) {
+            $this.addClass('form-control');
+        }
+
+        if (!$this.hasClass('select2')) {
+            $this.addClass('select2');
+        }
+    });
 </script>
\ No newline at end of file
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index 1e3ea4a9..5e846ed8 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -267,6 +267,8 @@ if (! function_exists('form_dropdown')) {
      */
     function form_dropdown($data = '', $options = [], $selected = [], $extra = ''): string
     {
+
+        
         $defaults = [];
         if (is_array($data)) {
             if (isset($data['selected'])) {

From e2885dd7dc697943a09cc17ec66899098ccb5332 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Sat, 31 Aug 2024 11:37:11 +0000
Subject: [PATCH 2/3] PO section

---
 app/Views/EditservicePurchaseorder.php |   70 +-
 app/Views/capitalpurchaseorder.php     |   50 +-
 app/Views/editCapitalAmendPO.php       |   64 +-
 app/Views/editCapitalPo.php            |  158 +-
 app/Views/editImportAmendPO.php        | 2813 +++++++++++-------------
 app/Views/editRevenueAmendPO.php       |  111 +-
 app/Views/editRevenuepurchaseorder.php |  137 +-
 app/Views/editServiceAmendPO.php       |   56 +-
 app/Views/editimportpo.php             |   80 +-
 app/Views/importpo.php                 |   89 +-
 app/Views/purchaseorder.php            |   48 +-
 app/Views/servicePurchaseorder.php     |    3 -
 12 files changed, 1729 insertions(+), 1950 deletions(-)

diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index 23c0eca2..a3d424eb 100644
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -869,7 +869,7 @@ if (!empty($getlogpodtl)) {
 										<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;');
+											$data = array('type'=>'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
 											echo form_input($data);
 											?>
 										</div>
@@ -1497,7 +1497,7 @@ if (!empty($getlogpodtl)) {
 		<!-- Model for servicepo -->
 		<div id="SERVICE" class="modal fade" tabindex="-1" role="dialog"
 			aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-			<div class="modal-dialog modal-lg">
+			<div class="modal-dialog modal-full-width">
 				<div class="modal-content">
 					<div class="modal-header">
 						<h4 class="modal-title">Add Service Purchase Order Item</h4>
@@ -1740,7 +1740,7 @@ if (!empty($getlogpodtl)) {
 		<!-- Service Special PO Modal Starts Here -->
 		<div id="EditServiceSplPOModel" class="modal fade" tabindex="-1" role="dialog"
 			aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-			<div class="modal-dialog modal-lg">
+			<div class="modal-dialog modal-full-width">
 				<div class="modal-content">
 					<div class="modal-header">
 						<h4 class="modal-title">Update Bill <span id="bill"><span> Details</h4>
@@ -1775,7 +1775,7 @@ if (!empty($getlogpodtl)) {
 		<!-- Edit Service Modal content Starts Here-->
 		<div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog"
 			aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-			<div class="modal-dialog modal-lg">
+			<div class="modal-dialog modal-full-width">
 				<div class="modal-content">
 					<div class="modal-header">
 						<h4 class="modal-title">Edit Service Purchase Order Item</h4>
@@ -2038,7 +2038,7 @@ if (!empty($getlogpodtl)) {
 		<!-- View Service Modal content Starts Here-->
 		<div id="VIEWSERVICE" class="modal fade" tabindex="-1" role="dialog"
 			aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-			<div class="modal-dialog modal-lg">
+			<div class="modal-dialog modal-full-width">
 				<div class="modal-content">
 					<div class="modal-header">
 						<h4 class="modal-title">View Service Purchase Order Item</h4>
@@ -2319,7 +2319,7 @@ if (!empty($getlogpodtl)) {
 
 
 
-		<script type="text/html" id="ServiceList">
+		<!-- <script type="text/html" id="ServiceList">
 			<tr id="<%=index%>">
 				<td align="left"><%=index%></td>
 				<td align="left"><%=ReqNo%></td>
@@ -2335,7 +2335,7 @@ if (!empty($getlogpodtl)) {
 					<a data-target='#EDITSERVICE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITSERVICE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
 				</td>
 			</tr>
-		</script>
+		</script> -->
 		<script>
 			var index = <?php echo $index; ?>;
 			var userid = '';
@@ -2421,21 +2421,48 @@ if (!empty($getlogpodtl)) {
 
 					index = parseInt(index) + 1;
 
-					var template = jQuery("#ServiceList").html();
+					// var template = jQuery("#ServiceList").html();
 
 
-					$('#ServiceAppend').append(_.template(template, {
-						index: temp,
-						ReqNo: Reqnumber,
-						MaterialCode: materialCode,
-						MaterialName: materialName,
-						Quantity: quantity,
-						UOM: uom,
-						Rate: itemRate,
-						BasicAmount: basicval,
-						Taxvalue: TotalTaxValue,
-						TotalValue: TotalOrderValue
-					}));
+					// $('#ServiceAppend').append(_.template(template, {
+					// 	index: temp,
+					// 	ReqNo: Reqnumber,
+					// 	MaterialCode: materialCode,
+					// 	MaterialName: materialName,
+					// 	Quantity: quantity,
+					// 	UOM: uom,
+					// 	Rate: itemRate,
+					// 	BasicAmount: basicval,
+					// 	Taxvalue: TotalTaxValue,
+					// 	TotalValue: TotalOrderValue
+					// }));
+					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>
+`;
+
+// Append the generated HTML to your table body
+$('#ServiceAppend').append(rowHtml);
+
 
 
 
@@ -3195,6 +3222,7 @@ if (!empty($getlogpodtl)) {
 				id = '';
 
 			});
+			$(document).ready(function() {
 			$("#EDITSERVICE").on("shown.bs.modal", function(e) {
 
 
@@ -3393,7 +3421,7 @@ if (!empty($getlogpodtl)) {
 					});
 				}
 
-			});
+			});});
 			$("#insuranceStatus").change(function() {
 				var InsNo = '<?php echo $InsuranceNumber; ?>';
 
diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php
index 646da27b..5ba38180 100644
--- a/app/Views/capitalpurchaseorder.php
+++ b/app/Views/capitalpurchaseorder.php
@@ -134,29 +134,29 @@
             $("#MaterialCode").select2();
             $("#currencytype").select2();
 
-            $("#PODate").datepicker({
-                //minDate : d,
-                maxDate: 'now',
-                dateFormat: 'dd-mm-yy',
-                changeMonth: true,
-                changeYear: true,
-                yearRange: '-100:+0'
-            });
-            $("#Deliverydt").datepicker({
-                minDate: 'now',
-                dateFormat: 'dd-mm-yy',
-                changeMonth: true,
-                changeYear: true,
-                yearRange: '0:+10'
-            });
-            $("#Exchangerateon").datepicker({
-                //minDate : d,
-                maxDate: 'now',
-                dateFormat: 'dd-mm-yy',
-                changeMonth: true,
-                changeYear: true,
-                yearRange: '-100:+0'
-            });
+            // $("#PODate").datepicker({
+            //     //minDate : d,
+            //     maxDate: 'now',
+            //     dateFormat: 'dd-mm-yy',
+            //     changeMonth: true,
+            //     changeYear: true,
+            //     yearRange: '-100:+0'
+            // });
+            // $("#Deliverydt").datepicker({
+            //     minDate: 'now',
+            //     dateFormat: 'dd-mm-yy',
+            //     changeMonth: true,
+            //     changeYear: true,
+            //     yearRange: '0:+10'
+            // });
+            // $("#Exchangerateon").datepicker({
+            //     //minDate : d,
+            //     maxDate: 'now',
+            //     dateFormat: 'dd-mm-yy',
+            //     changeMonth: true,
+            //     changeYear: true,
+            //     yearRange: '-100:+0'
+            // });
             $('#Date').click(function() {
 
                 //for Dispatch range selection  
@@ -395,7 +395,7 @@
                                         <label>Delivery Date<span class="text-danger">*</span></label>
                                         <div>
                                             <?php
-                                            $data = array('name' => 'Deliverydate', 'value' => set_value('Deliverydate', $CurrentDate), 'id' => 'Deliverydate',  'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
+                                            $data = array('type'=>'date','name' => 'Deliverydate', 'value' => set_value('Deliverydate', $CurrentDate), 'id' => 'Deliverydate',  'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
                                             echo form_input($data);
                                             ?>
                                         </div>
@@ -452,7 +452,7 @@
                                         <label>Purchase Order Date</label>
                                         <div>
                                             <?php
-                                            $data = array('name' => 'PODate', 'value' => set_value('PODate', $CurrentDate), 'id' => 'PODate',  'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
+                                            $data = array('type'=>"date",'name' => 'PODate', 'value' => set_value('PODate', $CurrentDate), 'id' => 'PODate',  'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
                                             echo form_input($data);
                                             ?>
                                         </div>
diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php
index 09520a66..166939ff 100644
--- a/app/Views/editCapitalAmendPO.php
+++ b/app/Views/editCapitalAmendPO.php
@@ -372,29 +372,29 @@
             $("#MaterialCode").select2();
             $("#currencytype").select2();
 
-            $("#PODate").datepicker({
-                //minDate : d,
-                maxDate: 'now',
-                dateFormat: 'dd-mm-yy',
-                changeMonth: true,
-                changeYear: true,
-                yearRange: '-100:+0'
-            });
-            $("#Deliverydate").datepicker({
-                minDate: 'now',
-                dateFormat: 'dd-mm-yy',
-                changeMonth: true,
-                changeYear: true,
-                yearRange: '0:+10'
-            });
+            // $("#PODate").datepicker({
+            //     //minDate : d,
+            //     maxDate: 'now',
+            //     dateFormat: 'dd-mm-yy',
+            //     changeMonth: true,
+            //     changeYear: true,
+            //     yearRange: '-100:+0'
+            // });
+            // $("#Deliverydate").datepicker({
+            //     minDate: 'now',
+            //     dateFormat: 'dd-mm-yy',
+            //     changeMonth: true,
+            //     changeYear: true,
+            //     yearRange: '0:+10'
+            // });
 
-            $("#Exchangerateon").datepicker({
-                minDate: 'now',
-                dateFormat: 'dd-mm-yy',
-                changeMonth: true,
-                changeYear: true,
-                yearRange: '0:+10'
-            });
+            // $("#Exchangerateon").datepicker({
+            //     minDate: 'now',
+            //     dateFormat: 'dd-mm-yy',
+            //     changeMonth: true,
+            //     changeYear: true,
+            //     yearRange: '0:+10'
+            // });
             $('#Date').click(function() {
                 //for Date range selection
                 $('#Schedulediv').hide();
@@ -575,7 +575,7 @@
 
                                 <div class="form-group">
                                     <?php
-                                    $data = array('name' => 'Deliverydate', 'value' => set_value('Deliverydate', $Deliverydt), 'id' => 'Deliverydate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+                                    $data = array('type'=>'date','name' => 'Deliverydate', 'value' => set_value('Deliverydate', $Deliverydt), 'id' => 'Deliverydate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
                                     echo form_input($data);
                                     ?>
                                 </div>
@@ -613,7 +613,7 @@
                                 <label>Exchange Rate On</label>
                                 <div class="form-group">
                                     <?php
-                                    $data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+                                    $data = array('type'=>'date','name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
                                     echo form_input($data);
                                     ?>
                                 </div>
@@ -647,7 +647,7 @@
                                 <label>Purchase Order Date</label>
                                 <div class="form-group">
                                     <?php
-                                    $data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+                                    $data = array('type'=>'date','name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
                                     echo form_input($data);
                                     ?>
                                 </div>
@@ -857,9 +857,12 @@
                         </div>
                         <br>
                     </div>
-                    <div class="box-body">
-                        <table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-                            <thead>
+                    <div class="form-row">
+								<div class="table-responsive">
+									<table id="serviceTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
+										<thead>
+
+                   
                                 <tr>
                                     <th>SNo</th>
                                     <th>Requisition No</th>
@@ -1213,6 +1216,7 @@
                                 ?>
                             </tbody>
                         </table>
+                                </div>
                     </div>
                     <div class="container-fluid">
                         <table class="table table-bordered" style="border:1px solid #333">
@@ -2252,7 +2256,7 @@
 	</div> <!-- content -->
 </div>
     <script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script>
-    <script type="text/html" id="CapitalList">
+    <!-- <script type="text/html" id="CapitalList">
         <tr id="<%=index%>">
             <td align="left"><%=index%></td>
             <td align="left"><%=ReqNo%></td>
@@ -2271,7 +2275,7 @@
 
             </td>
         </tr>
-    </script>
+    </script> -->
     <script>
         var RequistQuantity = '';
         var AvilBudAmt = '';
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index 8590e568..e1f40e89 100644
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -382,41 +382,41 @@
         $("#MaterialCode").select2();
         $("#currencytype").select2();
 
-        $("#PODate").datepicker({
-          //minDate : d,
-          // maxDate : 'now',
-          dateFormat: 'dd-mm-yy',
-          changeMonth: true,
-          changeYear: true
-        }); //,yearRange: '-100:+0'
-        $("#Deliverydt").datepicker({
-          minDate: 'now',
-          dateFormat: 'dd-mm-yy',
-          changeMonth: true,
-          changeYear: true,
-          yearRange: '0:+10'
-        });
-        $("#Exchangerateon").datepicker({
-          //minDate : d,
-          maxDate: 'now',
-          dateFormat: 'dd-mm-yy',
-          changeMonth: true,
-          changeYear: true,
-          yearRange: '-100:+0'
-        });
+        // $("#PODate").datepicker({
+        //   //minDate : d,
+        //   // maxDate : 'now',
+        //   dateFormat: 'dd-mm-yy',
+        //   changeMonth: true,
+        //   changeYear: true
+        // }); //,yearRange: '-100:+0'
+        // $("#Deliverydt").datepicker({
+        //   minDate: 'now',
+        //   dateFormat: 'dd-mm-yy',
+        //   changeMonth: true,
+        //   changeYear: true,
+        //   yearRange: '0:+10'
+        // });
+        // $("#Exchangerateon").datepicker({
+        //   //minDate : d,
+        //   maxDate: 'now',
+        //   dateFormat: 'dd-mm-yy',
+        //   changeMonth: true,
+        //   changeYear: true,
+        //   yearRange: '-100:+0'
+        // });
         $('#Date').click(function() {
           //for Dispatch range selection  
           $('#Schedulediv').hide();
           $('#Deliverydtdiv').show();
           $('#deliverydateby').hide();
         });
-        $("#Deliverydate").datepicker({
-          minDate: 'now',
-          dateFormat: 'dd-mm-yy',
-          changeMonth: true,
-          changeYear: true,
-          yearRange: '0:+10'
-        });
+        // $("#Deliverydate").datepicker({
+        //   minDate: 'now',
+        //   dateFormat: 'dd-mm-yy',
+        //   changeMonth: true,
+        //   changeYear: true,
+        //   yearRange: '0:+10'
+        // });
 
         $('#Schedule').click(function() {
           //for schedule range selection
@@ -578,7 +578,7 @@
                                 <label>Delivery Date<span class="text-danger">*</span></label>
                                 <div class="form-group">
                                   <?php
-                                  $data = array('name' => 'Deliverydate', 'value' => set_value('Deliverydate', $CurrentDate), 'id' => 'Deliverydate',  'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
+                                  $data = array('type'=>'date','name' => 'Deliverydate', 'value' => set_value('Deliverydate', $CurrentDate), 'id' => 'Deliverydate',  'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
                                   echo form_input($data);
                                   ?>
                                 </div>
@@ -614,7 +614,7 @@
                                 <label>Exchange Rate On</label>
                                 <div class="form-group">
                                   <?php
-                                  $data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+                                  $data = array('type'=>'date','name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
                                   echo form_input($data);
                                   ?>
                                 </div>
@@ -649,7 +649,7 @@
                                 <label>PO Date</label>
                                 <div class="form-group">
                                   <?php
-                                  $data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+                                  $data = array('type'=>'date','name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
                                   echo form_input($data);
                                   ?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
                                 </div>
@@ -3806,7 +3806,7 @@
       </div> <!-- content -->
     </div>
     <script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script>
-    <script type="text/html" id="CapitalList">
+    <!-- <script type="text/html" id="CapitalList">
       <tr id="<%=index%>">
         <td align="left"><%=index%></td>
         <td align="left"><%=ReqNo%></td>
@@ -3827,7 +3827,7 @@
 
         </td>
       </tr>
-    </script>
+    </script> -->
     <script>
       var RequistQuantity = '';
       var AvilBudAmt = '';
@@ -3868,21 +3868,21 @@
 
       $(function() {
 
-        $("#PODate").datepicker({
-          minDate: d,
-          maxDate: 'now',
-          dateFormat: 'mm/dd/yy',
-          changeMonth: true,
-          changeYear: true,
-          yearRange: '-100:+0'
-        });
-        $("#Deliverydt").datepicker({
-          minDate: 'now',
-          dateFormat: 'mm/dd/yy',
-          changeMonth: true,
-          changeYear: true,
-          yearRange: '0:+10'
-        });
+        // $("#PODate").datepicker({
+        //   minDate: d,
+        //   maxDate: 'now',
+        //   dateFormat: 'mm/dd/yy',
+        //   changeMonth: true,
+        //   changeYear: true,
+        //   yearRange: '-100:+0'
+        // });
+        // $("#Deliverydt").datepicker({
+        //   minDate: 'now',
+        //   dateFormat: 'mm/dd/yy',
+        //   changeMonth: true,
+        //   changeYear: true,
+        //   yearRange: '0:+10'
+        // });
 
         var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
         //alert(capital);   
@@ -4880,24 +4880,52 @@
 
           index = parseInt(index) + 1;
 
-          var template = jQuery("#CapitalList").html();
+          // var template = jQuery("#CapitalList").html();
 
 
-          $('#capitalAppend').append(_.template(template, {
-            index: temp,
-            ReqNo: Reqnumber,
-            MaterialCode: materialCode,
-            MaterialName: materialName,
-            Quantity: quantity,
-            UOM: uom,
-            Rate: itemRate,
-            BasicAmount: basicval,
-            Taxvalue: TotalTaxValue,
-            TotalValue: Total,
-            ActualQuantity: quantity,
-            ReceivedQuantity: 0,
-            PendingQuantity: quantity
-          }));
+          // $('#capitalAppend').append(_.template(template, {
+          //   index: temp,
+          //   ReqNo: Reqnumber,
+          //   MaterialCode: materialCode,
+          //   MaterialName: materialName,
+          //   Quantity: quantity,
+          //   UOM: uom,
+          //   Rate: itemRate,
+          //   BasicAmount: basicval,
+          //   Taxvalue: TotalTaxValue,
+          //   TotalValue: Total,
+          //   ActualQuantity: quantity,
+          //   ReceivedQuantity: 0,
+          //   PendingQuantity: quantity
+          // }));
+          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">${Total}</td>
+        <td align="left">${quantity}</td>
+        <td align="left">0</td>
+        <td align="left">${quantity}</td>
+        <td>
+            <a data-target='#EDITCAPITAL' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
+                <i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the ${Reqnumber} Requisition details"></i>
+            </a>&nbsp;&nbsp;&nbsp;
+            <a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
+                <span class="glyphicon glyphicon-trash"></span>
+            </a>
+        </td>
+    </tr>
+`;
+
+// Append the generated row HTML to the target element
+$('#capitalAppend').append(rowHtml);
 
 
           var theForm = $(".CapitalPO");
diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php
index 11208605..90bff9f4 100644
--- a/app/Views/editImportAmendPO.php
+++ b/app/Views/editImportAmendPO.php
@@ -184,10 +184,6 @@ if (!empty($RequistionDetails)) {
 ?>
 
 <style>
-    .modal {
-        padding-right: 25% ! important;
-    }
-
     .dataTables_paginate {
         margin-top: -5%;
     }
@@ -208,18 +204,6 @@ if (!empty($RequistionDetails)) {
         padding: 0px ! important;
     }
 
-    .header-container {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding: 25px;
-    }
-
-    .header-container h2 {
-        flex: 1;
-        text-align: center;
-        margin: 0;
-    }
 
     .centered {
         display: flex;
@@ -232,7 +216,6 @@ if (!empty($RequistionDetails)) {
     .centered input {
         margin: 0 5px;
     }
-
 </style>
 
 <script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript">
@@ -271,14 +254,14 @@ if (!empty($RequistionDetails)) {
         var t = '<?php echo $CurrentDate; ?>';
         var m = new Date(t);
 
-        $("#PODate").datepicker({
-            minDate: d,
-            maxDate: 'now',
-            dateFormat: 'dd-mm-yy',
-            changeMonth: true,
-            changeYear: true,
-            yearRange: '-100:+0'
-        });
+        // $("#PODate").datepicker({
+        //     minDate: d,
+        //     maxDate: 'now',
+        //     dateFormat: 'dd-mm-yy',
+        //     changeMonth: true,
+        //     changeYear: true,
+        //     yearRange: '-100:+0'
+        // });
 
 
         // $("#Deliverydt").datepicker({
@@ -286,1559 +269,1329 @@ if (!empty($RequistionDetails)) {
         //     dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
         // });
 
-        $("#Requeston").datepicker({
-            //minDate : d,
-            maxDate: 'now',
-            dateFormat: 'dd-mm-yy',
-            changeMonth: true,
-            changeYear: true,
-            yearRange: '-100:+0'
-        });
+        // $("#Requeston").datepicker({
+        //     //minDate : d,
+        //     maxDate: 'now',
+        //     dateFormat: 'dd-mm-yy',
+        //     changeMonth: true,
+        //     changeYear: true,
+        //     yearRange: '-100:+0'
+        // });
 
-        $("#Exchangerateon").datepicker({
-            minDate: m,
-            //maxDate : 'now',
-            dateFormat: 'dd-mm-yy',
-            changeMonth: true,
-            changeYear: true,
-            yearRange: '-100:+0'
-        });
+        // $("#Exchangerateon").datepicker({
+        //     minDate: m,
+        //     //maxDate : 'now',
+        //     dateFormat: 'dd-mm-yy',
+        //     changeMonth: true,
+        //     changeYear: true,
+        //     yearRange: '-100:+0'
+        // });
 
     });
 </script>
 <div class="content-page">
-	<div class="content">
-		<!-- Start Content-->
-		<div class="container-fluid">
-			<!-- start page title -->
-			<div class="row">
-				<div class="col-12">
-					<div class="page-title-box page-title-box-alt">
-						<h4><?= "Amended Import Purchase Order - $PONO "; ?></h4>
+    <div class="content">
+        <!-- Start Content-->
+        <div class="container-fluid">
+            <!-- start page title -->
+            <div class="row">
+                <div class="col-12">
+                    <div class="page-title-box page-title-box-alt">
+                        <h4><?= "Amended Import Purchase Order - $PONO "; ?></h4>
                         <a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-cancel" id="back" value="Back">Back</a>
-					</div>
-				</div>
-			</div>
-			<!-- end page title -->
-			<!-- Form row -->
-			<div class="row">
-				<div class="col-12">
-					<div class="card">
-						<div class="card-body">
-                            <?php
-                                $attributes = array('class' => 'form-label-left ImportPO ', 'name'  => 'ImportPO', 'id'  => 'ImportPO', 'enctype' => 'multipart/form-data');
-                                echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
-
-
-
-        <div style="border:2px solid #333;">
-            <div class="container-fluid">
-                <div class="row">
-                    <div class="form-group col-md-12">
-                        <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;
-                                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>
-                            <div class="form-group">
-
-                                <?php
-                                $data = array('name' => 'POType', 'value' => set_value('POType', IMPORT), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-3">
-                            <label>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'),'id="drpSupplier"'  ,'required="true"' ,'class="form-control select2');
-
-                            echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier"', 'required="true"', 'class="form-control select2');
-
-                            ?>
-                        </div>
-                        <div class="form-group col-md-3">
-                            <label>Address</label>
-                            <div class="form-group">
-                                <?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="row">
-                    <div class="form-group col-md-12">
-                        <div class="form-group col-md-3">
-                            <label>Currency Type<span class="text-danger">*</span></label>
-
+            </div>
+            <!-- end page title -->
+            <!-- Form row -->
+            <div class="row">
+                <div class="col-12">
+                    <div class="card">
+                        <div class="card-body">
                             <?php
-                            $options = array($CurCode => $Cur);
+                            $attributes = array('class' => 'form-label-left ImportPO ', 'name'  => 'ImportPO', 'id'  => 'ImportPO', 'enctype' => 'multipart/form-data');
+                            echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
 
-                            if (!empty($Currency)) {
-                                foreach ($Currency as $CUR) :
-                                    $options[$CUR->Currency_Code] =  $CUR->Currency_Code . ' ' . ' - ' . ' ' . $CUR->Country_and_Currency;
-                                endforeach;
-                            }
+                            <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) :
+                                            $options[$SID->ReqNo] = $SID->ReqNo;
+                                        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>
+                                    <div>
 
-                            echo form_dropdown('currencytype', $options, set_value('currencytype'), 'id="currencytype"', 'required="true"', 'class="form-control select2'); ?>
+                                        <?php
+                                        $data = array('name' => 'POType', 'value' => set_value('POType', IMPORT), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label>Supplier<span class="text-danger">*</span></label>
 
-                        </div>
-                        <div class="form-group col-md-3">
-                            <b><u>Select Delivery By<span class="text-danger">*</span></u></b><br />
-
-                            <!--  <?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "0", 'checked' => 'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td> -->
-
-                            <div class="centered">
-                                <?php echo form_label('Dispatch instruction', 'Dispatch instruction') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "2", 'checked' => 'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;
-                                <?php echo form_label('Schedule', 'Schedule') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Schedule", "value" => "1")); ?>
-                            </div>
-
-                        </div>
-                        <div class="form-group col-md-3" id="Schedulediv" style="display:none;"> <br />
-                            <!--  <label >Schedule </label>
-                         
-                        <?php
-                        $data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby'), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
-                        echo Form_textarea($data);
-                        ?> -->
-
-                            <label>Schedule By<span class="text-danger">*</span></label>
-
-                            <?php
-                            $data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverySchedule), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
-                            echo Form_textarea($data);
-                            ?>
-
-                        </div>
-                        <div class="form-group col-md-3" id="Deliverydtdiv">
-                            <!--  <label>Delivery Date</label>
-                             
-                                <?php
-                                $data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $CurrentDate), 'id' => 'Deliverydt',  'class' => 'form-control', 'required' => 'true');
-                                echo form_input($data);
-                                ?> -->
-
-
-                            <label>Dispatch Instruction<span class="text-danger">*</span></label>
-
-                            <?php
-                            // $data = array('name' => 'Dispatch','value' => set_value('Dispatch',$Import_DispatchDetails),'id'=>'Dispatch',  'class' => 'form-control'  ,'required' => 'true');
-                            // echo form_input($data);
-
-                            $data = array('name' => 'Dispatch', 'value' => set_value('Dispatch', $Import_DispatchDetails), 'id' => 'Dispatch',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
-                            echo Form_textarea($data);
-                            ?>
-
-                        </div>
-                        <div class="form-group col-md-3">
-                            <label>Delivery Address</label>
-                            <div class="form-group">
-                                <?php
-                                $data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
-                                echo Form_textarea($data);
-                                ?>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="form-group col-md-12">
-                        <div class="form-group col-md-3">
-                            Check Today's Foreign Exchange value <a href="http://www.xe.com/" target="_blank"><u>(Click here)</u></a>
-                        </div>
-                        <div class="form-group col-md-3">
-                            <label>Exchange Rate On</label>
-                            <div class="form-group">
-                                <?php
-                                $data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateCalculatedon), 'id' => 'Exchangerateon',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-3">
-                            <!--  <label>Exchange Rate </label> -->
-
-                            <label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)" ?><span class="text-danger">*</span></label>
-                            <div class="form-group">
-                                <?php
-                                $data = array('name' => 'ExchangeRate', 'value' => set_value('ExchangeRate', $ExchangeRate), 'id' => 'ExchangeRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'USRate()');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-3">
-                            <label>Place of Origin<span class="text-danger">*</span></label>
-                            <div class="form-group">
-                                <?php
-                                //  $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
-                                // echo form_input($data);
-
-                                $data = array('name' => 'PlaceOforigin', 'value' => set_value('PlaceOforigin', $Import_PlaceofOrgin), 'id' => 'PlaceOforigin',  'class' => 'form-control', 'required' => 'true');
-                                echo form_input($data);
-
-
-
-                                ?>
-                            </div>
-
-                            <!--  <div class="form-group" style="display:none;">
-                                            <?php
-                                            //  $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
-                                            // echo form_input($data);
-
-                                            $data = array('name' => 'beforePlaceOforigin', 'value' => set_value('beforePlaceOforigin', $Import_PlaceofOrgin), 'id' => 'beforePlaceOforigin',  'class' => 'form-control', 'required' => 'true');
-                                            echo form_input($data);
-
-
-
-                                            ?>   
-                                </div> -->
-
-
-
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="form-group col-md-12">
-                        <div class="form-group col-md-3">
-                            <label>Purchase Order Date</label>
-                            <div class="form-group">
-                                <?php
-                                $data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-3">
-                            <label>Mode Of Shipment</label>
-                            <div class="form-group">
-
-                                <?php
-                                $data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment', $Shipmentmode), 'id' => 'addmodeofshipment',  'class' => 'form-control');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-3">
-                            <label>Contact Reference</label>
-                            <div class="form-group">
-
-                                <?php
-                                $data = array('name' => 'amendsupplierreference', 'value' => set_value('amendsupplierreference', $SupplierRef), 'id' => 'amendsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-3">
-                            <label>Supplier's Offer No</label>
-                            <div class="form-group">
-
-                                <?php
-                                $data = array('name' => 'amendsupplierofferno', 'value' => set_value('amendsupplierofferno', $SupOfferno), 'id' => 'amendsupplierofferno',  'class' => 'form-control');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="form-group col-md-12">
-                        <div class="form-group col-md-3">
-                            <label>Our Reference(S)</label>
-                            <div class="form-group">
-
-                                <?php
-                                $data = array('name' => 'amendotherreference', 'value' => set_value('amendotherreference', $Otherref), 'id' => 'amendotherreference',  'class' => 'form-control');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-3">
-                            <label for="payablefrom">Import Type Options<span class="text-danger">*</span></label>
-
-                            <?php
-                            //$options1 = array("0"=>'Select Import Option');       
-                            if (!empty($PoTypeOptions)) {
-                                foreach ($PoTypeOptions as $payment) :
-
-                                    if ($Importoption == $payment->ConfigValue) {
-
-                                        $options2[$payment->ConfigValue] =  $payment->ConfigValue;
+                                    <?php
+                                    $options = array("0" => 'Select Supplier');
+                                    //print_r(  $options);
+                                    if (!empty($Suplist)) {
+                                        foreach ($Suplist as $SID) :
+                                            $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
+                                        endforeach;
                                     }
 
-                                endforeach;
-                                foreach ($PoTypeOptions as $payment) :
-
-                                    if ($Importoption != $payment->ConfigValue) {
-
-                                        $options2[$payment->ConfigValue] =  $payment->ConfigValue;
-                                    }
-                                endforeach;
-                            }
-
-                            echo form_dropdown('Importoption', $options2, set_value('Importoption'), 'id="Importoption"', 'class="form-control"');                                              ?>
-
-                        </div>
-                        <div class="form-group col-md-3">
-                            <label for="payablefrom">Payable Terms<span class="text-danger">*</span></label>
-                            <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms; ?>">
-
-
-                            <?php
-
-
-
-                            if (!empty($Payment)) {
-
-                                foreach ($Payment as $pay2)
-
-                                    if ($Terms == $pay2->PaymentID) {
-                                        //echo "$Terms";
-                                        //echo "$pay2->PaymentTerms";
-
-                            ?>
-                                    <input type="hidden" name="beforePaymentTermsText" value="<?php echo $pay2->PaymentTerms ?>">
-                            <?php
-
-                                        $optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
-                                    }
-
-                                foreach ($Payment as $pay1) :
-
-                                    if ($Terms != $pay1->PaymentID) {
-
-                                        $optionsPay[$pay1->PaymentID] =  $pay1->PaymentTerms;
-                                    }
-                                endforeach;
-                            }
-                            echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2');                                                    ?>
-
-                        </div>
-                        <div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
-                            <label>Description of Payable Terms<span class="text-danger">*</span></label>
-                            <div class="form-group">
-                                <?php
-
-                                $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment', $Otherpay), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="form-group col-md-12">
-                        <div class="form-group col-md-3">
-                            <label for="payablefrom">Insurance<span class="text-danger">*</span></label>
-
-
-
-                            <!-- <select id='Insurance' name='Insurance'>
-              <?php if ($Insurance == 1) {
-                    $opt1 = 'YES';
-                    $opt2 = 'NO';
-                } else {
-                    $opt1 = 'NO';
-                    $opt2 = 'YES';
-                } ?>
-                  
-                  
-                  <option value="NO"><?php echo $opt1; ?></option>
-                  <option value="YES"><?php echo $opt2; ?></option>
-              </select>    -->
-
-                            <?php
-
-                            if ($Insurance == 1) {
-                                $opt1 = 'YES';
-                                $opt2 = 'NO';
-                            } else {
-                                $opt1 = 'NO';
-                                $opt2 = 'YES';
-                            }
-
-                            $data = array('name' => 'Insurance', 'Insurance' => set_value('Insurance', $opt1), 'id' => 'Insurance',  'class' => 'form-control', 'required' => 'true', 'readonly' => true);
-                            echo form_input($data);
-                            ?>
-
-                        </div>
-                        <div class="form-group col-md-3" id="insurancenum" style="display:none;">
-                            <label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
-                            <div class="form-group">
-                                <?php
-
-                                $data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber'), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true', 'readonly' => 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'>
-                                <?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>
-                        </div>
-                        <div class="form-group col-md-3">
-                        </div>
-                    </div>
-                </div>
-
-                <div class="">
-                    <table class="table table-bordered" style="border:1px solid #333">
-                        <div align="right" style="padding-right:10px">
-                            <div align="right">
-                                <!-- <a data-toggle="modal" data-target="#importpomodel"  class="btn btn-success" data-dismiss="modal" onclick="myFunction();" >Add Line Item </a> -->
-
-
-
-
-
-
-                                <!--Edit modal body-->
-
-                                <div id="editimportpomodel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                                    <div class="modal-dialog">
-                                        <!-- Modal content-->
-                                        <form>
-                                            <div class="modal-content" style="width:1000px; font-size: 12px;">
-                                                <div class="modal-header">
-
-                                                    <center>
-                                                        <h4>Edit Import Purchase Order Item </h4>
-                                                    </center>
-                                                </div>
-                                                <div align="left">
-
-                                                    <div class="form-group col-md-12">
-                                                        <div class="form-group col-md-3">
-                                                            <label>Req No<span class="text-danger">*</span></label>
-                                                            <div>
-                                                                <?php
-
-                                                                $data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
-                                                                echo form_input($data); ?>
-                                                            </div>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label>Department Name</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group col-md-3">
-                                                            <label>Cost Center Code</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $options = array("0" => 'Select Cost Center');
-
-                                                                //echo form_dropdown('EditCostCenter', $options,set_value('EditCostCenter'),'id="EditCostCenter"' ,'class="form-control"');
-
-                                                                $data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
-                                                                echo form_input($data);
-
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group col-md-3" style="padding-right: 0px;">
-                                                            <label>Available Budget Amount (<?php echo $INR ?>)</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                // $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt',),'id'=>'EditAvlBudAmt',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                // echo form_input($data);
-
-                                                                $data = array('name' => 'EditAvlBud', 'value' => set_value('EditAvlBud'), 'id' => 'EditAvlBud',  'class' => 'form-control num', 'readonly' => 'true');
-
-                                                                // $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt','dsfd'),'id'=>'EditAvlBudAmt',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="form-group col-md-12">
-                                                        <div class="form-group col-md-2">
-                                                            <label>Item Code<span class="text-danger">*</span></label>
-
-                                                            <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
-                                                            <div>
-                                                                <?php
-
-
-                                                                $options = array("0" => 'Item Code');
-
-
-
-                                                                echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
-
-                                                                ?>
-                                                            </div>
-
-                                                        </div>
-
-                                                        <div class="form-group col-md-2">
-                                                            <label>Item Name</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group col-md-2">
-                                                            <label>UOM</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control', 'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group col-md-6" style="padding: 0px;">
-                                                            <div class="form-group col-md-3">
-                                                                <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' => 'EditRatechange(),ExceedEditQuantityCheck()');
-                                                                    echo form_input($data);
-
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="form-group col-md-3" style="padding-left: 0px;">
-                                                                <!--  <label>Rate </label> -->
-
-
-                                                                <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?><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' => 'EditRatechange()');
-                                                                    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: 0px;">
-                                                                <!-- <label><?php echo "Basic Value In"; ?></label>-->
-                                                                <label id="label3"><?php echo "Basic Value In $Currencycode ($Value)"; ?></label>
-                                                                <div class="form-group">
-                                                                    <?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>
-                                                        </div>
-                                                    </div>
-                                                    <div class="form-group col-md-12">
-
-                                                        <div class="form-group col-md-3">
-
-                                                            <!-- Basic Price in US $ per Ton : -->
-
-                                                            <p id="labelEditBasicPriceUs"><b><?php echo "Basic Value in $Currencycode ($Value)" ?></p>
-
-
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'EditimBasicPrice', 'value' => set_value('EditimBasicPrice'), 'id' => 'EditimBasicPrice',  'class' => 'form-control num', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-
-                                                            <?php echo "Exchange Rate ($Currencycode ($Value))" ?>
-
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'EditExchangeRt', 'value' => set_value('EditExchangeRt'), 'id' => 'EditExchangeRt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-
-                                                            <!--  Basic value in INR : -->
-
-                                                            <label id="labelEditBasicINR"><?php echo "Basic value in ($INR) :"; ?></label>
-
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'EditINRBasicvalue', 'value' => set_value('EditINRBasicvalue'), 'id' => 'EditINRBasicvalue',  'class' => 'form-control num', 'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <!--<div class="form-group col-md-3">
-                                             <a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
-                                     </div>-->
-
-                                                        <div class="form-group col-md-12" style="border:1px solid #000;padding:0px;">
-                                                            <br />
-                                                            <div class="form-group col-md-6" style="padding:0px;">
-                                                                <div class="form-group col-md-12">
-                                                                    <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 class="form-group" 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 class="form-group">
-                                                                            <?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-12">
-                                                                    <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 class="form-group">
-                                                                            <?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 class="form-group">
-                                                                            <?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-group col-md-12">
-                                                                    <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 class="form-group" 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 class="form-group">
-                                                                            <?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-group col-md-12">
-                                                                    <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 class="form-group">
-                                                                            <?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 class="form-group">
-                                                                            <?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-group col-md-12">
-                                                                    <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 class="form-group">
-                                                                            <?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 class="form-group">
-                                                                            <?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-group col-md-12">
-                                                                    <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 class="form-group">
-                                                                            <?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 class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                            <div class="form-group col-md-6" style="padding:0px;">
-                                                                <div class="form-group col-md-12">
-                                                                    <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 class="form-group" 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 class="form-group">
-                                                                            <?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-group col-md-12">
-                                                                    <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 class="form-group">
-                                                                            <?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 class="form-group">
-                                                                            <?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-group col-md-12">
-                                                                    <div class="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 class="form-group">
-                                                                            <?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-group col-md-12" style="padding:0px;">
-                                                                    <div class="form-group col-md-3">
-                                                                        <span>Freight Type </span>
-                                                                        <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('drpamendFreight', $options, set_value('drpamendFreight'), 'id="drpamendFreight"', 'class="form-control "');
-
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="form-group col-md-3" id="AmendTripsValue" style="display:block;">
-                                                                        <span>NO Of Trips</span>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'AmendNOOfTrips', 'value' => set_value('AmendNOOfTrips'), 'id' => 'AmendNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="form-group col-md-3">
-                                                                        <span>Freight Rate </span>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'AmendtxtFreight', 'value' => set_value('AmendtxtFreight'), 'id' => 'AmendtxtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-
-                                                                    <div class="form-group col-md-3" style="padding-left: 0px;">
-                                                                        <span>Freight Amt In <?php echo $INR; ?></span>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'AmendtxtAfterFreight', 'value' => set_value('AmendtxtAfterFreight'), 'id' => 'AmendtxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-
-                                                                </div>
-                                                                <!--End of Adding of freight in edit model -->
-
-                                                                <div class="form-group col-md-12">
-                                                                    <center> <label>Cost of the product Per UOM</label></center>
-                                                                    <hr />
-                                                                </div>
-                                                                <div class="form-group col-md-12">
-                                                                    <div class="form-group col-md-4">
-                                                                        Duty Impact
-                                                                    </div>
-                                                                    <div class="form-group col-md-4">
-                                                                        <div class="form-group">
-                                                                            <?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%">
-                                                                        <span>Quantity</span>
-                                                                        <div class="form-group">
-                                                                            <?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-group col-md-12">
-
-                                                                    <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 class="form-group">
-                                                                            <?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-group col-md-12">
-                                                                    <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 class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
-                                                                            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 class="form-group">
-                                                                            <?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: -->
-                                                                    </div>
-                                                                    <div class="form-group col-md-4">
-                                                                        <div class="form-group" 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>
-                                                    <div class="form-group col-md-12">
-                                                        <div class="form-group col-md-12">
-                                                            <label>Import Description :</label>
-                                                            <?php
-                                                            $data = array('name' => 'edittxtInstruction', 'value' => set_value('edittxtInstruction'), 'id' => 'edittxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
-                                                            echo form_textarea($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-
-                                                </div>
-                                                <div class="modal-footer">
-                                                    <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-                                                    <a class="btn btn-success font EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
-                                                    <!--<a class="btn btn-success font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
-                                                </div>
-                                            </div>
-                                        </form>
-
+                                    //echo form_dropdown('drpSupplier', $options,set_value('drpSupplier'),'id="drpSupplier"'  ,'required="true"' ,'class="form-control select2');
+
+                                    echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier" required="true" class="form-control select2"');
+
+                                    ?>
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label>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 class="form-row">
+                                <div class="form-group col-md-3">
+                                    <label>Currency Type<span class="text-danger">*</span></label>
 
+                                    <?php
+                                    $options = array($CurCode => $Cur);
+
+                                    if (!empty($Currency)) {
+                                        foreach ($Currency as $CUR) :
+                                            $options[$CUR->Currency_Code] =  $CUR->Currency_Code . ' ' . ' - ' . ' ' . $CUR->Country_and_Currency;
+                                        endforeach;
+                                    }
+
+                                    echo form_dropdown('currencytype', $options, set_value('currencytype'), 'id="currencytype" required="true" class="form-control select2"'); ?>
+
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <b><u>Select Delivery By<span class="text-danger">*</span></u></b><br />
+
+                                    <!--  <?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "0", 'checked' => 'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td> -->
+
+                                    <div class="centered">
+                                        <?php echo form_label('Dispatch instruction', 'Dispatch instruction') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "2", 'checked' => 'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;
+                                        <?php echo form_label('Schedule', 'Schedule') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Schedule", "value" => "1")); ?>
+                                    </div>
+
+                                </div>
+                                <div class="form-group col-md-3" id="Schedulediv" style="display:none;"> <br />
+                                    <!--  <label >Schedule </label>
+                         
+                                    <?php
+                                    $data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby'), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
+                                    echo Form_textarea($data);
+                                    ?> -->
+
+                                    <label>Schedule By<span class="text-danger">*</span></label>
+
+                                    <?php
+                                    $data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverySchedule), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
+                                    echo Form_textarea($data);
+                                    ?>
+
+                                </div>
+                                <div class="form-group col-md-3" id="Deliverydtdiv">
+                                    <!--  <label>Delivery Date</label>
+                                        
+                                            <?php
+                                            $data = array('type'=>'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $CurrentDate), 'id' => 'Deliverydt',  'class' => 'form-control', 'required' => 'true');
+                                            echo form_input($data);
+                                            ?> -->
+
+
+                                    <label>Dispatch Instruction<span class="text-danger">*</span></label>
+
+                                    <?php
+                                    // $data = array('name' => 'Dispatch','value' => set_value('Dispatch',$Import_DispatchDetails),'id'=>'Dispatch',  'class' => 'form-control'  ,'required' => 'true');
+                                    // echo form_input($data);
+
+                                    $data = array('name' => 'Dispatch', 'value' => set_value('Dispatch', $Import_DispatchDetails), 'id' => 'Dispatch',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
+                                    echo Form_textarea($data);
+                                    ?>
+
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label>Delivery Address</label>
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
+                                        echo Form_textarea($data);
+                                        ?>
+                                    </div>
+                                </div>
+
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-3">
+                                    Check Today's Foreign Exchange value <a href="http://www.xe.com/" target="_blank"><u>(Click here)</u></a>
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label>Exchange Rate On</label>
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateCalculatedon), 'id' => 'Exchangerateon',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label>Place of Origin<span class="text-danger">*</span></label>
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'PlaceOforigin', 'value' => set_value('PlaceOforigin', $Import_PlaceofOrgin), 'id' => 'PlaceOforigin',  'class' => 'form-control', 'required' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <!--  <label>Exchange Rate </label> -->
+
+                                    <label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)" ?><span class="text-danger">*</span></label>
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'ExchangeRate', 'value' => set_value('ExchangeRate', $ExchangeRate), 'id' => 'ExchangeRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'USRate()');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-3">
+                                    <label>Purchase Order Date</label>
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label>Mode Of Shipment</label>
+                                    <div>
+
+                                        <?php
+                                        $data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment', $Shipmentmode), 'id' => 'addmodeofshipment',  'class' => 'form-control');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label>Contact Reference</label>
+                                    <div>
+
+                                        <?php
+                                        $data = array('name' => 'amendsupplierreference', 'value' => set_value('amendsupplierreference', $SupplierRef), 'id' => 'amendsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label>Supplier's Offer No</label>
+                                    <div>
+
+                                        <?php
+                                        $data = array('name' => 'amendsupplierofferno', 'value' => set_value('amendsupplierofferno', $SupOfferno), 'id' => 'amendsupplierofferno',  'class' => 'form-control');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-3">
+                                    <label>Our Reference(S)</label>
+                                    <div>
+
+                                        <?php
+                                        $data = array('name' => 'amendotherreference', 'value' => set_value('amendotherreference', $Otherref), 'id' => 'amendotherreference',  'class' => 'form-control');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label for="payablefrom">Import Type Options<span class="text-danger">*</span></label>
+
+                                    <?php
+                                    //$options1 = array("0"=>'Select Import Option');       
+                                    if (!empty($PoTypeOptions)) {
+                                        foreach ($PoTypeOptions as $payment) :
+
+                                            if ($Importoption == $payment->ConfigValue) {
+
+                                                $options2[$payment->ConfigValue] =  $payment->ConfigValue;
+                                            }
+
+                                        endforeach;
+                                        foreach ($PoTypeOptions as $payment) :
+
+                                            if ($Importoption != $payment->ConfigValue) {
+
+                                                $options2[$payment->ConfigValue] =  $payment->ConfigValue;
+                                            }
+                                        endforeach;
+                                    }
+
+                                    echo form_dropdown('Importoption', $options2, set_value('Importoption'), 'id="Importoption" class="form-control"');                                              ?>
+
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label for="payablefrom">Payable Terms<span class="text-danger">*</span></label>
+                                    <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms; ?>">
+
+
+                                    <?php
+
+
+
+                                    if (!empty($Payment)) {
+
+                                        foreach ($Payment as $pay2)
+
+                                            if ($Terms == $pay2->PaymentID) {
+                                                //echo "$Terms";
+                                                //echo "$pay2->PaymentTerms";
+
+                                    ?>
+                                            <input type="hidden" name="beforePaymentTermsText" value="<?php echo $pay2->PaymentTerms ?>">
+                                    <?php
+
+                                                $optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
+                                            }
+
+                                        foreach ($Payment as $pay1) :
+
+                                            if ($Terms != $pay1->PaymentID) {
+
+                                                $optionsPay[$pay1->PaymentID] =  $pay1->PaymentTerms;
+                                            }
+                                        endforeach;
+                                    }
+                                    echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms" required="true" class="form-control select2"');                                                    ?>
+
+                                </div>
+                                <div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
+                                    <label>Description of Payable Terms<span class="text-danger">*</span></label>
+                                    <div>
+                                        <?php
+
+                                        $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment', $Otherpay), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-3">
+                                    <label for="payablefrom">Insurance<span class="text-danger">*</span></label>
+
+
+
+                                    <!-- <select id='Insurance' name='Insurance'>
+                                        <?php if ($Insurance == 1) {
+                                            $opt1 = 'YES';
+                                            $opt2 = 'NO';
+                                        } else {
+                                            $opt1 = 'NO';
+                                            $opt2 = 'YES';
+                                        } ?>
+                            
+                            
+                                            <option value="NO"><?php echo $opt1; ?></option>
+                                            <option value="YES"><?php echo $opt2; ?></option>
+                                        </select>    -->
+
+                                    <?php
+
+                                    if ($Insurance == 1) {
+                                        $opt1 = 'YES';
+                                        $opt2 = 'NO';
+                                    } else {
+                                        $opt1 = 'NO';
+                                        $opt2 = 'YES';
+                                    }
+
+                                    $data = array('name' => 'Insurance', 'Insurance' => set_value('Insurance', $opt1), 'id' => 'Insurance',  'class' => 'form-control', 'required' => 'true', 'readonly' => true);
+                                    echo form_input($data);
+                                    ?>
+
+                                </div>
+                                <div class="form-group col-md-3" id="insurancenum" style="display:none;">
+                                    <label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
+                                    <div>
+                                        <?php
+
+                                        $data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber'), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true', 'readonly' => 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';
+                                        } ?>
+
+
+                                        <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>
+
+
+                            <!--Edit modal body-->
+                            <div id="editimportpomodel" class="modal fade" tabindex="-1" role="dialog"
+                                aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+                                <div class="modal-dialog modal-full-width">
+                                    <div class="modal-content">
+                                        <div class="modal-header">
+                                            <h4 class="modal-title">Edit Import Purchase Order Item</h4>
+                                            <button type="button" class="close" data-dismiss="modal"
+                                                aria-hidden="true">×</button>
+                                        </div>
+                                        <form>
+                                            <div class="modal-body p-4">
+                                                <div class="form-row">
+                                                    <div class="form-group col-md-3">
+                                                        <label>Req No<span class="text-danger">*</span></label>
+                                                        <div>
+                                                            <?php
+
+                                                            $data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
+                                                            echo form_input($data); ?>
+                                                        </div>
+                                                    </div>
+
+                                                    <div class="form-group col-md-3">
+                                                        <label>Department Name</label>
+                                                        <div>
+                                                            <?php
+                                                            $data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group col-md-3">
+                                                        <label>Cost Center Code</label>
+                                                        <div>
+                                                            <?php
+                                                            $options = array("0" => 'Select Cost Center');
+
+                                                            //echo form_dropdown('EditCostCenter', $options,set_value('EditCostCenter'),'id="EditCostCenter"' ,'class="form-control"');
+
+                                                            $data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
+                                                            echo form_input($data);
+
+                                                            ?>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group col-md-3" style="padding-right: 0px;">
+                                                        <label>Available Budget Amount (<?php echo $INR ?>)</label>
+                                                        <div>
+                                                            <?php
+                                                            // $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt',),'id'=>'EditAvlBudAmt',  'class' => 'form-control' ,'readonly' => 'true');
+                                                            // echo form_input($data);
+
+                                                            $data = array('name' => 'EditAvlBud', 'value' => set_value('EditAvlBud'), 'id' => 'EditAvlBud',  'class' => 'form-control num', 'readonly' => 'true');
+
+                                                            // $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt','dsfd'),'id'=>'EditAvlBudAmt',  'class' => 'form-control' ,'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="form-row">
+                                                    <div class="form-group col-md-2">
+                                                        <label>Item Code<span class="text-danger">*</span></label>
+
+                                                        <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
+                                                        <div>
+                                                            <?php
+
+
+                                                            $options = array("0" => 'Item Code');
+
+
+
+                                                            echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
+
+                                                            ?>
+                                                        </div>
+
+                                                    </div>
+                                                    <div class="form-group col-md-2">
+                                                        <label>Item Name</label>
+                                                        <div>
+                                                            <?php
+                                                            $data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group col-md-1">
+                                                        <label>UOM</label>
+                                                        <div>
+                                                            <?php
+                                                            $data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </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' => 'EditRatechange(),ExceedEditQuantityCheck()');
+                                                            echo form_input($data);
+
+                                                            ?>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group col-md-2" style="padding-left: 0px;">
+                                                        <!--  <label>Rate </label> -->
+
+
+                                                        <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?><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' => 'EditRatechange()');
+                                                            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: 0px;">
+                                                        <!-- <label><?php echo "Basic Value In"; ?></label>-->
+                                                        <label id="label3"><?php echo "Basic Value In $Currencycode ($Value)"; ?></label>
+                                                        <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>
+                                                </div>
+                                                <div class="form-row">
+                                                    <div class="form-group col-md-3">
+
+                                                        <!-- Basic Price in US $ per Ton : -->
+
+                                                        <p id="labelEditBasicPriceUs"><b><?php echo "Basic Value in $Currencycode ($Value)" ?></p>
+
+
+                                                        <div>
+                                                            <?php
+                                                            $data = array('name' => 'EditimBasicPrice', 'value' => set_value('EditimBasicPrice'), 'id' => 'EditimBasicPrice',  'class' => 'form-control num', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group col-md-3">
+
+                                                        <?php echo "Exchange Rate ($Currencycode ($Value))" ?>
+
+                                                        <div>
+                                                            <?php
+                                                            $data = array('name' => 'EditExchangeRt', 'value' => set_value('EditExchangeRt'), 'id' => 'EditExchangeRt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+
+                                                    </div>
+                                                    <div class="form-group col-md-3">
+
+                                                        <!--  Basic value in INR : -->
+
+                                                        <label id="labelEditBasicINR"><?php echo "Basic value in ($INR) :"; ?></label>
+
+                                                        <div>
+                                                            <?php
+                                                            $data = array('name' => 'EditINRBasicvalue', 'value' => set_value('EditINRBasicvalue'), 'id' => 'EditINRBasicvalue',  'class' => 'form-control num', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+                                                    </div>
+                                                    <!--<div class="form-group col-md-3">
+                                                                <a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
+                                                        </div>-->
+                                                </div>
+                                                <br />
+                                                <div style="border:1px solid #000;padding:0px;">
+
+                                                    <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>
+                                                        </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>
+                                                    </div>
+                                                    <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">
+                                                            <span>Freight Type </span>
+                                                            <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('drpamendFreight', $options, set_value('drpamendFreight'), 'id="drpamendFreight" class="form-control "');
+
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="form-group col-md-3" id="AmendTripsValue" style="display:block;">
+                                                            <span>NO Of Trips</span>
+                                                            <div>
+                                                                <?php
+                                                                $data = array('name' => 'AmendNOOfTrips', 'value' => set_value('AmendNOOfTrips'), 'id' => 'AmendNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="form-group col-md-3">
+                                                            <span>Freight Rate </span>
+                                                            <div>
+                                                                <?php
+                                                                $data = array('name' => 'AmendtxtFreight', 'value' => set_value('AmendtxtFreight'), 'id' => 'AmendtxtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+
+                                                        <div class="form-group col-md-3" style="padding-left: 0px;">
+                                                            <span>Freight Amt In <?php echo $INR; ?></span>
+                                                            <div>
+                                                                <?php
+                                                                $data = array('name' => 'AmendtxtAfterFreight', 'value' => set_value('AmendtxtAfterFreight'), 'id' => 'AmendtxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+
+                                                    </div>
+                                                    <!--End of Adding of freight in edit model -->
+
+                                                    <div class="form-row">
+                                                        <center> <label>Cost of the product Per UOM</label></center>
+                                                        <hr />
+                                                    </div>
+                                                    <div class="form-row">
+                                                        <div class="form-group col-md-4">
+                                                            Duty Impact
+                                                        </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%">
+                                                            <span>Quantity</span>
+                                                            <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">
+                                                        <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' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
+                                                                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: -->
+                                                        </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 class="form-row">
+                                                    <div class="form-group col-md-12">
+                                                        <label>Import Description :</label>
+                                                        <?php
+                                                        $data = array('name' => 'edittxtInstruction', 'value' => set_value('edittxtInstruction'), 'id' => 'edittxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
+                                                        echo form_textarea($data);
+                                                        ?>
+                                                    </div>
+                                                </div>
+
+                                            </div>
+                                            <div class="modal-footer">
+                                                <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+                                                <a class="btn btn-success font EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
+                                                <!--<a class="btn btn-success font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
+                                            </div>
+                                        </form>
+                                    </div>
+                                </div>
+                            </div>
 
 
 
 
 
                             <br />
-                            <div class="box-body" style="margin-top: -3%;">
-                                <table id="ImportTax" class="table table-bordered table-hover" style="background-color:#fff;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 $INR ?></th>
-                                            <th>Basic Amount<?php echo $INR ?></th>
-                                            <!-- <th>Tax Amount</th>
-                    <th>Total Order Amount</th> -->
-                                            <th>Action</th>
-                                        </tr>
-                                    </thead>
-
-                                    <tbody id='ImportAppend'>
-                                        <?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->MaterialName ?></td>
-                                                    <td><?php echo $record->Quantity ?></td>
-                                                    <td><?php echo $record->UOM ?></td>
-                                                    <td><?php echo $record->Rate ?></td>
-                                                    <td><?php echo $record->BasicValue ?></td>
-                                                    <!-- <td><?php echo $record->Taxamount ?></td>
-                    <td><?php echo $record->TotalOrderValue ?></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 'AvlBudAmt'.$index 
-                                                                                    ?>" id="<?php //echo 'AvlBudAmt'.$index 
-                                                                                                                            ?>" value="<?php //echo $AvlBudAmt;
-                                                                                                                                                                        ?>" />  -->
-
-
-                                                    <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 'beforequantity' . $index ?>" id="<?php echo 'beforequantity' . $index ?>" value="<?php echo $record->Quantity; ?>" />
-
-
-                                                    <input type="hidden" name="<?php echo 'itemRate' . $index ?>" id="<?php echo 'itemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeitemRate' . $index ?>" id="<?php echo 'beforeitemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
-
-
-
-                                                    <input type="hidden" name="<?php echo 'LandingCharge' . $index ?>" id="<?php echo 'LandingCharge' . $index ?>" value="<?php echo $record->LandingCharge; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeLandingCharge' . $index ?>" id="<?php echo 'beforeLandingCharge' . $index ?>" value="<?php echo $record->LandingCharge; ?>" />
-
-
-                                                    <input type="hidden" name="<?php echo 'AfterLandingCharge' . $index ?>" id="<?php echo 'AfterLandingCharge' . $index ?>" value="<?php echo $record->AfterLandingCharge; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeAfterLandingCharge' . $index ?>" id="<?php echo 'beforeAfterLandingCharge' . $index ?>" value="<?php echo $record->AfterLandingCharge; ?>" />
-
-
-
-
-                                                    <input type="hidden" name="<?php echo 'CustomDuty' . $index ?>" id="<?php echo 'CustomDuty' . $index ?>" value="<?php echo $record->CustomDuty; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeCustomDuty' . $index ?>" id="<?php echo 'beforeCustomDuty' . $index ?>" value="<?php echo $record->CustomDuty; ?>" />
-
-
-                                                    <input type="hidden" name="<?php echo 'AfterCustomDuty' . $index ?>" id="<?php echo 'AfterCustomDuty' . $index ?>" value="<?php echo $record->AfterCustomDuty; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeAfterCustomDuty' . $index ?>" id="<?php echo 'beforeAfterCustomDuty' . $index ?>" value="<?php echo $record->AfterCustomDuty; ?>" />
-
-
-
-
-                                                    <input type="hidden" name="<?php echo 'CustomEdCess' . $index ?>" id="<?php echo 'CustomEdCess' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeCustomEdCess' . $index ?>" id="<?php echo 'CustomEdCess' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" />
-
-                                                    <input type="hidden" name="<?php echo 'AfterCustomEdCess' . $index ?>" id="<?php echo 'AfterCustomEdCess' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeAfterCustomEdCess' . $index ?>" id="<?php echo 'beforeAfterCustomEdCess' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
-
-
-
-                                                    <input type="hidden" name="<?php echo 'ExchangeRate' . $index ?>" id="<?php echo 'ExchangeRate' . $index ?>" value="<?php echo $record->ExchangeRate; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeExchangeRate' . $index ?>" id="<?php echo 'beforeExchangeRate' . $index ?>" value="<?php echo $record->ExchangeRate; ?>" />
-
-
-
-
-
-                                                    <input type="hidden" name="<?php echo 'CustomDutyExpensesPerKG' . $index ?>" id="<?php echo 'CustomDutyExpensesPerKG' . $index ?>" value="<?php echo $record->CustomDutyExpensesPerKG; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeCustomDutyExpensesPerKG' . $index ?>" id="<?php echo 'beforeCustomDutyExpensesPerKG' . $index ?>" value="<?php echo $record->CustomDutyExpensesPerKG; ?>" />
-
-
-
-
-                                                    <!-- <input type="hidden" name="<?php echo 'QuantityKG' . $index ?>" id="<?php echo 'QuantityKG' . $index ?>" value="<?php echo $record->QuantityKG; ?>" />
- <input type="hidden" name="<?php echo 'beforeQuantityKG' . $index ?>" id="<?php echo 'beforeQuantityKG' . $index ?>" value="<?php echo $record->QuantityKG; ?>" /> -->
-
-
-
-
-                                                    <input type="hidden" name="<?php echo 'BasicPriceInMTon' . $index ?>" id="<?php echo 'BasicPriceInMTon' . $index ?>" value="<?php echo $record->BasicPriceInMTon; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeBasicPriceInMTon' . $index ?>" id="<?php echo 'beforeBasicPriceInMTon' . $index ?>" value="<?php echo $record->BasicPriceInMTon; ?>" />
-
-
-
-
-                                                    <input type="hidden" name="<?php echo 'ProductPrice' . $index ?>" id="<?php echo 'ProductPrice' . $index ?>" value="<?php echo $record->BasicValue; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeProductPrice' . $index ?>" id="<?php echo 'beforeProductPrice' . $index ?>" value="<?php echo $record->ProductPrice; ?>" />
-
-
-
-
-                                                    <input type="hidden" name="<?php echo 'CustomSHCess' . $index ?>" id="<?php echo 'CustomSHCess' . $index ?>" value="<?php echo $record->CustomSHCess; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeCustomSHCess' . $index ?>" id="<?php echo 'beforeCustomSHCess' . $index ?>" value="<?php echo $record->CustomSHCess; ?>" />
-
-
-
-
-                                                    <input type="hidden" name="<?php echo 'AfterCustomSHCess' . $index ?>" id="<?php echo 'AfterCustomSHCess' . $index ?>" value="<?php echo $record->AfterCustomSHCess; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeAfterCustomSHCess' . $index ?>" id="<?php echo 'beforeAfterCustomSHCess' . $index ?>" value="<?php echo $record->AfterCustomSHCess; ?>" />
-
-
-
-
-                                                    <input type="hidden" name="<?php echo 'QuantityKG' . $index ?>" id="<?php echo 'QuantityKG' . $index ?>" value="<?php echo $record->QuantityKG; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeQuantityKG' . $index ?>" id="<?php echo 'beforeQuantityKG' . $index ?>" value="<?php echo $record->QuantityKG; ?>" />
-
-
-
-
-
-                                                    <input type="hidden" name="<?php echo 'BasicPriceInMTon' . $index ?>" id="<?php echo 'BasicPriceInMTonG' . $index ?>" value="<?php echo $record->BasicPriceInMTon; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeBasicPriceInMTon' . $index ?>" id="<?php echo 'beforeBasicPriceInMTonG' . $index ?>" value="<?php echo $record->BasicPriceInMTon; ?>" />
-
-
-
-                                                    <input type="hidden" name="<?php echo 'ProductPrice' . $index ?>" id="<?php echo 'ProductPrice' . $index ?>" value="<?php echo $record->ProductPrice; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeProductPrice' . $index ?>" id="<?php echo 'beforeProductPrice' . $index ?>" value="<?php echo $record->ProductPrice; ?>" />
-
-
-
-
-                                                    <input type="hidden" name="<?php echo 'CustomEdCess' . $index ?>" id="<?php echo 'CustomEdCess' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeCustomEdCess' . $index ?>" id="<?php echo 'beforeCustomEdCess' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" />
-
-
-
-                                                    <input type="hidden" name="<?php echo 'AfterCustomEdCess' . $index ?>" id="<?php echo 'AfterCustomEdCess' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeAfterCustomEdCess' . $index ?>" id="<?php echo 'beforeAfterCustomEdCess' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
-
-
-
-                                                    <!-- <input type="hidden" name="<?php echo 'Grossdutypayable' . $index ?>" id="<?php echo 'Grossdutypayable' . $index ?>" value="<?php echo $record->Grossdutypayable; ?>" />
- <input type="hidden" name="<?php echo 'beforeGrossdutypayable' . $index ?>" id="<?php echo 'beforeGrossdutypayable' . $index ?>" value="<?php echo $record->Grossdutypayable; ?>" /> -->
-
-
-
-
-
-                                                    <input type="hidden" name="<?php echo 'BasicINRValue' . $index ?>" id="<?php echo 'BasicINRValue' . $index ?>" value="<?php echo $record->BasicINRValue; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeBasicINRValue' . $index ?>" id="<?php echo 'beforeBasicINRValue' . $index ?>" value="<?php echo $record->BasicINRValue; ?>" />
-
-
-
-                                                    <input type="hidden" name="<?php echo 'TotalValue' . $index ?>" id="<?php echo 'TotalValue' . $index ?>" value="<?php echo $record->TotalOrderValue; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeTotalValue' . $index ?>" id="<?php echo 'beforeTotalValue' . $index ?>" value="<?php echo $record->TotalOrderValue; ?>" />
-
-
-                                                    <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 'NoOfTrip' . $index ?>" id="<?php echo 'NoOfTrip' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeNoOfTrip' . $index ?>" id="<?php echo 'beforeNoOfTrip' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
-
-
-
-                                                    <input type="hidden" name="<?php echo 'FreightValue' . $index ?>" id="<?php echo 'FreightValue' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
-
-                                                    <input type="hidden" name="<?php echo 'beforeFreightValue' . $index ?>" id="<?php echo 'beforeFreightValue' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
-
-
-
-                                                    <input type="hidden" name="<?php echo 'AfterFreightValue' . $index ?>" id="<?php echo 'AfterFreightValue' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
-
-                                                    <input type="hidden" name="<?php echo 'beforeAfterFreightValue' . $index ?>" id="<?php echo 'beforeAfterFreightValue' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
-
-
-                                                    <input type="hidden" name="<?php echo 'Per' . $index ?>" id="<?php echo 'Per' . $index ?>" value="<?php echo $record->Per; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforePer' . $index ?>" id="<?php echo 'beforePer' . $index ?>" value="<?php echo $record->Per; ?>" />
-
-
-                                                    <input type="hidden" name="<?php echo 'Addinstruction' . $index ?>" id="<?php echo 'Addinstruction' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
-
-
-
-
-
-
-                                                    <input type="hidden" name="<?php echo 'AssessableValue' . $index ?>" id="<?php echo 'AssessableValue' . $index ?>" value="<?php echo $record->AssessableValue; ?>" />
-
-                                                    <input type="hidden" name="<?php echo 'beforeAssessableValue' . $index ?>" id="<?php echo 'beforeAssessableValue' . $index ?>" value="<?php echo $record->AssessableValue; ?>" />
-
-
-
-                                                    <input type="hidden" name="<?php echo 'SubTotal' . $index ?>" id="<?php echo 'SubTotal' . $index ?>" value="<?php echo $record->SubTotal; ?>" />
-
-                                                    <input type="hidden" name="<?php echo 'beforeSubTotal' . $index ?>" id="<?php echo 'beforeSubTotal' . $index ?>" value="<?php echo $record->SubTotal; ?>" />
-
-
-
-                                                    <input type="hidden" name="<?php echo 'IGST' . $index ?>" id="<?php echo 'IGST' . $index ?>" value="<?php echo $record->IGST; ?>" />
-
-                                                    <input type="hidden" name="<?php echo 'beforeIGST' . $index ?>" id="<?php echo 'beforeIGST' . $index ?>" value="<?php echo $record->IGST; ?>" />
-
-
-
-                                                    <input type="hidden" name="<?php echo 'AfterIGST' . $index ?>" id="<?php echo 'AfterIGST' . $index ?>" value="<?php echo $record->AfterIGST; ?>" />
-
-                                                    <input type="hidden" name="<?php echo 'beforeAfterIGST' . $index ?>" id="<?php echo 'beforeAfterIGST' . $index ?>" value="<?php echo $record->AfterIGST; ?>" />
-
-
-
-                                                    <input type="hidden" name="<?php echo 'DutyImpact' . $index ?>" id="<?php echo 'DutyImpact' . $index ?>" value="<?php echo $record->DutyImpact; ?>" />
-
-                                                    <input type="hidden" name="<?php echo 'beforeDutyImpact' . $index ?>" id="<?php echo 'beforeDutyImpact' . $index ?>" value="<?php echo $record->DutyImpact; ?>" />
-
-
-
-                                                    <input type="hidden" name="<?php echo 'ClearingCharge' . $index ?>" id="<?php echo 'ClearingCharge' . $index ?>" value="<?php echo $record->ClearingCharge; ?>" />
-
-                                                    <input type="hidden" name="<?php echo 'beforeClearingCharge' . $index ?>" id="<?php echo 'beforeClearingCharge' . $index ?>" value="<?php echo $record->ClearingCharge; ?>" />
-
-
-                                                    <input type="hidden" name="<?php echo 'NetValue' . $index ?>" id="<?php echo 'NetValue' . $index ?>" value="<?php echo $record->NetValue; ?>" />
-
-                                                    <input type="hidden" name="<?php echo 'beforeNetValue' . $index ?>" id="<?php echo 'beforeNetValue' . $index ?>" value="<?php echo $record->NetValue; ?>" />
-
-
-
-                                                    <input type="hidden" name="<?php echo 'AfterCustomEdCess1' . $index ?>" id="<?php echo 'AfterCustomEdCess1' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
-
-
-                                                    <input type="hidden" name="<?php echo 'beforeAfterCustomEdCess1' . $index ?>" id="<?php echo 'beforeAfterCustomEdCess1' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
-
-
-
-                                                    <input type="hidden" name="<?php echo 'CustomEdCess1' . $index ?>" id="<?php echo 'CustomEdCess1' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeCustomEdCess1' . $index ?>" id="<?php echo 'beforeCustomEdCess1' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" />
-
-                                                    <input type="hidden" name="<?php echo 'Grossdutypayable1' . $index ?>" id="<?php echo 'Grossdutypayable1' . $index ?>" value="<?php echo $record->Grossdutypayable; ?>" />
-                                                    <input type="hidden" name="<?php echo 'beforeGrossdutypayable' . $index ?>" id="<?php echo 'beforeGrossdutypayable' . $index ?>" value="<?php echo $record->Grossdutypayable; ?>" />
-
-
-
-
-
-
-
-
-
-                                                    <?php
-
-                                                    // if($PONOStatus == PO_DRAFT) 
-                                                    // {
-                                                    ?>
-                                                    <td> <a data-target='#editimportpomodel' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#editimportpomodel"><i class="fas fa-pencil-alt" 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="glyphicon glyphicon-trash"></span></a>-->
+                            <div class="form-row">
+                                <div class="table-responsive">
+                                    <table id="ImportTax" 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 $INR ?></th>
+                                                <th>Basic Amount<?php echo $INR ?></th>
+                                                <!-- <th>Tax Amount</th>
+                                                            <th>Total Order Amount</th> -->
+                                                <th>Action</th>
+                                            </tr>
+                                        </thead>
+
+                                        <tbody id='ImportAppend'>
+                                            <?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->MaterialName ?></td>
+                                                        <td><?php echo $record->Quantity ?></td>
+                                                        <td><?php echo $record->UOM ?></td>
+                                                        <td><?php echo $record->Rate ?></td>
+                                                        <td><?php echo $record->BasicValue ?></td>
+                                                        <!-- <td><?php echo $record->Taxamount ?></td>
+                                                            <td><?php echo $record->TotalOrderValue ?></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 'AvlBudAmt'.$index 
+                                                                                        ?>" id="<?php //echo 'AvlBudAmt'.$index 
+                                                                                                            ?>" value="<?php //echo $AvlBudAmt;
+                                                                                                                        ?>" />  -->
+
+                                                        <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 'beforequantity' . $index ?>" id="<?php echo 'beforequantity' . $index ?>" value="<?php echo $record->Quantity; ?>" />
+                                                        <input type="hidden" name="<?php echo 'itemRate' . $index ?>" id="<?php echo 'itemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeitemRate' . $index ?>" id="<?php echo 'beforeitemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
+                                                        <input type="hidden" name="<?php echo 'LandingCharge' . $index ?>" id="<?php echo 'LandingCharge' . $index ?>" value="<?php echo $record->LandingCharge; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeLandingCharge' . $index ?>" id="<?php echo 'beforeLandingCharge' . $index ?>" value="<?php echo $record->LandingCharge; ?>" />
+                                                        <input type="hidden" name="<?php echo 'AfterLandingCharge' . $index ?>" id="<?php echo 'AfterLandingCharge' . $index ?>" value="<?php echo $record->AfterLandingCharge; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeAfterLandingCharge' . $index ?>" id="<?php echo 'beforeAfterLandingCharge' . $index ?>" value="<?php echo $record->AfterLandingCharge; ?>" />
+                                                        <input type="hidden" name="<?php echo 'CustomDuty' . $index ?>" id="<?php echo 'CustomDuty' . $index ?>" value="<?php echo $record->CustomDuty; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeCustomDuty' . $index ?>" id="<?php echo 'beforeCustomDuty' . $index ?>" value="<?php echo $record->CustomDuty; ?>" />
+                                                        <input type="hidden" name="<?php echo 'AfterCustomDuty' . $index ?>" id="<?php echo 'AfterCustomDuty' . $index ?>" value="<?php echo $record->AfterCustomDuty; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeAfterCustomDuty' . $index ?>" id="<?php echo 'beforeAfterCustomDuty' . $index ?>" value="<?php echo $record->AfterCustomDuty; ?>" />
+                                                        <input type="hidden" name="<?php echo 'CustomEdCess' . $index ?>" id="<?php echo 'CustomEdCess' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeCustomEdCess' . $index ?>" id="<?php echo 'CustomEdCess' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" />
+                                                        <input type="hidden" name="<?php echo 'AfterCustomEdCess' . $index ?>" id="<?php echo 'AfterCustomEdCess' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeAfterCustomEdCess' . $index ?>" id="<?php echo 'beforeAfterCustomEdCess' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
+                                                        <input type="hidden" name="<?php echo 'ExchangeRate' . $index ?>" id="<?php echo 'ExchangeRate' . $index ?>" value="<?php echo $record->ExchangeRate; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeExchangeRate' . $index ?>" id="<?php echo 'beforeExchangeRate' . $index ?>" value="<?php echo $record->ExchangeRate; ?>" />
+                                                        <input type="hidden" name="<?php echo 'CustomDutyExpensesPerKG' . $index ?>" id="<?php echo 'CustomDutyExpensesPerKG' . $index ?>" value="<?php echo $record->CustomDutyExpensesPerKG; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeCustomDutyExpensesPerKG' . $index ?>" id="<?php echo 'beforeCustomDutyExpensesPerKG' . $index ?>" value="<?php echo $record->CustomDutyExpensesPerKG; ?>" />
+                                                        <!-- <input type="hidden" name="<?php echo 'QuantityKG' . $index ?>" id="<?php echo 'QuantityKG' . $index ?>" value="<?php echo $record->QuantityKG; ?>" />
+                                                            <input type="hidden" name="<?php echo 'beforeQuantityKG' . $index ?>" id="<?php echo 'beforeQuantityKG' . $index ?>" value="<?php echo $record->QuantityKG; ?>" /> -->
+                                                        <input type="hidden" name="<?php echo 'BasicPriceInMTon' . $index ?>" id="<?php echo 'BasicPriceInMTon' . $index ?>" value="<?php echo $record->BasicPriceInMTon; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeBasicPriceInMTon' . $index ?>" id="<?php echo 'beforeBasicPriceInMTon' . $index ?>" value="<?php echo $record->BasicPriceInMTon; ?>" />
+                                                        <input type="hidden" name="<?php echo 'ProductPrice' . $index ?>" id="<?php echo 'ProductPrice' . $index ?>" value="<?php echo $record->BasicValue; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeProductPrice' . $index ?>" id="<?php echo 'beforeProductPrice' . $index ?>" value="<?php echo $record->ProductPrice; ?>" />
+                                                        <input type="hidden" name="<?php echo 'CustomSHCess' . $index ?>" id="<?php echo 'CustomSHCess' . $index ?>" value="<?php echo $record->CustomSHCess; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeCustomSHCess' . $index ?>" id="<?php echo 'beforeCustomSHCess' . $index ?>" value="<?php echo $record->CustomSHCess; ?>" />
+                                                        <input type="hidden" name="<?php echo 'AfterCustomSHCess' . $index ?>" id="<?php echo 'AfterCustomSHCess' . $index ?>" value="<?php echo $record->AfterCustomSHCess; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeAfterCustomSHCess' . $index ?>" id="<?php echo 'beforeAfterCustomSHCess' . $index ?>" value="<?php echo $record->AfterCustomSHCess; ?>" />
+                                                        <input type="hidden" name="<?php echo 'QuantityKG' . $index ?>" id="<?php echo 'QuantityKG' . $index ?>" value="<?php echo $record->QuantityKG; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeQuantityKG' . $index ?>" id="<?php echo 'beforeQuantityKG' . $index ?>" value="<?php echo $record->QuantityKG; ?>" />
+                                                        <input type="hidden" name="<?php echo 'BasicPriceInMTon' . $index ?>" id="<?php echo 'BasicPriceInMTonG' . $index ?>" value="<?php echo $record->BasicPriceInMTon; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeBasicPriceInMTon' . $index ?>" id="<?php echo 'beforeBasicPriceInMTonG' . $index ?>" value="<?php echo $record->BasicPriceInMTon; ?>" />
+
+
+
+                                                        <input type="hidden" name="<?php echo 'ProductPrice' . $index ?>" id="<?php echo 'ProductPrice' . $index ?>" value="<?php echo $record->ProductPrice; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeProductPrice' . $index ?>" id="<?php echo 'beforeProductPrice' . $index ?>" value="<?php echo $record->ProductPrice; ?>" />
+
+
+
+
+                                                        <input type="hidden" name="<?php echo 'CustomEdCess' . $index ?>" id="<?php echo 'CustomEdCess' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeCustomEdCess' . $index ?>" id="<?php echo 'beforeCustomEdCess' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" />
+
+
+
+                                                        <input type="hidden" name="<?php echo 'AfterCustomEdCess' . $index ?>" id="<?php echo 'AfterCustomEdCess' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeAfterCustomEdCess' . $index ?>" id="<?php echo 'beforeAfterCustomEdCess' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
+
+
+
+                                                        <!-- <input type="hidden" name="<?php echo 'Grossdutypayable' . $index ?>" id="<?php echo 'Grossdutypayable' . $index ?>" value="<?php echo $record->Grossdutypayable; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeGrossdutypayable' . $index ?>" id="<?php echo 'beforeGrossdutypayable' . $index ?>" value="<?php echo $record->Grossdutypayable; ?>" /> -->
+
+                                                        <input type="hidden" name="<?php echo 'BasicINRValue' . $index ?>" id="<?php echo 'BasicINRValue' . $index ?>" value="<?php echo $record->BasicINRValue; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeBasicINRValue' . $index ?>" id="<?php echo 'beforeBasicINRValue' . $index ?>" value="<?php echo $record->BasicINRValue; ?>" />
+                                                        <input type="hidden" name="<?php echo 'TotalValue' . $index ?>" id="<?php echo 'TotalValue' . $index ?>" value="<?php echo $record->TotalOrderValue; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeTotalValue' . $index ?>" id="<?php echo 'beforeTotalValue' . $index ?>" value="<?php echo $record->TotalOrderValue; ?>" />
+                                                        <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 'NoOfTrip' . $index ?>" id="<?php echo 'NoOfTrip' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeNoOfTrip' . $index ?>" id="<?php echo 'beforeNoOfTrip' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
+                                                        <input type="hidden" name="<?php echo 'FreightValue' . $index ?>" id="<?php echo 'FreightValue' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeFreightValue' . $index ?>" id="<?php echo 'beforeFreightValue' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
+                                                        <input type="hidden" name="<?php echo 'AfterFreightValue' . $index ?>" id="<?php echo 'AfterFreightValue' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeAfterFreightValue' . $index ?>" id="<?php echo 'beforeAfterFreightValue' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
+                                                        <input type="hidden" name="<?php echo 'Per' . $index ?>" id="<?php echo 'Per' . $index ?>" value="<?php echo $record->Per; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforePer' . $index ?>" id="<?php echo 'beforePer' . $index ?>" value="<?php echo $record->Per; ?>" />
+                                                        <input type="hidden" name="<?php echo 'Addinstruction' . $index ?>" id="<?php echo 'Addinstruction' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
+                                                        <input type="hidden" name="<?php echo 'AssessableValue' . $index ?>" id="<?php echo 'AssessableValue' . $index ?>" value="<?php echo $record->AssessableValue; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeAssessableValue' . $index ?>" id="<?php echo 'beforeAssessableValue' . $index ?>" value="<?php echo $record->AssessableValue; ?>" />
+                                                        <input type="hidden" name="<?php echo 'SubTotal' . $index ?>" id="<?php echo 'SubTotal' . $index ?>" value="<?php echo $record->SubTotal; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeSubTotal' . $index ?>" id="<?php echo 'beforeSubTotal' . $index ?>" value="<?php echo $record->SubTotal; ?>" />
+                                                        <input type="hidden" name="<?php echo 'IGST' . $index ?>" id="<?php echo 'IGST' . $index ?>" value="<?php echo $record->IGST; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeIGST' . $index ?>" id="<?php echo 'beforeIGST' . $index ?>" value="<?php echo $record->IGST; ?>" />
+                                                        <input type="hidden" name="<?php echo 'AfterIGST' . $index ?>" id="<?php echo 'AfterIGST' . $index ?>" value="<?php echo $record->AfterIGST; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeAfterIGST' . $index ?>" id="<?php echo 'beforeAfterIGST' . $index ?>" value="<?php echo $record->AfterIGST; ?>" />
+                                                        <input type="hidden" name="<?php echo 'DutyImpact' . $index ?>" id="<?php echo 'DutyImpact' . $index ?>" value="<?php echo $record->DutyImpact; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeDutyImpact' . $index ?>" id="<?php echo 'beforeDutyImpact' . $index ?>" value="<?php echo $record->DutyImpact; ?>" />
+                                                        <input type="hidden" name="<?php echo 'ClearingCharge' . $index ?>" id="<?php echo 'ClearingCharge' . $index ?>" value="<?php echo $record->ClearingCharge; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeClearingCharge' . $index ?>" id="<?php echo 'beforeClearingCharge' . $index ?>" value="<?php echo $record->ClearingCharge; ?>" />
+                                                        <input type="hidden" name="<?php echo 'NetValue' . $index ?>" id="<?php echo 'NetValue' . $index ?>" value="<?php echo $record->NetValue; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeNetValue' . $index ?>" id="<?php echo 'beforeNetValue' . $index ?>" value="<?php echo $record->NetValue; ?>" />
+                                                        <input type="hidden" name="<?php echo 'AfterCustomEdCess1' . $index ?>" id="<?php echo 'AfterCustomEdCess1' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeAfterCustomEdCess1' . $index ?>" id="<?php echo 'beforeAfterCustomEdCess1' . $index ?>" value="<?php echo $record->AfterCustomEdCess; ?>" />
+                                                        <input type="hidden" name="<?php echo 'CustomEdCess1' . $index ?>" id="<?php echo 'CustomEdCess1' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeCustomEdCess1' . $index ?>" id="<?php echo 'beforeCustomEdCess1' . $index ?>" value="<?php echo $record->CustomEdCess; ?>" />
+                                                        <input type="hidden" name="<?php echo 'Grossdutypayable1' . $index ?>" id="<?php echo 'Grossdutypayable1' . $index ?>" value="<?php echo $record->Grossdutypayable; ?>" />
+                                                        <input type="hidden" name="<?php echo 'beforeGrossdutypayable' . $index ?>" id="<?php echo 'beforeGrossdutypayable' . $index ?>" value="<?php echo $record->Grossdutypayable; ?>" />
                                                         <?php
-                                                        // } else {
+
+                                                        // if($PONOStatus == PO_DRAFT) 
+                                                        // {
                                                         ?>
-                                                    <td> <!-- <a   data-toggle="tooltip"  href="#"><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>  -->
-                                                        <?php
-                                                        // }
-                                                        ?>
-                                                </tr> <?php
+                                                        <td> <a data-target='#editimportpomodel' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#editimportpomodel"><i class="fas fa-pencil-alt" 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="glyphicon glyphicon-trash"></span></a>-->
+                                                            <?php
+                                                            // } else {
+                                                            ?>
+                                                        <td> <!-- <a   data-toggle="tooltip"  href="#"><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>  -->
+                                                            <?php
+                                                            // }
+                                                            ?>
+                                                    </tr> <?php
+                                                            $TotalLanding  = $TotalLanding + $record->AfterLandingCharge;
+                                                            $tothighseas   = $tothighseas + $record->AfterHighSeasSalesCharge;
+                                                            $totcustom  = $totcustom + $record->AfterCustomDuty;
+                                                            $totexciseduty  = $totexciseduty + $record->AfterExciseDuty;
+                                                            $totexcisedutyED  = $totexcisedutyED + $record->AfterExciseDutyEdCess;
+                                                            $totexciseSH  = $totexciseSH + $record->AfterExciseDutySHCess;
+                                                            $totcustomED  = $totcustomED + $record->AfterCustomEdCess;
+                                                            $totcustomSH   = $totcustomSH + $record->AfterCustomSHCess;
+                                                            $totaddtnlexcise = $totaddtnlexcise + $record->AfterAddlExciseDuty;
+                                                            //$totgrossduty   = $totgrossduty + $record->Grossdutypayable;
+                                                            //$totavlmodvat    = $totavlmodvat +$record->AvailableModvat;
+                                                            $totgrossduty = $totgrossduty + $record->Grossdutypayable;
+                                                            $totavlmodvat = $totavlmodvat + $record->AvailableModvat;
+                                                            $totgrossexpense = $totgrossexpense + $record->Grossexpensesduetocustomduty;
+                                                            $ExchangeRate = $record->ExchangeRate;
+                                                            $totorder = $totorder + $record->BasicValue;
+                                                            $totfreight = $totfreight + $record->AfterFreightValue;
+                                                            //alert($totorder);
+                                                            $totassesable = $totassesable + $record->AssessableValue;
+                                                            $totSubtotal = $totSubtotal + $record->SubTotal;
+                                                            $totigst = $totigst + $record->AfterIGST;
+                                                        }
+                                                        $Rowcount = $index;
+                                                            ?>
+                                            <?php
 
-
-
-                                                        $TotalLanding  = $TotalLanding + $record->AfterLandingCharge;
-                                                        $tothighseas   = $tothighseas + $record->AfterHighSeasSalesCharge;
-                                                        $totcustom  = $totcustom + $record->AfterCustomDuty;
-                                                        $totexciseduty  = $totexciseduty + $record->AfterExciseDuty;
-                                                        $totexcisedutyED  = $totexcisedutyED + $record->AfterExciseDutyEdCess;
-                                                        $totexciseSH  = $totexciseSH + $record->AfterExciseDutySHCess;
-                                                        $totcustomED  = $totcustomED + $record->AfterCustomEdCess;
-
-                                                        $totcustomSH   = $totcustomSH + $record->AfterCustomSHCess;
-                                                        $totaddtnlexcise = $totaddtnlexcise + $record->AfterAddlExciseDuty;
-                                                        //$totgrossduty   = $totgrossduty + $record->Grossdutypayable;
-                                                        //$totavlmodvat    = $totavlmodvat +$record->AvailableModvat;
-                                                        $totgrossduty = $totgrossduty + $record->Grossdutypayable;
-                                                        $totavlmodvat = $totavlmodvat + $record->AvailableModvat;
-                                                        $totgrossexpense = $totgrossexpense + $record->Grossexpensesduetocustomduty;
-                                                        $ExchangeRate = $record->ExchangeRate;
-                                                        $totorder = $totorder + $record->BasicValue;
-                                                        $totfreight = $totfreight + $record->AfterFreightValue;
-                                                        //alert($totorder);
-
-
-                                                        $totassesable = $totassesable + $record->AssessableValue;
-                                                        $totSubtotal = $totSubtotal + $record->SubTotal;
-                                                        $totigst = $totigst + $record->AfterIGST;
-                                                    }
-                                                    $Rowcount = $index;
-                                                        ?>
-                                        <?php
-
-                                            $totalhidden = $totorder;
-                                            $totorder = number_format($totorder, 2, '.', '');
-                                            //echo $to;
-                                            $TotalLanding = number_format($TotalLanding, 2, '.', '');
-                                            $tothighseas = number_format($tothighseas, 2, '.', '');
-                                            $totcustom = number_format($totcustom, 2, '.', '');
-                                            $totexciseduty = number_format($totexciseduty, 2, '.', '');
-                                            $totexcisedutyED = number_format($totexcisedutyED, 2, '.', '');
-                                            $totexciseSH = number_format($totexciseSH, 2, '.', '');
-                                            $totcustomED = number_format($totcustomED, 2, '.', '');
-                                            $totcustomSH = number_format($totcustomSH, 2, '.', '');
-                                            $totaddtnlexcise = number_format($totaddtnlexcise, 2, '.', '');
-                                            $totgrossduty = number_format($totgrossduty, 2, '.', '');
-                                            $totavlmodvat = number_format($totavlmodvat, 2, '.', '');
-                                            $totgrossexpense = number_format($totgrossexpense, 2, '.', '');
-                                            $totfreight = number_format($totfreight, 2, '.', '');
-
-
-                                            $totassesable = number_format($totassesable, 2, '.', '');
-                                            $totSubtotal = number_format($totSubtotal, 2, '.', '');
-                                            $totigst = number_format($totigst, 2, '.', '');
-                                        }
-                                        ?>
-                                    </tbody>
-                                </table>
+                                                $totalhidden = $totorder;
+                                                $totorder = number_format($totorder, 2, '.', '');
+                                                //echo $to;
+                                                $TotalLanding = number_format($TotalLanding, 2, '.', '');
+                                                $tothighseas = number_format($tothighseas, 2, '.', '');
+                                                $totcustom = number_format($totcustom, 2, '.', '');
+                                                $totexciseduty = number_format($totexciseduty, 2, '.', '');
+                                                $totexcisedutyED = number_format($totexcisedutyED, 2, '.', '');
+                                                $totexciseSH = number_format($totexciseSH, 2, '.', '');
+                                                $totcustomED = number_format($totcustomED, 2, '.', '');
+                                                $totcustomSH = number_format($totcustomSH, 2, '.', '');
+                                                $totaddtnlexcise = number_format($totaddtnlexcise, 2, '.', '');
+                                                $totgrossduty = number_format($totgrossduty, 2, '.', '');
+                                                $totavlmodvat = number_format($totavlmodvat, 2, '.', '');
+                                                $totgrossexpense = number_format($totgrossexpense, 2, '.', '');
+                                                $totfreight = number_format($totfreight, 2, '.', '');
+                                                $totassesable = number_format($totassesable, 2, '.', '');
+                                                $totSubtotal = number_format($totSubtotal, 2, '.', '');
+                                                $totigst = number_format($totigst, 2, '.', '');
+                                            }
+                                            ?>
+                                        </tbody>
+                                    </table>
+                                </div>
                             </div>
 
-                            <div class="form-group col-md-12" style="border: 1px solid;">
-
-                                <div class="form-group col-md-12">
-                                    <div class="form-group col-md-4">
-                                        <label>Total Landing Charge <?php echo "($INR)" ?></label>
-
-                                        <?php
-                                        $data = array('name' => 'txttotallanding', 'value' => set_value('txttotallanding', $TotalLanding), 'id' => 'txttotallanding',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-
-                                    <div class="form-group col-md-4">
-                                        <label>Total Assessable Value <?php echo "($INR)" ?></label>
-
-                                        <?php
-                                        $data = array('name' => 'txttotalAssessable', 'value' => set_value('txttotalAssessable', $totassesable), 'id' => 'txttotalAssessable',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-
-                                    <div class="form-group col-md-4">
-                                        <label>Total Custom Duty Charge <?php echo "($INR)" ?></label>
-
-                                        <?php
-                                        $data = array('name' => 'txttotalcustom', 'value' => set_value('txttotalcustom', $totcustom), 'id' => 'txttotalcustom',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
 
 
-                                    <div class="form-group col-md-4">
-                                        <label>Total Subtotal Charge <?php echo "($INR)" ?></label>
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    <label>Total Landing Charge <?php echo "($INR)" ?></label>
 
-                                        <?php
-                                        $data = array('name' => 'txttotalSubtotal', 'value' => set_value('txttotalSubtotal', $totSubtotal), 'id' => 'txttotalSubtotal',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-
-
-                                    <div class="form-group col-md-4">
-                                        <label>Total IGST <?php echo "($INR)" ?></label>
-
-                                        <?php
-                                        $data = array('name' => 'txttotalIgst', 'value' => set_value('txttotalIgst', $totigst), 'id' => 'txttotalIgst',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-
-
-                                    <div class="form-group col-md-4">
-                                        <label>Total Custom ED_cess Charge <?php echo "($INR)" ?></label>
-
-                                        <?php
-                                        $data = array('name' => 'txttotalcustomED', 'value' => set_value('txttotalcustomED', $totcustomED), 'id' => 'txttotalcustomED',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-
-                                    <div class="form-group col-md-4">
-                                        <label>Total Custom S & H cess Charge <?php echo "($INR)" ?></label>
-
-                                        <?php
-                                        $data = array('name' => 'txttotalcustomSH', 'value' => set_value('txttotalcustomSH', $totcustomSH), 'id' => 'txttotalcustomSH',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-
-                                    <div class="form-group col-md-4">
-                                        <label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
-
-                                        <?php
-                                        $data = array('name' => 'txttotalgrossduty', 'value' => set_value('txttotalgrossduty', $totgrossduty), 'id' => 'txttotalgrossduty',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-
-
-
-
-                                    <div class="form-group col-md-4">
-                                        <label>Total Freight Value </label> <?php
-                                                                            $data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', $totfreight), 'id' => 'txtTotalFreight',  'class' => 'form-control', 'required' => 'true', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                    </div>
-
-
-
-                                    <input type="hidden" name="txttotamend" id="txttotamed" value=<?php echo $totorder; ?>>
-                                    <div class="form-group col-md-4">
-                                        <label>Total Order Value <?php echo "($Value)" ?></label> <?php
-                                                                                                    $data = array('name' => 'txtToatlOrder', 'value' => set_value('txtToatlOrder', $totorder), 'id' => 'txtToatlOrder',  'class' => 'form-control', 'required' => 'true', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                                                                                    echo form_input($data);
-                                                                                                    ?>
-                                    </div>
+                                    <?php
+                                    $data = array('name' => 'txttotallanding', 'value' => set_value('txttotallanding', $TotalLanding), 'id' => 'txttotallanding',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
                                 </div>
 
+                                <div class="form-group col-md-4">
+                                    <label>Total Assessable Value <?php echo "($INR)" ?></label>
+
+                                    <?php
+                                    $data = array('name' => 'txttotalAssessable', 'value' => set_value('txttotalAssessable', $totassesable), 'id' => 'txttotalAssessable',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label>Total Custom Duty Charge <?php echo "($INR)" ?></label>
+
+                                    <?php
+                                    $data = array('name' => 'txttotalcustom', 'value' => set_value('txttotalcustom', $totcustom), 'id' => 'txttotalcustom',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label>Total Subtotal Charge <?php echo "($INR)" ?></label>
+
+                                    <?php
+                                    $data = array('name' => 'txttotalSubtotal', 'value' => set_value('txttotalSubtotal', $totSubtotal), 'id' => 'txttotalSubtotal',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label>Total IGST <?php echo "($INR)" ?></label>
+
+                                    <?php
+                                    $data = array('name' => 'txttotalIgst', 'value' => set_value('txttotalIgst', $totigst), 'id' => 'txttotalIgst',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label>Total Custom ED_cess Charge <?php echo "($INR)" ?></label>
+                                    <?php
+                                    $data = array('name' => 'txttotalcustomED', 'value' => set_value('txttotalcustomED', $totcustomED), 'id' => 'txttotalcustomED',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label>Total Custom S & H cess Charge <?php echo "($INR)" ?></label>
+                                    <?php
+                                    $data = array('name' => 'txttotalcustomSH', 'value' => set_value('txttotalcustomSH', $totcustomSH), 'id' => 'txttotalcustomSH',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
+
+                                    <?php
+                                    $data = array('name' => 'txttotalgrossduty', 'value' => set_value('txttotalgrossduty', $totgrossduty), 'id' => 'txttotalgrossduty',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label>Total Freight Value </label> <?php
+                                                                        $data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', $totfreight), 'id' => 'txtTotalFreight',  'class' => 'form-control', 'required' => 'true', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                </div>
+
+                                <input type="hidden" name="txttotamend" id="txttotamed" value=<?php echo $totorder; ?>>
                                 <input type="hidden" name="txttot" id="txttot" value=<?php echo $totalhidden; ?>>
 
-
-
-                                <div class="form-group col-md-12">
-                                    <div class="form-group col-md-12">
-                                        <label>Special Instructions </label> <?php
-                                                                                $data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
-                                                                                echo form_textarea($data);
-                                                                                ?>
-                                    </div>
+                                <div class="form-group col-md-4">
+                                    <label>Total Order Value <?php echo "($Value)" ?></label> <?php
+                                                                                                $data = array('name' => 'txtToatlOrder', 'value' => set_value('txtToatlOrder', $totorder), 'id' => 'txtToatlOrder',  'class' => 'form-control', 'required' => 'true', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                                                                                echo form_input($data);
+                                                                                                ?>
                                 </div>
-                                <div align="right" style="padding-right:10px">
+                            </div>
 
-                                    <div class="col-md-5 col-md-offset-7" align="right"><br />
-                                        <div>
-                                            <input type="file" name="POFile" id="POFile">
-                                            <?php if ($PrePOFile) { ?>
-                                                <label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
-                                            <?php } ?>
-                                            <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
-                                        </div>
-
-                                        <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" value="<?php echo  $Rowcount; ?>" />
-                                        <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
-                                        <input type="hidden" name="txtTotalorderValue" id="txtTotalorderValue" />
-
-                                        <input type="hidden" name="beforePlaceOforigin" id="beforePlaceOforigin" value="<?php echo $Import_PlaceofOrgin; ?>" />
-                                        <input type="hidden" name="beforePaymentterms" id="beforePaymentterms" value="<?php echo $PaymentTerms; ?>" />
-
-                                        <!-- <input type="hidden" name="beforeschedule" id="beforeschedule" value="<?php echo $DeliverySchedule; ?>"  />   
-        <input type="hidden" name="beforeDispatch" id="beforeschedule" value="<?php echo $Import_DispatchDetails; ?>"  />   -->
-
-                                        <?php //if($PONOStatus == PO_DRAFT) {
-                                        ?>
-                                        <!-- <a class="btn btn-success Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
-                                        <a class="btn btn-cancel Save" ID="Cancel" href="<?php echo base_url() . 'amendmentpurchaseorder'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
-                                        <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                        <!-- <input type="reset" class="btn btn-success" value="Reset"> -->
-                                        <?php //}else {
-                                        ?>
-                                        <!-- <input type="reset" class="btn btn-success" value = "OK">  <?php //} 
-                                                                                                        ?>-->
-                                        <br />
+                            <div class="form-row">
+                                <div class="form-group col-md-12">
+                                    <label>Special Instructions </label>
+                                    <?php
+                                    $data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
+                                    echo form_textarea($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-12" align="right"><br />
+                                    <div>
+                                        <input type="file" name="POFile" id="POFile">
+                                        <?php if ($PrePOFile) { ?>
+                                            <label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
+                                        <?php } ?>
+                                        <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
                                     </div>
 
+                                    <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" value="<?php echo  $Rowcount; ?>" />
+                                    <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
+                                    <input type="hidden" name="txtTotalorderValue" id="txtTotalorderValue" />
+
+                                    <input type="hidden" name="beforePlaceOforigin" id="beforePlaceOforigin" value="<?php echo $Import_PlaceofOrgin; ?>" />
+                                    <input type="hidden" name="beforePaymentterms" id="beforePaymentterms" value="<?php echo $PaymentTerms; ?>" />
+
+                                    <!-- <input type="hidden" name="beforeschedule" id="beforeschedule" value="<?php echo $DeliverySchedule; ?>"  />   
+                                                    <input type="hidden" name="beforeDispatch" id="beforeschedule" value="<?php echo $Import_DispatchDetails; ?>"  />   -->
+
+                                    <?php //if($PONOStatus == PO_DRAFT) {
+                                    ?>
+                                    <!-- <a class="btn btn-success Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
+                                    <a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'amendmentpurchaseorder'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
+                                    <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                    <!-- <input type="reset" class="btn btn-success" value="Reset"> -->
+                                    <?php //}else {
+                                    ?>
+                                    <!-- <input type="reset" class="btn btn-success" value = "OK">  <?php //} 
+                                                                                                    ?>-->
+                                    <br />
+                                </div>
+                            </div>
+
+                            <div class="form-row">
+                                <div class="form-group col-md-12">
+                                    <label>Request On :</label><?php echo $Reqon; ?><br />
+                                    <label>Request By :</label><?php echo $RequesterName; ?><br />
+                                    <!--<label>Status :</label><?php echo $StatusName; ?>-->
+                                    <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;
+                                                                }
+                                                            } else {
+                                                                echo "Status not provided";
+                                                            }
+                                                            ?>
+
                                 </div>
                             </div>
 
-                            <label>Request On :</label><?php echo $Reqon; ?><br />
-                            <label>Request By :</label><?php echo $RequesterName; ?><br />
-                            <!--<label>Status :</label><?php echo $StatusName; ?>-->
-                            <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;
-                                                        }
-                                                    } else {
-                                                        echo "Status not provided";
-                                                    }
-                                                    ?>
 
-                        </div>
-                </div>
-
-   
 
 
                         </div> <!-- end card body-->
-					</div> <!-- end card -->
-				</div><!-- end col-->
-			</div>
-		</div> <!-- container -->
-	</div> <!-- content -->
+                    </div> <!-- end card -->
+                </div><!-- end col-->
+            </div>
+        </div> <!-- container -->
+    </div> <!-- content -->
 </div>
 
 <script type="text/javascript">
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php
index 26e698d8..efc5eef4 100644
--- a/app/Views/editRevenueAmendPO.php
+++ b/app/Views/editRevenueAmendPO.php
@@ -965,7 +965,7 @@ if (!empty($INRSYMBOL)) {
 									</div>
 									<div class="form-group col-md-3">
 										<label>Supplier Address</label>
-										<div class="form-group">
+										<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);
@@ -998,9 +998,9 @@ if (!empty($INRSYMBOL)) {
 									?>
 									<input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt; ?>">
 									<label>Delivery Date<span class="text-danger">*</span></label>
-									<div class="form-group">
+									<div>
 										<?php
-										$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+										$data = array('type' => 'date','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>
@@ -1015,7 +1015,7 @@ if (!empty($INRSYMBOL)) {
 								</div>
 								<div class="form-group col-md-3">
 									<label>Delivery Address</label>
-									<div class="form-group">
+									<div>
 										<?php
 										$data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'readonly' => 'true');
 										echo Form_textarea($data);
@@ -1033,7 +1033,7 @@ if (!empty($INRSYMBOL)) {
 								</div>
 								<div class="form-group col-md-3">
 									<label>Mode Of Shipment</label>
-									<div class="form-group">
+									<div>
 
 										<?php
 										$data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment', $modeofshipment), 'id' => 'addmodeofshipment',  'class' => 'form-control', 'readonly' => 'readonly');
@@ -1046,7 +1046,7 @@ if (!empty($INRSYMBOL)) {
 								</div>
 								<div class="form-group col-md-3">
 									<label>Contact Reference</label>
-									<div class="form-group">
+									<div>
 
 										<?php
 										$data = array('name' => 'amendsupplierreference', 'value' => set_value('amendsupplierreference', $supplierref), 'id' => 'amendsupplierreference',  'class' => 'form-control', 'readonly' => 'readonly', 'maxlength' => '40');
@@ -1056,7 +1056,7 @@ if (!empty($INRSYMBOL)) {
 								</div>
 								<div class="form-group col-md-3">
 									<label>Supplier's Offer No</label>
-									<div class="form-group">
+									<div>
 
 										<?php
 										$data = array('name' => 'amendsupplierofferno', 'value' => set_value('amendsupplierofferno', $suppofferno), 'id' => 'amendsupplierofferno',  'class' => 'form-control', 'readonly' => 'readonly');
@@ -1069,7 +1069,7 @@ if (!empty($INRSYMBOL)) {
 							<div class="form-row">
 								<div class="form-group col-md-3">
 									<label>Other Reference(S)</label>
-									<div class="form-group">
+									<div>
 
 										<?php
 										$data = array('name' => 'amendotherreference', 'value' => set_value('amendotherreference', $otherref), 'id' => 'amendotherreference',  'class' => 'form-control', 'readonly' => 'readonly');
@@ -1079,7 +1079,7 @@ if (!empty($INRSYMBOL)) {
 								</div>
 								<div class="form-group col-md-3">
 									<label>Revenue Type Options<span class="text-danger">*</span></label>
-									<div class="form-group">
+									<div>
 
 										<?php
 
@@ -1153,7 +1153,6 @@ if (!empty($INRSYMBOL)) {
 								</div>
 							</div>
 							<div class="form-row">
-								<div class="form-group col-md-12">
 									<div class="form-group col-md-3">
 										<label for="insurance">Insurance<span class="text-danger">*</span></label>
 										<?php
@@ -1163,7 +1162,7 @@ if (!empty($INRSYMBOL)) {
 									</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 class="form-group">
+										<div>
 											<?php
 											$data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
 											echo form_input($data);
@@ -1190,8 +1189,8 @@ if (!empty($INRSYMBOL)) {
 									</div>
 									<div class="form-group col-md-3">
 									</div>
-								</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;">
@@ -1290,7 +1289,7 @@ if (!empty($INRSYMBOL)) {
 
 
 
-													<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to Amend the  <?php echo $record->ReqNo; ?> Requisition details"></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" data-toggle="tooltip"></i></a>
 
 														<!--	<td>   <a  	data-toggle="tooltip"  href="#"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="<?php //echo $record->ReqNo; 
 																																											?>  -  Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a>  </td>  -->
@@ -1445,12 +1444,13 @@ if (!empty($INRSYMBOL)) {
 								</div>
 							</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; ?>
-								<?php } ?><br />
+									<label>Request By : </label><?php echo $RequesterName; ?><br />
+								<?php } ?>
 								<label>Status : </label><?php
 														$statusMappings = [
 															'PO APPROVED' => 'AWAITING APPROVE',
@@ -1469,6 +1469,7 @@ if (!empty($INRSYMBOL)) {
 															echo "Status not provided";
 														}
 														?>
+														</div>
 							</div>
 
 						</div> <!-- end card body-->
@@ -1499,7 +1500,7 @@ if (!empty($INRSYMBOL)) {
 				</form>
 			</div>
 			<div class="modal-footer">
-				<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+				<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
 				<a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
 			</div>
 		</div>
@@ -1534,7 +1535,7 @@ if (!empty($INRSYMBOL)) {
 </div><!-- /.modal -->
 <div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-lg">
+	<div class="modal-dialog modal-full-width">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4>
@@ -1560,7 +1561,7 @@ if (!empty($INRSYMBOL)) {
 
 							<div class="form-group col-md-3">
 								<label>Department Name</label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
@@ -1569,7 +1570,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 							<div class="form-group col-md-3">
 								<label>Cost Center Code</label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
@@ -1579,7 +1580,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 							<div class="form-group col-md-3">
 								<label>Avl Bud Amt</label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
 									echo form_input($data);
@@ -1605,26 +1606,25 @@ if (!empty($INRSYMBOL)) {
 
 							<div class="form-group col-md-2">
 								<label>Item Name</label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
 									?>
 								</div>
 							</div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-1">
 								<label>UOM</label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control', 'readonly' => 'true');
 									echo form_input($data);
 									?>
 								</div>
 							</div>
-							<div class="form-group col-md-6" style="padding:0px;">
-								<div class="form-group col-md-3">
+								<div class="form-group col-md-2">
 									<label>Quantity<span class="text-danger">*</span></label>
-									<div class="form-group">
+									<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);
@@ -1632,37 +1632,36 @@ if (!empty($INRSYMBOL)) {
 
 									</div>
 								</div>
-								<div class="form-group col-md-3">
+								<div class="form-group col-md-2">
 									<label>Rate <?php echo "($INRSYM)" ?><span class="text-danger">*</span></label>
-									<div class="form-group">
+									<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">
+								<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-3" style="padding-left: 0px;">
+								<div class="form-group col-md-2" style="padding-left: 0px;">
 									<label>Basic Amt <?php echo "($INRSYM)" ?></label>
-									<div class="form-group">
+									<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>
-								<div>
+								
 									<?php
 									$options = array("0" => 'Select Discount Type');
 									//print_r(  $options);
@@ -1679,25 +1678,24 @@ if (!empty($INRSYMBOL)) {
 									echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType" class="form-control"');
 
 									?>
-								</div>
 							</div>
 							<div class="form-group col-md-2">
 								<label>Discount Rate </label>
-								<div class="form-group">
+								
 									<?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>
 							<div class="form-group col-md-2">
 								<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
-								<div class="form-group">
+								
 									<?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>
 						<div class="form-row">
@@ -1725,7 +1723,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 							<div class="form-group col-md-2" id="EditTripsValue" style="display:none;">
 								<label>NO Of Trips</label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight();');
 									echo form_input($data);
@@ -1734,7 +1732,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 							<div class="form-group col-md-2">
 								<label>Freight Rate </label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight();', 'style' => 'text-align:right;');
 									echo form_input($data);
@@ -1743,7 +1741,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 							<div class="form-group col-md-2">
 								<label>Freight Amt <?php echo "($INRSYM)" ?></label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 									echo form_input($data);
@@ -1776,7 +1774,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 							<div class="form-group col-md-2">
 								<label>Packaging Rate </label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'txtEditPackaging', 'value' => set_value('txtEditPackaging'), 'id' => 'txtEditPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculatePackaging();', 'style' => 'text-align:right;');
 									echo form_input($data);
@@ -1785,63 +1783,54 @@ if (!empty($INRSYMBOL)) {
 							</div>
 							<div class="form-group col-md-2">
 								<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
-								<div class="form-group">
 									<?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>
+
 						<div class="form-row" id="CGSTArea">
 							<div class="form-group col-md-8"></div>
 							<div class="form-group col-md-2">
 								<label>CGST in %</label>
-								<div class="form-group">
+								
 									<?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>
 							<div class="form-group col-md-2">
 								<label>CGST Amt <?php echo "($INRSYM)" ?></label>
-								<div class="form-group">
 									<?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>
 						<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>
-								<div class="form-group">
+								
 									<?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>
 							<div class="form-group col-md-2">
 								<label>SGST Amt <?php echo "($INRSYM)" ?></label>
-								<div class="form-group">
 									<?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>
 						<div class="form-row" id="IGSTModel" style="display:none;">
 							<div class="form-group col-md-8"></div>
 							<div class="form-group col-md-2">
 								<label>IGST in %</label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'txtEditOtherTax', 'value' => set_value('txtEditOtherTax'), 'id' => 'txtEditOtherTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateOtherTaxes(1);', 'style' => 'text-align:right;');
 									echo form_input($data);
@@ -1850,7 +1839,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 							<div class="form-group col-md-2">
 								<label>IGST Amt <?php echo "($INRSYM)" ?></label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'txtEditAfterOtherTax', 'value' => set_value('txtEditAfterOtherTax'), 'id' => 'txtEditAfterOtherTax',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 									echo form_input($data);
@@ -1865,7 +1854,7 @@ if (!empty($INRSYMBOL)) {
 							<div class="form-group col-md-8"></div>
 							<div class="form-group col-md-4">
 								<label> Insurance Amt <?php echo "($INRSYM)" ?>(if Any)</label>
-								<div class="form-group">
+								<div>
 									<?php
 									$data = array('name' => 'txtEditInsurance', 'value' => set_value('txtEditInsurance'), 'id' => 'txtEditInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateEditTotalValue(1);', 'style' => 'text-align:right;');
 									echo form_input($data);
@@ -1874,21 +1863,18 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 						<div class="form-row">
-
-							<div class="col-md-4 col-md-offset-8">
+							<div class="form-group col-md-12">
 								<label>Total Order Amt <?php echo "($INRSYM)" ?></label>
-								<div class="form-group">
 									<?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>
 						<div class="form-row">
+						<div class="form-group col-md-12">
 
 							<label><?php echo "Revenue Description"; ?></label>
-							<div class="form-group">
 								<?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);;
@@ -2027,6 +2013,7 @@ if (!empty($INRSYMBOL)) {
 
 
 	$("#EDITREVENUE").on("shown.bs.modal", function(e) {
+		
 		var AvlBudAmt = '<?php echo $AvlAmount ?>';
 
 		AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index 43e1549a..6907dbbd 100644
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -1958,7 +1958,7 @@ if (!empty($getlogpodtl)) {
 										<label>Delivery Date<span class="text-danger">*</span></label>
 										<div class="form-group">
 											<?php
-											$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+											$data = array('type' => 'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
 											echo form_input($data);
 											?>
 
@@ -1986,7 +1986,7 @@ if (!empty($getlogpodtl)) {
 										<label>Purchase Order Date</label>
 										<div class="form-group">
 											<?php
-											$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+											$data = array('type'=>'date','name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
 											echo form_input($data);
 											?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
 										</div>
@@ -2136,27 +2136,23 @@ if (!empty($getlogpodtl)) {
 									</div>
 								</div>
 								<div class="form-row">
-									<div align="right">
-										<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-											
+									<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) { ?>
-													<div class="form-group col-md-3 col-md-offset-7" align="right" style="padding:5px">
 														<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
-													</div>
-												<?php } else { ?>
-													<div class="form-group col-md-3 col-md-offset-7" align="right" style="padding:5px">
-													</div>
-												<?php } ?>
-												<div class="form-group" align="right">
+													
+												<?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>
-												</div>
 										<?php } ?>
 									</div>
 								</div>
+								<br>
 								<div class="form-row">
-									<table id="revenueTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-										<thead style="background-color: #ddd;">
+									<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>
@@ -2236,7 +2232,9 @@ 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='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" 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="glyphicon glyphicon-trash"></span></a>
+															<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" data-toggle="tooltip" ></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="glyphicon glyphicon-trash"></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>
@@ -2264,7 +2262,7 @@ if (!empty($getlogpodtl)) {
 											}
 											?>
 										</tbody>
-									</table>
+									</table><br></div>
 								</div>
 								<div class="form-row">
 									<div class="form-group col-md-3">
@@ -2618,7 +2616,7 @@ if (!empty($getlogpodtl)) {
 <!-- Add Model for revenue po -->
 <div id="REVENUE" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-lg">
+	<div class="modal-dialog modal-full-width">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Select Revenue Purchase Order Line Item</h4>
@@ -2963,7 +2961,7 @@ if (!empty($getlogpodtl)) {
 <!-- Edit Model for revenue po -->
 <div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-lg">
+	<div class="modal-dialog modal-full-width">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4>
@@ -3328,7 +3326,7 @@ if (!empty($getlogpodtl)) {
 <!-- View Model for revenue po -->
 <div id="VIEWREVENUE" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-lg">
+	<div class="modal-dialog modal-full-width">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">View Revenue Purchase Order Line Item</h4>
@@ -3850,7 +3848,7 @@ if (!empty($getlogpodtl)) {
 	</div>
 </div><!-- /.modal -->
 <!-- Revenue Special PO Modal Ends Here -->
-<script type="text/html" id="RevenueList">
+<!-- <script type="text/html" id="RevenueList">
 	<tr id="<%=index%>">
 		<td align="left"><%=index%></td>
 		<td align="left"><%=ReqNo%></td>
@@ -3870,7 +3868,7 @@ if (!empty($getlogpodtl)) {
 
 
 		</td>
-	</tr>
+	</tr> -->
 	</div>
 	</section>
 	</div>
@@ -3974,26 +3972,57 @@ if (!empty($getlogpodtl)) {
 			});
 			index = parseInt(index) + 1;
 
-			var template = jQuery("#RevenueList").html();
+			// var template = jQuery("#RevenueList").html();
 
 
-			$('#RevenueAppend').append(_.template(template, {
-				index: temp,
-				ReqNo: Reqnumber,
-				MaterialCode: materialCode,
-				MaterialName: materialName,
-				Quantity: quantity,
-				UOM: uom,
-				Rate: itemRate,
-				AddPer: PER,
-				Add_Service_Description: service_description,
-				BasicAmount: basicval,
-				Taxvalue: TotalTaxValue,
-				TotalValue: TotalOrderValue,
-				ActualQuantity: quantity,
-				ReceivedQuantity: 0,
-				PendingQuantity: quantity
-			}));
+			// $('#RevenueAppend').append(_.template(template, {
+			// 	index: temp,
+			// 	ReqNo: Reqnumber,
+			// 	MaterialCode: materialCode,
+			// 	MaterialName: materialName,
+			// 	Quantity: quantity,
+			// 	UOM: uom,
+			// 	Rate: itemRate,
+			// 	AddPer: PER,
+			// 	Add_Service_Description: service_description,
+			// 	BasicAmount: basicval,
+			// 	Taxvalue: TotalTaxValue,
+			// 	TotalValue: TotalOrderValue,
+			// 	ActualQuantity: quantity,
+			// 	ReceivedQuantity: 0,
+			// 	PendingQuantity: quantity
+			// }));
+			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="right">${quantity}</td>
+		<td align="left">${uom}</td>
+		<td align="right">${itemRate}</td>
+		<td align="right">${PER}</td>
+		<td align="right">${service_description}</td>
+		<td align="right">${basicval}</td>
+		<td align="right">${TotalTaxValue}</td>
+		<td align="right">${TotalOrderValue}</td>
+		<td align="right">${quantity}</td>
+		<td align="right">0</td>
+		<td align="right">${quantity}</td>
+
+		<td>
+			<a data-target='#EDITREVENUE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
+				<i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the ${Reqnumber} Requisition details"></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>
+`;
+$('#RevenueAppend').append(rowHtml);
+
 
 
 			var theForm = $(".CreatePO");
@@ -4540,7 +4569,6 @@ if (!empty($getlogpodtl)) {
 					url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
 					success: function(data) {
 						if (data) {
-							$('#content').loader('hide');
 							alert(data);
 
 						} else {
@@ -4653,7 +4681,6 @@ if (!empty($getlogpodtl)) {
 				return false;
 			} else {
 				var formData = new FormData($('.CreatePO')[0]);
-				$('#content').loader('show');
 				$.ajax({
 					type: "POST",
 					url: "<?php echo base_url() ?>purchaseorder/EditRevenuePurchaseOrder",
@@ -4662,7 +4689,6 @@ if (!empty($getlogpodtl)) {
 					contentType: false,
 					success: function(data) {
 						if (data) {
-							$('#content').loader('hide');
 							alert(data);
 							$('#txtRowCount').val('');
 							$('#txtDeletedRow').val('');
@@ -4672,7 +4698,6 @@ if (!empty($getlogpodtl)) {
 							window.location = "purchaseorderListing";
 
 						} else {
-							$('#content').loader('hide');
 							alert("Error");
 						}
 
@@ -4703,21 +4728,6 @@ if (!empty($getlogpodtl)) {
 
 	});
 
-	$(function() {
-
-		$('#revenueTax').DataTable({
-			"paging": false,
-			"lengthChange": false,
-			"searching": false,
-			//"ordering": true,
-			// "info": true,
-			"autoWidth": false
-
-		});
-	});
-
-
-
 	function RevenueChangeSgst() {
 		var getTypeOfTax = $("input:radio[name='Range']:checked").val();
 		if (getTypeOfTax == 0) {
@@ -4896,6 +4906,8 @@ if (!empty($getlogpodtl)) {
 		id = '';
 
 	});
+	$(document).ready(function() {
+
 	$("#EDITREVENUE").on("shown.bs.modal", function(e) {
 		var AvlBudAmt = '<?php echo $AvlAmount ?>';
 
@@ -5072,6 +5084,7 @@ if (!empty($getlogpodtl)) {
 
 
 	});
+    });
 </script>
 <script>
 	$('#insurancestatus').change(function() {
@@ -5101,7 +5114,6 @@ if (!empty($getlogpodtl)) {
 		formData.append('param2', param2);
 
 
-		$('.content').loader('show');
 		$.ajax({
 			data: formData,
 			type: "POST",
@@ -5113,7 +5125,6 @@ if (!empty($getlogpodtl)) {
 				if (data) {
 					alert(data);
 					window.location.reload();
-					$('.content').loader('hide');
 					// $('#spl').find('td').eq(5).text(filename[2]);
 					$('#billModel').modal('hide');
 				}
@@ -5146,7 +5157,6 @@ if (!empty($getlogpodtl)) {
 		formData.append('param7', param7);
 
 
-		$('.content').loader('show');
 		$.ajax({
 			data: formData,
 			type: "POST",
@@ -5158,7 +5168,6 @@ if (!empty($getlogpodtl)) {
 				if (data) {
 					alert(data);
 					window.location.reload();
-					$('.content').loader('hide');
 					// $('#spl').find('td').eq(5).text(filename[2]);
 					$('#EditRevenueSplPOModel').modal('hide');
 				}
@@ -5181,7 +5190,6 @@ if (!empty($getlogpodtl)) {
 		formData.append('count', counter);
 		formData.append('igr', igr);
 
-		$('.content').loader('show');
 		$.ajax({
 			data: formData,
 			type: "POST",
@@ -5193,7 +5201,6 @@ if (!empty($getlogpodtl)) {
 				if (data) {
 					alert(data);
 					window.location.reload();
-					$('.content').loader('hide');
 					// $('#spl').find('td').eq(5).text(filename[2]);
 					$('#billModel').modal('hide');
 				}
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php
index 544ce695..0664c6bc 100644
--- a/app/Views/editServiceAmendPO.php
+++ b/app/Views/editServiceAmendPO.php
@@ -225,21 +225,21 @@ foreach ($PaymentTerms as $TER) {
 		Mat: []
 	};
 	$(function() {
-		$("#PODate").datepicker({
-			minDate: d,
-			maxDate: 'now',
-			dateFormat: 'dd-mm-yy',
-			changeMonth: true,
-			changeYear: true,
-			yearRange: '-100:+0'
-		});
-		$("#Deliverydt").datepicker({
-			minDate: 'now',
-			dateFormat: 'dd-mm-yy',
-			changeMonth: true,
-			changeYear: true,
-			yearRange: '0:+10'
-		});
+		// $("#PODate").datepicker({
+		// 	minDate: d,
+		// 	maxDate: 'now',
+		// 	dateFormat: 'dd-mm-yy',
+		// 	changeMonth: true,
+		// 	changeYear: true,
+		// 	yearRange: '-100:+0'
+		// });
+		// $("#Deliverydt").datepicker({
+		// 	minDate: 'now',
+		// 	dateFormat: 'dd-mm-yy',
+		// 	changeMonth: true,
+		// 	changeYear: true,
+		// 	yearRange: '0:+10'
+		// });
 
 		$('#drpSupplier').change(function() {
 
@@ -792,7 +792,7 @@ foreach ($PaymentTerms as $TER) {
 										<input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt ?>">
 										<div class="form-group">
 											<?php
-											$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+											$data = array('type'=>'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
 											echo form_input($data);
 											?>
 										</div>
@@ -1002,7 +1002,7 @@ foreach ($PaymentTerms as $TER) {
 								<!-- Model for servicepo -->
 
 								<div class="modal fade" id="EDITSERVICE" role="dialog">
-									<div class="modal-dialog modal-lg">
+									<div class="modal-dialog modal-full-width">
 										<!-- Modal content-->
 										<form>
 											<div class="modal-content" style="width:900px;">
@@ -1577,7 +1577,7 @@ foreach ($PaymentTerms as $TER) {
 </div>
 
 
-<script type="text/html" id="ServiceList">
+<!-- <script type="text/html" id="ServiceList">
 	<tr id="<%=index%>">
 		<td align="left"><%=index%></td>
 		<td align="left"><%=ReqNo%></td>
@@ -1599,7 +1599,7 @@ foreach ($PaymentTerms as $TER) {
 
 		</td>
 	</tr>
-</script>
+</script> -->
 <script>
 	var index = $('#txtRowCount').val();;
 	var userid = '';
@@ -1614,7 +1614,7 @@ foreach ($PaymentTerms as $TER) {
 
 
 	$('#EditotherDescription').hide();
-
+	$(document).ready(function() {
 	$("#EDITSERVICE").on("shown.bs.modal", function(e) {
 		var AvlBudAmt = '<?php echo $AvlAmount ?>';
 
@@ -1711,7 +1711,7 @@ foreach ($PaymentTerms as $TER) {
 		}
 
 	});
-
+	});
 
 
 	$('.EditService').click(function() {
@@ -2168,13 +2168,13 @@ foreach ($PaymentTerms as $TER) {
 	// this function is used to clear data changing schedule option
 	$('#Scheduleby').change(function() {
 
-		$("#Deliverydt").datepicker({
-			minDate: 'now',
-			dateFormat: 'mm-dd-yy',
-			changeMonth: true,
-			changeYear: true,
-			yearRange: '0:+10'
-		});
+		// $("#Deliverydt").datepicker({
+		// 	minDate: 'now',
+		// 	dateFormat: 'mm-dd-yy',
+		// 	changeMonth: true,
+		// 	changeYear: true,
+		// 	yearRange: '0:+10'
+		// });
 
 
 	});
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index f8ecc7f1..2b486da4 100644
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -3072,39 +3072,6 @@ if (!empty($getlogpodtl)) {
 	</div> <!-- content -->
 </div>
 
-<script type="text/html" id="ImportList">
-    <tr id="<%=index%>">
-        <td align="left"><%=index%></td>
-        <td align="left"><%=ReqNo%></td>
-        <td align="left"><%=MaterialCode%></td>
-
-        <td align="left"><%=Description%></td>
-        <td align="left"><%=Quantity%></td>
-        <td align="left"><%=UOM%></td>
-        <td align="left"><%=Rate%></td>
-        <td align="left"><%=BasicAmount%></td>
-        <td align="left"><%=ReceivedQty%></td>
-        <td align="left"><%=RejectedQty%></td>
-        <td align="left"><%=PendingQty%></td>
-        <!-- <td align="left"><%=index%></td>
- <td align="left"><%=ReqNo%></td>
- 
-  <td align="left"><%=ItemName%></td>
-  <td align="left"><%=Quantity%></td> 
-  <td align="left"><%=UOM%></td>
-   <td align="left"><%=Rate%></td>
-    <td align="left"><%=BasicAmount%></td> -->
-        <!-- <td align="left"><%=Taxvalue%></td>
-    <td align="left"><%=TotalValue%></td> -->
-
-        <td>
-            <a data-target='#editimportpomodel' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#editimportpomodel"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
-
-
-        </td>
-    </tr>
-</script>
-
 
 <script type="text/javascript">
     $(document).ready(function() {
@@ -4370,29 +4337,32 @@ if (!empty($getlogpodtl)) {
 
 
             //alert('in');
-            var template = jQuery("#ImportList").html();
-            $('#ImportAppend').append(_.template(template, {
-                index: temp,
-                ReqNo: Reqnumber,
-                MaterialCode: materialCode,
-                Description: materialName,
-                Quantity: quantity,
-                UOM: uom,
-                Rate: itemRate,
-                BasicAmount: BasicAmt,
-                Taxvalue: taxamt,
-                TotalValue: totalexp,
-                ReceivedQty: receivedqty,
-                RejectedQty: rejectedqty,
-                PendingQty: pendingqty
-            }));
-            //alert(JSON.strigify(BasicAmt));
+            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">${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="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the ${Reqnumber} Requisition details"></i>
+            </a>&nbsp;&nbsp;&nbsp;
+            <a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
+                <span class="glyphicon glyphicon-trash"></span>
+            </a>
+        </td>
+    </tr>
+`;
 
-
-            //$('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,ItemName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp}));
-            //clearTaxField();
-
-            //from above defined variables
+// Append the generated row HTML to the target element
+$('#ImportAppend').append(rowHtml);
 
             var theForm = $(".ImportPO");
 
diff --git a/app/Views/importpo.php b/app/Views/importpo.php
index a4a503c4..646c66c1 100644
--- a/app/Views/importpo.php
+++ b/app/Views/importpo.php
@@ -714,7 +714,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 </div>
 <div id="IMPORT" class="modal fade" tabindex="-1" role="dialog"
     aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-    <div class="modal-dialog modal-lg">
+    <div class="modal-dialog modal-full-width">
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title">Add Import Purchase Order Item</h4>
@@ -1290,7 +1290,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 </div><!-- /.modal -->
 <div id="editimportpomodel" class="modal fade" tabindex="-1" role="dialog"
     aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-    <div class="modal-dialog modal-lg">
+    <div class="modal-dialog modal-full-width">
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title">Edit Import Purchase Order Item</h4>
@@ -1878,30 +1878,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
     </div>
 </div><!-- /.modal -->
 
-<script type="text/html" id="ImportList">
-    <tr id="<%=index%>">
-        <td align="left"><%=index%></td>
-        <td align="left"><%=ReqNo%></td>
-        <td align="left"><%=MaterialCode%></td>
-
-        <td align="left"><%=Description%></td>
-        <td align="left"><%=Quantity%></td>
-        <td align="left"><%=UOM%></td>
-        <td align="left"><%=Rate%></td>
-        <td align="left"><%=BasicAmount%></td>
-        <td align="left"><%=ReceivedQty%></td>
-        <td align="left"><%=RejectedQty%></td>
-        <td align="left"><%=PendingQty%></td>
-        <!-- <td align="left"><%=Taxvalue%></td>
-    <td align="left"><%=TotalValue%></td> -->
-
-        <td>
-            <a data-target='#editimportpomodel' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#editimportpomodel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
-
-
-        </td>
-    </tr>
-</script>
 
 
 
@@ -3315,22 +3291,51 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
             index = parseInt(index) + 1;
             //alert('in');
-            var template = jQuery("#ImportList").html();
-            $('#ImportAppend').append(_.template(template, {
-                index: temp,
-                ReqNo: Reqnumber,
-                MaterialCode: materialCode,
-                Description: materialName,
-                Quantity: quantity,
-                UOM: uom,
-                Rate: itemRate,
-                BasicAmount: BasicAmt,
-                Taxvalue: taxexp,
-                TotalValue: totalexp,
-                ReceivedQty: receivedqty,
-                RejectedQty: rejectedqty,
-                PendingQty: pendingqty
-            }));
+            // var template = jQuery("#ImportList").html();
+            // $('#ImportAppend').append(_.template(template, {
+            //     index: temp,
+            //     ReqNo: Reqnumber,
+            //     MaterialCode: materialCode,
+            //     Description: materialName,
+            //     Quantity: quantity,
+            //     UOM: uom,
+            //     Rate: itemRate,
+            //     BasicAmount: BasicAmt,
+            //     Taxvalue: taxexp,
+            //     TotalValue: totalexp,
+            //     ReceivedQty: receivedqty,
+            //     RejectedQty: rejectedqty,
+            //     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="fas fa-pencil-alt" 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="glyphicon glyphicon-trash"></span>
+            </a>
+        </td>
+    </tr>
+`;
+
+// Append the generated row HTML to the target element
+$('#ImportAppend').append(rowHtml);
+
             //alert(JSON.strigify(BasicAmt));
 
 
diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php
index a15e6636..187f86d9 100644
--- a/app/Views/purchaseorder.php
+++ b/app/Views/purchaseorder.php
@@ -2183,7 +2183,7 @@ if (!empty($INRSYMBOL)) {
 	</div> <!-- content -->
 </div>
 <!-- Modal for Packing Calculation -->
-<div id="packagingcalmodel" class="modal fade" tabindex="-1" role="dialog"
+<div id="packagingcalmodel" class="modal fade"  role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
 	<div class="modal-dialog modal-lg">
 		<div class="modal-content">
@@ -2212,7 +2212,7 @@ if (!empty($INRSYMBOL)) {
 <!-- Modal for freight Calculation-->
 <div id="freightcalmodel" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-lg">
+	<div class="modal-dialog modal-full-width">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Freight Calculation On</h4>
@@ -2242,7 +2242,7 @@ if (!empty($INRSYMBOL)) {
 <!-- Modal for Excise Duty Calculation-->
 <div id="ExciseDutyCalModel" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-lg">
+	<div class="modal-dialog modal-full-width">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Excise Duty Calculation On</h4>
@@ -2277,7 +2277,7 @@ if (!empty($INRSYMBOL)) {
 <!-- Modal for Vat Calculation -->
 <div id="VatCalModel" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-lg">
+	<div class="modal-dialog modal-full-width">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Vat Calculation On</h4>
@@ -2306,7 +2306,7 @@ if (!empty($INRSYMBOL)) {
 <!-- Modal for CST Calculation -->
 <div id="CSTCalModel" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-lg">
+	<div class="modal-dialog modal-full-width">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">CST Calculation On</h4>
@@ -2334,7 +2334,7 @@ if (!empty($INRSYMBOL)) {
 <!-- Model for revenue po -->
 <div id="REVENUE" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-lg">
+	<div class="modal-dialog modal-full-width">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Select Revenue Purchase Order Line Item</h4>
@@ -2348,7 +2348,7 @@ if (!empty($INRSYMBOL)) {
 
 					<div class="form-row">
 						<div class="form-group col-md-3">
-							<label>Req No<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+							<label>Req No<span class="text-danger">*</span></label>
 							<div>
 								<?php
 								$RL = array("0" => 'Select Req No');
@@ -2393,7 +2393,7 @@ if (!empty($INRSYMBOL)) {
 					</div>
 					<div class="form-row">
 						<div class="form-group col-md-2">
-							<label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+							<label>Item Code<span class="text-danger">*</span></label>
 							<div>
 								<?php
 								$options = array("0" => 'Item Code');
@@ -2423,14 +2423,14 @@ if (!empty($INRSYMBOL)) {
 							
 						</div>
 							<div class="form-group col-md-2">
-								<label>Qty<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+								<label>Qty<span class="text-danger">*</span></label>
 									<?php
 									$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
 									echo form_input($data);
 									?>
 							</div>
 							<div class="form-group col-md-1">
-								<label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+								<label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
 								<!-- <label>Rate</label> -->
 									<?php
 									$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
@@ -2686,7 +2686,7 @@ if (!empty($INRSYMBOL)) {
 <!-- Edit Model for revenue po -->
 <div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-lg">
+	<div class="modal-dialog modal-full-width">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Edit Revenue Purchase Order Line Item </h4>
@@ -2738,7 +2738,7 @@ if (!empty($INRSYMBOL)) {
 					</div>
 					<div class="form-row">
 						<div class="form-group col-md-2">
-							<label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+							<label>Item Code<span class="text-danger">*</span></label>
 							<div>
 								<?php
 								$options = array("0" => 'Item Code');
@@ -2758,7 +2758,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-1">
 							<label>UOM</label>
 							<div class="form-group">
 								<?php
@@ -2767,8 +2767,8 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
-							<div class="form-group col-md-3">
-								<label>Quantity<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+							<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', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
@@ -2776,8 +2776,8 @@ if (!empty($INRSYMBOL)) {
 									?>
 								</div>
 							</div>
-							<div class="form-group col-md-3">
-								<label><?php echo "Rate  ($INRSYM)" ?><span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+							<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', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
@@ -2785,12 +2785,12 @@ if (!empty($INRSYMBOL)) {
 									?>
 								</div>
 							</div>
-							<div class="form-group col-md-3">
+							<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-3">
+							<div class="form-group col-md-2">
 								<label><?php echo "Basic Amt ($INRSYM)" ?></label>
 								<div class="form-group">
 									<?php
@@ -3106,7 +3106,7 @@ if (!empty($INRSYMBOL)) {
 	});
 
 
-
+	$(document).ready(function() {
 	$("#EDITREVENUE").on("shown.bs.modal", function(e) {
 
 		userid = $(e.relatedTarget).data('userid');
@@ -3213,7 +3213,7 @@ if (!empty($INRSYMBOL)) {
 		$("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked');
 
 
-	});
+	});});
 	$('.AddRevenue').click(function() {
 		tinyMCE.triggerSave();
 		if (validateRevenueTax() && ExceedQuantityCheck()) {
@@ -3749,7 +3749,7 @@ $('#RevenueAppend').append(rowHtml);
 		var finalBasicAmount = txtTotBasicAmount - txtTotalDiscount;
 		//alert(txtTotBasicAmount+"--"+txtTotalDiscount+"--"+finalBasicAmount+"--"+AvlBudAmt);
 		if (validate()) {
-			if (document.getElementById('revenueTax').rows.length < 3) {
+			if (document.getElementById('revenueTax').rows.length < 1) {
 				alert('Please Select Line item to Create PO');
 				$('#Deliverydt').focus();
 				return false;
@@ -3776,7 +3776,7 @@ $('#RevenueAppend').append(rowHtml);
 
 				var formData = new FormData($('.CreatePO')[0]);
 
-				$('#content').loader('show');
+				
 				$.ajax({
 					type: "POST",
 					url: "<?php echo base_url() ?>purchaseorder/addNewPurchaseOrder",
@@ -3785,7 +3785,7 @@ $('#RevenueAppend').append(rowHtml);
 					contentType: false,
 					success: function(data) {
 						if (data) {
-							$('#content').loader('hide');
+							
 							alert(data);
 							$('#txtRowCount').val('');
 							$('#txtDeletedRow').val('');
diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php
index 1a181002..8a4b56f3 100644
--- a/app/Views/servicePurchaseorder.php
+++ b/app/Views/servicePurchaseorder.php
@@ -2232,7 +2232,6 @@ $('#ServiceAppend').append(rowHtml);
 				return false;
 
 			} else {
-				$('#content').loader('show');
 				var formData = new FormData($('.ServicePO')[0]);
 
 				$.ajax({
@@ -2244,7 +2243,6 @@ $('#ServiceAppend').append(rowHtml);
 					contentType: false,
 					success: function(data) {
 						if (data) {
-							$('#content').loader('hide');
 							alert(data);
 							$('#txtRowCount').val('');
 							$('#txtDeletedRow').val('');
@@ -2253,7 +2251,6 @@ $('#ServiceAppend').append(rowHtml);
 							window.location = "purchaseorderListing";
 
 						} else {
-							$('#content').loader('hide');
 							alert("Error");
 						}
 

From 14ed44541937e581bb61fc3dc63703f074508672 Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavanvalli@gmail.com>
Date: Sat, 31 Aug 2024 17:23:42 +0530
Subject: [PATCH 3/3] CHANGE_EMERGENCY_PO_LINE_TIME_ISSUE

---
 app/Controllers/Emergencypurchaseorder.php |  5 ++---
 app/Views/alterpurchaseorder.php           | 24 ++++++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php
index dd02756e..8e6dab1e 100644
--- a/app/Controllers/Emergencypurchaseorder.php
+++ b/app/Controllers/Emergencypurchaseorder.php
@@ -240,7 +240,6 @@ class Emergencypurchaseorder extends BaseController
 
         // PO Line Items
         $LineItemStatus = REQITEM_NEW;
-
         for ($i = 1; $i <= $RowCount; $i++) {
             $Per = $this->request->getPost('Serviceper' . $i);
             $MaterialCode = $this->request->getPost('materialCode' . $i);
@@ -387,7 +386,7 @@ class Emergencypurchaseorder extends BaseController
     function addNewRevenuePurchaseOrder()
     {
 
-        // print_r($this->request->getPost());die;
+        print_r($this->request->getPost());die;
         $txtspl = $this->request->getPost('txtSpecial');
 
 
@@ -870,7 +869,7 @@ class Emergencypurchaseorder extends BaseController
 
         $this->session->setFlashdata('success', 'You Have Successfully Created the Purchase order! '.$PONO);
         // return redirect()->route('purchaseorderListing');    
-        return true;    
+        return json_encode("111111111");    
 
         // echo "<script>alert('You Have Successfully created the Purchase order! $PONO');</script>";
         // redirect('purchaseorder/PurchaseOrderList', 'refresh');
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index 799df48e..156716b4 100644
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -5700,7 +5700,9 @@ if (!empty($INRSYMBOL)) {
             populateValueMainFormForRevenue();
 
 
-
+            if(index -1 == 0){
+                $('#ServiceAppend').empty();
+            }
             index = parseInt(index) + 1;
 
             var template = jQuery("#RevenueList").html();
@@ -5719,15 +5721,16 @@ if (!empty($INRSYMBOL)) {
                     <td>${TotalOrderValue}</td>
                 </tr>
             `;
-            $('#RevenueAppend').empty();
-            $('#ServiceAppend').empty();
+
+         
 
             $('#RevenueAppend').append(html);
             // $('#serviceTax').row.add($(html)).draw();
 
 
             var theForm = $(".CreatealterPO");
-
+            console.log("hidden inputs ");
+            
             addHidden(theForm, "Reqnumber" + temp, Reqnumber);
             addHidden(theForm, "departmentName" + temp, departmentName);
             addHidden(theForm, "AvilBudget" + temp, (AvilBudget ? AvilBudget : 0));
@@ -6386,7 +6389,10 @@ if (!empty($INRSYMBOL)) {
 
             populateValueMainFormForServiceTax();
 
-
+            if(index - 1 == 0){
+                $('#ServiceAppend').empty();
+                $('#RevenueAppend').empty();
+            }
             index = parseInt(index) + 1;
 
             var template = jQuery("#ServiceList").html();
@@ -6405,9 +6411,9 @@ if (!empty($INRSYMBOL)) {
                     <td>${TotalOrderValue}</td>
                 </tr>
             `;
-            $('#ServiceAppend').empty();
-            $('#RevenueAppend').empty();
-
+            console.log("index");
+            console.log(index);
+            
             $('#ServiceAppend').append(html);
 
 
@@ -7059,7 +7065,7 @@ $('#content').loader('hide');
                         $('#txtDeletedRow1').val('');
                         $('#SpcialInstruction').val('');
                         $('#txtDeliveryAddress').val('');
-                        window.location = "purchaseorderListing";
+                        // window.location = "purchaseorderListing";
                     },
                     error: function(xhr, status, error) {
                         // Handle errors