diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index 78b41d30..b3eaf166 100755
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -774,11 +774,11 @@ if (!empty($getlogpodtl)) {
 			<div class="row">
 				<div class="col-12">
 					<div class="card">
-						<div class="card-body">
+						<div class="card-body p-4">
 							<?php
-							$attributes = array('class' => 'form-label-left ServicePO ', 'name'  => 'ServicePO', 'id'  => 'ServicePO', 'enctype' => 'multipart/form-data');
+							$attributes = array('class' => 'form-label-left   ServicePO ', 'name'  => 'ServicePO', 'id'  => 'ServicePO', 'enctype' => 'multipart/form-data');
 							echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
-							<div class="container-fluid">
+							
 								<div class="form-row">
 									<div class="form-group  col-md-3">
 										<label>Requistion No</label>
@@ -1090,6 +1090,7 @@ if (!empty($getlogpodtl)) {
 										<?php } ?>
 									</div>
 								</div>
+								
 								<div class="form-row">
 									<div class="table-responsive" style="padding-bottom: 30px;">
 										<table id="ServiceTable" class="table table-striped table-hover mb-0" style="font-size:12px;">
@@ -1230,6 +1231,9 @@ if (!empty($getlogpodtl)) {
 										</table>
 									</div>
 								</div>
+
+								<br>
+
 								<div class="form-row">
 									<div class="form-group col-md-2">
 										<label>Basic Amount <?php echo "($INRSYM)" ?> </label>
@@ -1275,9 +1279,13 @@ if (!empty($getlogpodtl)) {
 										?>
 									</div>
 								</div>
+
+								<br>
+								
+
 								<div class="form-row">
 									<!--start new fields 1 sep-->
-									<div class="form-group col-md-11">
+									<div class="form-group col-md-12">
 										<label>Description Of Service <span class="text-danger">*</label>
 
 										<?php
@@ -1288,8 +1296,11 @@ if (!empty($getlogpodtl)) {
 									</div><!--end new fields 1 sep-->
 								</div>
 
+								<br>
+								
+
 								<div class="form-row">
-									<div class="form-group col-md-11">
+									<div class="form-group col-md-12">
 										<label>Scope Of Work</label>
 										<?php
 										$data = array('name' => 'ScopeofWork', 'value' => set_value('ScopeofWork', strip_tags($ServiceDescription)), 'id' => 'ScopeofWork',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
@@ -1297,6 +1308,10 @@ if (!empty($getlogpodtl)) {
 										?>
 									</div>
 								</div>
+
+								<br>
+								
+
 								<div class="form-row">
 									<div class="form-group col-md-12" id="splpodiv">
 										<label>Special po Table List</label>
@@ -1432,15 +1447,22 @@ if (!empty($getlogpodtl)) {
 											</div>
 										</div>
 
-										<div class="form-group col-md-12">
+										<div class="form-group col-md-12 px-4">
+
+											<div align="left">
+											<label>Select  File</label>
+											<br>
+														<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>
 
 											<div 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="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
 												<input type="hidden" name="txtStatus" id="txtStatus" />
 												<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if (isset($index)) {
@@ -1469,36 +1491,44 @@ if (!empty($getlogpodtl)) {
 
 										</div>
 
-										<label>Request On : </label><?php if (isset($Reqon)) {
-																		echo $Reqon;
-																	} ?><br />
-										<?php if (isset($RequesterName)) {
-											if ($RequesterName != '' || $RequesterName != null) { ?>
-												<label>Request By : </label><?php echo $RequesterName; ?><br />
-										<?php
-											}
-										} ?>
-										<!-- <label>Status : </label><?php echo $StatusName; ?> -->
-										<label>Status : </label><?php
-																$statusMappings = [
-																	'PO APPROVED' => 'AWAITING APPROVE',
-																	'AWAITING RELEASE' => 'AWAITING APPROVE',
-																	'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-																	'PO RELEASED' => 'PO APPROVED',
-																];
+										<div class="form-group col-md-12 px-4">
+										<div align="left">
+											<label>Request On : </label><?php if (isset($Reqon)) {
+																			echo $Reqon;
+																		} ?><br />
+											<?php if (isset($RequesterName)) {
+												if ($RequesterName != '' || $RequesterName != null) { ?>
+													<label>Request By : </label><?php echo $RequesterName; ?><br />
+											<?php
+												}
+											} ?>
+											<!-- <label>Status : </label><?php echo $StatusName; ?> -->
+											<label>Status : </label><?php
+																	$statusMappings = [
+																		'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];
+																	if (isset($StatusName) && !empty($StatusName)) {
+																		if (isset($statusMappings[$StatusName])) {
+																			echo $statusMappings[$StatusName];
+																		} else {
+																			echo $StatusName;
+																		}
 																	} else {
-																		echo $StatusName;
+																		echo "Status not provided";
 																	}
-																} else {
-																	echo "Status not provided";
-																}
-																?>
-								</div>
-							</div>
+																	?>
+								
+							
+												
+										</div>
+										</div>
+									
+									</div>
+							
 						</div> <!-- end card body-->
 					</div> <!-- end card -->
 				</div><!-- end col-->
@@ -1509,7 +1539,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-full-width">
+	<div class="modal-dialog modal-full-width" style="width: 1200px; !important">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Add Service Purchase Order Item</h4>
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index 65397ab7..01149d54 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -1883,7 +1883,13 @@ if (!empty($INRSYMBOL)) {
             $('#Scheduleby').focus();
             return false;
 
-        } else {
+        } 
+        else if( $('#Otherpayment').val() == ''){
+            alert('Please Enter the Description of payable terms');
+            $('#Otherpayment').focus();
+            return false;
+        }
+        else {
             $("#" + input).modal('show');
             $('#isEdit').val(0);
             if (StateTaxCheck == "0") {
@@ -2311,7 +2317,7 @@ if (!empty($INRSYMBOL)) {
 <div class="content-page">
     <div class="content">
         <div class="container-fluid">
-            <div class="row">
+            <div class="row mb-1">
                 <div class="col-6">
                     <div class="page-title-box page-title-box-alt">
                         <h4 class="page-title">Emergency Purchase Order</h4>
@@ -2319,6 +2325,8 @@ if (!empty($INRSYMBOL)) {
                 </div>
             </div>
 
+            
+
             <?php
             $attributes = array('class' => 'form-label-left CreatealterPO ', 'name' => 'CreatealterPO', 'id' => 'CreatealterPO');
             echo form_open(base_url() . '/purchaseorder/addalterPO/', $attributes); ?>
@@ -2326,7 +2334,7 @@ if (!empty($INRSYMBOL)) {
             <div class="row">
                 <div class="col-md-12">
                     <div class="card">
-                        <div class="card-body">
+                        <div class="card-body p-4">
                             <div class="row">
                                 <div class="col-md-3">
                                     <label>Request Type <span class="badge mandatory">*</span></label>
@@ -2742,10 +2750,300 @@ if (!empty($INRSYMBOL)) {
                                 </div>
                             </div>
 
-                            <!-- table showing line items selected -->
+                            <table class="table table-bordered ">
+                                    <div class="box-body">
+                                        <table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;">
+                                            <thead>
+                                                <tr>
+                                                    <th>SNo</th>
+                                                    <th>Requisition No</th>
+                                                    <th>Item Code</th>
+                                                    <th>Item Description</th>
+                                                    <th>Quantity</th>
+                                                    <th>UOM</th>
+                                                    <th>Rate<?php echo "($INRSYM)" ?></th>
+                                                    <th>Basic Amount<?php echo "($INRSYM)" ?></th>
+                                                    <th>Tax Amount<?php echo "($INRSYM)" ?></th>
+                                                    <th>Total Order Amount<?php echo "($INRSYM)" ?></th>
+                                                    <th>Action</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody id="ServiceAppend"></tbody>
+                                            <tbody id="RevenueAppend"></tbody>
+                                        </table>
+                                    </div>
+                            </table>
+
+
+                            <div class="row px-3" id="potaxes" style="display:none;" >
+                                <div class="col-md-12 p-4">
+
+                                            <div class="row">
+                                                <!-- Revenue po taxes -->
+                                                <div class="col-md-12" style='border : 1px solid; display:none;'
+                                                    id="revenuepotaxes">
+                                                    <br />
+                                                    <div class="row">
+                                                        <div class="col-md-3">
+                                                            <label>Basic Amount <?php echo "($INRSYM)" ?> </label>
+                                                            <?php
+                                                            $data = array('name' => 'txtTotBasicAmountRevenue', 'value' => set_value('txtTotBasicAmountRevenue'), 'id' => 'txtTotBasicAmountRevenue', 'class' => 'form-control num', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <label>Total Discount <?php echo "($INRSYM)" ?> </label>
+                                                            <?php
+                                                            $data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount'), 'id' => 'txtTotalDiscount', 'class' => 'form-control num', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+
+
+
+                                                        <div class="col-md-3">
+                                                            <label>CGST <?php echo "($INRSYM)" ?> </label>
+                                                            <?php
+                                                            $data = array('name' => 'txtTotalCGST', 'value' => set_value('txtTotalCGST'), 'id' => 'txtTotalCGST', 'class' => 'form-control num', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+
+                                                        <div class="col-md-3" id="displaySGST">
+                                                            <label>SGST <?php echo "($INRSYM)" ?> </label>
+                                                            <?php
+                                                            $data = array('name' => 'txtTotalSGST', 'value' => set_value('txtTotalSGST'), 'id' => 'txtTotalSGST', 'class' => 'form-control num', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+                                                        <div class="col-md-3" id="displayIGST" style="display:none;">
+                                                            <label> IGST <?php echo "($INRSYM)" ?> </label>
+                                                            <?php
+                                                            $data = array('name' => 'txtTotalIGST', 'value' => set_value('txtTotalIGST'), 'id' => 'txtTotalIGST', 'class' => 'form-control num', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+                                                    </div>
+
+                                                    <br/>
+
+                                                    <div class="row">
+                                                        <div class="col-md-3">
+                                                            <label>Total Packaging <?php echo "($INRSYM)" ?> </label>
+                                                            <?php
+                                                            $data = array('name' => 'txtTotalPackaing', 'value' => set_value('txtTotalPackaing'), 'id' => 'txtTotalPackaing', 'class' => 'form-control num', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <label>Total Insurance <?php echo "($INRSYM)" ?> </label>
+                                                            <?php
+                                                            $data = array('name' => 'txtTotalInsurance', 'value' => set_value('txtTotalInsurance'), 'id' => 'txtTotalInsurance', 'class' => 'form-control num', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <label>Total Freight <?php echo "($INRSYM)" ?></label>
+                                                            <?php
+                                                            $data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight'), 'id' => 'txtTotalFreight', 'class' => 'form-control num', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <label>Total Order Value <?php echo "($INRSYM)" ?></label>
+                                                            <?php
+                                                            $data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary'), 'id' => 'txtTotalOrderValueSummary', 'class' => 'form-control num', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+                                                    </div>
+
+                                                    <br/>
+
+                                                    <div class="row">
+                                                        <div class="col-md-12">
+                                                            <label>Special Instructions </label>
+                                                            <?php
+                                                            $data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '8');
+                                                            echo form_textarea($data);
+                                                            ?>
+                                                        </div>
+                                                    </div>
+
+                                                    <br/>
+
+                                                    <div class="row">
+                                                        <div class="col-md-12">
+                                                            <label>
+                                                             Select Purchase Order File
+                                                            </label><br>
+                                                            <input type="file" name="POFiles" id="POFiles"><br>
+                                                        </div>
+                                                    </div>
+
+                                                    <div class="row">
+                                                        <div class="col-md-12 col-md-offset-9 text-right"><br />
+                                                           
+                                                            <input type="hidden" name="txtPoRange" id="txtPoRange" />
+                                                            <input type="hidden" name="isEdit" id="isEdit" value="0" />
+                                                            <input type="hidden" name="txtStatus1" id="txtStatus1" />
+                                                            <input type="hidden" name="txtRowCount1" id="txtRowCount1" />
+                                                            <input type="hidden" name="txtDeletedRow1" id="txtDeletedRow1" />
+                                                            <input type="hidden" name="CheckLocalInter" id="CheckLocalInter" />
+                                                            <input type="hidden" name="Budget" id="Budget" />
+                                                            <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'; ?>"
+                                                                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>
+
+                                                    <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">
+                                                    <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-3">
+                                                            <label>CGST (₹)</label>
+                                                            <input type="text" name="txtTotCgst" value="" id="txtTotCgst"
+                                                                class="form-control num" readonly="true">
+                                                        </div>
+                                                        <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-3">
+                                                            <label>IGST (₹)</label>
+                                                            <input type="text" name="txtTotIgst" value="" id="txtTotIgst"
+                                                                class="form-control num" readonly="true">
+                                                        </div>
+                                                    </div>
+                                                    <br>
+                                                    <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 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>
+                                                    <br>
+                                                    <div class="row">
+                                                        <div class="col-md-12">
+                                                            <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>
+                                                    <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">
+                                                            <label>
+                                                             Select Purchase Order File
+                                                            </label><br>
+                                                            <input type="file" name="POFile" id="POFile"><br>
+                                                        </div>
+                                                    </div>
+
+                                                    <div class="row">
+                                                        <div class="col-md-12 col-md-offset-9 text-right"><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'; ?>"
+                                                                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>
+                                                    <br>
+                                                    <div class="row" style="padding:0px;"><br>
+                                                    </div>
+                                                </div>
+
+                                            </div>
+                                </div>
+                             </div>
+
+
+
+
+
+
+
+
+
+
+
+
+                        </div>
+
+                            <!-- All model  -->
                             <div class="row p-2">
-                                <table class="table table-bordered ">
-                                    <div align="right" style="padding-right:10px">
+                               
+                                    <div  style="padding-right:10px">
 
                                         <!-- Model for revenue PO -->
                                         <div id="REVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
@@ -2753,13 +3051,15 @@ if (!empty($INRSYMBOL)) {
                                             <div class="modal-dialog">
                                                 <!-- Modal content-->
                                                 <form>
-                                                    <div class="modal-content" style="width:1060px;">
+                                                    <div class="modal-content " style="width:1060px;">
                                                         <div class="modal-header">
                                                             <center>
                                                                 <h4>Select Revenue Purchase Order Line Item </h4>
                                                             </center>
                                                         </div>
-                                                        <div align="left" style="padding: 31px;">
+
+                                                        <div style="padding: 31px;">
+                                                        
                                                             <div class="row">
                                                                 <div class="col-md-3">
                                                                     <label>Item Code<span class="badge mandatory">*</span></label>
@@ -3095,6 +3395,7 @@ if (!empty($INRSYMBOL)) {
                                                             </div>
                                                             
 
+                                                        </div>
                                                             
 
 
@@ -3113,13 +3414,14 @@ if (!empty($INRSYMBOL)) {
                                             <div class="modal-dialog">
                                                 <!-- Modal content-->
                                                 <form>
-                                                    <div class="modal-content" style="width:1000px;">
+                                                    <div class="modal-content" style="width:1060px;">
                                                         <div class="modal-header">
                                                             <center>
                                                                 <h4>Add Service Purchase Order Item </h4>
                                                             </center>
                                                         </div>
-                                                        <div  style="padding: 31px;">
+
+                                                        <div align="left" style="padding: 31px;">
 
                                                             <div class="row">
                                                                 <div class="col-md-3">
@@ -3215,7 +3517,7 @@ if (!empty($INRSYMBOL)) {
 
                                                                 </div>
                                                                 <div class="col-md-3 text-right">
-                                                                    CGST In %
+                                                                  <label> CGST In %</label> 
                                                                 </div>
                                                                 <div class="col-md-3">
                                                                     <div class="form-group">
@@ -3239,7 +3541,7 @@ if (!empty($INRSYMBOL)) {
                                                                 <div class="col-md-3">
                                                                 </div>
                                                                 <div class="col-md-3 text-right">
-                                                                    SGST In %
+                                                                   <label> SGST In % </label>
                                                                 </div>
                                                                 <div class="col-md-3">
                                                                     <div class="form-group">
@@ -3263,7 +3565,7 @@ if (!empty($INRSYMBOL)) {
 
                                                                 </div>
                                                                 <div class="col-md-3 text-right">
-                                                                    IGST In %
+                                                                    <label> IGST In % </label>
                                                                 </div>
                                                                 <div class="col-md-3">
                                                                     <div class="form-group">
@@ -3359,9 +3661,9 @@ if (!empty($INRSYMBOL)) {
                                                                             </div>
                                                                         </div>
                                                                 </div> -->
-
-                                                            <div class="col-md-12" style="padding:0px;">
-                                                                <div class="col-md-12" style="padding: 0px 30px 10px 30px;">
+                                      
+                                                            <div class="row">
+                                                                <div class="col-md-12" >
                                                                     <label>Service Description<span
                                                                             class="badge mandatory">*</span></label>
                                                                     <?php
@@ -4354,253 +4656,10 @@ if (!empty($INRSYMBOL)) {
 
                                         <br />
                                     </div>
-
-
-                                    <div class="box-body">
-                                        <table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;">
-                                            <thead>
-                                                <tr>
-                                                    <th>SNo</th>
-                                                    <th>Requisition No</th>
-                                                    <th>Item Code</th>
-                                                    <th>Item Description</th>
-                                                    <th>Quantity</th>
-                                                    <th>UOM</th>
-                                                    <th>Rate<?php echo "($INRSYM)" ?></th>
-                                                    <th>Basic Amount<?php echo "($INRSYM)" ?></th>
-                                                    <th>Tax Amount<?php echo "($INRSYM)" ?></th>
-                                                    <th>Total Order Amount<?php echo "($INRSYM)" ?></th>
-                                                    <th>Action</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody id="ServiceAppend"></tbody>
-                                            <tbody id="RevenueAppend"></tbody>
-                                        </table>
-                                    </div>
-                                    </table>
-                                    <!-- /.box-body -->
+                                   
                             </div>
 
-                            <div class="row " id="potaxes" style="display:none;" >
-                                <div class="col-md-12 p-4">
-
-                                            <div class="row">
-                                                <!-- Revenue po taxes -->
-                                                <div class="col-md-12" style='border : 1px solid; display:none;'
-                                                    id="revenuepotaxes">
-                                                    <br />
-                                                    <div class="row">
-                                                        <div class="col-md-3">
-                                                            <label>Basic Amount <?php echo "($INRSYM)" ?> </label>
-                                                            <?php
-                                                            $data = array('name' => 'txtTotBasicAmountRevenue', 'value' => set_value('txtTotBasicAmountRevenue'), 'id' => 'txtTotBasicAmountRevenue', 'class' => 'form-control num', 'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-
-                                                        </div>
-                                                        <div class="col-md-3">
-                                                            <label>Total Discount <?php echo "($INRSYM)" ?> </label>
-                                                            <?php
-                                                            $data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount'), 'id' => 'txtTotalDiscount', 'class' => 'form-control num', 'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-
-
-
-                                                        <div class="col-md-3">
-                                                            <label>CGST <?php echo "($INRSYM)" ?> </label>
-                                                            <?php
-                                                            $data = array('name' => 'txtTotalCGST', 'value' => set_value('txtTotalCGST'), 'id' => 'txtTotalCGST', 'class' => 'form-control num', 'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-
-                                                        <div class="col-md-3" id="displaySGST">
-                                                            <label>SGST <?php echo "($INRSYM)" ?> </label>
-                                                            <?php
-                                                            $data = array('name' => 'txtTotalSGST', 'value' => set_value('txtTotalSGST'), 'id' => 'txtTotalSGST', 'class' => 'form-control num', 'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                        <div class="col-md-3" id="displayIGST" style="display:none;">
-                                                            <label> IGST <?php echo "($INRSYM)" ?> </label>
-                                                            <?php
-                                                            $data = array('name' => 'txtTotalIGST', 'value' => set_value('txtTotalIGST'), 'id' => 'txtTotalIGST', 'class' => 'form-control num', 'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row">
-                                                        <div class="col-md-3">
-                                                            <label>Total Packaging <?php echo "($INRSYM)" ?> </label>
-                                                            <?php
-                                                            $data = array('name' => 'txtTotalPackaing', 'value' => set_value('txtTotalPackaing'), 'id' => 'txtTotalPackaing', 'class' => 'form-control num', 'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                        <div class="col-md-3">
-                                                            <label>Total Insurance <?php echo "($INRSYM)" ?> </label>
-                                                            <?php
-                                                            $data = array('name' => 'txtTotalInsurance', 'value' => set_value('txtTotalInsurance'), 'id' => 'txtTotalInsurance', 'class' => 'form-control num', 'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                        <div class="col-md-3">
-                                                            <label>Total Freight <?php echo "($INRSYM)" ?></label>
-                                                            <?php
-                                                            $data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight'), 'id' => 'txtTotalFreight', 'class' => 'form-control num', 'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                        <div class="col-md-3">
-                                                            <label>Total Order Value <?php echo "($INRSYM)" ?></label>
-                                                            <?php
-                                                            $data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary'), 'id' => 'txtTotalOrderValueSummary', 'class' => 'form-control num', 'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row">
-                                                        <div class="col-md-12">
-                                                            <label>Special Instructions </label>
-                                                            <?php
-                                                            $data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '8');
-                                                            echo form_textarea($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-                                                    <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" />
-                                                            <input type="hidden" name="txtStatus1" id="txtStatus1" />
-                                                            <input type="hidden" name="txtRowCount1" id="txtRowCount1" />
-                                                            <input type="hidden" name="txtDeletedRow1" id="txtDeletedRow1" />
-                                                            <input type="hidden" name="CheckLocalInter" id="CheckLocalInter" />
-                                                            <input type="hidden" name="Budget" id="Budget" />
-                                                            <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'; ?>"
-                                                                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="row" style="padding:0px;"><br />
-                                                    </div>
-                                                </div>
-
-                                                <!-- Service po taxes -->
-                                                <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-3">
-                                                            <label>CGST (₹)</label>
-                                                            <input type="text" name="txtTotCgst" value="" id="txtTotCgst"
-                                                                class="form-control num" readonly="true">
-                                                        </div>
-                                                        <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-3">
-                                                            <label>IGST (₹)</label>
-                                                            <input type="text" name="txtTotIgst" value="" id="txtTotIgst"
-                                                                class="form-control num" readonly="true">
-                                                        </div>
-                                                    </div>
-                                                    <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 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>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="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>
-                                                    <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>
-                             </div>
-
-
-
-
-
-
-
-
-
-
-
-
-                        </div>
+                        
                     </div>
                 </div>
             </div>
@@ -4618,7 +4677,7 @@ if (!empty($INRSYMBOL)) {
                 <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-dialog modal-sm">
                         <div class="modal-content"
                             >
                             <div class="modal-header">
@@ -4837,7 +4896,7 @@ if (!empty($INRSYMBOL)) {
 
                 <div id="freightmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog"
                 aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-                    <div class="modal-dialog modal-lg">
+                    <div class="modal-dialog modal-sm">
 
                         <!-- Modal content-->
                         <div class="modal-content">
diff --git a/app/Views/createPOfromRequistion.php b/app/Views/createPOfromRequistion.php
index a156a899..67e67501 100755
--- a/app/Views/createPOfromRequistion.php
+++ b/app/Views/createPOfromRequistion.php
@@ -1,5 +1,17 @@
 <?php $defaultDate = ''; ?>
 <style>
+
+	.th-reqDate{
+
+		text-align:center !important;
+		
+	}
+
+	.th-status{
+
+		text-align:center !important;
+	}
+
 	.modal-dialog-centered {
 		display: flex;
 		align-items: center;
@@ -288,17 +300,17 @@
 								<thead>
 									<tr>
 										<th>Select</th>
-										<th>Requested Date</th>
-										<th>Requistion Number</th>
-										<th>Requistion Type </th>
-										<th>Requested By</th>
-										<th>Tot Line Items</th>
-										<th>Po Line Items</th>
-										<th>Partial PO Line Items</th>
-										<th>New Line Items</th>
-										<th>Status</th>
-										<th>Department</th>
-										<th>Designation</th>
+										<th class="th-reqDate">Requested Date</th>
+										<th class="th-reqNo">Requistion Number</th>
+										<th class="th-reqType">Requistion Type </th>
+										<th class="th-reqBy">Requested By</th>
+										<th class="th-toTLineItems">Tot Line Items</th>
+										<th class="th-poLineItems">Po Line Items</th>
+										<th class="th-PartialPolineItems">Partial PO Line Items</th>
+										<th class="th-reqNewlineItems">New Line Items</th>
+										<th class="th-status">Status</th>
+										<th class="th-department">Department</th>
+										<th class="th-designation">Designation</th>
 									</tr>
 								</thead>
 								<tbody>
@@ -307,23 +319,25 @@
 										foreach ($ReqList as $record) {
 									?>
 											<tr id="<?php echo $index; ?>">
-												<td align="left"><input type="checkbox" name="chk<?php echo $index; ?>" id="chk<?php echo $index; ?>" onclick="selectReqNo(<?php echo $index; ?>)" />&nbsp;</td>
-												<td align="left">
+												<td align="center"><input type="checkbox" name="chk<?php echo $index; ?>" id="chk<?php echo $index; ?>" onclick="selectReqNo(<?php echo $index; ?>)" />&nbsp;</td>
+												<td align="center">
 													<?php
 													$dt = new DateTime($record->ReqDate);
 													$RequestedDate =  $dt->format('d-m-Y');
 													echo $RequestedDate;
 													?>
 												</td>
-												<td align="left"><a data-toggle="modal" data-target="#RequisitionDtlsModal" data-id="<%=index%>" data-userid="<?php echo $record->ReqNo ?>"><u><?php echo $record->ReqNo; ?> </u></a></td>
-												<td align="left"><?php echo $record->ReqType; ?></td>
+												<td align="center"><a data-toggle="modal" data-target="#RequisitionDtlsModal" data-id="<%=index%>" data-userid="<?php echo $record->ReqNo ?>"><u><?php echo $record->ReqNo; ?> </u></a></td>
+												<td align="center"><?php echo $record->ReqType; ?></td>
 												<td><?php echo $record->FirstName; ?></td>
-												<td align="left"><?php echo $record->TotalNoofLineItems; ?></td>
-												<td align="left"><?php echo $record->PolineItems; ?></td>
-												<td align="left"><?php echo $record->PartilallyLineItems; ?></td>
-												<td align="left"><?php echo $record->newLineItem; ?></td>
-												<td><?php echo $record->StatusName; ?></td>
-												<td><?php echo $record->DepartmentName; ?></td>
+
+												<td align="center"><?php echo $record->TotalNoofLineItems; ?></td>
+												<td align="center"><?php echo $record->PolineItems; ?></td>
+												<td align="center"><?php echo $record->PartilallyLineItems; ?></td>
+												<td align="center"><?php echo $record->newLineItem; ?></td>
+
+												<td align="center"><?php echo $record->StatusName; ?></td>
+												<td align="center"><?php echo $record->DepartmentName; ?></td>
 												<td><?php echo $record->Designation; ?></td>
 											</tr>
 									<?php $index = $index + 1;
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index 0ad30da4..678535cc 100755
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -1935,14 +1935,14 @@ if (!empty($getlogpodtl)) {
 			<!-- end page title -->
 			<!-- Form row -->
 			<div class="row">
-				<div class="col-12">
+				<div class="col-md-12">
 					<div class="card">
-						<div class="card-body">
+						<div class="card-body p-4">
 							<?php
 							$attributes = array('class' => 'form-label-left CreatePO ', 'name'  => 'CreatePO', 'id'  => 'CreatePO');
 							echo form_open(base_url() . '/purchaseorder/addPO/', $attributes);
 							?>
-							<div class="container-fluid">
+						
 
 								<div class="form-row">
 									<div class="form-group col-md-3">
@@ -2674,7 +2674,7 @@ if (!empty($getlogpodtl)) {
 																?>
 									</div>
 								</div>
-							</div>
+							
 						</div> <!-- end card body-->
 					</div> <!-- end card -->
 				</div><!-- end col-->
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index e178c7a6..b5594c8c 100755
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -379,7 +379,7 @@ if (!empty($getlogpodtl)) {
             <div class="row">
                 <div class="col-12">
                     <div class="card">
-                        <div class="card-body">
+                        <div class="card-body p-4">
 
 
                             <?php
@@ -728,7 +728,7 @@ if (!empty($getlogpodtl)) {
                                 </div>
 
                             </div>
-                            <br><br><br>
+                            <br><br><br><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>
@@ -968,6 +968,8 @@ if (!empty($getlogpodtl)) {
                                 </table>
                             </div>
 
+                            <br><br>
+
                             <div class="form-row">
 
                                 <div class="form-row">
@@ -1153,7 +1155,7 @@ if (!empty($getlogpodtl)) {
                                     </div>
 
 
-                                    <div class="form-row p-3">
+                                    <div class="form-row p-4">
                                         <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');
@@ -1162,81 +1164,98 @@ if (!empty($getlogpodtl)) {
                                         </div>
                                     </div>
 
+                                    <div class="form-row px-4">
+
+                                    <div class="form-group col-md-3" align="left">
+                                               
+                                                   <label>Select File</label>
+                                                    <input type="file" class="form-control" 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; ?>" />
+                                                </div>
+
+                                    </div>
+
+                                    <div class="form-row px-4">
 
                                     <div class="form-group col-md-12">
 
-                                        <div align="right">
-                                            <div class="form-group col-md-3">
-                                                <input type="file" class="form-control" 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; ?>" />
-                                            </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" /> -->
-                                            <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-                                            <input type="hidden" name="txtRow" id="txtRow" value="<?php echo $index; ?>" />
-                                            <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
+                                            <div align="right">
+                                             
+                                                <input type="hidden" name="txtPoRange" id="txtPoRange" />
+                                                <input type="hidden" name="isEdit" id="isEdit" value="0" />
+                                                <input type="hidden" name="txtStatus" id="txtStatus" />
+                                                <!-- <input type="hidden" name="txtRowCount" id="txtRowCount" /> -->
+                                                <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
+                                                <input type="hidden" name="txtRow" id="txtRow" value="<?php echo $index; ?>" />
+                                                <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
 
-                                            <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
+                                                <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
 
-                                            <a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
-                                            <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) {
-                                                if ($PONOStatus == PO_DRAFT) { ?>
-                                                    <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-                                                <?php } ?>
-                                                <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                                <a class="btn btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
-                                                <!--  <input type="reset" class="btn btn-success" value="Reset"> -->
-                                            <?php } else { ?>
-
-
-                                                <?php if ($DEPCode == FINANCE) { ?>
-                                                    <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
-
-                                                <?php } else { ?>
-                                                    <!-- <input type="reset" class="btn btn-success" value = "OK"> -->
-                                                    <a class="btn btn-success Submit" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                <a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
+                                                <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) {
+                                                    if ($PONOStatus == PO_DRAFT) { ?>
+                                                        <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                    <?php } ?>
+                                                    <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
                                                     <a class="btn btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
-                                                    <a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorderListing">OK</a>
+                                                    <!--  <input type="reset" class="btn btn-success" value="Reset"> -->
+                                                <?php } else { ?>
+
+
+                                                    <?php if ($DEPCode == FINANCE) { ?>
+                                                        <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
+
+                                                    <?php } else { ?>
+                                                        <!-- <input type="reset" class="btn btn-success" value = "OK"> -->
+                                                        <a class="btn btn-success Submit" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                        <a class="btn btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                        <a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorderListing">OK</a>
+                                                    <?php } ?>
                                                 <?php } ?>
-                                            <?php } ?>
 
 
-                                        </div>
+                                            </div>
 
                                     </div>
 
-                                    <div class="form-group col-md-12" align="left" style="padding-right:10px">
-                                        <div class="col-md-5 col-md-offset-7" align="left"><br />
-                                            <label>Request On :</label><?php echo $Reqon; ?><br />
-                                            <label>Request By :</label><?php echo $RequesterName; ?><br />
-                                            <label>Status : </label><?php
-                                                                    $statusMappings = [
-                                                                        'PO APPROVED' => 'AWAITING APPROVE',
-                                                                        'AWAITING RELEASE' => 'AWAITING APPROVE',
-                                                                        'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-                                                                        'PO RELEASED' => 'PO APPROVED',
-                                                                    ];
+                                    </div>
 
-                                                                    if (isset($StatusName) && !empty($StatusName)) {
-                                                                        if (isset($statusMappings[$StatusName])) {
-                                                                            echo $statusMappings[$StatusName];
+                                    <div class="form-row px-4">
+                                        <div class="form-group col-md-12" align="left" style="padding-right:10px">
+                                            <div class="col-md-5 col-md-offset-7" align="left"><br />
+                                                <label>Request On :</label><?php echo $Reqon; ?><br />
+                                                <label>Request By :</label><?php echo $RequesterName; ?><br />
+                                                <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 $StatusName;
+                                                                            echo "Status not provided";
                                                                         }
-                                                                    } else {
-                                                                        echo "Status not provided";
-                                                                    }
-                                                                    ?>
+                                                                        ?>
+                                            </div>
+                                            <br />
                                         </div>
-                                        <br />
                                     </div>
 
 
+
+                          
+
+
                             </div>
 
                         </div>
@@ -2447,7 +2466,7 @@ if (!empty($getlogpodtl)) {
 </div><!-- /.modal -->
 <div id="viewimportmodal" 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-dialog modal-full-width" style="width: 1200px; !important">
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title">View Import Purchase Order Item</h4>
@@ -2492,7 +2511,7 @@ if (!empty($getlogpodtl)) {
                         </div>
                     </div>
                     <div class="form-row" style="margin-bottom: 10px;">
-                        <div class="form-group col-md-2">
+                        <div class="form-group col-md-3">
                             <label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</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>
@@ -2510,40 +2529,45 @@ if (!empty($getlogpodtl)) {
                                 echo form_dropdown('ViewMaterialCode', $options, set_value('ViewMaterialCode'), 'id="ViewMaterialCode" class="form-control"'); ?>
                             </div>
                         </div>
-                        <div class="form-group col-md-2">
+                        <div class="form-group col-md-3">
                             <label>Item Name</label>
                             <div>
                                 <?php $data = array('name' => 'ViewItemName', 'value' => set_value('ViewItemName'), 'id' => 'ViewItemName',  'class' => 'form-control', 'readonly' => 'true');
                                 echo form_input($data); ?>
                             </div>
                         </div>
-                        <div class="form-group col-md-1">
+                        <div class="form-group col-md-3">
                             <label>UOM</label>
                             <div>
                                 <?php $data = array('name' => 'ViewUOM', 'value' => set_value('ViewUOM'), 'id' => 'ViewUOM',  'class' => 'form-control', 'readonly' => 'true');
                                 echo form_input($data); ?>
                             </div>
                         </div>
-                        <div class="form-group col-md-2">
+                        <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>
                                 <?php $data = array('name' => 'ViewQuantity', 'value' => set_value('ViewQuantity'), 'id' => 'ViewQuantity', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),ExceedEditQuantityCheck()');
                                 echo form_input($data); ?>
                             </div>
                         </div>
-                        <div class="form-group col-md-2">
+                   
+                    </div>
+
+                    <div class="form-row" style="margin-bottom: 10px;">
+                        <div class="col-md-3"></div>
+                        <div class="form-group col-md-3">
                             <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?><span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span> </label>
                             <div>
                                 <?php $data = array('name' => 'ViewRate', 'value' => set_value('ViewRate'), 'id' => 'ViewRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => true, 'onchange' => 'EditRatechange()');
                                 echo form_input($data); ?>
                             </div>
                         </div>
-                        <div class="form-group col-md-1">
+                        <div class="form-group col-md-3">
                             <label>Per</label>
                             <?php $data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer', 'readonly' => true, 'class' => 'form-control');
                             echo form_input($data); ?>
                         </div>
-                        <div class="form-group col-md-2" style="padding: 0px;">
+                        <div class="form-group col-md-3" style="padding: 0px;">
                             <!-- <label><?php echo "Basic Value In"; ?></label>-->
                             <!--  <p id=label3> -->
                             <label id=label3><?php echo "Basic Value In $Currencycode ($Value)"; ?></label><!-- </p> -->
@@ -2554,310 +2578,333 @@ if (!empty($getlogpodtl)) {
                                 echo form_input($data); ?>
                             </div>
                         </div>
+
                     </div>
+
                     <div class="form-row" style="margin-bottom: 10px;">
-                        <div class="form-group col-md-3">
-                            <!-- Basic Price in US $ per Ton : -->
-                            <label id=labelEditBasicPriceUs><b><?php echo "Basic Price in $Currencycode ($Value)" ?></b></label>
-                            <div>
-                                <?php
-                                $data = array('name' => 'ViewimBasicPrice', 'value' => set_value('ViewimBasicPrice'), 'id' => 'ViewimBasicPrice',  '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">
-                            <!--  Exchange Rate : -->
-                            <label id=labelviewexc><?php echo "Exchange Rate ($Currencycode ($Value))" ?></label>
-                            <div>
-                                <?php $data = array('name' => 'ViewExchangeRt', 'value' => set_value('ViewExchangeRt', $ExchangeRate), 'id' => 'ViewExchangeRt',  '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' => 'ViewINRBasicvalue', 'value' => set_value('ViewINRBasicvalue'), 'id' => 'ViewINRBasicvalue',  '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>
-                    <div class="form-row" style="border: 1px solid;padding:0px;margin: 10px 0px;">
-                        <br>
-                        <div class="form-group col-md-6" style="padding:15px;">
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    Basic Price (<?php echo $INR ?>)
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'ViewBasicPriceTax', 'value' => set_value('ViewBasicPriceTax'), 'id' => 'ViewBasicPriceTax', 'readonly' => true, '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' => 'ViewAfterBasicPriceTax', 'value' => set_value('ViewAfterBasicPriceTax'), 'id' => 'ViewAfterBasicPriceTax',  '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' => 'ViewLandingCharge', 'value' => set_value('ViewLandingCharge'), 'id' => 'ViewLandingCharge', 'readonly' => true, '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' => 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge', 'readonly' => true, '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' => 'ViewHighseas ', 'value' => set_value('ViewHighseas'), 'id' => 'ViewHighseas',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateHighseassalescharge()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'ViewAfterAssessable', 'value' => set_value('ViewAfterAssessable'), 'id' => 'ViewAfterAssessable',  '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' => 'ViewCustomduty', 'value' => set_value('ViewCustomduty'), 'id' => 'ViewCustomduty',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomduty()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'ViewAfterCustomduty', 'value' => set_value('ViewAfterCustomduty'), 'id' => 'ViewAfterCustomduty',  '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' => 'ViewCustomEDcess', 'value' => set_value('ViewCustomEDcess'), 'id' => 'ViewCustomEDcess', 'readonly' => true, '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' => 'ViewAfterCustomEDcess', 'value' => set_value('ViewAfterCustomEDcess'), 'id' => 'ViewAfterCustomEDcess',  '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' => 'ViewCustomSHcess', 'value' => set_value('ViewCustomSHcess'), 'id' => 'ViewCustomSHcess',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomSHcess()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php $data = array('name' => 'ViewAfterCustomSHcess', 'value' => set_value('ViewAfterCustomSHcess'), 'id' => 'ViewAfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data); ?>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-6" style="padding:15px;">
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    <!-- Additional Excise duty : (g) -->
-                                    <label><?php echo "Subtotal (E) ($INR)  (A+B+C+D)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div style="display: none;">
-                                        <?php $data = array('name' => 'ViewAdditionalExciseduty ', 'value' => set_value('ViewAdditionalExciseduty'), 'id' => 'ViewAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => true, 'onchange' => 'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
-                                        echo form_input($data); ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php $data = array('name' => 'ViewSubtotal', 'value' => set_value('ViewSubtotal'), 'id' => 'ViewSubtotal',  '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' => 'ViewIgst ', 'value' => set_value('ViewIgst', 0), 'id' => 'ViewIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'onchange' => 'EditCalculateIgst()');
-                                        echo form_input($data); ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php $data = array('name' => 'ViewAfterIgst', 'value' => set_value('ViewAfterIgst', 0), 'id' => 'ViewAfterIgst',  '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 ($INR)   (B+C+D+F)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php $data = array('name' => 'ViewGrossdutypayable ', 'value' => set_value('ViewGrossdutypayable'), 'id' => 'ViewGrossdutypayable',  'class' => 'form-control num', 'readonly' => true, '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 class="form-group col-md-3"></div>
+
+                            <div class="form-group col-md-3">
+                                <!-- Basic Price in US $ per Ton : -->
+                                <label id=labelEditBasicPriceUs>
+                                    <?php echo "Basic Price in $Currencycode ($Value)" ?>
+                                </label>
+                                <div>
                                     <?php
-                                    $options = array("0" => 'Select Freight Type');
-                                    //print_r(  $options);
-                                    if (!empty($FreightType)) {
-                                        foreach ($FreightType as $SID) :
-                                            $options[$SID->ConfigValue] =  $SID->ConfigValue;
-                                        endforeach;
-                                    }
-                                    echo form_dropdown('drpviewFreight', $options, set_value('drpviewFreight'), 'id="drpviewFreight" class="form-control " disabled'); ?>
+                                    $data = array('name' => 'ViewimBasicPrice', 'value' => set_value('ViewimBasicPrice'), 'id' => 'ViewimBasicPrice',  'class' => 'form-control num', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
                                 </div>
-                                <div class="form-group col-md-3" id="ViewTripsValue" style="display:block;">
-                                    <span>NO Of Trips</span>
-                                    <?php $data = array('name' => 'viewNOOfTrips', 'value' => set_value('viewNOOfTrips'), 'id' => 'viewNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(2);', 'disabled' => 'disabled');
-                                    echo form_input($data); ?>
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <span>Freight Rate </span>
-                                    <?php $data = array('name' => 'viewtxtFreight', 'value' => set_value('viewtxtFreight'), 'id' => 'viewtxtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(2);', 'readonly' => 'true');
-                                    echo form_input($data); ?>
-                                </div>
-                                <div class="form-group col-md-3" style="padding-left: 0px;">
-                                    <span>Freight Amt In <?php echo $INR; ?></span>
-                                    <?php $data = array('name' => 'viewtxtAfterFreight', 'value' => set_value('viewtxtAfterFreight'), 'id' => 'viewtxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                            </div>
+                            <div class="form-group col-md-3">
+                                <!--  Exchange Rate : -->
+                                <label id=labelviewexc><?php echo "Exchange Rate ($Currencycode ($Value))" ?></label>
+                                <div>
+                                    <?php $data = array('name' => 'ViewExchangeRt', 'value' => set_value('ViewExchangeRt', $ExchangeRate), 'id' => 'ViewExchangeRt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
                                     echo form_input($data); ?>
                                 </div>
                             </div>
-                            <!--End of Adding of freight in edit model -->
-                            <div class="form-row">
+                            <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' => 'ViewINRBasicvalue', 'value' => set_value('ViewINRBasicvalue'), 'id' => 'ViewINRBasicvalue',  '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 class="form-row p-2" style="border: 1px solid;padding:0px;margin: 10px 0px;">
+                            <br>
+
+                            <div class="form-group col-md-6" style="padding:15px;">
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                      <label>  Basic Price (<?php echo $INR ?>)</label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'ViewBasicPriceTax', 'value' => set_value('ViewBasicPriceTax'), 'id' => 'ViewBasicPriceTax', 'readonly' => true, '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' => 'ViewAfterBasicPriceTax', 'value' => set_value('ViewAfterBasicPriceTax'), 'id' => 'ViewAfterBasicPriceTax',  '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' => 'ViewLandingCharge', 'value' => set_value('ViewLandingCharge'), 'id' => 'ViewLandingCharge', 'readonly' => true, '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' => 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge', 'readonly' => true, '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' => 'ViewHighseas ', 'value' => set_value('ViewHighseas'), 'id' => 'ViewHighseas',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateHighseassalescharge()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'ViewAfterAssessable', 'value' => set_value('ViewAfterAssessable'), 'id' => 'ViewAfterAssessable',  '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' => 'ViewCustomduty', 'value' => set_value('ViewCustomduty'), 'id' => 'ViewCustomduty',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomduty()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'ViewAfterCustomduty', 'value' => set_value('ViewAfterCustomduty'), 'id' => 'ViewAfterCustomduty',  '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' => 'ViewCustomEDcess', 'value' => set_value('ViewCustomEDcess'), 'id' => 'ViewCustomEDcess', 'readonly' => true, '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' => 'ViewAfterCustomEDcess', 'value' => set_value('ViewAfterCustomEDcess'), 'id' => 'ViewAfterCustomEDcess',  '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' => 'ViewCustomSHcess', 'value' => set_value('ViewCustomSHcess'), 'id' => 'ViewCustomSHcess',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomSHcess()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php $data = array('name' => 'ViewAfterCustomSHcess', 'value' => set_value('ViewAfterCustomSHcess'), 'id' => 'ViewAfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data); ?>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group col-md-6" style="padding:15px;">
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Additional Excise duty : (g) -->
+                                        <label><?php echo "Subtotal (E) ($INR)  (A+B+C+D)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display: none;">
+                                            <?php $data = array('name' => 'ViewAdditionalExciseduty ', 'value' => set_value('ViewAdditionalExciseduty'), 'id' => 'ViewAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => true, 'onchange' => 'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
+                                            echo form_input($data); ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php $data = array('name' => 'ViewSubtotal', 'value' => set_value('ViewSubtotal'), 'id' => 'ViewSubtotal',  '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' => 'ViewIgst ', 'value' => set_value('ViewIgst', 0), 'id' => 'ViewIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'onchange' => 'EditCalculateIgst()');
+                                            echo form_input($data); ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php $data = array('name' => 'ViewAfterIgst', 'value' => set_value('ViewAfterIgst', 0), 'id' => 'ViewAfterIgst',  '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 ($INR)   (B+C+D+F)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php $data = array('name' => 'ViewGrossdutypayable ', 'value' => set_value('ViewGrossdutypayable'), 'id' => 'ViewGrossdutypayable',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);');
+                                            echo form_input($data); ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <br>
+                                <!--Start of Adding of Frieght model-->
+                                <div class="form-row" style="padding:0px;">
+                                    <div class="form-group col-md-4">
+                                        <span>Freight Type </span>
+                                        <?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('drpviewFreight', $options, set_value('drpviewFreight'), 'id="drpviewFreight" class="form-control " disabled'); ?>
+                                    </div>
+                                    <div class="form-group col-md-4" id="ViewTripsValue" style="display:block;">
+                                        <span>NO Of Trips</span>
+                                        <?php $data = array('name' => 'viewNOOfTrips', 'value' => set_value('viewNOOfTrips'), 'id' => 'viewNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(2);', 'disabled' => 'disabled');
+                                        echo form_input($data); ?>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <span>Freight Rate </span>
+                                        <?php $data = array('name' => 'viewtxtFreight', 'value' => set_value('viewtxtFreight'), 'id' => 'viewtxtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(2);', 'readonly' => 'true');
+                                        echo form_input($data); ?>
+                                    </div>
+                                    <div class="form-group col-md-4" style="padding-left: 0px;">
+                                        <span>Freight Amt In <?php echo $INR; ?></span>
+                                        <?php $data = array('name' => 'viewtxtAfterFreight', 'value' => set_value('viewtxtAfterFreight'), 'id' => 'viewtxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data); ?>
+                                    </div>
+                                </div>
+
+                                <br>
+
                                 <center> <label>Cost of the product Per KG</label></center>
                                 <hr />
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-6">
-                                    <label>Duty Impact</label>
-                                    <div>
-                                        <?php $data = array('name' => 'ViewDutyImpact', 'value' => set_value('ViewDutyImpact'), 'id' => 'ViewDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                        echo form_input($data); ?>
+
+                                <!--End of Adding of freight in edit model -->
+                                <div class="form-row">
+                                
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-6">
+                                        <label>Duty Impact</label>
+                                        <div>
+                                            <?php $data = array('name' => 'ViewDutyImpact', 'value' => set_value('ViewDutyImpact'), 'id' => 'ViewDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data); ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-6">
+                                        <label>Quantity</label>
+                                        <div>
+                                            <?php $data = array('name' => 'ViewPurQuantity', 'value' => set_value('ViewPurQuantity'), 'id' => 'ViewPurQuantity',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
+                                            echo form_input($data); ?>
+                                        </div>
                                     </div>
                                 </div>
-                                <div class="form-group col-md-6">
-                                    <label>Quantity</label>
-                                    <div>
-                                        <?php $data = array('name' => 'ViewPurQuantity', 'value' => set_value('ViewPurQuantity'), 'id' => 'ViewPurQuantity',  'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
-                                        echo form_input($data); ?>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-6">
-                                    <label><?php echo "Custom Duty($INR) /UOM" ?></label>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'ViewCustomDutyExpenses ', 'value' => set_value('ViewCustomDutyExpenses'), 'id' => 'ViewCustomDutyExpenses',  '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-6">
-                                    <!-- RMC Including Customers -->
-                                    <label><?php echo "Clearing Charges ($INR)"; ?></label>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'ViewClearingCharges', 'value' => set_value('ViewClearingCharges'), 'id' => 'ViewClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-6">
-                                    <!-- RMC Including Customers -->
-                                    <label><?php echo "Nett per UOM($INR)"; ?></label>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4" style="display:none;">
-                                    <!-- Total Amount: -->
-                                    <label id=labelViewTotalAmount>Total Amount</label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div style="display:none;">
-                                        <?php $data = array('name' => 'ViewTotalExp', 'value' => set_value('ViewTotalExp'), 'id' => 'ViewTotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                        echo form_input($data); ?>
+                                <div class="form-row">
+                                    <div class="form-group col-md-6">
+                                        <label><?php echo "Custom Duty($INR) /UOM" ?></label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'ViewCustomDutyExpenses ', 'value' => set_value('ViewCustomDutyExpenses'), 'id' => 'ViewCustomDutyExpenses',  '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-6">
+                                        <!-- RMC Including Customers -->
+                                        <label><?php echo "Clearing Charges ($INR)"; ?></label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'ViewClearingCharges', 'value' => set_value('ViewClearingCharges'), 'id' => 'ViewClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-6">
+                                        <!-- RMC Including Customers -->
+                                        <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4" style="display:none;">
+                                        <!-- Total Amount: -->
+                                        <label id=labelViewTotalAmount>Total Amount</label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display:none;">
+                                            <?php $data = array('name' => 'ViewTotalExp', 'value' => set_value('ViewTotalExp'), 'id' => 'ViewTotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data); ?>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
+
+
                         </div>
-                    </div>
+                    
+
+                    <br>
+
                     <div class="form-row" style="margin-bottom: 10px;">
                         <div class="form-group col-md-12">
                             <label>Import Description :</label>
@@ -5397,19 +5444,6 @@ if (!empty($getlogpodtl)) {
     }
 
 
-    $(function() {
-        //$("#revenueTax").DataTable();
-        $('#ImportTax').DataTable({
-            "paging": false,
-            "lengthChange": true,
-            "searching": false,
-            "ordering": false,
-            // "info": true,
-            "autoWidth": true
-
-        });
-    });
-
     $("#PaymentTerms").change(function() {
 
         if ($('#PaymentTerms').val().trim() == 'PT08')
diff --git a/app/Views/requisitionform.php b/app/Views/requisitionform.php
index f816cfd8..8d0fa445 100755
--- a/app/Views/requisitionform.php
+++ b/app/Views/requisitionform.php
@@ -27,6 +27,7 @@ if (!empty($Emp)) {
 
 .th{
 	font-size: 14px;
+	text-align:center !important ;
 }
 
 </style>
@@ -638,12 +639,12 @@ if (!empty($Emp)) {
 			index = parseInt(index) + 1;
 
 			var rowHtml = `<tr id="${temp}">
-					<td align="left">${temp}</td>
-					<td align="left">${materialCode}</td>
-					<td align="left">${materialName}</td>
-					<td align="left">${uom}</td>
-					<td align="left">${quantity}</td>
-					<td>
+					<td align="center">${temp}</td>
+					<td align="center">${materialCode}</td>
+					<td align="center">${materialName}</td>
+					<td align="center">${uom}</td>
+					<td align="center">${quantity}</td>
+					<td align="center">
 					<a 
 						data-id="${temp}" 
 						data-userid="${temp}" 
diff --git a/app/Views/requisitionlisting.php b/app/Views/requisitionlisting.php
index 5be9410c..adf9a922 100755
--- a/app/Views/requisitionlisting.php
+++ b/app/Views/requisitionlisting.php
@@ -79,6 +79,15 @@ if (!empty($Status)) {
     .icon-button:hover {
         color: #0056b3;
     }
+
+    .th{
+       
+        text-align:center !important;
+        
+    }
+
+   
+
 </style>
 
 <div class="content-page">
@@ -123,15 +132,15 @@ if (!empty($Status)) {
                                 <table id="requisition_listing" class="table dt-responsive nowrap w-100">
                                     <thead>
                                         <tr>
-                                            <th>Requisted Date</th>
-                                            <th>Requisition No</th>
-                                            <th>Requisition Type</th>
-                                            <th>Tot No.OfLineItem </th>
-                                            <th>Po CreatedLineItem</th>
-                                            <th>Partially PoCreatedLineItem</th>
-                                            <th>NewLine Item</th>
-                                            <th>Status</th>
-                                            <th>Action</th>
+                                            <th class="th">Requisted Date</th>
+                                            <th class="th">Requisition No</th>
+                                            <th class="th">Requisition Type</th>
+                                            <th class="th">Tot No.OfLineItem </th>
+                                            <th class="th">Po CreatedLineItem</th>
+                                            <th class="th">Partially PoCreatedLineItem</th>
+                                            <th class="th">NewLine Item</th>
+                                            <th class="th">Status</th>
+                                            <th class="th">Action</th>
                                         </tr>
                                     </thead>
                                     <tbody>
@@ -140,19 +149,19 @@ if (!empty($Status)) {
                                             foreach ($TotNoOfLine as $record) { //print_r($record);
                                         ?>
                                                 <tr>
-                                                    <td> <?php $Pdt =    new DateTime($record->CreatedDate);
+                                                    <td align="center"> <?php $Pdt =    new DateTime($record->CreatedDate);
                                                             $PODate =  $Pdt->format('d-m-Y');
                                                             echo $PODate ?>
                                                     </td>
-                                                    <td><?php echo $record->ReqNo ?></td>
-                                                    <td><?php echo $record->ReqType ?></td>
-                                                    <td><?php echo $record->TotalNoofLineItems ?></td>
-                                                    <td><?php echo $record->PolineItems ?></td>
-                                                    <td><?php echo $record->PartilallyLineItems ?></td>
-                                                    <td> <?php echo $record->newLineItem ?></td>
+                                                    <td align="center"><?php echo $record->ReqNo ?></td>
+                                                    <td align="center"><?php echo $record->ReqType ?></td>
+                                                    <td align="center"><?php echo $record->TotalNoofLineItems ?></td>
+                                                    <td align="center"><?php echo $record->PolineItems ?></td>
+                                                    <td align="center"><?php echo $record->PartilallyLineItems ?></td>
+                                                    <td align="center"> <?php echo $record->newLineItem ?></td>
 
 
-                                                    <td><?php echo $record->StatusName ?></td>
+                                                    <td align="center"><?php echo $record->StatusName ?></td>
 
                                                     <td> <a data-toggle="tooltip"
                                                             href="<?php echo base_url() . 'EditRequisitionForm?ReqNo=' . $record->ReqNo . '&ReqType=' . $record->ReqType; ?>"><i