From 73bd2b947b3f92b2bda77c2219c9b88a1454d34b Mon Sep 17 00:00:00 2001
From: gandhimathi Bharathirajan <gandhimathi.b@venbainfotech.com>
Date: Wed, 12 Jul 2017 15:36:43 +0530
Subject: [PATCH] Amendment issue

---
 application/views/editRevenueAmendPO.php | 868 +----------------------
 1 file changed, 20 insertions(+), 848 deletions(-)

diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php
index 5550f37b..23fda964 100755
--- a/application/views/editRevenueAmendPO.php
+++ b/application/views/editRevenueAmendPO.php
@@ -7,7 +7,7 @@ $MaxPoDate = '';
 $AvlAmount = 0;
 $DeliverSchedule='';
 $DeliverOption='';
-
+$RowCount = 0;
 if(!empty($MaxPODate))
 {
     foreach ($MaxPODate as $date)
@@ -185,16 +185,7 @@ $("#Requeston").datepicker({
 
 
 
-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;
-}
+
 	
 $('#drpSupplier').change(function() {
     
@@ -1588,66 +1579,8 @@ function calculatePackaging(isEdit)
 	  calculateCST($('#isEdit').val());
  }
  
- // function ExceedQuantityCheck()
- // {
-	// // RequistQuantity
-	// 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').val(RequistQuantity);
-		  // $('#Quantity').focus();
-		 // return false;
-	// }
- // }
  
- // function ExceedEditQuantityCheck()
- // {
-	// // RequistQuantity
-	// var EnterQuantity =   $("#EditQuantity").val()== '' ? "0.00" :  parseFloat($("#EditQuantity").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.');
-		  // $('#EditQuantity').focus();
-		 // return false;
-	// }
- // }
- // To Reset the Tax calculation
- function resetTaxField()
- {
 
-		 $("#ItemName").val('');
-		$("#UOM").val('');
-		$("#Quantity").val('');
-		$("#Rate").val('');
-		$("#DiscountType").val("0");
-		$("#txtDiscount").val('');
-		$('#txtAfterDiscount').val('');
-		 $("#PackagingType").val("0")
-		$("#txtPackaging").val('');
-		$('#txtAfterPackaging').val('');
-		$("#txtExciseDuty").val('');
-		$('#txtAfterExciseDuty').val('');
-		$("#txtVat").val('');
-		$('#txtAfterVat').val('');
-		$("#txtCST").val('');
-		$('#txtAfterCST').val('');
-		$("#txtGST").val('');
-		$('#txtAfterGST').val('');
-		$("#txtOtherTax").val('');
-		$('#txtAfterOtherTax').val('');
-		$("#drpFreight").val("0")
-		$("#txtFreight").val('');
-		$('#txtAfterFreight').val('');
-		$('#txtInsurance').val('');
-		$('#txtTotalOrderValue').val('');
-		ExciseCalculation = '';
-		PackagingCalculation = '';
-		VatCalculation = '';
-		CSTCalculation = '';
- }
  
  function Editchange(){
 	  //ExceedEditQuantityCheck();	  
@@ -1912,25 +1845,12 @@ body {
             </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>
@@ -2068,402 +1988,7 @@ body {
 	  <!-- <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-primary" id="abcd" >Add Line Item</button> </a> -->
 	</div> 
   
-  <!-- Model for revenue po -->
-     <div  id="REVENUE" 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:1000px;">
-			<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">			   
-			  <center><h4>Select Revenue Purchase Order Line Item </h4></center>				
-			</div>
-		 	<div align="left"> 
-				<div>
-					<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' ,'readonly' => 'true');
-												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-2">
-								   <label>Avl Bud Amt</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-2">
-							  <label>Item Code</label>
-										<div  >
-											 <?php
-											$options = array("0"=>'Item Code');     
-																	
-								
-											echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
-
-											?>						 
-										</div>
-						   </div>
-						  
-							 <div class="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 num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							  <label>Rate</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'=>'change()' );
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							  <label>Basic Amount</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><br/>				
-				<div class="col-md-12" style="border : 1px solid">		 	 				 
-					<div class="row">
-					 <div class="col-md-12">
-											<div class="col-md-4">
-									  <label>Discount Type </label>
-												<div>
-													 <?php
-													$options = array("0"=>'Select Discount Type');     
-													//print_r(  $options);
-													
-													if(!empty($TaxType))
-													{
-													foreach ($TaxType as $SID):
-													  
-												   
-													  $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-													endforeach;
-													}										
-										
-													echo form_dropdown('DiscountType', $options,set_value('DiscountType'),'id="DiscountType"' ,'class="form-control"');
-
-													?>						 
-												</div>
-					 </div>
-					 <div class="col-md-2">
-									  <label>Discount Rate </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtDiscount','value' => set_value('txtDiscount'),'id'=>'txtDiscount',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'calculateDiscount(0);');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									  <label>Discounted Amount </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtAfterDiscount','value' => set_value('txtAfterDiscount'),'id'=>'txtAfterDiscount',  'class' => 'form-control num' ,'readonly' => 'true');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					<div id="Vat" >
-					 <div class="col-md-2"  >
-									  <label>Vat in %</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtVat','value' => set_value('txtVat'),'id'=>'txtVat',  'class' => 'form-control num','onchange'=>'calculateVat(0);' );
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2" >
-									  <label>Vat Amount </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtAfterVat','value' => set_value('txtAfterVat'),'id'=>'txtAfterVat',  'class' => 'form-control num' ,'readonly' => 'true','onkeypress'=>'return isNumberKey(event);');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 </div>
-					  <div style="display:none;"  id="CST">
-					  <div class="col-md-2 col-md-offset-2" >
-									  <label>CST in %</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtCST','value' => set_value('txtCST'),'id'=>'txtCST',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateCST(0);');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2" >
-									  <label>CST Amount</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtAfterCST','value' => set_value('txtAfterCST'),'id'=>'txtAfterCST',  'class' => 'form-control num' ,'readonly' => 'true');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					</div>
-					</div> 
-					</div>
-					<div class="row">
-					 <div class="col-md-12" style="text-align:left;">
-											<div class="col-md-4">
-									  <label>Packaging Type </label>
-												<div>
-													 <?php
-													$options = array("0"=>'Select Packaging Type');     
-													//print_r(  $options);
-													
-													if(!empty($TaxType))
-													{
-													foreach ($TaxType as $SID):
-													  
-												   
-													  $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-													endforeach;
-													}										
-										
-													echo form_dropdown('PackagingType', $options,set_value('PackagingType'),'id="PackagingType"' ,'class="form-control "');
-
-													?>						 
-												</div>
-					 </div>
-					 <div class="col-md-2">
-									  <label>Packaging Rate </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtPackaging','value' => set_value('txtPackaging'),'id'=>'txtPackaging',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculatePackaging(0);');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									  <label>Packaging Amount </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtAfterPackaging','value' => set_value('txtAfterPackaging'),'id'=>'txtAfterPackaging',  'class' => 'form-control num' ,'readonly' => 'true');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>  
-					<div class="col-md-2">
-									  <label>GST in %</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtGST','value' => set_value('txtGST'),'id'=>'txtGST',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>' calculateGST(0);');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									  <label>GST Amount</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtAfterGST','value' => set_value('txtAfterGST'),'id'=>'txtAfterGST',  'class' => 'form-control num' ,'readonly' => 'true');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					
-					</div> 
-					</div>
-					<div class="row">
-					<div class="col-md-12 "  >
-					<div class="col-md-2 col-md-offset-4">
-									  <label>Excise Duty in %	</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtExciseDuty','value' => set_value('txtExciseDuty'),'id'=>'txtExciseDuty',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateExcise(0);');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									  <label> Excise Duty Amount</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtAfterExciseDuty','value' => set_value('txtAfterExciseDuty'),'id'=>'txtAfterExciseDuty',  'class' => 'form-control num' ,'readonly' => 'true');
-													echo form_input($data);
-													?>   
-												</div>
-					</div>
-					<div class="col-md-2">
-									  <label>Other  Taxes in %</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtOtherTax','value' => set_value('txtOtherTax'),'id'=>'txtOtherTax',  'class' => 'form-control num','onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateOtherTaxes(0);');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									  <label>Other Taxes Amount</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtAfterOtherTax','value' => set_value('txtAfterOtherTax'),'id'=>'txtAfterOtherTax',  'class' => 'form-control num' ,'readonly' => 'true');
-													echo form_input($data);
-													?>  
-												</div> 
-												
-					</div>
-					 
-					</div>
-					</div>
-					<div class="row">
-					<div class="col-md-12"  >
-									<div class="col-md-4">
-									  <label>Freight Type </label>
-												<div>
-													 <?php
-													$options = array("0"=>'Select Freight Type');     
-													//print_r(  $options);
-													
-													if(!empty($FreightType))
-													{
-													foreach ($FreightType as $SID):
-													  
-												   
-													  $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-													endforeach;
-													}										
-										
-													echo form_dropdown('drpFreight', $options,set_value('drpFreight'),'id="drpFreight"' ,'class="form-control "');
-
-													?>						 
-												</div>
-					 </div>
-					 <div class="col-md-2">
-									  <label>Freight Rate </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtFreight','value' => set_value('txtFreight'),'id'=>'txtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									  <label>Freight Amount </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div> 
-					 <div class="col-md-4">
-									  <label> Insurance if Any</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtInsurance','value' => set_value('txtInsurance'),'id'=>'txtInsurance',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateTotalValue(0);');
-													echo form_input($data);
-													?>   
-												</div>
-					</div>
-					
-					
-					</div>
-					</div><hr/>
-					<div class="row">
-					 <div class="col-md-12" >
-					 
-						<div class="col-md-4" align="right"> <label>Total Order Amount :</label></div>
-						<div class="col-md-4 ">  
-							<div class="form-group">
-											<?php
-									 $data = array('name' => 'txtTotalOrderValue','value' => set_value('txtTotalOrderValue'),'id'=>'txtTotalOrderValue',  'class' => 'form-control num' ,'readonly' => 'true');
-									echo form_input($data);
-									?>   
-							</div> 
-						</div>
-					 <div class="col-md-4 ">
-					
-					<a class="btn btn-primary font AddRevenue"  ID="AddRevenue"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
-					<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>					 
-					</div>
-					</div> 
-					</div>			 				
-					</div>
-				<br/><br/>				
-				<!-- footer for revenue po -->
-			<div class="modal-footer">
-					
-			</div>
-			</div>
- 		  
-		 </div>
-		 </form>			 
-	</div>	  
-	</div>	   
+  
    
    <br/>
      <div  id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -2523,10 +2048,12 @@ body {
 							  <label>Item Code</label>
 										<div  >
 											 <?php
-											$options = array("0"=>'Item Code');     
-																	
-								
-											echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"');
+											 
+											  $data = array('name' => 'EditMaterialCode','value' => set_value('EditMaterialCode'),'id'=>'EditMaterialCode',  'class' => 'form-control'  ,'readonly' => 'true');
+											echo form_input($data);
+											
+											
+											
 
 											?>						 
 										</div>
@@ -2962,9 +2489,9 @@ body {
 								$totOrderSummaryAmt   = $totOrderSummaryAmt +$record->TotalValue;
 								
                         }
-						?> <input type="hidden" name="txtRowCount2" id="txtRowCount2"  value="<?php echo $index;?>">
+						?>
 						<?php 
-						   
+						$RowCount =   $index ; 
                     }
                     ?>
 			</tbody>
@@ -3095,7 +2622,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" value="<?php  echo $index; ?>"/>
+    <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php  echo $RowCount; ?>"/>
    <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />   
    <input type="hidden" name="txtPONO" id="txtPONO"  value="<?php  echo $PONO; ?>"/> 
 	
@@ -3161,10 +2688,7 @@ body {
 var index     = '1';
 var userid  = '';
 
-$("#REVENUE").on("shown.bs.modal", function(e) {
-	
-	$('#isEdit').val(0);
-});
+
 $("#EDITREVENUE").on("shown.bs.modal", function(e) {
 	
 		userid = $(e.relatedTarget).data('userid');
@@ -3266,120 +2790,7 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
 		
 	   
 });
-$('.AddRevenue').click(function(){
-         
-      if(validateRevenueTax() && validateExceedLimit()  && ExceedQuantityCheck())
-	  {
-		 var temp = index;
-		 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 DisType = $("#DiscountType").val();
-		  var DisVal = $("#txtDiscount").val();
-		  var AfterDisVal = $("#txtAfterDiscount").val();
-		  
-		  var PackOption = PackagingCalculation ;
-		  var PackType = $("#PackagingType").val();
-		  var PackVal = $("#txtPackaging").val();
-		  var AfterPackVal = $("#txtAfterPackaging").val();
-		  
-		  var ExciseOption = ExciseCalculation ;
-		  var ExciseVal = $("#txtExciseDuty").val();
-		  var AfterExciseVal = $("#txtAfterExciseDuty").val();
-		  
-		  var VatOption = VatCalculation ;
-		  var VatVal = $("#txtVat").val();
-		  var AfterVatVal = $("#txtAfterVat").val();
-			
-		  var CSTOption = CSTCalculation ;
-		  var CSTVal = $("#txtCST").val();
-		  var AfterCSTVal = $("#txtAfterCST").val();
-		  
-		  var GSTVal = $("#txtGST").val();
-		  var AfterGSTVal = $("#txtAfterGST").val();
-		  
-		   var OtherTaxVal = $("#txtOtherTax").val();
-		  var AfterOtherTaxVal = $("#txtAfterOtherTax").val();
-		  
-	      var FreightType = $("#drpFreight").val();
-		  var FreightVal = $("#txtFreight").val();
-		  var AfterFreightVal = $("#txtAfterFreight").val();
-		  
-		 var basicval = $("#txtBasicValue").val();
-		 var Insval = $("#txtInsurance").val();
-		 var TotalOrderValue = $("#txtTotalOrderValue").val();
-		 
-		 var TotalTaxValue = calculateTaxValue();
-		 
-	    // $('#ReqNo').val(Reqnumber).remove();
-		// $('#ReqNo option[value='+Reqnumber+']').remove();
-		 $('#MaterialCode option[value='+materialCode+']').remove();
-		  SelectedMaterialCode[CollIndex] = materialCode;
-			CollIndex = CollIndex + 1;	
-			 SelectedMaterialList.Mat.push({ 
-        "materialCode" :  materialCode,
-        "ReqNo"  : Reqnumber,
-      
-		});	
-			index = parseInt(index)+1;		
-		 
-	      var template = jQuery("#RevenueList").html();
-	   
-	     
-          $('#RevenueAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:TotalOrderValue}));
-		  
-		  	clearRevenueModalFields();
-		  var theForm = $(".CreatePO");
-		
-		 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,"DisType"+temp,DisType);
-	     addHidden(theForm,"DisVal"+temp,DisVal);
-		 addHidden(theForm,"AfterDisVal"+temp,AfterDisVal);
-		  addHidden(theForm,"PackOption"+temp,PackOption);
-		 addHidden(theForm,"PackType"+temp,PackType);
-	     addHidden(theForm,"PackVal"+temp,PackVal);
-		 addHidden(theForm,"AfterPackVal"+temp,AfterPackVal);
-		  addHidden(theForm,"ExciseOption"+temp,ExciseOption);
-		 addHidden(theForm,"ExciseVal"+temp,ExciseVal);
-	     addHidden(theForm,"AfterExciseVal"+temp,AfterExciseVal);
-		 addHidden(theForm,"VatOption"+temp,VatOption); 
-		  addHidden(theForm,"VatVal"+temp,VatVal);
-	     addHidden(theForm,"AfterVatVal"+temp,AfterVatVal);
-		 addHidden(theForm,"CSTOption"+temp,CSTOption);
-		  addHidden(theForm,"CSTVal"+temp,CSTVal);
-		 addHidden(theForm,"AfterCSTVal"+temp,AfterCSTVal);
-	     addHidden(theForm,"GSTVal"+temp,GSTVal);
-		 addHidden(theForm,"AfterGSTVal"+temp,AfterGSTVal);
-		  addHidden(theForm,"OtherTaxVal"+temp,OtherTaxVal);
-		 addHidden(theForm,"AfterOtherTaxVal"+temp,AfterOtherTaxVal);
-	     addHidden(theForm,"FreightType"+temp,FreightType);
-		 addHidden(theForm,"FreightVal"+temp,FreightVal);
-		 addHidden(theForm,"AfterFreightVal"+temp,AfterFreightVal);
-		 addHidden(theForm,"basicval"+temp,basicval);
-	     addHidden(theForm,"Insval"+temp,Insval);
-		 addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);		
-		
-		 $('#txtRowCount').val(temp); 	
-		// $('#REVENUE').modal('hide');	
-		  populateValueMainFormForRevenue();
-      	  }	  
-   
- });
+
  $('.EditRevenue').click(function(){
          
    		//alert('inside Functioon');			
@@ -3487,15 +2898,7 @@ $('.AddRevenue').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 populateValueMainFormForRevenue()
 {
 		var Packaging = $('#txtAfterPackaging').val() == '' ? '0.00' : $('#txtAfterPackaging').val();
@@ -3610,63 +3013,7 @@ function populateValueMainFormForEditRevenueTax()
 		$('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt).toFixed(2)  );
 		
 }
-function clearRevenueModalFields()
-{
-		// 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('');
 
-		$("#DiscountType").val('0');
-		$("#txtDiscount").val('');
-		$("#txtAfterDiscount").val('');
-
-
-		$("#PackagingType").val('0');
-		$("#txtPackaging").val('');
-		$("#txtAfterPackaging").val('');
-
-		$("input:radio[name='optPackaging'][value='0']").prop('checked', 'checked');
-		$("input:radio[name='optExcise'][value='0']").prop('checked', 'checked');
-		$("input:radio[name='optVat'][value='0']").prop('checked', 'checked');
-		$("input:radio[name='optCST'][value='0']").prop('checked', 'checked');
-
-		ExciseOption = '';
-		PackOption = '';
-		CSTOption = '';
-		VatOption = '';
-		
-		$("#txtExciseDuty").val('');
-		$("#txtAfterExciseDuty").val('');
-
-
-		$("#txtVat").val('');
-		$("#txtAfterVat").val('');
-
-
-		$("#txtCST").val('');
-		$("#txtAfterCST").val('');
-
-		$("#txtGST").val('');
-		$("#txtAfterGST").val('');
-
-		$("#txtOtherTax").val('');
-		$("#txtAfterOtherTax").val('');
-
-		$("#drpFreight").val('0');
-		$("#txtFreight").val('');
-		$("#txtAfterFreight").val('');
-
-		$("#txtBasicValue").val('');
-		$("#txtInsurance").val('');
-		$("#txtTotalOrderValue").val('');
-}
 function validateEditRevenueTax()
  {  
 	 if($('#EditCostCenter').val() == "")
@@ -3743,190 +3090,15 @@ function validateBudgetExceedLimit()
 	
 	  
  }
-function DeleteRow(rowid)
-{
-		var id = [];
-	   var DelRows  = $('#txtDeletedRow').val();
-	  //alertMaterialListrowid);
-	   var tr = document.getElementById(rowid);
-	  // var cellval = tr.cells;
-	   var MaterialCode = $('#materialCode'+rowid).val();
-	   var LineItemNo =$('#LineItemNo'+rowid).val();
-	   var ReqNo =$('#Reqnumber'+rowid).val();
-	   var POType ='<?php echo REVENUE ?>';
-		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();		
-		  
-		   SelectedMaterialCode.splice( SelectedMaterialCode.indexOf('removeItem'), 1 );
-		   $.each(SelectedMaterialList.Mat, function(i, el){
-	    
-			if (this.materialCode == removeItem){//Type = '';
-		          SelectedMaterialList.Mat.splice(i, 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(rows);
-		var totBasicAmt = $('#txtTotBasicAmount').val();
-		var totDiscountAmt = $('#txtTotalDiscount').val();;
-		var totPackagingAmt = $('#txtTotalPackaing').val();;
-		var totExciseAmt = $('#txtTotExciseDuty').val();;
-		var totVATAmt = $('#txtTotalVat').val();;
-		var totCSTAmt = $('#txtTotCST').val();;
-		var totGSTAmt = $('#txtTotalGST').val();;
-		var totOtherTaxAmt = $('#txtTotalOtherTaxes').val();;
-		var totFreightAmt = $('#txtTotalFreight').val();;
-		var totInsuranceAmt = $('#txtTotalInsurance').val();;
-		var totOrderSummaryAmt = $('#txtTotalOrderValueSummary').val();;
-		
-	  
-			
-		var Packaging = $('#AfterPackVal'+rowid).val() == '' ? '0.00' : $('#AfterPackVal'+rowid).val();
-		var ExciseDuty = $('#AfterExciseVal'+rowid).val() == '' ? '0.00' : $('#AfterExciseVal'+rowid).val();
-		var Vat  = $('#AfterVatVal'+rowid).val() == '' ? '0.00' : $('#AfterVatVal'+rowid).val();
-		var CST  =$('#AfterCSTVal'+rowid).val() == '' ? '0.00' : $('#AfterCSTVal'+rowid).val();
-	    var GST  = $('#AfterGSTVal'+rowid).val() == '' ? '0.00' : $('#AfterGSTVal'+rowid).val();
-		var OtherTax  = $('#AfterOtherTaxVal'+rowid).val() == '' ? '0.00' : $('#AfterOtherTaxVal'+rowid).val();
-		var Freight  = $('#AfterFreightVal'+rowid).val() == '' ? '0.00' : $('#AfterFreightVal'+rowid).val();
-		var Insurance    = $('#Insval'+rowid).val() == '' ? '0.00' : $('#Insval'+rowid).val();
-		var Discount   =$('#AfterDisVal'+rowid).val() == '' ? '0.00' : $('#AfterDisVal'+rowid).val();
-	    var BasicVal   = $('#basicval'+rowid).val() == '' ? '0.00' : $('#basicval'+rowid).val();
-		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
-		//alert(TotalVal);
-		
-		
-		totBasicAmt  = parseFloat(totBasicAmt ) - parseFloat(BasicVal);
-		totDiscountAmt  = parseFloat(totDiscountAmt ) - parseFloat(Discount);
-		totPackagingAmt  = parseFloat(totPackagingAmt) - parseFloat(Packaging);
-		totExciseAmt  = parseFloat(totExciseAmt) - parseFloat(ExciseDuty);
-		totVATAmt  = parseFloat(totVATAmt ) - parseFloat(Vat);
-		totCSTAmt  = parseFloat(totCSTAmt ) - parseFloat(CST);
-		totGSTAmt  = parseFloat(totGSTAmt ) - parseFloat(GST);
-		totOtherTaxAmt  = parseFloat(totOtherTaxAmt ) - parseFloat(OtherTax);
-		totFreightAmt  = parseFloat(totFreightAmt ) - parseFloat(Freight);
-		totInsuranceAmt  = parseFloat(totInsuranceAmt ) - parseFloat(Insurance);
-		totOrderSummaryAmt  = parseFloat(totOrderSummaryAmt ) - parseFloat(TotalVal);
-		
-		   
-				
-
-		$('#txtTotBasicAmount').val(parseFloat(totBasicAmt).toFixed(2)  );
-		$('#txtTotalDiscount').val(parseFloat(totDiscountAmt).toFixed(2)  );
-		$('#txtTotalPackaing').val(parseFloat(totPackagingAmt).toFixed(2)  );
-		$('#txtTotExciseDuty').val(parseFloat(totExciseAmt).toFixed(2)  );
-		$('#txtTotalVat').val(parseFloat(totVATAmt).toFixed(2)  );
-		$('#txtTotCST').val(parseFloat(totCSTAmt).toFixed(2) );
-		$('#txtTotalGST').val(parseFloat(totGSTAmt).toFixed(2)  );
 
 
-
- var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
-//console.log(Detail);
-  
-       $.each(Detail, function (index, value) 
-       {
-           $("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
-
-
-         
-       } );
-		$('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt).toFixed(2) );
-		$('#txtTotalFreight').val(parseFloat(totFreightAmt).toFixed(2) );
-		$('#txtTotalInsurance').val(parseFloat(totInsuranceAmt).toFixed(2) );
-		$('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt).toFixed(2)  );
-		
-}
 function Save(status)
 {  
 
-//alert('Inside Save');
-if(status == '0')
-{
-	stat = '<?php echo PO_DRAFT; ?>';
-}
-else
-{
+
 	//alert('Inside else');
-	stat = '<?php echo PO_CREATED; ?>';
-}
+	stat = '<?php echo PO_RELEASED; ?>';
+
 var splinstr = $('#txtSpcialInstruction').val();
 var deladd = $('#DeliveryAddr').val();
 $('#txtStatus').val(stat);