diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index 0ac16a41..dfafbed9 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -391,7 +391,7 @@ class purchaseorder extends BaseController
                $this->global['pageTitle'] = 'Siddharth : Edit Import Purchase order form';
                 $this->loadViews("editimportpo", $this->global,  $data, NULL);      
                 }
-                 else if($ReqType == CAPITAL)
+                else if($ReqType == CAPITAL)
                 {
                        $CapitalRange = $_GET['CapitalRange']; 
                        
@@ -402,6 +402,7 @@ class purchaseorder extends BaseController
                 {
                 $data['AvlBudAmt'] = $AvlBudget[0]['BudgetAmount'] -  $AvlBudget[0]['Totalvalue'];
                 }
+                
                         if($CapitalRange=='0'){
                         $data['POItem'] = $this->purchaseorder_model->getCapitalPurchaseOrderDetails($PONO);
                       }
@@ -411,7 +412,7 @@ class purchaseorder extends BaseController
                         $data['requestedBy'] = $this->purchaseorder_model->GetRequesedByDetails($PONO);
            
           
-                        $CapitalRange='';
+                        //$CapitalRange='';
                         foreach($data['POItem'] as $Rate)
                         {     
                           $exRate=$Rate->ExchangeRate;
@@ -422,6 +423,7 @@ class purchaseorder extends BaseController
                 
                         $Currency=$CUR->CurrencyType;
                        }
+
                         if($CapitalRange=='0'){
                          $data['CurrencyDetail']=$this->purchaseorder_model->GetCurrencyDetail($Currency);
                         $data['ExchangeRate']=$exRate;
@@ -1702,8 +1704,7 @@ $createddt='';
 /* Add capital Po*/
   function addNewCapitalPurchaseOrder()
     {
-//echo "sxscd";
-//die();
+
 
         $POdt =$this->input->post('PODate');
         $PODate =  $this->getDateformat($POdt);
@@ -1714,15 +1715,15 @@ $createddt='';
         $POType = $this->input->post('POType');
         $PoRange = $this->input->post('txtPoRange');
 
-        //$DeliveryOption = $this->input->post('DateRange');
-          //          if($DeliveryOption==1){
-            //      $Deliverydt = '';
-              //    $DeliverySchedule = $this->input->post('Scheduleby');
-                //  }
-                  //else{
-                  //$Deliverydt = $this->getDateformat($dt);
-                  //$DeliverySchedule = '';
-                 // }
+        /* $DeliveryOption = $this->input->post('DateRange');
+                   if($DeliveryOption==1){
+                  $Deliverydt = '';
+                  $DeliverySchedule = $this->input->post('Scheduleby');
+                  }
+                 else{
+                 $Deliverydt = $this->getDateformat($dt);
+                  $DeliverySchedule = '';
+                  } */
 
         $DeliveryOption = $this->input->post('DateRange');
            
@@ -1756,11 +1757,11 @@ $createddt='';
                         }
                   
                     $PaymentMethod = $this->input->post('PaymentMethod');
-                    $PayableAT = $this->input->post('PayableAT');
+                  
                     $Palaceoforigin=$this->input->post('PlaceOforigin');
                    
 
-                     $PaymentDate=$this->input->post('PaymentDate');  
+                    
         $SpcialInstruction = $this->input->post('txtSpcialInstruction');
         $TotalOrder = $this->input->post('CapitalToatlOrder');
           $POStatus = $this->input->post('txtStatus');
@@ -1777,7 +1778,7 @@ $createddt='';
         $createddt =  $dt->format('Y-m-d H:i:s');
         $currencytypeID = $this->input->post('currencytype'); 
                               
-        $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'ExchangeRate'=>$ExchangeRate,'PaymentTerms'=>$PaymentMethod,'PaymentDays'=>$PaymentDate,'PayableAt'=>$PayableAT,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CapitalRange'=>$CapitalRange,'POType'=>$POType,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch);
+        $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'ExchangeRate'=>$ExchangeRate,'PaymentTerms'=>$PaymentMethod,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CapitalRange'=>$CapitalRange,'POType'=>$POType,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch);
 
         // $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin);
                              
@@ -1843,13 +1844,16 @@ $createddt='';
 
                 //echo $BasicPriceinmton;
                 $CostCenter = $this->input->post('CPCostCode'.$i);
-                $ServiceTax = $this->input->post('AfterServiceTax'.$i);
-                $EduCess = $this->input->post('AfterEduCess'.$i);
-                $SecHighTax = $this->input->post('AfterSecHighTax'.$i);
-                $KrishiTax = $this->input->post('AfterKrishiTax'.$i);
-                $SwachhTax = $this->input->post('AfterSwachhTax'.$i);
+               
                 $TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
-                
+                $Cgst = $this->input->post('Cgst'.$i);
+                $Sgst = $this->input->post('Sgst'.$i);
+                $Igst = $this->input->post('Igst'.$i);
+                $AfterCgst = $this->input->post('AfterCgst'.$i);
+                $AfterSgst = $this->input->post('AfterSgst'.$i);
+                $AfterIgst = $this->input->post('AfterIgst'.$i);
+              
+                $OtherAmt = $this->input->post('OtherAmt'.$i);
                 $SkipInsert = "False";         
                 if( count($comma_separated) > 0)
                 {
@@ -1880,11 +1884,13 @@ $createddt='';
                     
                     if(trim($POType) == CAPITAL )
                     {
-                     $ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'ServiceTax'=>$ServiceTax,'EducessTax'=>$EduCess,'SecHigherEducessTax'=>$SecHighTax,'KrishiKalyantax'=>$KrishiTax,'SwachhBharattax'=>$SwachhTax,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt);
+                     if($CapitalRange=='1')
+                    {
+                     $ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'otherallowance'=>$OtherAmt,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt);
                       
                                   $ServiceTax = $this->purchaseorder_model->addServiceTax($ServiceTaxList);
-                                }
-
+                               
+                                  }
                     if($CapitalRange=='0')
                     {
                       //echo "dsc";
@@ -1897,9 +1903,9 @@ $createddt='';
                     
                     $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
                                                                                }
-                                                                               
+                                                                                
                     
-                    //}
+                    }
                 }
                 
               }             
@@ -1910,7 +1916,7 @@ $createddt='';
 /*Edit Capital po*/
  function EditCapitalPurchaseOrder()
     {
-    
+ 
        
         $PONO =$this->input->post('txtPONO');
         $POdt =$this->input->post('PODate');
@@ -1922,15 +1928,16 @@ $createddt='';
         $POType = $this->input->post('POType');
         $PoRange = $this->input->post('txtPoRange');
 
-        // $DeliveryOption = $this->input->post('DateRange');
-    //                 if($DeliveryOption==1){
-    //               $Deliverydt = '';
-    //               $DeliverySchedule = $this->input->post('Scheduleby');
-    //               }
-    //               else{
-    //               $Deliverydt = $this->getDateformat($dt);
-    //               $DeliverySchedule = '';
-    //               }
+       /* $DeliveryOption = $this->input->post('DateRange');
+                     if($DeliveryOption==1){
+                  $Deliverydt = '';
+                $DeliverySchedule = $this->input->post('Scheduleby');
+                  }
+                  else{
+                   //$Deliverydt = $this->getDateformat($dt);
+                   $Deliverydt = '';
+                  $DeliverySchedule = '';
+                   } */
 
 
         $DeliveryOption = $this->input->post('DateRange');
@@ -1969,10 +1976,10 @@ $createddt='';
                     $ExchangeRate=$this->input->post('ExchangeRt');
                         }
                     $PaymentMethod = $this->input->post('PaymentMethod');
-                    $PayableAT = $this->input->post('PayableAT');
+                  
                    
 
-                     $PaymentDate=$this->input->post('PaymentDate');  
+                    
         $SpcialInstruction = $this->input->post('txtSpcialInstruction');
         $TotalOrder = $this->input->post('CapitalToatlOrder');
           $POStatus = $this->input->post('txtStatus');
@@ -1991,7 +1998,7 @@ $createddt='';
         $updateddt =  $dt->format('Y-m-d H:i:s');
        
 
-        $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRate'=>$ExchangeRate,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'PaymentTerms'=>$PaymentMethod,'PaymentDays'=>$PaymentDate,'PayableAt'=>$PayableAT,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch);
+        $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRate'=>$ExchangeRate,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'PaymentTerms'=>$PaymentMethod,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch);
 
           
           $POMaster  = $this->purchaseorder_model->updatePOMaster($PONO,$POList);       
@@ -2050,14 +2057,17 @@ $createddt='';
 
                 //echo $BasicPriceinmton;
                 $CostCenter = $this->input->post('CPCostCode'.$i);
-                $ServiceTax = $this->input->post('AfterServiceTax'.$i);
-                $EduCess = $this->input->post('AfterEduCess'.$i);
-                $SecHighTax = $this->input->post('AfterSecHighTax'.$i);
-                $KrishiTax = $this->input->post('AfterKrishiTax'.$i);
-                $SwachhTax = $this->input->post('AfterSwachhTax'.$i);
+               
                 $TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
                 $POLineItemNo = $this->input->post('LineItemNo'.$i);
-                                                                    
+                       $Cgst = $this->input->post('Cgst'.$i);
+                $Sgst = $this->input->post('Sgst'.$i);
+                $Igst = $this->input->post('Igst'.$i);
+                $AfterCgst = $this->input->post('AfterCgst'.$i);
+                $AfterSgst = $this->input->post('AfterSgst'.$i);
+                $AfterIgst = $this->input->post('AfterIgst'.$i);
+              
+                $OtherAmt = $this->input->post('OtherAmt'.$i);                                              
                  $SkipInsert = "False";        
                    if( count($comma_separated) > 0)
                    {
@@ -2086,20 +2096,23 @@ $createddt='';
                     {
                       $LineItemNo =  $POLineItem[0]['LineItemNo'];
                     }
-                    //echo $LineItemNo; 
+                   
                     
                     if(trim($POType) == CAPITAL )
                     {
-                     $ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'ServiceTax'=>$ServiceTax,'EducessTax'=>$EduCess,'SecHigherEducessTax'=>$SecHighTax,'KrishiKalyantax'=>$KrishiTax,'SwachhBharattax'=>$SwachhTax,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt);
+                    if($capitalType=='1')
+                    {
+                     $ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'otherallowance'=>$OtherAmt,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt);
                       
                     $ServiceTax = $this->purchaseorder_model->addServiceTax($ServiceTaxList);
-
+                    }
+                    if($capitalType=='0')
+                    {
                     $ImportTaxList = array('LineItemNo'=>$LineItemNo, 'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'AfterLandingCharge'=>$AfterLandingCharge,'AfterHighSeasSalesCharge'=>$AfterHighSeas,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'AfterCustomDuty'=>$AfterCustomDuty,'ExciseDuty'=>$ExciseDuty,'AfterExciseDuty'=>$AfterExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd,'AfterExciseDutyEdCess'=>$AfterExciseDutyEd,'ExciseDutySHCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomSHCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'AfterExciseDutySHCess'=>$AfterExciseDutySH,'AfterAddlExciseDuty'=>$AfterAddAdtional,'Grossdutypayable'=>$Grossdutypayable,'AvailableModvat'=>$AvailableModvat,'Grossexpensesduetocustomduty'=>$Grossexpensesduetocustomduty,'purchaseratePerKG'=>$purchaseratePerKG,'CustomDutyExpensesPerKG'=>$CustomDutyExpensesPerKG,'RMCIncludingCustomersPerKG'=>$RMCIncludingCustomersPerKG,'QuantityKG'=>$QuantityKG,'AfterCustomSHCess'=>$AfterCustomSH,'AfterCustomEdCess'=>$AfterCustomEd,'TotalValue'=>$Totalvalueitem);
-                    //print_r($ImportTaxList);
-                    //die();
-                                         
+                   $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
+                       }                  
+                    
                     
-                    $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
                     
                     }
           
@@ -2112,16 +2125,19 @@ $createddt='';
               
                   $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
                   $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$LineItemNo,$POLineItemList);  
-                                  
-                 $ServiceTaxList = array('ServiceTax'=>$ServiceTax,'EducessTax'=>$EduCess,'SecHigherEducessTax'=>$SecHighTax,'KrishiKalyantax'=>$KrishiTax,'SwachhBharattax'=>$SwachhTax,'TotalValue'=>$TotalOrderValue, 'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt);
+                   if($capitalType=='1')
+                    {               
+                 $ServiceTaxList = array('CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'otherallowance'=>$OtherAmt,'TotalValue'=>$TotalOrderValue, 'UpdateBY'=>$CreateBy,'UpdatedOn'=>$createddt);
             
                 $ServiceTax = $this->purchaseorder_model->updateServiceTax($LineItemNo,$ServiceTaxList); 
-                
+                }
+                if($capitalType=='0')
+                    {
                 $ImportTaxList = array('LineItemNo'=>$LineItemNo,'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'AfterLandingCharge'=>$AfterLandingCharge,'AfterHighSeasSalesCharge'=>$AfterHighSeas,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'AfterCustomDuty'=>$AfterCustomDuty,'ExciseDuty'=>$ExciseDuty,'AfterExciseDuty'=>$AfterExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd,'AfterExciseDutyEdCess'=>$AfterExciseDutyEd,'ExciseDutySHCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomSHCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'AfterExciseDutySHCess'=>$AfterExciseDutySH,'AfterAddlExciseDuty'=>$AfterAddAdtional,'Grossdutypayable'=>$Grossdutypayable,'AvailableModvat'=>$AvailableModvat,'Grossexpensesduetocustomduty'=>$Grossexpensesduetocustomduty,'purchaseratePerKG'=>$purchaseratePerKG,'CustomDutyExpensesPerKG'=>$CustomDutyExpensesPerKG,'RMCIncludingCustomersPerKG'=>$RMCIncludingCustomersPerKG,'QuantityKG'=>$QuantityKG,'AfterCustomSHCess'=>$AfterCustomSH,'AfterCustomEdCess'=>$AfterCustomEd,'TotalValue'=>$Totalvalueitem);
                   
 
                   $ImportList= $this->purchaseorder_model->updateImportTax($LineItemNo,$ImportTaxList); 
-              
+              }
                 }
                 
                }                
diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index a7c6ff69..b47db09e 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -1256,14 +1256,13 @@ function getCapitalPurchaseOrderDetails($PONO = '')
 	{
 	     
 	$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
-Mat.UOM,Quantity,Rate,Req.Status,ROUND((ServiceTax.After_CGST + ServiceTax.After_SGST + ServiceTax.After_IGST + ServiceTax.otherallowance),2) as ServiceTaxamount
-				,ServiceTax.TotalValue,ServiceTax.CGST,ServiceTax.After_CGST,ServiceTax.SGST,ServiceTax.After_SGST,ServiceTax.IGST,ServiceTax.After_IGST,ServiceTax.otherallowance,
+Mat.UOM,Quantity,ReceivedQuantity,Rate,Req.Status,
  ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount,LandingCharge,HighSeasSalesCharge,CustomDuty,ExciseDuty,ExciseDutyEdCess,CustomEdCess,POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,AfterLandingCharge,AfterHighSeasSalesCharge,AfterCustomDuty,AfterExciseDuty,AfterExciseDutyEdCess,AddlExciseDuty,AfterAddlExciseDuty,Grossdutypayable,AvailableModvat,Grossexpensesduetocustomduty,purchaseratePerKG,CustomDutyExpensesPerKG,RMCIncludingCustomersPerKG,QuantityKG,BasicPriceInMTon,ProductPrice,CustomSHCess,AfterCustomSHCess,AfterExciseDutySHCess,ExciseDutySHCess,AfterCustomEdCess,ROUND((POMast.ExchangeRate*BasicPriceInMTon*Quantity),2) as BasicINRValue,Tax.TotalValue as ImportTotalValue,POMast.CurrencyType,
  
  Req.CostCenterCode,Dept.DepartmentName FROM T_PurchaseOrder_LineItem LineItem 
  join T_PurchaseOrder_Master POMast on POMast.PONO = LineItem.PONO
 join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode 
- join T_Service_Tax ServiceTax on ServiceTax.LineItemNo = LineItem.LineItemNo
+
  join T_Import_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo 
  join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo 
  join T_Employee_Details emp on Req.Requestedby = emp.EmpID
@@ -1284,13 +1283,13 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
          
             $subQuery ='SELECT distinct LineItem.LineItemNo,ReqNo,Mat.MaterialCode,Mat.MaterialName,
             Mat.UOM,Quantity,Rate,ROUND((Quantity   *Rate),2 ) as BasicValue ,
-            ROUND((ServiceTax + EducessTax + SecHigherEducessTax + KrishiKalyantax + SwachhBharattax),2)as Taxamount
-                ,TotalValue,ServiceTax,EducessTax,SecHigherEducessTax,KrishiKalyantax,SwachhBharattax,CostCenterCode ,  POMaster.*,sup.SupplierName,sup.Address
+            LineItem.CostCenterCode ,  POMaster.*,sup.SupplierName,sup.Address,Payment.PaymentID,Payment.PaymentTerms
             FROM T_PurchaseOrder_LineItem LineItem 
             join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
-            join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
+            
             join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO
             join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID
+            join T_PaymentTerms Payment on Payment.PaymentID = POMaster.PaymentTerms
             where LineItem.PONO =?';
          $query = $this->db->query($subQuery,array($PONO));            
         
@@ -1316,11 +1315,11 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
 	 // get domestic capital po list
 
       
-        function getDomesticCapitalPurchaseOrderDetails($PONO = '')
+       function getDomesticCapitalPurchaseOrderDetails($PONO = '')
 	{
 	     
 	$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
-        Mat.UOM,Quantity,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 + ServiceTax.otherallowance),2) as ServiceTaxamount
 				,ServiceTax.TotalValue,ServiceTax.CGST,ServiceTax.After_CGST,ServiceTax.SGST,ServiceTax.After_SGST,ServiceTax.IGST,ServiceTax.After_IGST,ServiceTax.otherallowance,
          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 404da500..a23119f4 100755
--- a/application/views/capitalpopdf.php
+++ b/application/views/capitalpopdf.php
@@ -1,8 +1,6 @@
 <?php
- 
-		
-		
-        $PONO = '';
+    
+		$PONO = '';
 		$postatus ='';
 		$CompanyAddress = '';
         $CompanyName = '';
@@ -11,281 +9,300 @@
 		$DeliveryAddress = '';
 		$Podt = '';
 		$DeliveryDate ='';
+		$postatus='';
 		$ServiceDescription = '';
-		$index=0;
+                   $PaymentTerms = '';
                  $PaymentDays='';
-                     $PayableAT='';
-                        $PaymentTerms='';
-                        $DeliverySchedule='';
-         if(!empty($CompanyDetails))
+                $PayableAT='';
+                $DeliverySchedule='';
+                $Import_DispatchDetails='';
+                $Placeoforigin='';
+	if(!empty($CompanyDetails))
 		{
-        foreach ($CompanyDetails as $CO)
-          {
-		    $CompanyName = $CO->CompanyName;
-		    $CompanyAddress = $CO->Address;
-		  }
+    foreach ($CompanyDetails as $CO)
+    {
+		$CompanyName = $CO->CompanyName;
+		$CompanyAddress = $CO->Address;
+		
+	}
         }	
-  
-        
 		if(!empty($POItem))
 		{
-		
-            foreach ($POItem as $PO)
-           {
-           	 $ReqNo=$PO->ReqNo;
-		     $PONO = $PO->PONO;
-			 $postatus= $PO->Status;
-		     $SuplierName = $PO->SupplierName;
-		     $SuplierAddress = $PO->Address;
-		     $DeliveryAddress = $PO->DeliveryAddress;
-		
-		     $dt = new DateTime($PO->PODate, new DateTimeZone('Asia/Kolkata'));				
-		     $Podt =  $dt->format('d-m-Y');
-		     if($PO->DeliveryOption=='1'){
+ 
+    foreach ($POItem as $PO)
+    {
+		 $PONO = $PO->PONO;
+		  $postatus= $PO->Status;
+		 $SuplierName = $PO->SupplierName;
+		$SuplierAddress = $PO->Address;
+		$DeliveryAddress = $PO->DeliveryAddress;
+		 $postatus= $PO->Status;
+		$dt = new DateTime($PO->PODate, new DateTimeZone('Asia/Kolkata'));				
+		$Podt =  $dt->format('d-m-Y');
+                if($PO->DeliveryOption=='1'){
                  $DeliveryDate =  '';
                  $DeliverySchedule =  $PO->DeliverySchedule;
+                 $Import_DispatchDetails='';
                     }
                     else{
             $dtDe = new DateTime($PO->DeliveryDate, new DateTimeZone('Asia/Kolkata'));				
 		$DeliveryDate =  $dtDe->format('d-m-Y');
                 $DeliverySchedule =  '';
+                $Import_DispatchDetails=$PO->Import_DispatchDetails;
                     }
-		     $ServiceDescription =$PO->ServiceDescription;
-		     $CostCenterCode=$PO->CostCenterCode;
-		   
-		     $PaymentTerms=$PO->PaymentTerms;
-                     $PaymentDays=$PO->PaymentDays;
-                     $PayableAT=$PO->PaymentTerms;
 		
-	        }
-        }
-
                
+		$ServiceDescription =$PO->ServiceDescription;
+                $PaymentTerms = $PO->PaymentTerms;
+                $Placeoforigin=$PO->Import_PlaceofOrgin;
+              
+		
+	}
+}
+		 $currencyName='INR';
                 $currencyCode ='';
-                $currencyName='';
-                if(!empty($CurrencySymbol))
+            if(!empty($CurrencySymbol))
                             {
                 foreach ($CurrencySymbol as $Curr)
                 {
                    
                             $currencyCode = $Curr->FontCode2000;
-                            $currencyName = $Curr->Currency_Code;
+                            //$currencyName = $currencyName;
                         
 
                     }
 
                     }
-      
-     
-
-
-?>
-
 
+             
+         ?>
 <style>
-	@page { margin: 310px 50px 30px 50px; }
-	.header { position: fixed; left: 0px; top: -310px; right: 0px; height: 550px;text-align: center; }
+	@page { margin: 280px 50px 30px 50px; }
+	.header { position: fixed; left: 0px; top: -280px; right: 0px; height: 550px;text-align: center; }
 	.footer { position: fixed; bottom: 0px; }
 	.pagenum:before { content: counter(page); }
 </style>
 <div class="footer">Page: <span class="pagenum"></span></div> 
- <div class="header">
-	<table>
-		<tr>
-			<td>
-			<img  width="80" height="80"  src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11JREFUeNrsnT9IHEEYxWfFw8rgpUhlo5URi2gTbIUUSrq1ui4oRLRIY9JIKrGKTQrBgJLuuutEi4CtSSOpPIuATdIEcid2YpN9C3sc8c6bf7uZmX0P7k7ultm7337zzXxvZjGaiaIfQoiqoHTUHk6eniSPUbLQUmUoebojB23dDZGBmQiQAAmQAAmQIkACJEACpAiweA3bbvDV5mb6+iKOxfTc3MDjf15dicbBQfr3591d7wBGM1H0J3l9bNLI84UFsby6mkIzFWACJMCafJ9PJyfSx29vbHQuoqJaxl34zc5O+mVtwIPi5EIcXV52IjnoLvx+by/9wXkIF8aHbq0dgYi4vOB1Q7QV2c4BXM4Z3r+RGBTAR9VqmqhVBoZnIyOdx9taTXqQGJ+YUDqXFwBV4WGU69aXRkNsr69LtyEzHfIKIKJCVl9PT3u+/63P+6bnC64SuWm3jdsYn5xkKcdamCJAAiwjQJcHAC8ATs/OBg1Qy0y4ub6WPhb1cuPwUFycn9/77OPWlvXzeQGw2QPGQ9o/PhZrS0v3IPpooFrpwgChYniidq6fnTnvrBSaA3Uc3A/1uvPuSmEA0f0uFLsyBKcZDjaisvSj8DsFW6pbcHPQpV12WQoBCHhri4taEOGwhJAXjeeBgFebn1eyp0LKi1Ym0rCsXieRqLk06HVetFqJwHmWnRz3yotHzabT9n0hpRxGZ0SjjpGKCEQkxgUtWDlbCyMfIi/qTHMgrDf7srCem5mQDS5YQNKRD2vCuQLMhCVM3bwIiK4PLIUYqrp5EXPFeGWFALO8CEdGddId7NYOHWFQUa1cUO4Fty78/fZW6tFrjx7gqfqAT0PbmWAqVCwq+bDUOxMeyokh6L8B1J1kE2BgIkACJMDyAbSx56/cACV3CoyOjfX9rNSrcrI7E/qVYYCnYhKY3LXkJECVOdx+Us51m6Nwm7HVQyUCf4UGEJuFZPMgIhC+XlYfw21WWQ/GxXJ50q09iBS1MSjYW73ww3SXMVXOobsk4MU80GQZc5DQbl5tOzWRRpS8nJqy1tUAzWZ7ecvKDdfdggWfTV0GbdnA4JB1UdhbHjo0LesAS6YWa2GaCQRIgARIESABEiABUgRIgARYRoAVYtBWBfcL/xb8hwS6av8VYADVjF2M5sTWJAAAAABJRU5ErkJggg==">
-			</td>
-			<td><center><h2>CAPITAL PURCHASE ORDER</h2><a style="color:#515151">PO NO:<?php echo $PONO?> </a><br/><b style="color:#3c8dbc"><?php echo $CompanyName; ?></b><br/>   <?php echo $CompanyAddress; ?></center></td>
-			<td>
+<div class="header">
+			<div style="text-align:right;">
 			<?php 
 				if ($postatus == 'ST026')
 				{}
 				else
 				{
-					echo '<div><br/><br/>This is Draft Version For Internal Purpose</div>';
+					echo '<div><b>DRAFT</b> </div>';
+					 
 				}
 
 				?>
-				</td>
-		</tr>
-	</table>
-		 
-		  
-		<table style="border-collapse: collapse;font-size:12px;"  cellpadding="0" cellspacing="0" border="1" width="100%">
-			  <tr><th>Payment Terms</th><th>Payable At</th><th>Payment Days</th><th>Delivery Date/Schedule</th><th>PO Date</th></tr>
-			  <tr><td><?php echo $PaymentTerms;?></td><td><?php echo $PayableAT;?></td><td><?php echo $PaymentDays;?></td><td><?php echo $DeliveryDate.$DeliverySchedule;?></td><td><?php echo $Podt?></td></tr>
-		</table> 
-		  <br/><br/>
- 		<table style="border-collapse: collapse;font-size:12px;"  cellpadding="0" cellspacing="0" border="1" width="100%">
-			<tr>
-				<td>
-					 <a style="color:#3c8dbc">Vendor Address :</a>  <br/> <?php echo $SuplierName?> <br/><?php  echo $SuplierAddress ?> 
-				</td>
-				<td>
-					 <a style="color:#3c8dbc">Delivery To :</a><br/>  <?php  echo $DeliveryAddress?> 
-				</td>
-				</td>
-			</tr>
-		</table>
-</div>
-<div class="page" style="font-size:12px;">
+				</div>
+				 
+	<center> <span style="font-size:24px;">PURCHASE ORDER - <a style="color:#515151">PO NO:<?php echo $PONO?> </a></span></center>
+	 
  
-<table style="border-collapse: collapse;"  cellpadding="0" cellspacing="0" border="1" width="100%">
-<tr style="background:#8c8c8c;color:#fff;">
-<th>#</th>
-<th>Item and Description</th>
-<th>Qty</th>
-<?php if($currencyName!='INR'){ ?>
-<th>Rate Per Unit in <?php echo "$currencyName"."("."$currencyCode".")"?></th>
-<?php 
-} else{
-
-?>
-<th>Rate Per Unit in <?php echo "$currencyName";?></th><?php } ?>
-
-
-<?php if($currencyName!='INR'){ ?>
-<th>Total Amount in <?php echo "$currencyName"."("."$currencyCode".")"?></th>
-<?php 
-} else{
-
-?>
-<th>Total Amount in <?php echo "$currencyName"; ?></th>  <?php } ?>
+<table style="border-collapse: collapse;font-size:12px;" border="1" width="100%" cellspacing="0" cellpadding="0">
+<tbody>
+<tr> 
+ 
+<td colspan="2">
+<p style="color:#3c8dbc;font-size:16px;"><strong><?php echo $CompanyName; ?></strong></p>
+<p> <?php echo $CompanyAddress; ?></p>
+</td>
+<td align="right"><img  width="100" height="100"  src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11JREFUeNrsnT9IHEEYxWfFw8rgpUhlo5URi2gTbIUUSrq1ui4oRLRIY9JIKrGKTQrBgJLuuutEi4CtSSOpPIuATdIEcid2YpN9C3sc8c6bf7uZmX0P7k7ultm7337zzXxvZjGaiaIfQoiqoHTUHk6eniSPUbLQUmUoebojB23dDZGBmQiQAAmQAAmQIkACJEACpAiweA3bbvDV5mb6+iKOxfTc3MDjf15dicbBQfr3591d7wBGM1H0J3l9bNLI84UFsby6mkIzFWACJMCafJ9PJyfSx29vbHQuoqJaxl34zc5O+mVtwIPi5EIcXV52IjnoLvx+by/9wXkIF8aHbq0dgYi4vOB1Q7QV2c4BXM4Z3r+RGBTAR9VqmqhVBoZnIyOdx9taTXqQGJ+YUDqXFwBV4WGU69aXRkNsr69LtyEzHfIKIKJCVl9PT3u+/63P+6bnC64SuWm3jdsYn5xkKcdamCJAAiwjQJcHAC8ATs/OBg1Qy0y4ub6WPhb1cuPwUFycn9/77OPWlvXzeQGw2QPGQ9o/PhZrS0v3IPpooFrpwgChYniidq6fnTnvrBSaA3Uc3A/1uvPuSmEA0f0uFLsyBKcZDjaisvSj8DsFW6pbcHPQpV12WQoBCHhri4taEOGwhJAXjeeBgFebn1eyp0LKi1Ym0rCsXieRqLk06HVetFqJwHmWnRz3yotHzabT9n0hpRxGZ0SjjpGKCEQkxgUtWDlbCyMfIi/qTHMgrDf7srCem5mQDS5YQNKRD2vCuQLMhCVM3bwIiK4PLIUYqrp5EXPFeGWFALO8CEdGddId7NYOHWFQUa1cUO4Fty78/fZW6tFrjx7gqfqAT0PbmWAqVCwq+bDUOxMeyokh6L8B1J1kE2BgIkACJMDyAbSx56/cACV3CoyOjfX9rNSrcrI7E/qVYYCnYhKY3LXkJECVOdx+Us51m6Nwm7HVQyUCf4UGEJuFZPMgIhC+XlYfw21WWQ/GxXJ50q09iBS1MSjYW73ww3SXMVXOobsk4MU80GQZc5DQbl5tOzWRRpS8nJqy1tUAzWZ7ecvKDdfdggWfTV0GbdnA4JB1UdhbHjo0LesAS6YWa2GaCQRIgARIESABEiABUgRIgARYRoAVYtBWBfcL/xb8hwS6av8VYADVjF2M5sTWJAAAAABJRU5ErkJggg=="></td> 
 </tr>
-
-<?php
-					   if(!empty($POItem))
-						{
-									
-									$TotalOrderValue=0;
-									$index=0;
-                                                                        $BasicValue=0;
-									
-
-									foreach($POItem as $record)
-									{
-										$index = $index + 1;
-
-				   ?>
-
 <tr>
-<td><?php echo $index ; ?></td>
-<td><?php echo $record->MaterialName ; ?></td>
-<td align="right"><?php echo $record->Quantity ; ?></td>
-<td align="right"><?php echo $record->Rate ; ?></td>
-
-<td align="right"><?php $BasicValue=($record->Quantity*$record->Rate);
-												echo number_format($BasicValue,2) ; ?></td>
+<td>
+<p><strong>Vendor Address :</strong></p>
+<p><?php echo $SuplierName; ?><br /><?php  echo $SuplierAddress; ?></p>
+</td>
+<td colspan="2">
+<p><strong>Delivery To :</strong></p>
+<p><?php  echo $DeliveryAddress; ?></p>
+</td>
 </tr>
-
-	<?php
-
-									$TotalOrderValue = $TotalOrderValue+$BasicValue;
-								}
-								}
-								
-							?>
-</table>
-
-
-
-<br>
-<br>
-<div align="right">
-<?php if($currencyName!='INR'){ ?>
-<p><b>Total Order Amount in <?php echo "$currencyName"."("."$currencyCode".")"?>:<?php echo  number_format($TotalOrderValue,2);?><b></p>
-<?php 
-} else{
-
-?>
-<p><b>Total Order Amount in <?php echo "$currencyName"; ?>:<?php echo  number_format($TotalOrderValue,2);?><b></p>
-<?php } ?>
-<table>
 <tr>
-<td><b>Total Amount In Words:</b></td>
-<td><b><?php echo $TotalAmountInWords." "."Only.";?></b></td>
-
+<td>PO DATE :<?php echo $Podt; ?></td>
+<td colspan="2">DISPATCH / SCHEDULE BY :<?php echo $Import_DispatchDetails.$DeliverySchedule;?></td>
+<td>PLACE OF ORIGIN:<?php echo $Placeoforigin; ?></td>
 </tr>
+</tbody>
 </table>
-<table style="border-collapse: collapse;"  cellpadding="0" cellspacing="0" border="1" width="100%">
-		<tr style="background:#8c8c8c;color:#fff;">
-		
-		<th>Requistion Number</th>
-		<th>Requested by</th>
-		<th>Requested Department</th>
-		<th>Cost center</th>
 	
-		</tr>
+	 
+</div>
+<p>&nbsp;</p>
 
-									 <?php
-							if(!empty($RequistionDetails))
+<table style="border-collapse: collapse;" border="1" width="100%" cellspacing="0" cellpadding="0">
+<tbody>
+<tr>
+<td>Requistion Number</td>
+<td>Requested By</td>
+<td>Requested Department</td>
+<td>Cost Center &nbsp;</td>
+</tr>
+<?php
+				if(!empty($RequistionDetails))
+				{
+					
+					foreach($RequistionDetails as $ReqDetails)
+					{
+												  						
+				?>
+			<tr>
+			<td><?php echo $ReqDetails['RequistionNo']; ?></td>
+			<td><?php echo $ReqDetails['RequestedName']; ?></td>
+			<td><?php echo $ReqDetails['RequestedDept']; ?></td>
+			<td><?php echo $ReqDetails['CostCenterCode']; ?></td>
+			</tr> 
+			 <?php
+						}
+						}
+						
+					  ?>
+</tbody>
+</table>
+<p>&nbsp;</p>
+
+<table style="border-collapse: collapse;" border="1" width="100%" cellspacing="0" cellpadding="0">
+<tbody>
+<tr>
+			<th>#</th>
+			<th>Item Name</th>
+			<th>Qty</th>
+			<th>UOM</p>
+			<?php if($currencyName!='INR'){ ?>
+
+			<th>Rate Per Unit in <?php echo "$currencyName"."("."$currencyCode".")"?></th>
+
+			<?php 
+
+			} else{
+
+
+
+			?>
+
+			<th>Rate Per Unit in <?php echo "$currencyName";?></th><?php } ?>
+
+                        <?php if($currencyName!='INR'){ ?>
+
+			<th>Total Amount in <?php echo "$currencyName"."("."$currencyCode".")"?></th>
+
+			<?php 
+
+			} else{
+
+
+
+			?>
+
+			<th>Total Amount in <?php echo "$currencyName";?></th><?php } ?>
+
+
+
+			
+</tr>
+<?php
+							if(!empty($POItem))
 							{
-								
-								foreach($RequistionDetails as $ReqDetails)
-								{
-                                                              
-									
-							?>
-		<tr>
 
-		<td><?php echo $ReqDetails['RequistionNo']; ?></td>
-		<td><?php echo $ReqDetails['RequestedName']; ?></td>
-		<td><?php echo $ReqDetails['RequestedDept']; ?></td>
-                 <td><?php echo $ReqDetails['CostCenterCode']; ?></td>
-		
+								 $index = 0;
+								 $TotalAmount = 0;
+								 $OrderValue = 0;
+								 
+								foreach($POItem as $record)
+								{
+									$index = $index + 1;
+									$OrderValue= $OrderValue + $record->Quantity*$record->Rate;
+							?>
+		<tr  style="line-height: 1.5em;">
+		<td><?php echo $index ; ?></td>
+			<td><?php echo $record->MaterialName ; ?></td>
+			<td align="right"><?php echo $record->Quantity ; ?></td>
+			<td align="right"><?php echo $record->UOM ; ?></td>
+			<td align="right"><?php echo number_format(($record->Rate),2) ; ?></td>
+			<td align="right"><?php echo number_format(($record->Quantity * $record->Rate),2);?></td>
+                   
+	
 		</tr>
 								
 		 <?php
-                }
-                }
+		 						
+								
+								
+								}
 							
-              ?>
-		</table>
- <br/>
-<br/>
+								
+									
+							}
+							
+							?>
+
+</tbody>
+</table>
+<p>&nbsp;</p>	 
+		<table  style="border-collapse: collapse;" cellpadding="0" cellspacing="0" border="1" width="100%">
+        <tbody>
+        <tr>
+        <td style="text-align: center;" ><strong>Total Amount In Words</strong><br /><br /><em><?php echo $TotalAmountInWords." "."Only.";?></em></td>
+        <td style="text-align: center;" ><?php if($currencyName!='INR'){ ?>
+
+					 Total Order Amount in <?php echo "$currencyName"."("."$currencyCode".")" ?><?php } else { ?><b>Total Order Amount in <?php echo "$currencyName"; ?><?php } ?> </b> <br/><?php if($currencyName!='INR'){ ?><?php echo  number_format($OrderValue,2); } else {?> <?php echo  number_format($OrderValue,2);}?></td>
+        </tr>
+         
+        <tr>
+        <td>
+        <p><strong>Payment Terms</strong></p>
+        <p><?php echo $PaymentTerms;?></p>
+        </td>
+        <td style="text-align: center;">
+        <p><font size="1">Certified that the particulars given above are true and correct</font></p>
+        <p><?php echo $CompanyName; ?></p>
+        <p>&nbsp;</p>
+        <p>Authorized Signatory</p>
+        </td>
+        </tr>
+        </tbody>
+		</table>  
+<p>&nbsp;</p>
+
+<p><strong>Special Instruction:</strong></p>
+<p><?php echo $ServiceDescription;?></p>
+<p>&nbsp;</p>
+<?php 
 
-<br>
-		<br>
-		<p>
-		<div align="Left"> <b>Service Description:</b><br/><br/><?php echo $ServiceDescription;?></div></p>
-		<?php 
 		if(!empty($releasedetails)){
+			
 			 $releasedOn = '';
 			foreach($releasedetails as $detail){
                 $releasedOn= new DateTime($detail->ReleasedOn, new DateTimeZone('Asia/Kolkata'));
+                      
 
 		?>
-		<table width="200%">
-		<tr>
-		<td><b>ReleasedBy:</b></td>
-		<td><b>ReleasedOn:</b></td>
-		</tr>
-		<tr>
-		<td><?php echo $detail->FirstName;?></td>
-		<td><?php echo $releasedOn->format('d-m-Y');?></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-		</tr>
-		</table>
+	
+		
+		<!-- <table   width="100%">
+			<tbody>
+			<tr>
+			<td><b>Released By:</b></td>
+			<td style="text-align:right;"><b>Released On:</b></td>
+			</tr>
+			<tr>
+			<td><?php echo $detail->FirstName;?></td>
+			<td style="text-align:right;"><?php echo $releasedOn->format('d-m-Y');?></td>
+			</tr>
+			</tbody>
+		</table> -->
+		<p>&nbsp;</p>
+		 <div align="Left"> <b>Released By : </b><?php echo $detail->FirstName;?></div> 
+		 <div align="Left"> <b>Released On : </b><?php echo $releasedOn->format('d-m-Y');?></div> 
 		<?php 
-			}
-		}
-                 else {
-             
-		?>
-                  
-
-                   <table width="200%">
-		<tr>
-		<td><b>Till Release State:</b></td>
-		
-		</tr>
-		
-		</table>
-                   <?php }  ?>
-
-
-</div>
-</div>
\ No newline at end of file
+					}
+				}
+						 else {
+						
+					 
+				?>
+						  
+ 
+						   <?php } ?> 
diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php
index 92f95d4e..cc26b11c 100755
--- a/application/views/capitalpurchaseorder.php
+++ b/application/views/capitalpurchaseorder.php
@@ -421,11 +421,11 @@ function vaildateBeforeOpenModal()
                 $options1 = array("0"=>'Select Payment method');
                                                         //print_r(  $options);
 
-                   if(!empty($payment))
+                   if(!empty($Payment))
                       {
-                       foreach ($payment as $payment):
+                       foreach ($Payment as $payment):
 
-                        $options1[$rl->PaymentTerms] =  $rl->ConfigValue.' '.' - '.' '.$rl->PaymentTerms;
+                        $options1[$payment->PaymentID] =  $payment->PaymentTerms;
 
                         endforeach;
                       }
@@ -433,6 +433,7 @@ function vaildateBeforeOpenModal()
                     echo form_dropdown('PaymentMethod', $options1,set_value('PaymentMethod'),'id="PaymentMethod"' ,'class="form-control"');
 
             ?>
+ 
            </div> 
             
            
@@ -454,12 +455,13 @@ function vaildateBeforeOpenModal()
                     <tr>
                                             <th>SNo</th>
                                             <th>Requisition No</th>
-                                            <th>Item Name</th>
+                                            <th>Item Code</th>
+                                            <th>Item Description</th>
                                             <th>Quantity</th>
                                             <th>UOM</th>
                                             <th>Rate</th>
                                             <th>Basic Amount</th>
-											<th>Tax Amount</th>
+					<th>Tax Amount</th>
                                             <th>Total Order Amount</th>
                                             <th>Action</th>
                     </tr>
@@ -573,11 +575,7 @@ function vaildateBeforeOpenModal()
                          ?>
                         </div>
                         </div>
-			             <div class="col-md-6">
-							<label>Service Description </label>	<?php
-							$data = array('name' => 'txtservicedescription','value' => set_value('txtservicedescription'),'id'=>'txtservicedescription',  'class' => 'form-control');
-							echo form_input($data); ?>
-						</div>
+			             
                           <div class="col-md-2">
                               <label>UOM</label>
                               <div class="form-group">
@@ -587,16 +585,7 @@ function vaildateBeforeOpenModal()
                              ?>
                               </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' ,'readonly' => 'true');
-								echo form_input($data);
-							?> 
-                           <input type="hidden" name="FrequencyNo" id="FrequencyNo" value="FrequencyNo" />
-							</div>
-					         </div>
+		                    
                            <div class="col-md-3">
                               <label>Quantity</label>
                                 <div class="form-group">
@@ -650,7 +639,7 @@ function vaildateBeforeOpenModal()
 							 <div class="form-group">
 							 
 												<?php
-										 $data = array('name' => 'AfterCgst','value' => set_value('AfterCgst'),'id'=>'AfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
+										 $data = array('name' => 'AfterCgst','value' => set_value('AfterCgst',0),'id'=>'AfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -678,7 +667,7 @@ function vaildateBeforeOpenModal()
 							 <div class="form-group">
 							 
 							<?php
-							  $data = array('name' => 'AfterSgst','value' => set_value('AfterSgst'),'id'=>'AfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
+							  $data = array('name' => 'AfterSgst','value' => set_value('AfterSgst',0),'id'=>'AfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
 							echo form_input($data);
 							?>   
 							</div>
@@ -707,7 +696,7 @@ function vaildateBeforeOpenModal()
 							 <div class="form-group">
 							 
 												<?php
-										 $data = array('name' => 'AfterIgst','value' => set_value('AfterIgst'),'id'=>'AfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
+										 $data = array('name' => 'AfterIgst','value' => set_value('AfterIgst',0),'id'=>'AfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -722,7 +711,7 @@ function vaildateBeforeOpenModal()
 		<div class="col-md-3">
 							 <div class="form-group">
 													<?php
-											 $data = array('name' => 'OtherAllowances','value' => set_value('OtherAllowances'),'id'=>'OtherAllowances',  'class' => 'form-control num' ,'placeholder' => 'Other Allowances');
+											 $data = array('name' => 'OtherAllowances','value' => set_value('OtherAllowances',0),'id'=>'OtherAllowances',  'class' => 'form-control num' ,'placeholder' => 'Other Allowances');
 											echo form_input($data);
 											?>   
 										</div>
@@ -1131,15 +1120,7 @@ function vaildateBeforeOpenModal()
                         ?>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                        <label>Avail Bud Amount<?php echo "($INR)"?></label>
-                    <div class="form-group">
-                        <?php
-                            $data = array('name' => 'EditCapitalbudAmt','value' => set_value('EditCapitalbudAmt'),'id'=>'EditCapitalbudAmt',  'class' => 'form-control' ,'readonly' => 'true');
-                            echo form_input($data);
-                        ?>
-                    </div>
-                    </div>
+                    
                     </div>
                     <div class="col-md-2" id="hideModalExchangeEdit">
                         <label> Exchange Rate</label> 
@@ -1172,12 +1153,7 @@ function vaildateBeforeOpenModal()
                                                             ?>
                                                         </div>
                                                     </div>
-														 <div class="col-md-6">
-															<label>Service Description </label>	<?php
-																	 $data = array('name' => 'Edittxtservicedescription','value' => set_value('Edittxtservicedescription'),'id'=>'Edittxtservicedescription',  'class' => 'form-control');
-																	echo form_input($data); ?>
-														</div>
-                                                    <div class="col-md-2">
+														 
                                                         <label>UOM</label>
                                                         <div class="form-group">
                                                             <?php
@@ -1186,16 +1162,7 @@ function vaildateBeforeOpenModal()
                                                             ?>
                                                         </div>
                                                     </div>
-													 <div class="col-md-3">
-						  <label>Frequency</label>
-							   <div>
-								<?php
-								$data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency',  'class' => 'form-control','readonly' => 'true' );
-									echo form_input($data);
-							   ?> 
-							<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />  					 
-							  </div>
-					   </div>
+													
                                                     <div class="col-md-3">
                                                         <label>Quantity</label>
                                                         <div class="form-group">
@@ -1842,18 +1809,18 @@ function vaildateBeforeOpenModal()
           
                   
 
-                          <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' );
-                            echo form_textarea($data);
-                            ?>   
-                          </div>   
+                          
 
                                
 
 
                     </div>
-
+<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' );
+                            echo form_textarea($data);
+                            ?>   
+                          </div>   
 
                 <div align="right" style="padding:1% 0%;"> 
                                         
@@ -1914,7 +1881,7 @@ function vaildateBeforeOpenModal()
     <tr  id="<%=index%>">
     <td align="left"><%=index%></td>
      <td align="left"><%=ReqNo%></td>
-
+ <td align="left"><%=MaterialCode%></td>
       <td align="left"><%=MaterialName%></td>
       <td align="left"><%=Quantity%></td> 
       <td align="left"><%=UOM%></td>
@@ -1984,19 +1951,9 @@ function vaildateBeforeOpenModal()
                              
                                     $("#SupAddress").val(obj.Address);
                                     supPaymentTerms=obj.PaymentTerms;
-                                    supPaymentAT=obj.PayableAT;
-                                    subPaymentDate=obj.PaymentDays;
+                                   $("#PaymentMethod").val(obj.PaymentID);
                                                         
-            //     if (subPaymentDate=="After") 
-            //     {
-            //       //alert();
-            //       document.getElementById("After").checked = true;
-
-            //     }
-            //     else{
-            //       document.getElementById("Before").checked = true;
-                  
-            // }
+          
                               
                             }
 
@@ -2004,37 +1961,8 @@ function vaildateBeforeOpenModal()
             
                   
            
-           $('#PaymentMethod').empty();
-         var paymentList = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
-
-           $.each(paymentList, function(idx1, obj1) {
-                   
-
-                                    if(obj1.PaymentTerms == supPaymentTerms )
-                                    {
-                          $("#PaymentMethod").append( $('<option></option>').val(obj1.PaymentTerms).html(obj1.PaymentTerms));
-                                    $("#PayableAT").val(supPaymentAT); 
-                              
-                               
-                                       }
-
-
-                    });                   
-                    
-                    $.each(paymentList, function(idx, obj) {
-                   
-                                
-                                    if(obj.PaymentTerms != supPaymentTerms )
-                                    {
-                          $("#PaymentMethod").append( $('<option></option>').val(obj.PaymentTerms).html(obj.PaymentTerms));
-                              $("#PayableAT").val(supPaymentAT); 
-                                
-                                              
-
-                                    }
-
-
-                    });
+         
+                  
                  
 
 
@@ -2054,7 +1982,7 @@ function vaildateBeforeOpenModal()
      var id = $('#Reqnumber').val();
 
      $("#CapitalbudAmt").val('');
-    $("#ExchangeRtModal").val(ExchangeRate);
+    $("#ExchangeRtModal").val(parseFloat(ExchangeRate).toFixed(2));
 
       $("#MaterialCode").empty();
       $("#CapitalDepartmentName").val('');
@@ -2083,7 +2011,7 @@ function vaildateBeforeOpenModal()
 
                             }			
                     });
-                    $("#CapitalbudAmt").val(AvlBudAmt);	
+                    $("#CapitalbudAmt").val(parseFloat(AvlBudAmt).toFixed(2));	
 
 
                     // For Binding Material list center for the selected Requistion Number	
@@ -2313,32 +2241,16 @@ function vaildateBeforeOpenModal()
 
              
               $('#CPTotalAmount').val(parseFloat(Tot).toFixed(2));
-                       $('#AfterBasicPriceTax').val(Math.round(BasicInINR));
+                       $('#AfterBasicPriceTax').val(parseFloat(BasicInINR).toFixed(2));
 
      //ExceedBudget($('#CPTotalAmount').val(),$('#CapitalbudAmt').val());
 
               if(ExceedBudget($('#CPTotalAmount').val(),$('#CapitalbudAmt').val())){
-     //Service Tax calculation
-
-
-            $('#AfterServiceTax').val(calculateServiceTax($('#AfterBasicPriceTax').val())); 	 
-
-             //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($('#AfterBasicPriceTax').val())); 
-             //Swachh Bharat tax
-
-            $('#AfterSwachhTax').val(calculateSwachhBharattax($('#AfterBasicPriceTax').val()));
-
-             // This is for import basic price
-
-         //$('#AfterBasicPriceTax').val(Math.round($('#CPTotalAmount').val()));
+      //Service Tax calculation
+        
+        $('#AfterCgst').val(calculateCgstTax($('#AfterBasicPriceTax').val(),$('#Cgst').val()));
+        $('#AfterSgst').val(calculateSgstTax($('#AfterBasicPriceTax').val(),$('#Sgst').val()));
+         $('#AfterIgst').val(calculateIgstTax($('#AfterBasicPriceTax').val(),$('#Igst').val()));
 
           if($('#LandingCharge').val()!='' && $('#AfterBasicPriceTax').val()!=''){
      $('#AfterLandingCharge').val(calculateLandingCharge($('#LandingCharge').val(),$('#AfterBasicPriceTax').val()));
@@ -2815,12 +2727,13 @@ function vaildateBeforeOpenModal()
                       var itemRate = parseFloat(convertRate).toFixed(2);
                var basicval = parseFloat($("#CPTotalAmount").val()).toFixed(2);
                
-                      var AfterServiceTax = $("#AfterServiceTax").val();
-                      var AfterEduCess = $("#AfterEduCess").val();
-                      var AfterSecHighTax = $("#AfterSecHighTax").val();
-
-                      var AfterKrishiTax = $("#AfterKrishiTax").val();
-                      var AfterSwachhTax = $("#AfterSwachhTax").val();
+                    var OtherAmt = parseFloat($('#OtherAllowances').val()).toFixed(2);
+		  var Cgst = $("#Cgst").val();
+		  var AfterCgst = $("#AfterCgst").val();
+                  var Sgst = $("#Sgst").val();
+                  var AfterSgst = $("#AfterSgst").val();
+                  var Igst = $("#Igst").val();
+                  var AfterIgst = $("#AfterIgst").val();
 
 
                     var landingCharge = $('#AfterLandingCharge').val();
@@ -2853,7 +2766,7 @@ var purchaseRate =  $('#purchaserate').val();
                  var beforeAdditionalExciseDuty =$('#AdditionalExciseduty').val(); 
                 var PurQuantity = $('#PurQuantity').val(); 
                     
-                      var Total = (parseFloat(basicval)+parseFloat(AfterServiceTax)+parseFloat(AfterEduCess)+parseFloat(AfterSecHighTax)+parseFloat(AfterKrishiTax)+parseFloat(AfterSwachhTax)).toFixed(2);
+                      var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)).toFixed(2);
 
                      
                  var TotalOrderValuePerkg = $("#txtTotalOrderValue").val();
@@ -2882,7 +2795,7 @@ var purchaseRate =  $('#purchaserate').val();
                   var template = jQuery("#CapitalList").html();
 
 
-              $('#capitalAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:basicval}));
+              $('#capitalAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:basicval}));
 
                             //clearCapitalModalFields();
                      var theForm = $(".CapitalPO");
@@ -2900,11 +2813,7 @@ var purchaseRate =  $('#purchaserate').val();
                       addHidden(theForm,"itemRate"+temp,itemRate);
                       addHidden(theForm,"basicval"+temp,basicval);
                       addHidden(theForm,"basicvalInINR"+temp,basicvalInINR);
-                     addHidden(theForm,"AfterServiceTax"+temp,AfterServiceTax);
-                    addHidden(theForm,"AfterEduCess"+temp,AfterEduCess);
-                addHidden(theForm,"AfterSecHighTax"+temp,AfterSecHighTax);
-                addHidden(theForm,"AfterKrishiTax"+temp,AfterKrishiTax);
-                addHidden(theForm,"AfterSwachhTax"+temp,AfterSwachhTax);
+                     
                 addHidden(theForm,"landingCharge"+temp,landingCharge);
                 addHidden(theForm,"HighSeasSalesCharge"+temp,HighSeasSalesCharge);
                 addHidden(theForm,"CustomDuty"+temp,CustomDuty);
@@ -2935,8 +2844,13 @@ var purchaseRate =  $('#purchaserate').val();
                    addHidden(theForm,"PerKgExpense"+temp,TotalOrderValuePerkg);
 
                   addHidden(theForm,"capitalType",capitalType);
-                  
-
+                   addHidden(theForm,"Cgst"+temp,Cgst);
+		  addHidden(theForm,"AfterCgst"+temp,AfterCgst);
+	      addHidden(theForm,"Sgst"+temp,Sgst);
+	      addHidden(theForm,"AfterSgst"+temp,AfterSgst);
+		  addHidden(theForm,"Igst"+temp,Igst);
+                  addHidden(theForm,"AfterIgst"+temp,AfterIgst);
+                   addHidden(theForm,"OtherAmt"+temp,OtherAmt);
 
                     		
 
@@ -3039,11 +2953,10 @@ var purchaseRate =  $('#purchaserate').val();
      }
     /* calculate tax value*/
     function calculateTaxValue(){
-             var ServiceTaxAmount = $('#AfterServiceTax').val() == '' ? '0.00' : $('#AfterServiceTax').val();
-              var EduCessTaxAmount = $('#AfterEduCess').val() == '' ? '0.00' : $('#AfterEduCess').val();
-               var SecHighTaxAmount = $('#AfterSecHighTax').val() == '' ? '0.00' : $('#AfterSecHighTax').val();
-                var KrishiTaxAmount = $('#AfterKrishiTax').val() == '' ? '0.00' : $('#AfterKrishiTax').val();
-                var SwachhTaxAmount = $('#AfterSwachhTax').val() == '' ? '0.00' : $('#AfterSwachhTax').val();
+             var Cgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val();
+              var Sgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val();
+               var Igst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val();
+              
             var landingCharge = $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val();
           var HighSeasSalesCharge = $('#AfterHighseas').val() == '' ? '0.00' : $('#AfterHighseas').val();
             var CustomDuty = $('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val();
@@ -3059,7 +2972,7 @@ var purchaseRate =  $('#purchaserate').val();
     var purchaseRate = $('#purchaserate').val() == '' ? '0.00' : $('#purchaserate').val();
     var CustomDutyExpenses = $('#CustomDutyExpenses').val() == '' ? '0.00' : $('#CustomDutyExpenses').val();
     var RMCIncludingCustomers = $('#RMCIncludingCustomers').val() == '' ? '0.00' : $('#RMCIncludingCustomers').val();  
-             var totTaxvalue = (parseFloat(ServiceTaxAmount)+ parseFloat(EduCessTaxAmount)+ parseFloat(SecHighTaxAmount) + parseFloat(KrishiTaxAmount)+ parseFloat(SwachhTaxAmount));
+             var totTaxvalue = (parseFloat(Sgst)+ parseFloat(Cgst)+ parseFloat(Igst));
 //+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);
@@ -3069,11 +2982,10 @@ var purchaseRate =  $('#purchaserate').val();
     function populateValueMainFormForCapital()
     {
                      var BasicVal = $('#CPTotalAmount').val() == '' ? '0.00' : $('#CPTotalAmount').val();
-             var ServiceTaxAmount = $('#AfterServiceTax').val() == '' ? '0.00' : $('#AfterServiceTax').val();
-              var EduCessTaxAmount = $('#AfterEduCess').val() == '' ? '0.00' : $('#AfterEduCess').val();
-               var SecHighTaxAmount = $('#AfterSecHighTax').val() == '' ? '0.00' : $('#AfterSecHighTax').val();
-                var KrishiTaxAmount = $('#AfterKrishiTax').val() == '' ? '0.00' : $('#AfterKrishiTax').val();
-                var SwachhTaxAmount = $('#AfterSwachhTax').val() == '' ? '0.00' : $('#AfterSwachhTax').val();
+             var AfterCgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val();
+		var AfterSgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val();
+		var AfterIgst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val();
+	        var OtherAmt = $('#OtherAllowances').val() == '' ? '0.00' : $('#OtherAllowances').val();
             var landingCharge = $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val();
           var HighSeasSalesCharge = $('#AfterHighseas').val() == '' ? '0.00' : $('#AfterHighseas').val();
             var CustomDuty = $('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val();
@@ -3090,17 +3002,15 @@ var purchaseRate =  $('#purchaserate').val();
       var CustomDutyExpenses = $('#CustomDutyExpenses').val() == '' ? '0.00' : $('#CustomDutyExpenses').val();
       var RMCIncludingCustomers = $('#RMCIncludingCustomers').val() == '' ? '0.00' : $('#RMCIncludingCustomers').val();  
             // var totvalue = $('#txtTotalOrderValue').val() == '' ? '0.00' : $('#txtTotalOrderValue').val();
-                      var totvalue = (parseFloat(ServiceTaxAmount)+parseFloat(EduCessTaxAmount)+parseFloat(SecHighTaxAmount)+parseFloat(KrishiTaxAmount)+parseFloat(SwachhTaxAmount)).toFixed(2);
+                      var totvalue = (parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)).toFixed(2);
 
 
                     var TotalOrderValueSummary = $('#txtToatlOrder').val() == '' ? '0.00' : $('#txtToatlOrder').val();
 
-                    var TotalServiceTax = $('#TotalAfterServiceTax').val() == '' ? '0.00' : $('#TotalAfterServiceTax').val();
-                    var TotalEducess = $('#TotalAfterEduCess').val() == '' ? '0.00' : $('#TotalAfterEduCess').val();
-                    var TotHigherEdu = $('#TotalAfterSecHighTax').val() == '' ? '0.00' : $('#TotalAfterSecHighTax').val();
-
-                    var TotalKrishiKalyan = $('#TotalAfterKrishiTax').val() == '' ? '0.00' : $('#TotalAfterKrishiTax').val();
-                    var TotSwachhBharat = $('#TotalAfterSwachhTax').val() == '' ? '0.00' : $('#TotalAfterSwachhTax').val();
+                  var TotalCgst = $('#txtTotCgst').val() == '' ? '0.00' : $('#txtTotCgst').val();
+		var TotSgst = $('#txtTotSgst').val() == '' ? '0.00' : $('#txtTotSgst').val();
+		var TotalIgst = $('#txtTotIgst').val() == '' ? '0.00' : $('#txtTotIgst').val();
+		 var TotalAllowance = $('#TotalOtherAllowances').val() == '' ? '0.00' : $('#TotalOtherAllowances').val();
                    
                     var TotLanding = $('#txttotallanding').val() == '' ? '0.00' : $('#txttotallanding').val();
                     var TotHighseas = $('#txttotalhighseas').val() == '' ? '0.00' : $('#txttotalhighseas').val();
@@ -3117,12 +3027,10 @@ var purchaseRate =  $('#purchaserate').val();
                      var TotGrossexpense = $('#txttotalgrossexpense').val() == '' ? '0.00' : $('#txttotalgrossexpense').val();
                      var TotalCapitalOrder = $('#CapitalToatlOrder').val() == '' ? '0.00' : $('#CapitalToatlOrder').val();
 
-                    $('#TotalAfterServiceTax').val((parseFloat(TotalServiceTax) + parseFloat(ServiceTaxAmount)).toFixed(2) );
-                    $('#TotalAfterEduCess').val((parseFloat(TotalEducess) + parseFloat(EduCessTaxAmount)).toFixed(2) );
-                    $('#TotalAfterSecHighTax').val((parseFloat(TotHigherEdu) + parseFloat(SecHighTaxAmount)).toFixed(2) );
-
-                    $('#TotalAfterKrishiTax').val((parseFloat(TotalKrishiKalyan) + parseFloat(KrishiTaxAmount)).toFixed(2) );
-                    $('#TotalAfterSwachhTax').val((parseFloat(TotSwachhBharat) + parseFloat(SwachhTaxAmount)).toFixed(2) );
+                    $('#txtTotCgst').val((parseFloat(TotalCgst) + parseFloat(AfterCgst)).toFixed(2) );
+		$('#txtTotSgst').val((parseFloat(TotSgst) + parseFloat(AfterSgst)).toFixed(2) );
+		$('#txtTotIgst').val((parseFloat(TotalIgst) + parseFloat(AfterIgst)).toFixed(2) );
+                $('#TotalOtherAllowances').val((parseFloat(TotalAllowance) + parseFloat(OtherAmt)).toFixed(2) );
 
                     $('#txttotallanding').val((parseFloat(TotLanding) + parseFloat(landingCharge)).toFixed(2) );
                 $('#txttotalhighseas').val((parseFloat(TotHighseas) + parseFloat(HighSeasSalesCharge)).toFixed(2) );
@@ -3161,12 +3069,13 @@ var purchaseRate =  $('#purchaserate').val();
                       $("#CPRate").val('');
 
              $("#CPTotalAmount").val('');
-                       $("#AfterServiceTax").val('');
-                       $("#AfterEduCess").val('');
-                       $("#AfterSecHighTax").val('');
-
-                       $("#AfterKrishiTax").val('');
-                       $("#AfterSwachhTax").val('');
+                       $("#AfterCgst").val(0);
+                      $("#AfterSgst").val(0);
+                      $("#AfterIgst").val(0);
+$("#Cgst").val(0);
+$("#Sgst").val(0);
+$("#Igst").val(0);
+$("#OtherAllowances").val(0);
 $('#AfterBasicPriceTax').val('');
                $('#LandingCharge').val('');
                     $('#AfterLandingCharge').val('');
@@ -3270,12 +3179,10 @@ function DeleteRow(rowid)
 
                  var TotalOrderValueSummary = 0;
 
-                    var TotalServiceTax = 0;
-                    var TotalEducess = 0;
-                    var TotHigherEdu = 0;
-
-                    var TotalKrishiKalyan = 0;
-                    var TotSwachhBharat = 0;
+                    var TotCgst = 0;
+		var TotSgst = 0;
+		var TotIgst = 0;
+	        var TotOther = 0;
 
                     var TotLanding = 0;
                     var TotHighseas = 0;
@@ -3294,12 +3201,12 @@ function DeleteRow(rowid)
                 
                 for (var i = 1; i < rows; i++) {
                     if(deletedRow==i){
-                       $('#AfterServiceTax'+i).val('');
-                    $('#AfterEduCess'+i).val('');
-                    $('#AfterSecHighTax'+i).val('');
+                       $('#AfterCgst'+i).val('');
+                    $('#AfterSgst'+i).val('');
+                    $('#AfterIgst'+i).val('');
 
-                    $('#AfterKrishiTax'+i).val('');
-                    $('#AfterSwachhTax'+i).val('');
+                    $('#OtherAmt'+i).val('');
+                   
 
                     $('#landingCharge'+i).val('');
                 $('#HighSeasSalesCharge'+i).val('');
@@ -3321,12 +3228,11 @@ function DeleteRow(rowid)
                
                     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 TotCgstI = $('#AfterCgst'+i).val() == '' ? '0.00' : $('#AfterCgst'+i).val();
+                    var TotSgstI = $('#AfterSgst'+i).val() == '' ? '0.00' : $('#AfterSgst'+i).val();
+                    var TotIgstI = $('#AfterIgst'+i).val() == '' ? '0.00' : $('#AfterIgst'+i).val();
+                    var TotOtherI =  $('#OtherAmt'+i).val() == '' ? '0.00' : $('#OtherAmt'+i).val();
+                   
 
                     var TotLandingI = $('#landingCharge'+i).val() == '' ? '0.00' : $('#landingCharge'+i).val();
                     var TotHighseasI = $('#HighSeasSalesCharge'+i).val() == '' ? '0.00' : $('#HighSeasSalesCharge'+i).val();
@@ -3350,12 +3256,10 @@ function DeleteRow(rowid)
                    
                     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 TotCgstI = $('#AfterCgst'+i).val() == '' ? '0.00' : $('#AfterCgst'+i).val();
+                    var TotSgstI = $('#AfterSgst'+i).val() == '' ? '0.00' : $('#AfterSgst'+i).val();
+                    var TotIgstI = $('#AfterIgst'+i).val() == '' ? '0.00' : $('#AfterIgst'+i).val();
+                    var TotOtherI =  $('#OtherAmt'+i).val() == '' ? '0.00' : $('#OtherAmt'+i).val();
 
                     var TotLandingI = $('#landingCharge'+i).val() == '' ? '0.00' : $('#landingCharge'+i).val();
                     var TotHighseasI = $('#HighSeasSalesCharge'+i).val() == '' ? '0.00' : $('#HighSeasSalesCharge'+i).val();
@@ -3376,12 +3280,11 @@ function DeleteRow(rowid)
                         
                     }
 
-                  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);
+                  TotCgst = parseFloat(TotCgst) + parseFloat(TotCgstI);
+                     TotSgst = parseFloat(TotSgst) + parseFloat(TotSgstI);
+                    TotIgst = parseFloat(TotIgst) + parseFloat(TotIgstI);
+                    TotOther = parseFloat(TotOther) + parseFloat(TotOtherI);
+                    
 
                     TotLanding = parseFloat(TotLanding) + parseFloat(TotLandingI);
                      TotHighseas = parseFloat(TotHighseas) + parseFloat(TotHighseasI);
@@ -3401,12 +3304,10 @@ function DeleteRow(rowid)
 
                     }
 
-                   $('#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) );
+                 $('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) );
+		$('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) );
+		$('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) );
+		$('#TotalOtherAllowances').val(parseFloat(TotOther).toFixed(2) );
 
                     $('#txttotallanding').val((parseFloat(TotLanding) ).toFixed(2) );
                 $('#txttotalhighseas').val((parseFloat(TotHighseas) ).toFixed(2) );
@@ -3486,7 +3387,13 @@ function DeleteRow(rowid)
                 $('#EditRMCIncludingCustomers').val($('#ServiceTotalOrderValue'+userid).val());
 		
 		$('#EdittxtTotalOrderValue').val($('#PerKgExpense'+userid).val());
-
+                $('#EditCgst').val($('#Cgst'+userid).val());
+                $('#EditAfterCgst').val($('#AfterCgst'+userid).val());
+		$('#EditSgst').val($('#Sgst'+userid).val());
+                $('#EditAfterSgst').val($('#AfterSgst'+userid).val());
+                $('#EditIgst').val($('#Igst'+userid).val());
+                $('#EditAfterIgst').val($('#AfterIgst'+userid).val());
+                $('#EditOtherAllowances').val($('#OtherAmt'+userid).val());
                  /* get % value */
                    
 		$('#EditLandingCharge').val($('#beforeLanding'+userid).val());
@@ -3614,16 +3521,11 @@ else
 {
 	stat = '<?php echo PO_CREATED; ?>';
 }
-
+tinyMCE.triggerSave();
 var splinstr = $('#txtSpcialInstruction').val();
 var deladd = $('#DeliveryAddr').val();
 var ExchangeRateOn = $('#Exchangerateon').val();
 var PaymentMethod = $('#PaymentMethod').val();
-var PayableAT = $('#PayableAT').val();
-var Before = $('#Before').val();
-var After = $('#After').val();
-
-
 $('#SpcialInstruction').val(splinstr);
 $('#txtDeliveryAddress').val(deladd);
 $('#txtStatus').val(stat);
@@ -3641,7 +3543,7 @@ $('#txtStatus').val(stat);
 			{
 			$('#content').loader('show');
 		  $.ajax({ 
-			data:$('.CapitalPO').serialize()+"&ExchangeRateOn="+ExchangeRateOn+"&PaymentMethod="+PaymentMethod+"&PayableAT="+PayableAT+"&PaymentDate="+PaymentDate,
+			data:$('.CapitalPO').serialize()+"&ExchangeRateOn="+ExchangeRateOn+"&PaymentMethod="+PaymentMethod,
 			type:"POST",
 			url:"<?php echo base_url() ?>purchaseorder/addNewCapitalPurchaseOrder", 
 			success:function(data) {
@@ -3737,8 +3639,8 @@ function clearAfterAddLineItemAdd(){
 
           var txtQuantity = parseFloat( $('#EditCPQuantity').val());
           var txtExchangeRate = 1;
-          var RatePerTon = parseFloat( $('#EditCPRate').val());
-              //var txtUnitPrice = parseFloat($('#Rate').val());
+          var RatePerTon = parseFloat( $('#EditCPRate').val()).toFixed(2);
+              //var txtUnitPrice = parseFloat($('#Rate').val()).toFixed(2);
               if(capitalType=='International'){
            txtExchangeRate = parseFloat( $('#EditExchangeRtModal').val());
             var Tot =  txtQuantity  * RatePerTon;
@@ -3759,20 +3661,9 @@ function clearAfterAddLineItemAdd(){
      //Service Tax calculation
 
 
-            $('#EditAfterServiceTax').val(calculateServiceTax($('#EditAfterBasicPriceTax').val())); 	 
-
-             //Edu. cess @2% on service Tax
-              $('#EditAfterEduCess').val( calculateEduess($('#EditAfterServiceTax').val()));
-
-             //Sec. & Higher Edu. cess @1 % on service Tax 
-
-            $('#EditAfterSecHighTax').val(calculateHigherEdu($('#EditAfterServiceTax').val())); 
-             //Krishi Kalyan tax 
-
-            $('#EditAfterKrishiTax').val(calculateKrishiKalyantax($('#EditAfterBasicPriceTax').val())); 
-             //Swachh Bharat tax
-
-            $('#EditAfterSwachhTax').val(calculateSwachhBharattax($('#EditAfterBasicPriceTax').val()));
+           $('#EditAfterCgst').val(calculateCgstTax($('#EditAfterBasicPriceTax').val(),$('#EditCgst').val()));
+        $('#EditAfterSgst').val(calculateSgstTax($('#EditAfterBasicPriceTax').val(),$('#EditSgst').val()));
+         $('#EditAfterIgst').val(calculateIgstTax($('#EditAfterBasicPriceTax').val(),$('#EditIgst').val()));
 
              // This is for import basic price
 
@@ -3921,13 +3812,14 @@ function clearAfterAddLineItemAdd(){
                      var convertRate = $("#EditCPRate").val();
                       var itemRate = convertRate;
                var basicval = $("#EditCPTotalAmount").val();
-                      var AfterServiceTax = $("#EditAfterServiceTax").val();
-                      var AfterEduCess = $("#EditAfterEduCess").val();
-                      var AfterSecHighTax = $("#EditAfterSecHighTax").val();
-
-                      var AfterKrishiTax = $("#EditAfterKrishiTax").val();
-                      var AfterSwachhTax = $("#EditAfterSwachhTax").val();
-                     var Total = (parseFloat(basicval)+parseFloat(AfterServiceTax)+parseFloat(AfterEduCess)+parseFloat(AfterSecHighTax)+parseFloat(AfterKrishiTax)+parseFloat(AfterSwachhTax));
+                       var Cgst = $("#EditCgst").val();
+		  var AfterCgst = $("#EditAfterCgst").val();
+                  var Sgst = $("#EditSgst").val();
+                  var AfterSgst = $("#EditAfterSgst").val();
+                  var Igst = $("#EditIgst").val();
+                  var AfterIgst = $("#EditAfterIgst").val();
+		var OtherAmt = $('#EditOtherAllowances').val();
+                     var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst));
 
                      var TotalTaxValue = EditcalculateTaxValue();
 
@@ -3981,11 +3873,7 @@ function clearAfterAddLineItemAdd(){
                 $('#basicvalInINR'+userid).val(basicvalInINR);
 		
 		RequistQuantity = $('#quantity'+userid).val();
-		$('#AfterServiceTax'+userid).val(AfterServiceTax);
-		$('#AfterEduCess'+userid).val(AfterEduCess);
-		$('#AfterSecHighTax'+userid).val(AfterSecHighTax);
-		$('#AfterKrishiTax'+userid).val(AfterKrishiTax);
-		$('#AfterSwachhTax'+userid).val(AfterSwachhTax);
+		
 		$('#ServiceTotalOrderValue'+userid).val(TotalTaxValue);
 
 		$('#landingCharge'+userid).val(landingCharge);
@@ -4004,8 +3892,15 @@ function clearAfterAddLineItemAdd(){
                 $('#CustomDutyExpenses'+userid).val(CustomDutyExpenses);
                 $('#RMCIncludingCustomers'+userid).val(RMCIncludingCustomers);
                $('#CapitalToatlOrder'+userid).val(basicval);
-               $('#CapitalToatlOrder'+userid).val(basicval);
-		
+              
+		$('#Cgst'+userid).val(Cgst);
+                        $('#AfterCgst'+userid).val(AfterCgst);
+			$('#Sgst'+userid).val(Sgst);
+			$('#AfterSgst'+userid).val(AfterSgst);	
+			$('#Igst'+userid).val(Igst);
+			$('#AfterIgst'+userid).val(AfterIgst);
+                        
+                        $('#OtherAmt'+userid).val(OtherAmt);
 		
 
                  /* get % value */
@@ -4021,15 +3916,15 @@ function clearAfterAddLineItemAdd(){
                $('#beforeAdditionalExciseDuty'+userid).val(beforeAdditionalExciseDuty);
                $('#PurQuantity'+userid).val(PurQuantity);
                 $('#PerKgExpense'+userid).val(TotalOrderValuePerkg);
-
-                    cellval[2].innerHTML = materialName;
+                cellval[2].innerHTML = materialCode;
+                    cellval[3].innerHTML = materialName;
  
-                    cellval[3].innerHTML = quantity;
-                    cellval[4].innerHTML =uom;
-                    cellval[5].innerHTML =itemRate;
-                    cellval[6].innerHTML =basicval;
-                    cellval[7].innerHTML =TotalTaxValue;
-                    cellval[8].innerHTML =basicval;
+                    cellval[4].innerHTML = quantity;
+                    cellval[5].innerHTML =uom;
+                    cellval[6].innerHTML =itemRate;
+                    cellval[7].innerHTML =basicval;
+                    cellval[8].innerHTML =TotalTaxValue;
+                    cellval[9].innerHTML =basicval;
 
 
 
@@ -4111,11 +4006,10 @@ function validateEditCapitalTax()
      }
     /* calculate tax value*/
     function EditcalculateTaxValue(){
-             var ServiceTaxAmount = $('#EditAfterServiceTax').val() == '' ? '0.00' : $('#EditAfterServiceTax').val();
-              var EduCessTaxAmount = $('#EditAfterEduCess').val() == '' ? '0.00' : $('#EditAfterEduCess').val();
-               var SecHighTaxAmount = $('#EditAfterSecHighTax').val() == '' ? '0.00' : $('#EditAfterSecHighTax').val();
-                var KrishiTaxAmount = $('#EditAfterKrishiTax').val() == '' ? '0.00' : $('#EditAfterKrishiTax').val();
-                var SwachhTaxAmount = $('#EditAfterSwachhTax').val() == '' ? '0.00' : $('#EditAfterSwachhTax').val();
+              var Cgst = $('#EditAfterCgst').val() == '' ? '0.00' : $('#EditAfterCgst').val();
+              var Sgst = $('#EditAfterSgst').val() == '' ? '0.00' : $('#EditAfterSgst').val();
+               var Igst = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val();
+              
             var landingCharge = $('#EditAfterLandingCharge').val() == '' ? '0.00' : $('#EditAfterLandingCharge').val();
           var HighSeasSalesCharge = $('#EditAfterHighseas').val() == '' ? '0.00' : $('#EditAfterHighseas').val();
             var CustomDuty = $('#EditAfterCustomduty').val() == '' ? '0.00' : $('#EditAfterCustomduty').val();
@@ -4131,7 +4025,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(ServiceTaxAmount)+ parseFloat(EduCessTaxAmount)+ parseFloat(SecHighTaxAmount) + parseFloat(KrishiTaxAmount)+ parseFloat(SwachhTaxAmount));
+             var totTaxvalue = (parseFloat(Cgst)+ parseFloat(Sgst)+ parseFloat(Igst));
 //+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);
@@ -4169,12 +4063,10 @@ function validateEditCapitalTax()
                 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 TotCgst = 0;
+		var TotSgst = 0;
+		var TotIgst = 0;
+	        var TotOther = 0;
 
                     var TotLanding = 0;
                     var TotHighseas = 0;
@@ -4196,13 +4088,11 @@ function validateEditCapitalTax()
                    
                     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 TotalCgstI = $('#AfterCgst'+i).val() == '' ? '0.00' : $('#AfterCgst'+i).val();
+                    var TotalSgstI = $('#AfterSgst'+i).val() == '' ? '0.00' : $('#AfterSgst'+i).val();
+                    var TotalIgstI = $('#AfterIgst'+i).val() == '' ? '0.00' : $('#AfterIgst'+i).val();
+                    var TotOtherI = $('#OtherAmt'+i).val() == '' ? '0.00' : $('#OtherAmt'+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();
@@ -4218,12 +4108,10 @@ function validateEditCapitalTax()
                      var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val();
                       var CapitalToatlOrderI = $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
 
-                  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);
+                 TotCgst = parseFloat(TotCgst) + parseFloat(TotalCgstI);
+		TotSgst = parseFloat(TotSgst) + parseFloat(TotalSgstI);
+		TotIgst = parseFloat(TotIgst) + parseFloat(TotalIgstI);
+		TotOther = parseFloat(TotOther) + parseFloat(TotOtherI);
 
                     TotLanding = parseFloat(TotLanding) + parseFloat(TotLandingI);
                      TotHighseas = parseFloat(TotHighseas) + parseFloat(TotHighseasI);
@@ -4243,12 +4131,10 @@ function validateEditCapitalTax()
 
                     }
 
-                   $('#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) );
+                  $('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) );
+		$('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) );
+		$('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) );
+		$('#TotalOtherAllowances').val(parseFloat(TotOther).toFixed(2) );
 
                     $('#txttotallanding').val((parseFloat(TotLanding) ).toFixed(2) );
                 $('#txttotalhighseas').val((parseFloat(TotHighseas) ).toFixed(2) );
@@ -4342,7 +4228,48 @@ function SetCapitalPo()
 	  }
  
  }
-
+function calculateCgstTax(varBasicValue,Cgst)
+ {
+	
+		 var basicValue = parseFloat(varBasicValue);
+		var Cgst = parseFloat(Cgst);	 
+		 var ServiceTaxValue = 0.0;  
+		 
+		 ServiceTaxValue = <?php echo SERVICETAX_CGST; ?>;
+		
+	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
+	 
+		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
+		 
+ }
+function calculateSgstTax(varBasicValue,Sgst)
+ {
+	
+		 var basicValue = parseFloat(varBasicValue);
+		var Sgst = parseFloat(Sgst);	 
+		 var ServiceTaxValue = 0.0;  
+		 
+		 ServiceTaxValue = <?php echo SERVICETAX_SGST; ?>;
+		
+	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
+	 
+		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
+		 
+ }
+function calculateIgstTax(varBasicValue,Igst)
+ {
+	
+		 var basicValue = parseFloat(varBasicValue);
+		var Igst = parseFloat(Igst);	 
+		 var ServiceTaxValue = 0.0;  
+		 
+		 ServiceTaxValue = <?php echo SERVICETAX_IGST; ?>;
+		
+	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
+	 
+		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
+		 
+ }
 
     </script>
 
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php
index dba76666..0dc352ba 100755
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -15,11 +15,11 @@
 		$DeliveryAddress ='';
 		$POStatus	 = 	'';
 		$PONO =  	'';
-		$TotalServiceTax = 0;
-		$TotalEducessTax = 0.0;
-		$TotalSecHigherEducessTax = 0.0;
-		$TotalKrishiKalyantax = 0.0;
-		$TotalSwachhBharattax = 0.0;
+		$TotalCgst = 0;
+		$TotalSgst = 0.0;
+		$TotalIgst = 0.0;
+		$OtherAmt = 0.0;
+		
 		$TotalSummary = 0.0;
 		$TotalBasicAmount = 0.0;
 		$ServiceDescription = '';
@@ -487,7 +487,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                      
                             if($PaymentTerms==$rl->PaymentTerms)
                             {
-                                $options6[$rl->PaymentTerms] =  $rl->PaymentTerms;
+                                $options6[$rl->PaymentID] =  $rl->PaymentTerms;
                             }
 
                                 endforeach;
@@ -499,7 +499,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                       
                             if($PaymentTerms!=$rl2->PaymentTerms)
                             {
-                                 $options6[$rl2->PaymentTerms] =  $rl2->PaymentTerms;
+                                 $options6[$rl2->PaymentID] =  $rl2->PaymentTerms;
                             }
 
                                 endforeach;
@@ -531,14 +531,18 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                     <tr>
                                             <th>SNo</th>
                                             <th>Requisition No</th>
-                                            <th>Item Name</th>
+                                            <th>Item Code</th>
+                                            <th>Item Description</th>
                                             <th>Quantity</th>
                                             <th>UOM</th>
                                             <th>Rate</th>
                                             <th>Basic Amount</th>
                                         <th>Tax Amount</th>
                                             <th>Total Order Amount</th>
-                                            <th>Action</th>
+                                            <th>Actual Quantity</th>
+                                            <th>Received Quantity</th>
+					<th>Pending Quantity</th>
+					<th>Action</th>
                     </tr>
                     </thead>				
 
@@ -556,13 +560,21 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                     <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->MaterialName?></td> 
                     <td><?php echo $record->Quantity ?></td>                      
                     <td><?php echo $record->UOM ?></td>                     
                     <td><?php echo $record->Rate ?></td>                     
-                    <td><?php echo $record->Rate * $record->Quantity ?></td>    
-                    <td><?php echo $record->ServiceTaxamount?></td>
-                    <td><?php echo $record->Rate * $record->Quantity ?></td>
+                    <td><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>    
+                   <?php if($CapitalRange=='1'){ ?>
+                <td><?php echo $record->ServiceTaxamount;?></td> <?php } ?>
+                 <?php if($CapitalRange=='0'){ ?>
+                <td><?php echo '0';?></td> <?php } ?>
+                 
+                    <td><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
+                    <td align="right"><?php echo $record->Quantity ?></td>
+                                                                        <td align="right"><?php echo $record->ReceivedQuantity ?></td>
+                                                                        <td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
                 <?php 
                                 $row=array("materialCode"=>$record->MaterialCode,"ReqNo"=>$record->ReqNo);
                 array_push($res_arr_values, $row);
@@ -582,6 +594,17 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 <input type="hidden" name="<?php echo 'itemRate'.$index ?>" id="<?php echo 'itemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" />
 <?php if($CapitalRange=='1'){ ?>
 <input type="hidden" name="<?php echo 'rateInUs'.$index ?>" id="<?php echo 'rateInUs'.$index ?>" value="<?php echo $record->Rate ; ?>" />
+
+<input type="hidden" name="<?php echo 'Cgst'.$index ?>" id="<?php echo 'Cgst'.$index ?>" value="<?php echo $record->CGST ; ?>" />
+
+<input type="hidden" name="<?php echo 'AfterCgst'.$index ?>" id="<?php echo 'AfterCgst'.$index ?>" value="<?php echo $record->After_CGST ; ?>" />
+<input type="hidden" name="<?php echo 'Sgst'.$index ?>" id="<?php echo 'Sgst'.$index ?>" value="<?php echo $record->SGST ; ?>" />
+<input type="hidden" name="<?php echo 'AfterSgst'.$index ?>" id="<?php echo 'AfterSgst'.$index ?>" value="<?php echo $record->After_SGST ; ?>" />
+<input type="hidden" name="<?php echo 'Igst'.$index ?>" id="<?php echo 'Igst'.$index ?>" value="<?php echo $record->IGST ; ?>" />
+<input type="hidden" name="<?php echo 'AfterIgst'.$index ?>" id="<?php echo 'AfterIgst'.$index ?>" value="<?php echo $record->After_IGST ; ?>" />
+<input type="hidden" name="<?php echo 'OtherAmt'.$index ?>" id="<?php echo 'OtherAmt'.$index ?>" value="<?php echo $record->otherallowance ; ?>" />
+<input type="hidden" name="<?php echo 'ServiceTotalOrderValue'.$index ?>" id="<?php echo 'ServiceTotalOrderValue'.$index ?>" value="<?php echo $record->ServiceTaxamount ; ?>" />
+
 <?php } ?>
 
 <?php if($CapitalRange=='0'){ ?>
@@ -628,20 +651,21 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 <input type="hidden" name="<?php echo 'PurQuantity'.$index ?>" id="<?php echo 'PurQuantity'.$index ?>" value="<?php echo $record->QuantityKG; ?>" />
 
 <input type="hidden" name="<?php echo 'PerKgExpense'.$index ?>" id="<?php echo 'PerKgExpense'.$index ?>" value="<?php echo $record->ImportTotalValue; ?>" />
+<input type="hidden" name="<?php echo 'Cgst'.$index ?>" id="<?php echo 'Cgst'.$index ?>" value="0" />
+
+<input type="hidden" name="<?php echo 'AfterCgst'.$index ?>" id="<?php echo 'AfterCgst'.$index ?>" value="0" />
+<input type="hidden" name="<?php echo 'Sgst'.$index ?>" id="<?php echo 'Sgst'.$index ?>" value="0" />
+<input type="hidden" name="<?php echo 'AfterSgst'.$index ?>" id="<?php echo 'AfterSgst'.$index ?>" value="0" />
+<input type="hidden" name="<?php echo 'Igst'.$index ?>" id="<?php echo 'Igst'.$index ?>" value="0" />
+<input type="hidden" name="<?php echo 'AfterIgst'.$index ?>" id="<?php echo 'AfterIgst'.$index ?>" value="0" />
+<input type="hidden" name="<?php echo 'OtherAmt'.$index ?>" id="<?php echo 'OtherAmt'.$index ?>" value="0" />
+<input type="hidden" name="<?php echo 'ServiceTotalOrderValue'.$index ?>" id="<?php echo 'ServiceTotalOrderValue'.$index ?>" value="0" />
+
 <?php } ?>
 
 <input type="hidden" name="<?php echo 'basicval'.$index ?>" id="<?php echo 'basicval'.$index ?>" value="<?php echo $record->Rate * $record->Quantity ; ?>" />
 
 
-<input type="hidden" name="<?php echo 'AfterServiceTax'.$index ?>" id="<?php echo 'AfterServiceTax'.$index ?>" value="<?php echo $record->ServiceTax ; ?>" />
-<input type="hidden" name="<?php echo 'AfterEduCess'.$index ?>" id="<?php echo 'AfterEduCess'.$index ?>" value="<?php echo $record->EducessTax ; ?>" />
-
-<input type="hidden" name="<?php echo 'AfterSecHighTax'.$index ?>" id="<?php echo 'AfterSecHighTax'.$index ?>" value="<?php echo $record->SecHigherEducessTax ; ?>" />
-
-<input type="hidden" name="<?php echo 'AfterKrishiTax'.$index ?>" id="<?php echo 'AfterKrishiTax'.$index ?>" value="<?php echo $record->KrishiKalyantax ; ?>" />
-<input type="hidden" name="<?php echo 'AfterSwachhTax'.$index ?>" id="<?php echo 'AfterSwachhTax'.$index ?>" value="<?php echo $record->SwachhBharattax ; ?>" />
-<input type="hidden" name="<?php echo 'ServiceTotalOrderValue'.$index ?>" id="<?php echo 'ServiceTotalOrderValue'.$index ?>" value="<?php echo $record->ServiceTaxamount ; ?>" />
-
 
 
 
@@ -660,13 +684,13 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                          <?php  
                         }?> 
                     </tr> <?php
-
-                             $TotalServiceTax =$TotalServiceTax+$record->ServiceTax;
-                            $TotalEducessTax = $TotalEducessTax+$record->EducessTax;
-                            $TotalSecHigherEducessTax = $TotalSecHigherEducessTax+$record->SecHigherEducessTax;
-                            $TotalKrishiKalyantax = $TotalKrishiKalyantax+$record->KrishiKalyantax;
-                            $TotalSwachhBharattax = $TotalSwachhBharattax+$record->SwachhBharattax;
+                    if($CapitalRange=='1'){
+                            $TotalCgst = $TotalCgst + $record->After_CGST;
+                            $TotalSgst = $TotalSgst + $record->After_SGST;
+                            $TotalIgst = $TotalIgst + $record->After_IGST;
+                            $OtherAmt =  $OtherAmt +  $record->otherallowance;
                             $TotalSummary = $TotalSummary+$record->ServiceTaxamount;
+                            }
                             $TotalBasicAmount = $TotalBasicAmount+$record->BasicValue;
                             $ServiceDescription = $ServiceDescription;
                                 if($CapitalRange=='0'){
@@ -691,7 +715,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                
                          
                                // $totorder=$totorder+$record->TotalOrderValue;
-                                $totalCapitalOrder = $totalCapitalOrder+$record->BasicValue;
+                                $totalCapitalOrder = $totalCapitalOrder+$record->Rate * $record->Quantity;
 
                                 
 
@@ -810,11 +834,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                 ?>
                 </div>
                 </div>
-				<div class="col-md-6">
-				<label>Service Description </label>	<?php
-				$data = array('name' => 'txtservicedescription','value' => set_value('txtservicedescription'),'id'=>'txtservicedescription',  'class' => 'form-control');
-				echo form_input($data); ?>
-						</div>
+				
                 <div class="col-md-2">
                 <label>UOM</label>
                 <div class="form-group">
@@ -824,16 +844,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                 ?>
                 </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' ,'readonly' => 'true');
-										echo form_input($data);
-										?> 
-                                             <input type="hidden" name="FrequencyNo" id="FrequencyNo" value="FrequencyNo" />
-									</div>
-					   </div>
+				
                                                     <div class="col-md-3">
                                                         <label>Quantity</label>
                                                         <div class="form-group">
@@ -884,7 +895,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 							 <div class="form-group">
 							 
 												<?php
-										 $data = array('name' => 'AfterCgst','value' => set_value('AfterCgst'),'id'=>'AfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
+										 $data = array('name' => 'AfterCgst','value' => set_value('AfterCgst',0),'id'=>'AfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -912,7 +923,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 							 <div class="form-group">
 							 
 												<?php
-										 $data = array('name' => 'AfterSgst','value' => set_value('AfterSgst'),'id'=>'AfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
+										 $data = array('name' => 'AfterSgst','value' => set_value('AfterSgst',0),'id'=>'AfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -941,7 +952,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 							 <div class="form-group">
 							 
 												<?php
-										 $data = array('name' => 'AfterIgst','value' => set_value('AfterIgst'),'id'=>'AfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
+										 $data = array('name' => 'AfterIgst','value' => set_value('AfterIgst',0),'id'=>'AfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -956,7 +967,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 		<div class="col-md-3">
 							 <div class="form-group">
 													<?php
-											 $data = array('name' => 'OtherAllowances','value' => set_value('OtherAllowances'),'id'=>'OtherAllowances',  'class' => 'form-control num' ,'placeholder' => 'Other Allowances');
+											 $data = array('name' => 'OtherAllowances','value' => set_value('OtherAllowances',0),'id'=>'OtherAllowances',  'class' => 'form-control num' ,'placeholder' => 'Other Allowances');
 											echo form_input($data);
 											?>   
 										</div>
@@ -1411,11 +1422,6 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
         ?>
         </div>
       </div>
-														 <div class="col-md-6">
-															<label>Service Description </label>	<?php
-																	 $data = array('name' => 'Edittxtservicedescription','value' => set_value('Edittxtservicedescription'),'id'=>'Edittxtservicedescription',  'class' => 'form-control');
-																	echo form_input($data); ?>
-														</div>
                                                     <div class="col-md-2">
                                                         <label>UOM</label>
                                                         <div class="form-group">
@@ -1425,16 +1431,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                             ?>
                                                         </div>
                                                     </div>
-													 <div class="col-md-3">
-						  <label>Frequency</label>
-							   <div>
-								<?php
-								$data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency',  'class' => 'form-control','readonly' => 'true' );
-									echo form_input($data);
-							   ?> 
-							<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />  					 
-							  </div>
-					   </div>
+													 
                                                     <div class="col-md-3">
                                                         <label>Quantity</label>
                                                         <div class="form-group">
@@ -1968,15 +1965,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 		?>
 		</div>
 		</div>
-		<div class="col-md-6">
-		<label>Avail Bud Amount<?php echo "($INR)"?></label>
-		<div class="form-group">
-		<?php
-		$data = array('name' => 'ViewCapitalbudAmt','value' => set_value('ViewCapitalbudAmt'),'id'=>'ViewCapitalbudAmt',  'class' => 'form-control' ,'readonly' => 'true');
-		echo form_input($data);
-		?>
-		</div>
-		</div> 
+		
 		</div>
 		<div class="col-md-2" id="ExchangeRateModalViewDiv" style="display:none;">
 		<label> Exchange Rate</label> 
@@ -1995,9 +1984,11 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
         <label>Item Code</label>                                                     
         <div>                                                        
         <?php
-        $options = array("0"=>'Item Code');
-        echo form_dropdown('MaterialCode', $options,set_value('ViewMaterialCode'),'id="ViewMaterialCode"' ,'class="form-control select2"');
-        ?>
+       
+       
+   $data = array('name' => 'ViewMaterialCode','value' => set_value('ViewMaterialCode'),'id'=>'ViewMaterialCode',  'class' => 'form-control' ,'readonly' => 'true');
+						echo form_input($data);
+             ?>
          </div> 
                                                     </div>
                                                     <div class="col-md-2">
@@ -2009,11 +2000,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                             ?>
                                                         </div>
                                                     </div>
-														 <div class="col-md-6">
-															<label>Service Description </label>	<?php
-																	 $data = array('name' => 'Viewtxtservicedescription','value' => set_value('Viewtxtservicedescription'),'id'=>'Viewtxtservicedescription',  'class' => 'form-control');
-																	echo form_input($data); ?>
-														</div>
+														 
                                                     <div class="col-md-2">
                                                         <label>UOM</label>
                                                         <div class="form-group">
@@ -2023,16 +2010,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                             ?>
                                                         </div>
                                                     </div>
-													 <div class="col-md-3">
-						  <label>Frequency</label>
-							   <div>
-								<?php
-								$data = array('name' => 'ViewFrequency','value' => set_value('ViewFrequency'),'id'=>'ViewFrequency',  'class' => 'form-control','readonly' => 'true' );
-									echo form_input($data);
-							   ?> 
-							<input type="hidden" name="ViewFrequencyNo" id="ViewFrequencyNo" value="ViewFrequencyNo" />  					 
-							  </div>
-					   </div>
+													 
                                                     <div class="col-md-3">
                                                         <label>Quantity</label>
                                                         <div class="form-group">
@@ -2515,7 +2493,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                             <div class="col-md-3">
 									 <label>CGST In INR</label> 
 									 <?php
-											 $data = array('name' => 'txtTotCgst','value' => set_value('txtTotCgst' ),'id'=>'txtTotCgst',  'class' => 'form-control num'  ,'readonly' => 'true');
+											 $data = array('name' => 'txtTotCgst','value' => set_value('txtTotCgst', number_format($TotalCgst, 2, '.', '')),'id'=>'txtTotCgst',  'class' => 'form-control num'  ,'readonly' => 'true');
 											echo form_input($data);				
 											?>   
 								</div>
@@ -2524,14 +2502,14 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 								<div class="col-md-3">
 									 <label>SGST In INR</label> 
 									 <?php
-											 $data = array('name' => 'txtTotSgst','value' => set_value('txtTotSgst' ),'id'=>'txtTotSgst',  'class' => 'form-control num'  ,'readonly' => 'true');
+											 $data = array('name' => 'txtTotSgst','value' => set_value('txtTotSgst',number_format($TotalSgst, 2, '.', '') ),'id'=>'txtTotSgst',  'class' => 'form-control num'  ,'readonly' => 'true');
 											echo form_input($data);				
 											?>   
 								</div>
 								<div class="col-md-3">
 									<label>IGST In INR</label> 
 									<?php
-											 $data = array('name' => 'txtTotIgst','value' => set_value('txtTotIgst' ),'id'=>'txtTotIgst',  'class' => 'form-control num'   ,'readonly' => 'true');
+											 $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>
@@ -2539,7 +2517,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 					<div class="col-md-3">
 							<label >Other Allowances  In INR </label>							
 								<?php
-								 $data = array('name' => 'ToatalOtherAllowances','value' => set_value('ToatalOtherAllowances'),'id'=>'ToatalOtherAllowances',  'class' => 'form-control num'  ,'readonly' => 'true');
+								 $data = array('name' => 'TotalOtherAllowances','value' => set_value('TotalOtherAllowances',number_format($OtherAmt, 2, '.', '')),'id'=>'TotalOtherAllowances',  'class' => 'form-control num'  ,'readonly' => 'true');
 								echo form_input($data);
 								?>   
 									
@@ -2554,7 +2532,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                   <label >Total Landing Charge:<?php echo "($INR)"?></label> 
 
                                 <?php
-                             $data = array('name' => 'txttotallanding','value' => set_value('txttotallanding',$TotalLanding),'id'=>'txttotallanding',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                             $data = array('name' => 'txttotallanding','value' => set_value('txttotallanding',number_format($TotalLanding, 2, '.', '')),'id'=>'txttotallanding',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
                             echo form_input($data);
                             ?>                      
                 </div>
@@ -2563,7 +2541,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                   <label >Total High seas sales Charge:<?php echo "($INR)"?></label> 
 
                                 <?php
-                             $data = array('name' => 'txttotalhighseas','value' => set_value('txttotalhighseas',$tothighseas),'id'=>'txttotalhighseas',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                             $data = array('name' => 'txttotalhighseas','value' => set_value('txttotalhighseas',number_format($tothighseas, 2, '.', '')),'id'=>'txttotalhighseas',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
                             echo form_input($data);
                             ?>                      
                 </div>
@@ -2572,7 +2550,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                   <label >Total Custom Duty Charge:<?php echo "($INR)"?></label> 
 
                                 <?php
-                             $data = array('name' => 'txttotalcustom','value' => set_value('txttotalcustom',$totcustom),'id'=>'txttotalcustom',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                             $data = array('name' => 'txttotalcustom','value' => set_value('txttotalcustom',number_format($totcustom, 2, '.', '')),'id'=>'txttotalcustom',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
                             echo form_input($data);
                             ?>                      
                 </div>
@@ -2581,7 +2559,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                   <label >Total Excise duty  Charge:<?php echo "($INR)"?></label> 
 
                                 <?php
-                             $data = array('name' => 'txttotalexcise','value' => set_value('txttotalexcise',$totexciseduty),'id'=>'txttotalexcise',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                             $data = array('name' => 'txttotalexcise','value' => set_value('txttotalexcise',number_format($totexciseduty, 2, '.', '')),'id'=>'txttotalexcise',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
                             echo form_input($data);
                             ?>                      
                 </div>
@@ -2590,7 +2568,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                   <label >Total Excise duty ED_cess Charge:<?php echo "($INR)"?></label> 
 
                                 <?php
-                             $data = array('name' => 'txttotalexciseED','value' => set_value('txttotalexciseED',$totexcisedutyED),'id'=>'txttotalexciseED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                             $data = array('name' => 'txttotalexciseED','value' => set_value('txttotalexciseED',number_format($totexcisedutyED, 2, '.', '')),'id'=>'txttotalexciseED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
                             echo form_input($data);
                             ?>                      
                 </div>
@@ -2600,7 +2578,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                   <label >Total Excise duty S & H cess  Charge:<?php echo "($INR)"?></label> 
 
                                 <?php
-                             $data = array('name' => 'txttotalexciseSH','value' => set_value('txttotalexciseSH',$totexciseSH),'id'=>'txttotalexciseSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                             $data = array('name' => 'txttotalexciseSH','value' => set_value('txttotalexciseSH',number_format($totexciseSH, 2, '.', '')),'id'=>'txttotalexciseSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
                             echo form_input($data);
                             ?>                      
                 </div>
@@ -2609,7 +2587,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                   <label >Total Custom ED_cess Charge:<?php echo "($INR)"?></label> 
 
                                 <?php
-                             $data = array('name' => 'txttotalcustomED','value' => set_value('txttotalcustomED',$totcustomED),'id'=>'txttotalcustomED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                             $data = array('name' => 'txttotalcustomED','value' => set_value('txttotalcustomED',number_format($totcustomED, 2, '.', '')),'id'=>'txttotalcustomED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
                             echo form_input($data);
                             ?>                      
                 </div>
@@ -2618,7 +2596,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                   <label >Total Custom S & H cess Charge:<?php echo "($INR)"?></label> 
 
                                 <?php
-                             $data = array('name' => 'txttotalcustomSH','value' => set_value('txttotalcustomSH',$totcustomSH),'id'=>'txttotalcustomSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                             $data = array('name' => 'txttotalcustomSH','value' => set_value('txttotalcustomSH',number_format($totcustomSH, 2, '.', '')),'id'=>'txttotalcustomSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
                             echo form_input($data);
                             ?>                      
                 </div>
@@ -2627,7 +2605,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                   <label >Total Additional Excise duty Charge:<?php echo "($INR)"?></label> 
 
                                 <?php
-                             $data = array('name' => 'txttotalAdditionalExciseduty','value' => set_value('txttotalAdditionalExciseduty',$totaddtnlexcise),'id'=>'txttotalAdditionalExciseduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                             $data = array('name' => 'txttotalAdditionalExciseduty','value' => set_value('txttotalAdditionalExciseduty',number_format($totaddtnlexcise, 2, '.', '')),'id'=>'txttotalAdditionalExciseduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
                             echo form_input($data);
                             ?>                      
                 </div>
@@ -2637,7 +2615,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                   <label >Total Gross duty payable Charge:<?php echo "($INR)"?></label> 
 
                                 <?php
-                             $data = array('name' => 'txttotalgrossduty','value' => set_value('txttotalgrossduty',$totgrossduty),'id'=>'txttotalgrossduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                             $data = array('name' => 'txttotalgrossduty','value' => set_value('txttotalgrossduty',number_format($totgrossduty, 2, '.', '')),'id'=>'txttotalgrossduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
                             echo form_input($data);
                             ?>                      
                 </div>
@@ -2646,7 +2624,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                   <label >Total Available Modvat set-off on import Charge:<?php echo "($INR)"?></label> 
 
                                 <?php
-                             $data = array('name' => 'txttotalavlmodvat','value' => set_value('txttotalavlmodvat',$totavlmodvat),'id'=>'txttotalavlmodvat',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                             $data = array('name' => 'txttotalavlmodvat','value' => set_value('txttotalavlmodvat',number_format($totavlmodvat, 2, '.', '')),'id'=>'txttotalavlmodvat',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
                             echo form_input($data);
                             ?>                      
                 </div>
@@ -2656,7 +2634,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                   <label >Total Gross expenses due to custom duty Charge:<?php echo "($INR)"?></label> 
 
                                 <?php
-                             $data = array('name' => 'txttotalgrossexpense','value' => set_value('txttotalgrossexpense',$totgrossexpense),'id'=>'txttotalgrossexpense',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                             $data = array('name' => 'txttotalgrossexpense','value' => set_value('txttotalgrossexpense',number_format($totgrossexpense, 2, '.', '')),'id'=>'txttotalgrossexpense',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
                             echo form_input($data);
                             ?>                      
                 </div>
@@ -2666,12 +2644,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
           
                   
 
-                          <div class="col-md-12">
-                                <label>Special Instructions :</label>  <?php
-                             $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
-                            echo form_textarea($data);
-                            ?>   
-                          </div>   
+                            
 
                                             <!-- <div align="right" style="padding-right:10px">
 
@@ -2690,7 +2663,12 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 
 
                     </div>
-
+ <div class="col-md-12">
+                                <label>Special Instructions :</label>  <?php
+                             $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
+                            echo form_textarea($data);
+                            ?>   
+                          </div>
 		 <div class="col-md-12" style="padding:1% 0%;">
 							<div class="col-md-4">
 								<span>Request On</span>								  
@@ -2743,7 +2721,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
     <tr  id="<%=index%>">
     <td align="left"><%=index%></td>
      <td align="left"><%=ReqNo%></td>
-
+    <td align="left"><%=MaterialCode%></td>
       <td align="left"><%=MaterialName%></td>
       <td align="left"><%=Quantity%></td> 
       <td align="left"><%=UOM%></td>
@@ -2751,7 +2729,9 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
         <td align="left"><%=BasicAmount%></td>
             <td align="left"><%=Taxvalue%></td>
             <td align="left"><%=TotalValue%></td>
-
+<td align="left"><%=ActualQuantity%></td>
+<td align="left"><%=ReceivedQuantity%></td>
+<td align="left"><%=PendingQuantity%></td>
        <td>
                               <a    data-target='#EDITCAPITAL'	data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITREVENUE"><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>
 
@@ -2836,45 +2816,12 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
                             {
                                     $("#SupAddress").val(obj.Address);
                             supPaymentTerms=obj.PaymentTerms;
-                                    supPaymentAT=obj.PayableAT;
-                                    subPaymentDate=obj.PaymentDays;
-
+                                  
+                                    $("#PaymentMethod").val(obj.PaymentID); 
                             }
 
                     });
-                           $('#PaymentMethod').empty();
-         var paymentList = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
-
-           $.each(paymentList, function(idx1, obj1) {
-                   
-
-                                    if(obj1.ConfigValue == supPaymentTerms )
-                                    {
-                          $("#PaymentMethod").append( $('<option></option>').val(obj1.ConfigValue).html(obj1.ConfigValue));
-                                    $("#PayableAT").val(supPaymentAT); 
-                              
-                               
-                                           
-
-                                    }
-
-
-                    });                   
-                    
-                    $.each(paymentList, function(idx, obj) {
-                   
-                                
-                                    if(obj.PaymentTerms != supPaymentTerms )
-                                    {
-                          $("#PaymentMethod").append( $('<option></option>').val(obj.PaymentTerms).html(obj.PaymentTerms));
-                              $("#PayableAT").val(supPaymentAT); 
-                                
-                                              
-
-                                    }
-
-
-                    });
+    
 
                     }
                     else
@@ -3160,20 +3107,9 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
      //Service Tax calculation
 
 
-            $('#AfterServiceTax').val(calculateServiceTax($('#AfterBasicPriceTax').val())); 	 
-
-             //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($('#AfterBasicPriceTax').val())); 
-             //Swachh Bharat tax
-
-            $('#AfterSwachhTax').val(calculateSwachhBharattax($('#AfterBasicPriceTax').val()));
+           $('#AfterCgst').val(calculateCgstTax($('#AfterBasicPriceTax').val(),$('#Cgst').val()));
+        $('#AfterSgst').val(calculateSgstTax($('#AfterBasicPriceTax').val(),$('#Sgst').val()));
+         $('#AfterIgst').val(calculateIgstTax($('#AfterBasicPriceTax').val(),$('#Igst').val()));
 
              // This is for import basic price
 
@@ -3599,7 +3535,7 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
     /*
     This is used to calculate Total order value
     */
-    function calculateTotalOrdervalue()
+     function calculateTotalOrdervalue()
      {
             var basicValue = parseFloat($('#CPTotalAmount').val());
             var ServiceTaxAmount = parseFloat($('#AfterServiceTax').val());
@@ -3654,12 +3590,13 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
                      var convertRate = $("#CPRate").val();
                       var itemRate = parseFloat(convertRate).toFixed(2);
                var basicval = parseFloat($("#CPTotalAmount").val()).toFixed(2);
-                      var AfterServiceTax = $("#AfterServiceTax").val();
-                      var AfterEduCess = $("#AfterEduCess").val();
-                      var AfterSecHighTax = $("#AfterSecHighTax").val();
-
-                      var AfterKrishiTax = $("#AfterKrishiTax").val();
-                      var AfterSwachhTax = $("#AfterSwachhTax").val();
+                      var OtherAmt = parseFloat($('#OtherAllowances').val()).toFixed(2);
+		  var Cgst = $("#Cgst").val();
+		  var AfterCgst = $("#AfterCgst").val();
+                  var Sgst = $("#Sgst").val();
+                  var AfterSgst = $("#AfterSgst").val();
+                  var Igst = $("#Igst").val();
+                  var AfterIgst = $("#AfterIgst").val();
             
 
                     var landingCharge = $('#AfterLandingCharge').val();
@@ -3692,7 +3629,7 @@ var purchaseRate =  $('#purchaserate').val();
                  var beforeAdditionalExciseDuty =$('#AdditionalExciseduty').val(); 
                 var PurQuantity = $('#PurQuantity').val(); 
                     
-                      var Total = (parseFloat(basicval)+parseFloat(AfterServiceTax)+parseFloat(AfterEduCess)+parseFloat(AfterSecHighTax)+parseFloat(AfterKrishiTax)+parseFloat(AfterSwachhTax)).toFixed(2);
+                      var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)).toFixed(2);
 
                      
                  var TotalOrderValuePerkg = $("#txtTotalOrderValue").val();
@@ -3721,9 +3658,9 @@ var purchaseRate =  $('#purchaserate').val();
                   var template = jQuery("#CapitalList").html();
 
 
-              $('#capitalAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:basicval}));
+              $('#capitalAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:basicval,ActualQuantity:quantity,ReceivedQuantity:0,PendingQuantity:quantity}));
 
-                            //clearCapitalModalFields();
+                           
                      var theForm = $(".CapitalPO");
 
                      addHidden(theForm,"Reqnumber"+temp,Reqnumber);
@@ -3738,11 +3675,7 @@ var purchaseRate =  $('#purchaserate').val();
                   addHidden(theForm,"rateInUs"+temp,convertRate);
                       addHidden(theForm,"itemRate"+temp,itemRate);
                       addHidden(theForm,"basicval"+temp,basicval);
-                     addHidden(theForm,"AfterServiceTax"+temp,AfterServiceTax);
-                    addHidden(theForm,"AfterEduCess"+temp,AfterEduCess);
-                addHidden(theForm,"AfterSecHighTax"+temp,AfterSecHighTax);
-                addHidden(theForm,"AfterKrishiTax"+temp,AfterKrishiTax);
-                addHidden(theForm,"AfterSwachhTax"+temp,AfterSwachhTax);
+                     
                 addHidden(theForm,"landingCharge"+temp,landingCharge);
                 addHidden(theForm,"HighSeasSalesCharge"+temp,HighSeasSalesCharge);
                 addHidden(theForm,"CustomDuty"+temp,CustomDuty);
@@ -3773,7 +3706,13 @@ var purchaseRate =  $('#purchaserate').val();
                    addHidden(theForm,"PerKgExpense"+temp,TotalOrderValuePerkg);
                    addHidden(theForm,"LineItemNo"+temp,"");
                     addHidden(theForm,"basicvalInINR"+temp,basicvalInINR);
-
+                     addHidden(theForm,"Cgst"+temp,Cgst);
+		  addHidden(theForm,"AfterCgst"+temp,AfterCgst);
+	      addHidden(theForm,"Sgst"+temp,Sgst);
+	      addHidden(theForm,"AfterSgst"+temp,AfterSgst);
+		  addHidden(theForm,"Igst"+temp,Igst);
+                  addHidden(theForm,"AfterIgst"+temp,AfterIgst);
+                   addHidden(theForm,"OtherAmt"+temp,OtherAmt);
                      $('#txtRowCount').val(temp); 
                   
 
@@ -3873,11 +3812,9 @@ var purchaseRate =  $('#purchaserate').val();
      }
     /* calculate tax value*/
     function calculateTaxValue(){
-             var ServiceTaxAmount = $('#AfterServiceTax').val() == '' ? '0.00' : $('#AfterServiceTax').val();
-              var EduCessTaxAmount = $('#AfterEduCess').val() == '' ? '0.00' : $('#AfterEduCess').val();
-               var SecHighTaxAmount = $('#AfterSecHighTax').val() == '' ? '0.00' : $('#AfterSecHighTax').val();
-                var KrishiTaxAmount = $('#AfterKrishiTax').val() == '' ? '0.00' : $('#AfterKrishiTax').val();
-                var SwachhTaxAmount = $('#AfterSwachhTax').val() == '' ? '0.00' : $('#AfterSwachhTax').val();
+            var Cgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val();
+              var Sgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val();
+               var Igst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val();
             var landingCharge = $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val();
           var HighSeasSalesCharge = $('#AfterHighseas').val() == '' ? '0.00' : $('#AfterHighseas').val();
             var CustomDuty = $('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val();
@@ -3893,7 +3830,7 @@ var purchaseRate =  $('#purchaserate').val();
     var purchaseRate = $('#purchaserate').val() == '' ? '0.00' : $('#purchaserate').val();
     var CustomDutyExpenses = $('#CustomDutyExpenses').val() == '' ? '0.00' : $('#CustomDutyExpenses').val();
     var RMCIncludingCustomers = $('#RMCIncludingCustomers').val() == '' ? '0.00' : $('#RMCIncludingCustomers').val();  
-             var totTaxvalue = (parseFloat(ServiceTaxAmount)+ parseFloat(EduCessTaxAmount)+ parseFloat(SecHighTaxAmount) + parseFloat(KrishiTaxAmount)+ parseFloat(SwachhTaxAmount));
+             var totTaxvalue = (parseFloat(Sgst)+ parseFloat(Cgst)+ parseFloat(Igst));
 //+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);
@@ -3903,12 +3840,10 @@ var purchaseRate =  $('#purchaserate').val();
     function populateValueMainFormForCapital()
     {
                      var BasicVal = $('#CPTotalAmount').val() == '' ? '0.00' : $('#CPTotalAmount').val();
-             var ServiceTaxAmount = $('#AfterServiceTax').val() == '' ? '0.00' : $('#AfterServiceTax').val();
-         
-              var EduCessTaxAmount = $('#AfterEduCess').val() == '' ? '0.00' : $('#AfterEduCess').val();
-               var SecHighTaxAmount = $('#AfterSecHighTax').val() == '' ? '0.00' : $('#AfterSecHighTax').val();
-                var KrishiTaxAmount = $('#AfterKrishiTax').val() == '' ? '0.00' : $('#AfterKrishiTax').val();
-                var SwachhTaxAmount = $('#AfterSwachhTax').val() == '' ? '0.00' : $('#AfterSwachhTax').val();
+             var AfterCgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val();
+		var AfterSgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val();
+		var AfterIgst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val();
+	        var OtherAmt = $('#OtherAllowances').val() == '' ? '0.00' : $('#OtherAllowances').val();
             var landingCharge = $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val();
           var HighSeasSalesCharge = $('#AfterHighseas').val() == '' ? '0.00' : $('#AfterHighseas').val();
             var CustomDuty = $('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val();
@@ -3925,18 +3860,15 @@ var purchaseRate =  $('#purchaserate').val();
       var CustomDutyExpenses = $('#CustomDutyExpenses').val() == '' ? '0.00' : $('#CustomDutyExpenses').val();
       var RMCIncludingCustomers = $('#RMCIncludingCustomers').val() == '' ? '0.00' : $('#RMCIncludingCustomers').val();  
             // var totvalue = $('#txtTotalOrderValue').val() == '' ? '0.00' : $('#txtTotalOrderValue').val();
-                      var totvalue = (parseFloat(ServiceTaxAmount)+parseFloat(EduCessTaxAmount)+parseFloat(SecHighTaxAmount)+parseFloat(KrishiTaxAmount)+parseFloat(SwachhTaxAmount)).toFixed(2);
+                      var totvalue = (parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)).toFixed(2);
 
 
                     var TotalOrderValueSummary = $('#txtToatlOrder').val() == '' ? '0.00' : $('#txtToatlOrder').val();
 
-                    var TotalServiceTax = $('#TotalAfterServiceTax').val() == '' ? '0.00' : $('#TotalAfterServiceTax').val();
-
-                    var TotalEducess = $('#TotalAfterEduCess').val() == '' ? '0.00' : $('#TotalAfterEduCess').val();
-                    var TotHigherEdu = $('#TotalAfterSecHighTax').val() == '' ? '0.00' : $('#TotalAfterSecHighTax').val();
-
-                    var TotalKrishiKalyan = $('#TotalAfterKrishiTax').val() == '' ? '0.00' : $('#TotalAfterKrishiTax').val();
-                    var TotSwachhBharat = $('#TotalAfterSwachhTax').val() == '' ? '0.00' : $('#TotalAfterSwachhTax').val();
+                     var TotalCgst = $('#txtTotCgst').val() == '' ? '0.00' : $('#txtTotCgst').val();
+		var TotSgst = $('#txtTotSgst').val() == '' ? '0.00' : $('#txtTotSgst').val();
+		var TotalIgst = $('#txtTotIgst').val() == '' ? '0.00' : $('#txtTotIgst').val();
+		 var TotalAllowance = $('#TotalOtherAllowances').val() == '' ? '0.00' : $('#TotalOtherAllowances').val();
                    
                     var TotLanding = $('#txttotallanding').val() == '' ? '0.00' : $('#txttotallanding').val();
                     var TotHighseas = $('#txttotalhighseas').val() == '' ? '0.00' : $('#txttotalhighseas').val();
@@ -3953,13 +3885,10 @@ var purchaseRate =  $('#purchaserate').val();
                      var TotGrossexpense = $('#txttotalgrossexpense').val() == '' ? '0.00' : $('#txttotalgrossexpense').val();
                      var TotalCapitalOrder = $('#CapitalToatlOrder').val() == '' ? '0.00' : $('#CapitalToatlOrder').val();
 
-                    $('#TotalAfterServiceTax').val((parseFloat(TotalServiceTax) + parseFloat(ServiceTaxAmount)).toFixed(2) );
-                    $('#TotalAfterEduCess').val((parseFloat(TotalEducess) + parseFloat(EduCessTaxAmount)).toFixed(2) );
-                    $('#TotalAfterSecHighTax').val((parseFloat(TotHigherEdu) + parseFloat(SecHighTaxAmount)).toFixed(2) );
-
-                    $('#TotalAfterKrishiTax').val((parseFloat(TotalKrishiKalyan) + parseFloat(KrishiTaxAmount)).toFixed(2) );
-                    $('#TotalAfterSwachhTax').val((parseFloat(TotSwachhBharat) + parseFloat(SwachhTaxAmount)).toFixed(2) );
-
+                    $('#txtTotCgst').val((parseFloat(TotalCgst) + parseFloat(AfterCgst)).toFixed(2) );
+		$('#txtTotSgst').val((parseFloat(TotSgst) + parseFloat(AfterSgst)).toFixed(2) );
+		$('#txtTotIgst').val((parseFloat(TotalIgst) + parseFloat(AfterIgst)).toFixed(2) );
+                $('#TotalOtherAllowances').val((parseFloat(TotalAllowance) + parseFloat(OtherAmt)).toFixed(2) );
                     $('#txttotallanding').val((parseFloat(TotLanding) + parseFloat(landingCharge)).toFixed(2) );
                 $('#txttotalhighseas').val((parseFloat(TotHighseas) + parseFloat(HighSeasSalesCharge)).toFixed(2) );
                 $('#txttotalcustom').val((parseFloat(TotCustom) + parseFloat(CustomDuty)).toFixed(2) );
@@ -3997,12 +3926,13 @@ var purchaseRate =  $('#purchaserate').val();
                       $("#CPRate").val('');
 
              $("#CPTotalAmount").val('');
-                       $("#AfterServiceTax").val('');
-                       $("#AfterEduCess").val('');
-                       $("#AfterSecHighTax").val('');
-
-                       $("#AfterKrishiTax").val('');
-                       $("#AfterSwachhTax").val('');
+                       $("#AfterCgst").val(0);
+                      $("#AfterSgst").val(0);
+                      $("#AfterIgst").val(0);
+$("#Cgst").val(0);
+$("#Sgst").val(0);
+$("#Igst").val(0);
+$("#OtherAllowances").val(0);
 $('#AfterBasicPriceTax').val('');
                $('#LandingCharge').val('');
                     $('#AfterLandingCharge').val('');
@@ -4176,13 +4106,10 @@ function DeleteRow(rowid)
 
                  var TotalOrderValueSummary = 0;
 
-                    var TotalServiceTax = 0;
-                    var TotalEducess = 0;
-                    var TotHigherEdu = 0;
-
-                    var TotalKrishiKalyan = 0;
-                    var TotSwachhBharat = 0;
-
+                     var TotCgst = 0;
+		var TotSgst = 0;
+		var TotIgst = 0;
+	        var TotOther = 0;
                     var TotLanding = 0;
                     var TotHighseas = 0;
                     var TotCustom = 0;
@@ -4200,12 +4127,11 @@ function DeleteRow(rowid)
                 
                 for (var i = 1; i < rows; i++) {
                     if(deletedRow==i){
-                       $('#AfterServiceTax'+i).val('');
-                    $('#AfterEduCess'+i).val('');
-                    $('#AfterSecHighTax'+i).val('');
+                     $('#AfterCgst'+i).val('');
+                    $('#AfterSgst'+i).val('');
+                    $('#AfterIgst'+i).val('');
 
-                    $('#AfterKrishiTax'+i).val('');
-                    $('#AfterSwachhTax'+i).val('');
+                    $('#OtherAmt'+i).val('');
 
                     $('#landingCharge'+i).val('');
                 $('#HighSeasSalesCharge'+i).val('');
@@ -4227,13 +4153,10 @@ function DeleteRow(rowid)
                
                     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 TotCgstI = $('#AfterCgst'+i).val() == '' ? '0.00' : $('#AfterCgst'+i).val();
+                    var TotSgstI = $('#AfterSgst'+i).val() == '' ? '0.00' : $('#AfterSgst'+i).val();
+                    var TotIgstI = $('#AfterIgst'+i).val() == '' ? '0.00' : $('#AfterIgst'+i).val();
+                    var TotOtherI =  $('#OtherAmt'+i).val() == '' ? '0.00' : $('#OtherAmt'+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();
@@ -4256,12 +4179,10 @@ function DeleteRow(rowid)
                    
                     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 TotCgstI = $('#AfterCgst'+i).val() == '' ? '0.00' : $('#AfterCgst'+i).val();
+                    var TotSgstI = $('#AfterSgst'+i).val() == '' ? '0.00' : $('#AfterSgst'+i).val();
+                    var TotIgstI = $('#AfterIgst'+i).val() == '' ? '0.00' : $('#AfterIgst'+i).val();
+                    var TotOtherI =  $('#OtherAmt'+i).val() == '' ? '0.00' : $('#OtherAmt'+i).val();
 
                     var TotLandingI = $('#landingCharge'+i).val() == '' ? '0.00' : $('#landingCharge'+i).val();
                     var TotHighseasI = $('#HighSeasSalesCharge'+i).val() == '' ? '0.00' : $('#HighSeasSalesCharge'+i).val();
@@ -4282,13 +4203,10 @@ function DeleteRow(rowid)
                         
                     }
 
-                  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);
-
+                   TotCgst = parseFloat(TotCgst) + parseFloat(TotCgstI);
+                     TotSgst = parseFloat(TotSgst) + parseFloat(TotSgstI);
+                    TotIgst = parseFloat(TotIgst) + parseFloat(TotIgstI);
+                    TotOther = parseFloat(TotOther) + parseFloat(TotOtherI);
                     TotLanding = parseFloat(TotLanding) + parseFloat(TotLandingI);
                      TotHighseas = parseFloat(TotHighseas) + parseFloat(TotHighseasI);
                     TotCustom = parseFloat(TotCustom) + parseFloat(TotCustomI);
@@ -4307,12 +4225,10 @@ function DeleteRow(rowid)
 
                     }
 
-                   $('#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) );
+                   $('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) );
+		$('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) );
+		$('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) );
+		$('#TotalOtherAllowances').val(parseFloat(TotOther).toFixed(2) );
 
                     $('#txttotallanding').val((parseFloat(TotLanding) ).toFixed(2) );
                 $('#txttotalhighseas').val((parseFloat(TotHighseas) ).toFixed(2) );
@@ -4352,7 +4268,7 @@ function DeleteRow(rowid)
 		$('#EditReqnumber').val($('#Reqnumber'+userid).val());
 		$('#EditCapitalDepartmentName').val($('#departmentName'+userid).val());
 		$("#EditCostCenter").val($('#CPCostCode'+userid).val());
-		$('#EditCapitalbudAmt').val($('#AvilBudget'+userid).val());
+		$('#EditCapitalbudAmt').val(parseFloat($('#AvilBudget'+userid).val()).toFixed(2));
                 $('#EditExchangeRtModal').val($('#echangeRate'+userid).val());
 		
 		$('#EditCapitalItemName').val($('#materialName'+userid).val());
@@ -4362,15 +4278,16 @@ function DeleteRow(rowid)
 		$('#EditCPQuantity').val($('#quantity'+userid).val());
                $('#EditCPRate').val($('#rateInUs'+userid).val());
 
-		$('#EditCPTotalAmount').val($('#basicval'+userid).val());
+		$('#EditCPTotalAmount').val(parseFloat($('#basicval'+userid).val()).toFixed(2));
 		
 		RequistQuantity = $('#quantity'+userid).val();
-		$('#EditAfterServiceTax').val($('#AfterServiceTax'+userid).val());
-		$('#EditAfterEduCess').val($('#AfterEduCess'+userid).val());
-		$('#EditAfterSecHighTax').val($('#AfterSecHighTax'+userid).val());
-		$('#EditAfterKrishiTax').val($('#AfterKrishiTax'+userid).val());
-		$('#EditAfterSwachhTax').val($('#AfterSwachhTax'+userid).val());
-		
+		$('#EditCgst').val($('#Cgst'+userid).val());
+		$('#EditSgst').val($('#Sgst'+userid).val());
+		$('#EditIgst').val($('#Igst'+userid).val());
+		$('#EditAfterCgst').val($('#AfterCgst'+userid).val());
+		$('#EditAfterSgst').val($('#AfterSgst'+userid).val());
+		$('#EditAfterIgst').val($('#AfterIgst'+userid).val());
+		$('#EditOtherAllowances').val($('#OtherAmt'+userid).val());
 
                 $('#EditAfterBasicPriceTax').val($('#basicvalInINR'+userid).val());
 		$('#EditAfterLandingCharge').val($('#landingCharge'+userid).val());
@@ -4464,11 +4381,13 @@ $('#EditRateIn').html('Rate(in' + " "+DisplayCurrencySymbol + '/'+EditUOM+')');
 		$('#ViewCPTotalAmount').val($('#basicval'+userid).val());
 		
 		RequistQuantity = $('#quantity'+userid).val();
-		$('#ViewAfterServiceTax').val($('#AfterServiceTax'+userid).val());
-		$('#ViewAfterEduCess').val($('#AfterEduCess'+userid).val());
-		$('#ViewAfterSecHighTax').val($('#AfterSecHighTax'+userid).val());
-		$('#ViewAfterKrishiTax').val($('#AfterKrishiTax'+userid).val());
-		$('#ViewAfterSwachhTax').val($('#AfterSwachhTax'+userid).val());
+		$('#ViewCgst').val($('#Cgst'+userid).val());
+		$('#ViewSgst').val($('#Sgst'+userid).val());
+		$('#ViewIgst').val($('#Igst'+userid).val());
+		$('#ViewAfterCgst').val($('#AfterCgst'+userid).val());
+		$('#ViewAfterSgst').val($('#AfterSgst'+userid).val());
+		$('#ViewAfterIgst').val($('#AfterIgst'+userid).val());
+		$('#ViewOtherAllowances').val($('#OtherAmt'+userid).val());
 		
 
                 $('#ViewAfterBasicPriceTax').val($('#basicvalInINR'+userid).val());
@@ -4611,15 +4530,13 @@ else
 {
 	stat = '<?php echo PO_CREATED; ?>';
 }
-
+tinyMCE.triggerSave();
 var splinstr = $('#txtSpcialInstruction').val();
 var deladd = $('#DeliveryAddr').val();
 
 var ExchangeRateOn = $('#Exchangerateon').val();
 var PaymentMethod = $('#PaymentMethod').val();
-var PayableAT = $('#PayableAT').val();
-var Before = $('#Before').val();
-var After = $('#After').val();
+
 $('#SpcialInstruction').val(splinstr);
 $('#txtDeliveryAddress').val(deladd);
 $('#txtStatus').val(stat);
@@ -4645,7 +4562,7 @@ $('#txtStatus').val(stat);
              
 		  $.ajax({
 
-			data:$('.CapitalPO').serialize()+"&ExchangeRateOn="+ExchangeRateOn+"&PaymentMethod="+PaymentMethod+"&PayableAT="+PayableAT+"&PaymentDate="+PaymentDate,
+			data:$('.CapitalPO').serialize()+"&ExchangeRateOn="+ExchangeRateOn+"&PaymentMethod="+PaymentMethod,
 			type:"POST",
 			url:"<?php echo base_url() ?>purchaseorder/EditCapitalPurchaseOrder", 
 
@@ -4765,20 +4682,10 @@ function clearAfterAddLineItemAdd(){
      //Service Tax calculation
 
 
-            $('#EditAfterServiceTax').val(calculateServiceTax($('#EditAfterBasicPriceTax').val())); 	 
-
-             //Edu. cess @2% on service Tax
-              $('#EditAfterEduCess').val( calculateEduess($('#EditAfterServiceTax').val()));
-
-             //Sec. & Higher Edu. cess @1 % on service Tax 
-
-            $('#EditAfterSecHighTax').val(calculateHigherEdu($('#EditAfterServiceTax').val())); 
-             //Krishi Kalyan tax 
-
-            $('#EditAfterKrishiTax').val(calculateKrishiKalyantax($('#EditAfterBasicPriceTax').val())); 
-             //Swachh Bharat tax
-
-            $('#EditAfterSwachhTax').val(calculateSwachhBharattax($('#EditAfterBasicPriceTax').val()));
+          
+           $('#EditAfterCgst').val(calculateCgstTax($('#EditAfterBasicPriceTax').val(),$('#EditCgst').val()));
+        $('#EditAfterSgst').val(calculateSgstTax($('#EditAfterBasicPriceTax').val(),$('#EditSgst').val()));
+         $('#EditAfterIgst').val(calculateIgstTax($('#EditAfterBasicPriceTax').val(),$('#EditIgst').val()));
 
              // This is for import basic price
 
@@ -4927,13 +4834,14 @@ function clearAfterAddLineItemAdd(){
                      var convertRate = $("#EditCPRate").val();
                       var itemRate = convertRate;
                var basicval = $("#EditCPTotalAmount").val();
-                      var AfterServiceTax = $("#EditAfterServiceTax").val();
-                      var AfterEduCess = $("#EditAfterEduCess").val();
-                      var AfterSecHighTax = $("#EditAfterSecHighTax").val();
-
-                      var AfterKrishiTax = $("#EditAfterKrishiTax").val();
-                      var AfterSwachhTax = $("#EditAfterSwachhTax").val();
-                     var Total = (parseFloat(basicval)+parseFloat(AfterServiceTax)+parseFloat(AfterEduCess)+parseFloat(AfterSecHighTax)+parseFloat(AfterKrishiTax)+parseFloat(AfterSwachhTax));
+                       var Cgst = $("#EditCgst").val();
+		  var AfterCgst = $("#EditAfterCgst").val();
+                  var Sgst = $("#EditSgst").val();
+                  var AfterSgst = $("#EditAfterSgst").val();
+                  var Igst = $("#EditIgst").val();
+                  var AfterIgst = $("#EditAfterIgst").val();
+		var OtherAmt = $('#EditOtherAllowances').val();
+                     var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst));
 
                      var TotalTaxValue = EditcalculateTaxValue();
 
@@ -4986,11 +4894,13 @@ function clearAfterAddLineItemAdd(){
 		$('#basicval'+userid).val(basicval);
 		
 		RequistQuantity = $('#quantity'+userid).val();
-		$('#AfterServiceTax'+userid).val(AfterServiceTax);
-		$('#AfterEduCess'+userid).val(AfterEduCess);
-		$('#AfterSecHighTax'+userid).val(AfterSecHighTax);
-		$('#AfterKrishiTax'+userid).val(AfterKrishiTax);
-		$('#AfterSwachhTax'+userid).val(AfterSwachhTax);
+		 $('#AfterCgst'+userid).val(AfterCgst);
+                $('#Sgst'+userid).val(Sgst);
+                $('#AfterSgst'+userid).val(AfterSgst);	
+                $('#Igst'+userid).val(Igst);
+                $('#AfterIgst'+userid).val(AfterIgst);
+
+                $('#OtherAmt'+userid).val(OtherAmt);
 		$('#ServiceTotalOrderValue'+userid).val(TotalTaxValue);
 
 		$('#landingCharge'+userid).val(landingCharge);
@@ -5025,15 +4935,15 @@ function clearAfterAddLineItemAdd(){
                $('#beforeAdditionalExciseDuty'+userid).val(beforeAdditionalExciseDuty);
                $('#PurQuantity'+userid).val(PurQuantity);
                 $('#PerKgExpense'+userid).val(TotalOrderValuePerkg);
-
-                    cellval[2].innerHTML = materialName;
+                cellval[2].innerHTML = materialCode;
+                    cellval[3].innerHTML = materialName;
  
-                    cellval[3].innerHTML = quantity;
-                    cellval[4].innerHTML =uom;
-                    cellval[5].innerHTML =itemRate;
-                    cellval[6].innerHTML =basicval;
-                    cellval[7].innerHTML =TotalTaxValue;
-                    cellval[8].innerHTML =basicval;
+                    cellval[4].innerHTML = quantity;
+                    cellval[5].innerHTML =uom;
+                    cellval[6].innerHTML =parseFloat(itemRate).toFixed(2);
+                    cellval[7].innerHTML =parseFloat(basicval).toFixed(2);
+                    cellval[8].innerHTML =parseFloat(TotalTaxValue).toFixed(2);
+                    cellval[9].innerHTML =parseFloat(basicval).toFixed(2);
 
 
 
@@ -5115,11 +5025,9 @@ function validateEditCapitalTax()
      }
     /* calculate tax value*/
     function EditcalculateTaxValue(){
-             var ServiceTaxAmount = $('#EditAfterServiceTax').val() == '' ? '0.00' : $('#EditAfterServiceTax').val();
-              var EduCessTaxAmount = $('#EditAfterEduCess').val() == '' ? '0.00' : $('#EditAfterEduCess').val();
-               var SecHighTaxAmount = $('#EditAfterSecHighTax').val() == '' ? '0.00' : $('#EditAfterSecHighTax').val();
-                var KrishiTaxAmount = $('#EditAfterKrishiTax').val() == '' ? '0.00' : $('#EditAfterKrishiTax').val();
-                var SwachhTaxAmount = $('#EditAfterSwachhTax').val() == '' ? '0.00' : $('#EditAfterSwachhTax').val();
+             var Cgst = $('#EditAfterCgst').val() == '' ? '0.00' : $('#EditAfterCgst').val();
+              var Sgst = $('#EditAfterSgst').val() == '' ? '0.00' : $('#EditAfterSgst').val();
+               var Igst = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val();
             var landingCharge = $('#EditAfterLandingCharge').val() == '' ? '0.00' : $('#EditAfterLandingCharge').val();
           var HighSeasSalesCharge = $('#EditAfterHighseas').val() == '' ? '0.00' : $('#EditAfterHighseas').val();
             var CustomDuty = $('#EditAfterCustomduty').val() == '' ? '0.00' : $('#EditAfterCustomduty').val();
@@ -5135,7 +5043,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(ServiceTaxAmount)+ parseFloat(EduCessTaxAmount)+ parseFloat(SecHighTaxAmount) + parseFloat(KrishiTaxAmount)+ parseFloat(SwachhTaxAmount));
+             var totTaxvalue = (parseFloat(Cgst)+ parseFloat(Sgst)+ parseFloat(Igst));
 //+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);
@@ -5173,12 +5081,10 @@ function validateEditCapitalTax()
                 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 TotCgst = 0;
+		var TotSgst = 0;
+		var TotIgst = 0;
+	        var TotOther = 0;
 
                     var TotLanding = 0;
                     var TotHighseas = 0;
@@ -5200,13 +5106,10 @@ function validateEditCapitalTax()
                    
                     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 TotalCgstI = $('#AfterCgst'+i).val() == '' ? '0.00' : $('#AfterCgst'+i).val();
+                    var TotalSgstI = $('#AfterSgst'+i).val() == '' ? '0.00' : $('#AfterSgst'+i).val();
+                    var TotalIgstI = $('#AfterIgst'+i).val() == '' ? '0.00' : $('#AfterIgst'+i).val();
+                    var TotOtherI = $('#OtherAmt'+i).val() == '' ? '0.00' : $('#OtherAmt'+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();
@@ -5222,13 +5125,10 @@ function validateEditCapitalTax()
                      var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val();
                       var CapitalToatlOrderI = $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
 
-                  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);
-
+                   TotCgst = parseFloat(TotCgst) + parseFloat(TotalCgstI);
+		TotSgst = parseFloat(TotSgst) + parseFloat(TotalSgstI);
+		TotIgst = parseFloat(TotIgst) + parseFloat(TotalIgstI);
+		TotOther = parseFloat(TotOther) + parseFloat(TotOtherI);
                     TotLanding = parseFloat(TotLanding) + parseFloat(TotLandingI);
                      TotHighseas = parseFloat(TotHighseas) + parseFloat(TotHighseasI);
                     TotCustom = parseFloat(TotCustom) + parseFloat(TotCustomI);
@@ -5247,13 +5147,10 @@ function validateEditCapitalTax()
 
                     }
 
-                   $('#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) );
-
+                   $('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) );
+		$('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) );
+		$('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) );
+		$('#TotalOtherAllowances').val(parseFloat(TotOther).toFixed(2) );
                     $('#txttotallanding').val((parseFloat(TotLanding) ).toFixed(2) );
                 $('#txttotalhighseas').val((parseFloat(TotHighseas) ).toFixed(2) );
                 $('#txttotalcustom').val((parseFloat(TotCustom)).toFixed(2) );
@@ -5318,13 +5215,47 @@ $('#EditTotalAmount').html('Basic Value in' + " "+DisplayCurrencySymbol);
                     });
 });
 
-var  PaymentDate='<?php echo $PaymentDays; ?>';
-$('#Before').change(function(){
-PaymentDate=$('#Before').val();
-});
-$('#After').change(function(){
-PaymentDate=$('#After').val();
-
-});
+function calculateCgstTax(varBasicValue,Cgst)
+ {
+	
+		 var basicValue = parseFloat(varBasicValue);
+		var Cgst = parseFloat(Cgst);	 
+		 var ServiceTaxValue = 0.0;  
+		 
+		 ServiceTaxValue = <?php echo SERVICETAX_CGST; ?>;
+		
+	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
+	 
+		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
+		 
+ }
+function calculateSgstTax(varBasicValue,Sgst)
+ {
+	
+		 var basicValue = parseFloat(varBasicValue);
+		var Sgst = parseFloat(Sgst);	 
+		 var ServiceTaxValue = 0.0;  
+		 
+		 ServiceTaxValue = <?php echo SERVICETAX_SGST; ?>;
+		
+	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
+	 
+		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
+		 
+ }
+function calculateIgstTax(varBasicValue,Igst)
+ {
+	
+		 var basicValue = parseFloat(varBasicValue);
+		var Igst = parseFloat(Igst);	 
+		 var ServiceTaxValue = 0.0;  
+		 
+		 ServiceTaxValue = <?php echo SERVICETAX_IGST; ?>;
+		
+	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
+	 
+		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
+		 
+ }
 
     </script>
diff --git a/application/views/revenuepopdf.php b/application/views/revenuepopdf.php
index 4b69b338..984e0a60 100755
--- a/application/views/revenuepopdf.php
+++ b/application/views/revenuepopdf.php
@@ -50,8 +50,7 @@
                
 		$ServiceDescription =$PO->ServiceDescription;
                 $PaymentTerms = $PO->PaymentTerms;
-                $PaymentDays=$PO->PaymentDays;
-                $PayableAT=$PO->PayableAT;
+               
 		
 	}
 }