diff --git a/app/Views/AmendPOlist.php b/app/Views/AmendPOlist.php
index 0f78786f..2efdcd06 100755
--- a/app/Views/AmendPOlist.php
+++ b/app/Views/AmendPOlist.php
@@ -46,6 +46,14 @@
     td {
         white-space: nowrap;
     }
+
+    .th-total-order-value{
+        text-align:"right" !important;
+        width:55%;
+    }
+
+
+
 </style>
 
 
@@ -84,7 +92,8 @@
                                             <th>PONO</th>
                                             <th>PO Type</th>
                                             <th>Supplier Name</th>
-                                            <th>Total Order Value</th>
+                                            <th class="th th-total-order-value">
+                                                Total Order Value</th>
                                             <th>PO Status</th>
                                             <th>Delivery Option</th>
                                             <th>Delivery Date</th>
@@ -108,7 +117,7 @@
                                                     <td><?php echo $record->PONO ?></td>
                                                     <td><?php echo $record->ReqType ?></td>
                                                     <td><?php echo $record->SupplierName ?></td>
-                                                    <td><?php echo $record->TotalOrderValue ?></td>
+                                                    <td align="right"><?php echo $record->TotalOrderValue ?></td>
 
                                                     <!-- <td><?php echo $record->StatusName ?></td> -->
                                                     <td><?php
@@ -130,7 +139,7 @@
                                                         }
                                                         ?>
                                                     </td>
-                                                    <td><?php $option = 'By Deliver Date';
+                                                    <td align="center"><?php $option = 'By Deliver Date';
                                                         if ($record->DeliveryOption == 1) {
                                                             $option   = "By Schedule";
                                                         } else if ($record->DeliveryOption == 2) {
@@ -146,7 +155,7 @@
                                                             $Deliverydt = '';
                                                             echo $Deliverydt;
                                                         } ?></td>
-                                                    <td><?php echo $record->DeliverySchedule ?></td>
+                                                    <td align="center"> <?php echo $record->DeliverySchedule ?></td>
 
 
 
diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php
index 1ec323cc..2ad0cf4a 100755
--- a/app/Views/addEmployeenew.php
+++ b/app/Views/addEmployeenew.php
@@ -1075,7 +1075,7 @@
                                                             <label>File</label>
                                                             <input type="file" name="emp_file[]" class="form-control">
                                                         </div>
-                                                        <div class="col-md-4" style="margin-top: 23px;">
+                                                        <div class="col-md-4" style="margin-top: 32px;">
                                                             <button type="button" class="btn btn-primary btn-sm a1"
                                                                 onclick="appendFilesFileds()" id="day">
                                                                 Add
@@ -1472,7 +1472,8 @@
             });
 
             if (!isValid) {
-                console.log('Validation failed. Please fill all required fields.');
+
+                alert('Validation failed. Please fill all required fields.');
                 return; // Stop the submission if validation fails
             }
 
diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php
index 30288a07..2242dcb6 100755
--- a/app/Views/editEmployeenew.php
+++ b/app/Views/editEmployeenew.php
@@ -1024,14 +1024,14 @@ if (!empty($EmpDetails)) {
 
 
                                                                 </div>
-                                                                <div class="col-md-1" style="margin-top: 25px;">
+                                                                <div class="col-md-1" style="margin-top: 32px;">
                                                                     <a href="<?php echo base_url() . 'public/uploads/images/emp_files/' . $value['emp_file']; ?>"
                                                                         download>
                                                                         <i class="fa fa-download" aria-hidden="true"
                                                                             style="font-size: 25px;"></i>
                                                                     </a>
                                                                 </div>
-                                                                <div class="col-md-4" align="left" style="margin-top: 23px;">
+                                                                <div class="col-md-4" align="left" style="margin-top: 32px;">
                                                                     <button type="button" class="btn btn-danger btn-sm"
                                                                         id="<?= $value['id']; ?>"
                                                                         onclick="removeContact(this)">Delete
@@ -1057,7 +1057,7 @@ if (!empty($EmpDetails)) {
                                                                 <label>File</label>
                                                                 <input type="file" name="emp_file[]" class="form-control">
                                                             </div>
-                                                            <div class="col-md-4" style="margin-top: 23px;">
+                                                            <div class="col-md-4" style="margin-top: 32px;">
                                                                 <button type="button" class="btn btn-primary btn-sm a1"
                                                                     onclick="appendFilesFileds()" id="day">
                                                                     Add
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index 4d06754d..1b7a1411 100755
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -366,7 +366,7 @@ if (!empty($getlogpodtl)) {
                 <div class="col-12">
                     <div class="page-title-box page-title-box-alt">
                         <?php if ($parentPO == '') { ?>
-                            <h4><?= "Edit Import Purchase Order - $PONO "; ?></h4>
+                            <h4><?= "Edit Import Purchase Order    - $PONO "; ?></h4>
                         <?php } else { ?>
                             <h4><?= "Amended Import Purchase Order - $PONO "; ?></h4>
                         <?php } ?>
@@ -391,174 +391,175 @@ if (!empty($getlogpodtl)) {
 
 
 
-                            <div class="form-row">
-                                <div class="form-group col-md-3">
-                                    <label>Requistion No</label>
-                                    <?php
-
-                                    $options = array("0" => 'Selected Requisition Numbers');
-                                    if (!empty($ReqList)) {
-                                        foreach ($ReqList as $SID) :
-                                            $options[$SID->ReqNo] = $SID->ReqNo;
-                                        // print_r($SID->ReqNo);
-                                        // $options[$SID->ReqNo] = $SID->ReqNo ."-". $SID->ReqBy;
-                                        //$ReqType = $SID->ReqType;
-                                        endforeach;
-                                    }
-                                    //echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' , 'required="true"');
-                                    echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"');
-
-                                    ?>
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <label>Purchase Order Type</label>
-                                    <div >
-
+                                <div class="form-row">
+                                    <div class="form-group col-md-3">
+                                        <label>Requistion No</label>
                                         <?php
-                                        $data = array('name' => 'POType', 'value' => set_value('POType', IMPORT), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <label>Select Supplier<span class="text-danger">*</span></label>
-
-                                    <?php
-                                    $options = array("0" => 'Select Supplier');
-                                    //print_r(  $options);
-                                    if (!empty($Suplist)) {
-                                        foreach ($Suplist as $SID) :
-                                            $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
-                                        endforeach;
-                                    }
-
-                                    //echo form_dropdown('drpSupplier', $options,set_value('drpSupplier'),'id="drpSupplier"'  ,'required="true"' ,'class="form-control select2"');
-
-                                    echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier" required="true" class="form-control select2"');
-
-                                    ?> <input type="hidden" name="b4supplier" id="b4supplier" value="<?php echo $SupId; ?>">
-                                    <input type="hidden" name="newsup" id="changeSup">
-
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <label>Supplier Address</label>
-                                    <div >
-                                        <?php
-                                        $data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
-                                        echo Form_textarea($data);
-
-
 
+                                        $options = array("0" => 'Selected Requisition Numbers');
+                                        if (!empty($ReqList)) {
+                                            foreach ($ReqList as $SID) :
+                                                $options[$SID->ReqNo] = $SID->ReqNo;
+                                            // print_r($SID->ReqNo);
+                                            // $options[$SID->ReqNo] = $SID->ReqNo ."-". $SID->ReqBy;
+                                            //$ReqType = $SID->ReqType;
+                                            endforeach;
+                                        }
+                                        //echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' , 'required="true"');
+                                        echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"');
 
                                         ?>
                                     </div>
-                                </div>
-                            </div>
+                                    <div class="form-group col-md-3">
+                                        <label>Purchase Order Type</label>
+                                        <div >
+
+                                            <?php
+                                            $data = array('name' => 'POType', 'value' => set_value('POType', IMPORT), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-3">
+                                        <label>Select Supplier<span class="text-danger">*</span></label>
+
+                                        <?php
+                                        $options = array("0" => 'Select Supplier');
+                                        //print_r(  $options);
+                                        if (!empty($Suplist)) {
+                                            foreach ($Suplist as $SID) :
+                                                $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
+                                            endforeach;
+                                        }
+
+                                        //echo form_dropdown('drpSupplier', $options,set_value('drpSupplier'),'id="drpSupplier"'  ,'required="true"' ,'class="form-control select2"');
+
+                                        echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier" required="true" class="form-control select2"');
+
+                                        ?> <input type="hidden" name="b4supplier" id="b4supplier" value="<?php echo $SupId; ?>">
+                                        <input type="hidden" name="newsup" id="changeSup">
+
+                                    </div>
+                                    <div class="form-group col-md-3">
+                                        <label>Supplier Address</label>
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
+                                            echo Form_textarea($data);
 
 
-                            <div class="form-row">
-                                <div class="form-group col-md-3">
-                                    <label>Currency Type<span class="text-danger">*</span></label>
-                                    <?php
-                                    if (!empty($Currency)) {
-
-                                        foreach ($Currency as $Cur) :
-                                            if ($Currency_Type == $Cur->Currency_Code) {
-                                                $options1[$Cur->Currency_Code] =  $Cur->Currency_Code . ' ' . ' - ' . ' ' . $Cur->Country_and_Currency;
-                                            }
-                                        endforeach;
 
 
-                                        foreach ($Currency as $Cur) :
-                                            if ($Currency_Type != $Cur->Currency_Code) {
-                                                $options1[$Cur->Currency_Code] =  $Cur->Currency_Code . ' ' . ' - ' . ' ' . $Cur->Country_and_Currency;
-                                            }
-                                        endforeach;
-                                    }
-
-                                    echo form_dropdown('currencytype', $options1, set_value('currencytype', $Currency_Type), 'id="currencytype" class="form-control select2" required="true"');
-
-                                    ?>
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <b><u>Select Delivery By<span class="text-danger">*</span></u></b><br />
-                                    <div class="centered">
-
-                                        <?php echo form_label('Dispatch instruction', 'Dispatch instruction') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "2", 'checked' => 'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;
-                                        <?php echo form_label('Schedule', 'Schedule') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Schedule", "value" => "1")); ?>
+                                            ?>
+                                        </div>
                                     </div>
                                 </div>
-                                <div class="form-group col-md-3" id="Schedulediv" style="display:none;">
-                                    <label>Schedule By <span class="text-danger">*</span></label>
 
-                                    <?php
-                                    $data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverySchedule), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
-                                    echo Form_textarea($data);
-                                    ?>
 
-                                </div>
-                                <div class="form-group col-md-3" id="Deliverydtdiv">
-                                    <label>Dispatch Instruction<span class="text-danger">*</span></label>
-
-                                    <?php
-                                    // $data = array('name' => 'Dispatch','value' => set_value('Dispatch',$Import_DispatchDetails),'id'=>'Dispatch',  'class' => 'form-control'  ,'required' => 'true');
-                                    //         echo form_input($data);
-
-                                    $data = array('name' => 'Dispatch', 'value' => set_value('Dispatch', $Import_DispatchDetails), 'id' => 'Dispatch',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
-                                    echo Form_textarea($data);
-                                    ?>
-
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <label>Delivery Address</label>
-                                    <div >
+                                <div class="form-row">
+                                    <div class="form-group col-md-3">
+                                        <label>Currency Type<span class="text-danger">*</span></label>
                                         <?php
-                                        $data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
+                                        if (!empty($Currency)) {
+
+                                            foreach ($Currency as $Cur) :
+                                                if ($Currency_Type == $Cur->Currency_Code) {
+                                                    $options1[$Cur->Currency_Code] =  $Cur->Currency_Code . ' ' . ' - ' . ' ' . $Cur->Country_and_Currency;
+                                                }
+                                            endforeach;
+
+
+                                            foreach ($Currency as $Cur) :
+                                                if ($Currency_Type != $Cur->Currency_Code) {
+                                                    $options1[$Cur->Currency_Code] =  $Cur->Currency_Code . ' ' . ' - ' . ' ' . $Cur->Country_and_Currency;
+                                                }
+                                            endforeach;
+                                        }
+
+                                        echo form_dropdown('currencytype', $options1, set_value('currencytype', $Currency_Type), 'id="currencytype" class="form-control select2" required="true"');
+
+                                        ?>
+                                    </div>
+                                    <div class="form-group col-md-3">
+                                        <b><u>Select Delivery By<span class="text-danger">*</span></u></b><br />
+                                        <div class="centered">
+
+                                            <?php echo form_label('Dispatch instruction', 'Dispatch instruction') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "2", 'checked' => 'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;
+                                            <?php echo form_label('Schedule', 'Schedule') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Schedule", "value" => "1")); ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-3" id="Schedulediv" style="display:none;">
+                                        <label>Schedule By <span class="text-danger">*</span></label>
+
+                                        <?php
+                                        $data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverySchedule), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
                                         echo Form_textarea($data);
                                         ?>
+
+                                    </div>
+                                    <div class="form-group col-md-3" id="Deliverydtdiv">
+                                        <label>Dispatch Instruction<span class="text-danger">*</span></label>
+
+                                        <?php
+                                        // $data = array('name' => 'Dispatch','value' => set_value('Dispatch',$Import_DispatchDetails),'id'=>'Dispatch',  'class' => 'form-control'  ,'required' => 'true');
+                                        //         echo form_input($data);
+
+                                        $data = array('name' => 'Dispatch', 'value' => set_value('Dispatch', $Import_DispatchDetails), 'id' => 'Dispatch',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
+                                        echo Form_textarea($data);
+                                        ?>
+
+                                    </div>
+                                    <div class="form-group col-md-3">
+                                        <label>Delivery Address</label>
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
+                                            echo Form_textarea($data);
+                                            ?>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
 
 
-                            <div class="form-row">
-                                <div class="form-group col-md-3">
-                                    Check Today's Foreign Exchange value <a href="http://www.xe.com/" target="_blank"><u>(Click here)</u></a>
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <label>Exchange Rate On</label>
-                                    <div >
+                                <div class="form-row">
+                                    <div class="form-group col-md-3">
+                                        Check Today's Foreign Exchange value <a href="http://www.xe.com/" target="_blank"><u>(Click here)</u></a>
+                                    </div>
+                                    <div class="form-group col-md-3">
+                                        <label>Exchange Rate On</label>
+                                        <div >
+                                            <?php
+                                            $data = array('type' => 'date', 'name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateCalculatedon), 'id' => 'Exchangerateon',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-3">
+                                        <!--  <label>Exchange Rate </label> -->
+
+                                        <label id=label1><?php echo "Exchange Rate in $Currencycode ($Value)" ?><span class="text-danger">*</span></label>
+
                                         <?php
-                                        $data = array('type' => 'date', 'name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateCalculatedon), 'id' => 'Exchangerateon',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+                                        $data = array('name' => 'ExchangeRate', 'value' => set_value('ExchangeRate', $ExchangeRate), 'id' => 'ExchangeRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'USRate()');
                                         echo form_input($data);
                                         ?>
+
+                                    </div>
+                                    <div class="form-group col-md-3">
+                                        <label>Place  of Origin
+                                            <span class="text-danger">*</span>
+                                        </label>
+
+                                        <?php
+                                        //  $data = array('name' => 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
+                                        // echo form_input($data);
+                                        $data = array('name' => 'PlaceOforigin', 'value' => set_value('PlaceOforigin', $Import_PlaceofOrgin), 'id' => 'PlaceOforigin',  'class' => 'form-control num', 'required' => 'true');
+                                        echo form_input($data);
+                                        ?>
+
                                     </div>
                                 </div>
-                                <div class="form-group col-md-3">
-                                    <!--  <label>Exchange Rate </label> -->
-
-                                    <label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)" ?><span class="text-danger">*</span></label>
-
-                                    <?php
-                                    $data = array('name' => 'ExchangeRate', 'value' => set_value('ExchangeRate', $ExchangeRate), 'id' => 'ExchangeRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'USRate()');
-                                    echo form_input($data);
-                                    ?>
-
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <label>Place of Origin<span class="text-danger">*</span></label>
-
-                                    <?php
-                                    //  $data = array('name' => 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
-                                    // echo form_input($data);
-                                    $data = array('name' => 'PlaceOforigin', 'value' => set_value('PlaceOforigin', $Import_PlaceofOrgin), 'id' => 'PlaceOforigin',  'class' => 'form-control', 'required' => 'true');
-                                    echo form_input($data);
-                                    ?>
-
-                                </div>
-
-
-
+                         
                                 <div class="form-row">
                                     <div class="form-group col-md-3">
                                         <label>Purchase Order Date</label>
@@ -713,41 +714,27 @@ if (!empty($getlogpodtl)) {
                                     <div class="form-group col-md-3">
                                     </div>
                                 </div>
-                                <div>
-                                    <table class="table table-bordered">
-                                        <div align="right" style="padding-right:10px">
-                                            <div align="right">
-                                                <div class="form-row">
-                                                    <div class="col-md-3 col-md-offset-7" align="right" style="padding:10px">
-                                                        <!-- <input type="checkbox" id="IsOpenOrder"  name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT -->
-                                                    </div>
-                                                    <div class="form-group col-md-1" align="right">
-                                                        <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED) { ?>
+
+                            
+                                   
+                                
+                                <div class="form-row" align="right">
+                                    <div class="col-md-4"> 
+
+                                    </div>
+                                    <div class="col-md-4">
+
+                                    </div>
+                                    <div class="col-md-4">
+                                    <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED) { ?>
                                                             <a data-toggle="modal" data-target="#importpomodel" class="btn btn-success" data-dismiss="modal" onclick="myFunction();">Add Line Item </a>
                                                         <?php } ?>
-                                                    </div>
-                                                </div>
-
-                                                <!--<a data-toggle="modal"><button type="submit"  onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a>-->
-
-
-                                                <!-- <div class="modal fade" id="importpomodel" role="dialog">-->
-
-
-                                            </div>
-                                        </div>
-
-
-
-
+                                    </div>
+                                                       
                                 </div>
-
-
-
-
-
-
-                                <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>
@@ -793,7 +780,9 @@ if (!empty($getlogpodtl)) {
                                                         <!-- <td><?php echo $record->QuantityRejected ?></td> -->
                                                         <!-- <td><?php echo $record->PendingQty ?></td>  -->
                                                         <!-- <td><?php echo $record->Taxamount ?></td>
-                    <td><?php echo $record->TotalOrderValue ?></td> -->
+                  
+                  
+                                                        <td><?php echo $record->TotalOrderValue ?></td> -->
 
                                                         <input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
                                                         <input type="hidden" name="<?php echo 'departmentName' . $index ?>" id="<?php echo 'departmentName' . $index ?>" value="<?php echo $record->DepartmentName; ?>" />
@@ -1172,7 +1161,7 @@ if (!empty($getlogpodtl)) {
                                         </div>
 
 
-                                        <div class="form-row">
+                                        <div class="form-row p-3">
                                             <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');
@@ -1180,15 +1169,33 @@ if (!empty($getlogpodtl)) {
                                                                                         ?>
                                             </div>
                                         </div>
+
+
+                                         
+            
+                                        <div class="form-row p-3">
+                                            <div>
+                                            <label class="form">
+                                              Select Purchase Order File
+                                            </label>
+                                            </div>
+                                        
+                       
+                                        <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; ?>" /><br>
+                                                
+                                        
+                                            </div>
+
+
                                         <div align="right" style="padding-right:10px">
 
                                             <div class="col-md-5 col-md-offset-7" align="right"><br />
                                                 <div>
-                                                    <input type="file" name="POFile" id="POFile">
-                                                    <?php if ($PrePOFile) { ?>
-                                                        <label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
-                                                    <?php } ?>
-                                                    <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
+                                                   
                                                 </div>
                                                 <input type="hidden" name="txtPoRange" id="txtPoRange" />
                                                 <input type="hidden" name="isEdit" id="isEdit" value="0" />
@@ -1222,11 +1229,13 @@ if (!empty($getlogpodtl)) {
                                                     <?php } ?>
                                                 <?php } ?>
 
-                                            </div>
-                                            <br />
-                                        </div>
 
-                                        <label>Request On :</label><?php echo $Reqon; ?><br />
+                                                        
+                                                <br><br>
+
+
+
+                                                <label >Request On :</label><?php echo $Reqon; ?><br />
                                         <label>Request By :</label><?php echo $RequesterName; ?><br />
                                         <label>Status : </label><?php
                                                                 $statusMappings = [
@@ -1246,6 +1255,11 @@ if (!empty($getlogpodtl)) {
                                                                     echo "Status not provided";
                                                                 }
                                                                 ?>
+                                            </div>
+                                            <br />
+                                        </div>
+                                        
+                                       
                                 </div>
 
                             </div>
@@ -1268,15 +1282,17 @@ if (!empty($getlogpodtl)) {
                 <button type="button" class="close" data-dismiss="modal"
                     aria-hidden="true">×</button>
             </div>
-            <form>
+            <form class="form-control">
                 <div class="modal-body p-4">
                     
 
                         <div class="form-row">
+
+
                             <div class="form-group col-md-3">
                                 <label>Req No<span class="text-danger" style="color:red;text-align:right;background-color: #fff
                                                             ;">*</span></label>
-                                <div>
+                               
                                     <?php
                                     $options = array("0" => 'Req No');
                                     //echo form_dropdown('ImportMaterialCode', $options,set_value('ImportMaterialCode'),'id="ImportMaterialCode"' ,'class="form-control required"');
@@ -1290,7 +1306,7 @@ if (!empty($getlogpodtl)) {
                                     echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo" class="form-control"');
 
                                     ?>
-                                </div>
+                                
                             </div>
 
                             <div class="form-group col-md-3">
@@ -1303,6 +1319,8 @@ if (!empty($getlogpodtl)) {
                                     ?>
                                 </div>
                             </div>
+
+
                             <div class="form-group col-md-3">
                                 <label>Cost Center Code</label>
                                 <div >
@@ -1317,6 +1335,7 @@ if (!empty($getlogpodtl)) {
                                     ?>
                                 </div>
                             </div>
+
                             <div class="form-group col-md-3" style="padding-right: 0px;">
                                 <label>Available Budget Amount (<?php echo $INR ?>)</label>
                                 <div >
@@ -1326,9 +1345,12 @@ if (!empty($getlogpodtl)) {
                                     ?>
                                 </div>
                             </div>
+
                         </div>
+
+                        <!-- second-row starts with item code -->
                         <div class="form-row">
-                            <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-->
@@ -1359,7 +1381,7 @@ if (!empty($getlogpodtl)) {
                                 </div>
 
                             </div>
-                            <div class="form-group col-md-2">
+                            <div class="form-group col-md-3">
                                 <label>Item Name</label>
                                 <div >
                                     <?php
@@ -1368,14 +1390,15 @@ if (!empty($getlogpodtl)) {
                                     ?>
                                 </div>
                             </div>
-                            <div class="form-group col-md-1">
+                            <div class="form-group col-md-3">
                                 <label>UOM</label>
                                     <?php
                                     $data = array('name' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control', 'readonly' => 'true');
                                     echo form_input($data);
                                     ?>
                             </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
@@ -1384,42 +1407,15 @@ if (!empty($getlogpodtl)) {
 
                                         ?>
                                     </div>
-                                </div>
-                                <div class="form-group col-md-2">
-                                    <!-- <label>Rate </label>
-                                                             -->
-
-                                    <!--  <P id=labelRate> --> <label id=labelRate><?php echo "Rate in $Currencycode ($Value)"; ?><span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span> </label><!-- </P> -->
-                                    <div >
-                                        <?php
-                                        $data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange(),calculateFreight(0)');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-1">
-                                    <label>Per</label> <?php
-                                                        $data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer',  'class' => 'form-control');
-                                                        echo form_input($data); ?>
-                                </div>
-                                <div class="form-group col-md-2" style="padding: 0px;">
-                                    <!-- <label>Basic Amount </label>-->
-                                    <!-- <p id=labelBasicvalue><label><?php echo "Basic Value In $Currencycode ($Value)"; ?></label></p>
-                                        -->
-
-                                    <!--  <p id=label2> --> <label id=label2><?php echo "Basic Value In $Currencycode"; ?></label><!-- </p> -->
-                                    <div >
-                                        <?php
-                                        //$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
-
-                                        $data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue', 'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
+                                
+                               
+                            </div>
+                        </div>                        
+
+                        <div class="form-row ">
+
+                        <div class="form-group col-md-3">
                             </div>
-                        </div>
-                        <div class="form-row">
 
                             <div class="form-group col-md-3">
 
@@ -1428,12 +1424,15 @@ if (!empty($getlogpodtl)) {
                                 <label id=labelBasicpriceus><?php echo "Basic Value in $Currencycode ($Value)" ?></label>
 
 
-                                <div >
-                                    <?php
+                                <div>
+                                <?php
                                     $data = array('name' => 'imBasicPrice', 'value' => set_value('imBasicPrice'), 'id' => 'imBasicPrice',  'class' => 'form-control', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'USRate()', 'readonly' => 'true');
                                     echo form_input($data);
                                     ?>
                                 </div>
+                            
+                                 
+                                
                             </div>
 
                             <div class="form-group col-md-3">
@@ -1467,391 +1466,401 @@ if (!empty($getlogpodtl)) {
                                     ?>
                                 </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="padding:0px;">
-                                <br />
-                                <div class="form-group col-md-6" style="padding:0px;">
-                                    <div class="form-group col-md-12">
-                                        <div class="form-group col-md-4">
-                                            <!-- Basic Price: -->
-                                            <label><?php echo "Basic Price ($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div  style="display:none;">
-                                                <?php
-                                                $data = array('name' => 'BasicPriceTax', 'value' => set_value('BasicPriceTax'), 'id' => 'BasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
+
+
+
+                        <br>
+
+                        <div class="form-row " style="border:1px solid black;">
+                            <br />
+                            <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Basic Price: -->
+                                        <label><?php echo "Basic Price ($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div  style="display:none;">
+                                            <?php
+                                            $data = array('name' => 'BasicPriceTax', 'value' => set_value('BasicPriceTax'), 'id' => 'BasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
+                                            echo form_input($data);
+                                            ?>
                                         </div>
                                     </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!--  Landing charge -->
-                                            <label><?php echo "Landing Charge ($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'LandingCharge', 'value' => set_value('LandingCharge', 0), 'id' => 'LandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Calculateloadingcharge()');
-                                                echo form_input($data);
-
-
-
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge'), 'id' => 'AfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!--   High seas sales charge -->
-                                            <label><?php echo "Assessable Value (A)($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div  style="display: none;">
-                                                <?php
-                                                $data = array('name' => 'Highseas ', 'value' => set_value('Highseas', 0), 'id' => 'Highseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateHighseassalescharge()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'AfterAssessable', 'value' => set_value('AfterAssessable'), 'id' => 'AfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!--  Custom duty : (a) -->
-                                            <label><?php echo "Custom duty (B)($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'Customduty', 'value' => set_value('Customduty', 0), 'id' => 'Customduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomduty()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'AfterCustomduty', 'value' => set_value('AfterCustomduty'), 'id' => 'AfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-
-
-
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Custom ED_cess : (e) -->
-                                            <label><?php echo "Custom ED_cess (C)($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'CustomEDcess', 'value' => set_value('CustomEDcess', 0), 'id' => 'CustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomEdcess()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess'), 'id' => 'AfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Custom S & H cess : (f) -->
-                                            <label><?php echo "Custom S & H cess (D)($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'CustomSHcess', 'value' => set_value('CustomSHcess', 0), 'id' => 'CustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomSHcess()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'AfterCustomSHcess', 'value' => set_value('AfterCustomSHcess'), 'id' => 'AfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
                                         </div>
                                     </div>
                                 </div>
-                                <div class="form-group col-md-6" style="padding:0px;">
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Additional Excise duty : (g) -->
-                                            <label><?php echo "Subtotal (E)($INR)  (A+B+C+D)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div  style="display: none">
-                                                <?php
-                                                $data = array('name' => 'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty', 0), 'id' => 'AdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateaddlExciseDuty(),CalculateAvlModvat(),CalculateGrossExpense()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'Subtotal', 'value' => set_value('Subtotal'), 'id' => 'Subtotal',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!--  Landing charge -->
+                                        <label><?php echo "Landing Charge ($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'LandingCharge', 'value' => set_value('LandingCharge', 0), 'id' => 'LandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Calculateloadingcharge()');
+                                            echo form_input($data);
+
+
+
+                                            ?>
                                         </div>
                                     </div>
-
-
-
-
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- Additional Excise duty : (g) -->
-                                            <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'Igst ', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateIgst()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge'), 'id' => 'AfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
                                         </div>
                                     </div>
-
-
-
-
-
-
-
-
-                                    <div class="form-row">
-                                        <div class="form-group col-md-8">
-                                            <!-- Gross duty payable -->
-                                            <label><?php echo "Total Duty (G)($INR) (B+C+D+F)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'Grossdutypayable ', 'value' => set_value('Grossdutypayable'), 'id' => 'Grossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateAvlModvat()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!--   High seas sales charge -->
+                                        <label><?php echo "Assessable Value (A)($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div  style="display: none;">
+                                            <?php
+                                            $data = array('name' => 'Highseas ', 'value' => set_value('Highseas', 0), 'id' => 'Highseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateHighseassalescharge()');
+                                            echo form_input($data);
+                                            ?>
                                         </div>
                                     </div>
-
-
-                                    <!--Start of Adding of Frieght model-->
-                                    <div class="form-row" style="padding:0px;">
-                                        <div class="form-group col-md-3">
-                                            <span>Freight Type </span>
-                                            <div>
-                                                <?php
-                                                $options = array("0" => 'Select Freight Type');
-                                                //print_r(  $options);
-
-                                                if (!empty($FreightType)) {
-                                                    foreach ($FreightType as $SID) :
-
-
-                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-                                                    endforeach;
-                                                }
-
-                                                echo form_dropdown('drpaddFreight', $options, set_value('drpaddFreight'), 'id="drpaddFreight" class="form-control "');
-
-                                                ?>
-                                            </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'AfterAssessable', 'value' => set_value('AfterAssessable'), 'id' => 'AfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
                                         </div>
-                                        <div class="form-group col-md-3" id="AddTripsValue" style="display:none;">
-                                            <span>NO Of Trips</span>
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'addNOOfTrips', 'value' => set_value('addNOOfTrips'), 'id' => 'addNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-3">
-                                            <span>Freight Rate </span>
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'addtxtFreight', 'value' => set_value('addtxtFreight'), 'id' => 'addtxtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
-                                        <div class="form-group col-md-3" style="padding-left: 0px;">
-                                            <span>Freight Amt In <?php echo $INR; ?></span>
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'addtxtAfterFreight', 'value' => set_value('addtxtAfterFreight'), 'id' => 'addtxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
                                     </div>
-                                    <!--End of Adding of freight in edit model -->
-
-
-                                    <center> <label>Cost of the product Per UOM</label></center>
-                                    <hr />
-
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <label>Duty Impact</label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact'), 'id' => 'DutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <div class="form-group col-md-4" style="margin-top: -4.8%">
-                                            <span>Quantity</span>
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!--  Custom duty : (a) -->
+                                        <label><?php echo "Custom duty (B)($INR)"; ?></label>
                                     </div>
-                                    <div class="form-row">
-
-                                        <div class="form-group col-md-4">
-                                            <!--  Custom Duty Expenses -->
-                                            <label><?php echo "Custom Duty Expenses($INR)/UOM"; ?></label>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'Customduty', 'value' => set_value('Customduty', 0), 'id' => 'Customduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomduty()');
+                                            echo form_input($data);
+                                            ?>
                                         </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
                                     </div>
-                                    <div class="form-row">
-                                        <div class="form-group col-md-4">
-                                            <!-- RMC Including Customers -->
-                                            <label><?php echo "Clearing Charges($INR)"; ?></label>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'AfterCustomduty', 'value' => set_value('AfterCustomduty'), 'id' => 'AfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
                                         </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
-
-
-
-
-                                        <div class="form-group col-md-4">
-                                            <!-- RMC Including Customers -->
-                                            <label><?php echo "Nett per UOM($INR)"; ?></label>
-                                        </div>
-                                        <div class="form-group col-md-4">
-                                            <div >
-                                                <?php
-                                                $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
-
-
-
-                                        <div class="form-group col-md-4" style="display: none">
-                                            <!--  Total Amount: -->
-                                            <label id=labelTotalAmount>Total Amount</label>
-                                        </div>
-                                        <div class="form-group col-md-4" style="display: none">
-                                            <div  style="display: none;">
-                                                <?php
-                                                $data = array('name' => 'TotalExp', 'value' => set_value('TotalExp'), 'id' => 'TotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-
                                     </div>
+                                </div>
 
 
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Custom ED_cess : (e) -->
+                                        <label><?php echo "Custom ED_cess (C)($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'CustomEDcess', 'value' => set_value('CustomEDcess', 0), 'id' => 'CustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomEdcess()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess'), 'id' => 'AfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Custom S & H cess : (f) -->
+                                        <label><?php echo "Custom S & H cess (D)($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'CustomSHcess', 'value' => set_value('CustomSHcess', 0), 'id' => 'CustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomSHcess()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'AfterCustomSHcess', 'value' => set_value('AfterCustomSHcess'), 'id' => 'AfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
 
-                            <div class="form-row">
-                                <div class="form-group col-md-12">
-                                    <label>Import Description :</label>
-                                    <?php
-                                    $data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
-                                    echo form_textarea($data);
-                                    ?>
+                            <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Additional Excise duty : (g) -->
+                                        <label><?php echo "Subtotal (E)($INR)  (A+B+C+D)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div  style="display: none">
+                                            <?php
+                                            $data = array('name' => 'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty', 0), 'id' => 'AdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateaddlExciseDuty(),CalculateAvlModvat(),CalculateGrossExpense()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'Subtotal', 'value' => set_value('Subtotal'), 'id' => 'Subtotal',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
                                 </div>
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Additional Excise duty : (g) -->
+                                        <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'Igst ', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateIgst()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-8">
+                                        <!-- Gross duty payable -->
+                                        <label><?php echo "Total Duty (G)($INR) (B+C+D+F)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'Grossdutypayable ', 'value' => set_value('Grossdutypayable'), 'id' => 'Grossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateAvlModvat()');
+                                            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-4">
+                                        <label>Freight Type </label>
+                                        <div>
+                                            <?php
+                                            $options = array("0" => 'Select Freight Type');
+                                            //print_r(  $options);
+
+                                            if (!empty($FreightType)) {
+                                                foreach ($FreightType as $SID) :
+
+
+                                                    $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+                                                endforeach;
+                                            }
+
+                                            echo form_dropdown('drpaddFreight', $options, set_value('drpaddFreight'), 'id="drpaddFreight" class="form-control "');
+
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4" id="AddTripsValue" style="display:none;">
+                                        <label>NO Of Trips</label>
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'addNOOfTrips', 'value' => set_value('addNOOfTrips'), 'id' => 'addNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <label>Freight Rate </label>
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'addtxtFreight', 'value' => set_value('addtxtFreight'), 'id' => 'addtxtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group col-md-4" style="padding-left: 0px;">
+                                        <label>Freight Amt In <?php echo $INR; ?></label>
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'addtxtAfterFreight', 'value' => set_value('addtxtAfterFreight'), 'id' => 'addtxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+                                <!--End of Adding of freight in edit model -->
+
+                                <br>
+
+                                <center> <label>Cost of the product Per UOM</label></center>
+                                <hr>
+
+                                <div class="form-row mt-3">
+                                    <div class="form-group col-md-4">
+                                        <label>Duty Impact</label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact'), 'id' => 'DutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4" style="margin-top: -4.0%">
+                                        <label>Quantity</label>
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+                                <div class="form-row">
+
+                                    <div class="form-group col-md-4">
+                                        <!--  Custom Duty Expenses -->
+                                        <label><?php echo "Custom Duty Expenses($INR)/UOM"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- RMC Including Customers -->
+                                        <label><?php echo "Clearing Charges($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div >
+                                            <?php
+                                            $data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+
+
+
+
+                                    <div class="form-group col-md-4" style="margin-top: -4.0%">
+                                        <!-- RMC Including Customers -->
+                                    <label>
+                                        <?php echo "Nett per UOM($INR)"; ?>
+                                    </label>
+                                    <div >
+                                            <?php
+                                            $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+
+
+                                    <div class="form-group col-md-4">
+                                        
+                                        
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                       
+                                    </div>
+
+
+
+
+                                    <div class="form-group col-md-4" style="display: none">
+                                        <!--  Total Amount: -->
+                                        <label id=labelTotalAmount>Total Amount</label>
+                                    </div>
+                                    <div class="form-group col-md-4" style="display: none">
+                                        <div  style="display: none;">
+                                            <?php
+                                            $data = array('name' => 'TotalExp', 'value' => set_value('TotalExp'), 'id' => 'TotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+
+
                             </div>
+                        </div>
+
+                        <br>
+
+                        <div class="form-row ">
+                            <div class="form-group col-md-12">
+                                <label>Import Description :</label>
+                                <?php
+                                $data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
+                                echo form_textarea($data);
+                                ?>
+                            </div>
+                        </div>
                         
 
                     
                 </div>
+
                 <div class="modal-footer">
                     <a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
+                    &nbsp;&nbsp;&nbsp;&nbsp;
                     <a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Import</span></a>
                 </div>
             </form>
diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php
index 4ed9849e..3f1d9617 100755
--- a/app/Views/editrequisitionform.php
+++ b/app/Views/editrequisitionform.php
@@ -34,7 +34,10 @@ if (!empty($ReqPOType)) {
 	$strReqPOType = $ReqPOType;
 }
 ?>
+
+
 <style>
+
 .btn-soft-primary {
     color: white;
     background-color: rgb(42, 206, 150);
@@ -76,6 +79,11 @@ td {
   width:15%;
 }
 
+.th-Sno{
+  text-align:center !important;
+  width:15%;
+}
+
 </style>
 <script type="text/javascript">
 	window.onload = function() {
@@ -183,7 +191,7 @@ td {
 									<table id="Items" class="table table-striped table-hover mb-0" style="font-size:12px;">
 										<thead>
 											<tr>
-												<th class="th">SNo</th>
+												<th class="th th-Sno" >SNo</th>
 												<th class="th th-materialCode">Material Code</th>
 												<th class="th th-materialName">Material Name</th>
 												<th class="th">Uom</th>
@@ -201,8 +209,8 @@ td {
 													$index = $index + 1;
 													$materialdesc = isset($record->MaterialDescription) ? $record->MaterialDescription : "";
 													//echo $materialdesc;
-											?>
-													<tr  id="<?php echo $index; ?>">
+											?>	
+													<tr id="<?php echo $index; ?>">
 														<td align="center"><?php echo $index; ?></td>
 														<input type="hidden" name="<?php echo 'te' . $index ?>" id="<?php echo 'te' . $index ?>" value="<?php echo $record->MaterialCode; ?>" />
 														<input type="hidden" name="<?php echo 'te' . $index ?>" id="<?php echo 'tes' . $index ?>" value="<?php echo $record->Quantity; ?>" />
diff --git a/deletableFile.php b/deletableFile.php
old mode 100644
new mode 100755
diff --git a/writable/cache/index.html b/writable/cache/index.html
deleted file mode 100755
index b702fbc3..00000000
--- a/writable/cache/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>