diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index dee7e2e4..d7e35f60 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -3,18 +3,21 @@ $AvlAmount = 0;
 $ReqType =''; 
 $Value='';
 $EXCRATE=0;
-
+$Rowcount = 0;
 $Value=$unicode;
 
+
 $Currencycode=$currencycode;
-
-
+$Cur = '';
+$CurCode= '';
 
 foreach ($CurrencyDetail as $Detail) 
 {
    $Cur=$Detail->Currency_Code.' '.' - '.' '.$Detail->Country_and_Currency;
+   $CurCode = $Detail->Currency_Code;
+   
 }
-
+					
 
 foreach ($PaymentTerms as $TER) 
 {
@@ -55,21 +58,21 @@ $DeliveryAddress ='';
 $PONOStatus='';
 $PONO = '';
 $ServiceDescription = '';
-$TotalLanding='';
-$tothighseas='';
-$totcustom='';
-$totexciseduty='';
-$totexcisedutyED='';
-$totexciseSH='';
-$totcustomED='';
-$totcustomSH='';
-$totaddtnlexcise='';
-$totgrossduty='';
-$totavlmodvat='';
-$totgrossexpense='';
-$totordervalue='';
-$ExchangeRate='';
-$totorder='';
+$TotalLanding=0.00;
+$tothighseas=0.00;
+$totcustom=0.00;
+$totexciseduty=0.00;
+$totexcisedutyED=0.00;
+$totexciseSH=0.00;
+$totcustomED=0.00;
+$totcustomSH=0.00;
+$totaddtnlexcise=0.00;
+$totgrossduty=0.00;
+$totavlmodvat=0.00;
+$totgrossexpense=0.00;
+$totordervalue=0.00;
+$ExchangeRate=0.00;
+$totorder=0.00;
 //$ExchangeRate
 $ExchangeRateCalculatedon='';
 $StatusName='';
@@ -252,7 +255,7 @@ body {
                 <label>Currency Type</label>
                      
                          <?php
-                         $options = array($Cur=>$Cur);
+                         $options = array($CurCode=>$Cur);
                        //$options = array("0"=>'Select Currency');
 
                         //print_r(  $options);
@@ -457,25 +460,12 @@ body {
             
             
               <div class="col-md-3">
-                      <span>Payable AT</span>
-                      
-                      <?php
-                         $data = array('name' => 'PayableAT','value' => set_value('PayableAT',$PayableAT),'id'=>'PayableAT',  'class' => 'form-control' ,'required' => 'true');
-                        echo form_input($data);
-                        ?>   
+                     
                             
                     </div>
                                 
                 <div class="col-md-6">
-                      Payment Date <br/>
-                        <tr>
-                            <td>
-                                <?php echo form_label('Before', 'Before') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"Before", "value"=>"0", 'checked'=>set_radio('Payment', '0', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-                            <td>
-                                <?php echo form_label('After', 'After') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"After", "value"=>"1", 'checked'=>set_radio('Payment', '1', FALSE))); ?>
-
-                            </td>
-                        </tr>
+                     
                 </div>
              
     </div>
@@ -492,565 +482,7 @@ body {
 
    
 
-  <!--<a data-toggle="modal"><button type="submit"  onclick="myFunction();" class="btn btn-primary" id="abcd" >Select Line Item</button> </a>-->
 
-  
-    <!-- <div class="modal fade" id="importpomodel" role="dialog">-->
-
-     <div  id="importpomodel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                            <div class="modal-dialog">
-                                <!-- Modal content-->
-                                <form>
-                                    <div class="modal-content" style="width:900px;">
-                                        <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
-                                            <button type="button" class="close" data-dismiss="modal">&times;</button>
-                                            <center><h4>Add Import Purchase Order Item </h4></center>
-                                        </div>
-                                        <div align="left">
-
-                                            <div class="col-md-12">
-                                                <div class="col-md-3">
-                                                    <label>Req No</label>
-                                                    <div>
-                                                        <?php
-                                                        $options = array("0"=>'Req No');
-                                                        //echo form_dropdown('ImportMaterialCode', $options,set_value('ImportMaterialCode'),'id="ImportMaterialCode"' ,'class="form-control required"');
-                                            $RL = array("0"=>'Select Req No');     
-                                            if(!empty($RequistionDetails))
-                                            {
-                                            foreach ($RequistionDetails as $SID):              
-                                                $RL[$SID->ReqNo] =  $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
-                                            endforeach;
-                                            }
-                            
-                                            echo form_dropdown('ReqNo', $RL,set_value('ReqNo'),'id="ReqNo"' ,'class="form-control"');
-
-                                                        ?>
-                                                    </div>
-                                                </div>
-
-                                                <div class="col-md-3">
-                                                    <label>Department Name</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        //$data = array('name' => 'ImportDepartmentName','value' => set_value('ImportDepartmentName'),'id'=>'ImportDepartmentName',  'class' => 'form-control' ,'readonly' => 'true');
-                                            $data = array('name' => 'deptName','value' => set_value('deptName'),'id'=>'deptName',  'class' => 'form-control','readonly'=>'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-3">
-                                                    <label>Cost Center Name</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        //$options = array("0"=>'Select Cost Center');
-
-                                                        //echo form_dropdown('CostCenter', $options,set_value('CostCenter'),'id="CostCenter"' ,'class="form-control"');
-
-                                                        $data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-                                                echo form_input($data);
-
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-3">
-                                                    <label>Available Budget Amount</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'AvlBudAmt','value' => set_value('AvlBudAmt'),'id'=>'AvlBudAmt',  'class' => 'form-control' ,'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="col-md-12">
-                                                <div class="col-md-2">
-                                                    <label>Item Code</label>
-                                                    
-                                                        <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
-                                                        <div>
-                                                        <?php
-                                                       // $options = array("0"=>'Item Code');
-
-                                                        //if(!empty($MaterialList))
-                                                        //{
-                                                          //  foreach ($MaterialList as $SID):
-
-
-                                                            //    $options[$SID->MaterialCode] =  $SID->MaterialCode.' '.' - '.' '.$SID->MaterialName;
-
-                                                            //endforeach;
-                                                        //}
-
-                                                        //echo form_dropdown('ImportMaterialCode', $options,set_value('ImportMaterialCode'),'id="ImportMaterialCode"' ,'class="form-control"');
-
-                                                        $options = array("0"=>'Item Code');     
-                                        //print_r(  $options);
-                                        
-                                                                            
-                            
-                                        echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
-
-                                                        ?>
-                                                    </div> 
-
-                                                </div>
-
-                                                <div class="col-md-2">
-                                                    <label>Item Name</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ItemName','value' => set_value('ItemName'),'id'=>'ItemName',  'class' => 'form-control' ,'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-2">
-                                                    <label>UOM</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control' ,'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-2">
-                                                    <label>Quantity</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange()');
-                                                        echo form_input($data);
-
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-2">
-                                                    <!-- <label>Rate </label>
- -->
-
-                                        <P id=labelRate>  <label><?php echo "Rate in $Currencycode ($Value)";?> </label></P>
-                                                    <div class="form-group">
-                                                        <?php
-                                                       $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()' );
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-2">
-                                                   <!-- <label>Basic Amount </label>-->
-                                    <!-- <p id=labelBasicvalue><label><?php echo "Basic Value In $Currencycode ($Value)";?></label></p>
- -->
-
-                            <p id=label2>  <label><?php echo "Basic Value In $Currencycode";?></label></p>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        //$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
-
-                                                    $data = array('name' => 'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue',  'class' => 'form-control' ,'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="col-md-12">
-
-                                                <div class="col-md-3">
-
-                                                   <!--  Basic Price in US $ per Ton : -->
-                                    <p id=labelBasicpriceus><b><?php echo "Basic Price in $Currencycode ($Value)"?></p>
-
-
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'imBasicPrice','value' => set_value('imBasicPrice'),'id'=>'imBasicPrice',  'class' => 'form-control' ,'placeholder '=>'basic price','onkeypress'=>'return isNumberKey(event);','onchange'=>'USRate()');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-
-                                                <div class="col-md-3">
-
-                                                    <!-- Exchange Rate : -->
-
-                                        <p id=label1><b><?php echo "Exchange Rate"?></p>
-
-
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ExchangeRt','value' => set_value('ExchangeRt'),'id'=>'ExchangeRt',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-
-                                                </div>
-
-                                                <div class="col-md-3">
-
-                                                    <!-- Basic value in INR : -->
-                                               <P id=labelBasicINR>  <label><?php echo "Basic value in INR";?> </label></P>
-
-
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'INRBasicvalue','value' => set_value('INRBasicvalue'),'id'=>'INRBasicvalue',  'class' => 'form-control' ,'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <!--<div class="col-md-3">
-                                             <a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
-                                     </div>-->
-
-                                                <div class="col-md-12"  style="border:1px solid #000;padding:0px;">
-                                                    <br/>
-                                                    <div class="col-md-6" style="padding:0px;">
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4" >
-                                                                Basic Price:
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'BasicPriceTax','value' => set_value('BasicPriceTax'),'id'=>'BasicPriceTax',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterBasicPriceTax','value' => set_value('AfterBasicPriceTax'),'id'=>'AfterBasicPriceTax',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Landing charge
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'LandingCharge','value' => set_value('LandingCharge'),'id'=>'LandingCharge',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Calculateloadingcharge()');
-                                                                    echo form_input($data);
-
-                                                  
-                                                                    
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterLandingCharge','value' => set_value('AfterLandingCharge'),'id'=>'AfterLandingCharge',  'class' => 'form-control'  ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                High seas sales charge
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'Highseas ','value' => set_value('Highseas'),'id'=>'Highseas',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateHighseassalescharge()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterHighseas','value' => set_value('AfterHighseas'),'id'=>'AfterHighseas',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Custom duty : (a)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'Customduty','value' => set_value('Customduty'),'id'=>'Customduty',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateCustomduty()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterCustomduty','value' => set_value('AfterCustomduty'),'id'=>'AfterCustomduty',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Excise duty : (b)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ExcisedutyTax','value' => set_value('ExcisedutyTax'),'id'=>'ExcisedutyTax',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateExciseDuty()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterExcisedutyTax','value' => set_value('AfterExcisedutyTax'),'id'=>'AfterExcisedutyTax',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Excise duty ED_cess : (C)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ExcisedutyEDcess','value' => set_value('ExcisedutyEDcess'),'id'=>'ExcisedutyEDcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateExciseED1()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterExcisedutyEDcess','value' => set_value('AfterExcisedutyEDcess'),'id'=>'AfterExcisedutyEDcess',  'class' => 'form-control','readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Excise duty S & H cess :(d)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ExcisedutySHcess','value' => set_value('ExcisedutySHcess'),'id'=>'ExcisedutySHcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateexciseSHcess()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterExcisedutySHcess','value' => set_value('AfterExcisedutySHcess'),'id'=>'AfterExcisedutySHcess',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Custom ED_cess : (e)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'CustomEDcess','value' => set_value('CustomEDcess'),'id'=>'CustomEDcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateCustomEdcess()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterCustomEDcess','value' => set_value('AfterCustomEDcess'),'id'=>'AfterCustomEDcess',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Custom S & H cess : (f)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'CustomSHcess','value' => set_value('CustomSHcess'),'id'=>'CustomSHcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateCustomSHcess()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterCustomSHcess','value' => set_value('AfterCustomSHcess'),'id'=>'AfterCustomSHcess',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-md-6" style="padding:0px;">
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Additional Excise duty : (g)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AdditionalExciseduty ','value' => set_value('AdditionalExciseduty'),'id'=>'AdditionalExciseduty',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateaddlExciseDuty(),CalculateAvlModvat(),CalculateGrossExpense()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterAdditionalExciseduty','value' => set_value('AfterAdditionalExciseduty'),'id'=>'AfterAdditionalExciseduty',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-8">
-                                                                Gross duty payable
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'Grossdutypayable ','value' => set_value('Grossdutypayable'),'id'=>'Grossdutypayable',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateAvlModvat()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-8">
-                                                                Available Modvat set-off on import :
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AvailableModvat','value' => set_value('AvailableModvat'),'id'=>'AvailableModvat',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>   (b + c + d + g)
-                                                                </div>
-                                                            </div>
-
-                                                        </div>
-                                                        <div class="col-md-12">
-
-                                                            <div class="col-md-8">
-                                                                Gross expenses due to custom duty:
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'Grossexpenses','value' => set_value('Grossexpenses'),'id'=>'Grossexpenses',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-
-                                                        <div class="col-md-12">
-                                                            <center> <label>Cost of the product Per KG</label></center>
-                                                            <hr/>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                purchase rate [Basic]
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'purchaserate','value' => set_value('purchaserate'),'id'=>'purchaserate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4"  style="margin-top: -4.8%">
-                                                                <span>Quantity</span>
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'PurQuantity','value' => set_value('PurQuantity'),'id'=>'PurQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateCtable()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-
-                                                        </div>
-                                                        <div class="col-md-12">
-
-                                                            <div class="col-md-4">
-                                                                Custom Duty Expenses
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'CustomDutyExpenses ','value' => set_value('CustomDutyExpenses'),'id'=>'CustomDutyExpenses',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                RMC Including Customers
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'RMCIncludingCustomers','value' => set_value('RMCIncludingCustomers'),'id'=>'RMCIncludingCustomers',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                         <div class="col-md-4">
-                                                                Total Amount:
-                                                            </div>
-                                                           <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'TotalExp','value' => set_value('TotalExp'),'id'=>'TotalExp',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-
-                                                        </div>
-
-
-                                                    </div>
-                                                </div>
-                                            </div>
-
-                                        </div>
-                                        <div class="modal-footer">
-                                            <a class="btn btn-info font AddImport"  ID="AddImport" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Import</span></a>
-                                            <!--<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
-
-                                            <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
-
-                                        </div>
-                                    </div>
-                                </form>
-
-                            </div>
-                        </div>        
-  </div>
-</div>
-   
-   
 
 <!--Edit modal body-->
 
@@ -1116,22 +548,9 @@ body {
                                                         <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
                                                         <div>
                                                         <?php
-                                                       // $options = array("0"=>'Item Code');
+                                                       
 
-                                                        //if(!empty($MaterialList))
-                                                        //{
-                                                          //  foreach ($MaterialList as $SID):
-
-
-                                                            //    $options[$SID->MaterialCode] =  $SID->MaterialCode.' '.' - '.' '.$SID->MaterialName;
-
-                                                            //endforeach;
-                                                        //}
-
-                                                        //echo form_dropdown('ImportMaterialCode', $options,set_value('ImportMaterialCode'),'id="ImportMaterialCode"' ,'class="form-control"');
-
-                                                        $options = array("0"=>'Item Code');     
-                                        //print_r(  $options);
+                                                        $options = array("0"=>'Item Code');                                          
                                         
                                                                             
                             
@@ -1753,7 +1172,8 @@ body {
                                 
 
                         }
-                        ?> <input type="hidden" name="txtRowCount" id="txtRowCount"  value="<?php echo $index;?>">
+						$Rowcount = $index;
+                        ?> 
                         <?php 
                            
                     }
@@ -1903,7 +1323,7 @@ body {
         <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" />       
+        <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo  $Rowcount;?>" />       
         <input type="hidden" name="txtPONO" id="txtPONO"  value="<?php  echo $PONO; ?>"/>   
 		<input type="hidden" name="txtTotalorderValue" id="txtTotalorderValue"  />   
 
@@ -1949,26 +1369,7 @@ body {
     </section>   
 </div>
 
-<script type="text/html" id="ImportList">
-<tr  id="<%=index%>">
-<td align="left"><%=index%></td>
- <td align="left"><%=ReqNo%></td>
- 
-  <td align="left"><%=ItemName%></td>
-  <td align="left"><%=Quantity%></td> 
-  <td align="left"><%=UOM%></td>
-   <td align="left"><%=Rate%></td>
-    <td align="left"><%=BasicAmount%></td>
-    <!-- <td align="left"><%=Taxvalue%></td>
-    <td align="left"><%=TotalValue%></td> -->
-    
-   <td>
-                          <a    data-target='#editimportpomodel'  data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#editimportpomodel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <!-- <a href='#' onclick = "DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>-->
-                         
-                          
-                      </td>
-</tr>
-</script>
+
 
 
 <script type="text/javascript">
@@ -1988,16 +1389,7 @@ var NilType = '<?php echo NILTYPE;?>';
 };
 
 
-var paymentday=<?php echo json_encode($PaymentDays,JSON_PRETTY_PRINT)?>;
-if (paymentday=="After") 
-{
 
-    document.getElementById("After").checked = true;
-}
-else
-{
-    document.getElementById("Before").checked = true;
-}
 
 
 $('#EditAvlBudAmt').val(<?php echo $AvlAmount; ?>);
@@ -2062,20 +1454,10 @@ $('#drpSupplier').change(function() {
             if(obj.SupplierID === id)
             {
                 $("#SupAddress").val(obj.Address);
-                $("#PayableAT").val(obj.PayableAT);
+                //$("#PayableAT").val(obj.PayableAT);
                 var a=obj.PaymentDays;
                 console.log(a);
-                if (a=="After") 
-                {
-                  //alert();
-                  document.getElementById("After").checked = true;
-
-                }
-                else
-                  document.getElementById("Before").checked = true;
-              
-                
-            }
+            }    
             
         });
             
@@ -3073,13 +2455,13 @@ function EditCalculateCtable()
     var txtcustomdutyexp=0;
     var txtrmc=0;
     var total=0;
-    var basicamt=0;
-    basicamt=parseFloat($('#EdittxtBasicValue').val());
-    $('#EditTotalExp').val(basicamt);
+    var basicprice=0;
+    basicprice=parseFloat($('#EdittxtBasicValue').val());
+    $('#EditTotalExp').val(basicprice);
     var a=parseFloat($('#EditTotalExp').val());
     //console.log(a);
     //alert(basicamt);
-    txtCtablequantity=parseFloat($('#EditPurQuantity').val());
+    quantity=parseFloat($('#EditPurQuantity').val());
     txtbasicinrprice=parseFloat($('#EditAfterBasicPriceTax').val());
     //txtpurchaserate=txtbasicinrprice/txtCtablequantity;
     txtpurchaserate=<?php echo PURCHASE_RATE;?>;
@@ -3094,9 +2476,8 @@ function EditCalculateCtable()
     txtrmc=<?php echo RMC_CAL;?>;
     $('#EditRMCIncludingCustomers').val(txtrmc);
     total=<?php echo CALCULATE_TOTAL;?>;
-    $('#EditTotalExp').val(basicamt);
-    //var a=parseFloat($('#EditTotalExp').val());
-    //console.log(basicamt);
+    $('#EditTotalExp').val(basicprice);
+    
 }  
 
 
@@ -3207,10 +2588,10 @@ $('#txtToatlOrder').val((parseFloat(TotalOrder) + parseFloat(totalexp)).toFixed(
 
 
 
-$("#editimportpomodel").on("shown.bs.modal", function(e) {
+$('#editimportpomodel').on("shown.bs.modal", function(e) {
 	
         userid = $(e.relatedTarget).data('userid');
-       
+       //  alert('test'+userid);
 
         var tr = document.getElementById(userid);
        
@@ -3491,15 +2872,9 @@ TotalGrossExpense  = parseFloat(TotalGrossExpense ) + parseFloat(Grossexpenses);
 
 function Save(status)
 {
-//alert('Inside Save');
-if(status == '0')
-{
-    stat = '<?php echo PO_DRAFT; ?>';
-}
-else
-{
-    stat = '<?php echo PO_CREATED; ?>';
-}
+
+    stat = '<?php echo PO_RELEASED; ?>';
+
 
 $('#txtStatus').val(stat);
 
@@ -3522,7 +2897,7 @@ if(validate())
 
      $('#content').loader('show');
           $.ajax({ 
-            data:$('.ImportPO').serialize()+"&txtRowCount="+txtRowCount+"&txtDeletedRow="+txtDeletedRow+"&textStatus="+stat,
+            data:$('.ImportPO').serialize(),
 
             //data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeQletedRowCount="+TextDeletedRowCount+"&TextTotalOrderValueSummaryService="+TextTotalOrderValueSummaryService+"&TextSpcialInstruction="+TextSpcialInstruction+"&TextExchangerate"+ExcLandingCharge="+hangerate+"Status="+TextStatus,
             type:"POST",
diff --git a/application/views/editServiceAmendPO.php b/application/views/editServiceAmendPO.php
index 161221dc..f87ddaeb 100755
--- a/application/views/editServiceAmendPO.php
+++ b/application/views/editServiceAmendPO.php
@@ -23,7 +23,7 @@ $DeliverSchedule='';
 $MaxPoDate = '';
 $AvlAmount = 0;
 $Value="&#8377;";
-
+$Rowcount=0;
 $StatusName='';
 
 
@@ -57,7 +57,7 @@ if(!empty($POMaster))
 		$pdt = new DateTime($Req->PODate);
 		$PODate =  $pdt->format('Y-m-d');
 		$DeliverOption = $Req->DeliveryOption;
-      $DeliverSchedule = $Req->DeliverySchedule;
+        $DeliverSchedule = $Req->DeliverySchedule;
 		$Ddt =	new DateTime($Req->DeliveryDate);
 		$Deliverydt =  $Ddt->format('Y-m-d');
         
@@ -175,15 +175,8 @@ $('#drpSupplier').change(function() {
 				$("#SupAddress").val(obj.Address);
 				$("#PayableAT").val(obj.PayableAT);
                 var a=obj.PaymentDays;
-                console.log(a);
-                if (a=="After") 
-                {
-                  //alert();
-                  document.getElementById("After").checked = true;
-
-                }
-                else
-                  document.getElementById("Before").checked = true;
+                //console.log(a);
+               
 				
 			}
 			
@@ -198,213 +191,10 @@ $('#drpSupplier').change(function() {
   
 });	
 
-$('#ReqNo').change(function() {
-  
- var id = $('#ReqNo').val();
- $("#AvlBudAmt").val('');
-  $("#CostCenter").val('');
-  $("#MaterialCode").empty();
-  $("#deptName").val('');
- $("#UOM").val('');
-$("#Quantity").val('');
-$("#ItemName").val('');
-$("#Rate").val('');
-$("#txtBasicValue").val('');
- clearTaxField();
-		if(id != '0')
-		{
-			var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
-		
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			var AvlBudAmt = '<?php echo $AvlAmount ?>'; 
-			//ServiceTable
-                   var rows =  document.getElementById('ServiceTable').rows.length;
-
-if(DeletedMaterialCode!=undefined && DeletedMaterialCode!=''){
-  
-                                                                                $("#MaterialCode").append( $('<option></option>').val(DeletedMaterialCode).html(DeletedMaterialCode + "-" + DeletedMaterialName));
-
-}
-
-for(i=2;i<=rows;i++){
-
-//var j=1;
-  $.each(Material[i], function(idx, obj) {
-
-    // j=j+1;
-           var materialCode = $('#materialCode'+i);
-
-
-
-
-                                    if(obj.materialCode == materialCode )
-                                    {
-                                    $("#MaterialCode").val('');
-                                    }
-
-                                 
-                                
-                               else{
-                                                                                $("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-
-                        }
-
-
-                    });
-
-
-
-
-}		// For Binding DepartmentName	           			
-		$.each(y, function(idx, obj) {
-			if(obj.ReqNo === id)
-			{
-				$("#deptName").val(obj.DepartmentName);
-				$("#CostCenter").val(obj.CostCenterCode);
-			}			
-		});
-			$("#AvlBudAmt").val(AvlBudAmt);	
-		// For Binding Material list center for the selected Requistion Number	
-		$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
-		var isAdded = "0";
-		 for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			
-				if(obj.ReqNo === id )
-				{
-									   
-						$.each(SelectedMaterialList.Mat, function(idx1, el){															
-							if (id == el.ReqNo )
-							{
-															
-								if(el.materialCode == obj.MaterialCode)
-								{
-										isAdded  = "1";
-										return false;																		
-								}
-								else
-								{
-									isAdded  = "0";
-								}
-								
-							}
-					});
-					
-					 
-						if(isAdded  == "0")
-						{
-
-							
-							$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-						}
-												
-				}
-			
-			
-		});
-		}
-		}
-		else
-		{
-			alert('Please select the Requisition Number');
-			return false;
-		}
-		id = '';
-  
-});
-	
-$('#MaterialCode').change(function() {
-    
- var id = $('#MaterialCode').val();
- RequistQuantity = '';
- clearTaxField();
-		if(id != '0')
-		{
-			var y = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			
-	   for(i=0;i<y.length;i++)
-                    {
-		$.each(y[i], function(idx, obj) {
-
-			if(obj.MaterialCode == id)
-			{
-                         
-                               
-				$("#ItemName").val(obj.MaterialName);
-				$("#UOM").val(obj.UOM);
-				$("#Quantity").val(obj.Quantity);
-				RequistQuantity	= 	obj.Quantity;		
-			}			
-		});
-                }			
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});
 
 
 });
-function Ratechange(){
-	 
-		if($('#ReqNo').val() == "0")
-		 {
-			 alert('Please select the Requisition Number');
-			 $('#ReqNo').focus();
-			 return false;
-		 }
-		 else if($('#MaterialCode').val() == "0")
-		 {
-			alert('Please select the Material Code');
-			$('#MaterialCode').focus();
-		   return false;
-		 }
-		 else if($('#CostCenter').val() == "0")
-		 {
-				alert('Please select the CostCenterCode');
-				$('#CostCenter').focus();
-			return false;
-		 }
-	 ExceedQuantityCheck();
-	  
-	 if($('#Quantity').val() != '' && $('#Rate').val() != '')
-	 {	  
-      var txtQuantity = parseFloat( $('#Quantity').val());
-	  var txtUnitPrice = parseFloat($('#Rate').val());
-	  var Tot =  txtQuantity * txtUnitPrice
-	  $('#txtBasicValue').val(Tot);
-	  
-	 //Service Tax calculation
-	$('#AfterServiceTax').val(calculateServiceTax($('#txtBasicValue').val())); // calculateServiceTax();	 
-	
-	 //Edu. cess @2% on service Tax
-	  $('#AfterEduCess').val( calculateEduess($('#AfterServiceTax').val()));
-	
-	 //Sec. & Higher Edu. cess @1 % on service Tax 
-	
-	$('#AfterSecHighTax').val(calculateHigherEdu($('#AfterServiceTax').val())); 
-	 //Krishi Kalyan tax 
-	
-	$('#AfterKrishiTax').val(calculateKrishiKalyantax($('#txtBasicValue').val())); 
-	 //Swachh Bharat tax
-	
-	$('#AfterSwachhTax').val(calculateSwachhBharattax($('#txtBasicValue').val()));
-	 
-	 calculateTotalOrdervalue();
-	 
-	 var res = ExceedBudget($('#TotalOrderValue').val(), $('#AvlBudAmt').val());
-      if(!res)
-	  {
-		 $('#Rate').focus();
-		 return false;
-	  }
-	 }
-	 
-}
+
 
 function EditRatechange(){
 	 
@@ -445,21 +235,7 @@ function EditRatechange(){
 	 
 }
 
-function ExceedQuantityCheck()
- {
-	var EnterQuantity =   $("#Quantity").val()== '' ? "0.00" :  parseFloat($("#Quantity").val());
-	var ReqQuantity = parseFloat(RequistQuantity);
-	if(EnterQuantity > ReqQuantity)
-	{
-		 alert('Your exceeding the Quantity from the Requisition Quantity:'+ RequistQuantity  +'.Please adjust the Quantity to proceed further.');
-		
-		  $('#Quantity').focus();
-		 return false;
-	}
-	else {
-		return true;
-	}
- }
+
  function EditExceedQuantityCheck()
  {
 	// RequistQuantity
@@ -824,25 +600,12 @@ $(document).ready(function () {
 								</div>
 								
 								<div class="col-md-3">
-								  <span>Payable AT</span>
 								  
-								  <?php
-									 $data = array('name' => 'PayableAT','value' => set_value('PayableAT',$PayableAT),'id'=>'PayableAT',  'class' => 'form-control' ,'required' => 'true');
-									echo form_input($data);
-									?>   
 										
 								</div>
 								
 								<div class="col-md-6">
-									  Payment Date <br/>
-												<tr>
-													<td>
-														<?php echo form_label('Before', 'Before') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"Before", "value"=>"0", 'checked'=>set_radio('Payment', '0', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-													<td>
-														<?php echo form_label('After', 'After') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"After", "value"=>"1", 'checked'=>set_radio('Payment', '1', FALSE))); ?>
-
-													</td>
-												</tr>
+									 
 								</div>
 							</div>
 						</div>
@@ -852,255 +615,7 @@ $(document).ready(function () {
 						<div align="right">
 						<!--	<a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-primary" id="abcd" >Select Line Item</button> </a> -->
 				  
-							<!-- Model for servicepo -->
-							<div class="modal fade" id="SERVICE" role="dialog">
-								<div class="modal-dialog">
-							   <!-- Modal content-->
-							 <form>
-								  <div class="modal-content" style="width:900px;">
-									<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> 
-									  <center><h4>Add Service Purchase Order Item </h4></center>				
-									</div>
-									<div align="left"> 
-									 
-									<div class="col-md-12">
-												 <div class="col-md-3">
-												 <label>Req No</label>
-															<div>
-																 <?php
-																	$RL = array("0"=>'Select Req No');     
-																	if(!empty($RequistionDetails))
-																	{
-																	foreach ($RequistionDetails as $SID):			   
-																		$RL[$SID->ReqNo] =  $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
-																	endforeach;
-																	}
-													
-																	echo form_dropdown('ReqNo', $RL,set_value('ReqNo'),'id="ReqNo"' ,'class="form-control"');
-
-																?>						 
-															</div>
-														</div>
-												 
-												  <div class="col-md-3">
-												   <label>Department Name</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'deptName','value' => set_value('deptName'),'id'=>'deptName',  'class' => 'form-control');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												  <div class="col-md-3">
-												   <label>Cost Center Name</label>
-															<div class="form-group">
-																		<?php
-												$data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-																		echo form_input($data);
-
-												?>		
-															</div>
-												 </div>
-												  <div class="col-md-3">
-												   <label>Available Budget Amount</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'AvlBudAmt','value' => set_value('AvlBudAmt'),'id'=>'AvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-								 </div>
-								 <div class="col-md-12">
-												<div class="col-md-3">
-												  <label>Item Code</label>
-															<div>
-																 <?php
-																$options = array("0"=>'Item Code');     
-																//print_r(  $options);
-																
-																									
-													
-																echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
-
-																?>						 
-															</div>
-											   </div>
-												<div class="col-md-3">
-												  <label>Item Name</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'ItemName','value' => set_value('ItemName'),'id'=>'ItemName',  'class' => 'form-control' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												<div class="col-md-3">
-												  <label>UOM</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												<div class="col-md-3">
-												  <label>Frequency</label>
-															<div>
-																<?php
-																 $data = array('name' => 'Frequency','value' => set_value('Frequency'),'id'=>'Frequency',  'class' => 'form-control' );
-																echo form_input($data);
-																?>   					 
-															</div>
-											   </div>
-								</div>
-								<div class="col-md-12">
-												<div class="col-md-3">
-												  <label>Quantity</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange()');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												 <div class="col-md-3">
-												  <label><?php echo "Rate ($INRSYM)";?></label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()' );
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												 <div class="col-md-3">
-												  <label><?php echo "Basic Amount ($INRSYM);"?></label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue',  'class' => 'form-control num' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-								 
-								</div>
-								 <div class="col-md-12">
-										<div class="col-md-12">
-											<div class="col-md-5 col-md-offset-4" align="right">
-													 
-									 Service Tax @14% :
-											</div>	
-											
-											<div class="col-md-3">
-													 <div class="form-group">
-																		<?php
-																 $data = array('name' => 'AfterServiceTax','value' => set_value('AfterServiceTax'),'id'=>'AfterServiceTax',  'class' => 'form-control num' ,'placeholder' => 'After Service Tax','readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-									 
-											</div>			 
-								 
-										</div>		 
-									<div class="col-md-12">
-											<div class="col-md-5 col-md-offset-4" align="right">
-												Edu. cess @2% on service Tax 	: 
-									 
-											</div>	
-											
-											<div class="col-md-3">
-													 <div class="form-group">
-																		<?php
-																 $data = array('name' => 'AfterEduCess','value' => set_value('AfterEduCess'),'id'=>'AfterEduCess',  'class' => 'form-control num' ,'placeholder' => 'After Edu.','readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-									 
-											</div>	 
-								 
-								 </div>
-								 <div class="col-md-12">
-												 
-								 <div class="col-md-5 col-md-offset-4" align="right">
-													Sec. & Higher Edu. cess @1 % on service Tax  :
-									 
-											</div>	
-											
-											<div class="col-md-3">
-													 <div class="form-group">
-																		<?php
-																 $data = array('name' => 'AfterSecHighTax','value' => set_value('AfterSecHighTax'),'id'=>'AfterSecHighTax',  'class' => 'form-control num' ,'placeholder' => 'After High Edu.','readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-									 
-											</div>
-								 </div>
-								  <div class="col-md-12">
-												 
-								 <div class="col-md-5 col-md-offset-4" align="right">
-													Krishi Kalyan tax  @.5 % on Basic Amount:
-									 
-											</div>	
-											
-											<div class="col-md-3">
-													 <div class="form-group">
-																		<?php
-																 $data = array('name' => 'AfterKrishiTax','value' => set_value('AfterKrishiTax'),'id'=>'AfterKrishiTax',  'class' => 'form-control  num' ,'placeholder' => 'After Krishi Kalyan tax.','readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-									 
-											</div>
-								 </div>
-								  <div class="col-md-12">
-												 
-								 <div class="col-md-5 col-md-offset-4" align="right">
-													Swachh Bharat tax @.5 % on Basic Amount:
-									 
-											</div>	
-												
-											<div class="col-md-3">
-													 <div class="form-group">
-																		<?php
-																 $data = array('name' => 'AfterSwachhTax','value' => set_value('AfterSwachhTax'),'id'=>'AfterSwachhTax',  'class' => 'form-control num' ,'placeholder' => 'After High Edu.','readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-									 
-											</div>
-								 </div>
-								
-								  <div class="col-md-12">
-								 <div class="col-md-5 col-md-offset-4" align="right">
-									<label><?php echo "Total Order Value ($INRSYM)";?></label>		 
-											</div>	
-								<div class="col-md-3">
-													 <div class="form-group">
-																			<?php
-																	 $data = array('name' => 'TotalOrderValue','value' => set_value('TotalOrderValue'),'id'=>'TotalOrderValue',  'class' => 'form-control num' ,'placeholder' => 'Total value','readonly' => 'true');
-																	echo form_input($data);
-																	?>   
-																</div>
-													 </div>
-								 </div>
-								 
-									</div>
-								
-									
-									  <br/>
-									   <br/>
-									<div class="modal-footer">
-									<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>
-												<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
-									
-									</div>
-								  </div>
-								 </form>
-									 
-								  </div>
-							</div>	
-						  </div>
+							
 						   <!-- Edit Modal content-->
 							<div class="modal fade" id="EDITSERVICE" role="dialog">
 								<div class="modal-dialog">
@@ -1158,11 +673,10 @@ $(document).ready(function () {
 												  <div class="col-md-3">
 												  <label>Item Code</label>
 															<div>
-																 <?php
-																$options = array("0"=>'Item Code');     
-																//print_r(  $options);
+																 <?php $data = array('name' => 'EditMaterialCode','value' => set_value('EditMaterialCode'),'id'=>'EditMaterialCode',  'class' => 'form-control num' ,'readonly' => 'true');
+																echo form_input($data);
+																
 																
-																echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"');
 
 																?>						 
 															</div>
@@ -1386,7 +900,7 @@ $(document).ready(function () {
 									<td align="right"><?php echo $record->TotalValue ?></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->ReqNo ; ?>" />
-									<input type="hidden" name="<?php echo 'AvilBudget'.$index ?>" id="<?php echo 'AvilBudget'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />					
+									<input type="hidden" name="<?php echo 'AvilBudget'.$index ?>" id="<?php echo 'AvilBudget'.$index ?>"  />					
 									<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 ; ?>" />
@@ -1425,9 +939,9 @@ $(document).ready(function () {
 												$TotalBasicAmount = $TotalBasicAmount + $record->BasicValue;
 												
 										}
-										?> <input type="hidden" name="txtRowCount" id="txtRowCount"  value="<?php echo $index;?>">
+										?> 
 										<?php 
-										   
+										 $Rowcount  = $index;
 									}
 									?>
 							</tbody>
@@ -1505,8 +1019,8 @@ $(document).ready(function () {
 							<div class="row"><br/>
 								<div align="right" style="padding-right:10px">
 								<input type="hidden" name="txtPONO" id="txtPONO"  value="<?php  echo $PONO; ?>"/> 
-								<input type="hidden" name="txtStatus" id="txtStatus" /> 		   
-								<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />  
+								<input type="hidden" name="txtStatus" id="txtStatus" /> 			
+								<input type="hidden" name="txtRowCount" id="txtRowCount"  value="<?php echo $Rowcount;?>">								
 								<?php //if($PONOStatus == PO_DRAFT) {?>   
 							<!--	<a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
 								<a class="btn btn-primary Save"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
@@ -1535,11 +1049,7 @@ $(document).ready(function () {
 							</div>
 							<div class="col-md-4">
 								<span>Status</span>								  
-								 <?php
-									// $options = array("0"=>'Select Status');     
-									// echo form_dropdown('Status', $options,set_value('Status'),'id="Status"'  ,'required="true"' ,'class="form-control select2')
-								 // $options = array("0"=>$PONOStatus);     
-         //                            echo form_dropdown('Status', $options,set_value('Status',$StatusName),'id="Status"'  ,'required="true"' ,'class="form-control select2')
+								 <?php							
 
                                     
                                      $data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status',  'class' => 'form-control' ,'readonly' => 'true');
@@ -1554,27 +1064,7 @@ $(document).ready(function () {
 		</div>
 	</section>
 </div>
-<script type="text/html" id="ServiceList">
-<tr  id="<%=index%>">
-<td align="left"><%=index%></td>
- <td align="left"><%=ReqNo%></td>
- 
-  <td align="left"><%=MaterialName%></td>
-  <td align="left"><%=Quantity%></td> 
-  <td align="left"><%=UOM%></td>
-   <td align="left"><%=Rate%></td>
-    <td align="left"><%=BasicAmount%></td>
-	<td align="left"><%=Taxvalue%></td>
-	<td align="left"><%=TotalValue%></td>
-	
-   <td>
-                          <a    data-target='#EDITSERVICE'	data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
-						 
-						  
-                      </td>
-</tr>
 
-</script>
 <script>
 var index     = $('#txtRowCount').val();;
 var userid  = '';
@@ -1585,17 +1075,6 @@ var userid  = '';
 };
 
 
-var paymentday=<?php echo json_encode($PaymentDays,JSON_PRETTY_PRINT)?>;
-if (paymentday=="After") 
-{
-//alert();
-    document.getElementById("After").checked = true;
-}
-else
-{
-    document.getElementById("Before").checked = true;
-}
-
 $("#EDITSERVICE").on("shown.bs.modal", function(e) {
 		userid = $(e.relatedTarget).data('userid');
 	
@@ -1607,7 +1086,7 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
 		$('#EditdeptName').val($('#departmentName'+userid).val());
 		$("#EditCostCenter").val($('#costCode'+userid).val());
 		$('#EditAvlBudAmt').val($('#AvilBudget'+userid).val());
-		
+		$('#EditMaterialCode').val($('#materialCode'+userid).val());
 		$('#EditItemName').val($('#materialName'+userid).val());
 		$('#EditUOM').val($('#uom'+userid).val());
 		$('#EditQuantity').val($('#quantity'+userid).val());
@@ -1676,92 +1155,6 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
 	   
 });
 
-$('.AddService').click(function(){
-        
-		
-      if(validateServiceTax())
-	  {
-		// alert('inside Addservice');
-		 var temp = parseInt(index) + 1;
-		 var Reqnumber = $('#ReqNo').val();
-		 var departmentName = $('#deptName').val();
-		 var AvilBudget = $('#AvlBudAmt').val();
-		 var costCode = $('#CostCenter').val();
-         var materialCode =$('#MaterialCode').val();
-         var materialName =  $("#ItemName").val();
-         var uom = $("#UOM").val();
-		 var quantity = $("#Quantity").val();
-		 var itemRate = $("#Rate").val();
-		  
-		
-		  var AfterServiceTax = $("#AfterServiceTax").val();
-		  
-		 
-		  var AfterEduCess = $("#AfterEduCess").val();
-		  
-		  
-		  var AfterSecHighTax = $("#AfterSecHighTax").val();
-		  
-		
-		  var AfterKrishiTax = $("#AfterKrishiTax").val();
-			
-		 
-		  var AfterSwachhTax = $("#AfterSwachhTax").val();
-		  
-		  var TotalOrderValue = $("#TotalOrderValue ").val();
-		 
-		  
-		 var basicval = $("#txtBasicValue").val();
-	
-		
-		 var TotalTaxValue = calculateTaxValue();		 
-	   
-		 $('#MaterialCode option[value='+materialCode+']').remove();
-		  SelectedMaterialCode[CollIndex] = materialCode;
-			CollIndex = CollIndex + 1;
-			
-			SelectedMaterialList.Mat.push({ 
-        "materialCode" :  materialCode,
-        "ReqNo"  : Reqnumber,
-      
-		});	
-		 populateValueMainFormForServiceTax();	 
-		
-			
-		  index = parseInt(index)+1;		
-		 
-	      var template = jQuery("#ServiceList").html();
-	   
-	     
-          $('#ServiceAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:TotalOrderValue}));
-		  
-		
-		 
-		 var theForm = $(".ServicePO");
-		
-		 addHidden(theForm,"Reqnumber"+temp,Reqnumber );
-		 addHidden(theForm,"departmentName"+temp,departmentName );
-	     addHidden(theForm,"AvilBudget"+temp,AvilBudget );
-		 addHidden(theForm,"costCode"+temp,costCode );		
-		  addHidden(theForm,"materialCode"+temp,materialCode );
-		 addHidden(theForm,"materialName"+temp,materialName );
-	     addHidden(theForm,"uom"+temp,uom);
-		 addHidden(theForm,"quantity"+temp,quantity);
-		  addHidden(theForm,"itemRate"+temp,itemRate);
-		
-		  addHidden(theForm,"ServiceTax"+temp,AfterServiceTax);
-		  addHidden(theForm,"EduCess"+temp,AfterEduCess);
-	      addHidden(theForm,"SecHighTax"+temp,AfterSecHighTax);
-	      addHidden(theForm,"KrishiTax"+temp,AfterKrishiTax);
-		  addHidden(theForm,"SwachhTax"+temp,AfterSwachhTax); 
-				   
-		  addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);		
-		
-		  $('#txtRowCount').val(temp); 
-		  clearServiceModalFields();
-      	  }	  
-   
- });
 
  $('.EditService').click(function(){
          
@@ -1830,49 +1223,9 @@ $('.AddService').click(function(){
       }
     
  });
- function addHidden(theForm, key, value) {
-    // Create a hidden input element, and append it to the form:
-    var input = document.createElement('input');
-    input.type = 'hidden';
-    input.name = key;'name-as-seen-at-the-server';
-    input.id = key;'name-as-seen-at-the-server';
-    input.value = value;
-    theForm.append(input);
-}
+ 
 
-function populateValueMainFormForServiceTax()
-{
-		var AfterServiceTax = $('#AfterServiceTax').val() == '' ? '0.00' : $('#AfterServiceTax').val();
-		var AfterEduCess = $('#AfterEduCess').val() == '' ? '0.00' : $('#AfterEduCess').val();
-		var AfterSecHighTax = $('#AfterSecHighTax').val() == '' ? '0.00' : $('#AfterSecHighTax').val();
-		var AfterKrishiTax = $('#AfterKrishiTax').val() == '' ? '0.00' : $('#AfterKrishiTax').val();
-	    var AfterSwachhTax = $('#AfterSwachhTax').val() == '' ? '0.00' : $('#AfterSwachhTax').val();
-		var TotalVal = $('#TotalOrderValue ').val() == '' ? '0.00' : $('#TotalOrderValue').val();
-		
-		var BasicVal = $('#txtBasicValue').val() == '' ? '0.00' : $('#txtBasicValue').val();
-		
-		
-		var TotalOrderValueSummary = $('#txtTotalOrderValueSummary').val() == '' ? '0.00' : $('#txtTotalOrderValueSummary').val();
-		
-		var totBasicAmt = $('#txtTotBasicAmount').val() == '' ? '0.00' : $('#txtTotBasicAmount').val();
-                totBasicAmt = Number(totBasicAmt.replace(/[^0-9\.]+/g,""));
-	  
-		var TotalServiceTax = $('#txtTotalServiceTax').val() == '' ? '0.00' : $('#txtTotalServiceTax').val();
-		var TotHigherEdu = $('#txtTotHigherEdu').val() == '' ? '0.00' : $('#txtTotHigherEdu').val();
-		var TotalEducess = $('#txtTotalEducess').val() == '' ? '0.00' : $('#txtTotalEducess').val();
-		var TotalKrishiKalyan = $('#txtTotalKrishiKalyan').val() == '' ? '0.00' : $('#txtTotalKrishiKalyan').val();
-		var TotSwachhBharat = $('#txtTotSwachhBharat').val() == '' ? '0.00' : $('#txtTotSwachhBharat').val();
-		
 
-		$('#txtTotBasicAmount').val((parseFloat(totBasicAmt) + parseFloat(BasicVal)).toFixed(2) );
-		$('#txtTotalServiceTax').val((parseFloat(TotalServiceTax) + parseFloat(AfterServiceTax)).toFixed(2) );
-		$('#txtTotHigherEdu').val((parseFloat(TotHigherEdu) + parseFloat(AfterSecHighTax)).toFixed(2) );
-		$('#txtTotalEducess').val((parseFloat(TotalEducess) + parseFloat(AfterEduCess)).toFixed(2) );
-		$('#txtTotalKrishiKalyan').val((parseFloat(TotalKrishiKalyan) + parseFloat(AfterKrishiTax)).toFixed(2) );
-		$('#txtTotSwachhBharat').val((parseFloat(TotSwachhBharat) + parseFloat(AfterSwachhTax)).toFixed(2) );	
-		$('#txtTotalOrderValueSummary').val((parseFloat(TotalOrderValueSummary) + parseFloat(TotalVal)).toFixed(2) );
-		
-}
 function populateValueMainFormForEditServiceTax()
 {
 	  
@@ -1941,240 +1294,10 @@ function calculateEditTaxValue()
 	var TottaxAmt = ServiceTaxAmount+ EduCessTaxAmount + SecHighTaxAmount+ KrishiTaxAmount + SwachhTaxAmount;
 	return parseFloat(TottaxAmt.toFixed(2)); 
  }
-function clearServiceModalFields()
-{
-	// To reset the Modal controls
-	$('#ReqNo').val('0'); 	
-	$('#deptName').val('');	
-	$('#CostCenter').val("0");
-	$('#AvlBudAmt').val('');
-	$('#MaterialCode').val("0")	;
-	$("#ItemName").val('');		
-	$('#UOM').val(''); 
-	$('#Quantity').val('');       
-	$("#Rate").val('');			 
-
-	$("#txtBasicValue").val('');
-	$("#AfterServiceTax").val('');
-	$("#AfterEduCess").val('');
-	$("#AfterSecHighTax").val('');
-	$("#AfterKrishiTax").val('');
-	$("#AfterSwachhTax").val('');
-	$("#TotalOrderValue ").val('');
-}
-var DeletedMaterialCode='';
-var DeletedMaterialName='';
-function DeleteRow(rowid)
-{
-	   var id = [];
-	   var DelRows  = $('#txtDeletedRow').val();
-	  
-	   var tr = document.getElementById(rowid);
-	  
-	   var MaterialCode = $('#materialCode'+rowid).val();
-	   var LineItemNo =$('#LineItemNo'+rowid).val();
-	   var ReqNo =$('#Reqnumber'+rowid).val();
-	   var POType ='<?php echo SERVICE ?>';
-		id[0]= LineItemNo;
-	    id[1]= ReqNo;
-		id[2]= MaterialCode;
-		id[3]= POType;
-		
-	   var answer = confirm(" Do you want to delete the Item from the List?")
-		if (answer) 
-		{ 			
-			
-			tr.parentNode.removeChild(tr);
-			
-			var removeItem = $('#materialCode'+rowid).val();
-
-		var materialCode = $('#materialCode'+rowid).val();
-              
-
-			 var removeItem = $('#materialCode'+rowid).val();  
-		 var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
- for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function (index, value) {
 
 
-      	if (value.MaterialCode==materialCode) {
 
 
-      		                                  //  $("#MaterialCode").append( $('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName) );
-                      DeletedMaterialCode = $('#materialCode'+rowid).val();
-                    DeletedMaterialName = $('#materialName'+rowid).val();
-      	}
-});
-}
-		
-		  
-		   SelectedMaterialCode.splice( SelectedMaterialCode.indexOf('removeItem'), 1 );
-		   var x = <?php echo json_encode($POItem, JSON_PRETTY_PRINT) ?>; 
-		  
-		   var result = '0';
-		   $.each(x, function(idx, obj) {
-			 
-						if(obj.LineItemNo === LineItemNo)
-						{			 
-						   result = '1';
-						   return  false;	
-						}
-						
-					   });
-					   
-					  // alert(result);
-			if(result == '0')
-			{
-				var DelRows  = $('#txtDeletedRow').val();
-				//tr.parentNode.removeChild(tr);
-				if(DelRows != '')
-					{
-					DelRows = DelRows + ":" + rowid;
-					}
-				else
-					{
-					DelRows=  "0" + ":" + rowid;
-					}
-				$('#txtDeletedRow').val(DelRows);
-			}
-           	// To delete the value from Tables
-			else  if(result == '1')
-			{
-				var DelRows  = $('#txtDeletedRow').val();
-				//tr.parentNode.removeChild(tr);
-				if(DelRows != '')
-					{
-					DelRows = DelRows + ":" + rowid;
-					}
-				else
-					{
-					DelRows=  "0" + ":" + rowid;
-					}
-				$('#txtDeletedRow').val(DelRows);				
-					
-			 $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>purchaseorder/DeletePODetails", 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				alert(data);			
-			}
-			else
-			{
-				alert("Error");	
-			}			
-		
-		}});  
-			}		   
-		
-		   populateValueMainFormForDeleteItem(rowid);
-		  
-		}
-       	
-} 
-function populateValueMainFormForDeleteItem(rowid)
-{
-	  
-		
-        //alert(rowid);
-		var TotServiceTax = $('#txtTotalServiceTax').val();
-		var TotEduCess = $('#txtTotalEducess').val();
-		var TotSecHighTax = $('#txtTotHigherEdu').val();
-		var TotKrishiTax = $('#txtTotalKrishiKalyan').val();
-		var TotSwachhTax = $('#txtTotSwachhBharat').val();
-		var TotSummary = $('#TotalOrderValue').val();
-		var TotBasicAmout = $('#txtTotBasicAmount').val();
-		
-          
-			
-		var AfterServiceTax = $('#ServiceTax'+rowid).val() == '' ? '0.00' : $('#ServiceTax'+rowid).val();
-		var AfterEduCess = $('#EduCess'+rowid).val() == '' ? '0.00' : $('#EduCess'+rowid).val();
-		var AfterSecHighTax = $('#SecHighTax'+rowid).val() == '' ? '0.00' : $('#SecHighTax'+rowid).val();
-		var AfterKrishiTax =$('#KrishiTax'+rowid).val() == '' ? '0.00' : $('#KrishiTax'+rowid).val();
-	       var AfterSwachhTax = $('#SwachhTax'+rowid).val() == '' ? '0.00' : $('#SwachhTax'+rowid).val();
-		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
-		
-		var Quantity = $('#quantity'+rowid).val() == '' ? '0.00' : $('#quantity'+rowid).val();
-		var ItemRate = $('#itemRate'+rowid).val() == '' ? '0.00' : $('#itemRate'+rowid).val();	
-		var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate);
-              // alert(BasicVal);
-		//alert(TotalVal);
-
-		
-		TotServiceTax = parseFloat(TotServiceTax) -  parseFloat(AfterServiceTax);
-		TotEduCess = parseFloat(TotEduCess) - parseFloat(AfterEduCess);
-		TotSecHighTax = parseFloat(TotSecHighTax) - parseFloat(AfterSecHighTax);
-		TotKrishiTax = parseFloat(TotKrishiTax) - parseFloat(AfterKrishiTax);
-		TotSwachhTax = parseFloat(TotSwachhTax) - parseFloat(AfterSwachhTax);
-             
-		TotSummary = parseFloat(TotBasicAmout) - parseFloat(TotalVal);
-		TotBasicAmout = parseFloat(TotBasicAmout) - parseFloat(BasicVal);
-		
-			
-		   
-		$('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
-		$('#txtTotalServiceTax').val(parseFloat(TotServiceTax).toFixed(2) );
-		$('#txtTotHigherEdu').val(parseFloat(TotSecHighTax).toFixed(2) );
-		$('#txtTotalEducess').val(parseFloat(TotEduCess).toFixed(2) );
-		$('#txtTotalKrishiKalyan').val(parseFloat(TotKrishiTax).toFixed(2) );
-		$('#txtTotSwachhBharat').val(parseFloat(TotSwachhTax).toFixed(2) );
-		$('#txtTotalOrderValueSummary').val(parseFloat(TotSummary).toFixed(2) );	
-
-		
-		
-}
-function validateServiceTax()
- {  
-
-	if($('#ReqNo').val() == "0")
-	{
-		alert('Please select the Requisition Number');
-		$('#ReqNo').focus();
-		return false;
-	}
-	else if($('#CostCenter').val() == "0")
-	{
-		alert('Please select the Cost center');
-		$('#CostCenter').focus();
-		return false;
-	}
-	else if($('#MaterialCode').val() == "0")
-	{
-		alert('Please select the Material Code');
-		$('#MaterialCode').focus();
-		return false;
-	}		
-	else if($('#Quantity').val() == '')
-	{
-		alert('Please Enter the Quantity value');
-		$('#Quantity').focus();
-		return false;
-	}
-	else if($('#Rate').val() == '')
-	{
-		alert('Please Enter the Rate of the Item');
-		$('#Rate').focus();
-		return false;
-	}
-	else if(ExceedQuantityCheck() ==  false)
-	{  
-		return false;
-	}
-	else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvlBudAmt').val()) == false)
-	{
-		 $('#Rate').focus(); 
-				return false;
-	}
-	else
-	{
-		return true;
-	}
-		
- }
  function validateEditServiceTax()
  {  
 
@@ -2223,14 +1346,9 @@ function validateServiceTax()
 
 function Save(status)
 {  
-if(status == '0')
-{
-	stat = '<?php echo PO_DRAFT; ?>';
-}
-else
-{
-	stat = '<?php echo PO_CREATED; ?>';
-}
+
+	stat = '<?php echo PO_RELEASED; ?>';
+
 var splinstr = $('#txtSpcialInstruction').val();
 var deladd = $('#DeliveryAddr').val();
 $('#txtStatus').val(stat);
@@ -2264,7 +1382,7 @@ $('#txtDeliveryAddress').val(deladd);
 				$('#txtStatus').val('');
 				$('#SpcialInstruction').val('');
 				$('#txtDeliveryAddress').val('')
-				//window.location =	"purchaseorderListing";
+				window.location =	"purchaseorderListing";
 			
 			}
 			else
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 4f2b5ffb..b9288c46 100644
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -3,6 +3,7 @@ $AvlAmount = 0;
 $ReqType =''; 
 $Value='';
 $EXCRATE=0;
+$parentPO= '';
 //$Value="&#36;";
 //echo $ExchangeRate;
 //echo $Currency;
@@ -13,6 +14,7 @@ $Currencycode=$currencycode;
 //echo $Currencycode;
 
 
+					
 foreach ($CurrencyDetail as $Detail) 
 {
    $Cur=$Detail->Currency_Code.' '.' - '.' '.$Detail->Country_and_Currency;
@@ -116,10 +118,10 @@ if(!empty($POMaster))
         $PaymentDays=$Req->PaymentDays;
         $StatusName=$Req->StatusName;
         $Currency_Type=$Req->CurrencyType;
-
+		 $parentPO =$Req->ParentPO;
     }
 }
-
+//echo $ServiceDescription;
 //echo $StatusName;
 
 
@@ -136,14 +138,7 @@ if(!empty($RequistionDetails))
         //$Status=$ReqDet->Status;
     }
 }
-//echo $RequesterName;
 
-// foreach ($POSTATUS as $PST ) 
-// {
-//    $POStatus=$PST->StatusName;
-// }
-
-//echo "$POStatus";
 ?>
 
 <style>
@@ -238,7 +233,11 @@ body {
      <div style="border:2px solid #333">
         <div class="col-md-12">
 			<div class="col-md-11">
+			<?php if ($parentPO == '') { ?>
 			 <center><b><h2>Siddharth Industries - Edit Import Purchase Order-<?php echo "$PONO"?></h2></b></center>
+			<?php } else {?>
+			   <center><b><h2>Siddharth Industries - Amended Purchase Order-<?php echo "$PONO"?></h2></b></center>
+			   <?php } ?>
 			</div>
 			<!--<div class="col-md-1"><br/>		
 			 <a class="btn btn-info" href="<?php echo base_url(); ?>purchaseorder/CreateimportPOPrint" target="_blank">Print</a>			
@@ -275,8 +274,6 @@ body {
      <div class="col-md-12">
                 <label>Currency Type</label>
                      
-
-
                 <?php
                                    
                                     
@@ -501,7 +498,7 @@ body {
                 <label class="radio-inline"><input type="radio" name="Payment"  value="Before">Before</label>
                 <label class="radio-inline"><input type="radio" name="Payment" value="After">After</label>
             </div> -->
-             <!--  <div class="col-md-3">
+              <div class="col-md-3">
                       <span>Payable AT</span>
                       
                       <?php
@@ -521,7 +518,7 @@ body {
 
                             </td>
                         </tr>
-                </div> -->
+                </div>
              
     </div>
     </div>     
@@ -532,16 +529,10 @@ body {
      <table class="table table-bordered" style="border:1px solid #333">
   <div align="right" style="padding-right:10px">
 <div align="right">
-<?php 
-
-if($PONOStatus == PO_RELEASED) 
-                            {?> 
-<!-- <a data-toggle="modal" data-target="#importpomodel"  class="btn btn-primary" data-dismiss="modal" onclick="myFunction();" >Add Line Item </a> -->
-  <?php
-    } else {?> 
-    <a data-toggle="modal" data-target="#importpomodel"  class="btn btn-primary" data-dismiss="modal" onclick="myFunction();" >Add Line Item </a><?php  
-                        }?> 
-
+<?php if ($parentPO == '') { ?>
+<a data-toggle="modal" data-target="#importpomodel"  class="btn btn-primary" data-dismiss="modal" onclick="myFunction();" >Add Line Item </a>
+  
+<?php } ?>
    
 
   <!--<a data-toggle="modal"><button type="submit"  onclick="myFunction();" class="btn btn-primary" id="abcd" >Select Line Item</button> </a>-->
@@ -678,7 +669,7 @@ if($PONOStatus == PO_RELEASED)
                                                 </div>
                                                 <div class="col-md-2">
                                                     <!-- <label>Rate </label>
-     -->
+ -->
 
                                         <P id=labelRate>  <label><?php echo "Rate in $Currencycode ($Value)";?> </label></P>
                                                     <div class="form-group">
@@ -1639,545 +1630,7 @@ if($PONOStatus == PO_RELEASED)
                                 </form>
 
                             </div>
-                        </div>  
-
-    <!-- view model body -->
-     <div  id="viewimportmodal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                            <div class="modal-dialog">
-                                <!-- Modal content-->
-                                <form>
-                                    <div class="modal-content" style="width:900px;">
-                                        <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
-                                            <button type="button" class="close" data-dismiss="modal">&times;</button>
-                                            <center><h4>View Import Purchase Order Item </h4></center>
-                                        </div>
-                                        <div align="left">
-
-                                            <div class="col-md-12">
-                                                <div class="col-md-3">
-                                                    <label>Req No</label>
-                                                    <div>
-                                                        <?php
-                                            
-                                        $data = array('name' => 'ViewReqNo','value' => set_value('ViewReqNo'),'id'=>'ViewReqNo',  'class' => 'form-control','readonly'=>'true');
-                                        echo form_input($data);?>
-                                                    </div>
-                                                </div>
-
-                                                <div class="col-md-3">
-                                                    <label>Department Name</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                         $data = array('name' => 'ViewdeptName','value' => set_value('ViewdeptName'),'id'=>'ViewdeptName',  'class' => 'form-control','readonly'=>'true');
-                                        echo form_input($data);
-                                        ?>   
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-3">
-                                                    <label>Cost Center Name</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $options = array("0"=>'Select Cost Center');
-
-                                                        //echo form_dropdown('EditCostCenter', $options,set_value('EditCostCenter'),'id="EditCostCenter"' ,'class="form-control"');
-
-                                                          $data = array('name' => 'ViewCostCenter','value' => set_value('ViewCostCenter'),'id'=>'ViewCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-                                                echo form_input($data);
-
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-3">
-                                                    <label>Available Budget Amount</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ViewAvlBudAmt','value' => set_value('ViewAvlBudAmt'),'id'=>'ViewAvlBudAmt',  'class' => 'form-control' ,'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="col-md-12">
-                                                <div class="col-md-2">
-                                                    <label>Item Code</label>
-                                                    
-                                                        <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
-                                                        <div>
-                                                        <?php
-                                                       // $options = array("0"=>'Item Code');
-
-                                                        //if(!empty($MaterialList))
-                                                        //{
-                                                          //  foreach ($MaterialList as $SID):
-
-
-                                                            //    $options[$SID->MaterialCode] =  $SID->MaterialCode.' '.' - '.' '.$SID->MaterialName;
-
-                                                            //endforeach;
-                                                        //}
-
-                                                        //echo form_dropdown('ImportMaterialCode', $options,set_value('ImportMaterialCode'),'id="ImportMaterialCode"' ,'class="form-control"');
-
-                                                        $options = array("0"=>'Item Code');     
-                                        //print_r(  $options);
-                                        
-                                                                            
-                            
-                                        echo form_dropdown('ViewMaterialCode', $options,set_value('ViewMaterialCode'),'id="ViewMaterialCode"' ,'class="form-control"');
-
-                                                        ?>
-                                                    </div> 
-
-                                                </div>
-
-                                                <div class="col-md-2">
-                                                    <label>Item Name</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ViewItemName','value' => set_value('ViewItemName'),'id'=>'ViewItemName',  'class' => 'form-control' ,'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-2">
-                                                    <label>UOM</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ViewUOM','value' => set_value('ViewUOM'),'id'=>'ViewUOM',  'class' => 'form-control' ,'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-2">
-                                                    <label>Quantity</label>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ViewQuantity','value' => set_value('ViewQuantity'),'id'=>'ViewQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange(),ExceedEditQuantityCheck()');
-                                                        echo form_input($data);
-
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-2">
-                                                   <!--  <label>Rate </label> -->
-
-                                            <P id=labelEditRate>  <label><?php echo "Rate in $Currencycode ($Value)";?> 
-                                                    <div class="form-group">
-                                                        <?php
-                                                       $data = array('name' => 'ViewRate','value' => set_value('ViewRate'),'id'=>'ViewRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-2">
-                                                   <!-- <label><?php echo "Basic Value In";?></label>-->
-                                            <p id=label3><label><?php echo "Basic Value In $Currencycode ($Value)";?></label></p>
-                                                    <div class="form-group">
-                                                        <?php
-                                                        //$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
-
-                                                    $data = array('name' => 'ViewtxtBasicValue','value' => set_value('ViewtxtBasicValue'),'id'=>'ViewtxtBasicValue',  'class' => 'form-control' ,'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="col-md-12">
-
-                                                <div class="col-md-3">
-
-                                                    <!-- Basic Price in US $ per Ton : -->
-
-                                <p id=labelEditBasicPriceUs><b><?php echo "Basic Price in $Currencycode ($Value)"?></p>
-
-
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ViewimBasicPrice','value' => set_value('ViewimBasicPrice'),'id'=>'ViewimBasicPrice',  'class' => 'form-control' ,'placeholder '=>'basic price','onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-
-                                                <div class="col-md-3">
-
-                                                    Exchange Rate :
-
-
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ViewExchangeRt','value' => set_value('ViewExchangeRt'),'id'=>'ViewExchangeRt',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-
-                                                </div>
-
-                                                <div class="col-md-3">
-
-                                                   <!--  Basic value in INR : -->
-
-                                        <p id=labelEditBasicINR><label><?php echo "Basic value in INR :";?></label></p>
-
-                                                    <div class="form-group">
-                                                        <?php
-                                                        $data = array('name' => 'ViewINRBasicvalue','value' => set_value('ViewINRBasicvalue'),'id'=>'ViewINRBasicvalue',  'class' => 'form-control' ,'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
-                                                <!--<div class="col-md-3">
-                                             <a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
-                                     </div>-->
-
-                                                <div class="col-md-12"  style="border:1px solid #000;padding:0px;">
-                                                    <br/>
-                                                    <div class="col-md-6" style="padding:0px;">
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4" >
-                                                                Basic Price:
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewBasicPriceTax','value' => set_value('ViewBasicPriceTax'),'id'=>'ViewBasicPriceTax',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewAfterBasicPriceTax','value' => set_value('ViewAfterBasicPriceTax'),'id'=>'ViewAfterBasicPriceTax',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Landing charge
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewLandingCharge','value' => set_value('ViewLandingCharge'),'id'=>'ViewLandingCharge',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateloadingcharge()');
-                                                                    echo form_input($data);
-
-                                                  
-                                                                    
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewAfterLandingCharge','value' => set_value('ViewAfterLandingCharge'),'id'=>'ViewAfterLandingCharge',  'class' => 'form-control'  ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                High seas sales charge
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewHighseas ','value' => set_value('ViewHighseas'),'id'=>'ViewHighseas',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateHighseassalescharge()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewAfterHighseas','value' => set_value('ViewAfterHighseas'),'id'=>'ViewAfterHighseas',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Custom duty : (a)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewCustomduty','value' => set_value('ViewCustomduty'),'id'=>'ViewCustomduty',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomduty()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewAfterCustomduty','value' => set_value('ViewAfterCustomduty'),'id'=>'ViewAfterCustomduty',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Excise duty : (b)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewExcisedutyTax','value' => set_value('ViewExcisedutyTax'),'id'=>'ViewExcisedutyTax',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateExciseDuty()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewAfterExcisedutyTax','value' => set_value('ViewAfterExcisedutyTax'),'id'=>'ViewAfterExcisedutyTax',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Excise duty ED_cess : (C)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewExcisedutyEDcess','value' => set_value('ViewExcisedutyEDcess'),'id'=>'ViewExcisedutyEDcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateExciseED1()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewAfterExcisedutyEDcess','value' => set_value('ViewAfterExcisedutyEDcess'),'id'=>'ViewAfterExcisedutyEDcess',  'class' => 'form-control','readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Excise duty S & H cess :(d)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewExcisedutySHcess','value' => set_value('ViewExcisedutySHcess'),'id'=>'ViewExcisedutySHcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateexciseSHcess()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewAfterExcisedutySHcess','value' => set_value('ViewAfterExcisedutySHcess'),'id'=>'ViewAfterExcisedutySHcess',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Custom ED_cess : (e)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewCustomEDcess','value' => set_value('ViewCustomEDcess'),'id'=>'ViewCustomEDcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomEdcess()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewAfterCustomEDcess','value' => set_value('ViewAfterCustomEDcess'),'id'=>'ViewAfterCustomEDcess',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Custom S & H cess : (f)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewCustomSHcess','value' => set_value('ViewCustomSHcess'),'id'=>'ViewCustomSHcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomSHcess()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewAfterCustomSHcess','value' => set_value('ViewAfterCustomSHcess'),'id'=>'ViewAfterCustomSHcess',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-md-6" style="padding:0px;">
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                Additional Excise duty : (g)
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewAdditionalExciseduty ','value' => set_value('ViewAdditionalExciseduty'),'id'=>'ViewAdditionalExciseduty',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewAfterAdditionalExciseduty','value' => set_value('ViewAfterAdditionalExciseduty'),'id'=>'ViewAfterAdditionalExciseduty',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-8">
-                                                                Gross duty payable
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewGrossdutypayable ','value' => set_value('ViewGrossdutypayable'),'id'=>'ViewGrossdutypayable',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-8">
-                                                                Available Modvat set-off on import :
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewAvailableModvat','value' => set_value('ViewAvailableModvat'),'id'=>'ViewAvailableModvat',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>   (b + c + d + g)
-                                                                </div>
-                                                            </div>
-
-                                                        </div>
-                                                        <div class="col-md-12">
-
-                                                            <div class="col-md-8">
-                                                                Gross expenses due to custom duty:
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewGrossexpenses','value' => set_value('ViewGrossexpenses'),'id'=>'ViewGrossexpenses',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-
-                                                        <div class="col-md-12">
-                                                            <center> <label>Cost of the product Per KG</label></center>
-                                                            <hr/>
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                purchase rate [Basic]
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'Viewpurchaserate','value' => set_value('Viewpurchaserate'),'id'=>'Viewpurchaserate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-4"  style="margin-top: -4.8%">
-                                                                <span>Quantity</span>
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewPurQuantity','value' => set_value('ViewPurQuantity'),'id'=>'ViewPurQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCtable()');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-
-                                                        </div>
-                                                        <div class="col-md-12">
-
-                                                            <div class="col-md-4">
-                                                                Custom Duty Expenses
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewCustomDutyExpenses ','value' => set_value('ViewCustomDutyExpenses'),'id'=>'ViewCustomDutyExpenses',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-
-                                                        </div>
-                                                        <div class="col-md-12">
-                                                            <div class="col-md-4">
-                                                                RMC Including Customers
-                                                            </div>
-                                                            <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewRMCIncludingCustomers','value' => set_value('ViewRMCIncludingCustomers'),'id'=>'ViewRMCIncludingCustomers',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                         <div class="col-md-4">
-                                                                Total Amount:
-                                                            </div>
-                                                           <div class="col-md-4">
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewTotalExp','value' => set_value('ViewTotalExp'),'id'=>'ViewTotalExp',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-
-                                                        </div>
-
-
-                                                    </div>
-                                                </div>
-                                            </div>
-
-                                        </div>
-                                        <div class="modal-footer">
-                                            <!-- <a class="btn btn-info font EditImport"  ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a> -->
-                                            <!--<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
-
-                                            <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
-
-                                        </div>
-                                    </div>
-                                </form>
-
-                            </div>
-                        </div> 
-
-    <!-- Finish of view model body -->                          
+                        </div>        
   </div>
  
 
@@ -2192,15 +1645,11 @@ if($PONOStatus == PO_RELEASED)
                 <tr>
                     <th>SNo</th>
                     <th>Requisition No</th>
-                    <th>Material Code</th>
-                    <th>Description</th>
+                    <th>Item Name</th>
                     <th>Quantity</th>
                     <th>UOM</th>
                     <th>Rate</th>
                     <th>Basic Amount</th>
-                    <th>Received Qty</th>
-                    <th>Rejected Qty</th>
-                    <th>Pending Qty</th>
                     <!-- <th>Tax Amount</th>
                     <th>Total Order Amount</th> -->
                     <th>Action</th>
@@ -2222,15 +1671,12 @@ if($PONOStatus == PO_RELEASED)
                     ?>
                     <tr id="<?php echo $index ; ?>">
                     <td align="left"><?php echo $index ; ?></td> 
-                    <td><?php echo $record->ReqNo ?></td>
-                    <td><?php echo $record->MaterialCode ?></td>
+                    <td><?php echo $record->ReqNo ?></td> 
                     <td><?php echo $record->MaterialName?></td> 
                     <td><?php echo $record->Quantity ?></td>                      
                     <td><?php echo $record->UOM ?></td>                     
                     <td><?php echo $record->Rate ?></td>                     
-                    <td><?php echo $record->BasicValue ?></td> 
-                    <td><?php echo $record->ReceivedQuantity ?></td>
-                    <td><?php echo $record->ReceivedQuantity ?></td>
+                    <td><?php echo $record->BasicValue ?></td>    
                     <!-- <td><?php echo $record->Taxamount?></td>
                     <td><?php echo $record->TotalOrderValue?></td> -->
 
@@ -2317,23 +1763,19 @@ if($PONOStatus == PO_RELEASED)
 
                    <?php 
                             
-                            if($PONOStatus != PO_RELEASED) 
+                            if($PONOStatus == PO_DRAFT) 
                             {?>                 
                     <td>    <a    data-target='#editimportpomodel'    data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#editimportpomodel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
-
-
                       <?php
                         } else {?>  
-                        <!-- <td>   <a   data-toggle="tooltip"  data-target='#viewimportmodal'><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?>  -  Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a>  </td>  --> 
-
-                        <td>   <a    data-target='#viewimportmodal' data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#viewimportmodal"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the  <?php echo $record->ReqNo ; ?>Click here to view Requisition details"></i>&nbsp;&nbsp;&nbsp;</a>    </td>  
+                        <td>   <a   data-toggle="tooltip"  href="#"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?>  -  Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a>  </td>  
                          <?php  
                         }?> 
                     </tr> <?php
 
 
-                                
-                               $TotalLanding  = $TotalLanding + $record->AfterLandingCharge;
+                                //echo $record->AfterLandingCharge + $TotalLanding;
+                               $TotalLanding  = $TotalLanding + ($record->AfterLandingCharge);
                                $tothighseas   = $tothighseas + $record->AfterHighSeasSalesCharge;
                                $totcustom  = $totcustom + $record->AfterCustomDuty;
                                $totexciseduty  = $totexciseduty + $record->AfterExciseDuty;
@@ -2505,7 +1947,7 @@ if($PONOStatus == PO_RELEASED)
                     <div class="col-md-12">
                       <div class="col-md-12">
                             <label>Special Instructions :</label>  <?php
-                         $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
+                         $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
                         echo form_textarea($data);
                         ?>   
                       </div>   
@@ -2522,16 +1964,13 @@ if($PONOStatus == PO_RELEASED)
         <input type="hidden" name="txtPONO" id="txtPONO"  value="<?php  echo $PONO; ?>"/>   
 
 
-        <?php if($PONOStatus != PO_RELEASED) {?> 
+        <?php if($PONOStatus == PO_DRAFT) {?> 
         <a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
         <a class="btn btn-primary Submit"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
     <input type="reset" class="btn btn-primary" value="Reset">
     <?php }else {?>
-      <!-- <input type="reset" class="btn btn-primary" value = "OK"> -->
-      <a class="btn btn-primary"  href="<?php echo base_url(); ?>purchaseorderListing">OK</a>
-       <?php } ?>
-
-
+      <input type="reset" class="btn btn-primary" value = "OK">  <?php } ?>
+  
   </div>
          <br/>
      </div>
@@ -2571,16 +2010,12 @@ if($PONOStatus == PO_RELEASED)
 <tr  id="<%=index%>">
 <td align="left"><%=index%></td>
  <td align="left"><%=ReqNo%></td>
- <td align="left"><%=MaterialCode%></td>
  
-  <td align="left"><%=Description%></td>
+  <td align="left"><%=ItemName%></td>
   <td align="left"><%=Quantity%></td> 
   <td align="left"><%=UOM%></td>
    <td align="left"><%=Rate%></td>
     <td align="left"><%=BasicAmount%></td>
-    <td align="left"><%=ReceivedQty%></td>
-    <td align="left"><%=RejectedQty%></td>
-    <td align="left"><%=PendingQty%></td>
     <!-- <td align="left"><%=Taxvalue%></td>
     <td align="left"><%=TotalValue%></td> -->
     
@@ -2595,21 +2030,6 @@ if($PONOStatus == PO_RELEASED)
 
 <script type="text/javascript">
 
-
-$(document).ready(function () {
-                $('#Date').click(function () {
-                    //for Date range selection
-                    $('#Schedulediv').hide();
-                    $('#Deliverydtdiv').show();
-                });
-                $('#Schedule').click(function () {
-                    //for schedule range selection
-                    $('#Deliverydtdiv').hide();
-                    $('#Schedulediv').show();
-                });
-            });
-
-
  var SelectedMaterialCode = [];
 var RequistQuantity = '';
 var AvilBudAmt = '';
@@ -2905,7 +2325,6 @@ function EditRatechange()
 
 
 
-
 function Ratechange(){
     //alert();
     if($('#ReqNo').val() == "0")
@@ -2934,28 +2353,7 @@ function Ratechange(){
       var txtQuantity = parseFloat( $('#Quantity').val());
       var txtUnitPrice = parseFloat($('#Rate').val());
       var Tot =  txtQuantity * txtUnitPrice
-      $('#txtBasicValue').val(Math.round(Tot));
-      $('#imBasicPrice').val(Math.round(Tot));
-
-
-      var txtbasics=parseFloat($('#imBasicPrice').val());
-       var txtexchangerate=parseFloat($('#ExchangeRate').val());
-       $('#ExchangeRt').val(txtexchangerate);
-       var txtINRvalue=txtbasics*txtexchangerate;
-       $('#INRBasicvalues').val(txtINRvalue)
-       $('#INRBasicvalue').val(Math.round(txtINRvalue));
-       $('#BasicPriceTax').val(txtINRvalue);
-       //txtINR = Math.ceil(txtINR*10)/10;
-       txtINR = Math.round(txtINRvalue);
-       //alert(txtINR);BasicPriceTax
-       
-      $('#AfterBasicPriceTax').val(txtINR);
-      $('#imBasicPrice').val(txtbasics);
-      $('#ExchangeRt').val(txtexchangerate);
-      $('#EditAfterBasicPriceTax').val(txtINR);
-      $('#EditimBasicPrice').val(txtbasics);
-      $('#EditExchangeRt').val(txtexchangerate);
-      $('#EditINRBasicvalue').val(txtINRvalue);
+      $('#txtBasicValue').val(Tot);
      }
 }
 
@@ -3686,9 +3084,9 @@ function CalculateCtable()
     var txtrmc=0;
     var total=0;
     var basicamt=0;
-    basicamt=parseFloat($('#txtBasicValue').val());
+    basicprice=parseFloat($('#txtBasicValue').val());
 
-    txtCtablequantity=parseFloat($('#PurQuantity').val());
+    quantity=parseFloat($('#PurQuantity').val());
     txtbasicinrprice=parseFloat($('#AfterBasicPriceTax').val());
     //txtpurchaserate=txtbasicinrprice/txtCtablequantity;
     txtpurchaserate=<?php echo PURCHASE_RATE;?>;
@@ -3725,7 +3123,7 @@ function CalculateCtable()
     }
     //total=<?php echo CALCULATE_TOTAL;?>;
    
-    $('#TotalExp').val(Math.round(basicamt));
+    $('#TotalExp').val(Math.round(basicprice));
     
 
 }
@@ -3742,13 +3140,13 @@ function EditCalculateCtable()
     var txtcustomdutyexp=0;
     var txtrmc=0;
     var total=0;
-    var basicamt=0;
-    basicamt=parseFloat($('#EdittxtBasicValue').val());
-    $('#EditTotalExp').val(basicamt);
+    var basicprice=0;
+    basicprice=parseFloat($('#EdittxtBasicValue').val());
+    $('#EditTotalExp').val(basicprice);
     var a=parseFloat($('#EditTotalExp').val());
     //console.log(a);
     //alert(basicamt);
-    txtCtablequantity=parseFloat($('#EditPurQuantity').val());
+    quantity=parseFloat($('#EditPurQuantity').val());
     txtbasicinrprice=parseFloat($('#EditAfterBasicPriceTax').val());
     //txtpurchaserate=txtbasicinrprice/txtCtablequantity;
     txtpurchaserate=<?php echo PURCHASE_RATE;?>;
@@ -3762,12 +3160,11 @@ function EditCalculateCtable()
     //txtrmc=txtpurchaserate+txtcustomdutyexp;
     txtrmc=<?php echo RMC_CAL;?>;
     $('#EditRMCIncludingCustomers').val(txtrmc);
-   // total=<?php echo CALCULATE_TOTAL;?>;
-    $('#EditTotalExp').val(basicamt);
-    //var a=parseFloat($('#EditTotalExp').val());
-    //console.log(basicamt);
+    total=<?php echo CALCULATE_TOTAL;?>;
+    $('#EditTotalExp').val(basicprice);
+    
+}  
 
-}
 
 //index = parseInt(index)+1;
 
@@ -3829,9 +3226,6 @@ $('.AddImport').click(function()
     var purate=$("#purchaserate").val();
     var CustomDutyExpense=$("#CustomDutyExpenses").val();
     var RMCIncluderate=$("#RMCIncludingCustomers").val();
-    var receivedqty='';
-    var rejectedqty='';
-    var pendingqty='';
     $('#MaterialCode option[value='+materialCode+']').remove();
     
     
@@ -3852,7 +3246,7 @@ $('.AddImport').click(function()
                
   //alert('in');
    var template = jQuery("#ImportList").html();
-   $('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,Description:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp,ReceivedQty:receivedqty,RejectedQty:rejectedqty,PendingQty:pendingqty}));
+   $('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,ItemName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp}));
    //alert(JSON.strigify(BasicAmt));
 
     
@@ -4041,7 +3435,7 @@ $('#txttotalavlmodvat').val((parseFloat(TotalAvlmodvat) + parseFloat(AvailableMo
 $('#txttotalgrossexpense').val((parseFloat(TotalGrossExpense) + parseFloat(Grossexpenses)).toFixed(2) );
 $('#txtToatlOrder').val((parseFloat(TotalOrder) + parseFloat(totalexp)).toFixed(2) );
 var r=parseFloat($('#txtToatlOrder').val());
-//console.log(r);
+console.log(r);
 //alert(JSON.stringify(txttotallanding));
 //alert(TotalOrder);
 
@@ -4183,110 +3577,6 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) {
 });
 
 
-$("#viewimportmodal").on("shown.bs.modal", function(e) {
-
-   // alert();
-        userid = $(e.relatedTarget).data('userid');
-        //alert(userid);
-        //alert('inadd');
-
-        var tr= document.getElementById(userid);
-        //alert(tr);
-        var cellval = tr.cells;
-        //alert(cellval);
-        var id= $('#Reqnumber'+userid).val();
-        //alert(id);
-        //var a=$('#Reqnumber'+userid).val();
-        //alert(a) 
-        $('#ViewReqNo').val($('#Reqnumber'+userid).val());
-        
-        $('#ViewdeptName').val($('#departmentName'+userid).val());
-        $("#ViewCostCenter").val($('#costCode'+userid).val());
-       // $('#EditAvlBudAmt').val($('#AvilBudget'+userid).val());
-        
-        $('#ViewItemName').val($('#materialName'+userid).val());
-        $('#ViewUOM').val($('#uom'+userid).val());
-        $('#ViewQuantity').val($('#quantity'+userid).val());
-        //RequistQuantity = $('#quantity'+userid).val();
-        $('#ViewRate').val($('#itemRate'+userid).val());
-         $('#ViewtxtBasicValue').val($('#ProductPrice'+userid).val());
-        $('#ViewBasicPrice').val($("#BasicINRValue"+userid).val());
-        $('#ViewimBasicPrice').val($("#BasicPriceInMTon"+userid).val());
-        $('#ViewLandingCharge').val($("#LandingCharge"+userid).val());
-        $('#ViewAfterLandingCharge').val($("#AfterLandingCharge"+userid).val());
-        $('#ViewHighseas').val($("#HighSeasSalesCharge"+userid).val());
-        $('#ViewAfterHighseas').val($("#AfterHighSeasSalesCharge"+userid).val());
-        $('#ViewCustomduty').val($("#CustomDuty"+userid).val());
-        $('#ViewAfterCustomduty').val($("#AfterCustomDuty"+userid).val());
-        $('#ViewExcisedutyTax').val($("#ExciseDuty"+userid).val());
-        $('#ViewAfterExcisedutyTax').val($("#AfterExciseDuty"+userid).val());
-        $('#ViewExcisedutyEDcess').val($("#ExciseDutyEdCess"+userid).val());
-        $('#ViewAfterExcisedutyEDcess').val($("#AfterExciseDutyEdCess"+userid).val());
-        $('#ViewExcisedutySHcess').val($("#ExciseDutySHCess"+userid).val());
-        $('#ViewAfterExcisedutySHcess').val($("#AfterExciseDutySHCess"+userid).val());
-
-        $('#ViewCustomEDcess').val($("#CustomEdCess"+userid).val());
-        $('#ViewAfterCustomEDcess').val($("#AfterCustomEdCess"+userid).val());
-        $('#ViewCustomSHcess').val($("#CustomSHCess"+userid).val());
-        $('#ViewAfterCustomSHcess').val($("#AfterCustomSHCess"+userid).val());
-        $('#ViewAdditionalExciseduty').val($("#AddlExciseDuty"+userid).val());
-        $('#ViewAfterAdditionalExciseduty').val($("#AfterAddlExciseDuty"+userid).val());
-        $('#ViewGrossdutypayable').val($("#Grossdutypayable"+userid).val());
-        $('#ViewGrossexpenses').val($("#Grossexpensesduetocustomduty"+userid).val());
-        $('#ViewPurQuantity').val($("#QuantityKG"+userid).val());
-        $('#Viewpurchaserate').val($("#purchaseratePerKG"+userid).val());
-        $('#ViewCustomDutyExpenses').val($("#CustomDutyExpensesPerKG"+userid).val());
-        $('#ViewRMCIncludingCustomers').val($("#RMCIncludingCustomersPerKG"+userid).val());
-        $('#ViewAfterBasicPriceTax').val($("#BasicINRValue"+userid).val());
-        $('#ViewAvailableModvat').val($("#AvailableModvat"+userid).val());
-        $('#ViewTotalExp').val($("#TotalValue"+userid).val());
-        $('#ViewINRBasicvalue').val($("#BasicINRValue"+userid).val());
-     
-        $('#ViewTotalOrderValue').val(cellval[6].innerHTML);
-        $("#ViewMaterialCode").empty();
-        var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-        $("#ViewMaterialCode").append( $('<option></option>').val($('#materialCode'+userid).val()).html($('#materialCode'+userid).val() + "-" + $('#materialName'+userid).val()  ) );
-        var isAdded = "0";
-         for(i=0;i<Material.length;i++)
-        {
-        $.each(Material[i], function(idx, obj) {
-            
-                if(obj.ReqNo === id )
-                {
-                                      
-                        $.each(SelectedMaterialList.Mat, function(idx1, el){                                                            
-                            if (id == el.ReqNo )
-                            {
-                                                            
-                                if(el.materialCode == obj.MaterialCode)
-                                {
-                                        isAdded  = "1";
-                                        return false;                                                                        
-                                }
-                                else
-                                {
-                                    isAdded  = "0";
-                                }
-                                
-                            }
-                    });
-                    
-                    
-                        if(isAdded  == "0")
-                        {
-                            
-                            $("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-                        }
-                                                
-                }
-            
-            
-        });
-        }
-        
-});
-
-
 $('.EditImport').click(function(){
     //alert('inside edit');
 
@@ -4333,7 +3623,7 @@ $('.EditImport').click(function(){
    var tr= document.getElementById(userid);
    var cellval = tr.cells; 
 
-   //cellval[1].innerHTML=editMaterialCode;      
+             
    cellval[3].innerHTML = editQuantity;
    cellval[4].innerHTML =editUOM;
    cellval[5].innerHTML =itemRate;
@@ -4515,33 +3805,29 @@ function DeleteRow(rowid)
               DelRows=  "0" + ":" + rowid;
           }
           $('#txtDeletedRow').val(DelRows);
-         
+         populateValueMainFormForDeleteItem(rowid);
          }
-        populateValueMainFormForDeleteItem(rowid);
+        
  }
 
 
 
 
 function populateValueMainFormForDeleteItem(rowid)
-{//alert();
-  var TotalLanding=$('#txttotallanding').val();
-  var TotalHighseas=$('#txttotalhighseas').val();
-  var TotalCustom=$('#txttotalcustom').val();
-  var TotalExcise=$('#txttotalexcise').val();
-  var TotalExciseED=$('#txttotalexciseED').val();
-  var TotalExciseSH=$('#txttotalexciseSH').val();
-  var TotalCustomED=$('#txttotalcustomED').val();
-  var TotalCustomSH=$('#txttotalcustomSH').val();
-  var TotalAdditionalExcise=$('#txttotalAdditionalExciseduty').val();
-  var TotalGrossDuty=$('#txttotalgrossduty').val();
-  var TotalAvlmodvat=$('#txttotalavlmodvat').val();
-  var TotalGrossExpense=$('#txttotalgrossexpense').val();
-  var TotalOrderValue=$('#txtToatlOrder').val();
-
+{
+  var TotalLanding=0;
+  var TotalHighseas=0;
+  var TotalCustom=0;
+  var TotalExcise=0;
+  var TotalExciseED=0;
+  var TotalExciseSH=0;
+  var TotalCustomED=0;
+  var TotalCustomSH=0;
+  var TotalAdditionalExcise=0;
+  var TotalGrossDuty=0;
+  var TotalAvlmodvat=0;
+  var TotalGrossExpense=0;
 var AfterLandingCharge= $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val();
-console.log(AfterLandingCharge);
-
 var AfterHighseas=$('#AfterHighseas').val()==''?'0.00':$('#AfterHighseas').val();
 var AfterCustomduty=$('#AfterCustomduty').val()==''?'0.00':$('#AfterCustomduty').val();
 var AfterExcisedutyTax=$('#AfterExcisedutyTax').val()==''?'0.00':$('#AfterExcisedutyTax').val();
@@ -4567,7 +3853,7 @@ TotalAdditionalExcise  = parseFloat(TotalAdditionalExcise ) - parseFloat(Additio
 TotalGrossDuty  = parseFloat(TotalGrossDuty) - parseFloat(Grossdutypayable);
 TotalAvlmodvat  = parseFloat(TotalAvlmodvat ) - parseFloat(AvailableModvat);
 TotalGrossExpense  = parseFloat(TotalGrossExpense ) - parseFloat(Grossexpenses);
-TotalOrderValue=parseFloat(TotalOrderValue)-parseFloat(totalExp);
+TotalOrderValue=parseFloat(TotalOrderValue)-parseFloat()
 
     $('#txttotallanding').val(parseFloat(TotalLanding).toFixed(2));
     $('#txttotalhighseas').val(parseFloat(TotalHighseas).toFixed(2));