diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php
index 0a36e987..f26c702a 100755
--- a/app/Views/capitalpurchaseorder.php
+++ b/app/Views/capitalpurchaseorder.php
@@ -124,6 +124,7 @@ if (!empty($INRSYMBOL)) {
         height: 10vh;
     }
 
+
     .centered label,
     .centered input {
         margin: 0 5px;
@@ -914,21 +915,23 @@ if (!empty($INRSYMBOL)) {
         </div>
     </div>
 </div><!-- /.modal -->
+
+<div align="center">
 <div id="CAPITAL" class="modal fade" tabindex="-1" role="dialog"
     aria-labelledby="myModalLabel" aria-hidden="true" style="display: none; overflow-y:scroll !important">
     <div class="modal-dialog modal-full-width">
-        <div class="modal-content">
+        <div class="modal-content" style="width: 1060px;">
             <div class="modal-header">
                 <h4 class="modal-title">Add Capital Purchase Order Item</h4>
                 <button type="button" class="close" data-dismiss="modal"
                     aria-hidden="true">×</button>
             </div>
             <form>
-                <div class="modal-body p-4">
+                <div class="modal-body p-4 " align="left">
 
 
                     <div class="form-row">
-                        <div class="form-group col-md-2">
+                        <div class="form-group col-md-3">
                             <label>Req No<span class="text-danger">*</span></label>
                             <?php
                             $RL = array("0" => 'Select Req No');
@@ -940,7 +943,7 @@ if (!empty($INRSYMBOL)) {
                             echo form_dropdown('Reqnumber', $RL, set_value('Reqnumber'), 'id="Reqnumber" class="form-control select2 required"');
                             ?>
                         </div>
-                        <div class="form-group col-md-2">
+                        <div class="form-group col-md-3">
                             <label>Department Name</label>
                             <div>
                                 <?php
@@ -949,7 +952,7 @@ if (!empty($INRSYMBOL)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="form-group col-md-2">
+                        <div class="form-group col-md-3">
                             <label>Cost Center Code</label>
                             <div>
                                 <?php
@@ -960,14 +963,14 @@ if (!empty($INRSYMBOL)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="form-group col-md-2">
+                        <div class="form-group col-md-3">
                             <label>Avail Bud Amount <?php echo "($INR)" ?></label>
                             <?php
                             $data = array('name' => 'CapitalbudAmt', 'value' => set_value('CapitalbudAmt'), 'id' => 'CapitalbudAmt',  'class' => 'form-control num', 'readonly' => 'true');
                             echo form_input($data);
                             ?>
                         </div>
-                        <div class="form-group col-md-2" id="hideModalExchange">
+                        <div class="form-group col-md-3" id="hideModalExchange">
                             <label> Exchange Rate</label>
                             <?php
                             $data = array('name' => 'ExchangeRtModal', 'value' => set_value('ExchangeRtModal'), 'id' => 'ExchangeRtModal',  'class' => 'form-control num', 'readonly' => 'true');
@@ -977,7 +980,7 @@ if (!empty($INRSYMBOL)) {
                     </div>
 
                     <div class="form-row" style="padding: 0px;">
-                        <div class="form-group col-md-2">
+                        <div class="form-group col-md-3">
                             <label>Item Code<span class="text-danger">*</span></label>
                             <div>
                                 <?php
@@ -986,7 +989,7 @@ if (!empty($INRSYMBOL)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="form-group col-md-2">
+                        <div class="form-group col-md-3">
                             <label>Item Name</label>
                             <div>
                                 <?php
@@ -995,7 +998,7 @@ if (!empty($INRSYMBOL)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="form-group col-md-1">
+                        <div class="form-group col-md-3">
                             <label>UOM</label>
                             <div>
                                 <?php
@@ -1004,7 +1007,7 @@ if (!empty($INRSYMBOL)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="form-group col-md-2">
+                        <div class="form-group col-md-3">
                             <label>Quantity<span class="text-danger">*</span></label>
                             <div>
                                 <?php
@@ -1013,25 +1016,34 @@ if (!empty($INRSYMBOL)) {
                                 ?>
                             </div>
                         </div>
-                        <div class="form-group col-md-2" style="padding-right: 0px;">
-                            <label id="RateIn">Rate(INR /UOM)</label><span class="text-danger">*</span>
-                            <?php
-                            $data = array('name' => 'CPRate', 'value' => set_value('CPRate'), 'id' => 'CPRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();calculateFreight(3);calculateFreightlocaddper()');
-                            echo form_input($data);
-                            ?>
-                        </div>
-                        <div class="form-group col-md-1">
-                            <label>Per</label> <?php
-                                                $data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer',  'class' => 'form-control');
-                                                echo form_input($data); ?>
-                        </div>
-                        <div class="form-group col-md-2">
-                            <label id="TotalAmount">Basic value <?php echo "($INR)" ?></label>
-                            <?php
-                            $data = array('name' => 'CPTotalAmount', 'value' => set_value('CPTotalAmount'), 'id' => 'CPTotalAmount',  'class' => 'form-control num', 'readonly' => 'true');
-                            echo form_input($data);
-                            ?>
-                        </div>
+                       
+                    </div>
+
+
+                    <div class="form-row">
+
+                             <div class="form-group col-md-3"></div>
+
+                            <div class="form-group col-md-3" style="padding-right: 0px;">
+                                <label id="RateIn">Rate(INR /UOM)</label><span class="text-danger">*</span>
+                                <?php
+                                $data = array('name' => 'CPRate', 'value' => set_value('CPRate'), 'id' => 'CPRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();calculateFreight(3);calculateFreightlocaddper()');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                            <div class="form-group col-md-3">
+                                <label>Per</label> <?php
+                                                    $data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer',  'class' => 'form-control');
+                                                    echo form_input($data); ?>
+                            </div>
+                            <div class="form-group col-md-3">
+                                <label id="TotalAmount">Basic value <?php echo "($INR)" ?></label>
+                                <?php
+                                $data = array('name' => 'CPTotalAmount', 'value' => set_value('CPTotalAmount'), 'id' => 'CPTotalAmount',  'class' => 'form-control num', 'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+
                     </div>
 
 
@@ -1094,13 +1106,7 @@ if (!empty($INRSYMBOL)) {
                                 echo form_dropdown('drpFreightloc', $options, set_value('drpFreightloc'), 'id="drpFreightloc" class="form-control "');
                                 ?>
                             </div>
-                            <div class="form-group col-md-3" id="TripsValueloc" style="display:none;">
-                                <label>NO Of Trips</label>
-                                <?php
-                                $data = array('name' => 'NOOfTripsloc', 'value' => set_value('NOOfTripsloc'), 'id' => 'NOOfTripsloc',  'class' => 'form-control num', 'onchange' => 'calculateFreightlocaddper(0);');
-                                echo form_input($data);
-                                ?>
-                            </div>
+                          
                             <div class="form-group col-md-3">
                                 <label>Freight Rate </label>
                                 <?php
@@ -1108,7 +1114,7 @@ if (!empty($INRSYMBOL)) {
                                 echo form_input($data);
                                 ?>
                             </div>
-                            <div class="form-group col-md-3" style="padding-left: 15px;">
+                            <div class="form-group col-md-3" >
                                 <label>Freight Amt <?php echo "($INR)"; ?></label>
                                 <?php
                                 $data = array('name' => 'txtAfterFreightloc', 'value' => set_value('txtAfterFreightloc'), 'id' => 'txtAfterFreightloc',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1117,6 +1123,22 @@ if (!empty($INRSYMBOL)) {
                             </div>
 
                         </div>
+
+
+                        <div class="form-row">
+                            <div class="form-group col-md-9"></div>
+                            <div class="form-group col-md-3" id="TripsValueloc" style="display:none;">
+                                <label>NO Of Trips</label>
+                                <?php
+                                $data = array('name' => 'NOOfTripsloc', 'value' => set_value('NOOfTripsloc'), 'id' => 'NOOfTripsloc',  'class' => 'form-control num', 'onchange' => 'calculateFreightlocaddper(0);');
+                                echo form_input($data);
+                                ?>
+                            </div>
+
+                        </div>
+
+
+
                         <div class="form-row">
                             <div class="form-group col-md-6" align="right">
                                 CGST In %
@@ -1459,7 +1481,7 @@ if (!empty($INRSYMBOL)) {
 
 
 
-                    <div class="form-row" style="padding: 0px 30px 10px 30px;    text-align: left;">
+                    <div class="form-row" >
                         <div class="form-group col-md-12">
                             <label>Capital Description </label>
                             <?php
@@ -1481,548 +1503,205 @@ if (!empty($INRSYMBOL)) {
         </div>
     </div>
 </div><!-- /.modal -->
-<div id="EDITCAPITAL" class="modal fade" tabindex="-1" role="dialog"
-    aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-    <div class="modal-dialog modal-full-width">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title">Edit Capital Purchase Order Item</h4>
-                <button type="button" class="close" data-dismiss="modal"
-                    aria-hidden="true">×</button>
-            </div>
-            <form>
-                <div class="modal-body p-4">
-                    <div class="form-row" style="padding:0px;">
+</div>
 
-                        <div class="form-group col-md-2">
-                            <label>Req No<span class="text-danger">*</span></label>
-                            <div>
+<div align="center">
+    <div id="EDITCAPITAL" class="modal fade" tabindex="-1" role="dialog"
+        aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+        <div class="modal-dialog modal-full-width">
+            <div class="modal-content" style="width: 1060px;">
+                <div class="modal-header">
+                    <h4 class="modal-title">Edit Capital Purchase Order Item</h4>
+                    <button type="button" class="close" data-dismiss="modal"
+                        aria-hidden="true">×</button>
+                </div>
+                <form>
+                    <div class="modal-body p-4" align="left">
+                        <div class="form-row" style="padding:0px;">
 
-                                <?php
-                                $RL = array("0" => 'Select Req No');
-                                if (!empty($RequistionDetails)) {
-                                    foreach ($RequistionDetails as $SID) :
-                                        $RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
-                                    endforeach;
-                                }
-
-
-                                $data = array('name' => 'EditReqnumber', 'value' => set_value('EditReqnumber'), 'id' => 'EditReqnumber',  'class' => 'form-control', 'readonly' => 'true');
-                                echo form_input($data);
-
-                                ?>
-
-                            </div>
-                        </div>
-                        <div class="form-group col-md-2">
-                            <label>Department Name</label>
-                            <div>
-                                <?php
-                                $data = array('name' => 'EditCapitalDepartmentName', 'value' => set_value('EditCapitalDepartmentName'), 'id' => 'EditCapitalDepartmentName',  'class' => 'form-control', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-
-
-                        <div class="form-group col-md-2">
-                            <label>Cost Center Code</label>
-                            <div>
-                                <?php
-
-                                $data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
-                                echo form_input($data);
-
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-2"> <label>Avail Bud Amount</label>
-                            <div> <?php $data = array('name' => 'EditCapitalbudAmt', 'value' => set_value('EditCapitalbudAmt'), 'id' => 'EditCapitalbudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);                                                                             ?> </div>
-                        </div>
-
-
-                        <div class="form-group col-md-2" id="hideModalExchangeEdit">
-                            <label> Exchange Rate</label>
-                            <div>
-                                <?php
-                                $data = array('name' => 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-
-                    </div>
-
-                    <div class="form-row" style="padding:0px;">
-                        <div class="form-group col-md-2">
-                            <label>Item Code<span class="text-danger">*</span></label>
-                            <div>
-                                <?php
-                                $options = array("0" => 'Item Code');
-                                echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control select2"');
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-2" style="padding-right:0px;">
-                            <label>Item Name</label>
-                            <div>
-                                <?php
-                                $data = array('name' => 'EditCapitalItemName', 'value' => set_value('EditCapitalItemName'), 'id' => 'EditCapitalItemName',  'class' => 'form-control', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-1">
-                            <label>UOM</label>
-                            <div>
-                                <?php
-                                $data = array('name' => 'EditCPUOM', 'value' => set_value('EditCPUOM'), 'id' => 'EditCPUOM',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-2">
-                            <label>Quantity<span class="text-danger">*</span></label>
-                            <div>
-                                <?php
-                                $data = array('name' => 'EditCPQuantity', 'value' => set_value('EditCPQuantity'), 'id' => 'EditCPQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-2" style="padding-right: 0px;">
-                            <label id="EditRateIn">Rate (In INR/UOM)</label><span class="text-danger">*</span>
-                            <div>
-                                <?php
-                                $data = array('name' => 'EditCPRate', 'value' => set_value('EditCPRate'), 'id' => 'EditCPRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-1">
-                            <label>Per</label> <?php
-                                                $data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
-                                                echo form_input($data); ?>
-                        </div>
-                        <div class="form-group col-md-2">
-                            <label id="EditTotalAmount">Basic value <?php echo "($INR)" ?></label>
-                            <div>
-                                <?php
-                                $data = array('name' => 'EditCPTotalAmount', 'value' => set_value('EditCPTotalAmount'), 'id' => 'EditCPTotalAmount',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div style="padding:5px;" id="EDITCAPdiv">
-                        <div class="form-row"> <!--<div class="form-group col-md-4">
-                                                                                                        </div>-->
                             <div class="form-group col-md-3">
-                            </div>
-                            <div class="form-group col-md-3">
-                                <label>Discount Type </label>
+                                <label>Req No<span class="text-danger">*</span></label>
                                 <div>
+
                                     <?php
-                                    $options = array("0" => 'Select Discount Type');
-                                    //print_r(  $options);
-
-                                    if (!empty($TaxType)) {
-                                        foreach ($TaxType as $SID) :
-
-
-                                            $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
+                                    $RL = array("0" => 'Select Req No');
+                                    if (!empty($RequistionDetails)) {
+                                        foreach ($RequistionDetails as $SID) :
+                                            $RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
                                         endforeach;
                                     }
 
-                                    echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType" class="form-control"');
+
+                                    $data = array('name' => 'EditReqnumber', 'value' => set_value('EditReqnumber'), 'id' => 'EditReqnumber',  'class' => 'form-control', 'readonly' => 'true');
+                                    echo form_input($data);
+
+                                    ?>
+
+                                </div>
+                            </div>
+                            <div class="form-group col-md-3">
+                                <label>Department Name</label>
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'EditCapitalDepartmentName', 'value' => set_value('EditCapitalDepartmentName'), 'id' => 'EditCapitalDepartmentName',  'class' => 'form-control', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+
+
+                            <div class="form-group col-md-3">
+                                <label>Cost Center Code</label>
+                                <div>
+                                    <?php
+
+                                    $data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
+                                    echo form_input($data);
 
                                     ?>
                                 </div>
                             </div>
-                            <div class="form-group col-md-3">
-                                <label>Discount Rate </label>
+                            <div class="form-group col-md-3"> <label>Avail Bud Amount</label>
+                                <div> <?php $data = array('name' => 'EditCapitalbudAmt', 'value' => set_value('EditCapitalbudAmt'), 'id' => 'EditCapitalbudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);                                                                             ?> </div>
+                            </div>
+
+
+                            <div class="form-group col-md-3" id="hideModalExchangeEdit">
+                                <label> Exchange Rate</label>
                                 <div>
                                     <?php
-                                    $data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount(1);', 'style' => 'text-align:right;');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="form-group col-md-3">
-                                <label>Discounted Amt <?php echo "($INR)" ?> </label>
-                                <div>
-                                    <?php
-                                    $data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    $data = array('name' => 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal',  'class' => 'form-control num', 'readonly' => 'true');
                                     echo form_input($data);
                                     ?>
                                 </div>
                             </div>
+
                         </div>
+
+                        <div class="form-row" style="padding:0px;">
+                            <div class="form-group col-md-3">
+                                <label>Item Code<span class="text-danger">*</span></label>
+                                <div>
+                                    <?php
+                                    $options = array("0" => 'Item Code');
+                                    echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control select2"');
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="form-group col-md-3" style="padding-right:0px;">
+                                <label>Item Name</label>
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'EditCapitalItemName', 'value' => set_value('EditCapitalItemName'), 'id' => 'EditCapitalItemName',  'class' => 'form-control', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="form-group col-md-3">
+                                <label>UOM</label>
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'EditCPUOM', 'value' => set_value('EditCPUOM'), 'id' => 'EditCPUOM',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="form-group col-md-3">
+                                <label>Quantity<span class="text-danger">*</span></label>
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'EditCPQuantity', 'value' => set_value('EditCPQuantity'), 'id' => 'EditCPQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            
+                        </div>
+
+
                         <div class="form-row">
-                            <div class="form-group col-md-3" id="TripsValueloceditAfterHide"></div>
-                            <div class="form-group col-md-3">
-                                <label>Freight Type </label>
-                                <?php
-                                $options = array("0" => 'Select Freight Type');
-                                if (!empty($FreightType)) {
-                                    foreach ($FreightType as $SID) :
-                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
-                                    endforeach;
-                                }
-                                echo form_dropdown('drpFreighteditloc', $options, set_value('drpFreighteditloc'), 'id="drpFreighteditloc" class="form-control "');
-                                ?>
-                            </div>
-                            <div class="form-group col-md-3" id="TripsValuelocedit" style="display:none;">
-                                <label>NO Of Trips</label>
-                                <?php
-                                $data = array('name' => 'NOOfTripslocedit', 'value' => set_value('NOOfTripslocedit'), 'id' => 'NOOfTripslocedit',  'class' => 'form-control num', 'onchange' => 'calculateFreightlocaddper(0);');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                            <div class="form-group col-md-3">
-                                <label>Freight Rate </label>
-                                <?php
-                                $data = array('name' => 'txtFreightlocedit', 'value' => set_value('txtFreightlocedit'), 'id' => 'txtFreightlocedit',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightloceditper();');
-                                echo form_input($data);
-                                ?>
-                            </div>
-
-                            <div class="form-group col-md-3" style="padding-left: -2px;">
-                                <label>Freight Amt <?php echo "($INR)"; ?></label>
-                                <?php
-                                $data = array('name' => 'txtAfterFreightlocedit', 'value' => set_value('txtAfterFreightlocedit'), 'id' => 'txtAfterFreightlocedit',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-
-                        </div>
-                        <div class="form-row">
-                            <div class="form-group col-md-6" align="right">
-
-                                CGST In %
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <div>
-
-                                    <?php
-                                    $data = array('name' => 'EditCgst', 'value' => set_value('EditCgst'), '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="form-group col-md-3">
-                                <div>
-
-                                    <?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>
-
-                        </div>
-                        <div class="form-row">
-                            <div class="form-group col-md-6" align="right">
-
-                                SGST In %
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <div>
-
-                                    <?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>
-                            <div class="form-group col-md-3">
-                                <div>
-
-                                    <?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>
-                        <div class="form-row">
-                            <div class="form-group col-md-6" align="right">
-
-                                IGST In %
-                            </div>
-
-                            <div class="form-group col-md-3">
-                                <div>
-
-                                    <?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>
-                            <div class="form-group col-md-3">
-                                <div>
-
-                                    <?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>
-                        <div class="form-row">
-                            <div class="col-md-9 col-md-offset-4" align="right">
-                                <label>Other Allowances <?php echo "($INR)" ?></label>
-                            </div>
-                            <div class="form-group col-md-3">
+                            <div class="form-group col-md-3"></div>
+                            <div class="form-group col-md-3" style="padding-right: 0px;">
+                                <label id="EditRateIn">Rate (In INR/UOM)</label><span class="text-danger">*</span>
                                 <div>
                                     <?php
-                                    $data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                    $data = array('name' => 'EditCPRate', 'value' => set_value('EditCPRate'), 'id' => 'EditCPRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()');
                                     echo form_input($data);
                                     ?>
                                 </div>
                             </div>
-                            <div class="col-md-9 col-md-offset-4" align="right">
-                                <label>Total Amount <?php echo "($INR)" ?></label>
+                            <div class="form-group col-md-3">
+                                <label>Per</label> <?php
+                                                    $data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
+                                                    echo form_input($data); ?>
                             </div>
                             <div class="form-group col-md-3">
+                                <label id="EditTotalAmount">Basic value <?php echo "($INR)" ?></label>
                                 <div>
                                     <?php
-                                    $data = array('name' => 'EdittxtTotalOrderValue', 'value' => set_value('EdittxtTotalOrderValue'), 'id' => 'EdittxtTotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total Order Amount', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                    $data = array('name' => 'EditCPTotalAmount', 'value' => set_value('EditCPTotalAmount'), 'id' => 'EditCPTotalAmount',  'class' => 'form-control num', 'readonly' => 'true');
                                     echo form_input($data);
                                     ?>
                                 </div>
                             </div>
                         </div>
 
-                    </div>
-                    <div class="form-row" style="padding:1%;"></div>
-                    <div class="form-row" style="padding:0px;border:1px solid" id="EditModalImportTaxHide">
-                        <br />
-                        <div class="form-group col-md-6" style="padding:10px;text-align:left;">
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    Basic Price <?php echo "($INR)" ?>
-                                </div>
-                                <div class="form-group col-md-4" style="display:none;">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditBasicPriceTax', 'value' => set_value('EditBasicPriceTax'), 'id' => 'EditBasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    Landing charge <?php echo "($INR)" ?>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    Assessable Value (A)<?php echo "($INR)" ?>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div class="form-group" style="display: none">
-                                        <?php
-                                        $data = array('name' => 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    Custom duty (B)<?php echo "($INR)" ?>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
 
 
+                        <div  id="EDITCAPdiv">
 
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    Custom ED_cess (C)
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    Custom S & H cess (D)
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-6" style="padding:10px;">
-                            <div class="form-row" style="text-align:left;">
-                                <div class="form-group col-md-4">
-                                    Subtotal (E) <?php echo "($INR)  (A+B+C+D)" ?>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div class="form-group" style="display: none;">
-                                        <?php
-                                        $data = array('name' => 'EditAdditionalExciseduty ', 'value' => set_value('EditAdditionalExciseduty'), 'id' => 'EditAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-
-
-
-
-                            <div class="form-row" style="text-align:left;">
-                                <div class="form-group col-md-4">
-                                    <!-- Additional Excise duty : (g) -->
-                                    <!--  <label><?php echo "IGST on (E): (F) ($INR)"; ?></label> -->
-
-                                    IGST on (E): (F)<?php echo "($INR)" ?>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditIgstInt ', 'value' => set_value('EditIgstInt', 0), 'id' => 'EditIgstInt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditAfterIgstInt', 'value' => set_value('EditAfterIgstInt', 0), 'id' => 'EditAfterIgstInt',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-
-
-
-
-
-
-
-
-
-                            <div class="form-row" style="text-align:left;">
-                                <div class="form-group col-md-8">
-                                    Total Duty (G)<?php echo "($INR) (B+C+D+F)" ?>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-
-
-                            <!--Start of Adding of Frieght model-->
-                            <div class="form-row" style="padding:0px;">
+                            <div class="form-row"> <!--<div class="form-group col-md-4">
+                                                                                                            </div>-->
                                 <div class="form-group col-md-3">
                                 </div>
                                 <div class="form-group col-md-3">
-                                    <span>Freight Type </span>
+                                    <label>Discount Type </label>
+                                    <div>
+                                        <?php
+                                        $options = array("0" => 'Select Discount Type');
+                                        //print_r(  $options);
+
+                                        if (!empty($TaxType)) {
+                                            foreach ($TaxType as $SID) :
+
+
+                                                $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+                                            endforeach;
+                                        }
+
+                                        echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType" class="form-control"');
+
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label>Discount Rate </label>
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount(1);', 'style' => 'text-align:right;');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <label>Discounted Amt <?php echo "($INR)" ?> </label>
+                                    <div>
+                                        <?php
+                                        $data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-row">
+                             
+                                <div class="form-group col-md-3" ></div>
+                      
+                                <div class="form-group col-md-3">
+                                    <label>Freight Type </label>
                                     <?php
                                     $options = array("0" => 'Select Freight Type');
                                     if (!empty($FreightType)) {
@@ -2030,138 +1709,506 @@ if (!empty($INRSYMBOL)) {
                                             $options[$SID->ConfigValue] =  $SID->ConfigValue;
                                         endforeach;
                                     }
-                                    echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control"');
+                                    echo form_dropdown('drpFreighteditloc', $options, set_value('drpFreighteditloc'), 'id="drpFreighteditloc" class="form-control "');
                                     ?>
                                 </div>
-                                <div class="form-group col-md-3" id="EditTripsValue" style="display:none;">
-                                    <span>NO Of Trips</span>
+                              
+                                <div class="form-group col-md-3">
+                                    <label>Freight Rate </label>
                                     <?php
-                                    $data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
+                                    $data = array('name' => 'txtFreightlocedit', 'value' => set_value('txtFreightlocedit'), 'id' => 'txtFreightlocedit',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightloceditper();');
                                     echo form_input($data);
                                     ?>
                                 </div>
+
+                                <div class="form-group col-md-3" style="padding-left: -2px;">
+                                    <label>Freight Amt <?php echo "($INR)"; ?></label>
+                                    <?php
+                                    $data = array('name' => 'txtAfterFreightlocedit', 'value' => set_value('txtAfterFreightlocedit'), 'id' => 'txtAfterFreightlocedit',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                            </div>
+
+                            <div class="form-row">
+                                <div class="form-group col-md-9"></div>
+                                <div class="form-group col-md-3" id="TripsValuelocedit" style="display:none;">
+                                    <label>NO Of Trips</label>
+                                    <?php
+                                    $data = array('name' => 'NOOfTripslocedit', 'value' => set_value('NOOfTripslocedit'), 'id' => 'NOOfTripslocedit',  'class' => 'form-control num', 'onchange' => 'calculateFreightlocaddper(0);');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+
+
+                            <div class="form-row">
+                                <div class="form-group col-md-6" align="right">
+
+                                    CGST In %
+                                </div>
+
+                                <div class="form-group col-md-3">
+                                    <div>
+
+                                        <?php
+                                        $data = array('name' => 'EditCgst', 'value' => set_value('EditCgst'), '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="form-group col-md-3">
-                                    <span>Freight Rate </span>
-                                    <?php
-                                    $data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                                <div class="form-group col-md-3" style="padding-left: 0px;">
-                                    <span>Freight Amt <?php echo "($INR)" ?></span>
-                                    <?php
-                                    $data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                            </div>
-                            <!--End of Adding of freight in edit model -->
-
-
-                            <div class="form-row">
-                                <center> <label>Cost of the product Per UOM</label></center>
-                                <hr />
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    Duty Impact
-                                </div>
-                                <div class="form-group col-md-4">
                                     <div>
+
                                         <?php
-                                        $data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4" style="margin-top: -3.1%">
-                                    <span>Quantity</span>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                        $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>
 
                             </div>
                             <div class="form-row">
+                                <div class="form-group col-md-6" align="right">
 
-                                <div class="form-group col-md-4">
-                                    Custom Duty <?php echo "($INR)/UOM" ?>
+                                    SGST In %
                                 </div>
-                                <div class="form-group col-md-4">
-                                </div>
-                                <div class="form-group col-md-4">
+
+                                <div class="form-group col-md-3">
                                     <div>
+
                                         <?php
-                                        $data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                        $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>
+                                <div class="form-group col-md-3">
+                                    <div>
+
+                                        <?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>
                             <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    Clearing Charges<?php echo "($INR)" ?>
+                                <div class="form-group col-md-6" align="right">
+
+                                    IGST In %
                                 </div>
-                                <div class="form-group col-md-4">
+
+                                <div class="form-group col-md-3">
+                                    <div>
+
+                                        <?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>
-                                <div class="form-group col-md-4">
+                                <div class="form-group col-md-3">
+                                    <div>
+
+                                        <?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>
+                            <div class="form-row">
+                                <div class="col-md-9 col-md-offset-4" align="right">
+                                    <label>Other Allowances <?php echo "($INR)" ?></label>
+                                </div>
+                                <div class="form-group col-md-3">
                                     <div>
                                         <?php
-                                        $data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                        $data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
                                         echo form_input($data);
                                         ?>
                                     </div>
                                 </div>
-
-                                <div class="form-group col-md-4">
-                                    <!-- RMC Including Customers -->
-                                    <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                <div class="col-md-9 col-md-offset-4" align="right">
+                                    <label>Total Amount <?php echo "($INR)" ?></label>
                                 </div>
-                                <div class="form-group col-md-4">
-                                </div>
-                                <div class="form-group col-md-4">
+                                <div class="form-group col-md-3">
                                     <div>
                                         <?php
-                                        $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                        $data = array('name' => 'EdittxtTotalOrderValue', 'value' => set_value('EdittxtTotalOrderValue'), 'id' => 'EdittxtTotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total Order Amount', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
                                         echo form_input($data);
                                         ?>
                                     </div>
                                 </div>
+                            </div>
 
+                        </div>
+                        <div class="form-row" style="padding:1%;"></div>
+                        <div class="form-row" style="padding:0px;border:1px solid" id="EditModalImportTaxHide">
+                            <br />
+                            <div class="form-group col-md-6" style="padding:10px;text-align:left;">
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        Basic Price <?php echo "($INR)" ?>
+                                    </div>
+                                    <div class="form-group col-md-4" style="display:none;">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditBasicPriceTax', 'value' => set_value('EditBasicPriceTax'), 'id' => 'EditBasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        Landing charge <?php echo "($INR)" ?>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        Assessable Value (A)<?php echo "($INR)" ?>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div class="form-group" style="display: none">
+                                            <?php
+                                            $data = array('name' => 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        Custom duty (B)<?php echo "($INR)" ?>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        Custom ED_cess (C)
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        Custom S & H cess (D)
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group col-md-6" style="padding:10px;">
+                                <div class="form-row" style="text-align:left;">
+                                    <div class="form-group col-md-4">
+                                        Subtotal (E) <?php echo "($INR)  (A+B+C+D)" ?>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div class="form-group" style="display: none;">
+                                            <?php
+                                            $data = array('name' => 'EditAdditionalExciseduty ', 'value' => set_value('EditAdditionalExciseduty'), 'id' => 'EditAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+
+
+
+                                <div class="form-row" style="text-align:left;">
+                                    <div class="form-group col-md-4">
+                                        <!-- Additional Excise duty : (g) -->
+                                        <!--  <label><?php echo "IGST on (E): (F) ($INR)"; ?></label> -->
+
+                                        IGST on (E): (F)<?php echo "($INR)" ?>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditIgstInt ', 'value' => set_value('EditIgstInt', 0), 'id' => 'EditIgstInt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditAfterIgstInt', 'value' => set_value('EditAfterIgstInt', 0), 'id' => 'EditAfterIgstInt',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+
+
+
+
+
+
+
+
+                                <div class="form-row" style="text-align:left;">
+                                    <div class="form-group col-md-8">
+                                        Total Duty (G)<?php echo "($INR) (B+C+D+F)" ?>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+
+                                <!--Start of Adding of Frieght model-->
+                                <div class="form-row" style="padding:0px;">
+                                    <div class="form-group col-md-3">
+                                    </div>
+                                    <div class="form-group col-md-3">
+                                        <span>Freight Type </span>
+                                        <?php
+                                        $options = array("0" => 'Select Freight Type');
+                                        if (!empty($FreightType)) {
+                                            foreach ($FreightType as $SID) :
+                                                $options[$SID->ConfigValue] =  $SID->ConfigValue;
+                                            endforeach;
+                                        }
+                                        echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control"');
+                                        ?>
+                                    </div>
+                                    <div class="form-group col-md-3" id="EditTripsValue" style="display:none;">
+                                        <span>NO Of Trips</span>
+                                        <?php
+                                        $data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                    <div class="form-group col-md-3">
+                                        <span>Freight Rate </span>
+                                        <?php
+                                        $data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+
+                                    <div class="form-group col-md-3" style="padding-left: 0px;">
+                                        <span>Freight Amt <?php echo "($INR)" ?></span>
+                                        <?php
+                                        $data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+
+                                </div>
+                                <!--End of Adding of freight in edit model -->
+
+
+                                <div class="form-row">
+                                    <center> <label>Cost of the product Per UOM</label></center>
+                                    <hr />
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        Duty Impact
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4" style="margin-top: -3.1%">
+                                        <span>Quantity</span>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+                                <div class="form-row">
+
+                                    <div class="form-group col-md-4">
+                                        Custom Duty <?php echo "($INR)/UOM" ?>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        Clearing Charges<?php echo "($INR)" ?>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group col-md-4">
+                                        <!-- RMC Including Customers -->
+                                        <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+
+
+                                </div>
 
 
                             </div>
 
-
                         </div>
 
-                    </div>
-
-                    <div class="form-row" style="padding: 0px 30px 10px 30px;    text-align: left;">
-                        <div class="form-group col-md-12">
-                            <label>Capital Description </label>
+                        <div class="form-row" >
+                            <div class="form-group col-md-12">
+                                <label>Capital Description </label>
 
 
-                            <?php
-                            $data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-                            echo form_textarea($data); ?>
+                                <?php
+                                $data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+                                echo form_textarea($data); ?>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="modal-footer">
-                    <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin: 10px;">Cancel</a>
-                    <a class="btn btn-success font EditCapital" ID="UpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
-                </div>
-            </form>
+                    <div class="modal-footer">
+                        <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin: 10px;">Cancel</a>
+                        <a class="btn btn-success font EditCapital" ID="UpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
+                    </div>
+                </form>
+            </div>
         </div>
-    </div>
-</div><!-- /.modal -->
+    </div><!-- /.modal -->
+</div>
+
+
 <div class="modal fade" id="DomesticNOT" role="dialog">
     <div class="modal-dialog">
         <!-- Modal content-->
@@ -2202,7 +2249,7 @@ if (!empty($INRSYMBOL)) {
 
 <!-- <script type="text/html" id="CapitalList">
         <tr id="<%=index%>">
-            <td align="left"><%=index%></td>
+            <td align="left"><%=index%></td>    
             <td align="left"><%=ReqNo%></td>
             <td align="left"><%=MaterialCode%></td>
             <td align="left"><%=MaterialName%></td>
@@ -4139,10 +4186,10 @@ if (!empty($INRSYMBOL)) {
 
             if (FreightTypeloc == '<?php echo PERTRIP; ?>') {
                 $('#TripsValuelocedit').show();
-                $('#TripsValueloceditAfterHide').hide();
+               
             } else {
                 $('#TripsValuelocedit').hide();
-                $('#TripsValueloceditAfterHide').show();
+               
             }
 
 
@@ -5659,16 +5706,16 @@ if (!empty($INRSYMBOL)) {
 
         if (FreightType == "PER TRIP") {
             $('#TripsValueloc').show();
-            $(this).parent().removeClass('col-md-3').addClass('col-md-2');
-            $('#NOOfTripsloc').parent().removeClass('col-md-3').addClass('col-md-2');
-            $('#txtFreightloc').parent().removeClass('col-md-3').addClass('col-md-2');
-            $('#txtAfterFreightloc').parent().removeClass('col-md-3').addClass('col-md-2');
+            // $(this).parent().removeClass('col-md-3').addClass('col-md-2');
+            // $('#NOOfTripsloc').parent().removeClass('col-md-3').addClass('col-md-2');
+            // $('#txtFreightloc').parent().removeClass('col-md-3').addClass('col-md-2');
+            // $('#txtAfterFreightloc').parent().removeClass('col-md-3').addClass('col-md-2');
         } else {
             $('#TripsValueloc').hide();
-            $(this).parent().removeClass('col-md-2').addClass('col-md-3');
-            $('#NOOfTripsloc').parent().removeClass('col-md-2').addClass('col-md-3');
-            $('#txtFreightloc').parent().removeClass('col-md-2').addClass('col-md-3');
-            $('#txtAfterFreightloc').parent().removeClass('col-md-2').addClass('col-md-3');
+            // $(this).parent().removeClass('col-md-2').addClass('col-md-3');
+            // $('#NOOfTripsloc').parent().removeClass('col-md-2').addClass('col-md-3');
+            // $('#txtFreightloc').parent().removeClass('col-md-2').addClass('col-md-3');
+            // $('#txtAfterFreightloc').parent().removeClass('col-md-2').addClass('col-md-3');
         }
 
 
@@ -5713,7 +5760,7 @@ if (!empty($INRSYMBOL)) {
     $('#editpackagingcalmodel').on('hidden.bs.modal', function() {
 
         $('#EDITCAPITAL').modal('show');
-        $('.modal-backdrop').remove();
+      //  $('.modal-backdrop').remove();
 
         // console.log($('#edit'+tempUserId));
 
@@ -5810,18 +5857,18 @@ if (!empty($INRSYMBOL)) {
 
         if (FreightType == "PER TRIP") {
             $('#TripsValuelocedit').show();
-            $('#TripsValueloceditAfterHide').hide();
-            $(this).parent().removeClass('col-md-3').addClass('col-md-2');
-            $('#NOOfTripslocedit').parent().removeClass('col-md-3').addClass('col-md-2');
-            $('#txtFreightlocedit').parent().removeClass('col-md-3').addClass('col-md-2');
-            $('#txtAfterFreightlocedit').parent().removeClass('col-md-3').addClass('col-md-2');
+           
+            // $(this).parent().removeClass('col-md-3').addClass('col-md-2');
+            // $('#NOOfTripslocedit').parent().removeClass('col-md-3').addClass('col-md-2');
+            // $('#txtFreightlocedit').parent().removeClass('col-md-3').addClass('col-md-2');
+            // $('#txtAfterFreightlocedit').parent().removeClass('col-md-3').addClass('col-md-2');
         } else {
             $('#TripsValuelocedit').hide();
-            $('#TripsValueloceditAfterHide').show();
-            $(this).parent().removeClass('col-md-2').addClass('col-md-3');
-            $('#NOOfTripslocedit').parent().removeClass('col-md-2').addClass('col-md-3');
-            $('#txtFreightlocedit').parent().removeClass('col-md-2').addClass('col-md-3');
-            $('#txtAfterFreightlocedit').parent().removeClass('col-md-2').addClass('col-md-3');
+            
+            // $(this).parent().removeClass('col-md-2').addClass('col-md-3');
+            // $('#NOOfTripslocedit').parent().removeClass('col-md-2').addClass('col-md-3');
+            // $('#txtFreightlocedit').parent().removeClass('col-md-2').addClass('col-md-3');
+            // $('#txtAfterFreightlocedit').parent().removeClass('col-md-2').addClass('col-md-3');
         }
 
         if ($('#EditCPRate').val() != '' && $('#EditMaterialCode').val() != "0") {
@@ -5869,20 +5916,25 @@ if (!empty($INRSYMBOL)) {
         var Calculation = document.querySelector('input[name = "editoptPackaging"]:checked').value;
         var FreightType = $("#drpFreighteditloc").val();
         $('#editpackagingcalmodel').modal('hide');
-        $('.modal-backdrop').remove();
+       // $('.modal-backdrop').remove();
         $('#EDITCAPITAL').modal('show');
-        if (!document.getElementById('modalScrollCSS')) {
-            var style = document.createElement('style');
-            style.id = 'modalScrollCSS'; // Assign an ID to the style tag to avoid duplicates
-            style.innerHTML = `
-            /* Force scroll by setting a max height */
-            .modal-body {
-                max-height: 540px; 
-                overflow-y: auto;  
-            }
-        `;
-            document.head.appendChild(style); // Append the CSS to the head
-        }
+        $('#EDITCAPITAL').modal({
+            backdrop: 'static',
+            keyboard: false
+        });
+
+                // if (!document.getElementById('modalScrollCSS')) {
+                //     var style = document.createElement('style');
+                //     style.id = 'modalScrollCSS'; // Assign an ID to the style tag to avoid duplicates
+                //     style.innerHTML = `
+                //     /* Force scroll by setting a max height */
+                //     .modal-body {
+                //         max-height: 540px; 
+                //         overflow-y: auto;  
+                //     }
+                // `;
+                //     document.head.appendChild(style); // Append the CSS to the head
+                // }
         if (FreightType == '<?php echo PERCENTAGE; ?>') {
 
             $('#txtAfterFreightlocedit').val('');