From b2b0f86e6070e009e2f89776e06e03e574718066 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Mon, 24 Mar 2025 04:17:37 +0000
Subject: [PATCH 1/5] employee loan balance amount having calculation mismatch
 (0001489)

---
 app/Views/editOldemppay.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/Views/editOldemppay.php b/app/Views/editOldemppay.php
index d2b0d818..f6c765cb 100755
--- a/app/Views/editOldemppay.php
+++ b/app/Views/editOldemppay.php
@@ -48,6 +48,7 @@ $Remaining_Due = '';
 $Paid_Due = '';
 $Paid_Amount = 0;
 $loanid = '';
+$pending_due_amount = 0;
 
 
 if (!empty($emppay)) {
@@ -115,6 +116,7 @@ if (!empty($emppay)) {
         $loanid = $ep->Loan_ID;
         $request_letter = $ep->request_letter;
         $payment_statement = $ep->payment_statement;
+        $pending_due_amount = $Remaining_Due * $Monthly_due;
     }
 }
 
@@ -236,6 +238,12 @@ if (!empty($emppay)) {
                                                                 <input type="text" class="form-control requried num" id="remaining_due" name="remaining_due" value="<?php echo $Remaining_Due; ?>" readonly>
                                                             </div>
                                                         </div>
+                                                        <div class="col-md-3">
+                                                            <div class="form-group">
+                                                                <label for="">Balance Amount</label>
+                                                                <input type="text" class="form-control requried num" id="balance_due_amount" value="<?php echo $pending_due_amount; ?>" readonly>
+                                                            </div>
+                                                        </div>
 
                                                     </div>
 
@@ -434,12 +442,14 @@ if (!empty($emppay)) {
                 Paid_Amount = document.getElementById('Paid_Amount').value;
                 loan = loan - Paid_Amount
                 totalDueAmt = loan / no_of_due;
+                balanceDueAmount = no_of_due * totalDueAmt;
 
 
                 document.getElementById('monthly_due').value = Math.ceil(totalDueAmt);
 
                 document.getElementById('remaining_due').value = Math.ceil(no_of_due);
 
+                document.getElementById('balance_due_amount').value = Math.ceil(balanceDueAmount);
 
 
             }

From 496e840ae290652f9461d092e0731491b7b4b9a4 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Mon, 24 Mar 2025 06:30:39 +0000
Subject: [PATCH 2/5]  Capital PO international - 0001442

---
 app/Views/editCapitalAmendPO.php | 329 ++++++++++++++++---------------
 app/Views/editCapitalPo.php      |  16 +-
 2 files changed, 178 insertions(+), 167 deletions(-)

diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php
index 5c7802b4..47a8be82 100755
--- a/app/Views/editCapitalAmendPO.php
+++ b/app/Views/editCapitalAmendPO.php
@@ -96,7 +96,7 @@ $TotalBasicAmount = 0.0;
 $scopeofwork = '';
 $Import_DispatchDetails = '';
 $Import_PlaceofOrgin = '';
-$CapitalRange = '';
+
 
 $Deliverydt = '';
 $DeliverSchedule = '';
@@ -196,8 +196,8 @@ if (!empty($POMaster)) {
         $PONO = $Req->PONO;
         $scopeofwork = $Req->ServiceDescription;
         //$PayableAT=$Req->PayableAT;
-        $ExchangeRateOn1 = new DateTime($Req->ExchangeRateCalculatedon);
-        $ExchangeRateOn = $ExchangeRateOn1->format('d-m-Y');
+        $Exchangedt = new DateTime($Req->ExchangeRateCalculatedon);
+        $ExchangeRateOn = $Exchangedt->format('d-m-Y');
         // $PaymentDays=$Req->PaymentDays;
         $PaymentOtherDescription = $Req->PaymentOtherDescription;
         $PaymentTerms = $Req->PaymentTerms;
@@ -383,19 +383,16 @@ if (!empty($POItem) && $CapitalRange == '1') {
             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('ExchangeRateModalViewDiv').style.display = 'none';
-            document.getElementById('Deliverydtdiv').style.display = 'none';
+            document.getElementById('ExchangeRateModalViewDiv').style.display = 'none';
+            document.getElementById('ViewModalImportTaxHide').style.display = 'none';
+            document.getElementById('PlaceOforigindiv').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';
@@ -405,14 +402,15 @@ if (!empty($POItem) && $CapitalRange == '1') {
             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('deliverydateby').style.display = 'block';
-            //document.getElementById('ViewModalImportTaxHide').style.display = 'block';
+            document.getElementById('datedomestic').style.display = 'none';
+
         }
     }
 </script>
@@ -647,13 +645,13 @@ 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><span class="text-danger"> * </span>
-
-                                    <?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);
-                                    ?>
-
+                                    <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>
                                 </div>
                                 <div class="form-group col-md-3" id="ExchangeRateDiv" style="display:none;">
                                     <label id="CurrencySymbol">Exchange Rate </label><span class="text-danger"> * </span>
@@ -901,24 +899,16 @@ 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"><?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 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>
 
-                                                        <?php } else if ($CapitalRange == '0') { ?>
-
-                                                            <td style="text-align:right !important">
-                                                                <?php echo number_format(($record->Rate * $record->Quantity), 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 } ?>
                                                         <?php
                                                         $row = array("materialCode" => $record->MaterialCode, "ReqNo" => $record->ReqNo);
@@ -1461,7 +1451,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
                             <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
 
                             <br>
-                            <div class="form-row" id="CAPdiv">
+                            <div id="CAPdiv">
+                            <div class="form-row">
 
                                 <div class="form-group col-md-3">
                                     <label>Total Basic Amount <?php echo "($INR)" ?></label>
@@ -1492,7 +1483,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
                             </div>
-
                             <div class="form-row">
                                 <div class="form-group col-md-3">
                                     <label>IGST <?php echo "($INR)" ?></label>
@@ -1509,8 +1499,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
 
                                 </div>
-
-
                                 <div class="form-group col-md-3">
                                     <label>Total Freight <?php echo "($INR)" ?> </label>
                                     <?php
@@ -1519,12 +1507,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
 
                                 </div>
-
-
-
-
-
-
                                 <div class="form-group col-md-3">
                                     <label>Total Order Value <?php echo "($INR)" ?> </label>
                                     <input type="hidden" name="preServiceTotalorderValue"
@@ -1535,6 +1517,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div></br>
                             </div>
+                            </div>
 
 
 
@@ -1544,15 +1527,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
 
                             <div class="form-row" style="padding:1% 0%;" id="HideImportTaxTotal" style="display:none;">
 
-                                <div class="form-group col-md-3">
-                                    <label>Total Frieght Amount <?php echo "($INR)" ?></label>
-
-                                    <?php
-                                    $data = array('name' => 'txttotalfrieght', 'value' => set_value('txttotalfrieght', $TotalFrieght), 'id' => 'txttotalfrieght', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                                <div class="form-group col-md-3">
+                                <div class="form-group col-md-4">
                                     <label>Total Landing Charge <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1561,7 +1536,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
 
-                                <div class="form-group col-md-3">
+                                <div class="form-group col-md-4">
                                     <label>Total Assessable Value <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1570,7 +1545,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
 
-                                <div class="form-group col-md-3">
+                                <div class="form-group col-md-4">
                                     <label>Total Custom Duty Charge <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1579,25 +1554,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </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">
+                                <div class="form-group col-md-4">
                                     <label>Total Subtotal Charge <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1607,7 +1564,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                 </div>
 
 
-                                <div class="form-group col-md-3">
+                                <div class="form-group col-md-4">
                                     <label>Total IGST <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1616,9 +1573,29 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </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-3">
+
+                                <div class="form-group col-md-4">
                                     <label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1626,6 +1603,14 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     echo form_input($data);
                                     ?>
                                 </div>
+                                <div class="form-group col-md-4">
+                                    <label>Total Frieght Amount <?php echo "($INR)" ?></label>
+
+                                    <?php
+                                    $data = array('name' => 'txttotalfrieght', 'value' => set_value('txttotalfrieght', $TotalFrieght), 'id' => 'txttotalfrieght', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
 
 
 
@@ -1650,7 +1635,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                               </div>
                                 </div>  -->
 
-                                <div class="form-group col-md-3">
+                                <div class="form-group col-md-4">
                                     <label id="lbl_international">Total Order Value <?php echo "($INR)" ?> </label>
                                     <input type="hidden" name="preinterTotalorderValue"
                                         value="<?php echo $totalCapitalOrder ?>">
@@ -1818,7 +1803,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                             </form>
                                         </div>
                                         <div class="modal-footer ">
-                                            <a class="btn btn-success" data-dismiss="modal"
+                                            <a class="btn btn-secondary" data-dismiss="modal"
                                                 value="Cancel">Cancel</a>
                                                 &nbsp;&nbsp;
                                             <a class="btn btn-success" ID="editPackagingOption"
@@ -2121,35 +2106,36 @@ if (!empty($POItem) && $CapitalRange == '1') {
 
                                                 </div>
                                                 <div class="form-row" id="EDITCAPdiv3"><!--EDITCAPdiv3 -->
-                                                    <div class="form-group col-md-9" align="right">
+                                                    <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">
-                                                        <?php
+                                                    <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="form-row" id="EDITCAPdiv4" style="display:flex;"><!--EDITCAPdiv4 -->
-                                                    <div class="form-group col-md-9" align="right">
-                                                        <label>Total Order Value <?php echo "($INR)" ?></label>
                                                     </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 id="EditModalImportTaxHide" style="display:none;">
-                                                    <div class="form-row" style="border:solid black 1px; padding:1%;">
-                                                        <div class="form-row" style="padding:1%;">
-                                                            
-                                                            <br/>
-                                                            
+                                                <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 class="form-group col-md-6" style="padding:15px;">
                                                                 <div class="form-row">
                                                                     <div class="form-group col-md-4">
@@ -2442,9 +2428,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                                                 </div>
                                                             </div>
 
-                                                        </div>
-                                                    </div>
-                                                </div>
+                                                </div> <!-- /EditModalImportTaxHide  closed here -->
                                                 <br>
                                                 <div class="form-row" style="text-align: left;">
                                                     <div class="form-group col-md-12">
@@ -2573,6 +2557,10 @@ if (!empty($POItem) && $CapitalRange == '1') {
             $('#ADDCAPdiv2').hide();
             $('#ADDCAPdiv3').hide();
             $('#EDITCAPdiv').hide();
+            $('#EDITCAPdiv').hide();
+            $('#EDITCAPdiv1').hide();
+            $('#EDITCAPdiv2').hide();
+            $('#EDITCAPdiv3').hide();
             // $('#EDITCAPdiv1').hide();
             // $('#EDITCAPdiv2').hide();
             // $('#EDITCAPdiv3').hide();
@@ -3323,7 +3311,7 @@ Calculate Landing charge
         $("#EDITCAPITAL").on("shown.bs.modal", function (e) {
 
 
-
+            
             userid = $(e.relatedTarget).data('userid');
 
 
@@ -3334,6 +3322,24 @@ 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');
@@ -3343,43 +3349,22 @@ 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());
-            $('#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);
-
-
+            $('#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());
 
             $('#drpFreighteditloc').val($('#Ftype' + userid).val());
             $('#NOOfTripslocedit').val($('#NoTrip' + userid).val());
             $('#txtFreightlocedit').val($('#Fvalue' + userid).val());
             $('#txtAfterFreightlocedit').val($('#Afvalue' + userid).val());
 
+
+
             var FreightType = $('#drpFreighteditloc').val();
 
 
@@ -3393,6 +3378,9 @@ Calculate Landing charge
 
 
 
+
+
+
             $('#EditAfterBasicPriceTax').val($('#basicvalInINR' + userid).val());
             $('#EditAfterLandingCharge').val($('#landingCharge' + userid).val());
 
@@ -3407,8 +3395,19 @@ Calculate Landing charge
             $('#EditCustomDutyExpenses').val($('#CustomDutyExpenses' + userid).val());
             //$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val());
 
+            $('#EdittxtTotalOrderValue').val(cellval[10].innerHTML);
 
-            $('#EdittxtTotalOrderValue').val($('#PerKgExpense' + userid).val());
+
+
+            $('#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());
 
             /* get % value */
 
@@ -3418,43 +3417,33 @@ 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 + ')');
-            $("#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());
+            $('#txtEditFreight').val($('#FreightVal' + userid).val());
+            $('#txtEditAfterFreight').val($('#AfterFreightVal' + userid).val());
+            $('#EditNOOfTrips').val($('#NoOfTrip' + userid).val());
+            $("#drpEditFreight").val($('#FreightType' + userid).val());
 
             var FreightType = $('#FreightType' + userid).val();
 
             if (FreightType == "PER TRIP") {
-                $('#AmendTripsValue').show();
+                $('#EditTripsValue').show();
             } else {
-                $('#AmendTripsValue').hide();
+                $('#EditTripsValue').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();
@@ -3462,13 +3451,35 @@ 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 b7c46863..bb79bced 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -1680,7 +1680,7 @@ if (!empty($getlogpodtl)) {
         </form>
       </div>
       <div class="modal-footer" style="border:none;">
-        <a class="btn btn-success" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
+        <a class="btn btn-secondary" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
         <a class="btn btn-success" ID="PackagingOption" onclick="calculateFreightlocaddper();">&nbsp;&nbsp;<span
             class="bold">Ok</span></a>
 
@@ -1712,7 +1712,7 @@ if (!empty($getlogpodtl)) {
         </form>
       </div>
       <div class="modal-footer" style="border:none;">
-        <a class="btn btn-success" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
+        <a class="btn btn-secondary" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
         <a class="btn btn-success" ID="editPackagingOption" onclick="calculateFreightloceditper();">&nbsp;&nbsp;<span
             class="bold">Ok</span></a>
       </div>
@@ -1742,7 +1742,7 @@ if (!empty($getlogpodtl)) {
         </form>
       </div>
       <div class="modal-footer" style="border:none;">
-        <a class="btn btn-success" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
+        <a class="btn btn-secondary" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
         <a class="btn btn-success" ID="viewPackagingOption" onclick="calculateFreightlocviewper();">&nbsp;&nbsp;<span
             class="bold">Ok</span></a>
 
@@ -2421,7 +2421,7 @@ if (!empty($getlogpodtl)) {
           </div>
         </div>
         <div class="modal-footer">
-          <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:20px;">Cancel</a>
+          <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:20px;">Cancel</a>
           <a class="btn btn-success font AddCapital" ID="AddCapital"> &nbsp;&nbsp;<span class="bold">Add
               Capital</span></a>
         </div>
@@ -2745,7 +2745,7 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
+            <diEditOtherAllowancesv 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">
@@ -3072,7 +3072,7 @@ if (!empty($getlogpodtl)) {
           </div><!-- C.Desc -->
         </div><!-- /.body -->
         <div class="modal-footer">
-          <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right: 10px;">Cancel</a>
+          <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right: 10px;">Cancel</a>
           <a class="btn btn-success font EditCapital" ID="UpdateCapital">&nbsp;&nbsp;<span class="bold">Update
               Capital</span></a>
         </div><!-- /.footer -->
@@ -3669,7 +3669,7 @@ if (!empty($getlogpodtl)) {
           </div><!-- form-row capitial Description -->
         </div><!-- modal-body -->
         <div class="modal-footer">
-          <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
+          <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
           <?php if ($CapitalRange == 1 || $CapitalRange == 0) { ?>
             <!-- <a class="btn btn-success font ViewCapital" ID="ViewUpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a> -->
           <?php } ?>
@@ -4254,7 +4254,7 @@ if (!empty($getlogpodtl)) {
           </div>
         </div>
         <div class="modal-footer">
-          <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
+          <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
           <?php if ($CapitalRange == 1 || $CapitalRange == 0) { ?>
             <!-- <a class="btn btn-success font ViewCapital" ID="ViewUpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a> -->
           <?php } ?>

From 170f7ece4cdbe9d59aec898741c22f666d3c90ca Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Mon, 24 Mar 2025 08:41:56 +0000
Subject: [PATCH 3/5] 0001442: again checked

---
 app/Views/editCapitalAmendPO.php | 730 +++++++++++++++----------------
 app/Views/editCapitalPo.php      |  11 +-
 2 files changed, 347 insertions(+), 394 deletions(-)

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 + ')');

From 0493755d64c872a9c405f4bd6b54846c6e52932f Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Mon, 24 Mar 2025 09:52:34 +0000
Subject: [PATCH 4/5] line break For file In PO

---
 app/Views/EditservicePurchaseorder.php | 32 ++++++++------------------
 app/Views/editCapitalPo.php            |  3 +--
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index 78b28659..dd1eb121 100755
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -1619,31 +1619,17 @@ if (!empty($getlogpodtl)) {
 												<label>Select Purchase Order File</label><br>
 												<input type="file" name="POFile" id="POFile">
 											</div>
-									</div>
-
-									<?php if (!empty($PrePOFile)) {
-										$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
-										if (file_exists($PrePOFilePath)) { ?>
-
-											<div class="form-row">
-												<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
-													<br />
-
-													<label><a title="previously uploaded PO File"
-													href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
-															<span>previously uploaded purchase order file- </span>
-															<small><?= $PrePOFile; ?></small></a></label>
-													&nbsp;&nbsp;&nbsp;&nbsp;
-													<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>
-
-													<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
+											<?php if ($PrePOFile) { ?>
+											<div id="deletePreviousPurchaseOrderFileDiv">
+												<div class="form-group col-md-12 px-4">
+												<label for="deletePreviousPurchaseOrderFile"><a title="previously uploaded PO File"
+													href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded purchase order file- </span><small><?= $PrePOFile; ?></small></a></label>
+												&nbsp;&nbsp;&nbsp;&nbsp;
+												<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
 												</div>
 											</div>
-
-										<?php } ?>
-
-
-									<?php } ?>
+											<?php } ?>
+									</div>
 									<!-- ends here -->
 
 
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index 0d890bf3..e1520dd8 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -1569,8 +1569,7 @@ if (!empty($getlogpodtl)) {
                 <div class="form-group col-md-12">
                   <?php if ($PrePOFile) { ?>
                     <label for="deletePreviousPurchaseOrderFile"><a title="previously uploaded PO File"
-                        href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded
-                          - </span><small><?= $PrePOFile; ?></small></a></label>
+                        href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded purchase order file- </span><small><?= $PrePOFile; ?></small></a></label>
                     &nbsp;&nbsp;&nbsp;&nbsp;
                     <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
                   <?php } ?>

From 1354c45d2d0ac91ff8be21d3082d3b1551638390 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Mon, 24 Mar 2025 12:30:28 +0000
Subject: [PATCH 5/5] issues fixes

---
 app/Controllers/Emergencypurchaseorder.php |   4 +-
 app/Controllers/Inwardgateregister.php     |   2 +
 app/Models/Inwardgateregister_model.php    |  11 +
 app/Views/alterpurchaseorder.php           | 612 ++++++++++-----------
 4 files changed, 292 insertions(+), 337 deletions(-)

diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php
index 78b9e3e9..e4e5fdcb 100755
--- a/app/Controllers/Emergencypurchaseorder.php
+++ b/app/Controllers/Emergencypurchaseorder.php
@@ -208,7 +208,9 @@ class Emergencypurchaseorder extends BaseController
         $newPONO = generate_po_number($lastPONO); 
         // PO Master
         $POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'ServiceWorkStatus' => $ServiceWorkStatus, 'POType' => $POType, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => $DescriptionOfPo, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder);
-        $file = $this->request->getFile('POFile');
+        $file = null;
+        if($POType == "SERVICE"){ $file = $this->request->getFile('ServiceFile');}
+        if($POType == "REVENUE"){ $file = $this->request->getFile('RevenueFile');}
         if($file !== null){
         $requestfilename = $file->getName();    
         if (!empty($requestfilename)) {
diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php
index 92c925fb..a680ad47 100755
--- a/app/Controllers/Inwardgateregister.php
+++ b/app/Controllers/Inwardgateregister.php
@@ -1442,6 +1442,8 @@ function updateIGRWeight(){
             if ($value1 != $value && $key1 == $key) {
                 $value = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value) : $value;
                 $value1 = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value1) : $value1;
+                $value = ($key1 == "TransporterId") ? $this->inwardgateregister_model->get_TransporterId($value) : $value;
+                $value1 = ($key1 == "TransporterId") ? $this->inwardgateregister_model->get_TransporterId($value1) : $value1;
                 // Store each changed field in an array
                 $history_entries[] = [
                     'field' => $key1,
diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php
index 74ab8b73..57eba79c 100755
--- a/app/Models/Inwardgateregister_model.php
+++ b/app/Models/Inwardgateregister_model.php
@@ -1361,5 +1361,16 @@ $builder = $this->db->table('t_igr_history')
         return $StatusName; 
 	}
 
+	public function get_TransporterId($value){
+		$builder = $this->db->table('t_transporter')
+                    ->select('id,name')
+                    ->where('id', $value);
+
+        $query = $builder->get()->getRow(); 
+
+        $transportername = $query ? $query->name : null; 
+        return $transportername; 
+	}
+
 		 
 }  
\ No newline at end of file
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index 90d8379b..01011b4b 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -3049,7 +3049,7 @@ if (!empty($INRSYMBOL)) {
                                                     <label>
                                                         Select Purchase Order File
                                                     </label><br>
-                                                    <input type="file" name="POFiles" id="POFiles"><br>
+                                                    <input type="file" name="RevenueFile" id="RevenueFile"><br>
                                                 </div>
                                             </div>
 
@@ -3155,7 +3155,7 @@ if (!empty($INRSYMBOL)) {
                                                     <label>
                                                         Select Purchase Order File
                                                     </label><br>
-                                                    <input type="file" name="POFile" id="POFile"><br>
+                                                    <input type="file" name="ServiceFile" id="ServiceFile"><br>
                                                 </div>
                                             </div>
 
@@ -5208,6 +5208,7 @@ if (!empty($INRSYMBOL)) {
 
         </div>
     </div>
+
     <!-- Modal for CST Calculation -->
     <div class="modal fade" id="CSTCalModel" role="dialog">
         <div class="modal-dialog">
@@ -5240,335 +5241,281 @@ if (!empty($INRSYMBOL)) {
 
         </div>
     </div>
-    <!-- Edit Service Modal content-->
-    <div class="modal fade" id="EDITSERVICE" role="dialog" style="overflow-y:scroll !important">
-        <div class="modal-dialog">
-            <!-- Modal content-->
-            <form>
-                <div class="modal-content" style="width:1000px;">
-                    <div class="modal-header">
 
-                        <center>
-                            <h4>Edit Service Purchase Order Item </h4>
-                        </center>
-                    </div>
-                    <div class="modal-body p-4">
+                            <!-- Edit Service Modal content-->
+                            <div align="center">
+                                <div class="modal fade" id="EDITSERVICE" role="dialog">
+                                    <div class="modal-dialog">
+                                        <!-- Modal content-->
+                                        <form>
+                                            <div class="modal-content" style="width:1060px;">
+                                                <div class="modal-header">
+                                                    <center>
+                                                        <h4>Edit Service Purchase Order Item </h4>
+                                                    </center>
+                                                    <button type="button" class="close" data-dismiss="modal"
+                                                        aria-label="Close">
+                                                        <span aria-hidden="true">&times;</span>
+                                                    </button>
+                                                </div>
 
-                        <div class="row">
-                            <div class="col-md-3">
-                                <label>Req No<span class="badge mandatory">*</span></label>
-                                <div>
-                                    <?php
+                                                <div align="left" style="padding: 31px;">
 
-                                    $data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo', 'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
+                                                    <div class="row">
+                                                            <div class="col-md-3">
+                                                                <label>Req No<span class="badge mandatory">*</span></label>
+                                                                <div>
+                                                                    <?php
 
-                                </div>
-                            </div>
+                                                                    $data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo', 'class' => 'form-control', 'readonly' => 'true');
+                                                                    echo form_input($data);
+                                                                    ?>
 
-                            <div class="col-md-3">
-                                <label>Department Name</label>
-                                <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName', 'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <label>Cost Center Code</label>
-                                <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter', 'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="col-md-3" style="display:none;">
-                                <label>Available Budget Amount</label><img id="AlertImg"
-                                    src="<?php echo base_url(); ?>public/assets/dist/img/red.png" alt="your image"
-                                    width="25px" style="display:none;" />
-                                <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt', 'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_hidden($data);
-                                    ?>
-                                </div>
-                            </div>
-
-                        </div>
-                        <div class="row">
-                            <div class="col-md-3">
-                                <label>Item Code<span class="badge mandatory">*</span></label>
-                                <div>
-                                    <?php
-                                    $options = array("0" => 'Item Code');
-                                    //print_r(  $options);
-                                    
-                                    echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
-
-                                    ?>
-                                </div>
-                            </div>
-
-                            <div class="col-md-3">
-                                <label>Item Name</label>
-                                <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName', 'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <label>UOM</label>
-                                <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM', 'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <label>Frequency</label>
-                                <div class="form-group">
-
-                                    <?php
-                                    $data = array('name' => 'EditFrequencyChange', 'value' => set_value('EditFrequencyChange'), 'id' => 'EditFrequencyChange', 'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <!-- <div class="col-md-12">
-                                                <div class="col-md-4" id="EditDisplayScheduleDiv" style="display:none;">
-                                                         <label>Select Service Schedule Type</label>
-                                                            <div class="form-group">
-                                                                 <?php
-                                                                 $Schdule = array("One Time", "Recurring");
-
-
-                                                                 if (!empty($Schdule)) {
-                                                                     foreach ($Schdule as $Sch):
-
-                                                                         $SchType[$Sch] = $Sch;
-
-                                                                     endforeach;
-                                                                 }
-                                                                 echo form_dropdown('EditScheduleType', $SchType, set_value('EditScheduleType'), 'id="EditScheduleType"', 'class = "form-control"');
-
-                                                                 ?>  
+                                                                </div>
                                                             </div>
-                                                         </div>
-                                                    <div class="col-md-4" id="EditServicePeriodOption" style="display:none;">
-                                                         <label>Select Service Period Option</label>
-                                                            <div class="form-group">
-                                                                 <?php
-
-
-
-                                                                 if (!empty($ServiceOption)) {
-                                                                     foreach ($ServiceOption as $SerOption):
-
-
-                                                                         $ServiceOptions[$SerOption->ConfigValue] = $SerOption->ConfigValue;
-                                                                     endforeach;
-                                                                 }
-                                                                 echo form_dropdown('EditServiceOptions', $ServiceOptions, set_value('EditServiceOptions'), 'id="EditServiceOptions"', 'class = "form-control"');
-
-                                                                 ?>  
+                                                            <div class="col-md-3">
+                                                                <label>Department Name</label>
+                                                                <div class="form-group">
+                                                                    <?php
+                                                                    $data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName', 'class' => 'form-control', 'readonly' => 'true');
+                                                                    echo form_input($data);
+                                                                    ?>
+                                                                </div>
                                                             </div>
-                                                         </div>
-                                                          <div class="col-md-4" id="EditNoServices" style="display:none;">
-                                                         <label>Number of Services</label>
-                                                            <div class="form-group">
-                                                                 <?php
-
-                                                                 $data = array('name' => 'EditServiceNo', 'value' => set_value('EditServiceNo'), 'id' => 'EditServiceNo', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
-                                                                 echo form_input($data);
-                                                                 ?>
+                                                            <div class="col-md-3">
+                                                                <label>Cost Center Code</label>
+                                                                <div class="form-group">
+                                                                    <?php
+                                                                    $data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter', 'class' => 'form-control', 'readonly' => 'true');
+                                                                    echo form_input($data);
+                                                                    ?>
+                                                                </div>
                                                             </div>
-                                                         </div>
-                                                </div> -->
-                        <div class="row">
+                                                            <div class="col-md-3" style="display:none;">
+                                                                <label>Available Budget Amount</label><img id="AlertImg"
+                                                                    src="<?php echo base_url(); ?>public/assets/dist/img/red.png" alt="your image"
+                                                                    width="25px" style="display:none;" />
+                                                                <div class="form-group">
+                                                                    <?php
+                                                                    $data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                    echo form_hidden($data);
+                                                                    ?>
+                                                                </div>
+                                                            </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col-md-3">
+                                                            <label>Item Code<span class="badge mandatory">*</span></label>
+                                                            <div>
+                                                                <?php
+                                                                $options = array("0" => 'Item Code');
+                                                                //print_r(  $options);
+                                                                
+                                                                echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
 
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <label>Item Name</label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName', 'class' => 'form-control', 'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <label>UOM</label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM', 'class' => 'form-control', 'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <label>Frequency</label>
+                                                            <div class="form-group">
 
-                            <div class="col-md-3">
-                                <label>Quantity<span class="badge mandatory">*</span></label>
-                                <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
-                                    echo form_input($data);
-                                    ?>
+                                                                <?php
+                                                                $data = array('name' => 'EditFrequencyChange', 'value' => set_value('EditFrequencyChange'), 'id' => 'EditFrequencyChange', 'class' => 'form-control', 'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col-md-3">
+                                                            <label>Quantity<span class="badge mandatory">*</span></label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <label>Per</label> <?php
+                                                            $data = array('name' => 'EditEmergPer', 'value' => set_value('EditEmergPer'), 'id' => 'EditEmergPer', 'class' => 'form-control');
+                                                            echo form_input($data); ?>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <label><?php echo "Basic Amount In ($INRSYM)"; ?></label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col-md-6" align="right">
+
+                                                            CGST In %
+                                                        </div>
+
+                                                        <div class="col-md-3">
+                                                            <div class="form-group">
+
+                                                                <?php
+                                                                $data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <div class="form-group">
+
+                                                                <?php
+                                                                $data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+
+                                                        </div>
+
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col-md-6" align="right">
+
+                                                            SGST In %
+                                                        </div>
+
+                                                        <div class="col-md-3">
+                                                            <div class="form-group">
+
+                                                                <?php
+                                                                $data = array('name' => 'EditSgst', 'value' => set_value('EditSgst', 0), 'id' => 'EditSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <div class="form-group">
+
+                                                                <?php
+                                                                $data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst', 0), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+
+                                                        </div>
+
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col-md-6" align="right">
+
+                                                            IGST In %
+                                                        </div>
+
+                                                        <div class="col-md-3">
+                                                            <div class="form-group">
+
+                                                                <?php
+                                                                $data = array('name' => 'EditIgst', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <div class="form-group">
+
+                                                                <?php
+                                                                $data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                                <input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo"
+                                                                    value="EditFrequencyNo" />
+                                                            </div>
+
+                                                        </div>
+
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col-md-9" align="right">
+                                                            <label>Other Allowances <?php echo "($INRSYM)" ?></label>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances', 0), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col-md-9" align="right">
+                                                            <label> <?php echo "Total Order Amount In ($INRSYM)"; ?></label>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row" style="padding: 0px 30px 10px 30px;">
+                                                        <div class="col-md-12">
+                                                            <label>Service Description<span class="badge mandatory">*</span></label>
+                                                            <?php
+                                                            $data = array('name' => 'EdittxtSpcialInstructionSingle', 'value' => set_value('EdittxtSpcialInstructionSingle'), 'id' => 'EdittxtSpcialInstructionSingle', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+                                                            echo form_textarea($data); ?>
+                                                        </div>
+                                                    </div>
+                                                    <input type="hidden" id="hiddenServiceuserid" name="hiddenServiceuserid" />
+                                                    
+                                                    <div class="modal-footer">
+                                                        <a class="btn btn-secondary" data-dismiss="modal" value="Cancel">Cancel</a>
+                                                        &nbsp;&nbsp;&nbsp;&nbsp;
+                                                        <a class="btn btn-success font EditService" ID="Edit"> &nbsp;&nbsp;<span class="bold">Update Service</span></a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </form>
+
+                                    </div>
                                 </div>
                             </div>
-                            <div class="col-md-3">
-                                <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
-                                <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <label>Per</label> <?php
-                                $data = array('name' => 'EditEmergPer', 'value' => set_value('EditEmergPer'), 'id' => 'EditEmergPer', 'class' => 'form-control');
-                                echo form_input($data); ?>
-                            </div>
-                            <div class="col-md-3">
-                                <label><?php echo "Basic Amount In ($INRSYM)"; ?></label>
-                                <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue', 'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-6" align="right">
-
-                                CGST In %
-                            </div>
-
-                            <div class="col-md-3">
-                                <div class="form-group">
-
-                                    <?php
-                                    $data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-
-                                    <?php
-                                    $data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                            </div>
-
-                        </div>
-                        <div class="row">
-                            <div class="col-md-6" align="right">
-
-                                SGST In %
-                            </div>
-
-                            <div class="col-md-3">
-                                <div class="form-group">
-
-                                    <?php
-                                    $data = array('name' => 'EditSgst', 'value' => set_value('EditSgst', 0), 'id' => 'EditSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-
-                                    <?php
-                                    $data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst', 0), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                            </div>
-
-                        </div>
-                        <div class="row">
-                            <div class="col-md-6" align="right">
-
-                                IGST In %
-                            </div>
-
-                            <div class="col-md-3">
-                                <div class="form-group">
-
-                                    <?php
-                                    $data = array('name' => 'EditIgst', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-
-                                    <?php
-                                    $data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                    <input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo"
-                                        value="EditFrequencyNo" />
-                                </div>
-
-                            </div>
-
-                        </div>
-                        <div class="row">
-                            <div class="col-md-9" align="right">
-                                <label>Other Allowances <?php echo "($INRSYM)" ?></label>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances', 0), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-9" align="right">
-                                <label> <?php echo "Total Order Amount In ($INRSYM)"; ?></label>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <?php
-                                    $data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row" style="padding: 0px 30px 10px 30px;">
-                            <div class="col-md-12">
-                                <label>Service Description<span class="badge mandatory">*</span></label>
-                                <?php
-                                $data = array('name' => 'EdittxtSpcialInstructionSingle', 'value' => set_value('EdittxtSpcialInstructionSingle'), 'id' => 'EdittxtSpcialInstructionSingle', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-                                echo form_textarea($data); ?>
-                            </div>
-                        </div>
-                        <input type="hidden" id="hiddenServiceuserid" name="hiddenServiceuserid" />
 
 
-
-
-
-                        <div class="modal-footer">
-                            <div class="col-md-12 text-right">
-                                <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-                                <a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span
-                                        class="bold">Update Service</span></a>
-                            </div>
-                        </div>
-                    </div>
-            </form>
-
-        </div>
-    </div>
-</div>
 <!-- Edit Revenue Modal -->
 <div align="center">
     <div id="EDITREVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
@@ -5584,7 +5531,7 @@ if (!empty($INRSYMBOL)) {
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                             <span aria-hidden="true">&times;</span>
                         </button>
-                    </div>
+                    </div><!-- modal header -->
                     <div class="modal-body p-4" align="left">
                         <!-- first row -->
                         <div class="row">
@@ -5975,7 +5922,7 @@ if (!empty($INRSYMBOL)) {
                             </div>
                         </div>
 
-                    </div>
+                    </div><!-- /.modal-body -->
                     <input type="hidden" id="hiddenRevenueuserid" name="hiddenRevenueuserid" />
 
                     <!-- footer for revenue po -->
@@ -5985,27 +5932,18 @@ if (!empty($INRSYMBOL)) {
                             <a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit
                                     Revenue</span></a>
                         </div>
-                    </div>
+                    </div><!-- /.modal-footer -->
                 </div>
-        </div>
-
+        
+            </form><!-- /.modal-content -->
+        </div><!-- /.dialogModal  -->
     </div>
 </div>
-</div>
-
-
-
-</form>
-</div>
-
-</form>
-</div>
-</div>
 
 
 
 
-</div>
+<!-- </div>
 
 
 </form>
@@ -6016,7 +5954,7 @@ if (!empty($INRSYMBOL)) {
 
 </div>
 
-</div>
+</div> -->
 
 <!-- </section> -->
 <!-- <script type="text/html" id="RevenueList">
@@ -7392,6 +7330,7 @@ if (!empty($INRSYMBOL)) {
                 $('#PoTypeOptions').focus();
                 return false;
             } else {
+                // console.log("Data :", Object.fromEntries(formData));return;
                 // Submit the form using AJAX
                 $('#loader').show();
                 // disableButtons();
@@ -7485,7 +7424,8 @@ if (!empty($INRSYMBOL)) {
                 formData.append(inputName, file); // Append the file to FormData
             }
         });
-
+        console.log("Data before AJAX call:", Object.fromEntries(formData));
+return;
 
         // Perform form validation
         if (validate()) {
@@ -7503,7 +7443,7 @@ if (!empty($INRSYMBOL)) {
                 return false;
             } else {
                 // Submit the form using AJAX
-
+                // console.log("Data :", Object.fromEntries(formData));return;
              $('#loader').show();
                 $.ajax({
                     url: "<?php echo base_url() ?>emergencypurchaseorder/addNewRevenuePurchaseOrder",