diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index abb82aec..738d4ced 100755
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -1168,8 +1168,8 @@ if (!empty($getlogpodtl)) {
 
                                     <div class="form-group col-md-3" align="left">
                                                
-                                                   <label>Select File</label>
-                                                    <input type="file" class="form-control" name="POFile" id="POFile">
+                                                   <label>Select Purchase Order File</label>
+                                                    <input type="file" class="" name="POFile" id="POFile">
                                                     <?php if ($PrePOFile) { ?>
                                                         <label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
                                                     <?php } ?>
@@ -1269,1162 +1269,1177 @@ if (!empty($getlogpodtl)) {
     </div> <!-- container -->
 </div> <!-- content -->
 </div>
-<div id="importpomodel" 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">Add Import Purchase Order Item</h4>
-                <button type="button" class="close" data-dismiss="modal"
-                    aria-hidden="true">×</button>
+
+<div align="center">
+    <div id="importpomodel" 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">Add Import Purchase Order Item</h4>
+                    <button type="button" class="close" data-dismiss="modal"
+                        aria-hidden="true">×</button>
+                </div>
+                <form class="form-control">
+
+                
+                    <div class="modal-body p-4" align="left">
+
+
+                        <div class="form-row">
+
+
+                            <div class="form-group col-md-3">
+                                <label>Req No<span class="text-danger" style="color:red;text-align:right;background-color: #fff
+                                                                ;">*</span></label>
+
+                                <?php
+                                $options = array("0" => 'Req No');
+                                //echo form_dropdown('ImportMaterialCode', $options,set_value('ImportMaterialCode'),'id="ImportMaterialCode"' ,'class="form-control required"');
+                                $RL = array("0" => 'Select Req No');
+                                if (!empty($RequistionDetails)) {
+                                    foreach ($RequistionDetails as $SID) :
+                                        $RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
+                                    endforeach;
+                                }
+
+                                echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo" class="form-control"');
+
+                                ?>
+
+                            </div>
+
+                            <div class="form-group col-md-3">
+                                <label>Department Name</label>
+                                <div>
+                                    <?php
+                                    //$data = array('name' => 'ImportDepartmentName','value' => set_value('ImportDepartmentName'),'id'=>'ImportDepartmentName',  'class' => 'form-control' ,'readonly' => 'true');
+                                    $data = array('name' => 'deptName', 'value' => set_value('deptName'), 'id' => 'deptName',  '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
+                                    //$options = array("0"=>'Select Cost Center');
+
+                                    //echo form_dropdown('CostCenter', $options,set_value('CostCenter'),'id="CostCenter"' ,'class="form-control"');
+
+                                    $data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter',  'class' => 'form-control', 'readonly' => 'true');
+                                    echo form_input($data);
+
+                                    ?>
+                                </div>
+                            </div>
+
+                            <div class="form-group col-md-3" style="padding-right: 0px;">
+                                <label>Available Budget Amount (<?php echo $INR ?>)</label>
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'AvlBudAmt', 'value' => set_value('AvlBudAmt'), 'id' => 'AvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <!-- second-row starts with item code -->
+                        <div class="form-row">
+                            <div class="form-group col-md-3">
+                                <label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+
+                                <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
+                                <div>
+                                    <?php
+                                    // $options = array("0"=>'Item Code');
+
+                                    //if(!empty($MaterialList))
+                                    //{
+                                    //  foreach ($MaterialList as $SID):
+
+
+                                    //    $options[$SID->MaterialCode] =  $SID->MaterialCode.' '.' - '.' '.$SID->MaterialName;
+
+                                    //endforeach;
+                                    //}
+
+                                    //echo form_dropdown('ImportMaterialCode', $options,set_value('ImportMaterialCode'),'id="ImportMaterialCode"' ,'class="form-control"');
+
+                                    $options = array("0" => 'Item Code');
+                                    //print_r(  $options);
+
+
+
+                                    echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode" class="form-control"');
+
+                                    ?>
+                                </div>
+
+                            </div>
+                            <div class="form-group col-md-3">
+                                <label>Item Name</label>
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'ItemName', 'value' => set_value('ItemName'), 'id' => 'ItemName',  'class' => 'form-control', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="form-group col-md-3">
+                                <label>UOM</label>
+                                <?php
+                                $data = array('name' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control', 'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+
+                            <div class="form-group col-md-3">
+                                <label>Quantity<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange(),calculateFreight(0)');
+                                    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">
+                                <!-- <P id=labelRate> --> <label id=labelRate><?php echo "Rate in"; ?> <span class="text-danger">*</span></label><!-- </P> -->
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange(),validateExceedLimit(),calculateFreight(0)');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </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>Basic Amount </label>-->
+                                <!--  <p id=label2> --> <label id=label2><?php echo "Basic Value In"; ?></label><!-- </p> -->
+                                <div>
+                                    <?php
+                                    //$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
+
+                                    $data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="form-row ">
+
+                            <div class="form-group col-md-3">
+                            </div>
+
+                            <div class="form-group col-md-3">
+
+                                <!--  Basic Price in US $ per Ton : -->
+                                <!-- <p id=labelBasicpriceus><b><?php echo "Basic Value in $Currencycode ($Value)" ?></p> -->
+                                <label id=labelBasicpriceus><?php echo "Basic Value in $Currencycode ($Value)" ?></label>
+
+
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'imBasicPrice', 'value' => set_value('imBasicPrice'), 'id' => 'imBasicPrice',  'class' => 'form-control', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'USRate()', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+
+
+                            </div>
+
+                            <div class="form-group col-md-3">
+
+                                <!-- Exchange Rate : -->
+
+                                <!-- <p id=label1><b><?php echo "Exchange Rate" ?></p> -->
+                                <!-- <label id=labeladdexc> </label>  -->
+
+                                <label id=labeladdexc><?php echo "Exchange Rate ($Currencycode ($Value))" ?></label>
+
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'ExchangeRt', 'value' => set_value('ExchangeRt'), 'id' => 'ExchangeRt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                            </div>
+
+                            <div class="form-group col-md-3">
+
+                                <!-- Basic value in INR : -->
+                                <label id=labelBasicINR><?php echo "Basic value in ($INR)"; ?> </label>
+
+
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'INRBasicvalue', 'value' => set_value('INRBasicvalue'), 'id' => 'INRBasicvalue',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+
+
+                        </div>
+
+
+
+                        <br>
+
+                        <div class="form-row " style="border:1px solid black;">
+                            <br />
+                            <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Basic Price: -->
+                                        <label><?php echo "Basic Price ($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display:none;">
+                                            <?php
+                                            $data = array('name' => 'BasicPriceTax', 'value' => set_value('BasicPriceTax'), 'id' => 'BasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!--  Landing charge -->
+                                        <label><?php echo "Landing Charge ($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'LandingCharge', 'value' => set_value('LandingCharge', 0), 'id' => 'LandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Calculateloadingcharge()');
+                                            echo form_input($data);
+
+
+
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge'), 'id' => 'AfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!--   High seas sales charge -->
+                                        <label><?php echo "Assessable Value (A)($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display: none;">
+                                            <?php
+                                            $data = array('name' => 'Highseas ', 'value' => set_value('Highseas', 0), 'id' => 'Highseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateHighseassalescharge()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'AfterAssessable', 'value' => set_value('AfterAssessable'), 'id' => 'AfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!--  Custom duty : (a) -->
+                                        <label><?php echo "Custom duty (B)($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'Customduty', 'value' => set_value('Customduty', 0), 'id' => 'Customduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomduty()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'AfterCustomduty', 'value' => set_value('AfterCustomduty'), 'id' => 'AfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Custom ED_cess : (e) -->
+                                        <label><?php echo "Custom ED_cess (C)($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'CustomEDcess', 'value' => set_value('CustomEDcess', 0), 'id' => 'CustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomEdcess()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess'), 'id' => 'AfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Custom S & H cess : (f) -->
+                                        <label><?php echo "Custom S & H cess (D)($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'CustomSHcess', 'value' => set_value('CustomSHcess', 0), 'id' => 'CustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomSHcess()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'AfterCustomSHcess', 'value' => set_value('AfterCustomSHcess'), 'id' => 'AfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Additional Excise duty : (g) -->
+                                        <label><?php echo "Subtotal (E)($INR)  (A+B+C+D)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display: none">
+                                            <?php
+                                            $data = array('name' => 'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty', 0), 'id' => 'AdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateaddlExciseDuty(),CalculateAvlModvat(),CalculateGrossExpense()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'Subtotal', 'value' => set_value('Subtotal'), 'id' => 'Subtotal',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Additional Excise duty : (g) -->
+                                        <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'Igst ', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateIgst()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-8">
+                                        <!-- Gross duty payable -->
+                                        <label><?php echo "Total Duty (G)($INR) (B+C+D+F)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'Grossdutypayable ', 'value' => set_value('Grossdutypayable'), 'id' => 'Grossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateAvlModvat()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+
+                                <!--Start of Adding of Frieght model-->
+                                <div class="form-row" style="padding:0px;">
+                                    <div class="form-group col-md-4">
+                                        <label>Freight Type </label>
+                                        <?php
+                                        $options = array("0" => 'Select Freight Type');
+                                        if (!empty($FreightType)) {
+                                            foreach ($FreightType as $SID) :
+                                                $options[$SID->ConfigValue] =  $SID->ConfigValue;
+                                            endforeach;
+                                        }
+                                        echo form_dropdown('drpaddFreight', $options, set_value('drpaddFreight'), 'id="drpaddFreight" class="form-control "');
+                                        ?>
+                                    </div>
+                                    <div class="form-group col-md-4" id="AddTripsValue" style="display:none;">
+                                        <label>NO Of Trips</label>
+                                        <?php
+                                        $data = array('name' => 'addNOOfTrips', 'value' => set_value('addNOOfTrips'), 'id' => 'addNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <label>Freight Rate </label>
+                                        <?php
+                                        $data = array('name' => 'addtxtFreight', 'value' => set_value('addtxtFreight'), 'id' => 'addtxtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+
+                                    <div class="form-group col-md-4" style="padding-left: 0px;">
+                                        <label>Freight Amt In <?php echo $INR; ?></label>
+                                        <?php
+                                        $data = array('name' => 'addtxtAfterFreight', 'value' => set_value('addtxtAfterFreight'), 'id' => 'addtxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+
+                                </div>
+                                <!--End of Adding of freight in edit model -->
+
+                                <br>
+
+                                <center> <label>Cost of the product Per UOM</label></center>
+                                <hr>
+
+                                <div class="form-row mt-3">
+                                    <div class="form-group col-md-6">
+                                        <label>Duty Impact</label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact'), 'id' => 'DutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-6">
+                                        <label>Quantity</label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-6">
+                                        <!--  Custom Duty Expenses -->
+                                        <label><?php echo "Custom Duty Expenses($INR)/UOM"; ?></label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-6">
+                                        <!-- RMC Including Customers -->
+                                        <label><?php echo "Clearing Charges($INR)"; ?></label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-6">
+                                        <!-- RMC Including Customers -->
+                                        <label>
+                                            <?php echo "Nett per UOM($INR)"; ?>
+                                        </label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+
+
+                                    <div class="form-group col-md-4">
+
+
+                                    </div>
+                                    <div class="form-group col-md-4">
+
+                                    </div>
+
+
+
+
+                                    <div class="form-group col-md-4" style="display: none">
+                                        <!--  Total Amount: -->
+                                        <label id=labelTotalAmount>Total Amount</label>
+                                    </div>
+                                    <div class="form-group col-md-4" style="display: none">
+                                        <div style="display: none;">
+                                            <?php
+                                            $data = array('name' => 'TotalExp', 'value' => set_value('TotalExp'), 'id' => 'TotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+
+
+                            </div>
+                        </div>
+
+                        <br>
+
+                        <div class="form-row ">
+                            <div class="form-group col-md-12">
+                                <label>Import Description :</label>
+                                <?php
+                                $data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40', 'disabled' => 'disabled');
+                                echo form_textarea($data);
+                                ?>
+                            </div>
+                        </div>
+
+
+
+                    </div>
+
+                    <div class="modal-footer">
+                        <a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
+                        &nbsp;&nbsp;&nbsp;&nbsp;
+                        <a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Import</span></a>
+                    </div>
+                </form>
             </div>
-            <form class="form-control">
-                <div class="modal-body p-4">
-
-
-                    <div class="form-row">
-
-
-                        <div class="form-group col-md-3">
-                            <label>Req No<span class="text-danger" style="color:red;text-align:right;background-color: #fff
-                                                            ;">*</span></label>
-
-                            <?php
-                            $options = array("0" => 'Req No');
-                            //echo form_dropdown('ImportMaterialCode', $options,set_value('ImportMaterialCode'),'id="ImportMaterialCode"' ,'class="form-control required"');
-                            $RL = array("0" => 'Select Req No');
-                            if (!empty($RequistionDetails)) {
-                                foreach ($RequistionDetails as $SID) :
-                                    $RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
-                                endforeach;
-                            }
-
-                            echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo" class="form-control"');
-
-                            ?>
-
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label>Department Name</label>
-                            <div>
-                                <?php
-                                //$data = array('name' => 'ImportDepartmentName','value' => set_value('ImportDepartmentName'),'id'=>'ImportDepartmentName',  'class' => 'form-control' ,'readonly' => 'true');
-                                $data = array('name' => 'deptName', 'value' => set_value('deptName'), 'id' => 'deptName',  '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
-                                //$options = array("0"=>'Select Cost Center');
-
-                                //echo form_dropdown('CostCenter', $options,set_value('CostCenter'),'id="CostCenter"' ,'class="form-control"');
-
-                                $data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter',  'class' => 'form-control', 'readonly' => 'true');
-                                echo form_input($data);
-
-                                ?>
-                            </div>
-                        </div>
-
-                        <div class="form-group col-md-3" style="padding-right: 0px;">
-                            <label>Available Budget Amount (<?php echo $INR ?>)</label>
-                            <div>
-                                <?php
-                                $data = array('name' => 'AvlBudAmt', 'value' => set_value('AvlBudAmt'), 'id' => 'AvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-
-                    </div>
-
-                    <!-- second-row starts with item code -->
-                    <div class="form-row">
-                        <div class="form-group col-md-3">
-                            <label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
-
-                            <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
-                            <div>
-                                <?php
-                                // $options = array("0"=>'Item Code');
-
-                                //if(!empty($MaterialList))
-                                //{
-                                //  foreach ($MaterialList as $SID):
-
-
-                                //    $options[$SID->MaterialCode] =  $SID->MaterialCode.' '.' - '.' '.$SID->MaterialName;
-
-                                //endforeach;
-                                //}
-
-                                //echo form_dropdown('ImportMaterialCode', $options,set_value('ImportMaterialCode'),'id="ImportMaterialCode"' ,'class="form-control"');
-
-                                $options = array("0" => 'Item Code');
-                                //print_r(  $options);
-
-
-
-                                echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode" class="form-control"');
-
-                                ?>
-                            </div>
-
-                        </div>
-                        <div class="form-group col-md-3">
-                            <label>Item Name</label>
-                            <div>
-                                <?php
-                                $data = array('name' => 'ItemName', 'value' => set_value('ItemName'), 'id' => 'ItemName',  'class' => 'form-control', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-3">
-                            <label>UOM</label>
-                            <?php
-                            $data = array('name' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control', 'readonly' => 'true');
-                            echo form_input($data);
-                            ?>
-                        </div>
-
-                        <div class="form-group col-md-3">
-                            <label>Quantity<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
-                            <div>
-                                <?php
-                                $data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange(),calculateFreight(0)');
-                                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">
-                            <!-- <P id=labelRate> --> <label id=labelRate><?php echo "Rate in"; ?> <span class="text-danger">*</span></label><!-- </P> -->
-                            <div>
-                                <?php
-                                $data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange(),validateExceedLimit(),calculateFreight(0)');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </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>Basic Amount </label>-->
-                            <!--  <p id=label2> --> <label id=label2><?php echo "Basic Value In"; ?></label><!-- </p> -->
-                            <div>
-                                <?php
-                                //$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
-
-                                $data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-row ">
-
-                        <div class="form-group col-md-3">
-                        </div>
-
-                        <div class="form-group col-md-3">
-
-                            <!--  Basic Price in US $ per Ton : -->
-                            <!-- <p id=labelBasicpriceus><b><?php echo "Basic Value in $Currencycode ($Value)" ?></p> -->
-                            <label id=labelBasicpriceus><?php echo "Basic Value in $Currencycode ($Value)" ?></label>
-
-
-                            <div>
-                                <?php
-                                $data = array('name' => 'imBasicPrice', 'value' => set_value('imBasicPrice'), 'id' => 'imBasicPrice',  'class' => 'form-control', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'USRate()', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-
-
-
-                        </div>
-
-                        <div class="form-group col-md-3">
-
-                            <!-- Exchange Rate : -->
-
-                            <!-- <p id=label1><b><?php echo "Exchange Rate" ?></p> -->
-                            <!-- <label id=labeladdexc> </label>  -->
-
-                            <label id=labeladdexc><?php echo "Exchange Rate ($Currencycode ($Value))" ?></label>
-
-                            <div>
-                                <?php
-                                $data = array('name' => 'ExchangeRt', 'value' => set_value('ExchangeRt'), 'id' => 'ExchangeRt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-
-                        </div>
-
-                        <div class="form-group col-md-3">
-
-                            <!-- Basic value in INR : -->
-                            <label id=labelBasicINR><?php echo "Basic value in ($INR)"; ?> </label>
-
-
-                            <div>
-                                <?php
-                                $data = array('name' => 'INRBasicvalue', 'value' => set_value('INRBasicvalue'), 'id' => 'INRBasicvalue',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-
-
-                    </div>
-
-
-
-                    <br>
-
-                    <div class="form-row " style="border:1px solid black;">
-                        <br />
-                        <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    <!-- Basic Price: -->
-                                    <label><?php echo "Basic Price ($INR)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div style="display:none;">
-                                        <?php
-                                        $data = array('name' => 'BasicPriceTax', 'value' => set_value('BasicPriceTax'), 'id' => 'BasicPriceTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    <!--  Landing charge -->
-                                    <label><?php echo "Landing Charge ($INR)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'LandingCharge', 'value' => set_value('LandingCharge', 0), 'id' => 'LandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Calculateloadingcharge()');
-                                        echo form_input($data);
-
-
-
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge'), 'id' => 'AfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    <!--   High seas sales charge -->
-                                    <label><?php echo "Assessable Value (A)($INR)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div style="display: none;">
-                                        <?php
-                                        $data = array('name' => 'Highseas ', 'value' => set_value('Highseas', 0), 'id' => 'Highseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateHighseassalescharge()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'AfterAssessable', 'value' => set_value('AfterAssessable'), 'id' => 'AfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    <!--  Custom duty : (a) -->
-                                    <label><?php echo "Custom duty (B)($INR)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'Customduty', 'value' => set_value('Customduty', 0), 'id' => 'Customduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomduty()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'AfterCustomduty', 'value' => set_value('AfterCustomduty'), 'id' => 'AfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-
-
-
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    <!-- Custom ED_cess : (e) -->
-                                    <label><?php echo "Custom ED_cess (C)($INR)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'CustomEDcess', 'value' => set_value('CustomEDcess', 0), 'id' => 'CustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomEdcess()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess'), 'id' => 'AfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    <!-- Custom S & H cess : (f) -->
-                                    <label><?php echo "Custom S & H cess (D)($INR)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'CustomSHcess', 'value' => set_value('CustomSHcess', 0), 'id' => 'CustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCustomSHcess()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'AfterCustomSHcess', 'value' => set_value('AfterCustomSHcess'), 'id' => 'AfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    <!-- Additional Excise duty : (g) -->
-                                    <label><?php echo "Subtotal (E)($INR)  (A+B+C+D)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div style="display: none">
-                                        <?php
-                                        $data = array('name' => 'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty', 0), 'id' => 'AdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateaddlExciseDuty(),CalculateAvlModvat(),CalculateGrossExpense()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'Subtotal', 'value' => set_value('Subtotal'), 'id' => 'Subtotal',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    <!-- Additional Excise duty : (g) -->
-                                    <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'Igst ', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateIgst()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-row">
-                                <div class="form-group col-md-8">
-                                    <!-- Gross duty payable -->
-                                    <label><?php echo "Total Duty (G)($INR) (B+C+D+F)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'Grossdutypayable ', 'value' => set_value('Grossdutypayable'), 'id' => 'Grossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateAvlModvat()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-
-
-                            <!--Start of Adding of Frieght model-->
-                            <div class="form-row" style="padding:0px;">
-                                <div class="form-group col-md-4">
-                                    <label>Freight Type </label>
-                                    <?php
-                                    $options = array("0" => 'Select Freight Type');
-                                    if (!empty($FreightType)) {
-                                        foreach ($FreightType as $SID) :
-                                            $options[$SID->ConfigValue] =  $SID->ConfigValue;
-                                        endforeach;
-                                    }
-                                    echo form_dropdown('drpaddFreight', $options, set_value('drpaddFreight'), 'id="drpaddFreight" class="form-control "');
-                                    ?>
-                                </div>
-                                <div class="form-group col-md-4" id="AddTripsValue" style="display:none;">
-                                    <label>NO Of Trips</label>
-                                    <?php
-                                    $data = array('name' => 'addNOOfTrips', 'value' => set_value('addNOOfTrips'), 'id' => 'addNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <label>Freight Rate </label>
-                                    <?php
-                                    $data = array('name' => 'addtxtFreight', 'value' => set_value('addtxtFreight'), 'id' => 'addtxtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                                <div class="form-group col-md-4" style="padding-left: 0px;">
-                                    <label>Freight Amt In <?php echo $INR; ?></label>
-                                    <?php
-                                    $data = array('name' => 'addtxtAfterFreight', 'value' => set_value('addtxtAfterFreight'), 'id' => 'addtxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                            </div>
-                            <!--End of Adding of freight in edit model -->
-
-                            <br>
-
-                            <center> <label>Cost of the product Per UOM</label></center>
-                            <hr>
-
-                            <div class="form-row mt-3">
-                                <div class="form-group col-md-6">
-                                    <label>Duty Impact</label>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact'), 'id' => 'DutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-6">
-                                    <label>Quantity</label>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-6">
-                                    <!--  Custom Duty Expenses -->
-                                    <label><?php echo "Custom Duty Expenses($INR)/UOM"; ?></label>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-6">
-                                    <!-- RMC Including Customers -->
-                                    <label><?php echo "Clearing Charges($INR)"; ?></label>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-6">
-                                    <!-- RMC Including Customers -->
-                                    <label>
-                                        <?php echo "Nett per UOM($INR)"; ?>
-                                    </label>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-
-
-
-                                <div class="form-group col-md-4">
-
-
-                                </div>
-                                <div class="form-group col-md-4">
-
-                                </div>
-
-
-
-
-                                <div class="form-group col-md-4" style="display: none">
-                                    <!--  Total Amount: -->
-                                    <label id=labelTotalAmount>Total Amount</label>
-                                </div>
-                                <div class="form-group col-md-4" style="display: none">
-                                    <div style="display: none;">
-                                        <?php
-                                        $data = array('name' => 'TotalExp', 'value' => set_value('TotalExp'), 'id' => 'TotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-
-                            </div>
-
-
-                        </div>
-                    </div>
-
-                    <br>
-
-                    <div class="form-row ">
-                        <div class="form-group col-md-12">
-                            <label>Import Description :</label>
-                            <?php
-                            $data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40', 'disabled' => 'disabled');
-                            echo form_textarea($data);
-                            ?>
-                        </div>
-                    </div>
-
-
-
-                </div>
-
-                <div class="modal-footer">
-                    <a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
-                    &nbsp;&nbsp;&nbsp;&nbsp;
-                    <a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Import</span></a>
-                </div>
-            </form>
         </div>
-    </div>
-</div><!-- /.modal -->
-<div id="editimportpomodel" 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 Import Purchase Order Item</h4>
-                <button type="button" class="close" data-dismiss="modal"
-                    aria-hidden="true">×</button>
+    </div><!-- /.modal -->
+</div>
+
+<div align="center">
+    <div id="editimportpomodel" 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 Import 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">
+                            <div class="form-group col-md-3">
+                                <label>Req No<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                <div>
+                                    <?php
+
+                                    $data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  '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' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  '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
+                                    $options = array("0" => 'Select Cost Center');
+
+                                    //echo form_dropdown('EditCostCenter', $options,set_value('EditCostCenter'),'id="EditCostCenter"' ,'class="form-control"');
+
+                                    $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" style="padding-right: 0px;">
+                                <label>Available Budget Amount (<?php echo $INR ?>)</label>
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="form-row">
+                            <div class="form-group col-md-3">
+                                <label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+
+                                <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
+                                <div>
+                                    <?php
+                                    // $options = array("0"=>'Item Code');
+
+                                    //if(!empty($MaterialList))
+                                    //{
+                                    //  foreach ($MaterialList as $SID):
+
+
+                                    //    $options[$SID->MaterialCode] =  $SID->MaterialCode.' '.' - '.' '.$SID->MaterialName;
+
+                                    //endforeach;
+                                    //}
+
+                                    //echo form_dropdown('ImportMaterialCode', $options,set_value('ImportMaterialCode'),'id="ImportMaterialCode"' ,'class="form-control"');
+
+                                    $options = array("0" => 'Item Code');
+                                    //print_r(  $options);
+
+
+
+                                    echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control "');
+
+                                    ?>
+                                </div>
+
+                            </div>
+                            <div class="form-group col-md-3">
+                                <label>Item Name</label>
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  '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' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="form-group col-md-3">
+                                <label>Quantity<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),ExceedEditQuantityCheck()');
+                                    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>Rate </label> -->
+
+                                <!-- <P id=labelEditRate> --> <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?> <span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),validateEditExceedLimit()');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <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" style="padding: 0px;">
+                                <!-- <label><?php echo "Basic Value In"; ?></label>-->
+                                <!-- <p id=label3> --><label id=label3><?php echo "Basic Value In $Currencycode ($Value)"; ?></label><!-- </p> -->
+                                <div>
+                                    <?php
+                                    //$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
+
+                                    $data = array('name' => 'EdittxtBasicValue', 'value' => set_value('EdittxtBasicValue'), 'id' => 'EdittxtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+                                    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">
+
+                                <!-- Basic Price in US $ per Ton : -->
+
+                                <!-- <p id=labelEditBasicPriceUs><b><?php echo "Basic Value in $Currencycode ($Value)" ?></p> -->
+                                <label id=labelEditBasicPriceUs><?php echo "Basic Value in $Currencycode ($Value)" ?> </label>
+
+
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'EditimBasicPrice', 'value' => set_value('EditimBasicPrice'), 'id' => 'EditimBasicPrice',  'class' => 'form-control num', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+
+                            <div class="form-group col-md-3">
+
+
+                                <!-- <label>Exchange Rate :</label>  -->
+                                <label id=labeleditexc><?php echo "Exchange Rate ($Currencycode ($Value))" ?></label>
+
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'EditExchangeRt', 'value' => set_value('EditExchangeRt'), 'id' => 'EditExchangeRt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                            </div>
+
+                            <div class="form-group col-md-3">
+
+                                <!--  Basic value in INR : -->
+
+                                <!-- <p id=labelEditBasicINR> --><label id=labelEditBasicINR><?php echo "Basic value in ($INR) :"; ?></label><!-- </p> -->
+
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'EditINRBasicvalue', 'value' => set_value('EditINRBasicvalue'), 'id' => 'EditINRBasicvalue',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <!--<div class="form-group col-md-3">
+                                    <a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
+                                </div>-->
+                        </div>
+
+                        <br>
+
+                        <div class="form-row" style="border:1px solid black;">
+                            <br />
+                            <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Basic Price: -->
+                                        <label><?php echo "Basic Price  ($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display:none;">
+                                            <?php
+                                            $data = array('name' => '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 -->
+                                        <label><?php echo "Landing Charge ($INR)"; ?></label>
+                                    </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' => 'EditCalculateloadingcharge()');
+                                            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">
+                                        <!--  High seas sales charge -->
+                                        <label><?php echo "Assessable Value (A) ($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display: none;">
+                                            <?php
+                                            $data = array('name' => 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateHighseassalescharge()');
+                                            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 : (a) -->
+                                        <label><?php echo "Custom duty (B)($INR)"; ?></label>
+                                    </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' => 'EditCalculateCustomduty()');
+                                            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 : (e) -->
+                                        <label><?php echo "Custom ED_cess  (C)($INR)"; ?></label>
+                                    </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' => 'EditCalculateCustomEdcess()');
+                                            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 : (f) -->
+                                        <label><?php echo "Custom S & H cess (D)($INR)"; ?></label>
+                                    </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' => 'EditCalculateCustomSHcess()');
+                                            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 p-2 mt-1" style="padding:0px;">
+                                <div class="form-row">
+                                    <div class="form-group col-md-4">
+                                        <!-- Additional Excise duty : (g) -->
+
+
+                                        <label><?php echo "Subtotal (E)($INR)  (A+B+C+D)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div style="display: none;">
+                                            <?php
+                                            $data = array('name' => 'EditAdditionalExciseduty ', 'value' => set_value('EditAdditionalExciseduty'), 'id' => 'EditAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
+                                            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">
+                                    <div class="form-group col-md-4">
+                                        <!-- Additional Excise duty : (g) -->
+                                        <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditIgst ', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst',  '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' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+
+
+
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-8">
+                                        <!-- Gross duty payable -->
+
+                                        <label><?php echo "Total Duty (G)($INR) (B+C+D+F)"; ?></label>
+                                    </div>
+                                    <div class="form-group col-md-4">
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <br>
+
+
+                                <!--Start of Adding of Frieght model-->
+                                <div class="form-row" style="padding:0px;">
+                                    <div class="form-group col-md-4">
+                                        <span>Freight Type </span>
+                                        <?php
+                                        $options = array("0" => 'Select Freight Type');
+                                        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-4" id="EditTripsValue" style="display:block;">
+                                        <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-4">
+                                        <span>Freight Rate </span>
+                                        <?php
+                                        $data = array('name' => 'edittxtFreight', 'value' => set_value('edittxtFreight'), 'id' => 'edittxtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+
+                                    <div class="form-group col-md-4" style="padding-left: 0px;">
+                                        <span>Freight Amt <?php echo $INR; ?></span>
+                                        <?php
+                                        $data = array('name' => 'edittxtAfterFreight', 'value' => set_value('edittxtAfterFreight'), 'id' => 'edittxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+
+                                </div>
+                                <!--End of Adding of freight in edit model -->
+
+
+                                <br>
+
+
+                                <center> <label>Cost of the product Per UOM</label></center>
+                                <hr />
+
+                                <div class="form-row">
+                                    <div class="form-group col-md-6">
+                                        <label>Duty Impact</label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-6">
+                                        <label>Quantity</label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-6">
+                                        <!-- Custom Duty Expenses -->
+                                        <label><?php echo "Custom Duty Expenses($INR) /UOM"; ?></label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                </div>
+                                <div class="form-row">
+                                    <div class="form-group col-md-6">
+                                        <!-- RMC Including Customers -->
+                                        <label><?php echo "Clearing Charges ($INR)" ?></label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-md-6">
+                                        <!-- RMC Including Customers -->
+                                        <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                        <div>
+                                            <?php
+                                            $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group col-md-6" style="display:none;">
+                                        <!-- Total Amount: -->
+                                        <label id=labelEditTotalAmount>Total Amount</label>
+                                        <div style="display:none;">
+                                            <?php
+                                            $data = array('name' => 'EditTotalExp', 'value' => set_value('EditTotalExp'), 'id' => 'EditTotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                                            echo form_input($data);
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+
+                        <div class="form-row">
+                            <div class="form-group col-md-12">
+                                <label style="margin-top:10px;">Import Description :</label>
+                                <?php
+                                $data = array('name' => 'edittxtInstruction', 'value' => set_value('edittxtInstruction'), 'id' => 'edittxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
+                                echo form_textarea($data);
+                                ?>
+                            </div>
+                        </div>
+
+
+                    </div>
+                    <div class="modal-footer">
+                        <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
+                        <a class="btn btn-success font EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
+                    </div>
+                </form>
             </div>
-            <form>
-                <div class="modal-body p-4">
-
-
-                    <div class="form-row">
-                        <div class="form-group col-md-3">
-                            <label>Req No<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
-                            <div>
-                                <?php
-
-                                $data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  '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' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  '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
-                                $options = array("0" => 'Select Cost Center');
-
-                                //echo form_dropdown('EditCostCenter', $options,set_value('EditCostCenter'),'id="EditCostCenter"' ,'class="form-control"');
-
-                                $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" style="padding-right: 0px;">
-                            <label>Available Budget Amount (<?php echo $INR ?>)</label>
-                            <div>
-                                <?php
-                                $data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-row">
-                        <div class="form-group col-md-3">
-                            <label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
-
-                            <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
-                            <div>
-                                <?php
-                                // $options = array("0"=>'Item Code');
-
-                                //if(!empty($MaterialList))
-                                //{
-                                //  foreach ($MaterialList as $SID):
-
-
-                                //    $options[$SID->MaterialCode] =  $SID->MaterialCode.' '.' - '.' '.$SID->MaterialName;
-
-                                //endforeach;
-                                //}
-
-                                //echo form_dropdown('ImportMaterialCode', $options,set_value('ImportMaterialCode'),'id="ImportMaterialCode"' ,'class="form-control"');
-
-                                $options = array("0" => 'Item Code');
-                                //print_r(  $options);
-
-
-
-                                echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control "');
-
-                                ?>
-                            </div>
-
-                        </div>
-                        <div class="form-group col-md-3">
-                            <label>Item Name</label>
-                            <div>
-                                <?php
-                                $data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  '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' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-3">
-                            <label>Quantity<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
-                            <div>
-                                <?php
-                                $data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),ExceedEditQuantityCheck()');
-                                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>Rate </label> -->
-
-                            <!-- <P id=labelEditRate> --> <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?> <span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
-                            <div>
-                                <?php
-                                $data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),validateEditExceedLimit()');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <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" style="padding: 0px;">
-                            <!-- <label><?php echo "Basic Value In"; ?></label>-->
-                            <!-- <p id=label3> --><label id=label3><?php echo "Basic Value In $Currencycode ($Value)"; ?></label><!-- </p> -->
-                            <div>
-                                <?php
-                                //$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
-
-                                $data = array('name' => 'EdittxtBasicValue', 'value' => set_value('EdittxtBasicValue'), 'id' => 'EdittxtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
-                                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">
-
-                            <!-- Basic Price in US $ per Ton : -->
-
-                            <!-- <p id=labelEditBasicPriceUs><b><?php echo "Basic Value in $Currencycode ($Value)" ?></p> -->
-                            <label id=labelEditBasicPriceUs><?php echo "Basic Value in $Currencycode ($Value)" ?> </label>
-
-
-                            <div>
-                                <?php
-                                $data = array('name' => 'EditimBasicPrice', 'value' => set_value('EditimBasicPrice'), 'id' => 'EditimBasicPrice',  'class' => 'form-control num', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-
-                        <div class="form-group col-md-3">
-
-
-                            <!-- <label>Exchange Rate :</label>  -->
-                            <label id=labeleditexc><?php echo "Exchange Rate ($Currencycode ($Value))" ?></label>
-
-                            <div>
-                                <?php
-                                $data = array('name' => 'EditExchangeRt', 'value' => set_value('EditExchangeRt'), 'id' => 'EditExchangeRt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-
-                        </div>
-
-                        <div class="form-group col-md-3">
-
-                            <!--  Basic value in INR : -->
-
-                            <!-- <p id=labelEditBasicINR> --><label id=labelEditBasicINR><?php echo "Basic value in ($INR) :"; ?></label><!-- </p> -->
-
-                            <div>
-                                <?php
-                                $data = array('name' => 'EditINRBasicvalue', 'value' => set_value('EditINRBasicvalue'), 'id' => 'EditINRBasicvalue',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-                        </div>
-                        <!--<div class="form-group col-md-3">
-                                <a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
-                            </div>-->
-                    </div>
-
-                    <div class="form-row" style="border:1px solid black;">
-                        <br />
-                        <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    <!-- Basic Price: -->
-                                    <label><?php echo "Basic Price  ($INR)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div style="display:none;">
-                                        <?php
-                                        $data = array('name' => '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 -->
-                                    <label><?php echo "Landing Charge ($INR)"; ?></label>
-                                </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' => 'EditCalculateloadingcharge()');
-                                        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">
-                                    <!--  High seas sales charge -->
-                                    <label><?php echo "Assessable Value (A) ($INR)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div style="display: none;">
-                                        <?php
-                                        $data = array('name' => 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateHighseassalescharge()');
-                                        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 : (a) -->
-                                    <label><?php echo "Custom duty (B)($INR)"; ?></label>
-                                </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' => 'EditCalculateCustomduty()');
-                                        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 : (e) -->
-                                    <label><?php echo "Custom ED_cess  (C)($INR)"; ?></label>
-                                </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' => 'EditCalculateCustomEdcess()');
-                                        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 : (f) -->
-                                    <label><?php echo "Custom S & H cess (D)($INR)"; ?></label>
-                                </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' => 'EditCalculateCustomSHcess()');
-                                        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 p-2 mt-1" style="padding:0px;">
-                            <div class="form-row">
-                                <div class="form-group col-md-4">
-                                    <!-- Additional Excise duty : (g) -->
-
-
-                                    <label><?php echo "Subtotal (E)($INR)  (A+B+C+D)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div style="display: none;">
-                                        <?php
-                                        $data = array('name' => 'EditAdditionalExciseduty ', 'value' => set_value('EditAdditionalExciseduty'), 'id' => 'EditAdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
-                                        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">
-                                <div class="form-group col-md-4">
-                                    <!-- Additional Excise duty : (g) -->
-                                    <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditIgst ', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst',  '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' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-
-
-
-
-
-                            <div class="form-row">
-                                <div class="form-group col-md-8">
-                                    <!-- Gross duty payable -->
-
-                                    <label><?php echo "Total Duty (G)($INR) (B+C+D+F)"; ?></label>
-                                </div>
-                                <div class="form-group col-md-4">
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-
-
-                            <!--Start of Adding of Frieght model-->
-                            <div class="form-row" style="padding:0px;">
-                                <div class="form-group col-md-3">
-                                    <span>Freight Type </span>
-                                    <?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:block;">
-                                    <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' => 'edittxtFreight', 'value' => set_value('edittxtFreight'), 'id' => 'edittxtFreight',  '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' => 'edittxtAfterFreight', 'value' => set_value('edittxtAfterFreight'), 'id' => 'edittxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                            </div>
-                            <!--End of Adding of freight in edit model -->
-
-
-                            <center> <label>Cost of the product Per UOM</label></center>
-                            <hr />
-
-                            <div class="form-row">
-                                <div class="form-group col-md-6">
-                                    <label>Duty Impact</label>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-6">
-                                    <span>Quantity</span>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-6">
-                                    <!-- Custom Duty Expenses -->
-                                    <label><?php echo "Custom Duty Expenses($INR) /UOM"; ?></label>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-
-                            </div>
-                            <div class="form-row">
-                                <div class="form-group col-md-6">
-                                    <!-- RMC Including Customers -->
-                                    <label><?php echo "Clearing Charges ($INR)" ?></label>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-group col-md-6">
-                                    <!-- RMC Including Customers -->
-                                    <label><?php echo "Nett per UOM($INR)"; ?></label>
-                                    <div>
-                                        <?php
-                                        $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-
-                                <div class="form-group col-md-6" style="display:none;">
-                                    <!-- Total Amount: -->
-                                    <label id=labelEditTotalAmount>Total Amount</label>
-                                    <div style="display:none;">
-                                        <?php
-                                        $data = array('name' => 'EditTotalExp', 'value' => set_value('EditTotalExp'), 'id' => 'EditTotalExp',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-
-                    <div class="form-row">
-                        <div class="form-group col-md-12">
-                            <label style="margin-top:10px;">Import Description :</label>
-                            <?php
-                            $data = array('name' => 'edittxtInstruction', 'value' => set_value('edittxtInstruction'), 'id' => 'edittxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
-                            echo form_textarea($data);
-                            ?>
-                        </div>
-                    </div>
-
-
-                </div>
-                <div class="modal-footer">
-                    <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
-                    <a class="btn btn-success font EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
-                </div>
-            </form>
         </div>
-    </div>
-</div><!-- /.modal -->
+    </div><!-- /.modal -->
+</div>
+
 <div id="viewimportmodal" class="modal fade" tabindex="-1" role="dialog"
     aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
     <div class="modal-dialog modal-full-width" style="width: 1200px; !important">
@@ -2884,6 +2899,8 @@ if (!empty($getlogpodtl)) {
         </div>
     </div>
 </div><!-- /.modal -->
+</div>
+
 
 
 <script type="text/javascript">
diff --git a/app/Views/importpo.php b/app/Views/importpo.php
index b02b1e60..42002729 100755
--- a/app/Views/importpo.php
+++ b/app/Views/importpo.php
@@ -915,10 +915,12 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
         </div> <!-- container -->
     </div> <!-- content -->
 </div>
-<div id="IMPORT" class="modal fade" tabindex="-1" role="dialog"
+
+
+<div id="IMPORT" class="modal fade" align="center" 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-content"  style="width:1060px;" >
             <div class="modal-header">
                 <h4 class="modal-title">Add Import Purchase Order Item</h4>
                 <button type="button" class="close" data-dismiss="modal"
@@ -1468,14 +1470,16 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                             </div>
                         </div>
 
-
-                        <div class="form-group col-md-11" style="margin-top:10px;">
-                            <label>Import Description </label>
-                            <?php
-                            $data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
-                            echo form_textarea($data);
-                            ?>
-                        </div>
+                      <div class="form-row mt-3">
+                        <div class="form-group col-md-12">
+                                <label>Import Description </label>
+                                <?php
+                                $data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
+                                echo form_textarea($data);
+                                ?>
+                            </div>
+                      </div>
+                      
 
                     </div>
                 </div>
@@ -1488,10 +1492,11 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
         </div>
     </div>
 </div><!-- /.modal -->
-<div id="editimportpomodel" class="modal fade" tabindex="-1" role="dialog"
+
+<div id="editimportpomodel" class="modal fade" align="center"  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-content "  style="width: 1060px;">
             <div class="modal-header">
                 <h4 class="modal-title">Edit Import Purchase Order Item</h4>
                 <button type="button" class="close" data-dismiss="modal"
@@ -1898,9 +1903,10 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                         </div>
                                     </div>
                                 </div>
+                                <br>
                                 <!--Start of Adding of Frieght model-->
                                 <div class="form-row" style="padding:0px;">
-                                    <div class="form-group col-md-3">
+                                    <div class="form-group col-md-4">
                                         <label>Freight Type </label>
                                         <?php
                                         $options = array("0" => 'Select Freight Type');
@@ -1912,7 +1918,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                         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;">
+                                    <div class="form-group col-md-4" id="editTripsValue" style="display:none;">
                                         <label>NO Of Trips</label>
                                         <?php
                                         $data = array('name' => 'editNOOfTrips', 'value' => set_value('editNOOfTrips'), 'id' => 'editNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
@@ -1920,7 +1926,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                         ?>
                                     </div>
 
-                                    <div class="form-group col-md-3">
+                                    <div class="form-group col-md-4">
                                         <label>Freight Rate </label>
                                         <?php
                                         $data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
@@ -1928,7 +1934,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                         ?>
                                     </div>
 
-                                    <div class="form-group col-md-3" style="padding-left: 0px;">
+                                    <div class="form-group col-md-4" style="padding-left: 0px;">
                                         <label>Freight Amt In <?php echo $INR; ?></label>
                                         <?php
                                         $data = array('name' => 'edittxtAfterFreight', 'value' => set_value('edittxtAfterFreight'), 'id' => 'edittxtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
@@ -1946,12 +1952,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                 <br>
 
                                 <div class="form-row">
-                                    <div class="form-group col-md-4">
+                                    <div class="form-group col-md-6">
                                         <label>Duty Impact </label>
                                         <!-- <p id=labelEditPurchaseRate><label><?php echo "purchase rate [Basic]/" ?></label>   -->
-
-                                    </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);', 'readonly' => 'true');
@@ -1959,8 +1962,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="form-group col-md-4" style="margin-top: -4.8%">
-                                        <label>Quantity</label>
+                                    <div class="form-group col-md-6">
+                                    <label>Quantity</label>
                                         <div>
                                             <?php
                                             $data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
@@ -1968,15 +1971,14 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                             ?>
                                         </div>
                                     </div>
+                                 
 
                                 </div>
                                 <div class="form-row">
 
-                                    <div class="form-group col-md-4">
+                                    <div class="form-group col-md-6">
                                         <!-- Custom Duty Expenses -->
                                         <label><?php echo "Custom Duty($INR) /UOM" ?></label>
-                                    </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);', 'readonly' => 'true');
@@ -1984,30 +1986,29 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                             ?>
                                         </div>
                                     </div>
+                                   
 
                                 </div>
 
+                          
                                 <div class="form-row mt-2">
-                                    <div class="form-group col-md-4">
+                                    <div class="form-group col-md-6">
+                                      
+                                         <label><?php echo "Clearing Charges ($INR)"; ?></label>
                                         <div>
-                                            <!-- RMC Including Customers -->
-                                            <label><?php echo "Clearing Charges ($INR)"; ?></label>
-                                            <?php
+                                        <?php
                                             $data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
                                             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 class="form-group col-md-6">
+                                         
+                                          <label><?php echo "Nett per UOM($INR)"; ?></label>
                                         <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);
@@ -2042,7 +2043,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                         </div>
 
                         <div class="form-row mt-3">
-                            <div class="form-row">
+                            <div class="form-group col-md-12">
                                 <label>Import Description :</label>
                                 <?php
                                 $data = array('name' => 'edittxtInstruction', 'value' => set_value('edittxtInstruction'), 'id' => 'edittxtInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php
index 4098e38c..8f873b57 100755
--- a/app/Views/purchaseorder.php
+++ b/app/Views/purchaseorder.php
@@ -657,10 +657,10 @@ if (!empty($INRSYMBOL)) {
 
 			if (FreightType == "PER TRIP") {
 				$('#TripsValue').show();
-				$(this).parent().removeClass('col-md-4').addClass('col-md-2');
+				
 			} else {
 				$('#TripsValue').hide();
-				$(this).parent().removeClass('col-md-2').addClass('col-md-4');
+				
 			}
 			if ($('#Rate').val() != '' && $('#MaterialCode').val() != "0") {
 				selValue = $("#drpFreight").val();
@@ -704,10 +704,10 @@ if (!empty($INRSYMBOL)) {
 
 			if (FreightType == "PER TRIP") {
 				$('#EditTripsValue').show();
-				$(this).parent().removeClass('col-md-4').addClass('col-md-2');
+				
 			} else {
 				$('#EditTripsValue').hide();
-				$(this).parent().removeClass('col-md-2').addClass('col-md-4');
+				
 			}
 			if ($('#EditRate').val() != '' && $('#EditMaterialCode').val() != "0") {
 				selValue = $("#drpEditFreight").val();
@@ -2224,10 +2224,23 @@ if (!empty($INRSYMBOL)) {
 									<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
 								</div>
 							</div>
+
+
+							<label>Select Purchase Order File</label>
+							<div class="form-row">
+								
+								<div class="form-group col-md-12">
+								
+								<input type="file" name="POFile" id="POFile"><br>
+								</div>
+						    
+
+							</div>
+
 							<div class="form-row">
 								<div class="form-group col-md-12">
 									<div align="right" style="padding-right:10px">
-										<input type="file" name="POFile" id="POFile"><br>
+										
 										<input type="hidden" name="txtPoRange" id="txtPoRange" />
 										<input type="hidden" name="isEdit" id="isEdit" value="0" />
 										<input type="hidden" name="txtStatus" id="txtStatus" />
@@ -2403,349 +2416,376 @@ if (!empty($INRSYMBOL)) {
 	</div>
 </div><!-- /.modal -->
 <!-- Model for revenue po -->
-<div id="REVENUE" 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">Select Revenue Purchase Order Line Item</h4>
-				<button type="button" class="close" data-dismiss="modal"
-					aria-hidden="true">×</button>
+ <div align="center">
+		<div id="REVENUE" 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" align="left" style="width:1060px;">
+					<div class="modal-header">
+						<h4 class="modal-title">Select Revenue Purchase Order Line 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">
+								<div class="form-group col-md-3">
+									<label>Req No<span class="text-danger">*</span></label>
+									<div>
+										<?php
+										$RL = array("0" => 'Select Req No');
+										if (!empty($RequistionDetails)) {
+											foreach ($RequistionDetails as $SID) :
+												$RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
+											endforeach;
+										}
+
+										echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo" class="form-control"');
+
+										?>
+									</div>
+								</div>
+
+								<div class="form-group col-md-3">
+									<label>Department Name</label>
+
+									<?php
+									$data = array('name' => 'deptName', 'value' => set_value('deptName'), 'id' => 'deptName',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>Cost Center Code</label>
+
+									<?php
+
+									$data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>Avl Bud Amt <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'AvlBudAmt', 'value' => set_value('AvlBudAmt'), 'id' => 'AvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+
+							<div class="form-row">
+								<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('MaterialCode'), 'id="MaterialCode" class="form-control"');
+
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Item Name</label>
+
+									<?php
+									$data = array('name' => 'ItemName', 'value' => set_value('ItemName'), 'id' => 'ItemName',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>UOM</label>
+
+									<?php
+									$data = array('name' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>Qty<span class="text-danger">*</span></label>
+									<?php
+									$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
+									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">
+									<label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
+									<!-- <label>Rate</label> -->
+									<?php
+									$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
+									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><?php echo "Basic Amt ($INRSYM)"; ?></label>
+									<!-- <label>Basic Amount</label> -->
+									<?php
+									$data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+
+							</div>
+
+							<div class="form-row" style="padding:0px;">
+								<div class="form-group col-md-3"></div>
+
+								<div class="form-group col-md-3">
+									<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('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType" class="form-control"');
+
+										?>
+									</div>
+								</div>
+
+								<div class="form-group col-md-3">
+									<label>Discount Rate </label>
+									<div class="form-group">
+										<?php
+										$data = array('name' => 'txtDiscount', 'value' => set_value('txtDiscount'), 'id' => 'txtDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();calculateDiscount(0);');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+
+								<div class="form-group col-md-3">
+									<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount', 0.00), 'id' => 'txtAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+
+							</div>
+
+							<div class="form-row" style="text-align:left;">
+								<div class="form-group col-md-3"></div>
+								<div class="form-group col-md-3">
+									<label>Packaging Type </label>
+									<div>
+										<?php
+										$options = array("0" => 'Select Packaging Type');
+										//print_r(  $options);
+
+										if (!empty($TaxType)) {
+											foreach ($TaxType as $SID) :
+
+
+												$options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+											endforeach;
+										}
+
+										echo form_dropdown('PackagingType', $options, set_value('PackagingType'), 'id="PackagingType" class="form-control "');
+
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Packaging Rate </label>
+									<?php
+									$data = array('name' => 'txtPackaging', 'value' => set_value('txtPackaging'), 'id' => 'txtPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+									echo form_input($data);
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'txtAfterPackaging', 'value' => set_value('txtAfterPackaging', 0.00), 'id' => 'txtAfterPackaging',  '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">
+									<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('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
+									?>
+								</div>
+				
+								<div class="form-group col-md-3">
+									<label>Freight Rate </label>
+									<?php
+									$data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+									echo form_input($data);
+									?>
+								</div>
+
+								<div class="form-group col-md-3">
+									<label>Freight Amt <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight', 0.00), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>				
+
+							</div>
+
+							<div class="form-row">
+
+							<div class="from-group col-md-9"></div>
+
+							<div class="form-group col-md-3" id="TripsValue" style="display:none;">
+									<label>NO Of Trips</label>
+									<?php
+									$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+
+
+							<!-- cgst -->
+							<div class="form-row">
+								<div class="form-group col-md-6"></div>
+								<div class="form-group col-md-3">
+									<label>CGST In %</label>
+									<?php
+									$data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();');
+									echo form_input($data);
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>CGST Amt <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0.00), 'id' => 'AfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+
+							<!-- sgst -->
+							<div class="form-row" id="SGSTAddModel">
+								<div class="form-group col-md-6"></div>
+								<div class="form-group col-md-3">
+									<label>SGST In %</label>
+									<?php
+									$data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+									echo form_input($data);
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>SGST Amt <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0.00), 'id' => 'AfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+							<div class="form-row" id="IGSTAddModel" style="display:none;">
+								<div class="form-group col-md-6"></div>
+								<div class="form-group col-md-3">
+									<label>IGST In %</label>
+									<?php
+									$data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+									echo form_input($data);
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>IGST Amt <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0.00), 'id' => 'AfterIgst',  '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">
+									<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
+									<?php
+									$data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance', 0.00), 'id' => 'txtInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);');
+									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 ">
+									<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
+									<?php
+									$data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue', 0.00), 'id' => 'txtTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-12">
+									<label><?php echo "Revenue Description"; ?></label>
+									<?php
+									$data = array('name' => 'Service_Description', 'value' => set_value('Service_Description'), 'id' => 'Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
+									echo form_textarea($data);;
+									?>
+								</div>
+							</div>
+
+
+						</div>
+						<div class="modal-footer">
+
+							<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
+							<a class="btn btn-info waves-effect waves-light font AddRevenue" ID="AddRevenue"> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
+
+						</div>
+					</form>
+
+				</div>
 			</div>
+		</div><!-- /.modal -->
+ </div>
 
-			<form>
-				<div class="modal-body p-4">
-
-
-					<div class="form-row">
-						<div class="form-group col-md-3">
-							<label>Req No<span class="text-danger">*</span></label>
-							<div>
-								<?php
-								$RL = array("0" => 'Select Req No');
-								if (!empty($RequistionDetails)) {
-									foreach ($RequistionDetails as $SID) :
-										$RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
-									endforeach;
-								}
-
-								echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo" class="form-control"');
-
-								?>
-							</div>
-						</div>
-
-						<div class="form-group col-md-3">
-							<label>Department Name</label>
-
-							<?php
-							$data = array('name' => 'deptName', 'value' => set_value('deptName'), 'id' => 'deptName',  'class' => 'form-control', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-
-						</div>
-						<div class="form-group col-md-3">
-							<label>Cost Center Code</label>
-
-							<?php
-
-							$data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter',  'class' => 'form-control', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-
-						</div>
-						<div class="form-group col-md-3">
-							<label>Avl Bud Amt <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'AvlBudAmt', 'value' => set_value('AvlBudAmt'), 'id' => 'AvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-					<div class="form-row">
-						<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('MaterialCode'), 'id="MaterialCode" class="form-control"');
-
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-2">
-							<label>Item Name</label>
-
-							<?php
-							$data = array('name' => 'ItemName', 'value' => set_value('ItemName'), 'id' => 'ItemName',  'class' => 'form-control', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-
-						</div>
-						<div class="form-group col-md-1">
-							<label>UOM</label>
-
-							<?php
-							$data = array('name' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-
-						</div>
-						<div class="form-group col-md-2">
-							<label>Qty<span class="text-danger">*</span></label>
-							<?php
-							$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
-							echo form_input($data);
-							?>
-						</div>
-						<div class="form-group col-md-1">
-							<label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
-							<!-- <label>Rate</label> -->
-							<?php
-							$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
-							echo form_input($data);
-							?>
-						</div>
-						<div class="form-group col-md-2">
-							<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><?php echo "Basic Amt ($INRSYM)"; ?></label>
-							<!-- <label>Basic Amount</label> -->
-							<?php
-							$data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-
-					</div>
-					<div class="form-row" style="padding:0px;">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
-							<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('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType" class="form-control"');
-
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-2">
-							<label>Discount Rate </label>
-							<div class="form-group">
-								<?php
-								$data = array('name' => 'txtDiscount', 'value' => set_value('txtDiscount'), 'id' => 'txtDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();calculateDiscount(0);');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-2">
-							<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount', 0.00), 'id' => 'txtAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-
-					<div class="form-row" style="text-align:left;">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
-							<label>Packaging Type </label>
-							<div>
-								<?php
-								$options = array("0" => 'Select Packaging Type');
-								//print_r(  $options);
-
-								if (!empty($TaxType)) {
-									foreach ($TaxType as $SID) :
-
-
-										$options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-									endforeach;
-								}
-
-								echo form_dropdown('PackagingType', $options, set_value('PackagingType'), 'id="PackagingType" class="form-control "');
-
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-2">
-							<label>Packaging Rate </label>
-							<?php
-							$data = array('name' => 'txtPackaging', 'value' => set_value('txtPackaging'), 'id' => 'txtPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-							echo form_input($data);
-							?>
-						</div>
-						<div class="form-group col-md-2">
-							<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'txtAfterPackaging', 'value' => set_value('txtAfterPackaging', 0.00), 'id' => 'txtAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-
-					<div class="form-row">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
-							<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('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
-							?>
-						</div>
-						<div class="form-group col-md-2" id="TripsValue" style="display:none;">
-							<label>NO Of Trips</label>
-							<?php
-							$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
-							echo form_input($data);
-							?>
-						</div>
-						<div class="form-group col-md-2">
-							<label>Freight Rate </label>
-							<?php
-							$data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-							echo form_input($data);
-							?>
-						</div>
-						<div class="form-group col-md-2">
-							<label>Freight Amt <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight', 0.00), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-
-					</div>
-
-
-					<!-- cgst -->
-					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
-							<label>CGST In %</label>
-							<?php
-							$data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();');
-							echo form_input($data);
-							?>
-						</div>
-						<div class="form-group col-md-2">
-							<label>CGST Amt <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0.00), 'id' => 'AfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-
-					<!-- sgst -->
-					<div class="form-row" id="SGSTAddModel">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
-							<label>SGST In %</label>
-							<?php
-							$data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-							echo form_input($data);
-							?>
-						</div>
-						<div class="form-group col-md-2">
-							<label>SGST Amt <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0.00), 'id' => 'AfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-					<div class="form-row" id="IGSTAddModel" style="display:none;">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
-							<label>IGST In %</label>
-							<?php
-							$data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-							echo form_input($data);
-							?>
-						</div>
-						<div class="form-group col-md-2">
-							<label>IGST Amt <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0.00), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-
-					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-4">
-							<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
-							<?php
-							$data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance', 0.00), 'id' => 'txtInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-
-					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-4 ">
-							<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
-							<?php
-							$data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue', 0.00), 'id' => 'txtTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-					<div class="form-row">
-						<div class="form-group col-md-12">
-							<label><?php echo "Revenue Description"; ?></label>
-							<?php
-							$data = array('name' => 'Service_Description', 'value' => set_value('Service_Description'), 'id' => 'Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
-							echo form_textarea($data);;
-							?>
-						</div>
-					</div>
-
-
-				</div>
-				<div class="modal-footer">
-
-					<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
-					<a class="btn btn-info waves-effect waves-light font AddRevenue" ID="AddRevenue"> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
-
-				</div>
-			</form>
-
-		</div>
-	</div>
-</div><!-- /.modal -->
 <!-- Edit Model for revenue po -->
-<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
+ <div align="center">
+ <div id="EDITREVENUE" 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-content" align="left" style="width:1060px;">
 			<div class="modal-header">
 				<h4 class="modal-title">Edit Revenue Purchase Order Line Item </h4>
 				<button type="button" class="close" data-dismiss="modal"
@@ -2795,7 +2835,7 @@ if (!empty($INRSYMBOL)) {
 						</div>
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Item Code<span class="text-danger">*</span></label>
 							<div>
 								<?php
@@ -2807,7 +2847,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 class="form-group">
 								<?php
@@ -2816,7 +2856,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-1">
+						<div class="form-group col-md-3">
 							<label>UOM</label>
 							<div class="form-group">
 								<?php
@@ -2825,7 +2865,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 class="form-group">
 								<?php
@@ -2834,7 +2874,13 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+					
+
+					</div>
+
+					<div class="form-row">
+						<div class="form-group col-md-3"></div>
+				    	<div class="form-group col-md-3">
 							<label><?php echo "Rate  ($INRSYM)" ?><span class="text-danger">*</span></label>
 							<div class="form-group">
 								<?php
@@ -2843,12 +2889,12 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-1">
+						<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-2">
+						<div class="form-group col-md-3">
 							<label><?php echo "Basic Amt ($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -2857,12 +2903,11 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
-
 					</div>
 
 					<div class="form-row">
-						<div class="col-md-4"></div>
-						<div class="col-md-4">
+						<div class="col-md-3"></div>
+						<div class="col-md-3">
 							<label>Discount Type </label>
 							<div>
 								<?php
@@ -2883,7 +2928,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Discount Rate </label>
 							<div class="form-group">
 								<?php
@@ -2892,7 +2937,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Discounted Amt <?php echo "($INRSYM)" ?> </label>
 							<div class="form-group">
 								<?php
@@ -2902,9 +2947,10 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 					</div>
+
 					<div class="form-row" style="text-align:left;">
-						<div class="col-md-4"></div>
-						<div class="col-md-4">
+						<div class="col-md-3"></div>
+						<div class="col-md-3">
 							<label>Packaging Type </label>
 							<div>
 								<?php
@@ -2925,7 +2971,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Packaging Rate </label>
 							<div class="form-group">
 								<?php
@@ -2934,7 +2980,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Packaging Amt <?php echo "($INRSYM)" ?> </label>
 							<div class="form-group">
 								<?php
@@ -2944,9 +2990,10 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 					</div>
+
 					<div class="form-row">
-						<div class="col-md-4"></div>
-						<div class="col-md-4">
+						<div class="col-md-3"></div>
+						<div class="col-md-3">
 							<label>Freight Type </label>
 							<?php
 							$options = array("0" => 'Select Freight Type');
@@ -2957,32 +3004,38 @@ if (!empty($INRSYMBOL)) {
 							}
 							echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control "');
 							?>
-						</div>
-						<div class="form-group col-md-2" id="EditTripsValue" style="display:none;">
-							<label>NO Of Trips</label>
-							<?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-2">
+						</div>					
+						<div class="form-group col-md-3">
 							<label>Freight Rate </label>
 							<?php
 							$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
 							echo form_input($data);
 							?>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Freight Amt <?php echo "($INRSYM)" ?></label>
 							<?php
 							$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
 							echo form_input($data);
 							?>
 						</div>
+					
 					</div>
+
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
+						<div class="col-md-9"></div>
+						<div class="form-group col-md-3" id="EditTripsValue" style="display:none;">
+							<label>NO Of Trips</label>
+							<?php
+							$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
+							echo form_input($data);
+							?>
+						</div>
+					</div>
+
+					<div class="form-row">
+						<div class="form-group col-md-6"></div>
+						<div class="form-group col-md-3">
 							<label>CGST In %</label>
 							<div class="form-group">
 								<?php
@@ -2991,7 +3044,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>CGST Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -3005,8 +3058,8 @@ if (!empty($INRSYMBOL)) {
 
 					<div class="form-row" id="SGSTEditModel">
 
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-6"></div>
+						<div class="form-group col-md-3">
 							<label>SGST In %</label>
 							<div class="form-group">
 								<?php
@@ -3015,7 +3068,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>SGST Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -3026,10 +3079,11 @@ if (!empty($INRSYMBOL)) {
 						</div>
 
 					</div>
+
 					<div class="form-row" style="text-align:left;">
 						<div id="IGSTEditModel" style="display:none;">
-							<div class="col-md-8"></div>
-							<div class="form-group col-md-2">
+							<div class="col-md-6"></div>
+							<div class="form-group col-md-3">
 								<label>IGST In %</label>
 								<div class="form-group">
 									<?php
@@ -3038,7 +3092,7 @@ if (!empty($INRSYMBOL)) {
 									?>
 								</div>
 							</div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>IGST Amt <?php echo "($INRSYM)" ?></label>
 								<div class="form-group">
 									<?php
@@ -3051,8 +3105,8 @@ if (!empty($INRSYMBOL)) {
 					</div>
 
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-9"></div>
+						<div class="form-group col-md-3">
 							<label> Insurance Amt <?php echo "($INRSYM)" ?> (if Any)</label>
 							<div class="form-group">
 								<?php
@@ -3064,9 +3118,10 @@ if (!empty($INRSYMBOL)) {
 
 
 					</div>
+
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-9"></div>
+						<div class="form-group col-md-3">
 							<div class="form-group">
 								<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
 								<?php
@@ -3076,6 +3131,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 					</div>
+
 					<div class="form-row">
 						<div class="form-group col-md-12">
 							<label><?php echo "Reveneue Description"; ?></label>
@@ -3087,7 +3143,7 @@ if (!empty($INRSYMBOL)) {
 						</div>
 					</div>
 				</div>
-				<div class="modal-footer" style="border:none;>
+				<div class="modal-footer" style="border:none;">
 					<a class=" btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
 					<a class="btn btn-info waves-effect waves-light EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
 				</div>
@@ -3095,6 +3151,8 @@ if (!empty($INRSYMBOL)) {
 		</div>
 	</div>
 </div><!-- /.modal -->
+ </div>
+
 
 
 
diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php
index b574f10d..a2548db7 100755
--- a/app/Views/servicePurchaseorder.php
+++ b/app/Views/servicePurchaseorder.php
@@ -968,6 +968,10 @@ if (!empty($INRSYMBOL)) {
 									</table><!-- serviceTax table closed here -->
 								</div>
 							</div><!-- 7. form-row div closed here -->
+
+							
+							<br>
+
 							<div class="form-row" style="padding: 0px;">
 
 								<div class="form-group col-md-2">
@@ -1015,6 +1019,9 @@ if (!empty($INRSYMBOL)) {
 
 								</div><!--  col-md-2  div closed here -->
 							</div><!-- 8 form-row  div closed here -->
+
+							<br>
+
 							<div class="form-row">
 								<div class="form-group col-md-12">
 									<label>Description Of Service<span class="text-danger">*</label>
@@ -1025,6 +1032,10 @@ if (!empty($INRSYMBOL)) {
 									?>
 								</div><!--   div closed here -->
 							</div><!-- 9 form-row  div closed here -->
+
+							<br>
+
+
 							<div class="form-row" style="padding:0px;">
 								<div class="form-group col-md-12">
 									<label>Scope Of Work</label> <?php
@@ -1032,11 +1043,23 @@ if (!empty($INRSYMBOL)) {
 																	echo form_textarea($data); ?>
 								</div><!--   div closed here -->
 							</div><!-- 10 form-row  div closed here -->
+							
+
+							<br>
+
+							<div class="form-row">
+								<div class="form-group col-md-12">
+									<label for="POFile">Select Purchase Order File</label>
+								<input type="file" class="d-block" name="POFile" id="POFile"><br>
+								</div>
+							</div>
+							
+							
 							<div class="form-row">
 								<div class="form-group col-md-12">
 									<br />
 									<div align="right" style="padding-right:10px">
-										<input type="file" name="POFile" id="POFile"><br>
+										
 										<input type="hidden" name="txtStatus" id="txtStatus" />
 										<input type="hidden" name="txtRowCount" id="txtRowCount" />
 										<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
@@ -1059,566 +1082,585 @@ if (!empty($INRSYMBOL)) {
 		</div> <!-- container -->
 	</div> <!-- content -->
 </div>
-<div id="SERVICE" class="modal fade" tabindex="-1" role="dialog"
-	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-lg">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title">Add Service 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">
-						<div class="form-group col-md-3">
-							<label>Req No<span class="badge mandatory">*</span></label>
-							<div>
-								<?php
-								$RL = array("0" => 'Select Req No');
-								if (!empty($RequistionDetails)) {
-									foreach ($RequistionDetails as $SID) :
-										$RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
-									endforeach;
-								}
-
-								echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo" class="form-control"');
-
-								?>
-							</div>
-						</div>
-
-						<div class="form-group col-md-3">
-							<label>Department Name</label>
-							<div>
-								<?php
-								$data = array('name' => 'deptName', 'value' => set_value('deptName'), 'id' => 'deptName',  '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' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter',  'class' => 'form-control', 'readonly' => 'true');
-								echo form_input($data);
-
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-3">
-							<label>Avail Budget Amount <?php echo "($INRSYM)" ?></label>
-							<div>
-								<?php
-								$data = array('name' => 'AvlBudAmt', 'value' => set_value('AvlBudAmt'), 'id' => 'AvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-					</div><!-- SERVICE.1 closed here -->
-					<div class="form-row">
-						<div class="form-group col-md-3">
-							<label>Item Code<span class="badge mandatory">*</span></label>
-							<div>
-								<?php
-								$options = array("0" => 'Item Code');
-								//print_r(  $options);
-
-
-
-								echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode" class="form-control"');
-
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-3">
-							<label>Item Name</label>
-							<div>
-								<?php
-								$data = array('name' => 'ItemName', 'value' => set_value('ItemName'), 'id' => 'ItemName',  'class' => 'form-control', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-
-
-
-						<div class="form-group col-md-3" id="otherdescription">
-							<label>Item Description</label>
-							<div>
-								<?php
-								$data = array('name' => 'OtheritemDescription', 'value' => set_value('OtheritemDescription'), 'id' => 'OtheritemDescription',  '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' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control num', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-3">
-							<label>Service Schedule Type</label>
-							<div>
-								<?php
-								$data = array('name' => 'Frequency', 'value' => set_value('Frequency'), 'id' => 'Frequency',  'class' => 'form-control', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-								<input type="hidden" name="FrequencyNo" id="FrequencyNo" value="FrequencyNo" />
-							</div>
-						</div>
-
-
-					</div><!-- SERVICE.2 closed here -->
-					<div class="form-row">
-
-						<div class="form-group col-md-3">
-							<label>Quantity<span class="badge mandatory">*</span></label>
-							<div>
-								<?php
-								$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-3">
-							<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
-							<div>
-								<?php
-								$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
-								echo form_input($data);
-								?>
-							</div>
-						</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><?php echo "Basic Amount ($INRSYM)"; ?></label>
-							<div>
-								<?php
-								$data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-
-
-					</div><!-- SERVICE.3 closed here -->
-					<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' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'Ratechange();ChangeSgst();', 'onkeypress' => 'return isNumberKey(event);');
-								echo form_input($data);
-								?>
-							</div>
-
-						</div>
-						<div class="form-group col-md-3">
-							<div>
-
-								<?php
-								$data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst'), 'id' => 'AfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-
-						</div>
-
-					</div><!-- SERVICE.4 closed here -->
-					<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' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
-								echo form_input($data);
-								?>
-							</div>
-
-						</div>
-						<div class="form-group col-md-3">
-							<div>
-
-								<?php
-								$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst'), 'id' => 'AfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-
-						</div>
-
-					</div><!-- SERVICE.5 closed here -->
-					<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' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
-								echo form_input($data);
-								?>
-							</div>
-
-						</div>
-						<div class="form-group col-md-3">
-							<div>
-
-								<?php
-								$data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst'), 'id' => 'AfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-
-						</div>
-
-					</div><!-- SERVICE.6 closed here -->
-					<div class="form-row">
-						<div class="form-group col-md-9" align="right">
-							<label>Other Allowances <?php echo "($INRSYM)" ?></label>
-						</div>
-						<div class="form-group col-md-3">
-							<div>
-								<?php
-								$data = array('name' => 'OtherAllowances', 'value' => set_value('OtherAllowances', 0), 'id' => 'OtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-					</div><!-- SERVICE.7 closed here -->
-					<div class="form-row">
-						<div class="form-group col-md-9" align="right">
-							<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
-						</div>
-						<div class="form-group col-md-3">
-							<div>
-								<?php
-								$data = array('name' => 'TotalOrderValue', 'value' => set_value('TotalOrderValue'), 'id' => 'TotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total value', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-					</div><!-- SERVICE.8 closed here -->
-
-
-					<div class="form-row">
-						<div class="form-group col-md-12">
-							<label>Service Description </label>
-
-
-							<?php
-							$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-							echo form_textarea($data); ?>
-						</div>
-					</div><!-- SERVICE  -->
 
+<div align="center">
+	<div id="SERVICE" class="modal fade" tabindex="-1" role="dialog"
+		aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+		<div class="modal-dialog modal-full-width">
+			<div class="modal-content" style="width: 1060px;">
+				<div class="modal-header">
+					<h4 class="modal-title">Add Service Purchase Order Item</h4>
+					<button type="button" class="close" data-dismiss="modal"
+						aria-hidden="true">×</button>
 				</div>
-				<div class="modal-footer">
-					<div class="form-row">
-						<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel" style="margin-right: 10px;">Cancel</a>
-						<a class="btn btn-info waves-effect waves-light font AddService" id="AddService"> &nbsp;&nbsp;<span class="bold">Add Service</span></a>
-					</div>
-				</div><!-- SERVICE modal-footer closed here -->
-		</div>
-		</form><!-- SERVICE form closed here -->
+				<form>
+					<div class="modal-body p-4">
 
+					<div align="left">
+
+
+					<div class="form-row">
+							<div class="form-group col-md-3">
+								<label>Req No<span class="badge mandatory">*</span></label>
+								<div>
+									<?php
+									$RL = array("0" => 'Select Req No');
+									if (!empty($RequistionDetails)) {
+										foreach ($RequistionDetails as $SID) :
+											$RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
+										endforeach;
+									}
+
+									echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo" class="form-control"');
+
+									?>
+								</div>
+							</div>
+
+							<div class="form-group col-md-3">
+								<label>Department Name</label>
+								<div>
+									<?php
+									$data = array('name' => 'deptName', 'value' => set_value('deptName'), 'id' => 'deptName',  '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' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+
+									?>
+								</div>
+							</div>
+							<div class="form-group col-md-3">
+								<label>Avail Budget Amount <?php echo "($INRSYM)" ?></label>
+								<div>
+									<?php
+									$data = array('name' => 'AvlBudAmt', 'value' => set_value('AvlBudAmt'), 'id' => 'AvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+						</div><!-- SERVICE.1 closed here -->
+						<div class="form-row">
+							<div class="form-group col-md-3">
+								<label>Item Code<span class="badge mandatory">*</span></label>
+								<div>
+									<?php
+									$options = array("0" => 'Item Code');
+									//print_r(  $options);
+
+
+
+									echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode" class="form-control"');
+
+									?>
+								</div>
+							</div>
+							<div class="form-group col-md-3">
+								<label>Item Name</label>
+								<div>
+									<?php
+									$data = array('name' => 'ItemName', 'value' => set_value('ItemName'), 'id' => 'ItemName',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+
+
+
+							<div class="form-group col-md-3" id="otherdescription">
+								<label>Item Description</label>
+								<div>
+									<?php
+									$data = array('name' => 'OtheritemDescription', 'value' => set_value('OtheritemDescription'), 'id' => 'OtheritemDescription',  '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' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+							<div class="form-group col-md-3">
+								<label>Service Schedule Type</label>
+								<div>
+									<?php
+									$data = array('name' => 'Frequency', 'value' => set_value('Frequency'), 'id' => 'Frequency',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+									<input type="hidden" name="FrequencyNo" id="FrequencyNo" value="FrequencyNo" />
+								</div>
+							</div>
+
+
+						</div><!-- SERVICE.2 closed here -->
+						<div class="form-row">
+
+							<div class="form-group col-md-3">
+								<label>Quantity<span class="badge mandatory">*</span></label>
+								<div>
+									<?php
+									$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+							<div class="form-group col-md-3">
+								<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
+								<div>
+									<?php
+									$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
+									echo form_input($data);
+									?>
+								</div>
+							</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><?php echo "Basic Amount ($INRSYM)"; ?></label>
+								<div>
+									<?php
+									$data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+
+
+						</div><!-- SERVICE.3 closed here -->
+						<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' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'Ratechange();ChangeSgst();', 'onkeypress' => 'return isNumberKey(event);');
+									echo form_input($data);
+									?>
+								</div>
+
+							</div>
+							<div class="form-group col-md-3">
+								<div>
+
+									<?php
+									$data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst'), 'id' => 'AfterCgst',  'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+
+							</div>
+
+						</div><!-- SERVICE.4 closed here -->
+						<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' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
+									echo form_input($data);
+									?>
+								</div>
+
+							</div>
+							<div class="form-group col-md-3">
+								<div>
+
+									<?php
+									$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst'), 'id' => 'AfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+
+							</div>
+
+						</div><!-- SERVICE.5 closed here -->
+						<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' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
+									echo form_input($data);
+									?>
+								</div>
+
+							</div>
+							<div class="form-group col-md-3">
+								<div>
+
+									<?php
+									$data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst'), 'id' => 'AfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+
+							</div>
+
+						</div><!-- SERVICE.6 closed here -->
+						<div class="form-row">
+							<div class="form-group col-md-9" align="right">
+								<label>Other Allowances <?php echo "($INRSYM)" ?></label>
+							</div>
+							<div class="form-group col-md-3">
+								<div>
+									<?php
+									$data = array('name' => 'OtherAllowances', 'value' => set_value('OtherAllowances', 0), 'id' => 'OtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'Ratechange()', 'onkeypress' => 'return isNumberKey(event);');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+						</div><!-- SERVICE.7 closed here -->
+						<div class="form-row">
+							<div class="form-group col-md-9" align="right">
+								<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
+							</div>
+							<div class="form-group col-md-3">
+								<div>
+									<?php
+									$data = array('name' => 'TotalOrderValue', 'value' => set_value('TotalOrderValue'), 'id' => 'TotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total value', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+						</div><!-- SERVICE.8 closed here -->
+
+
+						<div class="form-row">
+							<div class="form-group col-md-12">
+								<label>Service Description </label>
+
+
+								<?php
+								$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+								echo form_textarea($data); ?>
+							</div>
+						</div><!-- SERVICE  -->
+
+					</div>
+
+
+					</div>
+					<div class="modal-footer">
+						<div class="form-row">
+							<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel" style="margin-right: 10px;">Cancel</a>
+							<a class="btn btn-info waves-effect waves-light font AddService" id="AddService"> &nbsp;&nbsp;<span class="bold">Add Service</span></a>
+						</div>
+					</div><!-- SERVICE modal-footer closed here -->
+			</div>
+			</form><!-- SERVICE form closed here -->
+
+		</div>
 	</div>
 </div>
+
 </div><!-- /.modal -->
-<div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog"
-	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-lg">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title">Edit Service 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">
-						<div class="form-group col-md-3">
-							<label>Req No<span class="badge mandatory">*</span></label>
-							<div>
-								<?php
 
-								$data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div><!-- EDITSERVICE.1.1 col-md-3 closed here -->
-						<div class="form-group col-md-3">
-							<label>Department Name</label>
-							<div>
-								<?php
-								$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div><!-- EDITSERVICE.1.2 col-md-3 closed here -->
-						<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><!-- EDITSERVICE.1.3 col-md-3 closed here -->
-						<div class="form-group col-md-3">
-							<label>Avail Budget Amount <?php echo "($INRSYM)" ?></label>
-							<div>
-								<?php
-								$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div><!-- EDITSERVICE.1.4 col-md-3 closed here -->
-					</div><!-- EDITSERVICE.1 form-row closed here -->
-					<div class="form-row">
-						<div class="form-group col-md-3">
-							<label>Item Code<span class="badge mandatory" #fff ;">*</span></label>
-							<div>
-								<?php
-								$options = array("0" => 'Item Code');
-								//print_r(  $options);
-
-								echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
-
-								?>
-							</div>
-						</div><!-- EDITSERVICE.2.1 col-md-3 closed here -->
-						<div class="form-group col-md-3">
-							<label>Item Name</label>
-							<div>
-								<?php
-								$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div><!-- EDITSERVICE.2.2 col-md-3 closed here 
-						<div class="form-group col-md-3" id=EditotherDescription>
-							<label>Item Description</label>
-							<div>
-								<?php
-								$data = array('name' => 'EditOtheritemDescription', 'value' => set_value('EditOtheritemDescription'), 'id' => 'EditOtheritemDescription',  'class' => 'form-control', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div> EDITSERVICE.2.3 col-md-3 closed here -->
-						<div class="form-group col-md-3">
-							<label>UOM</label>
-							<div>
-								<?php
-								$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control num', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div><!-- EDITSERVICE.2.4 col-md-3 closed here -->
-						<div class="form-group col-md-3">
-							<label>Service Schedule Type</label>
-							<div>
-								<?php
-								$data = array('name' => 'EditFrequency', 'value' => set_value('EditFrequency'), 'id' => 'EditFrequency',  'class' => 'form-control', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-								<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />
-							</div>
-						</div><!-- EDITSERVICE.2.5 col-md-3 closed here -->
-					</div><!-- EDITSERVICE.2 form-row closed here -->
-					<div class="form-row">
-						<div class="form-group col-md-3">
-							<label>Quantity<span class="badge mandatory">*</span></label>
-							<div>
-								<?php
-								$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
-								echo form_input($data);
-								?>
-							</div>
-						</div><!-- EDITSERVICE.3.1 col-md-3 closed here -->
-						<div class="form-group col-md-3">
-							<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
-							<div>
-								<?php
-								$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
-								echo form_input($data);
-								?>
-							</div>
-						</div><!-- EDITSERVICE.3.2 col-md-3 closed here -->
-						<div class="form-group col-md-3">
-							<label>Per</label><!--date should be come-->
-							<?php
-							$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
-							echo form_input($data); ?>
-						</div><!-- EDITSERVICE.3.3 col-md-3 closed here -->
-						<div class="form-group col-md-3">
-							<label><?php echo "Basic Amount ($INRSYM)"; ?></label>
-							<div>
-								<?php
-								$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div><!-- EDITSERVICE.3.4 col-md-3 closed here -->
-					</div><!-- EDITSERVICE.3 form-row closed here -->
-
-					<div class="form-row">
-						<div class="form-group col-md-6" align="right">
-							CGST In %
-						</div><!-- EDITSERVICE.4.1 col-md-6 closed here -->
-						<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><!-- EDITSERVICE.4.2 col-md-3 closed here -->
-						<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><!-- EDITSERVICE.4.3 col-md-3 closed here -->
-					</div><!-- EDITSERVICE.4 form-row closed here -->
-					<div class="form-row">
-						<div class="form-group col-md-6" align="right">
-							SGST In %
-						</div><!-- EDITSERVICE.5.1 col-md-6 closed here -->
-
-						<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><!-- EDITSERVICE.5.2 col-md-3 closed here -->
-						<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><!-- EDITSERVICE.5.3 col-md-3 closed here -->
-
-					</div><!-- EDITSERVICE.5 form-row closed here -->
-
-					<div class="form-row">
-						<div class="form-group col-md-6" align="right">
-
-							IGST In %
-						</div><!-- EDITSERVICE.6.1 col-md-6 closed here -->
-
-						<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><!-- EDITSERVICE.6.2 col-md-3 closed here -->
-						<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><!-- EDITSERVICE.6.3 col-md-3 closed here -->
-
-					</div><!-- EDITSERVICE.6 form-row closed here -->
-					<div class="form-row">
-						<div class="col-md-5 col-md-offset-4" align="right">
-							<label>Other Allowances <?php echo "($INRSYM)" ?></label>
-						</div><!-- EDITSERVICE.7.1 col-md-5 col-md-offset-4 closed here -->
-						<div class="form-group col-md-3">
-							<div>
-								<?php
-								$data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances', 0), 'id' => 'EditOtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
-								echo form_input($data);
-								?>
-							</div>
-						</div><!-- EDITSERVICE.7.2 col-md-3 closed here -->
-					</div><!-- EDITSERVICE.7 form-row closed here -->
-					<div class="form-row">
-						<div class="col-md-5 col-md-offset-4" align="right">
-							<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
-						</div>
-						<div class="form-group col-md-3">
-							<div>
-								<?php
-								$data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total value', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-					</div><!-- EDITSERVICE.8 form-row closed here -->
-
-					<div class="form-row">
-						<div class="form-group col-md-12">
-							<label>Service Description </label>
-							<?php
-							$data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-							echo form_textarea($data); ?>
-						</div>
-					</div><!-- EDITSERVICE.9 form-row closed here -->
+<div align="center">
 
+	<div id="EDITSERVICE" 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 Service Purchase Order Item</h4>
+					<button type="button" class="close" data-dismiss="modal"
+						aria-hidden="true">×</button>
 				</div>
-				<div class="modal-footer">
-					<div class="form-row">
-						<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
-						<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
-					</div>
-				</div><!-- EDITSERVICE modal-footer closed here -->
-			</form><!-- EDITSERVICE form closed here -->
+				<form>
+					<div align="left">
+						<div class="modal-body p-4">
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Req No<span class="badge mandatory">*</span></label>
+									<div>
+										<?php
 
+										$data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
+										echo form_input($data);
+										?>
+									</div>
+								</div><!-- EDITSERVICE.1.1 col-md-3 closed here -->
+								<div class="form-group col-md-3">
+									<label>Department Name</label>
+									<div>
+										<?php
+										$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
+										echo form_input($data);
+										?>
+									</div>
+								</div><!-- EDITSERVICE.1.2 col-md-3 closed here -->
+								<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><!-- EDITSERVICE.1.3 col-md-3 closed here -->
+								<div class="form-group col-md-3">
+									<label>Avail Budget Amount <?php echo "($INRSYM)" ?></label>
+									<div>
+										<?php
+										$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+										echo form_input($data);
+										?>
+									</div>
+								</div><!-- EDITSERVICE.1.4 col-md-3 closed here -->
+							</div><!-- EDITSERVICE.1 form-row closed here -->
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Item Code<span class="badge mandatory" #fff ;">*</span></label>
+									<div>
+										<?php
+										$options = array("0" => 'Item Code');
+										//print_r(  $options);
+
+										echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
+
+										?>
+									</div>
+								</div><!-- EDITSERVICE.2.1 col-md-3 closed here -->
+								<div class="form-group col-md-3">
+									<label>Item Name</label>
+									<div>
+										<?php
+										$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
+										echo form_input($data);
+										?>
+									</div>
+								</div><!-- EDITSERVICE.2.2 col-md-3 closed here 
+								<div class="form-group col-md-3" id=EditotherDescription>
+									<label>Item Description</label>
+									<div>
+										<?php
+										$data = array('name' => 'EditOtheritemDescription', 'value' => set_value('EditOtheritemDescription'), 'id' => 'EditOtheritemDescription',  'class' => 'form-control', 'readonly' => 'true');
+										echo form_input($data);
+										?>
+									</div>
+								</div> EDITSERVICE.2.3 col-md-3 closed here -->
+								<div class="form-group col-md-3">
+									<label>UOM</label>
+									<div>
+										<?php
+										$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control num', 'readonly' => 'true');
+										echo form_input($data);
+										?>
+									</div>
+								</div><!-- EDITSERVICE.2.4 col-md-3 closed here -->
+								<div class="form-group col-md-3">
+									<label>Service Schedule Type</label>
+									<div>
+										<?php
+										$data = array('name' => 'EditFrequency', 'value' => set_value('EditFrequency'), 'id' => 'EditFrequency',  'class' => 'form-control', 'readonly' => 'true');
+										echo form_input($data);
+										?>
+										<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />
+									</div>
+								</div><!-- EDITSERVICE.2.5 col-md-3 closed here -->
+							</div><!-- EDITSERVICE.2 form-row closed here -->
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Quantity<span class="badge mandatory">*</span></label>
+									<div>
+										<?php
+										$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
+										echo form_input($data);
+										?>
+									</div>
+								</div><!-- EDITSERVICE.3.1 col-md-3 closed here -->
+								<div class="form-group col-md-3">
+									<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
+									<div>
+										<?php
+										$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
+										echo form_input($data);
+										?>
+									</div>
+								</div><!-- EDITSERVICE.3.2 col-md-3 closed here -->
+								<div class="form-group col-md-3">
+									<label>Per</label><!--date should be come-->
+									<?php
+									$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
+									echo form_input($data); ?>
+								</div><!-- EDITSERVICE.3.3 col-md-3 closed here -->
+								<div class="form-group col-md-3">
+									<label><?php echo "Basic Amount ($INRSYM)"; ?></label>
+									<div>
+										<?php
+										$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+										echo form_input($data);
+										?>
+									</div>
+								</div><!-- EDITSERVICE.3.4 col-md-3 closed here -->
+							</div><!-- EDITSERVICE.3 form-row closed here -->
+
+							<div class="form-row">
+								<div class="form-group col-md-6" align="right">
+									CGST In %
+								</div><!-- EDITSERVICE.4.1 col-md-6 closed here -->
+								<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><!-- EDITSERVICE.4.2 col-md-3 closed here -->
+								<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><!-- EDITSERVICE.4.3 col-md-3 closed here -->
+							</div><!-- EDITSERVICE.4 form-row closed here -->
+							<div class="form-row">
+								<div class="form-group col-md-6" align="right">
+									SGST In %
+								</div><!-- EDITSERVICE.5.1 col-md-6 closed here -->
+
+								<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><!-- EDITSERVICE.5.2 col-md-3 closed here -->
+								<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><!-- EDITSERVICE.5.3 col-md-3 closed here -->
+
+							</div><!-- EDITSERVICE.5 form-row closed here -->
+
+							<div class="form-row">
+								<div class="form-group col-md-6" align="right">
+
+									IGST In %
+								</div><!-- EDITSERVICE.6.1 col-md-6 closed here -->
+
+								<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><!-- EDITSERVICE.6.2 col-md-3 closed here -->
+								<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><!-- EDITSERVICE.6.3 col-md-3 closed here -->
+
+							</div><!-- EDITSERVICE.6 form-row closed here -->
+							<div class="form-row">
+								<div class="col-md-5 col-md-offset-4" align="right">
+									<label>Other Allowances <?php echo "($INRSYM)" ?></label>
+								</div><!-- EDITSERVICE.7.1 col-md-5 col-md-offset-4 closed here -->
+								<div class="form-group col-md-3">
+									<div>
+										<?php
+										$data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances', 0), 'id' => 'EditOtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
+										echo form_input($data);
+										?>
+									</div>
+								</div><!-- EDITSERVICE.7.2 col-md-3 closed here -->
+							</div><!-- EDITSERVICE.7 form-row closed here -->
+							<div class="form-row">
+								<div class="col-md-5 col-md-offset-4" align="right">
+									<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
+								</div>
+								<div class="form-group col-md-3">
+									<div>
+										<?php
+										$data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total value', 'readonly' => 'true');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+							</div><!-- EDITSERVICE.8 form-row closed here -->
+
+							<div class="form-row">
+								<div class="form-group col-md-12">
+									<label>Service Description </label>
+									<?php
+									$data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+									echo form_textarea($data); ?>
+								</div>
+							</div><!-- EDITSERVICE.9 form-row closed here -->
+
+						</div>
+					</div>
+					
+					<div class="modal-footer">
+						<div class="form-row">
+							<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
+							<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
+						</div>
+					</div><!-- EDITSERVICE modal-footer closed here -->
+				</form><!-- EDITSERVICE form closed here -->
+
+			</div>
 		</div>
-	</div>
-</div><!-- /.modal -->
+	</div><!-- /.modal -->
+
+
+</div>
 
 
 <!-- <script type="text/html" id="ServiceList">