From ca1a7290d9cf4f1a5b7511c1e6e2a4050ee70ee6 Mon Sep 17 00:00:00 2001
From: velz2020 <velmurugan.s@venbainfotech.com>
Date: Thu, 21 Sep 2017 19:17:06 +0530
Subject: [PATCH] AMEND DOMESTIC CAPITAL TAX CALCULATIONS

---
 .../controllers/amendmentpurchaseorder.php    |  10 +-
 application/models/purchaseorder_model.php    |   2 +-
 application/views/capitalpopdf.php            |   3 +-
 application/views/editCapitalAmendPO.php      | 270 +++++-------------
 4 files changed, 82 insertions(+), 203 deletions(-)

diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php
index 1d6c8635..99e98fa3 100755
--- a/application/controllers/amendmentpurchaseorder.php
+++ b/application/controllers/amendmentpurchaseorder.php
@@ -306,7 +306,7 @@ class amendmentpurchaseorder extends BaseController
 				//echo $Otherpayment;
 				$prePaymentTerms=$this->input->post('beforePaymentTerms');
 				$preTotalOdervalue=$this->input->post('preTotalOdervalue');
-				$MAD.="Amended Total Order Value:&nbsp;&nbsp;:" . $preTotalOdervalue ."<br>";
+				$MAD.="Amended TotalOrder Value:&nbsp;&nbsp;:" . $preTotalOdervalue ."<br>";
 				$testdate=date("Y-m-d");
                 if($PaymentTerms!=$prePaymentTerms)
 				{
@@ -345,7 +345,7 @@ class amendmentpurchaseorder extends BaseController
 			    }
 					
 				$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID,'POType'=>$POType,'PORange'=>$PoRange,'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>PO_RELEASED,'PaymentTerms'=>$PaymentTerms,'PaymentOtherDescription'=>$Otherpayment,'Mode_Of_Shipment'=>$Modeofshipment,'Supplier_Reference'=>$supplierreference,'Supplier_Offer_No'=>$supplieroffno,'Other_Reference'=>$otherreference,'Fincap'=>$fincap,'InsuranceStatus'=>$insurancestatus,'InsuranceNumber'=>$insuranceno,'POSubType'=>$revenuetype,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpecialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'AmendedDetails'=>$MAD);
-				print_r($POMaster);
+				//print_r($POMaster);
 				
 				
 								
@@ -615,7 +615,7 @@ function UpdateAmendServicePurchaseOrder()
 				
 				$preTotalordervalue=$this->input->post('preTotalordervalue');
 				
-				$MAD.="Amended Total OrderValue:&nbsp;&nbsp;" . $preTotalordervalue . "<br>";
+				$MAD.="Amended TotalOrder Value:&nbsp;&nbsp;" . $preTotalordervalue . "<br>";
 				if(($ddate != $beforeddate)||($dschedule != $beforedschedule))
 				{
 					$MAD.="Amended DeliveryOption  :&nbsp;&nbsp;" . 	$beforeddate . $beforedschedule."<br>";
@@ -858,9 +858,9 @@ function UpdateAmendServicePurchaseOrder()
                                    $ServiceTypeOptions=$this->input->post('PoTypeOptions');
 				//echo $TotalCapitalorder . "-" . $preTotalCapitalorder;
 				if($PoRange==1){
-				$MAD.="Amended TotalOrder Vale:&nbsp;&nbsp;" . $PreServiceTotalorder . "<br>";	
+				$MAD.="Amended TotalOrder Value:&nbsp;&nbsp;" . $PreServiceTotalorder . "<br>";	
 				}else if($PoRange==0){
-				$MAD.="Amended TotalOrder Vale:&nbsp;&nbsp;" . $preTotalCapitalorder . "<br>";	
+				$MAD.="Amended TotalOrder Value:&nbsp;&nbsp;" . $preTotalCapitalorder . "<br>";	
 				}
 				
 				if($PaymentMethod != $prePaymentmethod)
diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index dd28cd13..15378f34 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -1406,7 +1406,7 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
 	{
 	     
 	$subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.Per,LineItem.ServiceMaterialDescription,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
-        Mat.UOM,Quantity,ReceivedQuantity,Rate,Req.Status,ROUND((ServiceTax.After_CGST + ServiceTax.After_SGST + ServiceTax.After_IGST + ServiceTax.otherallowance),2) as ServiceTaxamount
+        Mat.UOM,Quantity,ReceivedQuantity,Rate,Req.Status,ROUND((ServiceTax.After_CGST + ServiceTax.After_SGST + ServiceTax.After_IGST),2) as ServiceTaxamount
 				,ServiceTax.TotalValue,ServiceTax.CGST,ServiceTax.After_CGST,ServiceTax.SGST,ServiceTax.After_SGST,ServiceTax.IGST,ServiceTax.After_IGST,ServiceTax.otherallowance,ServiceTax.discount,ServiceTax.discountval,ServiceTax.Afterdiscountval,
          POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,ROUND((POMast.TotalOrderValue),2) as BasicINRValue,POMast.CurrencyType,
 
diff --git a/application/views/capitalpopdf.php b/application/views/capitalpopdf.php
index 786cbb01..15949232 100755
--- a/application/views/capitalpopdf.php
+++ b/application/views/capitalpopdf.php
@@ -554,7 +554,8 @@
 		<tr>
 
               <?php if($TotalOrderValue>0 && $TotalOrderValue!='') { ?>
-                <td style="text-align: right;"><?php echo number_format($TotalOrderValue,2);?></td>
+			  <?php $TotalOrderValueDomestic = $TotalOrderValue - ($TotalCgst1+$TotalSgst+$TotalIgst+$TotalOtherAllowance);?>
+                <td style="text-align: right;"><?php echo number_format($TotalOrderValueDomestic,2);?></td>
 				<?php } else { ?>
 				<td style="text-align: center;"> <?php echo '-'; ?> </td>
 				<?php } ?>
diff --git a/application/views/editCapitalAmendPO.php b/application/views/editCapitalAmendPO.php
index 02509ed2..de5f688f 100755
--- a/application/views/editCapitalAmendPO.php
+++ b/application/views/editCapitalAmendPO.php
@@ -72,6 +72,7 @@
                 $InsuranceOptions='';
                 $InsuranceNo='';
                 $ServiceTypeOptions='';
+				$FinalTotalBasic = 0;
 
 $INR='';
 $INRSYM='';
@@ -241,18 +242,16 @@ else{
 $('#insuranceTxtDiv').hide();
 }
      if(DelOpt=="0"){
- $('#Deliverydtdiv').show();
-                    $('#Schedulediv').hide();
-$('#Deliverydt').val(DelDt);
+ //$('#Deliverydtdiv').show();
+ $('#Schedulediv').hide();
+$('#deliverydateby').show();
+$('#Deliverydtdiv').hide();
  }
 
  else if(DelOpt=="1"){
- $('#Deliverydtdiv').hide();
-                    $('#Schedulediv').show();
-//$('#Deliverydt').val('');
-$('#Deliverydt').hide();
-
-$('#Scheduleby').val(SchName);
+ $('#deliverydateby').hide();
+                        $('#Schedulediv').show();
+						$('#Deliverydtdiv').hide();
 }
 
 if($('#PaymentMethod').val()== 'PT08')
@@ -882,7 +881,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
                     <td style="text-align:right"><?php echo number_format($record->Rate * $record->Quantity,2,'.',''); ?></td>    
                     <td style="text-align:right"><?php if($CapitalRange=='1'){echo $record->ServiceTaxamount;}else if($CapitalRange=='0'){echo "0.0"; }?></td>
 					<?php if($CapitalRange=='1'){?>
-                    <td style="text-align:right"><?php echo number_format(($record->Rate * $record->Quantity),2,'.',''); ?></td>
+                    <td style="text-align:right"><?php echo $record->TotalValue; ?></td>
 					<?php }else if($CapitalRange=='0'){?>
 					 <td style="text-align:right"><?php echo number_format(($record->Rate * $record->Quantity),2,'.',''); ?></td>
 						<?php }?>
@@ -1016,14 +1015,19 @@ document.getElementById('dispatchinternational').style.display = 'block';
                         
                     </tr> <?php
 							$TotalFrieght = 0;
+							$TotalSummary = 0;	
+							
 							if($CapitalRange=='1'){
                             $TotalSGST =$TotalSGST+$record->After_SGST;
                             $TotalCGST = $TotalCGST+$record->After_CGST;
                             $TotalIGST = $TotalIGST+$record->After_IGST;
+							$FinalTotalBasic = $FinalTotalBasic + ($record->Rate * $record->Quantity);
                             $Totalotherallowances = $Totalotherallowances+$record->otherallowance;
-                            $TotalDiscountedAmt = $record->Afterdiscountval;
+                            $TotalDiscountedAmt = $TotalDiscountedAmt+ $record->Afterdiscountval;
                             $TotalSummary = $TotalSummary+$record->ServiceTaxamount;//tax
-                            $TotalBasicAmount = $TotalBasicAmount+($record->Rate * $record->Quantity);//basic
+							//echo 'TAx' . $TotalSummary;
+                            $TotalBasicAmount = $TotalBasicAmount+((($record->Rate * $record->Quantity)+($TotalSummary)+($Totalotherallowances))-(($TotalDiscountedAmt)));//basic
+							//echo 'ALL' . $TotalBasicAmount;
                             //$ServiceDescription = $ServiceDescription;
 							}
                                 if($CapitalRange=='0'){
@@ -1055,7 +1059,8 @@ document.getElementById('dispatchinternational').style.display = 'block';
 						//echo $TotalSummary;
 						 if($CapitalRange=='1'){
 							
-						 $totalCapitalOrder = $totalCapitalOrder+$TotalBasicAmount-$TotalDiscountedAmt;
+						 $totalCapitalOrder = $totalCapitalOrder+$TotalBasicAmount;
+						// echo 'FNAL' . $totalCapitalOrder;
 						 
 						 }
 						 else if($CapitalRange=='0')
@@ -1366,7 +1371,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
 											?>   
 										</div>
 							 </div>
-							 <div class="col-md-12" id="EDITCAPdiv4" style="padding:0px;display:none;"><!--EDITCAPdiv4 -->
+							 <div class="col-md-12" id="EDITCAPdiv4" style="padding:0px;display:block;"><!--EDITCAPdiv4 -->
 				 <div class="col-md-5 col-md-offset-4" align="right">
 							<label>Total Order Value In INR</label>			 
 					</div>
@@ -1801,6 +1806,16 @@ document.getElementById('dispatchinternational').style.display = 'block';
 		</table>
         <div class="col-md-12"  style="border: 1px solid;" id="CAPdiv" >
 
+											<div class="col-md-3">
+									 <label>Total Basic Amount <?php echo "($INR)"?></label> 
+									 <?php
+											 $data = array('name' => 'txtTotalBasic','value' => set_value('txtTotalBasic',number_format($FinalTotalBasic, 2, '.', '')),'id'=>'txtTotalBasic',  'class' => 'form-control num'  ,'readonly' => 'true');
+											echo form_input($data);				
+											?>   
+								</div>
+											
+											
+											
 											<div class="col-md-3">
 									 <label>Total Discount Amount <?php echo "($INR)"?></label> 
 									 <?php
@@ -1824,16 +1839,17 @@ document.getElementById('dispatchinternational').style.display = 'block';
 											echo form_input($data);				
 											?>   
 								</div>
-								<div class="col-md-3">
+								
+							 
+					
+              <div class="col-md-12">
+			  <div class="col-md-3">
 									<label>IGST In INR</label> 
 									<?php
 											 $data = array('name' => 'txtTotIgst','value' => set_value('txtTotIgst' ,number_format($TotalIGST, 2, '.', '')),'id'=>'txtTotIgst',  'class' => 'form-control num'   ,'readonly' => 'true');
 											echo form_input($data);
 											?>   
 								</div>
-							 
-					
-              <div class="col-md-12">
 			  <div class="col-md-3" style="padding: 0px;">
 							<label >Other Allowances <?php echo "($INR)"?> </label>							
 								<?php
@@ -1843,7 +1859,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
 									
 							</div>
               <div class="col-md-3" >
-              <label>Total Order Value <?php echo "($INR)"?> </label>    
+              <label>Total Order Value e<?php echo "($INR)"?> </label>    
               <input type="hidden" name="preServiceTotalorderValue" value="<?php echo $totalCapitalOrder?>">  
                 <?php
                  $data = array('name' => 'Totalservicesummary','value' => set_value('Totalservicesummary',number_format($totalCapitalOrder, 2, '.', '')),'id'=>'Totalservicesummary',  'class' => 'form-control num'  ,'readonly' => 'true');
@@ -2877,171 +2893,7 @@ $('#PurQuantity').val('');
 
 
 
-  /**
-             * This function is used to calculate the total amounts after delete the row
-             */
-             function populateValueMainFormForDeleteServiceTax(deletedRow)
-            {
-         
-                var rows =  document.getElementById('serviceTax').rows.length;
-
-                 var TotalOrderValueSummary = 0;
-
-                    var TotalServiceTax = 0;
-                    var TotalEducess = 0;
-                    var TotHigherEdu = 0;
-
-                    var TotalKrishiKalyan = 0;
-                    var TotSwachhBharat = 0;
-
-                    var TotLanding = 0;
-                    var TotHighseas = 0;
-                    var TotCustom = 0;
-                    var TotExcise = 0;
-                    var TotExciseED = 0;
-                    var TotExciseSH = 0;
-                    var TotCustomED = 0;
-                     var TotCustomSH = 0;
-                     var TotAdditionalExciseduty = 0;
-                     var TotGrossduty = 0;
-                     var TotAvlmodvat = 0;
-
-                     var TotGrossexpense = 0;
-                    var CapitalToatlOrder=0; 
-                
-                for (var i = 1; i < rows; i++) {
-                    if(deletedRow==i){
-                       $('#AfterServiceTax'+i).val('');
-                    $('#AfterEduCess'+i).val('');
-                    $('#AfterSecHighTax'+i).val('');
-
-                    $('#AfterKrishiTax'+i).val('');
-                    $('#AfterSwachhTax'+i).val('');
-
-                    $('#landingCharge'+i).val('');
-                $('#HighSeasSalesCharge'+i).val('');
-                $('#CustomDuty'+i).val('');
-                $('#ExciseDuty'+i).val('');
-                $('#ExciseDutyEDCess'+i).val('');
-                $('#ExciseDutySHCess'+i).val('');
-                $('#CustomEDCess'+i).val('');
-                $('#CustomSHCess'+i).val('');
-                $('#AdditionalExciseDuty'+i).val('');
-                $('#GrossDutyPayable'+i).val('');
-                $('#AvailableModvat'+i).val('');
-                $('#GrossExpensesDuetoCustom'+i).val('');
-                $('#basicval'+i).val('');
-
-                    $('#ServiceTotalOrderValue'+i).val('');
-
-                  
-               
-                    var TotalOrderValueSummaryI = $('#ServiceTotalOrderValue'+i).val() == '' ? '0.00' : $('#ServiceTotalOrderValue'+i).val();
-                   
-                    var TotalServiceTaxI = $('#AfterServiceTax'+i).val() == '' ? '0.00' : $('#AfterServiceTax'+i).val();
-                    var TotalEducessI = $('#AfterEduCess'+i).val() == '' ? '0.00' : $('#AfterEduCess'+i).val();
-                    var TotHigherEduI = $('#AfterSecHighTax'+i).val() == '' ? '0.00' : $('#AfterSecHighTax'+i).val();
-
-                    var TotalKrishiKalyanI = $('#AfterKrishiTax'+i).val() == '' ? '0.00' : $('#AfterKrishiTax'+i).val();
-                    var TotSwachhBharatI = $('#AfterSwachhTax'+i).val() == '' ? '0.00' : $('#AfterSwachhTax'+i).val();
-
-                    var TotLandingI = $('#landingCharge'+i).val() == '' ? '0.00' : $('#landingCharge'+i).val();
-                    var TotHighseasI = $('#HighSeasSalesCharge'+i).val() == '' ? '0.00' : $('#HighSeasSalesCharge'+i).val();
-                    var TotCustomI = $('#CustomDuty'+i).val() == '' ? '0.00' : $('#CustomDuty'+i).val();
-                    var TotExciseI = $('#ExciseDuty'+i).val() == '' ? '0.00' : $('#ExciseDuty'+i).val();
-                    var TotExciseEDI = $('#ExciseDutyEDCess'+i).val() == '' ? '0.00' : $('#ExciseDutyEDCess'+i).val();
-                    var TotExciseSHI = $('#ExciseDutySHCess'+i).val() == '' ? '0.00' : $('#ExciseDutySHCess'+i).val();
-                    var TotCustomEDI = $('#CustomEDCess'+i).val() == '' ? '0.00' : $('#CustomEDCess'+i).val();
-                     var TotCustomSHI = $('#CustomSHCess'+i).val() == '' ? '0.00' : $('#CustomSHCess'+i).val();
-                     var TotAdditionalExcisedutyI = $('#AdditionalExciseDuty'+i).val() == '' ? '0.00' : $('#AdditionalExciseDuty'+i).val();
-                     var TotGrossdutyI = $('#GrossDutyPayable'+i).val() == '' ? '0.00' : $('#GrossDutyPayable'+i).val();
-                     var TotAvlmodvatI = $('#AvailableModvat'+i).val() == '' ? '0.00' : $('#AvailableModvat'+i).val();
-
-                     var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val();
-                   
-              var CapitalToatlOrderI= $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
-                }
-
-                    else if(deletedRow!=i){
-                       
-                   
-                    var TotalOrderValueSummaryI = $('#ServiceTotalOrderValue'+i).val() == '' ? '0.00' : $('#ServiceTotalOrderValue'+i).val();
-                   
-                    var TotalServiceTaxI = $('#AfterServiceTax'+i).val() == '' ? '0.00' : $('#AfterServiceTax'+i).val();
-                    var TotalEducessI = $('#AfterEduCess'+i).val() == '' ? '0.00' : $('#AfterEduCess'+i).val();
-                    var TotHigherEduI = $('#AfterSecHighTax'+i).val() == '' ? '0.00' : $('#AfterSecHighTax'+i).val();
-
-                    var TotalKrishiKalyanI = $('#AfterKrishiTax'+i).val() == '' ? '0.00' : $('#AfterKrishiTax'+i).val();
-                    var TotSwachhBharatI = $('#AfterSwachhTax'+i).val() == '' ? '0.00' : $('#AfterSwachhTax'+i).val();
-
-                    var TotLandingI = $('#landingCharge'+i).val() == '' ? '0.00' : $('#landingCharge'+i).val();
-                    var TotHighseasI = $('#HighSeasSalesCharge'+i).val() == '' ? '0.00' : $('#HighSeasSalesCharge'+i).val();
-                    var TotCustomI = $('#CustomDuty'+i).val() == '' ? '0.00' : $('#CustomDuty'+i).val();
-                    var TotExciseI = $('#ExciseDuty'+i).val() == '' ? '0.00' : $('#ExciseDuty'+i).val();
-                    var TotExciseEDI = $('#ExciseDutyEDCess'+i).val() == '' ? '0.00' : $('#ExciseDutyEDCess'+i).val();
-                    var TotExciseSHI = $('#ExciseDutySHCess'+i).val() == '' ? '0.00' : $('#ExciseDutySHCess'+i).val();
-                    var TotCustomEDI = $('#CustomEDCess'+i).val() == '' ? '0.00' : $('#CustomEDCess'+i).val();
-                     var TotCustomSHI = $('#CustomSHCess'+i).val() == '' ? '0.00' : $('#CustomSHCess'+i).val();
-                     var TotAdditionalExcisedutyI = $('#AdditionalExciseDuty'+i).val() == '' ? '0.00' : $('#AdditionalExciseDuty'+i).val();
-                     var TotGrossdutyI = $('#GrossDutyPayable'+i).val() == '' ? '0.00' : $('#GrossDutyPayable'+i).val();
-                     var TotAvlmodvatI = $('#AvailableModvat'+i).val() == '' ? '0.00' : $('#AvailableModvat'+i).val();
-
-                     var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val();
-                     var CapitalToatlOrderI= $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
-                        }
- else{
-                        
-                    }
-
-                  TotalServiceTax = parseFloat(TotalServiceTax) + parseFloat(TotalServiceTaxI);
-                     TotalEducess = parseFloat(TotalEducess) + parseFloat(TotalEducessI);
-                    TotHigherEdu = parseFloat(TotHigherEdu) + parseFloat(TotHigherEduI);
-
-                     TotalKrishiKalyan = parseFloat(TotalKrishiKalyan) + parseFloat(TotalKrishiKalyanI);
-                    TotSwachhBharat = parseFloat(TotSwachhBharat) + parseFloat(TotSwachhBharatI);
-
-                    TotLanding = parseFloat(TotLanding) + parseFloat(TotLandingI);
-                     TotHighseas = parseFloat(TotHighseas) + parseFloat(TotHighseasI);
-                    TotCustom = parseFloat(TotCustom) + parseFloat(TotCustomI);
-                    TotExcise = parseFloat(TotExcise) + parseFloat(TotExciseI);
-                    TotExciseED = parseFloat(TotExciseED) + parseFloat(TotExciseEDI);
-                    TotExciseSH = parseFloat(TotExciseSH) + parseFloat(TotExciseSHI);
-                    TotCustomED = parseFloat(TotCustomED) + parseFloat(TotCustomEDI);
-                     TotCustomSH = parseFloat(TotCustomSH) + parseFloat(TotCustomSHI);
-                     TotAdditionalExciseduty = parseFloat(TotAdditionalExciseduty) + parseFloat(TotAdditionalExcisedutyI);
-                     TotGrossduty = parseFloat(TotGrossduty) + parseFloat(TotGrossdutyI);
-                     TotAvlmodvat = parseFloat(TotAvlmodvat) + parseFloat(TotAvlmodvatI);
-
-                     TotGrossexpense = parseFloat(TotGrossexpense) + parseFloat(TotGrossexpenseI);
-                  TotalOrderValueSummary = parseFloat(TotalOrderValueSummary) + parseFloat(TotalOrderValueSummaryI);
-              CapitalToatlOrder=parseFloat(CapitalToatlOrder) + parseFloat(CapitalToatlOrderI);
-
-                    }
-
-                   $('#TotalAfterServiceTax').val((parseFloat(TotalServiceTax)).toFixed(2) );
-                    $('#TotalAfterEduCess').val((parseFloat(TotalEducess)).toFixed(2) );
-                    $('#TotalAfterSecHighTax').val((parseFloat(TotHigherEdu)).toFixed(2) );
-
-                    $('#TotalAfterKrishiTax').val((parseFloat(TotalKrishiKalyan) ).toFixed(2) );
-                    $('#TotalAfterSwachhTax').val((parseFloat(TotSwachhBharat) ).toFixed(2) );
-
-                    $('#txttotallanding').val((parseFloat(TotLanding) ).toFixed(2) );
-                $('#txttotalhighseas').val((parseFloat(TotHighseas) ).toFixed(2) );
-                $('#txttotalcustom').val((parseFloat(TotCustom)).toFixed(2) );
-                $('#txttotalexcise').val((parseFloat(TotExcise)).toFixed(2) );
-                $('#txttotalexciseED').val((parseFloat(TotExciseED)).toFixed(2) );
-                $('#txttotalexciseSH').val((parseFloat(TotExciseSH)).toFixed(2) );
-                $('#txttotalcustomED').val((parseFloat(TotCustomED)).toFixed(2) );
-                $('#txttotalcustomSH').val((parseFloat(TotCustomSH)).toFixed(2) );
-                $('#txttotalAdditionalExciseduty').val((parseFloat(TotAdditionalExciseduty)).toFixed(2) );
-                $('#txttotalgrossduty').val((parseFloat(TotGrossduty)).toFixed(2) );
-                $('#txttotalavlmodvat').val((parseFloat(TotAvlmodvat)).toFixed(2) );
-                $('#txttotalgrossexpense').val((parseFloat(TotGrossexpense)).toFixed(2) );
-                $('#CapitalToatlOrder').val((parseFloat(CapitalToatlOrder)).toFixed(2) );
-
-                    $('#txtToatlOrder').val((parseFloat(TotalOrderValueSummary)).toFixed(2) );
-                   
-            }
+           
 /* get Edit Capital Po Modal*/
 
    $("#EDITCAPITAL").on("shown.bs.modal", function(e) {
@@ -3059,6 +2911,16 @@ $('#PurQuantity').val('');
 		var cellval = tr.cells;
 
 		var id= $('#Reqnumber'+userid).val();
+		var disc = $('#DisType'+userid).val();
+		//alert(disc);
+		if(disc != 'NIL')
+		{
+			//alert('removed');
+			$('#txtEditDiscount').removeAttr('readonly');
+		}else{
+			//alert('Set');
+			$('#txtEditDiscount').attr('readonly',true);
+		}
 		
 		$('#EditReqnumber').val($('#Reqnumber'+userid).val());
 		
@@ -3281,9 +3143,11 @@ var basicamt=0;
 //alert(ExchangeRate+"-"+AvlBudAmt+"-"+capitalrange);
 if(capitalrange == 0){//international
 basicamt=($('#CapitalToatlOrder').val() * ExchangeRate);
+alert(basicamt);
 }
 else if(capitalrange == 1){//domestic
-basicamt=$('#Totalservicesummary').val();
+basicamt=$('#txtTotalBasic').val() - $('#txtTotalDiscount').val();
+alert(basicamt);
 }
 
 	if(validate())
@@ -3323,7 +3187,7 @@ basicamt=$('#Totalservicesummary').val();
 
 			data:$('.CapitalPO').serialize()+"&ExchangeRateOn="+ExchangeRateOn+"&PaymentMethod="+PaymentMethod+"&PayableAT="+PayableAT+"&PaymentDate="+PaymentDate,
 			type:"POST",
-			url:"<?php echo base_url() ?>amendmentpurchaseorder/EditAmendCapitalPurchaseOrder", 
+			//url:"<?php echo base_url() ?>amendmentpurchaseorder/EditAmendCapitalPurchaseOrder", 
 
 			success:function(data) {
 			if(data)
@@ -3408,16 +3272,19 @@ EditRatechange();
              }
 
          else{
-			// alert('Dometic');
+			 
             var Tot =  txtQuantity * RatePerTon;
+			
               if ($('#txtEditDiscount').val() != '' && $('#txtEditDiscount').val() != '0')
 			 {
               $('#txtEditAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#EditDiscountType").val(),$('#txtEditDiscount').val()));
 		}	
             
          var discountedValue =  parseFloat($('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val()).toFixed(2);
+		 
            txtExchangeRate = 1;
            BasicInINR=Tot * txtExchangeRate - discountedValue;
+		   
              }
 
                
@@ -3440,7 +3307,7 @@ EditRatechange();
 
             $('#EditAfterIgst').val(calculateServiceIGST($('#EditAfterBasicPriceTax').val(),$("#EditIgst").val()== '' ? "0.00" : $('#EditIgst').val())); 
             
-             var tempEditservicetotalordervaue=(parseFloat($('#EditCPTotalAmount').val())+parseFloat($('#EditAfterCgst').val())+parseFloat($('#EditAfterSgst').val())+parseFloat($('#EditAfterIgst').val())+parseFloat($('#EditOtherAllowances').val()=='' ? "0.00" : $('#EditOtherAllowances').val()));
+             var tempEditservicetotalordervaue=(parseFloat($('#EditCPTotalAmount').val())+parseFloat($('#EditAfterCgst').val())+parseFloat($('#EditAfterSgst').val())+parseFloat($('#EditAfterIgst').val())+parseFloat($('#EditOtherAllowances').val()=='' ? "0.00" : $('#EditOtherAllowances').val())) - parseFloat($('#txtEditAfterDiscount').val()=='' ? "0.00" : $('#txtEditAfterDiscount').val());
 			$('#Editservicetotalordervaue').val(parseFloat(tempEditservicetotalordervaue).toFixed(2)); 			
 
             
@@ -3609,8 +3476,8 @@ EditRatechange();
                       var AfterIGST = $("#EditAfterIgst").val();
 					  var otherallowance = $("#EditOtherAllowances").val();
 					  
-                      //var totalservicevalue = $("#Editservicetotalordervaue").val();
-					  var totalservicevalue = $("#EditCPTotalAmount").val();
+                      var totalservicevalue = $("#Editservicetotalordervaue").val();
+					  //var totalservicevalue = $("#EditCPTotalAmount").val();
                      var Totaltaxamount = (parseFloat(AfterCGST)+parseFloat(AfterSGST)+parseFloat(AfterIGST)+parseFloat(otherallowance));
 					//alert(totalservicevalue+"-"+Total);
                      var TotalTaxValue = EditcalculateTaxValue();
@@ -3800,6 +3667,7 @@ function validateEditCapitalTax()
               var SGSTTaxAmount = $('#EditAfterSgst').val() == '' ? '0.00' : $('#EditAfterSgst').val();
                var IGSTTaxAmount = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val();
                 var otherallowanceAmount = $('#EditOtherAllowances').val() == '' ? '0.00' : $('#EditOtherAllowances').val();
+				
                //alert(CGSTTaxAmount+""+SGSTTaxAmount+""+IGSTTaxAmount+otherallowanceAmount)
             var landingCharge = $('#EditAfterLandingCharge').val() == '' ? '0.00' : $('#EditAfterLandingCharge').val();
           var HighSeasSalesCharge = $('#EditAfterHighseas').val() == '' ? '0.00' : $('#EditAfterHighseas').val();
@@ -3816,7 +3684,7 @@ function validateEditCapitalTax()
     var purchaseRate = $('#Editpurchaserate').val() == '' ? '0.00' : $('#Editpurchaserate').val();
     var CustomDutyExpenses = $('#EditCustomDutyExpenses').val() == '' ? '0.00' : $('#EditCustomDutyExpenses').val();
     var RMCIncludingCustomers = $('#EditRMCIncludingCustomers').val() == '' ? '0.00' : $('#EditRMCIncludingCustomers').val();  
-             var totTaxvalue = (parseFloat(CGSTTaxAmount)+ parseFloat(SGSTTaxAmount)+ parseFloat(IGSTTaxAmount) + parseFloat(otherallowanceAmount));
+             var totTaxvalue = (parseFloat(CGSTTaxAmount)+ parseFloat(SGSTTaxAmount)+ parseFloat(IGSTTaxAmount));
 //+parseFloat(landingCharge)+parseFloat(HighSeasSalesCharge)+parseFloat(CustomDuty)+parseFloat(ExciseDuty)+parseFloat(ExciseDutyEDCess)+parseFloat(ExciseDutySHCess)+parseFloat(CustomEDCess)+parseFloat(CustomSHCess)+parseFloat(AdditionalExciseDuty)+parseFloat(GrossDutyPayable)+parseFloat(AvailableModvat)+parseFloat(GrossExpensesDuetoCustom)+parseFloat(purchaseRate)+parseFloat(CustomDutyExpenses)+parseFloat(RMCIncludingCustomers)
 
              var totTax =  parseFloat(totTaxvalue).toFixed(2);
@@ -3855,7 +3723,10 @@ function validateEditCapitalTax()
          
                 var rows =  document.getElementById('serviceTax').rows.length;
                  var TotalOrderValueSummary = 0;
-
+				var basicfordometic = 0;
+				var qty = 0;
+				var rateperqty = 0;
+				
                     var TotalCGSTTax = 0;
                     var TotalSGSTTax = 0;
                     var TotalIGSTTax = 0;
@@ -3886,14 +3757,19 @@ function validateEditCapitalTax()
                    var discountedRateValue = $('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
 				   //alert('Current Item'+ discountedRateValue);
                     var TotalOrderValueSummaryI = $('#totalservicevalue'+i).val() == '' ? '0.00' : $('#totalservicevalue'+i).val();//FOr Domestic total value
-                   TotalOrderValueSummaryI=TotalOrderValueSummaryI-discountedRateValue;
+                   TotalOrderValueSummaryI=TotalOrderValueSummaryI;//-discountedRateValue;
                     var TotalCGSTTaxI = $('#afterCGST'+i).val() == '' ? '0.00' : $('#afterCGST'+i).val();
                     var TotalSGSTTaxI = $('#afterSGST'+i).val() == '' ? '0.00' : $('#afterSGST'+i).val();
                     var TotalIGSTTaxI = $('#afterIGST'+i).val() == '' ? '0.00' : $('#afterIGST'+i).val();
-                     
+					//var tr= document.getElementById(serviceTax);
+                    //var cellval = tr.cells;
+					qty = $('#quantity'+i).val();
+					rateperqty = $('#itemRate'+i).val();
+					basicfordometic = basicfordometic + (qty * rateperqty);
+
                     var TotalotherallowanceI = $('#otherallowance'+i).val() == '' ? '0.00' : $('#otherallowance'+i).val();
                     
-
+                     
                     var TotLandingI = $('#landingCharge'+i).val() == '' ? '0.00' : $('#landingCharge'+i).val();
                     var TotHighseasI = $('#HighSeasSalesCharge'+i).val() == '' ? '0.00' : $('#HighSeasSalesCharge'+i).val();
                     var TotCustomI = $('#CustomDuty'+i).val() == '' ? '0.00' : $('#CustomDuty'+i).val();
@@ -3959,6 +3835,8 @@ function validateEditCapitalTax()
                 $('#txttotalgrossexpense').val((parseFloat(TotGrossexpense)).toFixed(2) );
                 $('#CapitalToatlOrder').val((parseFloat(CapitalToatlOrder)).toFixed(2) );
 				$('#Totalservicesummary').val((parseFloat(TotalOrderValueSummary)).toFixed(2) );
+				$('#txtTotalBasic').val((parseFloat(basicfordometic)).toFixed(2) );
+				basicfordometic = 0;
                    
             }
 var DisplayCurrencySymbol='';
@@ -4178,7 +4056,7 @@ function updateDiscountValuesChange(totAmt,disType,disAmt){
 
 			 var basicValue = totAmt;
 			 var DiscountType =disType;
-			
+		
 			
 			 var AfterDiscount = 0.0;
 			  var Discountval = parseFloat(disAmt);