diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php
index 47a8be82..86f8dcf1 100755
--- a/app/Views/editCapitalAmendPO.php
+++ b/app/Views/editCapitalAmendPO.php
@@ -4,7 +4,7 @@
 		align-items: center;
 		gap: 10px;
 	}
-
+    $CapitalRange
 	.edit-input-field {
 		padding: 2px;
 		font-size: 14px;
@@ -96,7 +96,7 @@ $TotalBasicAmount = 0.0;
 $scopeofwork = '';
 $Import_DispatchDetails = '';
 $Import_PlaceofOrgin = '';
-
+$CapitalRange = '';
 
 $Deliverydt = '';
 $DeliverSchedule = '';
@@ -131,7 +131,7 @@ $PayableAT = '';
 $ExchangeDate = '';
 $ExchangeRateOn = '';
 $UpdatedOn;
-$CapitalRange = '';
+
 $PoStatusName = '';
 $ModeOfShipment = '';
 $SupplierReference = '';
@@ -203,7 +203,7 @@ if (!empty($POMaster)) {
         $PaymentTerms = $Req->PaymentTerms;
         //echo $PaymentTerms;
         $UpdatedOn = $Req->UpdatedOn;
-        $CapitalRange = $Req->CapitalRange;
+
         $Import_DispatchDetails = $Req->Import_DispatchDetails;
         $Import_PlaceofOrgin = $Req->Import_PlaceofOrgin;
         $CapitalRange = $Req->CapitalRange;
@@ -377,40 +377,44 @@ if (!empty($POItem) && $CapitalRange == '1') {
     var capitalType = '';
     window.onload = function () {
         var CapRan = '<?php echo $CapitalRange; ?>';
+
         if (CapRan == '1') {
 
             document.getElementById('FromOnline').style.display = 'none';
             document.getElementById('ExchangeRateOnDiv').style.display = 'none';
             document.getElementById('ExchangeRateDiv').style.display = 'none';
             document.getElementById('currencyTypeDiv').style.display = 'none';
-            document.getElementById('ExchangeRateModalDiv').style.display = 'none';
+            //document.getElementById('ExchangeRateModalDiv').style.display = 'none';
             document.getElementById('ExchangeRateModalEditDiv').style.display = 'none';
             document.getElementById('HideImportTaxTotal').style.display = 'none';
-            document.getElementById('ModalImportTaxHide').style.display = 'none';
+            // document.getElementById('ModalImportTaxHide').style.display = 'none';
             document.getElementById('EditModalImportTaxHide').style.display = 'none';
-            document.getElementById('ExchangeRateModalViewDiv').style.display = 'none';
-            document.getElementById('ViewModalImportTaxHide').style.display = 'none';
-            document.getElementById('PlaceOforigindiv').style.display = 'none';
+            // document.getElementById('ExchangeRateModalViewDiv').style.display = 'none';
+            //document.getElementById('ViewModalImportTaxHide').style.display = 'none';
+            //document.getElementById('ExchangeRateModalViewDiv').style.display = 'none';
+            document.getElementById('Deliverydtdiv').style.display = 'none';
             document.getElementById('dispatchinternational').style.display = 'none';
+            document.getElementById('placeoforgin').style.display = 'none';
             document.getElementById('datedomestic').style.display = 'block';
+            //document.getElementById('deliverydateby').style.display = 'none';
 
 
             capitalType = 'Domestic';
 
         } else {
+            
             document.getElementById('FromOnline').style.display = 'block';
             document.getElementById('ExchangeRateOnDiv').style.display = 'block';
             document.getElementById('ExchangeRateDiv').style.display = 'block';
             document.getElementById('currencyTypeDiv').style.display = 'block';
-            document.getElementById('ExchangeRateModalDiv').style.display = 'block';
+            //document.getElementById('ExchangeRateModalDiv').style.display = 'block';
             document.getElementById('ExchangeRateModalEditDiv').style.display = 'block';
-            document.getElementById('ExchangeRateModalViewDiv').style.display = 'block';
+            //document.getElementById('ExchangeRateModalViewDiv').style.display = 'block';
             capitalType = 'International';
             document.getElementById('currencyTypeDiv').style.display = 'block';
-            document.getElementById('ViewModalImportTaxHide').style.display = 'block';
             document.getElementById('dispatchinternational').style.display = 'block';
-            document.getElementById('datedomestic').style.display = 'none';
-
+            //document.getElementById('deliverydateby').style.display = 'block';
+            //document.getElementById('ViewModalImportTaxHide').style.display = 'block';
         }
     }
 </script>
@@ -645,13 +649,16 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                         target="_blank"><u>(Click here)</u></a>
                                 </div>
                                 <div class="form-group col-md-3" id="ExchangeRateOnDiv" style="display:none;">
-                                    <label>Exchange Rate On</label>
-                                    <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num date-picker-common', 'required' => 'true', 'onkeypress' => 'return false;');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
+                                    <label>Exchange Rate On</label><span class="text-danger"> * </span>
+                                    <?php
+                                    $data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num date-picker-common', 'required' => 'true', 'onkeypress' => 'return false;');
+                                    echo form_input($data);
+                                    ?>
+                                    <!-- <?php
+                                    // $data = array('type' => 'date', 'name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+                                    // echo form_input($data);
+                                    ?> -->
+
                                 </div>
                                 <div class="form-group col-md-3" id="ExchangeRateDiv" style="display:none;">
                                     <label id="CurrencySymbol">Exchange Rate </label><span class="text-danger"> * </span>
@@ -899,16 +906,24 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                                         <td style="text-align:right !important">
                                                             <?php echo number_format($record->Rate * $record->Quantity, 2, '.', ''); ?>
                                                         </td>
+                                                        <td style="text-align:right !important"><?php if ($CapitalRange == '1') {
+                                                            echo $record->ServiceTaxamount;
+                                                        } else if ($CapitalRange == '0') {
+                                                            echo "0.0";
+                                                        } ?></td>
+
                                                         <?php if ($CapitalRange == '1') { ?>
-                                                            <td style="text-align:right !important"><?php echo $record->ServiceTaxamount; ?></td>
-                                                            <td style="text-align:right !important">CapitalRange
-                                                            <?php echo number_format($record->Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?>
+
+                                                            <!-- <td style="text-align:right"><?php echo $record->TotalValue + $record->Afvalue; ?></td> -->
+
+                                                            <td style="text-align:right !important"><?php echo number_format($record->Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?>
                                                             </td>
 
-                                                        <?php } ?>
-                                                        <?php if ($CapitalRange == '0') { ?>
-                                                            <td style="text-align:right !important"><?php echo '0'; ?></td>
-                                                            <td style="text-align:right !important"><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
+                                                        <?php } else if ($CapitalRange == '0') { ?>
+
+                                                            <td style="text-align:right !important">
+                                                                <?php echo number_format(($record->Rate * $record->Quantity), 2, '.', ''); ?>
+                                                                </td>
                                                         <?php } ?>
                                                         <?php
                                                         $row = array("materialCode" => $record->MaterialCode, "ReqNo" => $record->ReqNo);
@@ -1452,158 +1467,85 @@ if (!empty($POItem) && $CapitalRange == '1') {
 
                             <br>
                             <div id="CAPdiv">
-                            <div class="form-row">
+                                <div class="form-row">
 
-                                <div class="form-group col-md-3">
-                                    <label>Total Basic Amount <?php echo "($INR)" ?></label>
-                                    <?php
-                                    $data = array('name' => 'txtTotalBasic', 'value' => set_value('txtTotalBasic', number_format($FinalTotalBasic, 2, '.', '')), 'id' => 'txtTotalBasic', 'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
+                                    <div class="form-group col-md-3">
+                                        <label>Total Basic Amount <?php echo "($INR)" ?></label>
+                                        <?php
+                                        $data = array('name' => 'txtTotalBasic', 'value' => set_value('txtTotalBasic', number_format($FinalTotalBasic, 2, '.', '')), 'id' => 'txtTotalBasic', 'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                    <div class="form-group col-md-3">
+                                        <label>Total Discount Amount <?php echo "($INR)" ?></label>
+                                        <?php
+                                        $data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', number_format($TotalDiscountedAmt, 2, '.', '')), 'id' => 'txtTotalDiscount', 'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                    <div class="form-group col-md-3">
+                                        <label>CGST <?php echo "($INR)" ?></label>
+                                        <?php
+                                        $data = array('name' => 'txtTotCgst', 'value' => set_value('txtTotCgst', number_format($TotalCGST, 2, '.', '')), 'id' => 'txtTotCgst', 'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                    <div class="form-group col-md-3">
+                                        <label>SGST <?php echo "($INR)" ?></label>
+                                        <?php
+                                        $data = array('name' => 'txtTotSgst', 'value' => set_value('txtTotSgst', number_format($TotalSGST, 2, '.', '')), 'id' => 'txtTotSgst', 'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
                                 </div>
-                                <div class="form-group col-md-3">
-                                    <label>Total Discount Amount <?php echo "($INR)" ?></label>
-                                    <?php
-                                    $data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', number_format($TotalDiscountedAmt, 2, '.', '')), 'id' => 'txtTotalDiscount', 'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-3">
+                                        <label>IGST <?php echo "($INR)" ?></label>
+                                        <?php
+                                        $data = array('name' => 'txtTotIgst', 'value' => set_value('txtTotIgst', number_format($TotalIGST, 2, '.', '')), 'id' => 'txtTotIgst', 'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                    <div class="form-group col-md-3" style="padding: 0px;">
+                                        <label>Other Allowances <?php echo "($INR)" ?> </label>
+                                        <?php
+                                        $data = array('name' => 'TotalOtherAllowances', 'value' => set_value('TotalOtherAllowances', number_format($Totalotherallowances, 2, '.', '')), 'id' => 'TotalOtherAllowances', 'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+
+                                    </div>
+
+
+                                    <div class="form-group col-md-3">
+                                        <label>Total Freight <?php echo "($INR)" ?> </label>
+                                        <?php
+                                        $data = array('name' => 'TotalFreight', 'value' => set_value('TotalFreight', number_format($TotalFreightvalue, 2, '.', '')), 'id' => 'TotalFreight', 'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+
+                                    </div>
+
+
+
+
+
+
+                                    <div class="form-group col-md-3">
+                                        <label>Total Order Value <?php echo "($INR)" ?> </label>
+                                        <input type="hidden" name="preServiceTotalorderValue"
+                                            value="<?php echo $totalCapitalOrder ?>">
+                                        <?php
+                                        $data = array('name' => 'Totalservicesummary', 'value' => set_value('Totalservicesummary', number_format($totalCapitalOrder, 2, '.', '')), 'id' => 'Totalservicesummary', 'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div></br>
                                 </div>
-                                <div class="form-group col-md-3">
-                                    <label>CGST <?php echo "($INR)" ?></label>
-                                    <?php
-                                    $data = array('name' => 'txtTotCgst', 'value' => set_value('txtTotCgst', number_format($TotalCGST, 2, '.', '')), 'id' => 'txtTotCgst', 'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <label>SGST <?php echo "($INR)" ?></label>
-                                    <?php
-                                    $data = array('name' => 'txtTotSgst', 'value' => set_value('txtTotSgst', number_format($TotalSGST, 2, '.', '')), 'id' => 'txtTotSgst', 'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-3">
-                                    <label>IGST <?php echo "($INR)" ?></label>
-                                    <?php
-                                    $data = array('name' => 'txtTotIgst', 'value' => set_value('txtTotIgst', number_format($TotalIGST, 2, '.', '')), 'id' => 'txtTotIgst', 'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                                <div class="form-group col-md-3" style="padding: 0px;">
-                                    <label>Other Allowances <?php echo "($INR)" ?> </label>
-                                    <?php
-                                    $data = array('name' => 'TotalOtherAllowances', 'value' => set_value('TotalOtherAllowances', number_format($Totalotherallowances, 2, '.', '')), 'id' => 'TotalOtherAllowances', 'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <label>Total Freight <?php echo "($INR)" ?> </label>
-                                    <?php
-                                    $data = array('name' => 'TotalFreight', 'value' => set_value('TotalFreight', number_format($TotalFreightvalue, 2, '.', '')), 'id' => 'TotalFreight', 'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <label>Total Order Value <?php echo "($INR)" ?> </label>
-                                    <input type="hidden" name="preServiceTotalorderValue"
-                                        value="<?php echo $totalCapitalOrder ?>">
-                                    <?php
-                                    $data = array('name' => 'Totalservicesummary', 'value' => set_value('Totalservicesummary', number_format($totalCapitalOrder, 2, '.', '')), 'id' => 'Totalservicesummary', 'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div></br>
-                            </div>
-                            </div>
-
-
-
-
-
-
+                            </div><!-- /.Domestic total section -->
 
                             <div class="form-row" style="padding:1% 0%;" id="HideImportTaxTotal" style="display:none;">
 
-                                <div class="form-group col-md-4">
-                                    <label>Total Landing Charge <?php echo "($INR)" ?></label>
-
-                                    <?php
-                                    $data = array('name' => 'txttotallanding', 'value' => set_value('txttotallanding', $TotalLanding), 'id' => 'txttotallanding', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                                <div class="form-group col-md-4">
-                                    <label>Total Assessable Value <?php echo "($INR)" ?></label>
-
-                                    <?php
-                                    $data = array('name' => 'txttotalAssessable', 'value' => set_value('txttotalAssessable', $totassesable), 'id' => 'txttotalAssessable', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                                <div class="form-group col-md-4">
-                                    <label>Total Custom Duty Charge <?php echo "($INR)" ?></label>
-
-                                    <?php
-                                    $data = array('name' => 'txttotalcustom', 'value' => set_value('txttotalcustom', $totcustom), 'id' => 'txttotalcustom', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                                <div class="form-group col-md-4">
-                                    <label>Total Subtotal Charge <?php echo "($INR)" ?></label>
-
-                                    <?php
-                                    $data = array('name' => 'txttotalSubtotal', 'value' => set_value('txttotalSubtotal', $totSubtotal), 'id' => 'txttotalSubtotal', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-
-                                <div class="form-group col-md-4">
-                                    <label>Total IGST <?php echo "($INR)" ?></label>
-
-                                    <?php
-                                    $data = array('name' => 'txttotalIgst', 'value' => set_value('txttotalIgst', $totigst), 'id' => 'txttotalIgst', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                                <div class="form-group col-md-4">
-                                    <label>Total Custom ED_cess Charge <?php echo "($INR)" ?></label>
-
-                                    <?php
-                                    $data = array('name' => 'txttotalcustomED', 'value' => set_value('txttotalcustomED', $totcustomED), 'id' => 'txttotalcustomED', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                                <div class="form-group col-md-4">
-                                    <label>Total Custom S & H cess Charge <?php echo "($INR)" ?></label>
-
-                                    <?php
-                                    $data = array('name' => 'txttotalcustomSH', 'value' => set_value('txttotalcustomSH', $totcustomSH), 'id' => 'txttotalcustomSH', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                               
-
-
-
-                                <div class="form-group col-md-4">
-                                    <label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
-
-                                    <?php
-                                    $data = array('name' => 'txttotalgrossduty', 'value' => set_value('txttotalgrossduty', $totgrossduty), 'id' => 'txttotalgrossduty', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                                <div class="form-group col-md-4">
+                                <div class="form-group col-md-3">
                                     <label>Total Frieght Amount <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1612,13 +1554,77 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
 
+                                <div class="form-group col-md-3">
+                                    <label>Total Landing Charge <?php echo "($INR)" ?></label>
 
+                                    <?php
+                                    $data = array('name' => 'txttotallanding', 'value' => set_value('txttotallanding', $TotalLanding), 'id' => 'txttotallanding', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
 
+                                <div class="form-group col-md-3">
+                                    <label>Total Assessable Value <?php echo "($INR)" ?></label>
 
+                                    <?php
+                                    $data = array('name' => 'txttotalAssessable', 'value' => set_value('txttotalAssessable', $totassesable), 'id' => 'txttotalAssessable', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
 
+                                <div class="form-group col-md-3">
+                                    <label>Total Custom Duty Charge <?php echo "($INR)" ?></label>
 
+                                    <?php
+                                    $data = array('name' => 'txttotalcustom', 'value' => set_value('txttotalcustom', $totcustom), 'id' => 'txttotalcustom', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
 
+                                <div class="form-group col-md-3">
+                                    <label>Total Custom ED_cess Charge <?php echo "($INR)" ?></label>
 
+                                    <?php
+                                    $data = array('name' => 'txttotalcustomED', 'value' => set_value('txttotalcustomED', $totcustomED), 'id' => 'txttotalcustomED', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                                <div class="form-group col-md-3">
+                                    <label>Total Custom S & H cess Charge <?php echo "($INR)" ?></label>
+
+                                    <?php
+                                    $data = array('name' => 'txttotalcustomSH', 'value' => set_value('txttotalcustomSH', $totcustomSH), 'id' => 'txttotalcustomSH', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                                <div class="form-group col-md-3">
+                                    <label>Total Subtotal Charge <?php echo "($INR)" ?></label>
+
+                                    <?php
+                                    $data = array('name' => 'txttotalSubtotal', 'value' => set_value('txttotalSubtotal', $totSubtotal), 'id' => 'txttotalSubtotal', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                                <div class="form-group col-md-3">
+                                    <label>Total IGST <?php echo "($INR)" ?></label>
+
+                                    <?php
+                                    $data = array('name' => 'txttotalIgst', 'value' => set_value('txttotalIgst', $totigst), 'id' => 'txttotalIgst', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                                <div class="form-group col-md-3">
+                                    <label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
+
+                                    <?php
+                                    $data = array('name' => 'txttotalgrossduty', 'value' => set_value('txttotalgrossduty', $totgrossduty), 'id' => 'txttotalgrossduty', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
 
                                 <!-- <div align="right" style="padding-right:10px">
 
@@ -1635,7 +1641,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                               </div>
                                 </div>  -->
 
-                                <div class="form-group col-md-4">
+                                <div class="form-group col-md-3">
                                     <label id="lbl_international">Total Order Value <?php echo "($INR)" ?> </label>
                                     <input type="hidden" name="preinterTotalorderValue"
                                         value="<?php echo $totalCapitalOrder ?>">
@@ -1645,10 +1651,9 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
 
+                            
+                            </div><!-- /.Internation total section -->
 
-
-
-                            </div>
                             <div class="form-row">
                                 <div class="form-group col-md-12">
                                     <label>Special Instructions </label> <?php
@@ -1656,7 +1661,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     echo form_textarea($data);
                                     ?>
                                 </div>
-                            </div>
+                            </div><!-- /.Special Instructions section -->
 
                             <!-- Start po file changes as per edit page -->
                             <div class="form-row">
@@ -1690,7 +1695,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
 
 
 							<?php } ?>
-                            <!-- ends here -->
+                            <!-- /.file section -->
 
                             <!-- for button -->
                             <div class="form-row">
@@ -1714,7 +1719,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
 
                                 </div>
                             </div>
-                            <!-- end button --> 
+                            <!-- /.button section --> 
 
                             <div class="form-row">
                                 <div class="form-group col-md-12">
@@ -1747,19 +1752,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
 
                                 </div>
                             </div>
-                         
-
-                            <div class="form-row">
-                                <div align="right">
-                                    <!-- <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a>  -->
-                                </div>
-                                <br>
-                            </div>
-
-
-
-
-
+                            <!-- /.Status details section --> 
 
                         </div> <!-- end card body-->
                     </div> <!-- end card -->
@@ -1803,7 +1796,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                             </form>
                                         </div>
                                         <div class="modal-footer ">
-                                            <a class="btn btn-secondary" data-dismiss="modal"
+                                            <a class="btn btn-success" data-dismiss="modal"
                                                 value="Cancel">Cancel</a>
                                                 &nbsp;&nbsp;
                                             <a class="btn btn-success" ID="editPackagingOption"
@@ -2029,113 +2022,111 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                                         </div>
                                                     </div>
 
-                                                </div>
-
-                                                <div class="form-row" id="EDITCAPdiv1"><!--EDITCAPdiv1 -->
+                                                    <div class="form-row">
 
 
 
-                                                    <div class="form-group col-md-6" align="right">
-                                                    <label for="">  CGST In % </label>
-                                                    
-                                                    </div>
+                                                        <div class="form-group col-md-6" align="right">
+                                                        <label for="">  CGST In % </label>
+                                                        
+                                                        </div>
 
-                                                    <div class="form-group col-md-3">
+                                                        <div class="form-group col-md-3">
 
-                                                        <?php
-                                                        $data = array('name' => 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'ChangeEditSgst();EditRatechange();', 'onkeypress' => 'return isNumberKey(event);');
-                                                        echo form_input($data);
-                                                        ?>
+                                                            <?php
+                                                            $data = array('name' => 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'ChangeEditSgst();EditRatechange();', 'onkeypress' => 'return isNumberKey(event);');
+                                                            echo form_input($data);
+                                                            ?>
+
+                                                        </div>
+
+                                                        <div class="form-group col-md-3">
+
+                                                            <?php
+                                                            $data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+
+                                                        </div>
+
+
+                                                        <div class="form-group col-md-6" align="right">
+                                                        <label for="">  SGST In % </label>
+                                                        
+                                                        </div>
+                                                        <div class="form-group col-md-3">
+
+                                                            <?php
+                                                            $data = array('name' => 'EditSgst', 'value' => set_value('EditSgst'), 'id' => 'EditSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                            echo form_input($data);
+                                                            ?>
+
+                                                        </div>
+                                                        <div class="form-group col-md-3">
+
+                                                            <?php
+                                                            $data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+
+                                                        </div>
 
                                                     </div>
+                                                
+                                                    <div class="form-row">
+                                                        <div class="form-group col-md-6" align="right">
+                                                        <label for=""> IGST In %</label>
+                                                        
+                                                        </div>
 
-                                                    <div class="form-group col-md-3">
+                                                        <div class="form-group col-md-3">
 
-                                                        <?php
-                                                        $data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
+                                                            <?php
+                                                            $data = array('name' => 'EditIgst', 'value' => set_value('EditIgst'), 'id' => 'EditIgst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                            echo form_input($data);
+                                                            ?>
+
+                                                        </div>
+                                                        <div class="form-group col-md-3">
+
+                                                            <?php
+                                                            $data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst'), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+
+                                                        </div>
 
                                                     </div>
+                                                
+                                                    <div class="form-row">
+                                                        <div class="form-group col-md-9" align="right">
+                                                            <label>Other Allowances <?php echo "($INR)" ?></label>
+                                                        </div>
 
-
-                                                    <div class="form-group col-md-6" align="right">
-                                                    <label for="">  SGST In % </label>
-                                                    
-                                                    </div>
-                                                    <div class="form-group col-md-3">
-
-                                                        <?php
-                                                        $data = array('name' => 'EditSgst', 'value' => set_value('EditSgst'), 'id' => 'EditSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                                        echo form_input($data);
-                                                        ?>
-
-                                                    </div>
-                                                    <div class="form-group col-md-3">
-
-                                                        <?php
-                                                        $data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-
+                                                        <div class="form-group col-md-3">
+                                                            <?php
+                                                            $data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
                                                     </div>
 
-                                                </div>
-                                                <div class="form-row" id="EDITCAPdiv2"><!--EDITCAPdiv2 -->
-                                                    <div class="form-group col-md-6" align="right">
-                                                    <label for=""> IGST In %</label>
-                                                    
-                                                    </div>
-
-                                                    <div class="form-group col-md-3">
-
-                                                        <?php
-                                                        $data = array('name' => 'EditIgst', 'value' => set_value('EditIgst'), 'id' => 'EditIgst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                                        echo form_input($data);
-                                                        ?>
+                                                    <div class="form-row" style="display:flex;">
+                                                        <div class="form-group col-md-9" align="right">
+                                                            <label>Total Order Value <?php echo "($INR)" ?></label>
+                                                        </div>
 
+                                                        <div class="form-group col-md-3">
+                                                            <?php
+                                                            $data = array('name' => 'Editservicetotalordervaue', 'value' => set_value('Editservicetotalordervaue'), 'id' => 'Editservicetotalordervaue', 'class' => 'form-control num', 'readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
                                                     </div>
-                                                    <div class="form-group col-md-3">
-
-                                                        <?php
-                                                        $data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst'), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-
-                                                    </div>
-
-                                                </div>
-                                                <div class="form-row" id="EDITCAPdiv3"><!--EDITCAPdiv3 -->
-                                                    <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
-                                                        <label>Other Allowances <?php echo "($INR)" ?></label>
-                                                    </div>
-
-                                                    <div class="form-group col-md-3">
-                                                    <div class="form-group">                                                        <?php
-                                                        $data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                    </div>
-                                                    <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
-                                                    <label>Total Amount <?php echo "($INR)" ?></label>
-                                                    </div>
-                                                    <div class="form-group col-md-3">
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'Editservicetotalordervaue', 'value' => set_value('Editservicetotalordervaue'), 'id' => 'Editservicetotalordervaue', 'class' => 'form-control num', 'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                    </div>
-                                                </div>
-                                                <div class="form-row" id="EDITCAPdiv3"><!--EDITCAPdiv3 -->
-                                                </div><!-- /.C.D3-->
-                                                <div class="form-row" style="padding:1%;"></div><!-- /.layer-->
-                                                <div class="form-row" style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide"
-                                                style="display:none;">
-                                                <br />
-                                                                                                                
+                                                </div><!-- /.Domestic Modal Editable-->
+                                                <div class="form-row" style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide" style="display:none;">
+                                                <br/>
+                                                            
                                                             <div class="form-group col-md-6" style="padding:15px;">
                                                                 <div class="form-row">
                                                                     <div class="form-group col-md-4">
@@ -2251,8 +2242,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                                                     </div>
                                                                 </div>
                                                             </div>
-
-
                                                             <div class="form-group col-md-6" style="padding:15px;">
                                                                 <div class="form-row">
                                                                     <div class="form-group col-md-4">
@@ -2428,7 +2417,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                                                 </div>
                                                             </div>
 
-                                                </div> <!-- /EditModalImportTaxHide  closed here -->
+                                                </div><!-- /.Internation Modal Editable -->
+
                                                 <br>
                                                 <div class="form-row" style="text-align: left;">
                                                     <div class="form-group col-md-12">
@@ -2552,22 +2542,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
         var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
         if (capital == 0) {
             $('#CAPdiv').hide();
-            $('#ADDCAPdiv').hide();
-            $('#ADDCAPdiv1').hide();
-            $('#ADDCAPdiv2').hide();
-            $('#ADDCAPdiv3').hide();
             $('#EDITCAPdiv').hide();
-            $('#EDITCAPdiv').hide();
-            $('#EDITCAPdiv1').hide();
-            $('#EDITCAPdiv2').hide();
-            $('#EDITCAPdiv3').hide();
-            // $('#EDITCAPdiv1').hide();
-            // $('#EDITCAPdiv2').hide();
-            // $('#EDITCAPdiv3').hide();
-            // $('#VIEWCAPdiv').hide();
-            // $('#VIEWCAPdiv1').hide();
-            // $('#VIEWCAPdiv2').hide();
-            // $('#VIEWCAPdiv3').hide();
             //$('#DOMdiv').hide();
         }
 
@@ -3311,7 +3286,7 @@ Calculate Landing charge
         $("#EDITCAPITAL").on("shown.bs.modal", function (e) {
 
 
-            
+
             userid = $(e.relatedTarget).data('userid');
 
 
@@ -3322,24 +3297,6 @@ Calculate Landing charge
             var cellval = tr.cells;
 
             var id = $('#Reqnumber' + userid).val();
-
-            $('#EditReqnumber').val($('#Reqnumber' + userid).val());
-            $('#EditCapitalDepartmentName').val($('#departmentName' + userid).val());
-            $("#EditCostCenter").val($('#CPCostCode' + userid).val());
-            $('#EditCapitalbudAmt').val(parseFloat($('#AvilBudget' + userid).val()).toFixed(2));
-            $('#EditExchangeRtModal').val($('#echangeRate' + userid).val());
-
-            $('#EditCapitalItemName').val($('#materialName' + userid).val());
-
-            $('#EditCPUOM').val($('#uom' + userid).val());
-            $('#EditPer').val($('#per' + userid).val());
-            $('#EditAmendPer').val($('#per' + userid).val()); // refer this
-            $('#EditCPQuantity').val($('#quantity' + userid).val());
-            $('#EditCPRate').val($('#rateInUs' + userid).val());
-
-            $('#EditCPTotalAmount').val(parseFloat($('#basicval' + userid).val()).toFixed(2));
-
-
             var disc = $('#DisType' + userid).val();
             if (disc != 'NIL') {
                 //alert('removed');
@@ -3349,22 +3306,43 @@ Calculate Landing charge
                 $('#txtEditDiscount').attr('readonly', true);
             }
 
+            $('#EditReqnumber').val($('#Reqnumber' + userid).val());
+
+            $('#EditCapitalDepartmentName').val($('#departmentName' + userid).val());
+            $("#EditCostCenter").val($('#CPCostCode' + userid).val());
+            $('#EditCapitalbudAmt').val($('#AvilBudget' + userid).val());
+            $('#EditExchangeRtModal').val($('#echangeRate' + userid).val());
+
+            $('#EditCapitalItemName').val($('#materialName' + userid).val());
+            $('#Edittxtservicedescription').val($('#ServiceMaterialDescription' + userid).val());
+            $('#EditFrequency').val($('#frequency' + userid).val());
+
+            $('#EditCPUOM').val($('#uom' + userid).val());
+            $('#EditAmendPer').val($('#per' + userid).val());
+            $('#EditCPQuantity').val($('#quantity' + userid).val());
+            $('#EditCPRate').val(parseFloat($('#rateInUs' + userid).val()).toFixed(2));
+
+            $('#EditCPTotalAmount').val(parseFloat($('#basicval' + userid).val()).toFixed(2));
+
             RequistQuantity = $('#quantity' + userid).val();
-            $('#EditCgst').val($('#Cgst' + userid).val());
-            $('#EditSgst').val($('#Sgst' + userid).val());
-            $('#EditIgst').val($('#Igst' + userid).val());
-            $('#EditAfterCgst').val($('#AfterCgst' + userid).val());
-            $('#EditAfterSgst').val($('#AfterSgst' + userid).val());
-            $('#EditAfterIgst').val($('#AfterIgst' + userid).val());
-            $('#EditOtherAllowances').val($('#OtherAmt' + userid).val());
+            $('#EditCgst').val($('#CGST' + userid).val());
+            $('#EditAfterCgst').val($('#afterCGST' + userid).val());
+            $('#EditSgst').val($('#SGST' + userid).val());
+            $('#EditAfterSgst').val($('#afterSGST' + userid).val());
+            $('#EditIgst').val($('#IGST' + userid).val());
+            $('#EditAfterIgst').val($('#afterIGST' + userid).val());
+            $('#EditOtherAllowances').val($('#otherallowance' + userid).val());
+            //$('#Editservicetotalordervaue').val($('#totalservicevalue'+userid).val());
+
+            $('#Editservicetotalordervaue').val(cellval[9].innerHTML);
+
+
 
             $('#drpFreighteditloc').val($('#Ftype' + userid).val());
             $('#NOOfTripslocedit').val($('#NoTrip' + userid).val());
             $('#txtFreightlocedit').val($('#Fvalue' + userid).val());
             $('#txtAfterFreightlocedit').val($('#Afvalue' + userid).val());
 
-
-
             var FreightType = $('#drpFreighteditloc').val();
 
 
@@ -3378,9 +3356,6 @@ Calculate Landing charge
 
 
 
-
-
-
             $('#EditAfterBasicPriceTax').val($('#basicvalInINR' + userid).val());
             $('#EditAfterLandingCharge').val($('#landingCharge' + userid).val());
 
@@ -3395,19 +3370,8 @@ Calculate Landing charge
             $('#EditCustomDutyExpenses').val($('#CustomDutyExpenses' + userid).val());
             //$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val());
 
-            $('#EdittxtTotalOrderValue').val(cellval[10].innerHTML);
 
-
-
-            $('#EditAfterAssessable').val($("#AssessableValue" + userid).val());
-            $('#EditSubtotal').val($("#SubTotal" + userid).val());
-            $('#EditIgstInt').val($("#IGSTInt" + userid).val());
-            // alert("Fetched the value GST"+$("#IGSTInt" + userid).val());
-            $('#EditAfterIgstInt').val($("#AfterIGSTInt" + userid).val());
-            // alert("Fetched the value IGST"+$("#AfterIGSTInt" + userid).val());
-            $('#EditDutyImpact').val($("#DutyImpact" + userid).val());
-            $('#EditNett').val($("#NetValue" + userid).val());
-            $('#EditClearingCharges').val($("#ClearingCharge" + userid).val());
+            $('#EdittxtTotalOrderValue').val($('#PerKgExpense' + userid).val());
 
             /* get % value */
 
@@ -3417,33 +3381,43 @@ Calculate Landing charge
 
             $('#EditCustomEDcess').val($('#beforeCustomEDCess' + userid).val());
             $('#EditCustomSHcess').val($('#beforeCustomSHCess' + userid).val());
-            $('#EditAdditionalExciseduty').val($('#beforeAdditionalExciseDuty' + userid).val());
+
             $('#EditPurQuantity').val($('#PurQuantity' + userid).val());
 
+
+
+
+            $('#EditAfterAssessable').val($("#AssessableValue" + userid).val());
+            $('#EditSubtotal').val($("#SubTotal" + userid).val());
+            $('#EditIgstInt').val($("#IGSTInt" + userid).val());
+            $('#EditAfterIgstInt').val($("#AfterIGSTInt" + userid).val());
+            $('#EditDutyImpact').val($("#DutyImpact" + userid).val());
+            $('#EditNett').val($("#NetValue" + userid).val());
+            $('#EditClearingCharges').val($("#ClearingCharge" + userid).val());
+
+
+
+
+
             var EditUOM = $('#uom' + userid).val();
             $('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EditUOM + ')');
             $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EditUOM + ')');
-            $('#txtEditFreight').val($('#FreightVal' + userid).val());
-            $('#txtEditAfterFreight').val($('#AfterFreightVal' + userid).val());
-            $('#EditNOOfTrips').val($('#NoOfTrip' + userid).val());
-            $("#drpEditFreight").val($('#FreightType' + userid).val());
+            $("#EditDiscountType").val($('#DisType' + userid).val());
+            $('#txtEditDiscount').val($('#DisVal' + userid).val());
+            $('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
+            tinyMCE.get('EditItemDescription').setContent($('#CapitalItemDescrition' + userid).val());
+            $('#AmendtxtFreight').val($('#FreightVal' + userid).val());
+            $('#AmendtxtAfterFreight').val($('#AfterFreightVal' + userid).val());
+            $('#AmendNOOfTrips').val($('#NoOfTrip' + userid).val());
+            $("#drpamendFreight").val($('#FreightType' + userid).val());
 
             var FreightType = $('#FreightType' + userid).val();
 
             if (FreightType == "PER TRIP") {
-                $('#EditTripsValue').show();
+                $('#AmendTripsValue').show();
             } else {
-                $('#EditTripsValue').hide();
+                $('#AmendTripsValue').hide();
             }
-
-            $("#EditDiscountType").val($('#DisType' + userid).val());
-            $('#txtEditDiscount').val($('#DisVal' + userid).val());
-            $('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
-
-            tinyMCE.get('EditItemDescription').setContent($('#CapitalItemDescrition' + userid).val());
-
-
-
             var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
 
             $("#EditMaterialCode").empty();
@@ -3451,35 +3425,13 @@ Calculate Landing charge
             $("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
 
             for (i = 0; i < Material.length; i++) {
-                $.each(Material[i], function(idx, obj) {
-                if (obj.MaterialCode != $('#materialCode' + userid).val()) {
-                    $("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+                $.each(Material[i], function (idx, obj) {
+                    if (obj.MaterialCode != $('#materialCode' + userid).val()) {
+                        $("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
 
-                }
+                    }
                 });
             }
-
-            $('#Edittxtservicedescription').val($('#ServiceMaterialDescription' + userid).val());
-            $('#EditFrequency').val($('#frequency' + userid).val());
-
-            //old
-            $('#Editservicetotalordervaue').val(cellval[9].innerHTML);
-            $('#EdittxtTotalOrderValue').val($('#PerKgExpense' + userid).val()); 
-
-            /* get % value */
-            $('#AmendtxtFreight').val($('#FreightVal' + userid).val());
-            $('#AmendtxtAfterFreight').val($('#AfterFreightVal' + userid).val());
-            $('#AmendNOOfTrips').val($('#NoOfTrip' + userid).val());
-            $("#drpamendFreight").val($('#FreightType' + userid).val());
-
-            
-
-            if (FreightType == "PER TRIP") {
-                $('#AmendTripsValue').show();
-            } else {
-                $('#AmendTripsValue').hide();
-            }
-            
             $('#EditLandingCharge').attr("style", "pointer-events: none;");
             $('#EditHighseas').attr("style", "pointer-events: none;");
             $('#EditCustomduty').attr("style", "pointer-events: none;");
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index bb79bced..0d890bf3 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -2745,7 +2745,7 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <diEditOtherAllowancesv class="col-md-9 col-md-offset-4" style="text-align:right !important">
+            <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
               <label>Total Amount <?php echo "($INR)" ?></label>
             </div>
             <div class="form-group col-md-3">
@@ -2758,7 +2758,7 @@ if (!empty($getlogpodtl)) {
             </div>
           </div><!-- /.C.D3-->
           <div class="form-row" style="padding:1%;"></div><!-- /.layer-->
-          <div class="form-row" style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide"
+          <div class="form-row" style="border:1px solid #000;padding:0px;" id="ViewModalImportTaxHide"
             style="display:none;">
             <br />
             <div class="form-group col-md-6" style="padding:10px;">
@@ -4548,7 +4548,7 @@ if (!empty($getlogpodtl)) {
               $("#CPRate").val(obj.material_rate);
               RequistQuantity = obj.Quantity;
 
-              var CPUOMDisplay = obj.UOM;
+              var CPUOMDisplay = obj.UOM ? obj.UOM : '';
 
               $('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
               $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
@@ -4608,7 +4608,7 @@ if (!empty($getlogpodtl)) {
               $("#EditUOM").val(obj.UOM);
               $("#EditQuantity").val(obj.Quantity);
               RequistQuantity = obj.Quantity;
-              var CPUOMDisplay = obj.UOM;
+              var CPUOMDisplay = obj.UOM ? obj.UOM : '';
 
               $('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
               $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
@@ -6508,7 +6508,8 @@ if (!empty($getlogpodtl)) {
           if (obj.MaterialCode === id) {
             $("#EditCapitalItemName").val(obj.MaterialName);
             $("#EditCPUOM").val(obj.UOM);
-            var EDITUOMDisplay = obj.UOM;
+            var EDITUOMDisplay = obj.UOM ? obj.UOM : '';
+
             $("#EditCPQuantity").val(obj.Quantity);
             RequistQuantity = obj.Quantity;
             $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EDITUOMDisplay + ')');