diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php
index e1da44f6..f9e9c900 100755
--- a/app/Controllers/Purchaseorder.php
+++ b/app/Controllers/Purchaseorder.php
@@ -2944,6 +2944,9 @@ class Purchaseorder extends BaseController
           $POList['POFile'] = $requestfilename;
         }
       }
+    }else{
+      log_message('error', 'File Upload not Done' . $requestfilename);
+      return json_encode($this->requestr);
     }
     $POMaster  = $this->purchaseorder_model->updatePOMaster($PONO, $POList);
 
@@ -3033,7 +3036,7 @@ class Purchaseorder extends BaseController
       $DiscountType = $this->request->getPost('DisType' . $i);
       $DiscountValue = $this->request->getPost('DisVal' . $i);
       $AfterDiscount = $this->request->getPost('AfterDisVal' . $i);
-      $TaxtotalOrderValue = $itemRate * $Quantity + $OtherAmt + $AfterCgst + $AfterSgst + $AfterIgst - $AfterDiscount;
+      $TaxtotalOrderValue = (float)$itemRate * (float)$Quantity + (float)$OtherAmt + (float)$AfterCgst + (float)$AfterSgst + (float)$AfterIgst - (float)$AfterDiscount;
 
 
       $OtherAmt = $this->request->getPost('OtherAmt' . $i);
diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php
index ae7c68a5..0a36e987 100755
--- a/app/Views/capitalpurchaseorder.php
+++ b/app/Views/capitalpurchaseorder.php
@@ -90,12 +90,14 @@ if (!empty($INRSYMBOL)) {
 
 ?>
 <style>
-        #mceu_1{
+    #mceu_1 {
         border-width: 0px 0px 0px !important;
     }
-    #mceu_0{
+
+    #mceu_0 {
         padding: 1px !important;
     }
+
     .modal {
         overflow: auto !important;
     }
@@ -1197,275 +1199,261 @@ if (!empty($INRSYMBOL)) {
                                 ?>
                             </div>
                         </div>
+                    </span>
 
-
-                        <div class="form-row" style="padding:1%;"></div>
-                        <div class="form-row" id="ModalImportTaxHide">
-                            <br />
-                            <div class="form-group col-md-6" style="padding:10px;">
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        Basic Price <?php echo "($INR)" ?>
-                                    </div>
-                                    <div class="form-group col-md-4" style="display:none;">
-                                        <?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 class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
+                    <div class="form-row" style="padding:1%;"></div>
+                    <div class="form-row" id="ModalImportTaxHide" style="border:1px solid #000;padding:0px;">
+                        <br />
+                        <div class="form-group col-md-6" style="padding:10px;">
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    Basic Price <?php echo "($INR)" ?>
                                 </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        Landing charge<?php echo "($INR)" ?>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'LandingCharge', 'value' => set_value('LandingCharge'), 'id' => 'LandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge'), 'id' => 'AfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
+                                <div class="form-group col-md-4" 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 class="form-row">
-                                    <div class="form-group col-md-4">
-                                        Assessable Value (A)<?php echo "($INR)" ?>
-                                    </div>
-                                    <div class="form-group col-md-4" style="display: none;">
-                                        <?php
-                                        $data = array('name' => 'Highseas ', 'value' => set_value('Highseas'), 'id' => 'Highseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                        echo form_input($data);
-                                        ?>
-
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'AfterAssessable', 'value' => set_value('AfterAssessable'), 'id' => 'AfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        Custom duty (B)<?php echo "($INR)" ?>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'Customduty', 'value' => set_value('Customduty'), 'id' => 'Customduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'AfterCustomduty', 'value' => set_value('AfterCustomduty'), 'id' => 'AfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        Custom ED_cess (C)
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'CustomEDcess', 'value' => set_value('CustomEDcess'), 'id' => 'CustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess'), 'id' => 'AfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        Custom S & H cess (D)
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'CustomSHcess', 'value' => set_value('CustomSHcess'), 'id' => 'CustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'AfterCustomSHcess', 'value' => set_value('AfterCustomSHcess'), 'id' => 'AfterCustomSHcess',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
+                                <div class="form-group col-md-4">
+                                    <?php
+                                    $data = array('name' => 'AfterBasicPriceTax', 'value' => set_value('AfterBasicPriceTax'), 'id' => 'AfterBasicPriceTax',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
                                 </div>
                             </div>
-                            <div class="form-group col-md-6" style="padding:10px;">
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        Subtotal (E) <?php echo "($INR)  (A+B+C+D)" ?>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <div style="display: none;">
-                                            <?php
-                                            $data = array('name' => 'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty'), 'id' => 'AdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'Subtotal', 'value' => set_value('Subtotal'), 'id' => 'Subtotal',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    Landing charge<?php echo "($INR)" ?>
                                 </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        <!-- Additional Excise duty : (g) -->
-                                        <!--  <label><?php echo "IGST on (F) ($INR)"; ?></label> -->
-
-                                        IGST on (E) (F)<?php echo "($INR)"; ?>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'Igst ', 'value' => set_value('Igst', 0), 'id' => 'IgstInt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'AfterIgstInt', 'value' => set_value('AfterIgstInt', 0), 'id' => 'AfterIgstInt',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
+                                <div class="form-group col-md-4">
+                                    <?php
+                                    $data = array('name' => 'LandingCharge', 'value' => set_value('LandingCharge'), 'id' => 'LandingCharge',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                    echo form_input($data);
+                                    ?>
                                 </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-8">
-                                        Total Duty (G) <?php echo "($INR) (B+C+D+F)" ?>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'Grossdutypayable ', 'value' => set_value('Grossdutypayable'), 'id' => 'Grossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
+                                <div class="form-group col-md-4">
+                                    <?php
+                                    $data = array('name' => 'AfterLandingCharge', 'value' => set_value('AfterLandingCharge'), 'id' => 'AfterLandingCharge',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
                                 </div>
-
-                                <div class="form-row" style="padding:0px;">
-                                    <div class="form-group col-md-3" id="TripsValueafterHide"></div>
-                                    <div class="form-group col-md-3">
-                                        <span>Freight Type </span>
-                                        <?php
-                                        $options = array("0" => 'Select Freight Type');
-                                        //print_r(  $options);
-                                        if (!empty($FreightType)) {
-                                            foreach ($FreightType as $SID) :
-                                                $options[$SID->ConfigValue] =  $SID->ConfigValue;
-                                            endforeach;
-                                        }
-                                        echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
-                                        ?>
-                                    </div>
-                                    <div class="form-group col-md-3" id="TripsValue" style="display:none;">
-                                        <span>NO Of Trips</span>
-                                        <?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-3">
-                                        <span>Freight Rate </span>
-                                        <?php
-                                        $data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
-                                        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' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    Assessable Value (A)<?php echo "($INR)" ?>
                                 </div>
-
-                                <div class="form-row">
-                                    <center> <label>Cost of the product Per UOM</label></center>
-                                    <hr />
-                                </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        Duty Impact
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact'), 'id' => 'DutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                    <div class="form-group col-md-4" style="margin-top: -3.1%">
-                                        <span>Quantity</span>
-                                        <?php
-                                        $data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-                                <div class="form-row">
-                                    <div class="form-group col-md-4">
-                                        Custom Duty<?php echo " ($INR)/UOM" ?>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
+                                <div class="form-group col-md-4" style="display: none;">
+                                    <?php
+                                    $data = array('name' => 'Highseas ', 'value' => set_value('Highseas'), 'id' => 'Highseas',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                    echo form_input($data);
+                                    ?>
 
                                 </div>
-                                <div class="form-row">
-
-                                    <div class="form-group col-md-4">
-                                        Clearing Charges <?php echo "($INR)" ?>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?php
-                                        $data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-
-                                    <div class="form-group col-md-4">
-                                        <!-- RMC Including Customers -->
-                                        <label><?php echo "Nett per UOM($INR)"; ?></label>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                        <?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 class="form-group col-md-4">
+                                    <?php
+                                    $data = array('name' => 'AfterAssessable', 'value' => set_value('AfterAssessable'), 'id' => 'AfterAssessable',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    Custom duty (B)<?php echo "($INR)" ?>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <?php
+                                    $data = array('name' => 'Customduty', 'value' => set_value('Customduty'), 'id' => 'Customduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <?php
+                                    $data = array('name' => 'AfterCustomduty', 'value' => set_value('AfterCustomduty'), 'id' => 'AfterCustomduty',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    Custom ED_cess (C)
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <?php
+                                    $data = array('name' => 'CustomEDcess', 'value' => set_value('CustomEDcess'), 'id' => 'CustomEDcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <?php
+                                    $data = array('name' => 'AfterCustomEDcess', 'value' => set_value('AfterCustomEDcess'), 'id' => 'AfterCustomEDcess',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    Custom S & H cess (D)
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <?php
+                                    $data = array('name' => 'CustomSHcess', 'value' => set_value('CustomSHcess'), 'id' => 'CustomSHcess',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <?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 class="form-group col-md-6" style="padding:10px;">
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    Subtotal (E) <?php echo "($INR)  (A+B+C+D)" ?>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <div style="display: none;">
+                                        <?php
+                                        $data = array('name' => 'AdditionalExciseduty ', 'value' => set_value('AdditionalExciseduty'), 'id' => 'AdditionalExciseduty',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <?php
+                                    $data = array('name' => 'Subtotal', 'value' => set_value('Subtotal'), 'id' => 'Subtotal',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-4">
+                                    <!-- Additional Excise duty : (g) -->
+                                    <!--  <label><?php echo "IGST on (F) ($INR)"; ?></label> -->
+
+                                    IGST on (E) (F)<?php echo "($INR)"; ?>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <?php
+                                    $data = array('name' => 'Igst ', 'value' => set_value('Igst', 0), 'id' => 'IgstInt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <?php
+                                    $data = array('name' => 'AfterIgstInt', 'value' => set_value('AfterIgstInt', 0), 'id' => 'AfterIgstInt',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-8">
+                                    Total Duty (G) <?php echo "($INR) (B+C+D+F)" ?>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <?php
+                                    $data = array('name' => 'Grossdutypayable ', 'value' => set_value('Grossdutypayable'), 'id' => 'Grossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+
+                            <div class="form-row" style="padding:0px;">
+                                <div class="form-group col-md-3" id="TripsValueafterHide"></div>
+                                <div class="form-group col-md-3">
+                                    <span>Freight Type </span>
+                                    <?php
+                                    $options = array("0" => 'Select Freight Type');
+                                    //print_r(  $options);
+                                    if (!empty($FreightType)) {
+                                        foreach ($FreightType as $SID) :
+                                            $options[$SID->ConfigValue] =  $SID->ConfigValue;
+                                        endforeach;
+                                    }
+                                    echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
+                                    ?>
+                                </div>
+                                <div class="form-group col-md-3" id="TripsValue" style="display:none;">
+                                    <span>NO Of Trips</span>
+                                    <?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-3">
+                                    <span>Freight Rate </span>
+                                    <?php
+                                    $data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
+                                    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' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+
+                            <div class="form-row">
+                                <center> <label>Cost of the product Per UOM</label></center>
+                                <hr />
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-6">
+                                <label>Duty Impact</label>
+                                    <?php
+                                    $data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact'), 'id' => 'DutyImpact',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                                <div class="form-group col-md-6">
+                                    <label>Quantity</label>
+                                    <?php
+                                    $data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-6">
+                                <label> Custom Duty<?php echo " ($INR)/UOM" ?></label>
+                                    <?php
+                                    $data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                            </div>
+                            <div class="form-row">
+
+                                <div class="form-group col-md-6">
+                                <label> Clearing Charges <?php echo "($INR)" ?></label>
+                                    <?php
+                                    $data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                                <div class="form-group col-md-6">
+                                    <!-- RMC Including Customers -->
+                                    <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                    <?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>
+                    </div>
 
                     </span>
 
@@ -1822,7 +1810,7 @@ if (!empty($INRSYMBOL)) {
 
                     </div>
                     <div class="form-row" style="padding:1%;"></div>
-                    <div class="form-row" style="padding:0px;" id="EditModalImportTaxHide">
+                    <div class="form-row" style="padding:0px;border:1px solid" id="EditModalImportTaxHide">
                         <br />
                         <div class="form-group col-md-6" style="padding:10px;text-align:left;">
                             <div class="form-row">
@@ -2190,13 +2178,13 @@ if (!empty($INRSYMBOL)) {
                     </div>
                     <div class="form-group col-md-3">
                         <div class="form-check form-check-inline">
-                            <input class="form-check-input" type="radio" name="optcapital" id="optcapitalYes" value="0">
+                            <input class="form-check-input" type="radio" name="optcapital" id="optcapital" checked="checked" value="0">
                             <label class="form-check-label" for="optcapitalYes">YES</label>
                         </div>
                     </div>
                     <div class="form-group col-md-3">
                         <div class="form-check form-check-inline">
-                            <input class="form-check-input" type="radio" name="optcapital" id="optcapitalNo" value="1" checked>
+                            <input class="form-check-input" type="radio" name="optcapital" id="optcapital" value="1" checked>
                             <label class="form-check-label" for="optcapitalNo">NO</label>
                         </div>
                     </div>
@@ -5065,6 +5053,8 @@ if (!empty($INRSYMBOL)) {
 
         capitalType1 = $("input:radio[name='optcapital']:checked").val();
 
+        console.log(capitalType1);
+        console.log(capitalType1 == 0);
 
         if (capitalType1 == 0) {
             capitalType = 'International';
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index e90d75a5..48e4de67 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -221,12 +221,14 @@ if (!empty($getlogpodtl)) {
 
 ?>
 <style>
-      #mceu_1{
-        border-width: 0px 0px 0px !important;
-    }
-    #mceu_0{
-        padding: 1px !important;
-    }
+  #mceu_1 {
+    border-width: 0px 0px 0px !important;
+  }
+
+  #mceu_0 {
+    padding: 1px !important;
+  }
+
   .modal {
     overflow: auto !important;
   }
@@ -639,7 +641,7 @@ if (!empty($getlogpodtl)) {
                   <label>Exchange Rate On</label>
                   <div class="form-group">
                     <?php
-                    $data = array('type' => 'date', 'name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+                    $data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon',  'class' => 'form-control num date-picker-common', 'required' => 'true', 'onkeypress' => 'return false;');
                     echo form_input($data);
                     ?>
                   </div>
@@ -1733,12 +1735,8 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-          </div>
-
-          <div class="form-row" style="padding:2px">
             <div class="form-group col-md-3">
             </div>
-
             <div class="form-group col-md-3">
               <label>Freight Type </label>
               <?php
@@ -1774,10 +1772,6 @@ if (!empty($getlogpodtl)) {
               echo form_input($data);
               ?>
             </div>
-
-          </div>
-
-          <div class="form-row" style="padding:2px">
             <div class="form-group col-md-6" align="right">
               CGST In %
             </div>
@@ -2410,8 +2404,6 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-          </div>
-          <div class="form-row" style="padding:0px">
             <div class="form-group col-md-3">
             </div>
             <div class="form-group col-md-3">
@@ -2447,8 +2439,6 @@ if (!empty($getlogpodtl)) {
               echo form_input($data);
               ?>
             </div>
-          </div>
-          <div class="form-row" style="padding:0px">
             <div class="form-group col-md-6" align="right">
               CGST In %
             </div>
@@ -5809,6 +5799,12 @@ if (!empty($getlogpodtl)) {
         formData.append('txtRowCount', $('#txtRowCount').val());
         formData.append('txtPONO', $('#txtPONO').val());
         formData.append('capitalType', $('#capitalType').val());
+        const fileInput = document.getElementById('POFile');
+        if (fileInput.files.length > 0) {
+          formData.append('POFile', fileInput.files[0]);
+        } else {
+          console.error('No file selected.');
+        }
         $('input, select, textarea').each(function() {
           var input = $(this);
           var inputID = input.attr('id'); // Get the ID of the input field
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index 0f8a68c4..af4ed5da 100755
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -1942,599 +1942,599 @@ if (!empty($getlogpodtl)) {
 							$attributes = array('class' => 'form-label-left CreatePO ', 'name'  => 'CreatePO', 'id'  => 'CreatePO');
 							echo form_open(base_url() . '/purchaseorder/addPO/', $attributes);
 							?>
-						
 
-								<div class="form-row">
-									<div class="form-group col-md-3">
-										<label>Requistion No</label>
+
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Requistion No</label>
+									<?php
+									$options = array("0" => 'Selected Requisition Numbers');
+									if (!empty($ReqList)) {
+										foreach ($ReqList as $SID) :
+
+											$options[$SID->ReqNo] = $SID->ReqNo;
+										//$ReqType = $SID->ReqType;
+										endforeach;
+									}
+									echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"');
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Purchase Order Type</label>
+									<div class="form-group">
+
 										<?php
-										$options = array("0" => 'Selected Requisition Numbers');
-										if (!empty($ReqList)) {
-											foreach ($ReqList as $SID) :
-
-												$options[$SID->ReqNo] = $SID->ReqNo;
-											//$ReqType = $SID->ReqType;
-											endforeach;
-										}
-										echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"');
+										$data = array('name' => 'POType', 'value' => set_value('POType', REVENUE), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
+										echo form_input($data);
 										?>
 									</div>
-									<div class="form-group col-md-3">
-										<label>Purchase Order Type</label>
-										<div class="form-group">
-
-											<?php
-											$data = array('name' => 'POType', 'value' => set_value('POType', REVENUE), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
-									<div class="form-group col-md-3">
-										<label>Select Supplier<span class="text-danger">*</span></label>
-										<?php
-										$options = array("0" => 'Select Supplier');
-										//print_r(  $options);
-
-										if (!empty($Suplist)) {
-											foreach ($Suplist as $SID) :
-												$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
-											endforeach;
-										}
-
-										echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier"', 'required="true"', 'class="form-control select2');
-										?> <input type="hidden" name="b4supplier" id="b4supplier" value="<?php echo $SupId; ?>">
-										<input type="hidden" name="newsup" id="changeSup">
-									</div>
-									<div class="form-group col-md-3">
-										<label>Supplier Address</label>
-										<div class="form-group">
-											<?php
-											$data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
-											echo Form_textarea($data);
-											?>
-										</div>
-									</div>
 								</div>
-								<div class="form-row">
-									<div class="form-group col-md-3">
-										<div id="div1" style="display:block;">
+								<div class="form-group col-md-3">
+									<label>Select Supplier<span class="text-danger">*</span></label>
+									<?php
+									$options = array("0" => 'Select Supplier');
+									//print_r(  $options);
 
-											<b><u>Select Tax Range</u></b><br />
-											<div class="centered">
+									if (!empty($Suplist)) {
+										foreach ($Suplist as $SID) :
+											$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
+										endforeach;
+									}
 
-												<?php echo form_label('Local', 'Local') . "&nbsp;&nbsp;" . form_radio(array('name' => 'Range', 'value' => '0', 'checked' => ('0' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Local', 'onchange' => 'SetVatorCST();')); ?>
-
-												<?php echo form_label('Inter state', 'Inter state') . "&nbsp;&nbsp;" . form_radio(array('name' => 'Range', 'value' => '1', 'checked' => ('1' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Inter_state', 'onchange' => 'SetVatorCST();')); ?>
-
-											</div>
-										</div>
-									</div>
-									<div class="form-group col-md-3">
-										<b><u>Select Delivery By<span class="text-danger">*</span></u></b><br />
-										<div class="centered">
-
-											<?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;" . form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?>
-
-											<?php echo form_label('Schedule', 'Schedule') . form_radio(array('name' => 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?>
-										</div>
-
-									</div>
-									<div class="form-group col-md-3" id="Deliverydtdiv">
-										<label>Delivery Date<span class="text-danger">*</span></label>
-										<div class="form-group">
-											<?php
-											$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
-											echo form_input($data);
-											?>
-
-										</div>
-									</div>
-									<div class="form-group col-md-3" id="Schedulediv" style="display:none;">
-										<label>Schedule By<span class="text-danger">*</span></label>
+									echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier"', 'required="true"', 'class="form-control select2');
+									?> <input type="hidden" name="b4supplier" id="b4supplier" value="<?php echo $SupId; ?>">
+									<input type="hidden" name="newsup" id="changeSup">
+								</div>
+								<div class="form-group col-md-3">
+									<label>Supplier Address</label>
+									<div class="form-group">
 										<?php
-										$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverSchedule), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
+										$data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
 										echo Form_textarea($data);
 										?>
 									</div>
-									<div class="form-group col-md-3">
-										<label>Delivery Address</label>
-										<div class="form-group">
-											<?php
-											$data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
-											echo Form_textarea($data);
-											?> <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" value="<?php echo $DeliveryAddress; ?>">
+								</div>
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<div id="div1" style="display:block;">
+
+										<b><u>Select Tax Range</u></b><br />
+										<div class="centered">
+
+											<?php echo form_label('Local', 'Local') . "&nbsp;&nbsp;" . form_radio(array('name' => 'Range', 'value' => '0', 'checked' => ('0' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Local', 'onchange' => 'SetVatorCST();')); ?>
+
+											<?php echo form_label('Inter state', 'Inter state') . "&nbsp;&nbsp;" . form_radio(array('name' => 'Range', 'value' => '1', 'checked' => ('1' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Inter_state', 'onchange' => 'SetVatorCST();')); ?>
+
 										</div>
 									</div>
 								</div>
-								<div class="form-row">
-									<div class="form-group col-md-3">
-										<label>Purchase Order Date</label>
-										<div class="form-group">
-											<?php
-											$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
-											echo form_input($data);
-											?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
-										</div>
+								<div class="form-group col-md-3">
+									<b><u>Select Delivery By<span class="text-danger">*</span></u></b><br />
+									<div class="centered">
+
+										<?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;" . form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?>
+
+										<?php echo form_label('Schedule', 'Schedule') . form_radio(array('name' => 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?>
 									</div>
-									<div class="form-group col-md-3">
 
-										<label>Mode Of Shipment</label>
-										<div class="form-group">
-
-											<?php
-											$data = array('name' => 'editmodeofshipment', 'value' => set_value('editmodeofshipment', $modeofshipment), 'id' => 'editmodeofshipment',  'class' => 'form-control');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
-									<div class="form-group col-md-3">
-										<label>Contact Reference</label>
-										<div class="form-group">
-
-											<?php
-											$data = array('name' => 'editsupplierreference', 'value' => set_value('editsupplierreference', $supplierref), 'id' => 'editsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
-											echo form_input($data);
-											?>
-										</div>
-
-									</div>
-									<div class="form-group col-md-3">
-										<label>Supplier's Offer No</label>
-										<div class="form-group">
-
-											<?php
-											$data = array('name' => 'editsupplierofferno', 'value' => set_value('editsupplierofferno', $suppofferno), 'id' => 'editsupplierofferno',  'class' => 'form-control');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
 								</div>
-								<div class="form-row">
-									<div class="form-group col-md-3">
-
-										<label>Our Reference(S)</label>
-										<div class="form-group">
-
-											<?php
-											$data = array('name' => 'editotherreference', 'value' => set_value('editotherreference', $otherref), 'id' => 'editotherreference',  'class' => 'form-control');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
-									<div class="form-group col-md-3">
-										<label>Revenue Type Options<span class="text-danger">*</span></label>
-
+								<div class="form-group col-md-3" id="Deliverydtdiv">
+									<label>Delivery Date<span class="text-danger">*</span></label>
+									<div class="form-group">
 										<?php
-										//$optionsWork = array("0"=>'Select Work Status');
-
-
-										if (!empty($PoTypeOptions)) {
-
-											foreach ($PoTypeOptions as $POpt) :
-
-												if ($revenuesubtype == $POpt->ConfigValue) {
-													$optionsPO[$POpt->ConfigValue] =  $POpt->ConfigValue;
-												}
-
-											endforeach;
-											foreach ($PoTypeOptions as $POpt1) :
-
-												if ($revenuesubtype != $POpt1->ConfigValue) {
-													$optionsPO[$POpt1->ConfigValue] =  $POpt1->ConfigValue;
-												}
-
-											endforeach;
-										}
-
-										echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions" required="true" class="form-control"');
-
+										$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+										echo form_input($data);
 										?>
 
 									</div>
-									<div class="form-group col-md-3">
-										<label>Payment Terms<span class="text-danger">*</span></label>
+								</div>
+								<div class="form-group col-md-3" id="Schedulediv" style="display:none;">
+									<label>Schedule By<span class="text-danger">*</span></label>
+									<?php
+									$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverSchedule), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
+									echo Form_textarea($data);
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Delivery Address</label>
+									<div class="form-group">
+										<?php
+										$data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
+										echo Form_textarea($data);
+										?> <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" value="<?php echo $DeliveryAddress; ?>">
+									</div>
+								</div>
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Purchase Order Date</label>
+									<div class="form-group">
+										<?php
+										$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+										echo form_input($data);
+										?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+
+									<label>Mode Of Shipment</label>
+									<div class="form-group">
 
 										<?php
-
-
-
-										if (!empty($Payment)) {
-
-											foreach ($Payment as $pay) :
-
-
-												$options6[$pay->PaymentID] =  $pay->PaymentTerms;
-
-											endforeach;
-										}
-										echo form_dropdown('PaymentTerms', $options6, set_value('PaymentTerms', $Terms), 'id="PaymentTerms"', 'required="true"', 'class="form-control"');
+										$data = array('name' => 'editmodeofshipment', 'value' => set_value('editmodeofshipment', $modeofshipment), 'id' => 'editmodeofshipment',  'class' => 'form-control');
+										echo form_input($data);
 										?>
-
-
-
-									</div>
-									<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
-										<label>Description of Payable Terms<span class="text-danger">*</span></label>
-										<div class="form-group">
-											<?php
-											$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
-											echo form_input($data);
-											?>
-										</div>
 									</div>
 								</div>
-								<div class="form-row">
-									<div class="form-group col-md-3">
-										<label for="insurance">Insurance Options<span class="text-danger">*</span></label>
+								<div class="form-group col-md-3">
+									<label>Contact Reference</label>
+									<div class="form-group">
+
 										<?php
-										$optionsnew = array('1' => 'Yes', '0' => 'No');
-										echo form_dropdown('insurancestatus', $optionsnew, set_value('insurancestatus'), 'id="insurancestatus" required="true" class="form-control"');
+										$data = array('name' => 'editsupplierreference', 'value' => set_value('editsupplierreference', $supplierref), 'id' => 'editsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
+										echo form_input($data);
 										?>
 									</div>
-									<div class="form-group col-md-3" id="InsuranceNumberdiv" style="display:block;">
-										<label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
-										<div class="form-group">
-											<?php
-											$data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
-											echo form_input($data);
-											?>
-										</div>
-									</div>
-									<div class="form-group col-md-3">
-										<label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
-										<select id='BudgetType' name='BudgetType' class="form-control">
-											<?php if ($BudgetType == 'CAPITAL') {
-												$opt1 = 'CAPITAL';
-												$opt2 = 'REVENUE';
-											} else {
-												$opt1 = 'REVENUE';
-												$opt2 = 'CAPITAL';
-											} ?>
 
+								</div>
+								<div class="form-group col-md-3">
+									<label>Supplier's Offer No</label>
+									<div class="form-group">
 
-											<option value=<?php echo $opt1; ?>><?php echo $opt1; ?></option>
-											<option value=<?php echo $opt2; ?>><?php echo $opt2; ?></option>
-										</select>
-
-									</div>
-									<div class="form-group col-md-3">
+										<?php
+										$data = array('name' => 'editsupplierofferno', 'value' => set_value('editsupplierofferno', $suppofferno), 'id' => 'editsupplierofferno',  'class' => 'form-control');
+										echo form_input($data);
+										?>
 									</div>
 								</div>
-								<div class="form-row">
-									<div class="form-group col-md-12" align="right">
-										<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-											<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-												<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-3">
 
-											<?php }  ?>
-											<!-- <a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a> -->
-											<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
-										<?php } ?>
+									<label>Our Reference(S)</label>
+									<div class="form-group">
+
+										<?php
+										$data = array('name' => 'editotherreference', 'value' => set_value('editotherreference', $otherref), 'id' => 'editotherreference',  'class' => 'form-control');
+										echo form_input($data);
+										?>
 									</div>
 								</div>
-								<br>
-								<div class="form-row">
-									<div class="table-responsive" style="padding-bottom:30px;">
-										<table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
-											<thead>
+								<div class="form-group col-md-3">
+									<label>Revenue Type Options<span class="text-danger">*</span></label>
 
-												<tr>
-													<th style="text-align:center !important">SNo</th>
-													<th style="text-align:center !important">Requisition No</th>
-													<th style="text-align:center !important">Item Code</th>
-													<th style="text-align:center !important">Item Description</th>
-													<th style="text-align:center !important">Quantity</th>
-													<th style="text-align:center !important">UOM</th>
-													<th style="text-align:center !important">Rate <?php echo "($INRSYM)" ?></th>
-													<th style="text-align:center !important">Basic Amount <?php echo "($INRSYM)" ?></th>
-													<th style="text-align:center !important">Tax Amount <?php echo "($INRSYM)" ?></th>
-													<th style="text-align:center !important">Total Order Amount <?php echo "($INRSYM)" ?></th>
-													<!-- <th>Actual Quantity</th>
+									<?php
+									//$optionsWork = array("0"=>'Select Work Status');
+
+
+									if (!empty($PoTypeOptions)) {
+
+										foreach ($PoTypeOptions as $POpt) :
+
+											if ($revenuesubtype == $POpt->ConfigValue) {
+												$optionsPO[$POpt->ConfigValue] =  $POpt->ConfigValue;
+											}
+
+										endforeach;
+										foreach ($PoTypeOptions as $POpt1) :
+
+											if ($revenuesubtype != $POpt1->ConfigValue) {
+												$optionsPO[$POpt1->ConfigValue] =  $POpt1->ConfigValue;
+											}
+
+										endforeach;
+									}
+
+									echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions" required="true" class="form-control"');
+
+									?>
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>Payment Terms<span class="text-danger">*</span></label>
+
+									<?php
+
+
+
+									if (!empty($Payment)) {
+
+										foreach ($Payment as $pay) :
+
+
+											$options6[$pay->PaymentID] =  $pay->PaymentTerms;
+
+										endforeach;
+									}
+									echo form_dropdown('PaymentTerms', $options6, set_value('PaymentTerms', $Terms), 'id="PaymentTerms"', 'required="true"', 'class="form-control"');
+									?>
+
+
+
+								</div>
+								<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
+									<label>Description of Payable Terms<span class="text-danger">*</span></label>
+									<div class="form-group">
+										<?php
+										$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label for="insurance">Insurance Options<span class="text-danger">*</span></label>
+									<?php
+									$optionsnew = array('1' => 'Yes', '0' => 'No');
+									echo form_dropdown('insurancestatus', $optionsnew, set_value('insurancestatus'), 'id="insurancestatus" required="true" class="form-control"');
+									?>
+								</div>
+								<div class="form-group col-md-3" id="InsuranceNumberdiv" style="display:block;">
+									<label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
+									<div class="form-group">
+										<?php
+										$data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
+										echo form_input($data);
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
+									<select id='BudgetType' name='BudgetType' class="form-control">
+										<?php if ($BudgetType == 'CAPITAL') {
+											$opt1 = 'CAPITAL';
+											$opt2 = 'REVENUE';
+										} else {
+											$opt1 = 'REVENUE';
+											$opt2 = 'CAPITAL';
+										} ?>
+
+
+										<option value=<?php echo $opt1; ?>><?php echo $opt1; ?></option>
+										<option value=<?php echo $opt2; ?>><?php echo $opt2; ?></option>
+									</select>
+
+								</div>
+								<div class="form-group col-md-3">
+								</div>
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-12" align="right">
+									<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
+										<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
+											<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
+
+										<?php }  ?>
+										<!-- <a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a> -->
+										<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
+									<?php } ?>
+								</div>
+							</div>
+							<br>
+							<div class="form-row">
+								<div class="table-responsive" style="padding-bottom:30px;">
+									<table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
+										<thead>
+
+											<tr>
+												<th style="text-align:center !important">SNo</th>
+												<th style="text-align:center !important">Requisition No</th>
+												<th style="text-align:center !important">Item Code</th>
+												<th style="text-align:center !important">Item Description</th>
+												<th style="text-align:center !important">Quantity</th>
+												<th style="text-align:center !important">UOM</th>
+												<th style="text-align:center !important">Rate <?php echo "($INRSYM)" ?></th>
+												<th style="text-align:center !important">Basic Amount <?php echo "($INRSYM)" ?></th>
+												<th style="text-align:center !important">Tax Amount <?php echo "($INRSYM)" ?></th>
+												<th style="text-align:center !important">Total Order Amount <?php echo "($INRSYM)" ?></th>
+												<!-- <th>Actual Quantity</th>
 													<th>Received Quantity</th>
 													<th>Pending Quantity</th> -->
-													<th style="text-align:center !important">Action</th>
-												</tr>
-											</thead>
-											<tbody id='RevenueAppend'>
-												<?php
-												if (!empty($POItem)) {
-													$index = 0;
+												<th style="text-align:center !important">Action</th>
+											</tr>
+										</thead>
+										<tbody id='RevenueAppend'>
+											<?php
+											if (!empty($POItem)) {
+												$index = 0;
 
-													foreach ($POItem as $record) {
-														$index = $index + 1;
-												?>
-														<tr id="<?php echo $index; ?>">
-															<td align="center"><?php echo $index; ?></td>
-															<td align="center"><?php echo $record->ReqNo ?></td>
-															<td align="center"><?php echo $record->MaterialCode ?></td>
-															<td align="center"><?php echo $record->MaterialName ?></td>
-															<td align="center"><?php echo $record->Quantity ?></td>
-															<td align="center"><?php echo $record->UOM ?></td>
-															<td align="right"><?php echo $record->Rate ?></td>
+												foreach ($POItem as $record) {
+													$index = $index + 1;
+											?>
+													<tr id="<?php echo $index; ?>">
+														<td align="center"><?php echo $index; ?></td>
+														<td align="center"><?php echo $record->ReqNo ?></td>
+														<td align="center"><?php echo $record->MaterialCode ?></td>
+														<td align="center"><?php echo $record->MaterialName ?></td>
+														<td align="center"><?php echo $record->Quantity ?></td>
+														<td align="center"><?php echo $record->UOM ?></td>
+														<td align="right"><?php echo $record->Rate ?></td>
 
-															<td align="right"><?php echo number_format($record->BasicValue, 2, '.', ''); ?></td>
+														<td align="right"><?php echo number_format($record->BasicValue, 2, '.', ''); ?></td>
 
-															<td align="right"><?php echo $record->Taxamount ?></td>
-															<td align="right"><?php echo $record->TotalValue ?></td>
-															<!-- <td align="right"><?php echo $record->Quantity ?></td>
+														<td align="right"><?php echo $record->Taxamount ?></td>
+														<td align="right"><?php echo $record->TotalValue ?></td>
+														<!-- <td align="right"><?php echo $record->Quantity ?></td>
 											<td align="right"><?php echo $record->ReceivedQuantity ?></td>
 											<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> -->
-															<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
-															<input type="hidden" name="<?php echo 'departmentName' . $index ?>" id="<?php echo 'departmentName' . $index ?>" value="<?php echo $record->DepartmentName; ?>" />
-															<input type="hidden" name="<?php echo 'AvilBudget' . $index ?>" id="<?php echo 'AvilBudget' . $index ?>" value="<?php echo $AvlAmount; ?>" />
-															<input type="hidden" name="<?php echo 'LineItemNo' . $index ?>" id="<?php echo 'LineItemNo' . $index ?>" value="<?php echo $record->LineItemNo; ?>" />
-															<input type="hidden" name="<?php echo 'costCode' . $index ?>" id="<?php echo 'costCode' . $index ?>" value="<?php echo $record->CostCenterCode; ?>" />
-															<input type="hidden" name="<?php echo 'materialCode' . $index ?>" id="<?php echo 'materialCode' . $index ?>" value="<?php echo $record->MaterialCode; ?>" />
-															<input type="hidden" name="<?php echo 'materialName' . $index ?>" id="<?php echo 'materialName' . $index ?>" value="<?php echo htmlentities($record->MaterialName); ?>" />
-															<input type="hidden" name="<?php echo 'uom' . $index ?>" id="<?php echo 'uom' . $index ?>" value="<?php echo $record->UOM; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'quantity' . $index ?>" id="<?php echo 'quantity' . $index ?>" value="<?php echo $record->Quantity; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'b4qty' . $index ?>" id="<?php echo 'b4qty' . $index ?>" value="<?php echo $record->Quantity; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'itemRate' . $index ?>" id="<?php echo 'itemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'b4rate' . $index ?>" id="<?php echo 'b4rate' . $index ?>" value="<?php echo $record->Rate; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'service_description' . $index ?>" id="<?php echo 'service_description' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
+														<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
+														<input type="hidden" name="<?php echo 'departmentName' . $index ?>" id="<?php echo 'departmentName' . $index ?>" value="<?php echo $record->DepartmentName; ?>" />
+														<input type="hidden" name="<?php echo 'AvilBudget' . $index ?>" id="<?php echo 'AvilBudget' . $index ?>" value="<?php echo $AvlAmount; ?>" />
+														<input type="hidden" name="<?php echo 'LineItemNo' . $index ?>" id="<?php echo 'LineItemNo' . $index ?>" value="<?php echo $record->LineItemNo; ?>" />
+														<input type="hidden" name="<?php echo 'costCode' . $index ?>" id="<?php echo 'costCode' . $index ?>" value="<?php echo $record->CostCenterCode; ?>" />
+														<input type="hidden" name="<?php echo 'materialCode' . $index ?>" id="<?php echo 'materialCode' . $index ?>" value="<?php echo $record->MaterialCode; ?>" />
+														<input type="hidden" name="<?php echo 'materialName' . $index ?>" id="<?php echo 'materialName' . $index ?>" value="<?php echo htmlentities($record->MaterialName); ?>" />
+														<input type="hidden" name="<?php echo 'uom' . $index ?>" id="<?php echo 'uom' . $index ?>" value="<?php echo $record->UOM; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'quantity' . $index ?>" id="<?php echo 'quantity' . $index ?>" value="<?php echo $record->Quantity; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'b4qty' . $index ?>" id="<?php echo 'b4qty' . $index ?>" value="<?php echo $record->Quantity; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'itemRate' . $index ?>" id="<?php echo 'itemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'b4rate' . $index ?>" id="<?php echo 'b4rate' . $index ?>" value="<?php echo $record->Rate; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'service_description' . $index ?>" id="<?php echo 'service_description' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
 
-															<input align="right" type="hidden" name="<?php echo 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'PackOption' . $index ?>" id="<?php echo 'PackOption' . $index ?>" value="<?php echo $record->PackagingCalulatedOn; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'PackType' . $index ?>" id="<?php echo 'PackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'PackVal' . $index ?>" id="<?php echo 'PackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'AfterPackVal' . $index ?>" id="<?php echo 'AfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'RevenueCgst' . $index ?>" id="<?php echo 'RevenueCgst' . $index ?>" value="<?php echo $record->CGST; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'RevenueAfterCgst' . $index ?>" id="<?php echo 'RevenueAfterCgst' . $index ?>" value="<?php echo $record->AfterCGST; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'RevenueSgst' . $index ?>" id="<?php echo 'RevenueSgst' . $index ?>" value="<?php echo $record->SGST; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'RevenueAfterSgst' . $index ?>" id="<?php echo 'RevenueAfterSgst' . $index ?>" value="<?php echo $record->AfterSGST; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'RevenueIgst' . $index ?>" id="<?php echo 'RevenueIgst' . $index ?>" value="<?php echo $record->IGST; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'RevenueAfterIgst' . $index ?>" id="<?php echo 'RevenueAfterIgst' . $index ?>" value="<?php echo $record->AfterIGST; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'NoOfTrip' . $index ?>" id="<?php echo 'NoOfTrip' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'FreightVal' . $index ?>" id="<?php echo 'FreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>" id="<?php echo 'AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'basicval' . $index ?>" id="<?php echo 'basicval' . $index ?>" value="<?php echo $record->BasicValue; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'Insval' . $index ?>" id="<?php echo 'Insval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
-															<input align="right" type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
-															<?php
+														<input align="right" type="hidden" name="<?php echo 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'DisVal' . $index ?>" id="<?php echo 'DisVal' . $index ?>" value="<?php echo $record->DiscountValue; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'AfterDisVal' . $index ?>" id="<?php echo 'AfterDisVal' . $index ?>" value="<?php echo $record->AfterDiscount; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'PackOption' . $index ?>" id="<?php echo 'PackOption' . $index ?>" value="<?php echo $record->PackagingCalulatedOn; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'PackType' . $index ?>" id="<?php echo 'PackType' . $index ?>" value="<?php echo $record->PackagingType; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'PackVal' . $index ?>" id="<?php echo 'PackVal' . $index ?>" value="<?php echo $record->PackagingValue; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'AfterPackVal' . $index ?>" id="<?php echo 'AfterPackVal' . $index ?>" value="<?php echo $record->AfterPackagingValue; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'RevenueCgst' . $index ?>" id="<?php echo 'RevenueCgst' . $index ?>" value="<?php echo $record->CGST; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'RevenueAfterCgst' . $index ?>" id="<?php echo 'RevenueAfterCgst' . $index ?>" value="<?php echo $record->AfterCGST; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'RevenueSgst' . $index ?>" id="<?php echo 'RevenueSgst' . $index ?>" value="<?php echo $record->SGST; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'RevenueAfterSgst' . $index ?>" id="<?php echo 'RevenueAfterSgst' . $index ?>" value="<?php echo $record->AfterSGST; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'RevenueIgst' . $index ?>" id="<?php echo 'RevenueIgst' . $index ?>" value="<?php echo $record->IGST; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'RevenueAfterIgst' . $index ?>" id="<?php echo 'RevenueAfterIgst' . $index ?>" value="<?php echo $record->AfterIGST; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'NoOfTrip' . $index ?>" id="<?php echo 'NoOfTrip' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'FreightVal' . $index ?>" id="<?php echo 'FreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>" id="<?php echo 'AfterFreightVal' . $index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'basicval' . $index ?>" id="<?php echo 'basicval' . $index ?>" value="<?php echo $record->BasicValue; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'Insval' . $index ?>" id="<?php echo 'Insval' . $index ?>" value="<?php echo $record->Insurance; ?>" />
+														<input align="right" type="hidden" name="<?php echo 'TotalOrderValue' . $index ?>" id="<?php echo 'TotalOrderValue' . $index ?>" value="<?php echo $record->TotalValue; ?>" />
+														<?php
 
-															if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?>
-																<td align="center"> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="ri-pencil-fill"></i></a>
-																
-																	<a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
-															    </td>
-																<?php
-															} else { ?>
-																<td align="center"> <a data-target='#VIEWREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWREVENUE"><i class="fa fa-eye" title="Click here to view the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a>
-															    </td>
-
-															<?php
-															} ?>
-														</tr>
-													<?php
-
-
-														$totBasicAmt  = $totBasicAmt + $record->BasicValue;
-														$totDiscountAmt  = $totDiscountAmt + $record->AfterDiscount;
-														$totPackagingAmt  = $totPackagingAmt + $record->AfterPackagingValue;
-														$totCgst  = $totCgst + $record->AfterCGST;
-														$totSgst  = $totSgst + $record->AfterSGST;
-														$totIgst  = $totIgst + $record->AfterIGST;
-
-														$totFreightAmt   = $totFreightAmt + $record->AfterFreightValue;
-														$totInsuranceAmt   = $totInsuranceAmt + $record->Insurance;
-														$totOrderSummaryAmt   = $totOrderSummaryAmt + $record->TotalValue;
-													}
-													?>
-												<?php
-
-												}
-												?>
-											</tbody>
-										</table>
-									</div>
-								</div>
-
-								<br>
-
-								<div class="form-row">
-									<div class="form-group col-md-3">
-										<label>Basic Amount <?php echo "($INRSYM)" ?></label>
-
-										<?php
-										$data = array('name' => 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount', number_format($totBasicAmt, 2, '.', '')), 'id' => 'txtTotBasicAmount',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-										echo form_input($data);
-										?>
-
-
-									</div>
-									<div class="form-group col-md-3">
-										<label>Total Discount Amount <?php echo "($INRSYM)" ?></label>
-
-										<?php
-										$data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', number_format($totDiscountAmt, 2, '.', '')), 'id' => 'txtTotalDiscount',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-										echo form_input($data);
-										?>
-
-									</div>
-									<div class="form-group col-md-3" id="TotSCST">
-										<label>Total SGST Amount <?php echo "($INRSYM)" ?></label>
-
-										<?php
-										$data = array('name' => 'txtTotalSGST', 'value' => set_value('txtTotalSGST', number_format($totSgst, 2, '.', '')), 'id' => 'txtTotalSGST',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-										echo form_input($data);
-										?>
-
-									</div>
-									<div class="form-group col-md-3" id="TotICST" style="display:none;">
-										<label>Total IGST Amount <?php echo "($INRSYM)" ?> </label>
-
-										<?php
-										$data = array('name' => 'txtTotalIGST', 'value' => set_value('txtTotalIGST', number_format($totIgst, 2, '.', '')), 'id' => 'txtTotalIGST',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-										echo form_input($data);
-										?>
-
-									</div>
-									<div class="form-group col-md-3">
-										<label>Total CGST Amount <?php echo "($INRSYM)" ?> </label>
-
-										<?php
-										$data = array('name' => 'txtTotalCGST', 'value' => set_value('txtTotalCGST', number_format($totCgst, 2, '.', '')), 'id' => 'txtTotalCGST',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-										echo form_input($data);
-										?>
-
-									</div>
-								</div>
-
-								<br>
-
-								<div class="form-row">
-									<div class="form-group col-md-3">
-										<label>Total Packaging Amount <?php echo "($INRSYM)" ?></label>
-
-										<?php
-										$data = array('name' => 'txtTotalPackaing', 'value' => set_value('txtTotalPackaing', number_format($totPackagingAmt, 2, '.', '')), 'id' => 'txtTotalPackaing',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-										echo form_input($data);
-										?>
-
-									</div>
-									<div class="form-group col-md-3">
-										<label>Total Insurance Amount <?php echo "($INRSYM)" ?></label>
-
-										<?php
-										$data = array('name' => 'txtTotalInsurance', 'value' => set_value('txtTotalInsurance', number_format($totInsuranceAmt, 2, '.', '')), 'id' => 'txtTotalInsurance',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-										echo form_input($data);
-										?>
-
-
-									</div>
-									<div class="form-group col-md-3">
-										<label>Total Freight Amount <?php echo "($INRSYM)" ?></label>
-
-										<?php
-										$data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', number_format($totFreightAmt, 2, '.', '')), 'id' => 'txtTotalFreight',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-										echo form_input($data);
-										?>
-
-									</div>
-									<div class="form-group col-md-3">
-										<label>Total Order Amount <?php echo "($INRSYM)" ?></label>
-										<?php
-										$data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary', number_format($totOrderSummaryAmt, 2, '.', '')), 'id' => 'txtTotalOrderValueSummary',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-										echo form_input($data);
-										?>
-									</div>
-								</div>
-
-								<br>
-
-								
-								<div class="form-row">
-									<div class="form-group col-md-12">
-										<label>Special Instructions </label> <?php
-																				$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'id' => 'txtSpcialInstruction',  'class' => 'form-control');
-																				echo form_textarea($data);
-																				?>
-										<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
-									</div>
-								</div>
-
-								<br>
-
-								
-								<div class="form-row" id="splpodiv" style="display:none;">
-									<div class="form-group col-md-12"><label>Special po Table List</label>
-
-										<table id="table2" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
-											<thead style="background-color: #ddd;">
-												<tr>
-													<!--   <th>Bill No </th>  -->
-													<!-- <th>Materials</th>        -->
-													<th>Delivery Challan No</th>
-													<th>Delivery Challan Date</th>
-													<th>MaterialReceived Date </th>
-													<th>Vehicle No</th>
-													<th>Courier No</th>
-													<!--  <th>IGRNO</th> -->
-													<!--  <th>File</th> -->
-													<th>Action</th>
-												</tr>
-											</thead>
-											<tbody id="spl">
-												<?php
-												if (!empty($getdata)) {
-													foreach ($getdata as $row => $gd) {
-
-												?>
-														<tr id="lastvalue">
-
-															<td><?php echo $gd->DeliveryChellanOrInvoiceNo ?></td>
-															<td><?php $date = new DateTime($gd->DeliveryChellanDate);
-																echo $date->format('d-m-Y'); ?></td>
-															<td><?php $date = new DateTime($gd->MaterialRcvdDate);
-																echo $date->format('d-m-Y'); ?></td>
-															<td><?php echo $gd->VehicleNo ?></td>
-															<td><?php echo $gd->CourierNo ?></td>
-
-															<input type="hidden" id="igrno" value="<?= $gd->IGRNO ?>">
-															<input type="hidden" id="billnos<?= $row ?>" value="<?= isset($gd->BillNo) ? $gd->BillNo : "" ?>">
-															<input type="hidden" id="file<?= $row ?>" value="<?= isset($gd->FilePath) ? $gd->FilePath : "" ?>">
-															<input type="hidden" id="deliveryinvoiceno<?= $row ?>" value="<?= $gd->DeliveryChellanOrInvoiceNo ?>">
-															<input type="hidden" id="deliverydate<?= $row ?>" value="<?= $gd->DeliveryChellanDate ?>">
-															<input type="hidden" id="vehicleno<?= $row ?>" value="<?= $gd->VehicleNo ?>">
-															<input type="hidden" id="courierno<?= $row ?>" value="<?= $gd->CourierNo ?>">
-															<input type="hidden" id="MaterialRcvdDate<?= $row ?>" value="<?= $gd->MaterialRcvdDate ?>">
-
-															<td><span onclick="openmodel(<?= $row ?>);"><i class="ri-pencil-fill"></i></span>
+														if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?>
+															<td align="center"> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="ri-pencil-fill"></i></a>
 
+																<a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
 															</td>
-														</tr>
+														<?php
+														} else { ?>
+															<td align="center"> <a data-target='#VIEWREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWREVENUE"><i class="fa fa-eye" title="Click here to view the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a>
+															</td>
+
+														<?php
+														} ?>
+													</tr>
 												<?php
-													}
+
+
+													$totBasicAmt  = $totBasicAmt + $record->BasicValue;
+													$totDiscountAmt  = $totDiscountAmt + $record->AfterDiscount;
+													$totPackagingAmt  = $totPackagingAmt + $record->AfterPackagingValue;
+													$totCgst  = $totCgst + $record->AfterCGST;
+													$totSgst  = $totSgst + $record->AfterSGST;
+													$totIgst  = $totIgst + $record->AfterIGST;
+
+													$totFreightAmt   = $totFreightAmt + $record->AfterFreightValue;
+													$totInsuranceAmt   = $totInsuranceAmt + $record->Insurance;
+													$totOrderSummaryAmt   = $totOrderSummaryAmt + $record->TotalValue;
 												}
 												?>
-											</tbody>
-										</table>
-									</div>
+											<?php
 
-									<div class="form-row"><!-- <label>Special po Table List</label> -->
-										<p> </p>
-										<table id="table3" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
-											<div class="form-row" style="padding-bottom: 10px;">
+											}
+											?>
+										</tbody>
+									</table>
+								</div>
+							</div>
 
-												<div class="col-md-offset-10 col-md-8">
+							<br>
 
-													<input type="button" class="btn btn-success" id="addmorebutton" value=" ADD FILES.."><br>
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Basic Amount <?php echo "($INRSYM)" ?></label>
 
-												</div>
+									<?php
+									$data = array('name' => 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount', number_format($totBasicAmt, 2, '.', '')), 'id' => 'txtTotBasicAmount',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
 
-												<div id="newdiv"></div>
-												<input type="hidden" name="hidecounter" id="hidecounter" value="0" />
-												<input type="hidden" name="hideconstant" id="hideconstant" value="0" />
-												<input type="hidden" name="hiddenIGRNO" id="hiddenIGRNO" value="<?php echo $IGRNO; ?>" />
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>Total Discount Amount <?php echo "($INRSYM)" ?></label>
+
+									<?php
+									$data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', number_format($totDiscountAmt, 2, '.', '')), 'id' => 'txtTotalDiscount',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3" id="TotSCST">
+									<label>Total SGST Amount <?php echo "($INRSYM)" ?></label>
+
+									<?php
+									$data = array('name' => 'txtTotalSGST', 'value' => set_value('txtTotalSGST', number_format($totSgst, 2, '.', '')), 'id' => 'txtTotalSGST',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3" id="TotICST" style="display:none;">
+									<label>Total IGST Amount <?php echo "($INRSYM)" ?> </label>
+
+									<?php
+									$data = array('name' => 'txtTotalIGST', 'value' => set_value('txtTotalIGST', number_format($totIgst, 2, '.', '')), 'id' => 'txtTotalIGST',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>Total CGST Amount <?php echo "($INRSYM)" ?> </label>
+
+									<?php
+									$data = array('name' => 'txtTotalCGST', 'value' => set_value('txtTotalCGST', number_format($totCgst, 2, '.', '')), 'id' => 'txtTotalCGST',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+
+								</div>
+							</div>
+
+							<br>
+
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Total Packaging Amount <?php echo "($INRSYM)" ?></label>
+
+									<?php
+									$data = array('name' => 'txtTotalPackaing', 'value' => set_value('txtTotalPackaing', number_format($totPackagingAmt, 2, '.', '')), 'id' => 'txtTotalPackaing',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>Total Insurance Amount <?php echo "($INRSYM)" ?></label>
+
+									<?php
+									$data = array('name' => 'txtTotalInsurance', 'value' => set_value('txtTotalInsurance', number_format($totInsuranceAmt, 2, '.', '')), 'id' => 'txtTotalInsurance',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>Total Freight Amount <?php echo "($INRSYM)" ?></label>
+
+									<?php
+									$data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', number_format($totFreightAmt, 2, '.', '')), 'id' => 'txtTotalFreight',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>Total Order Amount <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary', number_format($totOrderSummaryAmt, 2, '.', '')), 'id' => 'txtTotalOrderValueSummary',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+
+							<br>
+
+
+							<div class="form-row">
+								<div class="form-group col-md-12">
+									<label>Special Instructions </label> <?php
+																			$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'id' => 'txtSpcialInstruction',  'class' => 'form-control');
+																			echo form_textarea($data);
+																			?>
+									<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
+								</div>
+							</div>
+
+							<br>
+
+
+							<div class="form-row" id="splpodiv" style="display:none;">
+								<div class="form-group col-md-12"><label>Special po Table List</label>
+
+									<table id="table2" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
+										<thead style="background-color: #ddd;">
+											<tr>
+												<!--   <th>Bill No </th>  -->
+												<!-- <th>Materials</th>        -->
+												<th>Delivery Challan No</th>
+												<th>Delivery Challan Date</th>
+												<th>MaterialReceived Date </th>
+												<th>Vehicle No</th>
+												<th>Courier No</th>
+												<!--  <th>IGRNO</th> -->
+												<!--  <th>File</th> -->
+												<th>Action</th>
+											</tr>
+										</thead>
+										<tbody id="spl">
+											<?php
+											if (!empty($getdata)) {
+												foreach ($getdata as $row => $gd) {
+
+											?>
+													<tr id="lastvalue">
+
+														<td><?php echo $gd->DeliveryChellanOrInvoiceNo ?></td>
+														<td><?php $date = new DateTime($gd->DeliveryChellanDate);
+															echo $date->format('d-m-Y'); ?></td>
+														<td><?php $date = new DateTime($gd->MaterialRcvdDate);
+															echo $date->format('d-m-Y'); ?></td>
+														<td><?php echo $gd->VehicleNo ?></td>
+														<td><?php echo $gd->CourierNo ?></td>
+
+														<input type="hidden" id="igrno" value="<?= $gd->IGRNO ?>">
+														<input type="hidden" id="billnos<?= $row ?>" value="<?= isset($gd->BillNo) ? $gd->BillNo : "" ?>">
+														<input type="hidden" id="file<?= $row ?>" value="<?= isset($gd->FilePath) ? $gd->FilePath : "" ?>">
+														<input type="hidden" id="deliveryinvoiceno<?= $row ?>" value="<?= $gd->DeliveryChellanOrInvoiceNo ?>">
+														<input type="hidden" id="deliverydate<?= $row ?>" value="<?= $gd->DeliveryChellanDate ?>">
+														<input type="hidden" id="vehicleno<?= $row ?>" value="<?= $gd->VehicleNo ?>">
+														<input type="hidden" id="courierno<?= $row ?>" value="<?= $gd->CourierNo ?>">
+														<input type="hidden" id="MaterialRcvdDate<?= $row ?>" value="<?= $gd->MaterialRcvdDate ?>">
+
+														<td><span onclick="openmodel(<?= $row ?>);"><i class="ri-pencil-fill"></i></span>
+
+														</td>
+													</tr>
+											<?php
+												}
+											}
+											?>
+										</tbody>
+									</table>
+								</div>
+
+								<div class="form-row"><!-- <label>Special po Table List</label> -->
+									<p> </p>
+									<table id="table3" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
+										<div class="form-row" style="padding-bottom: 10px;">
+
+											<div class="col-md-offset-10 col-md-8">
+
+												<input type="button" class="btn btn-success" id="addmorebutton" value=" ADD FILES.."><br>
 
 											</div>
-											<thead>
-												<tr>
-													<th>Bill No </th>
 
-													<th>File</th>
-													<th>Action</th>
-												</tr>
-											</thead>
-											<tbody id="spl">
-												<?php
-												if (!empty($billfile)) {
+											<div id="newdiv"></div>
+											<input type="hidden" name="hidecounter" id="hidecounter" value="0" />
+											<input type="hidden" name="hideconstant" id="hideconstant" value="0" />
+											<input type="hidden" name="hiddenIGRNO" id="hiddenIGRNO" value="<?php echo $IGRNO; ?>" />
 
-													foreach ($billfile as $row => $gd) {
-														if (!empty($gd->BillNo)) {
-															$index = $row + 1;
-												?>
-															<tr id="lastvalue">
-																<td><?php echo $gd->BillNo ?></td>
+										</div>
+										<thead>
+											<tr>
+												<th>Bill No </th>
 
-																<td><?php echo (!empty($gd->FilePath)) ? $gd->FilePath : "No File"; ?></td>
-																<!-- <input type="hidden" id="hiddenigrno" value="<?php $gd->IGRNO ?>"> -->
-																<input type="hidden" id="billnos<?= $index ?>" value="<?= $gd->BillNo ?>">
-																<input type="hidden" id="file<?= $index ?>" name='file' value="<?= $gd->FilePath ?>">
+												<th>File</th>
+												<th>Action</th>
+											</tr>
+										</thead>
+										<tbody id="spl">
+											<?php
+											if (!empty($billfile)) {
+
+												foreach ($billfile as $row => $gd) {
+													if (!empty($gd->BillNo)) {
+														$index = $row + 1;
+											?>
+														<tr id="lastvalue">
+															<td><?php echo $gd->BillNo ?></td>
+
+															<td><?php echo (!empty($gd->FilePath)) ? $gd->FilePath : "No File"; ?></td>
+															<!-- <input type="hidden" id="hiddenigrno" value="<?php $gd->IGRNO ?>"> -->
+															<input type="hidden" id="billnos<?= $index ?>" value="<?= $gd->BillNo ?>">
+															<input type="hidden" id="file<?= $index ?>" name='file' value="<?= $gd->FilePath ?>">
 
 
 
@@ -2545,153 +2545,153 @@ if (!empty($getlogpodtl)) {
 
 
 
-																<td><span onclick="openbillmodel(<?php echo $index ?>);"><i class="ri-pencil-fill"></i></span>
-																	<?php if (!empty($gd->FilePath)) { ?>
-																		<a target="_blank" href="<?php echo  base_url() . 'public/uploads/BillFiles/' ?><?php echo $gd->FilePath ?>"><i class="fa fa-download"></i></a>
-																	<?php } ?>
-																</td>
-															</tr>
-												<?php
-														}
-													}
-												}
-												?>
-											</tbody>
-										</table>
-									</div>
-								</div>
-								<!--##################################################################   -->
-								<?php if (!empty($update)) { ?>
-									<div class="form-row" id="editpodiv">
-										<!-- <div class="form-row"> -->
-										<label>Editable POScreen</label>
-										<table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
-											<thead style="background-color: #ddd;">
-												<tr>
-													<th>Sno</th>
-													<th>PONO</th>
-
-													<th>LineItemNo</th>
-													<th>Entity</th>
-													<th>OldValue</th>
-													<th>NewValue</th>
-													<th>UpdatedBy</th>
-													<th>UpdateOn</th>
-
-												</tr>
-											</thead>
-											<tbody>
-												<?php
-												if (!empty($getlogpodtl)) {
-
-													$inde = 0;
-													foreach ($getlogpodtl as $oldpo) {
-														$inde = $inde + 1;
-												?>
-														<tr id="<?php echo $inde; ?>">
-
-															<td><?php echo $inde; ?></td>
-															<td><?php echo $oldpo->PONO ?></td>
-
-
-															<td><?php echo $oldpo->LineItemNos; ?></td>
-															<td><?php echo $oldpo->entity ?></td>
-															<?php if ($oldpo->entity == 'PO DateChanged') {
-																$oldValue = date('d-m-Y', strtotime($oldpo->oldValue));
-															} else {
-																$oldValue = $oldpo->oldValue;
-															} ?>
-															<td><?php echo $oldValue . '-' . $oldpo->SupplierName; ?></td>
-															<?php if ($oldpo->entity == 'PO DateChanged') {
-																$newValue = date('d-m-Y', strtotime($oldpo->newValue));
-															} else {
-																$newValue = $oldpo->newValue;
-															} ?>
-															<td><?php echo $newValue ?></td>
-															<td><?php echo $oldpo->FirstName ?></td>
-
-															<td><?php $date = new DateTime($oldpo->UpdatedOn);
-																echo $date->format('d-m-Y'); ?></td>
-
-
+															<td><span onclick="openbillmodel(<?php echo $index ?>);"><i class="ri-pencil-fill"></i></span>
+																<?php if (!empty($gd->FilePath)) { ?>
+																	<a target="_blank" href="<?php echo  base_url() . 'public/uploads/BillFiles/' ?><?php echo $gd->FilePath ?>"><i class="fa fa-download"></i></a>
+																<?php } ?>
+															</td>
 														</tr>
-												<?php
+											<?php
 													}
 												}
-												?>
-											</tbody>
-										</table>
-										<!-- </div> -->
-									</div>
-								<?php } else {
-								} ?>
-								<div class="form-row">
-									<div class="form-group col-md-12" align="left"><br />
-										<div>
-											<label>Select Purchase Order File</label><br>
-											<input type="file" name="POFile" id="POFile">
-											<?php if ($PrePOFile) { ?>
-												<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
-											<?php } ?>
-											<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
-										</div>
-										<input type="hidden" name="txtPoRange" id="txtPoRange" />
-										<input type="hidden" name="isEdit" id="isEdit" value="0" />
-										<input type="hidden" name="txtStatus" id="txtStatus" />
-										<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if (isset($index)) {
-																											echo $index;
-																										} ?>">
-										<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-										<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
-										<input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" />
-										<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
-										<div class="btn-container" style="text-align: right;">
-											<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-												<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
-												<?php if ($PONOStatus == PO_DRAFT) { ?>
-													<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-												<?php } ?>
-												<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-												<a class="btn btn-soft-primary waves-effect waves-light Save" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
-											<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
-												<a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-											<?php } else { ?>
-												<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
-											<?php } ?>
-										</div>
-
-
-
-									</div><br />
+											}
+											?>
+										</tbody>
+									</table>
 								</div>
-								<div class="form-row">
-									<div class="form-group col-md-12">
+							</div>
+							<!--##################################################################   -->
+							<?php if (!empty($update)) { ?>
+								<div class="form-row" id="editpodiv">
+									<!-- <div class="form-row"> -->
+									<label>Editable POScreen</label>
+									<table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
+										<thead style="background-color: #ddd;">
+											<tr>
+												<th>Sno</th>
+												<th>PONO</th>
 
-										<label>Request On : </label><?php echo $Reqon; ?><br />
-										<?php if ($RequesterName != '' || $RequesterName != null) { ?>
-											<label>Request By : </label><?php echo $RequesterName; ?><br />
+												<th>LineItemNo</th>
+												<th>Entity</th>
+												<th>OldValue</th>
+												<th>NewValue</th>
+												<th>UpdatedBy</th>
+												<th>UpdateOn</th>
+
+											</tr>
+										</thead>
+										<tbody>
+											<?php
+											if (!empty($getlogpodtl)) {
+
+												$inde = 0;
+												foreach ($getlogpodtl as $oldpo) {
+													$inde = $inde + 1;
+											?>
+													<tr id="<?php echo $inde; ?>">
+
+														<td><?php echo $inde; ?></td>
+														<td><?php echo $oldpo->PONO ?></td>
+
+
+														<td><?php echo $oldpo->LineItemNos; ?></td>
+														<td><?php echo $oldpo->entity ?></td>
+														<?php if ($oldpo->entity == 'PO DateChanged') {
+															$oldValue = date('d-m-Y', strtotime($oldpo->oldValue));
+														} else {
+															$oldValue = $oldpo->oldValue;
+														} ?>
+														<td><?php echo $oldValue . '-' . $oldpo->SupplierName; ?></td>
+														<?php if ($oldpo->entity == 'PO DateChanged') {
+															$newValue = date('d-m-Y', strtotime($oldpo->newValue));
+														} else {
+															$newValue = $oldpo->newValue;
+														} ?>
+														<td><?php echo $newValue ?></td>
+														<td><?php echo $oldpo->FirstName ?></td>
+
+														<td><?php $date = new DateTime($oldpo->UpdatedOn);
+															echo $date->format('d-m-Y'); ?></td>
+
+
+													</tr>
+											<?php
+												}
+											}
+											?>
+										</tbody>
+									</table>
+									<!-- </div> -->
+								</div>
+							<?php } else {
+							} ?>
+							<div class="form-row">
+								<div class="form-group col-md-12" align="left"><br />
+									<div>
+										<label>Select Purchase Order File</label><br>
+										<input type="file" name="POFile" id="POFile">
+										<?php if ($PrePOFile) { ?>
+											<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
 										<?php } ?>
-										<label>Status : </label><?php
-																$statusMappings = [
-																	'PO APPROVED' => 'AWAITING APPROVE',
-																	'AWAITING RELEASE' => 'AWAITING APPROVE',
-																	'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-																	'PO RELEASED' => 'PO APPROVED',
-																];
-
-																if (isset($StatusName) && !empty($StatusName)) {
-																	if (isset($statusMappings[$StatusName])) {
-																		echo $statusMappings[$StatusName];
-																	} else {
-																		echo $StatusName;
-																	}
-																} else {
-																	echo "Status not provided";
-																}
-																?>
+										<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
 									</div>
+									<input type="hidden" name="txtPoRange" id="txtPoRange" />
+									<input type="hidden" name="isEdit" id="isEdit" value="0" />
+									<input type="hidden" name="txtStatus" id="txtStatus" />
+									<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if (isset($index)) {
+																										echo $index;
+																									} ?>">
+									<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
+									<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
+									<input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" />
+									<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
+									<div class="btn-container" style="text-align: right;">
+										<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
+											<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
+											<?php if ($PONOStatus == PO_DRAFT) { ?>
+												<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+											<?php } ?>
+											<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+											<a class="btn btn-soft-primary waves-effect waves-light Save" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+										<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
+											<a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+										<?php } else { ?>
+											<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
+										<?php } ?>
+									</div>
+
+
+
+								</div><br />
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-12">
+
+									<label>Request On : </label><?php echo $Reqon; ?><br />
+									<?php if ($RequesterName != '' || $RequesterName != null) { ?>
+										<label>Request By : </label><?php echo $RequesterName; ?><br />
+									<?php } ?>
+									<label>Status : </label><?php
+															$statusMappings = [
+																'PO APPROVED' => 'AWAITING APPROVE',
+																'AWAITING RELEASE' => 'AWAITING APPROVE',
+																'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+																'PO RELEASED' => 'PO APPROVED',
+															];
+
+															if (isset($StatusName) && !empty($StatusName)) {
+																if (isset($statusMappings[$StatusName])) {
+																	echo $statusMappings[$StatusName];
+																} else {
+																	echo $StatusName;
+																}
+															} else {
+																echo "Status not provided";
+															}
+															?>
 								</div>
-							
+							</div>
+
 						</div> <!-- end card body-->
 					</div> <!-- end card -->
 				</div><!-- end col-->
@@ -3283,6 +3283,27 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 					</div>
+					<div class="form-row">
+						<div class="form-group col-md-8"></div>
+						<div class="form-group col-md-2">
+							<label>CGST In %</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+						<div class="form-group col-md-2">
+							<label>CGST Amt <?php echo "($INRSYM)" ?></label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
 					<div class="form-row" id="SGSTEditModel">
 						<div class="form-group col-md-8"></div>
 						<div class="form-group col-md-2">
@@ -3325,27 +3346,6 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 					</div>
-					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
-							<label>CGST In %</label>
-							<div class="form-group">
-								<?php
-								$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-2">
-							<label>CGST Amt <?php echo "($INRSYM)" ?></label>
-							<div class="form-group">
-								<?php
-								$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-					</div>
 					<div class="form-row">
 						<div class="form-group col-md-8"></div>
 						<div class="form-group col-md-4">
@@ -3591,24 +3591,24 @@ if (!empty($getlogpodtl)) {
 						</div>
 						<div class="form-group col-md-2" id="ViewTripsValue" style="display:none;">
 							<label>NO Of Trips</label>
-								<?php
-								$data = array('name' => 'ViewNOOfTrips', 'value' => set_value('ViewNOOfTrips'), 'id' => 'ViewNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(2);');
-								echo form_input($data);
-								?>
+							<?php
+							$data = array('name' => 'ViewNOOfTrips', 'value' => set_value('ViewNOOfTrips'), 'id' => 'ViewNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(2);');
+							echo form_input($data);
+							?>
 						</div>
 						<div class="form-group col-md-2">
 							<label>Freight Rate </label>
-								<?php
-								$data = array('name' => 'txtViewFreight', 'value' => set_value('txtViewFreight'), 'id' => 'txtViewFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'onchange' => 'calculateFreight(2);', 'readonly' => 'readonly');
-								echo form_input($data);
-								?>
+							<?php
+							$data = array('name' => 'txtViewFreight', 'value' => set_value('txtViewFreight'), 'id' => 'txtViewFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'onchange' => 'calculateFreight(2);', 'readonly' => 'readonly');
+							echo form_input($data);
+							?>
 						</div>
 						<div class="form-group col-md-2">
 							<label><?php echo "Freight Amt ($INRSYM)"; ?> </label>
-								<?php
-								$data = array('name' => 'txtViewAfterFreight', 'value' => set_value('txtViewAfterFreight'), 'id' => 'txtViewAfterFreight',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-								echo form_input($data);
-								?>
+							<?php
+							$data = array('name' => 'txtViewAfterFreight', 'value' => set_value('txtViewAfterFreight'), 'id' => 'txtViewAfterFreight',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+							echo form_input($data);
+							?>
 						</div>
 					</div>
 					<div class="form-row">
diff --git a/app/Views/includes/new_footer.php b/app/Views/includes/new_footer.php
index 038bfc1b..d16e6755 100755
--- a/app/Views/includes/new_footer.php
+++ b/app/Views/includes/new_footer.php
@@ -60,6 +60,12 @@
 <script>
     $(document).ready(function() {
         $('select').addClass('form-control');
+        $(".date-picker-common")
+            .datepicker({
+                autoclose: true,
+                orientation: 'bottom',
+                format: 'dd-mm-yyyy',
+                todayHighlight: true            });
         form = $(".form-date-search")
             .datepicker({
                 autoclose: true,
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php
index 2eaee04a..5ce67adc 100755
--- a/app/Views/includes/new_header.php
+++ b/app/Views/includes/new_header.php
@@ -71,7 +71,17 @@
     <link href="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
 
     <style>
-        	.modal { overflow: auto !important; }
+        .mce-edit-area.mce-container.mce-panel.mce-first.mce-last.mce-stack-layout-item {
+            border-width: 0px 0px 0px !important;
+        }
+
+        .mce-tinymce.mce-container.mce-panel {
+            padding: 1px !important;
+        }
+
+        .modal {
+            overflow: auto !important;
+        }
 
         ::-webkit-scrollbar {
             width: 5px;