diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index 786eeca0..6f0b94f7 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -2027,13 +2027,13 @@ function addNewImportPurchaseOrder()
 		  }
 }
 /* Add capital Po*/
- function addNewCapitalPurchaseOrder()
+  function addNewCapitalPurchaseOrder()
     {
 
 
         $POdt =$this->input->post('PODate');
         $PODate =  $this->getDateformat($POdt);
-                                $SupplierID = $this->input->post('drpSupplier');  
+        $SupplierID = $this->input->post('drpSupplier');  
         $DeliveryAddr = $this->input->post('DeliveryAddr');
         $dt = $this->input->post('Deliverydate');
         
@@ -2090,6 +2090,14 @@ function addNewImportPurchaseOrder()
                     $ExchangeRate=$this->input->post('ExchangeRt');
                     $Palaceoforigin=$this->input->post('PlaceOforigin');
                         }
+                    $ModeOfShipment=$this->input->post('addmodeofshipment');
+                    $SupplierReference=$this->input->post('addsupplierreference');
+                    $SuppliersOfferNo=$this->input->post('addsupplierofferno');
+                    $OtherReferences=$this->input->post('addotherreference');
+                    $Fincap=$this->input->post('addfincap');
+                    $InsuranceOptions=$this->input->post('insuranceStatus');
+                    $InsuranceNo=$this->input->post('insuranceNo');
+                    $ServiceTypeOptions=$this->input->post('PoTypeOptions');
                   
                     $PaymentMethod = $this->input->post('PaymentMethod');
                   $OtherPayment=$this->input->post('Otherpayment');
@@ -2113,7 +2121,7 @@ function addNewImportPurchaseOrder()
         $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,'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,'DeliveryDate'=>$Deliverydt,'PaymentOtherDescription'=>$OtherPayment);
+        $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,'DeliveryDate'=>$Deliverydt,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$SupplierReference,'Mode_Of_Shipment'=>$ModeOfShipment,'Supplier_Offer_No'=>$SuppliersOfferNo,'Other_Reference'=>$OtherReferences,'Fincap'=>$Fincap,'InsuranceStatus'=>$InsuranceOptions,'InsuranceNumber'=>$InsuranceNo,'POSubType'=>$ServiceTypeOptions);
 
         // $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);
                              
@@ -2135,9 +2143,7 @@ function addNewImportPurchaseOrder()
                 $Quantity = $this->input->post('quantity'.$i); 
                 $Reqnumber = $this->input->post('Reqnumber'.$i);
                 $itemRate = $this->input->post('itemRate'.$i);
-                //echo $itemRate;
-                //die();
-
+              
           
                 $BasicPriceinmton = $this->input->post('rateInUs'.$i); 
                 $Productprice = $this->input->post('basicvalInINR'.$i);
@@ -2173,7 +2179,10 @@ function addNewImportPurchaseOrder()
                 $CustomDutyExpensesPerKG = $this->input->post('CustomDutyExpenses'.$i);
                 $RMCIncludingCustomersPerKG = $this->input->post('RMCIncludingCustomers'.$i);
                 $QuantityKG = $this->input->post('PurQuantity'.$i);
-
+                $FreightType = $this->input->post('FreightType'.$i);
+                $FreightValue = $this->input->post('FreightVal'.$i); 
+                $AfterFreightValue = $this->input->post('AfterFreightVal'.$i);
+                $NOOfTrip = $this->input->post('NoOfTrip'.$i);
                 
                 $Totalvalueitem=$this->input->post('PerKgExpense'.$i);
 
@@ -2187,8 +2196,12 @@ function addNewImportPurchaseOrder()
                 $AfterCgst = $this->input->post('AfterCgst'.$i);
                 $AfterSgst = $this->input->post('AfterSgst'.$i);
                 $AfterIgst = $this->input->post('AfterIgst'.$i);
-              
+                $DiscountType = $this->input->post('DisType'.$i);
+                $DiscountValue = $this->input->post('DisVal'.$i); 
+                $AfterDiscount = $this->input->post('AfterDisVal'.$i);
                 $OtherAmt = $this->input->post('OtherAmt'.$i);
+                $CapitalItemDescription = $this->input->post('CapitalItemDescrition'.$i);
+                $Per = $this->input->post('per'.$i);
                 $SkipInsert = "False";         
                 if( count($comma_separated) > 0)
                 {
@@ -2206,7 +2219,7 @@ function addNewImportPurchaseOrder()
                  }
                  if($SkipInsert == "False")
                   {
-                    $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
+                    $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceMaterialDescription'=>$CapitalItemDescription,'Per'=>$Per);
               
                     $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
               
@@ -2215,25 +2228,22 @@ function addNewImportPurchaseOrder()
                     {
                       $LineItemNo =  $POLineItem[0]['LineItemNo'];
                     }
-                    //echo $LineItemNo; 
+                 
                     
                     if(trim($POType) == CAPITAL )
                     {
                      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);
+                     $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,'discount'=>$DiscountType,'discountval'=>$DiscountValue,'Afterdiscountval'=>$AfterDiscount);
                       
                                   $ServiceTax = $this->purchaseorder_model->addServiceTax($ServiceTaxList);
                                
                                   }
                     if($CapitalRange=='0')
                     {
-                      //echo "dsc";
-                      //die();
-                        $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);
+                     
+                        $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,'FreightType'=>$FreightType,'NoOfTrip'=>$NOOfTrip,'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue);
 
-                       //print_r( $ImportTaxList);
-                      //die();
                     
                     
                     $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
@@ -2326,7 +2336,14 @@ function addNewImportPurchaseOrder()
         $TotalOrder = $this->input->post('CapitalToatlOrder');
           $POStatus = $this->input->post('txtStatus');
           $Palaceoforigin=$this->input->post('PlaceOforigin');
-       
+       $ModeOfShipment=$this->input->post('editmodeofshipment');
+        $SupplierReference=$this->input->post('editsupplierreference');
+        $SuppliersOfferNo=$this->input->post('editsupplierofferno');
+        $OtherReferences=$this->input->post('editotherreference');
+        $Fincap=$this->input->post('editfincap');
+        $InsuranceOptions=$this->input->post('insuranceStatus');
+        $InsuranceNo=$this->input->post('insuranceNo');
+        $ServiceTypeOptions=$this->input->post('PoTypeOptions');
 
                            $CreateBy = $this->session->userdata ( 'userId' );
         $RowCount =  $this->input->post('txtRowCount'); 
@@ -2340,7 +2357,7 @@ function addNewImportPurchaseOrder()
         $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,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch,'DeliveryDate'=>$Deliverydt,'PaymentOtherDescription'=>$OtherPayment);
+        $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,'DeliveryDate'=>$Deliverydt,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$SupplierReference,'Mode_Of_Shipment'=>$ModeOfShipment,'Supplier_Offer_No'=>$SuppliersOfferNo,'Other_Reference'=>$OtherReferences,'Fincap'=>$Fincap,'InsuranceStatus'=>$InsuranceOptions,'InsuranceNumber'=>$InsuranceNo,'POSubType'=>$ServiceTypeOptions);
 
           
           $POMaster  = $this->purchaseorder_model->updatePOMaster($PONO,$POList);       
@@ -2409,7 +2426,17 @@ function addNewImportPurchaseOrder()
                 $AfterSgst = $this->input->post('AfterSgst'.$i);
                 $AfterIgst = $this->input->post('AfterIgst'.$i);
               
-                $OtherAmt = $this->input->post('OtherAmt'.$i);                                              
+                $OtherAmt = $this->input->post('OtherAmt'.$i);   
+                 $DiscountType = $this->input->post('DisType'.$i);
+                $DiscountValue = $this->input->post('DisVal'.$i); 
+                $AfterDiscount = $this->input->post('AfterDisVal'.$i);
+                $OtherAmt = $this->input->post('OtherAmt'.$i);
+                $CapitalItemDescription = $this->input->post('CapitalItemDescrition'.$i);
+                $Per = $this->input->post('per'.$i);
+                 $FreightType = $this->input->post('FreightType'.$i);
+                $FreightValue = $this->input->post('FreightVal'.$i); 
+                $AfterFreightValue = $this->input->post('AfterFreightVal'.$i);
+                $NOOfTrip = $this->input->post('NoOfTrip'.$i);
                  $SkipInsert = "False";        
                    if( count($comma_separated) > 0)
                    {
@@ -2429,7 +2456,7 @@ function addNewImportPurchaseOrder()
                   {
                 if(strlen($POLineItemNo) == 0)
                 {
-                  $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
+                  $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceMaterialDescription'=>$CapitalItemDescription,'Per'=>$Per);
               
                     $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
               
@@ -2444,13 +2471,13 @@ function addNewImportPurchaseOrder()
                     {
                     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);
+                     $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,'discount'=>$DiscountType,'discountval'=>$DiscountValue,'Afterdiscountval'=>$AfterDiscount);
                       
                     $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);
+                    $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,'FreightType'=>$FreightType,'NoOfTrip'=>$NOOfTrip,'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue);
                    $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
                        }                  
                     
@@ -2465,17 +2492,17 @@ function addNewImportPurchaseOrder()
 
                                   
               
-                  $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
+                  $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceMaterialDescription'=>$CapitalItemDescription,'Per'=>$Per);
                   $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$LineItemNo,$POLineItemList);  
                    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);
+                 $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,'discount'=>$DiscountType,'discountval'=>$DiscountValue,'Afterdiscountval'=>$AfterDiscount);
             
                 $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);
+                $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,'FreightType'=>$FreightType,'NoOfTrip'=>$NOOfTrip,'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue);
                   
 
                   $ImportList= $this->purchaseorder_model->updateImportTax($LineItemNo,$ImportTaxList); 
diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index 2129301d..75d10f38 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -1298,9 +1298,9 @@ function GetCurrencytype()
 function getCapitalPurchaseOrderDetails($PONO = '')
 	{
 	     
-	$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
+	$subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.Per,LineItem.ServiceMaterialDescription,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
 Mat.UOM,Quantity,ReceivedQuantity,Rate,Req.Status,
- ROUND((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,
+ 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,Tax.FreightType,Tax.NoOfTrip,Tax.FreightValue,Tax.AfterFreightValue,POMast.CurrencyType,
  
  Req.CostCenterCode,Dept.DepartmentName FROM T_PurchaseOrder_LineItem LineItem 
  join T_PurchaseOrder_Master POMast on POMast.PONO = LineItem.PONO
@@ -1362,9 +1362,9 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
        function getDomesticCapitalPurchaseOrderDetails($PONO = '')
 	{
 	     
-	$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
+	$subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.Per,LineItem.ServiceMaterialDescription,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
         Mat.UOM,Quantity,ReceivedQuantity,Rate,Req.Status,ROUND((ServiceTax.After_CGST + ServiceTax.After_SGST + ServiceTax.After_IGST + ServiceTax.otherallowance),2) as ServiceTaxamount
-				,ServiceTax.TotalValue,ServiceTax.CGST,ServiceTax.After_CGST,ServiceTax.SGST,ServiceTax.After_SGST,ServiceTax.IGST,ServiceTax.After_IGST,ServiceTax.otherallowance,
+				,ServiceTax.TotalValue,ServiceTax.CGST,ServiceTax.After_CGST,ServiceTax.SGST,ServiceTax.After_SGST,ServiceTax.IGST,ServiceTax.After_IGST,ServiceTax.otherallowance,ServiceTax.discount,ServiceTax.discountval,ServiceTax.Afterdiscountval,
          POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,ROUND((POMast.TotalOrderValue),2) as BasicINRValue,POMast.CurrencyType,
 
          Req.CostCenterCode,Dept.DepartmentName FROM T_PurchaseOrder_LineItem LineItem 
diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php
index 69dea7ed..873a264a 100755
--- a/application/views/capitalpurchaseorder.php
+++ b/application/views/capitalpurchaseorder.php
@@ -1,4 +1,8 @@
-    <?php $ReqType =''; 
+    <?php 
+     $insuranceStatus = array(
+    array("name"=>"NO","value"=>"0"),array("name"=>"YES","value"=>"1")
+    );
+    $ReqType =''; 
     $CompanyAddress = '';
     $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
     $CurrentDate =  $dt->format('d-m-Y');
@@ -80,11 +84,12 @@ if(!empty($INRSYMBOL))
 	z-index: 1080 !important;
 }
     </style>
+
 <script src="<?php echo base_url()  ?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
  
- 
+ <script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
       
-    <script>
+    <script type="text/javascript">
 	 tinymce.init({
           selector: "textarea#txtSpcialInstruction",
           
@@ -92,6 +97,23 @@ if(!empty($INRSYMBOL))
            statusbar: false,
            toolbar: false
         });
+         tinymce.init({
+          selector: "textarea#ItemDescription",
+          
+          menubar: false,
+           statusbar: false,
+           toolbar: false
+        });
+         tinymce.init({
+          selector: "textarea#EditItemDescription",
+          
+          menubar: false,
+           statusbar: false,
+           toolbar: false
+        });
+
+        </script>
+<script>
 		
      $(document).ready(function(){
 		 
@@ -563,7 +585,85 @@ function vaildateBeforeOpenModal()
 	</div> 
 	</div>
 	</div><!--End new fields 1 sep-->
-						<div class="col-md-12" style="padding:0px;">
+</div><!--End new fields 1 sep-->
+<!--start new fields 1 sep-->
+	<div class="row">
+	<div class="col-md-12">	
+	<div class="col-md-3">
+	<div class="col-md-12" style="padding: 0px;">
+	 
+
+	  <label>Service Type Options</label>
+						<div class="form-group">
+						
+							 <?php
+
+				   //$optionsWork = array("0"=>'Select Work Status');     
+						
+						
+						if(!empty($PoTypeOptions))
+						{
+						foreach ($PoTypeOptions as $POpt):
+						  
+					   
+						  $optionsPO[$POpt->ConfigValue] =  $POpt->ConfigValue;
+
+						endforeach;
+						}										
+			
+						echo form_dropdown('PoTypeOptions', $optionsPO,set_value('PoTypeOptions'),'id="PoTypeOptions"'  ,'required="true"' ,'class="form-control select2');
+
+
+						?> 
+						</div>
+
+
+
+	</div> 
+	</div>
+	<div class="col-md-9" style="padding:0px;">
+	<div class="col-md-4" style="padding:0px;" >
+	<div class="col-md-12">
+ <label>Insurance Options</label>
+						<div class="form-group">
+						
+							 <?php
+
+						if(!empty($insuranceStatus))
+						{
+						foreach ($insuranceStatus as $INS):
+						  
+					   
+						  $optionsInsurance[$INS['value']] =  $INS['name'];
+
+						endforeach;
+						}										
+			
+						echo form_dropdown('insuranceStatus', $optionsInsurance,set_value('insuranceStatus'),'id="insuranceStatus"'  ,'required="true"' ,'class="form-control select2');
+
+
+						?>
+						</div>
+
+
+	
+
+	</div>
+	</div>
+	<div class="col-md-4" id="insuranceTxtDiv"  style="display:block;">
+                     <label>Insurance No<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
+                       <div class="form-group">                        
+                           <?php
+                            $data = array('name' => 'insuranceNo','value' => set_value('insuranceNo'),'id'=>'insuranceNo',  'class' => 'form-control' ,'required' => 'true');
+                           echo form_input($data);
+                           ?>  
+                       </div>
+               </div>
+	 
+	</div> 
+	</div>
+	</div><!--End new fields 1 sep-->
+        <div class="col-md-12" style="padding:0px;">
 	  
 		   <div class="col-md-3">
 			   
@@ -753,7 +853,7 @@ function vaildateBeforeOpenModal()
                               <label>Quantity</label>
                                 <div class="form-group">
                                   <?php
-                                    $data = array('name' => 'CPQuantity','value' => set_value('CPQuantity'),'id'=>'CPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();');
+                                    $data = array('name' => 'CPQuantity','value' => set_value('CPQuantity'),'id'=>'CPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);');
                                     echo form_input($data);
                                    ?>
                                 </div>
@@ -762,7 +862,7 @@ function vaildateBeforeOpenModal()
                                <label id="RateIn">Rate(In INR /UOM)</label>
                                   <div class="form-group">
                                     <?php
-                                      $data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();' );
+                                      $data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);' );
                                       echo form_input($data);
                                     ?>
                                                         </div>
@@ -788,6 +888,49 @@ function vaildateBeforeOpenModal()
 
 
 <div class="col-md-12" id="CAPdiv"  style="border:1px solid #000;padding:5px;">
+    <div class="col-md-12">                             <div class="col-md-4">
+                                                            </div>
+                                                        <div class="col-md-4">
+                                                            <label>Discount Type </label>
+                                                            <div>
+                                                                <?php
+                                                                $options = array("0"=>'Select Discount Type');
+                                                                //print_r(  $options);
+
+                                                                if(!empty($TaxType))
+                                                                {
+                                                                    foreach ($TaxType as $SID):
+
+
+                                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+                                                                    endforeach;
+                                                                }
+
+                                                                echo form_dropdown('DiscountType', $options,set_value('DiscountType'),'id="DiscountType"' ,'class="form-control"');
+
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-2">
+                                                            <label>Discount Rate </label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'txtDiscount','value' => set_value('txtDiscount'),'id'=>'txtDiscount',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'calculateDiscount(0);');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-2">
+                                                            <label>Discounted Amt In INR</label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'txtAfterDiscount','value' => set_value('txtAfterDiscount',0.00),'id'=>'txtAfterDiscount',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+</div>
                         <div class="col-md-12">
 					<div class="col-md-6" align="right">
 							 
@@ -1274,6 +1417,15 @@ function vaildateBeforeOpenModal()
 
 
            </div>
+           	 <div class="col-md-12" style="padding: 0px 30px 10px 30px;"> 
+                             <label>Capital Description </label>	
+                         
+
+							<?php
+						 $data = array('name' => 'ItemDescription','value' => set_value('ItemDescription'),'id'=>'ItemDescription',  'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
+						echo form_textarea($data); ?>
+							 
+						</div> 
               <div class="modal-footer">
                  <a class="btn btn-primary font AddCapital"  ID="AddCapital"  ></i>&nbsp;&nbsp;<span class="bold">Add Capital</span></a>
                  <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
@@ -1394,7 +1546,7 @@ function vaildateBeforeOpenModal()
                                                         <label>Quantity</label>
                                                         <div class="form-group">
                                                             <?php
-                                                            $data = array('name' => 'EditCPQuantity','value' => set_value('EditCPQuantity'),'id'=>'EditCPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();');
+                                                            $data = array('name' => 'EditCPQuantity','value' => set_value('EditCPQuantity'),'id'=>'EditCPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();calculateFreight(4);');
                                                             echo form_input($data);
                                                             ?>
                                                         </div>
@@ -1403,7 +1555,7 @@ function vaildateBeforeOpenModal()
                                                         <label id="EditRateIn">Rate(in INR/UOM)</label>
                                                         <div class="form-group">
                                                             <?php
-                                                            $data = array('name' => 'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();' );
+                                                            $data = array('name' => 'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();calculateFreight(4);' );
                                                             echo form_input($data);
                                                             ?>
                                                         </div>
@@ -1428,6 +1580,49 @@ function vaildateBeforeOpenModal()
 												</div>
                                                 <div class="col-md-12">											
                   <div class="col-md-12"  style="border:1px solid #000;padding:5px;" id="EDITCAPdiv">
+                  <div class="col-md-12">                                                   <div class="col-md-4">
+                                                                                                        </div>
+												<div class="col-md-4">
+															  <label>Discount Type </label>
+																		<div>
+																			 <?php
+																			$options = array("0"=>'Select Discount Type');     
+																			//print_r(  $options);
+																			
+																			if(!empty($TaxType))
+																			{
+																			foreach ($TaxType as $SID):
+																			  
+																		   
+																			  $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+																			endforeach;
+																			}										
+																
+																			echo form_dropdown('EditDiscountType', $options,set_value('EditDiscountType'),'id="EditDiscountType"' ,'class="form-control"');
+
+																			?>						 
+																		</div>
+											 </div>
+											 <div class="col-md-2">
+															  <label>Discount Rate </label>
+															  <div class="form-group">
+																					<?php
+																			 $data = array('name' => 'txtEditDiscount','value' => set_value('txtEditDiscount'),'id'=>'txtEditDiscount',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'calculateDiscount(1);','style'=>'text-align:right;');
+																			echo form_input($data);
+																			?>   
+																		</div> 
+											</div>
+											 <div class="col-md-2">
+															  <label>Discounted Amt In INR  </label>
+															  <div class="form-group">
+																					<?php
+																			 $data = array('name' => 'txtEditAfterDiscount','value' => set_value('txtEditAfterDiscount'),'id'=>'txtEditAfterDiscount',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
+																			echo form_input($data);
+																			?>   
+																		</div> 
+											</div>	
+                                                                                            </div>
                                                 <div class="col-md-12">
 					<div class="col-md-6" align="right">
 							 
@@ -1804,16 +1999,16 @@ function vaildateBeforeOpenModal()
                                                                     endforeach;
                                                                 }
 
-                                                                echo form_dropdown('drpeditFreight', $options,set_value('drpeditFreight'),'id="drpeditFreight"' ,'class="form-control "');
+                                                                echo form_dropdown('drpEditFreight', $options,set_value('drpEditFreight'),'id="drpEditFreight"' ,'class="form-control "');
 
                                                                 ?>
                                                             </div>
                                                         </div>
-														<div class="col-md-3" id="editTripsValue" style="display:none;">
+														<div class="col-md-3" id="EditTripsValue" style="display:none;">
                                                             <span>NO Of Trips</span>
                                                             <div class="form-group">
                                                                 <?php
-                                                                $data = array('name' => 'editNOOfTrips','value' => set_value('editNOOfTrips'),'id'=>'editNOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
+                                                                $data = array('name' => 'EditNOOfTrips','value' => set_value('EditNOOfTrips'),'id'=>'EditNOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(1);' );
                                                                 echo form_input($data);
                                                                 ?>
                                                             </div>
@@ -1822,7 +2017,7 @@ function vaildateBeforeOpenModal()
                                                             <span>Freight Rate </span>
                                                             <div class="form-group">
                                                                 <?php
-                                                                $data = array('name' => 'edittxtFreight','value' => set_value('txtFreight'),'id'=>'txtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
+                                                                $data = array('name' => 'txtEditFreight','value' => set_value('txtEditFreight'),'id'=>'txtEditFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(1);');
                                                                 echo form_input($data);
                                                                 ?>
                                                             </div>
@@ -1832,7 +2027,7 @@ function vaildateBeforeOpenModal()
                                                             <span>Freight Amt In INR</span>
                                                             <div class="form-group">
                                                                 <?php
-                                                                $data = array('name' => 'edittxtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                                $data = array('name' => 'txtEditAfterFreight','value' => set_value('txtEditAfterFreight'),'id'=>'txtEditAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
                                                                 echo form_input($data);
                                                                 ?>
                                                             </div>
@@ -1919,7 +2114,15 @@ function vaildateBeforeOpenModal()
                                                 
 
 
+                                                    <div class="col-md-12" style="padding: 0px 30px 10px 30px;"> 
+                             <label>Capital Description </label>	
+                         
 
+							<?php
+						 $data = array('name' => 'EditItemDescription','value' => set_value('EditItemDescription'),'id'=>'EditItemDescription',  'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
+						echo form_textarea($data); ?>
+							 
+						</div> 
 
 
                                             <div class="modal-footer">
@@ -2167,7 +2370,6 @@ function vaildateBeforeOpenModal()
         </section>
 
 
-     <script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
     <script type="text/html" id="CapitalList">
     <tr  id="<%=index%>">
     <td align="left"><%=index%></td>
@@ -2254,6 +2456,9 @@ function vaildateBeforeOpenModal()
                  $('#otheroptiondiv').hide();  
                     $('#Otherpayment').val('');
                     }
+                    else if(supPaymentTerms=='PT08'){
+                    $('#otheroptiondiv').show();
+                        }
                     $('#PaymentMethod').empty();
                  var paymentList = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
 
@@ -2555,20 +2760,29 @@ EditRatechange();
         
           var txtQuantity = parseFloat( $('#CPQuantity').val());
           var txtExchangeRate ='';
-        
+            var BasicInINR='';
           var RatePerTon = parseFloat( $('#CPRate').val());
               //var txtUnitPrice = parseFloat($('#Rate').val());
              if(capitalType=='International'){
            txtExchangeRate = parseFloat( $('#ExchangeRtModal').val());
             var Tot =  txtQuantity * RatePerTon;
+            BasicInINR=Tot * txtExchangeRate;
              }
 
          else{
-            var Tot =  txtQuantity * RatePerTon;
+          var Tot =  txtQuantity * RatePerTon;
+           if ($('#txtDiscount').val() != '' && $('#txtDiscount').val() != '0')
+			 {
+              $('#txtAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#DiscountType").val()));
+		}
+         var discountedValue =  parseFloat($('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val()).toFixed(2);
+         
+           
            txtExchangeRate = 1;
+           BasicInINR=Tot * txtExchangeRate - discountedValue;
              }
                
-        var BasicInINR=Tot * txtExchangeRate;
+     
            
   
               $('#CPTotalAmount').val(parseFloat(Tot).toFixed(2));
@@ -3037,7 +3251,7 @@ EditRatechange();
     /* This is used add capital po line item */
     $('.AddCapital').click(function(){
 
-
+tinyMCE.triggerSave();
           if(validateCapitalTax() && validateExceedLimit() && ExceedQuantityCheck())
               {
                      var temp = index;
@@ -3049,6 +3263,13 @@ EditRatechange();
                 var materialCode =$('#MaterialCode').val();
                 var materialName =  $("#CapitalItemName").val();
                 var uom = $("#CPUOM").val();
+                var addPer='';
+                if($("#AddPer").val().trim()==''){
+               addPer = $("#CPUOM").val();
+               }
+               else{
+               addPer = $("#AddPer").val();
+                    }
                 var exchangeRate = $("#ExchangeRtModal").val();
                      var quantity = $("#CPQuantity").val();
                      var convertRate = $("#CPRate").val();
@@ -3062,7 +3283,10 @@ EditRatechange();
                   var AfterSgst = $("#AfterSgst").val();
                   var Igst = $("#Igst").val();
                   var AfterIgst = $("#AfterIgst").val();
-
+                    
+		  var DisType = $("#DiscountType").val();
+		  var DisVal = $("#txtDiscount").val();
+		  var AfterDisVal = $("#txtAfterDiscount").val();
 
                     var landingCharge = $('#AfterLandingCharge').val();
           var HighSeasSalesCharge =  $('#AfterHighseas').val();
@@ -3093,7 +3317,11 @@ var purchaseRate =  $('#purchaserate').val();
                 var beforeCustomSHCess = $('#CustomSHcess').val();
                  var beforeAdditionalExciseDuty =$('#AdditionalExciseduty').val(); 
                 var PurQuantity = $('#PurQuantity').val(); 
-                    
+                      
+                var FreightType = $("#drpFreight").val();
+		  var FreightVal = $("#txtFreight").val();
+		  var AfterFreightVal = $("#txtAfterFreight").val();
+		  var NoOfTrip = $("#NOOfTrips").val();
                       var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)).toFixed(2);
 
                      
@@ -3101,7 +3329,7 @@ var purchaseRate =  $('#purchaserate').val();
 
                      var TotalTaxValue = calculateTaxValue();
                      var basicvalInINR=$('#AfterBasicPriceTax').val();
-               
+                var CapitalDescription  =$('#ItemDescription').val();
                
                      $('#MaterialCode option[value='+materialCode+']').remove();
 
@@ -3136,6 +3364,7 @@ var purchaseRate =  $('#purchaserate').val();
                      addHidden(theForm,"materialName"+temp,materialName );
                      addHidden(theForm,"echangeRate"+temp,exchangeRate );
                  addHidden(theForm,"uom"+temp,uom);
+                 addHidden(theForm,"per"+temp,addPer);
                      addHidden(theForm,"quantity"+temp,quantity);
                   addHidden(theForm,"rateInUs"+temp,itemRate);
                       addHidden(theForm,"itemRate"+temp,itemRate);
@@ -3179,9 +3408,15 @@ var purchaseRate =  $('#purchaserate').val();
 		  addHidden(theForm,"Igst"+temp,Igst);
                   addHidden(theForm,"AfterIgst"+temp,AfterIgst);
                    addHidden(theForm,"OtherAmt"+temp,OtherAmt);
-
+                     addHidden(theForm,"FreightType"+temp,FreightType);
+		 addHidden(theForm,"FreightVal"+temp,FreightVal);
+		 addHidden(theForm,"AfterFreightVal"+temp,AfterFreightVal);
+                 addHidden(theForm,"NoOfTrip"+temp,NoOfTrip);
+                 addHidden(theForm,"CapitalItemDescrition"+temp,CapitalDescription);
                     		
-
+                  addHidden(theForm,"DisType"+temp,DisType);
+	     addHidden(theForm,"DisVal"+temp,DisVal);
+		 addHidden(theForm,"AfterDisVal"+temp,AfterDisVal);
                      $('#txtRowCount').val(temp); 
                   
 
@@ -3259,6 +3494,12 @@ var purchaseRate =  $('#purchaserate').val();
                     alert('Please Enter the Valid Rate of the Item');
                     $('#CPRate').focus();
                     return false;
+            }
+              else if($('#ItemDescription').val() == '')
+            {
+                     alert('Please Enter the Capital Description');
+                 $('#ItemDescription').focus(); 
+				return false;
             }
             else
             {
@@ -3328,6 +3569,9 @@ var purchaseRate =  $('#purchaserate').val();
     function populateValueMainFormForCapital()
     {
                      var BasicVal = $('#CPTotalAmount').val() == '' ? '0.00' : $('#CPTotalAmount').val();
+                     var disRate = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
+                    BasicVal = BasicVal-disRate;
+
              var AfterCgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val();
 		var AfterSgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val();
 		var AfterIgst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val();
@@ -3352,7 +3596,7 @@ var purchaseRate =  $('#purchaserate').val();
 
 
                     var TotalOrderValueSummary = $('#txtToatlOrder').val() == '' ? '0.00' : $('#txtToatlOrder').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();
@@ -3372,7 +3616,7 @@ var purchaseRate =  $('#purchaserate').val();
 
                      var TotGrossexpense = $('#txttotalgrossexpense').val() == '' ? '0.00' : $('#txttotalgrossexpense').val();
                      var TotalCapitalOrder = $('#CapitalToatlOrder').val() == '' ? '0.00' : $('#CapitalToatlOrder').val();
-
+                  
                     $('#txtTotCgst').val((parseFloat(TotalCgst) + parseFloat(AfterCgst)).toFixed(2) );
 		$('#txtTotSgst').val((parseFloat(TotSgst) + parseFloat(AfterSgst)).toFixed(2) );
 		$('#txtTotIgst').val((parseFloat(TotalIgst) + parseFloat(AfterIgst)).toFixed(2) );
@@ -3450,6 +3694,15 @@ $('#PurQuantity').val('');
      $('#CustomDutyExpenses').val('');
        $('#RMCIncludingCustomers').val(''); 
                      $("#txtTotalOrderValue").val('');
+                      $("#AddPer").val('');
+                    $("#drpFreight").val('0');
+		$("#txtFreight").val('');
+		$("#txtAfterFreight").val('');
+                $("#NOOfTrips").val('');
+        tinyMCE.get('ItemDescription').setContent('');
+        $("#DiscountType").val('0');
+		$("#txtDiscount").val('');
+		$("#txtAfterDiscount").val('');
 
 
     }
@@ -3593,8 +3846,11 @@ function DeleteRow(rowid)
                      var TotAvlmodvatI = $('#AvailableModvat'+i).val() == '' ? '0.00' : $('#AvailableModvat'+i).val();
 
                      var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val();
-                   
+                    var discountedRateValue = $('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
+                    
+
               var CapitalToatlOrderI= $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
+              CapitalToatlOrderI = CapitalToatlOrderI-discountedRateValue;
                 }
 
                     else if(deletedRow!=i){
@@ -3620,7 +3876,10 @@ function DeleteRow(rowid)
                      var TotAvlmodvatI = $('#AvailableModvat'+i).val() == '' ? '0.00' : $('#AvailableModvat'+i).val();
 
                      var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val();
+                    var discountedRateValue = $('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
+
                      var CapitalToatlOrderI= $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
+                     CapitalToatlOrderI=CapitalToatlOrderI-discountedRateValue;
                         }
  else{
                         
@@ -3698,6 +3957,7 @@ function DeleteRow(rowid)
 		
 		$('#EditCapitalItemName').val($('#materialName'+userid).val());
 		$('#EditCPUOM').val($('#uom'+userid).val());
+                $('#EditPer').val($('#per'+userid).val());
                 var EditUOM = $('#uom'+userid).val();
 		$('#EditCPQuantity').val($('#quantity'+userid).val());
                $('#EditCPRate').val($('#rateInUs'+userid).val());
@@ -3752,10 +4012,25 @@ function DeleteRow(rowid)
 		$('#EditCustomSHcess').val($('#beforeCustomSHCess'+userid).val());
                $('#EditAdditionalExciseduty').val($('#beforeAdditionalExciseDuty'+userid).val());
                $('#EditPurQuantity').val($('#PurQuantity'+userid).val());
-                 
+                 $('#txtEditFreight').val($('#FreightVal'+userid).val());
+		$('#txtEditAfterFreight').val($('#AfterFreightVal'+userid).val());
+                $('#EditNOOfTrips').val($('#NoOfTrip'+userid).val());
+		$("#drpEditFreight").val($('#FreightType'+userid).val());
 		
+                var FreightType =$('#FreightType'+userid).val();
+              
+	        if (FreightType == "PER TRIP"){
+                $('#EditTripsValue').show();
+                    }
+                    else{
+                    $('#EditTripsValue').hide();
+                    }
+                    $("#EditDiscountType").val($('#DisType'+userid).val());
+		$('#txtEditDiscount').val($('#DisVal'+userid).val());
+		$('#txtEditAfterDiscount').val($('#AfterDisVal'+userid).val());
 		
-		   
+		                 tinyMCE.get('EditItemDescription').setContent($('#CapitalItemDescrition'+userid).val());
+  
                             
 
           var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
@@ -4004,18 +4279,26 @@ function clearAfterAddLineItemAdd(){
           var txtExchangeRate = 1;
           var RatePerTon = parseFloat( $('#EditCPRate').val()).toFixed(2);
               //var txtUnitPrice = parseFloat($('#Rate').val()).toFixed(2);
+              var BasicInINR='';
               if(capitalType=='International'){
            txtExchangeRate = parseFloat( $('#EditExchangeRtModal').val());
             var Tot =  txtQuantity  * RatePerTon;
-                 
+                 var BasicInINR=Tot * txtExchangeRate;
 
              }
 
          else{
-            var Tot =  txtQuantity * RatePerTon;
+          var Tot =  txtQuantity * RatePerTon;
+             if ($('#txtEditDiscount').val() != '' && $('#txtEditDiscount').val() != '0')
+			 {
+              $('#txtEditAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#EditDiscountType").val()));
+		}
+         var discountedValue =  parseFloat($('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val()).toFixed(2);
+           
         txtExchangeRate=1;
+        var BasicInINR=Tot * txtExchangeRate - discountedValue;
              }
-    var BasicInINR=Tot * txtExchangeRate;
+    
               $('#EditCPTotalAmount').val(parseFloat(Tot).toFixed(2));
                  $('#EditAfterBasicPriceTax').val(Math.round(BasicInINR));
      //ExceedBudget($('#CPTotalAmount').val(),$('#CapitalbudAmt').val());
@@ -4155,7 +4438,7 @@ function clearAfterAddLineItemAdd(){
              */
             $('.EditCapital').click(function(){
         
-
+           tinyMCE.triggerSave();
                 if( validateEditCapitalTax() && EditExceedQuantityCheck() && validateEditExceedLimit())
                 {
                    
@@ -4170,6 +4453,14 @@ function clearAfterAddLineItemAdd(){
                 var materialCode =$('#EditMaterialCode').val();
                 var materialName =  $("#EditCapitalItemName").val();
                 var uom = $("#EditCPUOM").val();
+               var editPer='';
+                if($("#EditPer").val().trim()==''){
+               editPer = $("#EditCPUOM").val();
+               }
+               else{
+               editPer = $("#EditPer").val();
+                    }
+                  
                 var exchangeRate = $("#EditExchangeRtModal").val();
                      var quantity = $("#EditCPQuantity").val();
                      var convertRate = $("#EditCPRate").val();
@@ -4203,6 +4494,7 @@ function clearAfterAddLineItemAdd(){
             var CustomDutyExpenses =  $('#EditCustomDutyExpenses').val();
               var RMCIncludingCustomers = $('#EditRMCIncludingCustomers').val(); 
             var TotalOrderValuePerkg = $("#EdittxtTotalOrderValue").val();
+            
 
            /*get % values */
                 var beforeLanding = $('#EditLandingCharge').val();  
@@ -4215,9 +4507,18 @@ function clearAfterAddLineItemAdd(){
                 var beforeCustomSHCess = $('#EditCustomSHcess').val();
                  var beforeAdditionalExciseDuty =$('#EditAdditionalExciseduty').val(); 
                 var PurQuantity = $('#EditPurQuantity').val(); 
+                 var FreightType = $("#drpEditFreight").val();
+		  var FreightVal = $("#txtEditFreight").val();
+		  var AfterFreightVal = $("#txtEditAfterFreight").val();
+		  var NoOfTrip = $("#EditNOOfTrips").val();
 
             var basicvalInINR=$('#EditAfterBasicPriceTax').val();
-
+            var EditCapitalDescription = $("#EditItemDescription").val();
+            
+		  var DisType = $("#EditDiscountType").val();
+		  var DisVal = $("#txtEditDiscount").val();
+		  var AfterDisVal = $("#txtEditAfterDiscount").val();
+        
 
 
 
@@ -4229,6 +4530,7 @@ function clearAfterAddLineItemAdd(){
 		$('#materialCode'+userid).val(materialCode);
 		$('#materialName'+userid).val(materialName);
 		$('#uom'+userid).val(uom);
+                $('#per'+userid).val(editPer);
 		$('#quantity'+userid).val(quantity);
                $('#rateInUs'+userid).val(itemRate);
 
@@ -4264,7 +4566,9 @@ function clearAfterAddLineItemAdd(){
 			$('#AfterIgst'+userid).val(AfterIgst);
                         
                         $('#OtherAmt'+userid).val(OtherAmt);
-		
+		$('#DisType'+userid).val(DisType);
+			$('#DisVal'+userid).val(DisVal);
+			$('#AfterDisVal'+userid).val(AfterDisVal);
 
                  /* get % value */
                    
@@ -4279,6 +4583,14 @@ function clearAfterAddLineItemAdd(){
                $('#beforeAdditionalExciseDuty'+userid).val(beforeAdditionalExciseDuty);
                $('#PurQuantity'+userid).val(PurQuantity);
                 $('#PerKgExpense'+userid).val(TotalOrderValuePerkg);
+                $('#FreightType'+userid).val(FreightType);
+                $('#FreightVal'+userid).val(FreightVal);
+                $('#NoOfTrip'+userid).val(NoOfTrip);
+                
+                
+                $('#AfterFreightVal'+userid).val(AfterFreightVal);
+                $('#CapitalItemDescrition'+userid).val(EditCapitalDescription);
+
                 cellval[2].innerHTML = materialCode;
                     cellval[3].innerHTML = materialName;
  
@@ -4340,6 +4652,12 @@ function validateEditCapitalTax()
                     alert('Please Enter the Valid Rate of the Item');
                     $('#EditCPRate').focus();
                     return false;
+            }
+             else if($('#EditItemDescription').val() == '')
+            {
+                     alert('Please Enter the Capital Description');
+                 $('#EditItemDescription').focus(); 
+				return false;
             }
             else
             {
@@ -4474,7 +4792,7 @@ function validateEditCapitalTax()
                     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 discountedRateValue = $('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+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();
@@ -4489,7 +4807,7 @@ function validateEditCapitalTax()
 
                      var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val();
                       var CapitalToatlOrderI = $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
-
+                     CapitalToatlOrderI = CapitalToatlOrderI - discountedRateValue;
                  TotCgst = parseFloat(TotCgst) + parseFloat(TotalCgstI);
 		TotSgst = parseFloat(TotSgst) + parseFloat(TotalSgstI);
 		TotIgst = parseFloat(TotIgst) + parseFloat(TotalIgstI);
@@ -4698,9 +5016,23 @@ location.reload();
 
 }
 
-$('#drpFreight').change(function(){
-	var FreightType = $('#drpFreight').val();
-if (FreightType == "PER TRIP")
+$('#insuranceTxtDiv').hide();
+$("#insuranceStatus").change(function(){
+
+if($("#insuranceStatus").val()=="1"){
+$('#insuranceTxtDiv').show();
+
+}
+else{
+$('#insuranceTxtDiv').hide();
+$('#insuranceNo').val('');
+}
+});
+$('#drpFreight').change(function() {
+
+	 var FreightType =$("#drpFreight").val();
+	 
+	if (FreightType == "PER TRIP")
 				{
 					 
 					 $('#TripsValue').show();
@@ -4708,25 +5040,567 @@ if (FreightType == "PER TRIP")
 				else {
 					 
 					 $('#TripsValue').hide();	 
-				} 
+				}
 
+	if($('#AfterBasicPriceTax').val() != '')
+	{
+    selValue = $("#drpFreight").val() ;
+	 $('#txtFreight').val('');
+	  $('#txtAfterFreight').val('');
+	 
+	if (selValue == '<?php echo NILTYPE;?>')
+	{
+     
+		 $('#txtFreight').attr('readonly', 'true');
+		 $('#txtFreight').val('0.00');
+		
+	}
+	else
+	{
+		 $('#txtFreight').removeAttr( 'readonly','true' );
+		 $('#txtFreight').val('');
+		
+		
+	}
+	}
+	else
+		{
+			alert('Please Enter the Rate value');
+			$('#drpFreight').val("0");
+			$('#CPRate').focus();
+		}
+                calculateFreight(0);
+  
 });
-$('#drpeditFreight').change(function(){
-	var FreightType = $('#drpeditFreight').val();
-if (FreightType == "PER TRIP")
+$('#drpEditFreight').change(function() {
+	var FreightType =$("#drpEditFreight").val();
+	 
+	if (FreightType == "PER TRIP")
 				{
 					 
-					 $('#editTripsValue').show();
+					 $('#EditTripsValue').show();
 				}
 				else {
 					 
-					 $('#editTripsValue').hide();	 
-				} 
-
+					 $('#EditTripsValue').hide();	 
+				}
+	if($('#EditAfterBasicPriceTax').val() != '')
+	{
+    selValue = $("#drpEditFreight").val() ;
+	 $('#txtEditFreight').val('');
+	  $('#txtEditAfterFreight').val('');
+	 
+	if (selValue == '<?php echo NILTYPE;?>')
+	{
+     
+		 $('#txtEditFreight').attr('readonly', 'true');
+		 $('#txtEditFreight').val('0.00');
+		
+	}
+	
+	else
+	{
+		 $('#txtEditFreight').removeAttr( 'readonly','true' );
+		 $('#txtEditFreight').val('');
+	}
+	}
+  else
+		{
+			alert('Please Enter the Rate value');
+			$('#drpEditFreight').val("0");
+			$('#EditCPRate').focus();
+		}
+calculateFreight(1);
 });
+
+function calculateFreight(isEdit)
+ {
+
+	 if(isEdit == '0')
+	{ 
+		
+		 if($('#AfterBasicPriceTax').val() == '')
+		 {
+			  alert('Please Enter the Rate value');
+			  $('#CPRate').focus();
+			  $('#txtFreight').val('') ;
+			  return false;
+		 }		
+		 else
+		 {
+			 var basicValue = parseFloat($('#AfterBasicPriceTax').val());
+                         
+			 var FreightType =$("#drpFreight").val();
+			 if(FreightType == "0")
+			 {
+				 alert('Please select Freight Type');
+				 $('#txtFreight').val('');
+				 $("#drpFreight").focus();
+			 }
+			 else if( $('#txtFreight').val() != "0"  && $('#txtFreight').val() != '')
+			 {	
+                        
+				var FreightValue =  parseFloat($('#txtFreight').val());
+				
+				var Quantity          = parseFloat($('#CPQuantity').val());
+				
+				var AfterFreight = 0.0;	
+				if(FreightType == '<?php echo PERCENTAGE;?>')
+				{	
+                                
+					AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;
+                                        
+				}
+				else if(FreightType == '<?php echo NILTYPE;?>')
+				{		
+					AfterFreight = 0.0;	 		  	  
+				}
+				else if(FreightType == '<?php echo LUMPSUM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERUOM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_PERUOM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERTRIP;?>')
+				{
+                                        if($('#NOOfTrips').val()==''){
+                                             alert('Please Enter No of Trip');
+				
+				 $("#NOOfTrips").focus();
+                                 $('#txtFreight').val(0)
+                                 AfterFreight=0;
+                                 $('#txtAfterFreight').val("0.00");
+                                 return false;
+                                            }
+                                            else{
+                                            var noOftrip = $("#NOOfTrips").val();
+                                            AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
+                                            AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
+                                                }
+                                             
+							  	  
+				}
+                            else {
+				AfterFreight = $("#txtFreight").val();
+				}	
+				var AfterFreightval =  parseFloat(AfterFreight).toFixed(2);
+                              
+				$('#txtAfterFreight').val(AfterFreightval); 
+			 }
+			 else
+			 {
+				$('#txtAfterFreight').val("0.00");  
+			 }
+			
+		 } 
+		
+	}
+          else if(isEdit == '3'){
+        
+				
+		 if($('#AfterBasicPriceTax').val() != '')
+		 {
+		 var basicValue = parseFloat($('#AfterBasicPriceTax').val());
+                         
+			 var FreightType =$("#drpFreight").val();
+			
+			  if( $('#txtFreight').val() != "0"  && $('#txtFreight').val() != '')
+			 {	
+                        
+				var FreightValue =  parseFloat($('#txtFreight').val());
+				
+				var Quantity          = parseFloat($('#CPQuantity').val());
+				
+				var AfterFreight = 0.0;	
+				if(FreightType == '<?php echo PERCENTAGE;?>')
+				{	
+                                
+					AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;
+                                        
+				}
+				else if(FreightType == '<?php echo NILTYPE;?>')
+				{		
+					AfterFreight = 0.0;	 		  	  
+				}
+				else if(FreightType == '<?php echo LUMPSUM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERUOM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_PERUOM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERTRIP;?>')
+				{
+                                        if($('#NOOfTrips').val()==''){
+                                             alert('Please Enter No of Trip');
+				
+				 $("#NOOfTrips").focus();
+                                 $('#txtFreight').val(0)
+                                 AfterFreight=0;
+                                 $('#txtAfterFreight').val("0.00");
+                                 return false;
+                                            }
+                                            else{
+                                            var noOftrip = $("#NOOfTrips").val();
+                                            AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
+                                            AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
+                                                }
+                                             
+							  	  
+				}
+                            else {
+				AfterFreight = $("#txtFreight").val();
+				}	
+				var AfterFreightval =  parseFloat(AfterFreight).toFixed(2);
+                              
+				$('#txtAfterFreight').val(AfterFreightval); 
+			 }
+			 else
+			 {
+				$('#txtAfterFreight').val("0.00");  
+			 }	
+			
+		 } 
+            
+            }
+             else if(isEdit == '4'){
+        
+				
+		 if($('#EditAfterBasicPriceTax').val() != '')
+		 {
+			 var basicValue = parseFloat($('#EditAfterBasicPriceTax').val());
+			 var FreightType =$("#drpEditFreight").val();
+			
+			  if( $('#txtEditFreight').val() != "0"  && $('#txtEditFreight').val() != '')
+			 {	
+				var FreightValue =  parseFloat($('#txtEditFreight').val());
+				
+				var Quantity          = parseFloat($('#EditCPQuantity').val());
+				//alert(FreightType);
+				var AfterFreight = 0.0;	
+				if(FreightType == '<?php echo PERCENTAGE;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;		  	  
+				}
+				else if(FreightType == '<?php echo NILTYPE;?>')
+				{		
+					AfterFreight = 0.0;	 		  	  
+				}
+				else if(FreightType == '<?php echo LUMPSUM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERUOM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_PERUOM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERTRIP;?>')
+				{		
+					 if($('#EditNOOfTrips').val()==''){
+                                             alert('Please Enter No of Trip');
+				
+				 $("#EditNOOfTrips").focus();
+                                 $('#txtEditFreight').val(0)
+                                 AfterFreight=0;
+                                 $('#txtEditAfterFreight').val("0.00");
+                                 return false;
+                                            }
+                                            else{
+                                            var noOftrip = $("#EditNOOfTrips").val();
+                                            AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
+                                            AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
+                                                }		  	  
+				}
+                                    else {
+				AfterFreight = $("#txtEditFreight").val();
+				}	
+				var AfterFreightval =  parseFloat(AfterFreight).toFixed(2);
+		 
+				$('#txtEditAfterFreight').val(AfterFreightval); 
+			 }
+			 else
+			 {
+				$('#txtEditAfterFreight').val("0.00");  
+			 }
+			
+		 } 
+            
+            }
+	else
+	{
+		 if($('#EditAfterBasicPriceTax').val() == '')
+		 {
+			  alert('Please Enter the Rate value');
+			 $('#EditCPRate').focus();
+			  $('#txtEditFreight').val('') ;
+			  return false;
+		 }
+				
+		 else
+		 {
+			 var basicValue = parseFloat($('#EditAfterBasicPriceTax').val());
+			 var FreightType =$("#drpEditFreight").val();
+			 if(FreightType == "0")
+			 {
+				 alert('Please select Freight Type');
+				 $('#txtEditFreight').val('');
+				 $("#drpEditFreight").focus();
+			 }
+			 else if( $('#txtEditFreight').val() != "0"  && $('#txtEditFreight').val() != '')
+			 {	
+				var FreightValue =  parseFloat($('#txtEditFreight').val());
+				
+				var Quantity          = parseFloat($('#EditCPQuantity').val());
+				//alert(FreightType);
+				var AfterFreight = 0.0;	
+				if(FreightType == '<?php echo PERCENTAGE;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;		  	  
+				}
+				else if(FreightType == '<?php echo NILTYPE;?>')
+				{		
+					AfterFreight = 0.0;	 		  	  
+				}
+				else if(FreightType == '<?php echo LUMPSUM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERUOM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_PERUOM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERTRIP;?>')
+				{		
+					 if($('#EditNOOfTrips').val()==''){
+                                             alert('Please Enter No of Trip');
+				
+				 $("#EditNOOfTrips").focus();
+                                 $('#txtEditFreight').val(0)
+                                 AfterFreight=0;
+                                 $('#txtEditAfterFreight').val("0.00");
+                                 return false;
+                                            }
+                                            else{
+                                            var noOftrip = $("#EditNOOfTrips").val();
+                                            AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
+                                            AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
+                                                }		  	  
+				}
+                                    else {
+				AfterFreight = $("#txtEditFreight").val();
+				}	
+				var AfterFreightval =  parseFloat(AfterFreight).toFixed(2);
+		 
+				$('#txtEditAfterFreight').val(AfterFreightval); 
+			 }
+			 else
+			 {
+				$('#txtEditAfterFreight').val("0.00");  
+			 }
+			
+		 } 
+			
+
+	}
+ }
+
+/* Capital Discount calcualation */
+
+ $('#DiscountType').change(function() {
+	 if($('#CPRate').val() != '')
+	{
+    selValue = $("#DiscountType").val(); 
+	 $('#txtDiscount').val('');
+	 $('#txtAfterDiscount').val(''); 
+	if (selValue == '<?php echo NILTYPE;?>')
+	{
+      
+		 $('#txtDiscount').attr('readonly', 'true');
+		 $('#txtDiscount').val('0.00');
+		 $('#txtAfterDiscount').val('0.00');
+		 
+	}
+	else
+	{
+		 $('#txtDiscount').removeAttr( 'readonly','true' );
+		 $('#txtDiscount').val('');
+		  $('#txtAfterDiscount').val('');
+	}
+	}
+	else
+		{
+			alert('Please Rate Field Value');
+			
+			$('#CPRate').focus();
+		}
+                Ratechange();
+  
+});
+$('#EditDiscountType').change(function() {
+	if($('#EditCPRate').val() != '')
+	{
+    selValue = $("#EditDiscountType").val(); 
+	 $('#txtEditDiscount').val('');
+	 $('#txtEditAfterDiscount').val(''); 
+	if (selValue == '<?php echo NILTYPE;?>')
+	{
+      
+		 $('#txtEditDiscount').attr('readonly', 'true');
+		 $('#txtEditDiscount').val('0.00');
+		 $('#txtEditAfterDiscount').val('0.00');
+		 
+	}
+	else
+	{
+		 $('#txtEditDiscount').removeAttr( 'readonly','true' );
+		 $('#txtEditDiscount').val('');
+		  $('#txtEditAfterDiscount').val('');
+	}
+	}
+  else
+		{
+			alert('Please Select MaterialCode and Rate Field Value');
+			$('#EditDiscountType').val("0");
+			$('#EditCPRate').focus();
+		}
+                EditRatechange();
+              
+});
+/*
+ * To calcuate the Discount  */
+function calculateDiscount(isEdit)
+ {  
+
+	if(isEdit == '0')
+	{
+    
+	  if($('#CPRate').val() == '')
+	 {
+		  alert('Please Enter the Rate value');
+		  $('#CPRate').focus();
+		  $('#txtDiscount').val('');
+		  return false;
+	 }
+    if($('#CPRate').val() != '')
+	{
+	
+	 var basicValue = parseFloat($('#CPTotalAmount').val());
+	 var DiscountType =$("#DiscountType").val();
+	
+	 if(DiscountType == "0")
+	 {
+		alert('Please Select the discount Type');
+		$('#txtDiscount').val('');
+		$("#DiscountType").focus(); 
+	 }
+	 else  if ($('#txtDiscount').val() != '' && $('#txtDiscount').val() != '0')
+	 {
+	 var AfterDiscount = 0.0;
+	  var Discountval = parseFloat($('#txtDiscount').val());
+	 if(DiscountType == '<?php echo PERCENTAGE;?>')
+	 {
+		
+		AfterDiscount = <?php echo DIS_PERCENTAGE;?>;	
+		  	  
+	 }
+	 else if(DiscountType == '<?php echo NILTYPE;?>' )
+	 {
+	    AfterDiscount = "0.00";				
+	 }
+	 else
+	 {
+		 AfterDiscount = <?php echo DIS_LUMPSUM;?>;			 	
+	 }
+		var discount = parseFloat(AfterDiscount).toFixed(2);
+		$('#txtAfterDiscount').val(discount);	 
+	 }
+	else
+	{
+		$('#txtAfterDiscount').val("0.00");	 
+	}
+        Ratechange();
+	}
+       
+              
+	}
+	else
+	{
+		
+		  
+			if($('#EditCPRate').val() != '')
+			{
+			
+			 var basicValue = parseFloat($('#EditCPTotalAmount').val());
+			 var DiscountType =$("#EditDiscountType").val();
+			
+			 if(DiscountType == "0")
+			 {
+				alert('Please Select the discount Type');
+				$('#txtEditDiscount').val('');
+				$("#EditDiscountType").focus(); 
+			 }
+			 else  if ($('#txtEditDiscount').val() != '' && $('#txtEditDiscount').val() != '0')
+			 {
+			 var AfterDiscount = 0.0;
+			  var Discountval = parseFloat($('#txtEditDiscount').val());
+			 if(DiscountType == '<?php echo PERCENTAGE;?>')
+			 {
+				
+				AfterDiscount = <?php echo DIS_PERCENTAGE;?>;	
+					  
+			 }
+			 else if(DiscountType == '<?php echo NILTYPE;?>' )
+			 {
+				AfterDiscount = "0.00";				
+			 }
+			 else
+			 {
+				 AfterDiscount = <?php echo DIS_LUMPSUM;?>;			 	
+			 }
+				var discount = parseFloat(AfterDiscount).toFixed(2);
+				$('#txtEditAfterDiscount').val(discount);	 
+			 }
+			else
+			{
+				$('#txtEditAfterDiscount').val("0.00");	 
+			}
+                        EditRatechange();
+			}
+                              	
+	}
+ }
+function updateDiscountValuesChange(totAmt,disType){
+
+			 var basicValue = totAmt;
+			 var DiscountType =disType;
+			
+			
+			 var AfterDiscount = 0.0;
+			  var Discountval = parseFloat($('#txtEditDiscount').val());
+			 if(DiscountType == '<?php echo PERCENTAGE;?>')
+			 {
+				
+				AfterDiscount = <?php echo DIS_PERCENTAGE;?>;	
+					  
+			 }
+			 else if(DiscountType == '<?php echo NILTYPE;?>' )
+			 {
+				AfterDiscount = "0.00";				
+			 }
+			 else
+			 {
+				 AfterDiscount = <?php echo DIS_LUMPSUM;?>;			 	
+			 }
+				var discount = parseFloat(AfterDiscount).toFixed(2);
+				return discount;
+			 }
     </script>
 
 
   
 
 
+
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php
index 56391f40..f7cb4cd3 100755
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -1,5 +1,7 @@
     <?php 
-
+         $insuranceStatus = array(
+        array("name"=>"NO","value"=>"0"),array("name"=>"YES","value"=>"1")
+        );
         $requestedBy=$requestedBy[0]->FirstName;
 	$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
     $CurrentDate =  $dt->format('d-m-Y');
@@ -66,6 +68,15 @@
             $ExitTotalOrderValue=0;
 
             $ExitExchangeRate='';
+
+                 $ModeOfShipment='';
+                $SupplierReference='';
+                $SuppliersOfferNo='';
+                $OtherReferences='';
+                $Fincap='';
+                $InsuranceOptions='';
+                $InsuranceNo='';
+                $ServiceTypeOptions='';
 if(!empty($INRSYMBOL))
 { 
    foreach ($INRSYMBOL as $INR) 
@@ -133,6 +144,15 @@ if(!empty($POMaster))
                         else{
                         $ExitTotalOrderValue=$Req->TotalOrderValue;
                             }
+                       
+                $ModeOfShipment=$Req->Mode_Of_Shipment;	
+                $SupplierReference=$Req->Supplier_Reference;	
+                $SuppliersOfferNo=$Req->Supplier_Offer_No;	
+                $OtherReferences=$Req->Other_Reference;	
+                $Fincap=$Req->Fincap;	
+                $InsuranceOptions=$Req->InsuranceStatus;	
+                $InsuranceNo=$Req->InsuranceNumber;	
+                $ServiceTypeOptions=$Req->POSubType;	
                 
     }
 
@@ -180,6 +200,28 @@ if(!empty($AvlBudAmt))
            statusbar: false,
            toolbar: false
         });
+        tinymce.init({
+          selector: "textarea#ItemDescription",
+          menubar: false,
+           statusbar: false,
+           toolbar: false
+        });
+         tinymce.init({
+          selector: "textarea#EditItemDescription",
+          menubar: false,
+           statusbar: false,
+           toolbar: false
+        });
+         tinymce.init({
+          selector: "textarea#ViewItemDescription",
+          menubar: false,
+           statusbar: false,
+           toolbar: false,
+           readonly : 1
+        });
+
+        
+var insuranceOpt = '<?php echo $InsuranceOptions; ?>';
     var DelOpt = '<?php echo $DeliverOption; ?>';
     var SchName = <?php echo json_encode($DeliverSchedule); ?>;
 var DelDt = '<?php echo $Deliverydt; ?>';
@@ -187,6 +229,12 @@ var DelDt = '<?php echo $Deliverydt; ?>';
 $(document).ready(function () {
 	
 	$("#PaymentTerms").select2();
+        if(insuranceOpt=="1"){
+ 
+}
+else{
+$('#insuranceTxtDiv').hide();
+}
      if(DelOpt=="0"){
  $('#Deliverydtdiv').hide();
                     $('#Schedulediv').hide();
@@ -575,7 +623,7 @@ $("#PaymentMethod").select2();
             <div class="form-group">
             
                   <?php
-               $data = array('name' => 'editmodeofshipment','value' => set_value('editmodeofshipment'),'id'=>'editmodeofshipment',  'class' => 'form-control');
+               $data = array('name' => 'editmodeofshipment','value' => set_value('editmodeofshipment',$ModeOfShipment),'id'=>'editmodeofshipment',  'class' => 'form-control');
               echo form_input($data);
               ?>   
             </div>
@@ -591,7 +639,7 @@ $("#PaymentMethod").select2();
             <div class="form-group">
             
                   <?php
-               $data = array('name' => 'editsupplierreference','value' => set_value('editsupplierreference'),'id'=>'editsupplierreference',  'class' => 'form-control');
+               $data = array('name' => 'editsupplierreference','value' => set_value('editsupplierreference',$SupplierReference),'id'=>'editsupplierreference',  'class' => 'form-control');
               echo form_input($data);
               ?>   
             </div>
@@ -607,8 +655,9 @@ $("#PaymentMethod").select2();
             <div class="form-group">
             
                   <?php
-               $data = array('name' => 'editsupplierofferno','value' => set_value('editsupplierofferno'),'id'=>'editsupplierofferno',  'class' => 'form-control');
+               $data = array('name' => 'editsupplierofferno','value' => set_value('editsupplierofferno',$SuppliersOfferNo),'id'=>'editsupplierofferno',  'class' => 'form-control');
               echo form_input($data);
+              
               ?>   
             </div>
 
@@ -621,7 +670,7 @@ $("#PaymentMethod").select2();
             <div class="form-group">
             
                   <?php
-               $data = array('name' => 'editotherreference','value' => set_value('editotherreference'),'id'=>'editotherreference',  'class' => 'form-control');
+               $data = array('name' => 'editotherreference','value' => set_value('editotherreference',$OtherReferences),'id'=>'editotherreference',  'class' => 'form-control');
               echo form_input($data);
               ?>   
             </div>
@@ -631,7 +680,7 @@ $("#PaymentMethod").select2();
             <div class="form-group">
             
                   <?php
-               $data = array('name' => 'editfincap','value' => set_value('editfincap'),'id'=>'editfincap',  'class' => 'form-control');
+               $data = array('name' => 'editfincap','value' => set_value('editfincap',$Fincap),'id'=>'editfincap',  'class' => 'form-control');
               echo form_input($data);
               ?>   
             </div>
@@ -640,6 +689,99 @@ $("#PaymentMethod").select2();
   </div> 
   </div>
   </div><!--End new fields 1 sep-->
+    <!--start new fields 1 sep-->
+	<div class="row">
+	<div class="col-md-12">	
+	<div class="col-md-3">
+	<div class="col-md-12" style="padding: 0px;">
+	 
+
+	  <label>Service Type Options</label>
+						<div class="form-group">
+						
+							 <?php
+
+				   //$optionsWork = array("0"=>'Select Work Status');     
+						
+						
+						if(!empty($PoTypeOptions))
+						{
+						foreach ($PoTypeOptions as $POpt):
+						  
+					       if($ServiceTypeOptions==$POpt->ConfigValue){
+						  $optionsPO[$POpt->ConfigValue] =  $POpt->ConfigValue;
+                                                  }
+						endforeach;
+                                                foreach ($PoTypeOptions as $POpt1):
+						  
+					       if($ServiceTypeOptions!=$POpt1->ConfigValue){
+						  $optionsPO[$POpt1->ConfigValue] =  $POpt1->ConfigValue;
+                                                  }
+						endforeach;
+						}										
+			
+						echo form_dropdown('PoTypeOptions', $optionsPO,set_value('PoTypeOptions'),'id="PoTypeOptions"'  ,'required="true"' ,'class="form-control select2');
+
+
+						?> 
+						</div>
+
+
+
+	</div> 
+	</div>
+	<div class="col-md-9" style="padding:0px;">
+	<div class="col-md-4" style="padding:0px;" >
+	<div class="col-md-12">
+ <label>Insurance Options</label>
+						<div class="form-group">
+						
+							 <?php
+                                                        
+						if(!empty($insuranceStatus))
+						{
+						foreach ($insuranceStatus as $INS):
+						  if($InsuranceOptions==$INS['value']){
+                                                   $optionsInsurance[$INS['value']] =  $INS['name'];
+                                                     }
+					   
+						 
+
+						endforeach;
+                                                	foreach ($insuranceStatus as $INS1):
+						  if($InsuranceOptions!=$INS1['value']){
+                                                   $optionsInsurance[$INS1['value']] =  $INS1['name'];
+                                                     }
+					   
+						 
+
+						endforeach;
+						}										
+			
+						echo form_dropdown('insuranceStatus', $optionsInsurance,set_value('insuranceStatus'),'id="insuranceStatus"'  ,'required="true"' ,'class="form-control select2');
+
+
+						?>
+						</div>
+
+
+	
+
+	</div>
+	</div>
+	<div class="col-md-4" id="insuranceTxtDiv"  style="display:block;">
+                     <label>Insurance No<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
+                       <div class="form-group">                        
+                           <?php
+                            $data = array('name' => 'insuranceNo','value' => set_value('insuranceNo',$InsuranceNo),'id'=>'insuranceNo',  'class' => 'form-control' ,'required' => 'true');
+                           echo form_input($data);
+                           ?>  
+                       </div>
+               </div>
+	 
+	</div> 
+	</div>
+	</div><!--End new fields 1 sep-->
 
 			<div class="col-md-12" style="padding: 0px;">
 		    <div class="col-md-3">
@@ -692,11 +834,12 @@ $("#PaymentMethod").select2();
 	</div>
           </div>	   
        </div>
-             </div>
+             </div> <?php if($POStatus == PO_DRAFT || $POStatus == PO_CREATED) { ?>
                      <div class="col-md-12">
                     <div align="right">
     <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-primary" id="abcd" >Select Line Item</button> </a> 
                     </div>
+                    <?php } ?>
     <br>
       </div>
              <div class="box-body">
@@ -726,6 +869,7 @@ $("#PaymentMethod").select2();
                     {
                          $index = 0;
                        $totalCapitalOrder=0;
+                       $TotalDiscountedAmt=0;
                         foreach($POItem as $record)
                         {
                             $index = $index + 1;
@@ -764,6 +908,8 @@ $("#PaymentMethod").select2();
 <input type="hidden" name="<?php echo 'materialCode'.$index ?>" id="<?php echo 'materialCode'.$index ?>" value="<?php echo $record->MaterialCode ; ?>" />
 <input type="hidden" name="<?php echo 'materialName'.$index ?>" id="<?php echo 'materialName'.$index ?>" value="<?php echo $record->MaterialName ; ?>" />
 <input type="hidden" name="<?php echo 'uom'.$index ?>" id="<?php echo 'uom'.$index ?>" value="<?php echo $record->UOM ; ?>" />
+<input type="hidden" name="<?php echo 'per'.$index ?>" id="<?php echo 'per'.$index ?>" value="<?php echo $record->Per ; ?>" />
+<input type="hidden" name="<?php echo 'CapitalItemDescrition'.$index ?>" id="<?php echo 'CapitalItemDescrition'.$index ?>" value="<?php echo $record->ServiceMaterialDescription ; ?>" />
 <input type="hidden" name="<?php echo 'quantity'.$index ?>" id="<?php echo 'quantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
 <input type="hidden" name="<?php echo 'itemRate'.$index ?>" id="<?php echo 'itemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" />
 <?php if($CapitalRange=='1'){ ?>
@@ -778,11 +924,16 @@ $("#PaymentMethod").select2();
 <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 ; ?>" />
-
+<input align="right" type="hidden" name="<?php echo 'DisType'.$index ?>" id="<?php echo 'DisType'.$index ?>" value="<?php echo $record->discount ; ?>" />
+ <input align="right" type="hidden" name="<?php echo 'DisVal'.$index ?>" id="<?php echo 'DisVal'.$index ?>" value="<?php echo $record->discountval ; ?>" />
+ <input align="right" type="hidden" name="<?php echo 'AfterDisVal'.$index ?>" id="<?php echo 'AfterDisVal'.$index ?>" value="<?php echo $record->Afterdiscountval ; ?>" />
 <?php } ?>
 
 <?php if($CapitalRange=='0'){ ?>
-
+ <input align="right" type="hidden" name="<?php echo 'FreightType'.$index ?>" id="<?php echo 'FreightType'.$index ?>" value="<?php echo $record->FreightType ; ?>" />
+<input align="right" type="hidden" name="<?php echo 'NoOfTrip'.$index ?>" id="<?php echo 'NoOfTrip'.$index ?>" value="<?php echo $record->NoOfTrip ; ?>" />
+ <input align="right" type="hidden" name="<?php echo 'FreightVal'.$index ?>" id="<?php echo 'FreightVal'.$index ?>" value="<?php echo $record->FreightValue ; ?>" />
+ <input align="right" type="hidden" name="<?php echo 'AfterFreightVal'.$index ?>" id="<?php echo 'AfterFreightVal'.$index ?>" value="<?php echo $record->AfterFreightValue ; ?>" />
 <input type="hidden" name="<?php echo 'rateInUs'.$index ?>" id="<?php echo 'rateInUs'.$index ?>" value="<?php echo $record->BasicPriceInMTon ; ?>" />
 <input type="hidden" name="<?php echo 'basicvalInINR'.$index ?>" id="<?php echo 'basicvalInINR'.$index ?>" value="<?php echo $record->ProductPrice ; ?>" />
 <input type="hidden" name="<?php echo 'beforeLanding'.$index ?>" id="<?php echo 'beforeLanding'.$index ?>" value="<?php echo $record->LandingCharge; ?>" />
@@ -834,6 +985,9 @@ $("#PaymentMethod").select2();
 <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" />
+<input align="right" type="hidden" name="<?php echo 'DisType'.$index ?>" id="<?php echo 'DisType'.$index ?>" value="0" />
+ <input align="right" type="hidden" name="<?php echo 'DisVal'.$index ?>" id="<?php echo 'DisVal'.$index ?>" value="0" />
+ <input align="right" type="hidden" name="<?php echo 'AfterDisVal'.$index ?>" id="<?php echo 'AfterDisVal'.$index ?>" value="0" />
 
 <?php } ?>
 
@@ -857,6 +1011,7 @@ $("#PaymentMethod").select2();
                             $TotalIgst = $TotalIgst + $record->After_IGST;
                             $OtherAmt =  $OtherAmt +  $record->otherallowance;
                             $TotalSummary = $TotalSummary+$record->ServiceTaxamount;
+                            $TotalDiscountedAmt = $TotalDiscountedAmt + $record->Afterdiscountval;
                             }
                             $TotalBasicAmount = $TotalBasicAmount+$record->BasicValue;
                             $ServiceDescription = $ServiceDescription;
@@ -882,7 +1037,7 @@ $("#PaymentMethod").select2();
                                
                          
                                // $totorder=$totorder+$record->TotalOrderValue;
-                                $totalCapitalOrder = $totalCapitalOrder+$record->Rate * $record->Quantity;
+                                $totalCapitalOrder = $totalCapitalOrder+$record->Rate * $record->Quantity-$TotalDiscountedAmt;
 
                                 
 
@@ -1016,7 +1171,7 @@ $("#PaymentMethod").select2();
 						<label>Quantity</label>
 						<div class="form-group">
 							<?php
-							$data = array('name' => 'CPQuantity','value' => set_value('CPQuantity'),'id'=>'CPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();');
+							$data = array('name' => 'CPQuantity','value' => set_value('CPQuantity'),'id'=>'CPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);');
 							echo form_input($data);
 							?>
 						</div>
@@ -1025,7 +1180,7 @@ $("#PaymentMethod").select2();
 						<label id="RateIn">Rate(In INR /UOM)</label>
 						<div class="form-group">
 							<?php
-							$data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();' );
+							$data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);' );
 							echo form_input($data);
 							?>
 						</div>
@@ -1049,6 +1204,49 @@ $("#PaymentMethod").select2();
                                                 </div>
                                                 <div class="col-md-12" style="padding:0px">		
 							<div class="col-md-12" id="ADDCAPdiv" style="padding:0px">
+                                                        <div class="col-md-12">                             <div class="col-md-4">
+                                                            </div>
+                                                        <div class="col-md-4">
+                                                            <label>Discount Type </label>
+                                                            <div>
+                                                                <?php
+                                                                $options = array("0"=>'Select Discount Type');
+                                                                //print_r(  $options);
+
+                                                                if(!empty($TaxType))
+                                                                {
+                                                                    foreach ($TaxType as $SID):
+
+
+                                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+                                                                    endforeach;
+                                                                }
+
+                                                                echo form_dropdown('DiscountType', $options,set_value('DiscountType'),'id="DiscountType"' ,'class="form-control"');
+
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-2">
+                                                            <label>Discount Rate </label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'txtDiscount','value' => set_value('txtDiscount'),'id'=>'txtDiscount',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'calculateDiscount(0);');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-2">
+                                                            <label>Discounted Amt In INR</label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'txtAfterDiscount','value' => set_value('txtAfterDiscount',0.00),'id'=>'txtAfterDiscount',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+</div>
 					<div class="col-md-6" align="right">
 							 
 				CGST In %
@@ -1424,7 +1622,7 @@ $("#PaymentMethod").select2();
                                                                     endforeach;
                                                                 }
 
-                                                                echo form_dropdown('drpaddFreight', $options,set_value('drpaddFreight'),'id="drpaddFreight"' ,'class="form-control "');
+                                                                echo form_dropdown('drpFreight', $options,set_value('drpFreight'),'id="drpFreight"' ,'class="form-control "');
 
                                                                 ?>
                                                             </div>
@@ -1433,7 +1631,7 @@ $("#PaymentMethod").select2();
                                                             <span>NO Of Trips</span>
                                                             <div class="form-group">
                                                                 <?php
-                                                                $data = array('name' => 'addNOOfTrips','value' => set_value('addNOOfTrips'),'id'=>'addNOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
+                                                                $data = array('name' => 'NOOfTrips','value' => set_value('NOOfTrips'),'id'=>'NOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
                                                                 echo form_input($data);
                                                                 ?>
                                                             </div>
@@ -1442,7 +1640,7 @@ $("#PaymentMethod").select2();
                                                             <span>Freight Rate </span>
                                                             <div class="form-group">
                                                                 <?php
-                                                                $data = array('name' => 'addtxtFreight','value' => set_value('addtxtFreight'),'id'=>'addtxtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
+                                                                $data = array('name' => 'txtFreight','value' => set_value('txtFreight'),'id'=>'txtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
                                                                 echo form_input($data);
                                                                 ?>
                                                             </div>
@@ -1452,7 +1650,7 @@ $("#PaymentMethod").select2();
                                                             <span>Freight Amt In INR</span>
                                                             <div class="form-group">
                                                                 <?php
-                                                                $data = array('name' => 'addtxtAfterFreight','value' => set_value('addtxtAfterFreight'),'id'=>'addtxtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                                $data = array('name' => 'txtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
                                                                 echo form_input($data);
                                                                 ?>
                                                             </div>
@@ -1540,7 +1738,15 @@ $("#PaymentMethod").select2();
 
 
 
+                                                 <div class="col-md-12" style="padding: 0px 30px 10px 30px;"> 
+                             <label>Capital Description </label>	
+                         
 
+							<?php
+						 $data = array('name' => 'ItemDescription','value' => set_value('ItemDescription'),'id'=>'ItemDescription',  'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
+						echo form_textarea($data); ?>
+							 
+						</div> 
 
                                             <div class="modal-footer">
                                                 <a class="btn btn-primary font AddCapital"  ID="AddCapital"  > &nbsp;&nbsp;<span class="bold">Add Capital</span></a>
@@ -1665,7 +1871,7 @@ $("#PaymentMethod").select2();
 					<label>Quantity</label>
 					<div class="form-group">
 						<?php
-						$data = array('name' => 'EditCPQuantity','value' => set_value('EditCPQuantity'),'id'=>'EditCPQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();');
+						$data = array('name' => 'EditCPQuantity','value' => set_value('EditCPQuantity'),'id'=>'EditCPQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();calculateFreight(4)');
 						echo form_input($data);
 						?>
 					</div>
@@ -1674,7 +1880,7 @@ $("#PaymentMethod").select2();
 					<label id="EditRateIn">Rate(in INR/UOM)</label>
 					<div class="form-group">
 						<?php
-						$data = array('name' => 'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();' );
+						$data = array('name' => 'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();calculateFreight(4);' );
 						echo form_input($data);
 						?>
 					</div>
@@ -1699,6 +1905,49 @@ $("#PaymentMethod").select2();
                                                 <div class="col-md-12">											
             <div class="col-md-12"  style="border:1px solid #000;padding:0px;">
                 <div class="col-md-12" id="EDITCAPdiv">
+                 <div class="col-md-12">                                                   <div class="col-md-4">
+                                                                                                        </div>
+												<div class="col-md-4">
+															  <label>Discount Type </label>
+																		<div>
+																			 <?php
+																			$options = array("0"=>'Select Discount Type');     
+																			//print_r(  $options);
+																			
+																			if(!empty($TaxType))
+																			{
+																			foreach ($TaxType as $SID):
+																			  
+																		   
+																			  $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+																			endforeach;
+																			}										
+																
+																			echo form_dropdown('EditDiscountType', $options,set_value('EditDiscountType'),'id="EditDiscountType"' ,'class="form-control"');
+
+																			?>						 
+																		</div>
+											 </div>
+											 <div class="col-md-2">
+															  <label>Discount Rate </label>
+															  <div class="form-group">
+																					<?php
+																			 $data = array('name' => 'txtEditDiscount','value' => set_value('txtEditDiscount'),'id'=>'txtEditDiscount',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange();calculateDiscount(1);','style'=>'text-align:right;');
+																			echo form_input($data);
+																			?>   
+																		</div> 
+											</div>
+											 <div class="col-md-2">
+															  <label>Discounted Amt In INR  </label>
+															  <div class="form-group">
+																					<?php
+																			 $data = array('name' => 'txtEditAfterDiscount','value' => set_value('txtEditAfterDiscount'),'id'=>'txtEditAfterDiscount',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
+																			echo form_input($data);
+																			?>   
+																		</div> 
+											</div>	
+                                                                                            </div>
 					<div class="col-md-6" align="right">
 							 
 				CGST In %
@@ -2074,7 +2323,7 @@ $("#PaymentMethod").select2();
                                                                     endforeach;
                                                                 }
 
-                                                                echo form_dropdown('drpeditFreight', $options,set_value('drpeditFreight'),'id="drpeditFreight"' ,'class="form-control "');
+                                                                echo form_dropdown('drpEditFreight', $options,set_value('drpEditFreight'),'id="drpEditFreight"' ,'class="form-control "');
 
                                                                 ?>
                                                             </div>
@@ -2083,7 +2332,7 @@ $("#PaymentMethod").select2();
                                                             <span>NO Of Trips</span>
                                                             <div class="form-group">
                                                                 <?php
-                                                                $data = array('name' => 'editNOOfTrips','value' => set_value('editNOOfTrips'),'id'=>'editNOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
+                                                                $data = array('name' => 'EditNOOfTrips','value' => set_value('EditNOOfTrips'),'id'=>'EditNOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(1);' );
                                                                 echo form_input($data);
                                                                 ?>
                                                             </div>
@@ -2092,7 +2341,7 @@ $("#PaymentMethod").select2();
                                                             <span>Freight Rate </span>
                                                             <div class="form-group">
                                                                 <?php
-                                                                $data = array('name' => 'edittxtFreight','value' => set_value('txtFreight'),'id'=>'txtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
+                                                                $data = array('name' => 'txtEditFreight','value' => set_value('txtEditFreight'),'id'=>'txtEditFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(1);');
                                                                 echo form_input($data);
                                                                 ?>
                                                             </div>
@@ -2102,7 +2351,7 @@ $("#PaymentMethod").select2();
                                                             <span>Freight Amt In INR</span>
                                                             <div class="form-group">
                                                                 <?php
-                                                                $data = array('name' => 'edittxtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                                $data = array('name' => 'txtEditAfterFreight','value' => set_value('txtEditAfterFreight'),'id'=>'txtEditAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
                                                                 echo form_input($data);
                                                                 ?>
                                                             </div>
@@ -2188,7 +2437,15 @@ $("#PaymentMethod").select2();
                                                 </div>
 
 
+                                                 <div class="col-md-12" style="padding: 0px 30px 10px 30px;"> 
+                             <label>Capital Description </label>	
+                         
 
+							<?php
+						 $data = array('name' => 'EditItemDescription','value' => set_value('EditItemDescription'),'id'=>'EditItemDescription',  'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
+						echo form_textarea($data); ?>
+							 
+						</div> 
 
 
                                             <div class="modal-footer">
@@ -2313,7 +2570,7 @@ $("#PaymentMethod").select2();
 						<label>Quantity</label>
 						<div class="form-group">
 							<?php
-							$data = array('name' => 'ViewCPQuantity','value' => set_value('ViewCPQuantity'),'id'=>'ViewCPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();');
+							$data = array('name' => 'ViewCPQuantity','value' => set_value('ViewCPQuantity'),'id'=>'ViewCPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();','readonly' => 'true');
 							echo form_input($data);
 							?>
 						</div>
@@ -2322,14 +2579,14 @@ $("#PaymentMethod").select2();
 						<label id="ViewRateIn">Rate(in INR/UOM)</label>
 						<div class="form-group">
 							<?php
-							$data = array('name' => 'ViewCPRate','value' => set_value('ViewCPRate'),'id'=>'ViewCPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();' );
+							$data = array('name' => 'ViewCPRate','value' => set_value('ViewCPRate'),'id'=>'ViewCPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();','readonly' => 'true' );
 							echo form_input($data);
 							?>
 						</div>
 					</div>
           <div class="col-md-3">
               <label>Per</label>  <?php
-            $data = array('name' => 'ViewPer','value' => set_value('ViewPer'),'id'=>'ViewPer',  'class' => 'form-control');
+            $data = array('name' => 'ViewPer','value' => set_value('ViewPer'),'id'=>'ViewPer',  'class' => 'form-control','readonly' => 'true');
            echo form_input($data); ?>
               </div>
 					<div class="col-md-3">
@@ -2346,6 +2603,39 @@ $("#PaymentMethod").select2();
                                                 </div>
                                                 <div class="col-md-12" style="padding: 0px;">											
                                             <div class="col-md-12" id="VIEWCAPdiv" style="padding: 0px;">
+                                            <div class="col-md-12">                                                   <div class="col-md-4">
+                                                                                                        </div>
+												<div class="col-md-4">
+															  <label>Discount Type </label>
+																		<div>
+																			 <?php
+																													
+																
+                                                                                                                                                  $data = array('name' => 'ViewDiscountType','value' => set_value('ViewDiscountType'),'id'=>'ViewDiscountType',  'class' => 'form-control num'  ,'readonly' => 'true');
+                                                                                                                                                            echo form_input($data);
+                                                                                                                                                        
+																			?>						 
+																		</div>
+											 </div>
+											 <div class="col-md-2">
+															  <label>Discount Rate </label>
+															  <div class="form-group">
+																					<?php
+																			 $data = array('name' => 'txtViewDiscount','value' => set_value('txtViewDiscount'),'id'=>'txtViewDiscount',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange();calculateDiscount(1);','style'=>'text-align:right;','readonly' => 'true');
+																			echo form_input($data);
+																			?>   
+																		</div> 
+											</div>
+											 <div class="col-md-2">
+															  <label>Discounted Amt In INR  </label>
+															  <div class="form-group">
+																					<?php
+																			 $data = array('name' => 'txtViewAfterDiscount','value' => set_value('txtViewAfterDiscount'),'id'=>'txtViewAfterDiscount',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
+																			echo form_input($data);
+																			?>   
+																		</div> 
+											</div>	
+                                                                                            </div>
                                 <div class="col-md-6" align="right">
 							 
 				CGST In %
@@ -2355,7 +2645,7 @@ $("#PaymentMethod").select2();
 							 <div class="form-group">
 							 
 												<?php
-										 $data = array('name' => 'ViewCgst','value' => set_value('ViewCgst'),'id'=>'ViewCgst',  'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+										 $data = array('name' => 'ViewCgst','value' => set_value('ViewCgst'),'id'=>'ViewCgst',  'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange()','readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -2383,7 +2673,7 @@ $("#PaymentMethod").select2();
 							 <div class="form-group">
 							 
 												<?php
-										 $data = array('name' => 'ViewSgst','value' => set_value('ViewSgst'),'id'=>'ViewSgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+										 $data = array('name' => 'ViewSgst','value' => set_value('ViewSgst'),'id'=>'ViewSgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()','readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -2412,7 +2702,7 @@ $("#PaymentMethod").select2();
 							 <div class="form-group">
 							 
 												<?php
-										 $data = array('name' => 'ViewIgst','value' => set_value('ViewIgst'),'id'=>'ViewIgst',  'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+										 $data = array('name' => 'ViewIgst','value' => set_value('ViewIgst'),'id'=>'ViewIgst',  'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()','readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -2437,7 +2727,7 @@ $("#PaymentMethod").select2();
 		<div class="col-md-3">
 							 <div class="form-group">
 													<?php
-											 $data = array('name' => 'ViewOtherAllowances','value' => set_value('ViewOtherAllowances'),'id'=>'ViewOtherAllowances',  'class' => 'form-control num' ,'placeholder' => 'Other Allowances');
+											 $data = array('name' => 'ViewOtherAllowances','value' => set_value('ViewOtherAllowances'),'id'=>'ViewOtherAllowances',  'class' => 'form-control num' ,'placeholder' => 'Other Allowances','readonly' => 'true');
 											echo form_input($data);
 											?>   
 										</div>
@@ -2720,7 +3010,7 @@ $("#PaymentMethod").select2();
                                                                     endforeach;
                                                                 }
 
-                                                                echo form_dropdown('drpviewFreight', $options,set_value('drpviewFreight'),'id="drpviewFreight"' ,'class="form-control "');
+                                                                echo form_dropdown('drpViewFreight', $options,set_value('drpViewFreight'),'id="drpViewFreight"' ,'class="form-control "');
 
                                                                 ?>
                                                             </div>
@@ -2729,7 +3019,7 @@ $("#PaymentMethod").select2();
                                                             <span>NO Of Trips</span>
                                                             <div class="form-group">
                                                                 <?php
-                                                                $data = array('name' => 'viewNOOfTrips','value' => set_value('viewNOOfTrips'),'id'=>'viewNOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
+                                                                $data = array('name' => 'ViewNOOfTrips','value' => set_value('ViewNOOfTrips'),'id'=>'ViewNOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(2);' );
                                                                 echo form_input($data);
                                                                 ?>
                                                             </div>
@@ -2738,7 +3028,7 @@ $("#PaymentMethod").select2();
                                                             <span>Freight Rate </span>
                                                             <div class="form-group">
                                                                 <?php
-                                                                $data = array('name' => 'viewtxtFreight','value' => set_value('viewtxtFreight'),'id'=>'viewtxtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
+                                                                $data = array('name' => 'txtViewFreight','value' => set_value('txtViewFreight'),'id'=>'txtViewFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(2);');
                                                                 echo form_input($data);
                                                                 ?>
                                                             </div>
@@ -2748,7 +3038,7 @@ $("#PaymentMethod").select2();
                                                             <span>Freight Amt In INR</span>
                                                             <div class="form-group">
                                                                 <?php
-                                                                $data = array('name' => 'viewtxtAfterFreight','value' => set_value('viewtxtAfterFreight'),'id'=>'viewtxtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                                $data = array('name' => 'txtViewAfterFreight','value' => set_value('txtViewAfterFreight'),'id'=>'txtViewAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
                                                                 echo form_input($data);
                                                                 ?>
                                                             </div>
@@ -2836,9 +3126,22 @@ $("#PaymentMethod").select2();
 
 
 
+<div class="col-md-12" style="padding: 0px 30px 10px 30px;"> 
+                             <label>Capital Description </label>	
+                         
+
+							<?php
+						 $data = array('name' => 'ViewItemDescription','value' => set_value('ViewItemDescription'),'id'=>'ViewItemDescription',  'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
+						echo form_textarea($data); ?>
+							 
+						</div> 
+
 
                                             <div class="modal-footer">
-                                                 
+                                                <?php if($CapitalRange!=1){ ?>
+                                                <a class="btn btn-primary font ViewCapital"  ID="ViewUpdateCapital"  >&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
+                                                <?php } ?>
+                                                <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                             </div>
                                         </div>
@@ -3038,8 +3341,9 @@ $("#PaymentMethod").select2();
 				<a class="btn btn-primary Save"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
                                 <a class="btn btn-primary Save"  ID="Cancel" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
 				
-				<?php }else {?>
-				  <a class="btn btn-primary"  ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>  <?php } ?>
+				<?php  }else { if($CapitalRange!=1){?>
+                                <a class="btn btn-primary Save"  ID="Save" onclick="Save(2)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
+				  <?php } ?><a class="btn btn-primary"  ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>  <?php } ?>
 
 		</div>  
              
@@ -3135,7 +3439,7 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
  }
 
     $('#drpSupplier').change(function() {
-
+var PaymentOtherData = '<?php echo $otherPayment; ?>';
      var id = $('#drpSupplier').val();
  var supPaymentTerms='';
    
@@ -3160,6 +3464,11 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
                  $('#otheroptiondiv').hide();  
                     $('#Otherpayment').val('');
                     }
+                    else if(supPaymentTerms=='PT08'){
+                        $('#otheroptiondiv').show();
+                        $('#Otherpayment').val(PaymentOtherData);
+                        
+                        }
                     $('#PaymentMethod').empty();
                  var paymentList = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
 
@@ -3462,18 +3771,27 @@ EditRatechange();
               //var txtUnitPrice = parseFloat($('#Rate').val());
              
         var txtExchangeRate='';
+         var BasicInINR='';
           if(capitalType=='International'){
            txtExchangeRate = parseFloat( $('#ExchangeRtModal').val());
             var Tot =  txtQuantity * RatePerTon;
+            BasicInINR=Tot * txtExchangeRate;
              }
 
          else{
-            var Tot =  txtQuantity * RatePerTon;
+         var Tot =  txtQuantity * RatePerTon;
+          if ($('#txtDiscount').val() != '' && $('#txtDiscount').val() != '0')
+			 {
+              $('#txtAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#DiscountType").val()));
+		}
+         var discountedValue =  parseFloat($('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val()).toFixed(2);
+            
            txtExchangeRate = 1;
+           BasicInINR=Tot * txtExchangeRate - discountedValue;
              }
 
        
-        var BasicInINR=Tot * txtExchangeRate;
+  
        
 
               $('#CPTotalAmount').val(parseFloat(Tot).toFixed(2));
@@ -3609,6 +3927,7 @@ EditRatechange();
             }
             else {
                     return true;
+                    
             }
      } 
     /*
@@ -3964,7 +4283,7 @@ if(isNaN(CustomDutyExpenses))
   
     /* This is used add capital po line item */
     $('.AddCapital').click(function(){
-
+         tinyMCE.triggerSave();
 
           if(validateCapitalTax() && validateExceedLimit() && ExceedQuantityCheck())
               {
@@ -3977,6 +4296,13 @@ if(isNaN(CustomDutyExpenses))
                 var materialCode =$('#MaterialCode').val();
                 var materialName =  $("#CapitalItemName").val();
                 var uom = $("#CPUOM").val();
+                 var addPer='';
+                if($("#AddPer").val().trim()==''){
+               addPer = $("#CPUOM").val();
+               }
+               else{
+               addPer = $("#AddPer").val();
+                    }
                 var exchangeRate = $("#ExchangeRtModal").val();
                      var quantity = $("#CPQuantity").val();
                      var convertRate = $("#CPRate").val();
@@ -3990,7 +4316,10 @@ if(isNaN(CustomDutyExpenses))
                   var Igst = $("#Igst").val();
                   var AfterIgst = $("#AfterIgst").val();
             
-
+                   var DisType = $("#DiscountType").val();
+                 
+		  var DisVal = $("#txtDiscount").val();
+		  var AfterDisVal = $("#txtAfterDiscount").val();
                     var landingCharge = $('#AfterLandingCharge').val();
           var HighSeasSalesCharge =  $('#AfterHighseas').val();
             var CustomDuty = $('#AfterCustomduty').val();
@@ -4020,12 +4349,15 @@ var purchaseRate =  $('#purchaserate').val();
                 var beforeCustomSHCess = $('#CustomSHcess').val();
                  var beforeAdditionalExciseDuty =$('#AdditionalExciseduty').val(); 
                 var PurQuantity = $('#PurQuantity').val(); 
-                    
+                     var FreightType = $("#drpFreight").val();
+		  var FreightVal = $("#txtFreight").val();
+		  var AfterFreightVal = $("#txtAfterFreight").val();
+		  var NoOfTrip = $("#NOOfTrips").val();
                       var Total = (parseFloat(basicval)+parseFloat(AfterCgst)+parseFloat(AfterSgst)+parseFloat(AfterIgst)+parseFloat(OtherAmt)).toFixed(2);
 
                      
                  var TotalOrderValuePerkg = $("#txtTotalOrderValue").val();
-
+                 var CapitalDescription  =$('#ItemDescription').val();
                      var TotalTaxValue = calculateTaxValue();
 
                
@@ -4040,9 +4372,9 @@ var purchaseRate =  $('#purchaserate').val();
             "ReqNo"  : Reqnumber,
 
                     });	
-
+                         	
                      populateValueMainFormForCapital();
-
+                  
 
 
                             index = parseInt(index)+1;		
@@ -4063,6 +4395,7 @@ var purchaseRate =  $('#purchaserate').val();
                      addHidden(theForm,"materialName"+temp,materialName );
                      addHidden(theForm,"echangeRate"+temp,exchangeRate );
                  addHidden(theForm,"uom"+temp,uom);
+                 addHidden(theForm,"per"+temp,addPer);
                      addHidden(theForm,"quantity"+temp,quantity);
                   addHidden(theForm,"rateInUs"+temp,itemRate);
                       addHidden(theForm,"itemRate"+temp,itemRate);
@@ -4105,6 +4438,15 @@ var purchaseRate =  $('#purchaserate').val();
 		  addHidden(theForm,"Igst"+temp,Igst);
                   addHidden(theForm,"AfterIgst"+temp,AfterIgst);
                    addHidden(theForm,"OtherAmt"+temp,OtherAmt);
+                    addHidden(theForm,"FreightType"+temp,FreightType);
+		 addHidden(theForm,"FreightVal"+temp,FreightVal);
+		 addHidden(theForm,"AfterFreightVal"+temp,AfterFreightVal);
+                 addHidden(theForm,"NoOfTrip"+temp,NoOfTrip);
+                 addHidden(theForm,"CapitalItemDescrition"+temp,CapitalDescription);
+                   	
+                  addHidden(theForm,"DisType"+temp,DisType);
+	     addHidden(theForm,"DisVal"+temp,DisVal);
+		 addHidden(theForm,"AfterDisVal"+temp,AfterDisVal);
                      $('#txtRowCount').val(temp); 
                   
 
@@ -4182,6 +4524,12 @@ var purchaseRate =  $('#purchaserate').val();
                     alert('Please Enter the Valid Rate of the Item');
                     $('#CPRate').focus();
                     return false;
+            }
+               else if($('#ItemDescription').val() == '')
+            {
+                     alert('Please Enter the Capital Description');
+                 $('#ItemDescription').focus(); 
+				return false;
             }
             else
             {
@@ -4250,6 +4598,8 @@ var purchaseRate =  $('#purchaserate').val();
     function populateValueMainFormForCapital()
     {
                      var BasicVal = $('#CPTotalAmount').val() == '' ? '0.00' : $('#CPTotalAmount').val();
+                      var disRate = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
+                    BasicVal = BasicVal-disRate;
              var AfterCgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val();
 		var AfterSgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val();
 		var AfterIgst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val();
@@ -4371,6 +4721,16 @@ $('#PurQuantity').val('');
      $('#CustomDutyExpenses').val('');
        $('#RMCIncludingCustomers').val(''); 
                      $("#txtTotalOrderValue").val('');
+                      $("#AddPer").val('');
+                    $("#drpFreight").val('0');
+		$("#txtFreight").val('');
+		$("#txtAfterFreight").val('');
+                $("#NOOfTrips").val('');
+        tinyMCE.get('ItemDescription').setContent('');
+        $("#DiscountType").val('0');
+		$("#txtDiscount").val('');
+		$("#txtAfterDiscount").val('');
+
 
 
     }
@@ -4580,8 +4940,9 @@ function DeleteRow(rowid)
                      var TotAvlmodvatI = $('#AvailableModvat'+i).val() == '' ? '0.00' : $('#AvailableModvat'+i).val();
 
                      var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val();
-                   
+                   var discountedRateValue = $('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
               var CapitalToatlOrderI= $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
+              CapitalToatlOrderI = CapitalToatlOrderI-discountedRateValue;
                 }
 
                     else if(deletedRow!=i){
@@ -4607,8 +4968,11 @@ function DeleteRow(rowid)
                      var TotAvlmodvatI = $('#AvailableModvat'+i).val() == '' ? '0.00' : $('#AvailableModvat'+i).val();
 
                      var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val();
-                     var CapitalToatlOrderI= $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
-                        }
+                                        var discountedRateValue = $('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
+
+                var CapitalToatlOrderI= $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
+                CapitalToatlOrderI = CapitalToatlOrderI-discountedRateValue;       
+                 }
  else{
                         
                     }
@@ -4684,7 +5048,7 @@ function DeleteRow(rowid)
 		$('#EditCapitalItemName').val($('#materialName'+userid).val());
                
 		$('#EditCPUOM').val($('#uom'+userid).val());
-           
+                $('#EditPer').val($('#per'+userid).val());
 		$('#EditCPQuantity').val($('#quantity'+userid).val());
                $('#EditCPRate').val($('#rateInUs'+userid).val());
 
@@ -4735,7 +5099,26 @@ function DeleteRow(rowid)
 		var EditUOM = $('#uom'+userid).val();
 		$('#RateIn').html('Rate(in' + " "+DisplayCurrencySymbol + '/'+EditUOM+')');
                 $('#EditRateIn').html('Rate(in' + " "+DisplayCurrencySymbol + '/'+EditUOM+')');
-		   
+		     $('#txtEditFreight').val($('#FreightVal'+userid).val());
+		$('#txtEditAfterFreight').val($('#AfterFreightVal'+userid).val());
+                $('#EditNOOfTrips').val($('#NoOfTrip'+userid).val());
+		$("#drpEditFreight").val($('#FreightType'+userid).val());
+		
+                var FreightType =$('#FreightType'+userid).val();
+              
+	        if (FreightType == "PER TRIP"){
+                $('#EditTripsValue').show();
+                    }
+                    else{
+                    $('#EditTripsValue').hide();
+                    }
+                  
+                    $("#EditDiscountType").val($('#DisType'+userid).val());
+		$('#txtEditDiscount').val($('#DisVal'+userid).val());
+		$('#txtEditAfterDiscount').val($('#AfterDisVal'+userid).val());
+		
+		                 tinyMCE.get('EditItemDescription').setContent($('#CapitalItemDescrition'+userid).val());
+  
                             
 
           var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
@@ -4832,7 +5215,7 @@ function DeleteRow(rowid)
 		$('#ViewCustomSHcess').val($('#beforeCustomSHCess'+userid).val());
                $('#ViewAdditionalExciseduty').val($('#beforeAdditionalExciseDuty'+userid).val());
                $('#ViewPurQuantity').val($('#PurQuantity'+userid).val());
-                 
+                  $('#ViewPer').val($('#per'+userid).val());
 		var ViewUOM = $('#uom'+userid).val();
              
 		//$('#RateIn').html('Rate(in' + " "+DisplayCurrencySymbol + '/'+ViewUOM+')');
@@ -4843,6 +5226,26 @@ function DeleteRow(rowid)
    
              
                           $("#ViewMaterialCode").val($('#materialCode'+userid).val());
+                          $('#txtViewFreight').val($('#FreightVal'+userid).val());
+		$('#txtViewAfterFreight').val($('#AfterFreightVal'+userid).val());
+                $('#ViewNOOfTrips').val($('#NoOfTrip'+userid).val());
+		$("#drpViewFreight").val($('#FreightType'+userid).val());
+		
+                var FreightType =$('#FreightType'+userid).val();
+              
+	        if (FreightType == "PER TRIP"){
+                $('#ViewTripsValue').show();
+                    }
+                    else{
+                    $('#ViewTripsValue').hide();
+                    }
+                  
+                    $("#ViewDiscountType").val($('#DisType'+userid).val());
+		$('#txtViewDiscount').val($('#DisVal'+userid).val());
+		$('#txtViewAfterDiscount').val($('#AfterDisVal'+userid).val());
+		
+            tinyMCE.get('ViewItemDescription').setContent($('#CapitalItemDescrition'+userid).val());
+  
                                     	   
 });
 
@@ -4935,6 +5338,9 @@ if(status == '0')
 {
 	stat = '<?php echo PO_DRAFT; ?>';
 }
+else if(status == '2'){
+    stat = '<?php echo $POStatus; ?>';
+}
 else
 {
 	stat = '<?php echo PO_CREATED; ?>';
@@ -5053,7 +5459,7 @@ function clearAfterAddLineItemAdd(){
     */
     function EditRatechange(){
 
-
+                    
                     if($('#EditReqnumber').val() == "0")
                      {
                              alert('Please select the Requisition Number');
@@ -5076,28 +5482,39 @@ function clearAfterAddLineItemAdd(){
 
           if(EditExceedQuantityCheck()){
 
-
+          
              if($('#EditCPQuantity').val() != '' && $('#EditCPRate').val() != '')
-             {	 
+             {
+       
 
           var txtQuantity = parseFloat( $('#EditCPQuantity').val());
           //var txtExchangeRate = parseFloat( $('#EditExchangeRtModal').val());
           var RatePerTon = parseFloat( $('#EditCPRate').val());
               //var txtUnitPrice = parseFloat($('#Rate').val());
              var txtExchangeRate='';
+             var BasicInINR='';
           if(capitalType=='International'){
            txtExchangeRate = parseFloat( $('#EditExchangeRtModal').val());
             var Tot =  txtQuantity * RatePerTon;
+            BasicInINR=Tot * txtExchangeRate;
              }
 
          else{
             var Tot =  txtQuantity * RatePerTon;
+             if ($('#txtEditDiscount').val() != '' && $('#txtEditDiscount').val() != '0')
+			 {
+              $('#txtEditAfterDiscount').val(updateDiscountValuesChange(parseFloat(Tot).toFixed(2),$("#EditDiscountType").val()));
+		}	
+            
+         var discountedValue =  parseFloat($('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val()).toFixed(2);
+            
            txtExchangeRate = 1;
+           var BasicInINR=Tot * txtExchangeRate - discountedValue;
              }
 
                
-        var BasicInINR=Tot * txtExchangeRate;
-
+  
+             
               $('#EditCPTotalAmount').val(parseFloat(Tot).toFixed(2));
  $('#EditAfterBasicPriceTax').val(Math.round(BasicInINR));
 
@@ -5208,7 +5625,7 @@ function clearAfterAddLineItemAdd(){
     else{
     //clearTaxField();
     }
-
+ 
     }
 /* This function used to check quantity exceeding or not while Editing*/
 
@@ -5226,7 +5643,9 @@ function clearAfterAddLineItemAdd(){
                      return false;
             }
             else {
+                   
                     return true;
+                    
             }
      }
   /**
@@ -5234,7 +5653,7 @@ function clearAfterAddLineItemAdd(){
              */
             $('.EditCapital').click(function(){
         
-
+             tinyMCE.triggerSave();
                 if( validateEditCapitalTax() && EditExceedQuantityCheck() && validateEditExceedLimit())
                 {
                    
@@ -5249,6 +5668,14 @@ function clearAfterAddLineItemAdd(){
                 var materialCode =$('#EditMaterialCode').val();
                 var materialName =  $("#EditCapitalItemName").val();
                 var uom = $("#EditCPUOM").val();
+                var editPer='';
+                if($("#EditPer").val().trim()==''){
+               editPer = $("#EditCPUOM").val();
+               }
+               else{
+               editPer = $("#EditPer").val();
+                    }
+                    
                 var exchangeRate = $("#EditExchangeRtModal").val();
                      var quantity = $("#EditCPQuantity").val();
                      var convertRate = $("#EditCPRate").val();
@@ -5295,7 +5722,14 @@ function clearAfterAddLineItemAdd(){
                  var beforeAdditionalExciseDuty =$('#EditAdditionalExciseduty').val(); 
                 var PurQuantity = $('#EditPurQuantity').val(); 
                     var basicvalInINR=$('#EditAfterBasicPriceTax').val();
-
+                     var EditCapitalDescription = $("#EditItemDescription").val();
+             var FreightType = $("#drpEditFreight").val();
+		  var FreightVal = $("#txtEditFreight").val();
+		  var AfterFreightVal = $("#txtEditAfterFreight").val();
+		  var NoOfTrip = $("#EditNOOfTrips").val();
+		  var DisType = $("#EditDiscountType").val();
+		  var DisVal = $("#txtEditDiscount").val();
+		  var AfterDisVal = $("#txtEditAfterDiscount").val();
 
 
 
@@ -5323,7 +5757,17 @@ function clearAfterAddLineItemAdd(){
                 $('#AfterIgst'+userid).val(AfterIgst);
 
                 $('#OtherAmt'+userid).val(OtherAmt);
+                $('#DisType'+userid).val(DisType);
+			$('#DisVal'+userid).val(DisVal);
+			$('#AfterDisVal'+userid).val(AfterDisVal);
 		$('#ServiceTotalOrderValue'+userid).val(TotalTaxValue);
+                 $('#FreightType'+userid).val(FreightType);
+                $('#FreightVal'+userid).val(FreightVal);
+                $('#NoOfTrip'+userid).val(NoOfTrip);
+                
+                
+                $('#AfterFreightVal'+userid).val(AfterFreightVal);
+                $('#CapitalItemDescrition'+userid).val(EditCapitalDescription);
 
 		$('#landingCharge'+userid).val(landingCharge);
 		$('#HighSeasSalesCharge'+userid).val(HighSeasSalesCharge);
@@ -5374,6 +5818,25 @@ function clearAfterAddLineItemAdd(){
                 }
 
             }); 
+
+            
+            $('.ViewCapital').click(function(){ 
+             var tr= document.getElementById(userid);
+                    var cellval = tr.cells;
+                 
+                var FreightType = $("#drpViewFreight").val();
+		  var FreightVal = $("#txtViewFreight").val();
+		  var AfterFreightVal = $("#txtViewAfterFreight").val();
+		  var NoOfTrip = $("#ViewNOOfTrips").val();
+              $('#FreightType'+userid).val(FreightType);
+                $('#FreightVal'+userid).val(FreightVal);
+                $('#NoOfTrip'+userid).val(NoOfTrip);
+                
+                
+                $('#AfterFreightVal'+userid).val(AfterFreightVal);
+
+
+            });
 function validateEditCapitalTax()
      {  
    
@@ -5419,6 +5882,12 @@ function validateEditCapitalTax()
                     $('#EditCPRate').focus();
                     return false;
             }
+            else if($('#EditItemDescription').val() == '')
+            {
+                     alert('Please Enter the Capital Description');
+                 $('#EditItemDescription').focus(); 
+				return false;
+            }
             else
             {
                     return true;
@@ -5550,6 +6019,8 @@ function validateEditCapitalTax()
                     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 discountedRateValue = $('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+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();
@@ -5564,7 +6035,7 @@ function validateEditCapitalTax()
 
                      var TotGrossexpenseI = $('#GrossExpensesDuetoCustom'+i).val() == '' ? '0.00' : $('#GrossExpensesDuetoCustom'+i).val();
                       var CapitalToatlOrderI = $('#basicval'+i).val() == '' ? '0.00' : $('#basicval'+i).val();
-
+                      CapitalToatlOrderI = CapitalToatlOrderI - discountedRateValue;
                    TotCgst = parseFloat(TotCgst) + parseFloat(TotalCgstI);
 		TotSgst = parseFloat(TotSgst) + parseFloat(TotalSgstI);
 		TotIgst = parseFloat(TotIgst) + parseFloat(TotalIgstI);
@@ -5699,53 +6170,721 @@ function calculateIgstTax(varBasicValue,Igst)
  }
 //If others is the payment terms to display mandatory field
 $("#PaymentMethod").change(function() { 
+    var otherPayment = '<?php echo $otherPayment; ?>';
 				if ($('#PaymentMethod').val().trim()=='PT08')
 				{
 					 $('#otheroptiondiv').show();
+                                         $('#Otherpayment').val(otherPayment);
+                                         
 				}
 				else {
 					 $('#otheroptiondiv').hide();
                                          $('#Otherpayment').val('');
 				}
 			});
-$('#drpviewFreight').change(function(){
-  var FreightType = $('#drpviewFreight').val();
-if (FreightType == "PER TRIP")
-        {
-           
-           $('#ViewTripsValue').show();
-        }
-        else {
-           
-           $('#ViewTripsValue').hide();  
-        } 
+$("#insuranceStatus").change(function(){
+var InsNo = '<?php echo $InsuranceNo; ?>';
 
+if($("#insuranceStatus").val()=="1"){
+$('#insuranceTxtDiv').show();
+$('#insuranceNo').val(InsNo);
+}
+else{
+$('#insuranceTxtDiv').hide();
+$('#insuranceNo').val('');
+}
 });
-$('#drpeditFreight').change(function(){
-  var FreightType = $('#drpeditFreight').val();
-if (FreightType == "PER TRIP")
-        {
-           
-           $('#EditTripsValue').show();
-        }
-        else {
-           
-           $('#EditTripsValue').hide();  
-        } 
+$('#drpFreight').change(function() {
 
-});
-$('#drpaddFreight').change(function(){
-  var FreightType = $('#drpaddFreight').val();
-if (FreightType == "PER TRIP")
-        {
-           
-           $('#AddTripsValue').show();
-        }
-        else {
-           
-           $('#AddTripsValue').hide();  
-        } 
+	 var FreightType =$("#drpFreight").val();
+	 
+	if (FreightType == "PER TRIP")
+				{
+					 
+					 $('#TripsValue').show();
+				}
+				else {
+					 
+					 $('#TripsValue').hide();	 
+				}
 
+	if($('#AfterBasicPriceTax').val() != '')
+	{
+    selValue = $("#drpFreight").val() ;
+	 $('#txtFreight').val('');
+	  $('#txtAfterFreight').val('');
+	 
+	if (selValue == '<?php echo NILTYPE;?>')
+	{
+     
+		 $('#txtFreight').attr('readonly', 'true');
+		 $('#txtFreight').val('0.00');
+		
+	}
+	else
+	{
+		 $('#txtFreight').removeAttr( 'readonly','true' );
+		 $('#txtFreight').val('');
+		
+		
+	}
+	}
+	else
+		{
+			alert('Please Enter the Rate value');
+			$('#drpFreight').val("0");
+			$('#CPRate').focus();
+		}
+                calculateFreight(0);
+  
 });
+$('#drpEditFreight').change(function() {
+	var FreightType =$("#drpEditFreight").val();
+	 
+	if (FreightType == "PER TRIP")
+				{
+					 
+					 $('#EditTripsValue').show();
+				}
+				else {
+					 
+					 $('#EditTripsValue').hide();	 
+				}
+	if($('#EditAfterBasicPriceTax').val() != '')
+	{
+    selValue = $("#drpEditFreight").val() ;
+	 $('#txtEditFreight').val('');
+	  $('#txtEditAfterFreight').val('');
+	 
+	if (selValue == '<?php echo NILTYPE;?>')
+	{
+     
+		 $('#txtEditFreight').attr('readonly', 'true');
+		 $('#txtEditFreight').val('0.00');
+		
+	}
+	
+	else
+	{
+		 $('#txtEditFreight').removeAttr( 'readonly','true' );
+		 $('#txtEditFreight').val('');
+	}
+	}
+  else
+		{
+			alert('Please Enter the Rate value');
+			$('#drpEditFreight').val("0");
+			$('#EditCPRate').focus();
+		}
+calculateFreight(1);
+});
+
+$('#drpViewFreight').change(function() {
+	var FreightType =$("#drpViewFreight").val();
+	 
+	if (FreightType == "PER TRIP")
+				{
+					 
+					 $('#ViewTripsValue').show();
+				}
+				else {
+					 
+					 $('#ViewTripsValue').hide();	 
+				}
+	if($('#ViewAfterBasicPriceTax').val() != '')
+	{
+    selValue = $("#drpViewFreight").val() ;
+	 $('#txtViewFreight').val('');
+	  $('#txtViewAfterFreight').val('');
+	 
+	if (selValue == '<?php echo NILTYPE;?>')
+	{
+     
+		 $('#txtViewFreight').attr('readonly', 'true');
+		 $('#txtViewFreight').val('0.00');
+		
+	}
+	
+	else
+	{
+		 $('#txtViewFreight').removeAttr( 'readonly','true' );
+		 $('#txtViewFreight').val('');
+	}
+	}
+  else
+		{
+			alert('Please Enter the Rate value');
+			$('#drpViewFreight').val("0");
+			$('#ViewCPRate').focus();
+		}
+calculateFreight(2);
+});
+
+function calculateFreight(isEdit)
+ {
+
+	 if(isEdit == '0')
+	{ 
+		
+		 if($('#AfterBasicPriceTax').val() == '')
+		 {
+			  alert('Please Enter the Rate value');
+			  $('#CPRate').focus();
+			  $('#txtFreight').val('') ;
+			  return false;
+		 }		
+		 else
+		 {
+			 var basicValue = parseFloat($('#AfterBasicPriceTax').val());
+                         
+			 var FreightType =$("#drpFreight").val();
+			 if(FreightType == "0")
+			 {
+				 alert('Please select Freight Type');
+				 $('#txtFreight').val('');
+				 $("#drpFreight").focus();
+			 }
+			 else if( $('#txtFreight').val() != "0"  && $('#txtFreight').val() != '')
+			 {	
+                        
+				var FreightValue =  parseFloat($('#txtFreight').val());
+				
+				var Quantity          = parseFloat($('#CPQuantity').val());
+				
+				var AfterFreight = 0.0;	
+				if(FreightType == '<?php echo PERCENTAGE;?>')
+				{	
+                                
+					AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;
+                                        
+				}
+				else if(FreightType == '<?php echo NILTYPE;?>')
+				{		
+					AfterFreight = 0.0;	 		  	  
+				}
+				else if(FreightType == '<?php echo LUMPSUM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERUOM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_PERUOM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERTRIP;?>')
+				{
+                                        if($('#NOOfTrips').val()==''){
+                                             alert('Please Enter No of Trip');
+				
+				 $("#NOOfTrips").focus();
+                                 $('#txtFreight').val(0)
+                                 AfterFreight=0;
+                                 $('#txtAfterFreight').val("0.00");
+                                 return false;
+                                            }
+                                            else{
+                                            var noOftrip = $("#NOOfTrips").val();
+                                            AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
+                                            AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
+                                                }
+                                             
+							  	  
+				}
+                            else {
+				AfterFreight = $("#txtFreight").val();
+				}	
+				var AfterFreightval =  parseFloat(AfterFreight).toFixed(2);
+                              
+				$('#txtAfterFreight').val(AfterFreightval); 
+			 }
+			 else
+			 {
+				$('#txtAfterFreight').val("0.00");  
+			 }
+			
+		 } 
+		
+	}
+        else if(isEdit == '2'){
+        
+            if($('#ViewAfterBasicPriceTax').val() == '')
+		 {
+			  alert('Please Enter the Rate value');
+			 $('#ViewCPRate').focus();
+			  $('#txtViewFreight').val('') ;
+			  return false;
+		 }
+				
+		 else
+		 {
+			 var basicValue = parseFloat($('#ViewAfterBasicPriceTax').val());
+			 var FreightType =$("#drpViewFreight").val();
+			 if(FreightType == "0")
+			 {
+				 alert('Please select Freight Type');
+				 $('#txtViewFreight').val('');
+				 $("#drpViewFreight").focus();
+			 }
+			 else if( $('#txtViewFreight').val() != "0"  && $('#txtViewFreight').val() != '')
+			 {	
+				var FreightValue =  parseFloat($('#txtViewFreight').val());
+				
+				var Quantity          = parseFloat($('#ViewCPQuantity').val());
+				//alert(FreightType);
+				var AfterFreight = 0.0;	
+				if(FreightType == '<?php echo PERCENTAGE;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;		  	  
+				}
+				else if(FreightType == '<?php echo NILTYPE;?>')
+				{		
+					AfterFreight = 0.0;	 		  	  
+				}
+				else if(FreightType == '<?php echo LUMPSUM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERUOM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_PERUOM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERTRIP;?>')
+				{		
+					 if($('#ViewNOOfTrips').val()==''){
+                                             alert('Please Enter No of Trip');
+				
+				 $("#ViewNOOfTrips").focus();
+                                 $('#txtViewFreight').val(0)
+                                 AfterFreight=0;
+                                 $('#txtViewAfterFreight').val("0.00");
+                                 return false;
+                                            }
+                                            else{
+                                            var noOftrip = $("#ViewNOOfTrips").val();
+                                            AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
+                                            AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
+                                                }		  	  
+				}
+                                    else {
+				AfterFreight = $("#txtViewFreight").val();
+				}	
+				var AfterFreightval =  parseFloat(AfterFreight).toFixed(2);
+		 
+				$('#txtViewAfterFreight').val(AfterFreightval); 
+			 }
+			 else
+			 {
+				$('#txtViewAfterFreight').val("0.00");  
+			 }
+			
+		 } 
+            
+            }
+
+
+             else if(isEdit == '3'){
+        
+				
+		 if($('#AfterBasicPriceTax').val() != '')
+		 {
+		 var basicValue = parseFloat($('#AfterBasicPriceTax').val());
+                         
+			 var FreightType =$("#drpFreight").val();
+			
+			  if( $('#txtFreight').val() != "0"  && $('#txtFreight').val() != '')
+			 {	
+                        
+				var FreightValue =  parseFloat($('#txtFreight').val());
+				
+				var Quantity          = parseFloat($('#CPQuantity').val());
+				
+				var AfterFreight = 0.0;	
+				if(FreightType == '<?php echo PERCENTAGE;?>')
+				{	
+                                
+					AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;
+                                        
+				}
+				else if(FreightType == '<?php echo NILTYPE;?>')
+				{		
+					AfterFreight = 0.0;	 		  	  
+				}
+				else if(FreightType == '<?php echo LUMPSUM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERUOM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_PERUOM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERTRIP;?>')
+				{
+                                        if($('#NOOfTrips').val()==''){
+                                             alert('Please Enter No of Trip');
+				
+				 $("#NOOfTrips").focus();
+                                 $('#txtFreight').val(0)
+                                 AfterFreight=0;
+                                 $('#txtAfterFreight').val("0.00");
+                                 return false;
+                                            }
+                                            else{
+                                            var noOftrip = $("#NOOfTrips").val();
+                                            AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
+                                            AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
+                                                }
+                                             
+							  	  
+				}
+                            else {
+				AfterFreight = $("#txtFreight").val();
+				}	
+				var AfterFreightval =  parseFloat(AfterFreight).toFixed(2);
+                              
+				$('#txtAfterFreight').val(AfterFreightval); 
+			 }
+			 else
+			 {
+				$('#txtAfterFreight').val("0.00");  
+			 }	
+			
+		 } 
+            
+            }
+             else if(isEdit == '4'){
+        
+				
+		 if($('#EditAfterBasicPriceTax').val() != '')
+		 {
+			 var basicValue = parseFloat($('#EditAfterBasicPriceTax').val());
+			 var FreightType =$("#drpEditFreight").val();
+			 
+			  if( $('#txtEditFreight').val() != "0"  && $('#txtEditFreight').val() != '')
+			 {	
+				var FreightValue =  parseFloat($('#txtEditFreight').val());
+				
+				var Quantity          = parseFloat($('#EditCPQuantity').val());
+				//alert(FreightType);
+				var AfterFreight = 0.0;	
+				if(FreightType == '<?php echo PERCENTAGE;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;		  	  
+				}
+				else if(FreightType == '<?php echo NILTYPE;?>')
+				{		
+					AfterFreight = 0.0;	 		  	  
+				}
+				else if(FreightType == '<?php echo LUMPSUM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERUOM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_PERUOM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERTRIP;?>')
+				{		
+					 if($('#EditNOOfTrips').val()==''){
+                                             alert('Please Enter No of Trip');
+				
+				 $("#EditNOOfTrips").focus();
+                                 $('#txtEditFreight').val(0)
+                                 AfterFreight=0;
+                                 $('#txtEditAfterFreight').val("0.00");
+                                 return false;
+                                            }
+                                            else{
+                                            var noOftrip = $("#EditNOOfTrips").val();
+                                            AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
+                                            AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
+                                                }		  	  
+				}
+                                    else {
+				AfterFreight = $("#txtEditFreight").val();
+				}	
+				var AfterFreightval =  parseFloat(AfterFreight).toFixed(2);
+		 
+				$('#txtEditAfterFreight').val(AfterFreightval); 
+			 }
+			 else
+			 {
+				$('#txtEditAfterFreight').val("0.00");  
+			 }
+			
+		 } 
+            
+            }
+	else
+	{
+		 if($('#EditAfterBasicPriceTax').val() == '')
+		 {
+			  alert('Please Enter the Rate value');
+			 $('#EditCPRate').focus();
+			  $('#txtEditFreight').val('') ;
+			  return false;
+		 }
+				
+		 else
+		 {
+			 var basicValue = parseFloat($('#EditAfterBasicPriceTax').val());
+			 var FreightType =$("#drpEditFreight").val();
+			 if(FreightType == "0")
+			 {
+				 alert('Please select Freight Type');
+				 $('#txtEditFreight').val('');
+				 $("#drpEditFreight").focus();
+			 }
+			 else if( $('#txtEditFreight').val() != "0"  && $('#txtEditFreight').val() != '')
+			 {	
+				var FreightValue =  parseFloat($('#txtEditFreight').val());
+				
+				var Quantity          = parseFloat($('#EditCPQuantity').val());
+				//alert(FreightType);
+				var AfterFreight = 0.0;	
+				if(FreightType == '<?php echo PERCENTAGE;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;		  	  
+				}
+				else if(FreightType == '<?php echo NILTYPE;?>')
+				{		
+					AfterFreight = 0.0;	 		  	  
+				}
+				else if(FreightType == '<?php echo LUMPSUM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERUOM;?>')
+				{		
+					AfterFreight = <?php echo FREIGHT_PERUOM;?>;		  	  
+				}
+				else if(FreightType == '<?php echo PERTRIP;?>')
+				{		
+					 if($('#EditNOOfTrips').val()==''){
+                                             alert('Please Enter No of Trip');
+				
+				 $("#EditNOOfTrips").focus();
+                                 $('#txtEditFreight').val(0)
+                                 AfterFreight=0;
+                                 $('#txtEditAfterFreight').val("0.00");
+                                 return false;
+                                            }
+                                            else{
+                                            var noOftrip = $("#EditNOOfTrips").val();
+                                            AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
+                                            AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
+                                                }		  	  
+				}
+                                    else {
+				AfterFreight = $("#txtEditFreight").val();
+				}	
+				var AfterFreightval =  parseFloat(AfterFreight).toFixed(2);
+		 
+				$('#txtEditAfterFreight').val(AfterFreightval); 
+			 }
+			 else
+			 {
+				$('#txtEditAfterFreight').val("0.00");  
+			 }
+			
+		 } 
+			
+
+	}
+ }
+
+/* Capital Discount calcualation */
+
+ $('#DiscountType').change(function() {
+	 if($('#CPRate').val() != '')
+	{
+    selValue = $("#DiscountType").val(); 
+	 $('#txtDiscount').val('');
+	 $('#txtAfterDiscount').val(''); 
+	if (selValue == '<?php echo NILTYPE;?>')
+	{
+      
+		 $('#txtDiscount').attr('readonly', 'true');
+		 $('#txtDiscount').val('0.00');
+		 $('#txtAfterDiscount').val('0.00');
+		 
+	}
+	else
+	{
+		 $('#txtDiscount').removeAttr( 'readonly','true' );
+		 $('#txtDiscount').val('');
+		  $('#txtAfterDiscount').val('');
+	}
+	}
+	else
+		{
+			alert('Please Rate Field Value');
+			
+			$('#CPRate').focus();
+		}
+                Ratechange();
+  
+});
+$('#EditDiscountType').change(function() {
+	if($('#EditCPRate').val() != '')
+	{
+    selValue = $("#EditDiscountType").val(); 
+	 $('#txtEditDiscount').val('');
+	 $('#txtEditAfterDiscount').val(''); 
+	if (selValue == '<?php echo NILTYPE;?>')
+	{
+      
+		 $('#txtEditDiscount').attr('readonly', 'true');
+		 $('#txtEditDiscount').val('0.00');
+		 $('#txtEditAfterDiscount').val('0.00');
+		 
+	}
+	else
+	{
+		 $('#txtEditDiscount').removeAttr( 'readonly','true' );
+		 $('#txtEditDiscount').val('');
+		  $('#txtEditAfterDiscount').val('');
+	}
+	}
+  else
+		{
+			alert('Please Select MaterialCode and Rate Field Value');
+			$('#EditDiscountType').val("0");
+			$('#EditCPRate').focus();
+		}
+                EditRatechange();
+              
+});
+/*
+ * To calcuate the Discount  */
+function calculateDiscount(isEdit)
+ {  
+
+	if(isEdit == '0')
+	{
+    
+	  if($('#CPRate').val() == '')
+	 {
+		  alert('Please Enter the Rate value');
+		  $('#CPRate').focus();
+		  $('#txtDiscount').val('');
+		  return false;
+	 }
+    if($('#CPRate').val() != '')
+	{
+	
+	 var basicValue = parseFloat($('#CPTotalAmount').val());
+	 var DiscountType =$("#DiscountType").val();
+	
+	 if(DiscountType == "0")
+	 {
+		alert('Please Select the discount Type');
+		$('#txtDiscount').val('');
+		$("#DiscountType").focus(); 
+	 }
+	 else  if ($('#txtDiscount').val() != '' && $('#txtDiscount').val() != '0')
+	 {
+	 var AfterDiscount = 0.0;
+	  var Discountval = parseFloat($('#txtDiscount').val());
+	 if(DiscountType == '<?php echo PERCENTAGE;?>')
+	 {
+		
+		AfterDiscount = <?php echo DIS_PERCENTAGE;?>;	
+		  	  
+	 }
+	 else if(DiscountType == '<?php echo NILTYPE;?>' )
+	 {
+	    AfterDiscount = "0.00";				
+	 }
+	 else
+	 {
+		 AfterDiscount = <?php echo DIS_LUMPSUM;?>;			 	
+	 }
+		var discount = parseFloat(AfterDiscount).toFixed(2);
+		$('#txtAfterDiscount').val(discount);	 
+	 }
+	else
+	{
+		$('#txtAfterDiscount').val("0.00");	 
+	}
+        Ratechange();
+	}
+       
+              
+	}
+	else
+	{
+		
+		  
+			if($('#EditCPRate').val() != '')
+			{
+			
+			 var basicValue = parseFloat($('#EditCPTotalAmount').val());
+			 var DiscountType =$("#EditDiscountType").val();
+			
+			 if(DiscountType == "0")
+			 {
+				alert('Please Select the discount Type');
+				$('#txtEditDiscount').val('');
+				$("#EditDiscountType").focus(); 
+			 }
+			 else  if ($('#txtEditDiscount').val() != '' && $('#txtEditDiscount').val() != '0')
+			 {
+			 var AfterDiscount = 0.0;
+			  var Discountval = parseFloat($('#txtEditDiscount').val());
+			 if(DiscountType == '<?php echo PERCENTAGE;?>')
+			 {
+				
+				AfterDiscount = <?php echo DIS_PERCENTAGE;?>;	
+					  
+			 }
+			 else if(DiscountType == '<?php echo NILTYPE;?>' )
+			 {
+				AfterDiscount = "0.00";				
+			 }
+			 else
+			 {
+				 AfterDiscount = <?php echo DIS_LUMPSUM;?>;			 	
+			 }
+				var discount = parseFloat(AfterDiscount).toFixed(2);
+				$('#txtEditAfterDiscount').val(discount);	 
+			 }
+			else
+			{
+				$('#txtEditAfterDiscount').val("0.00");	 
+			}
+                        EditRatechange();
+			}
+                              	
+	}
+ }
+
+function updateDiscountValuesChange(totAmt,disType){
+
+			 var basicValue = totAmt;
+			 var DiscountType =disType;
+			
+			
+			 var AfterDiscount = 0.0;
+			  var Discountval = parseFloat($('#txtEditDiscount').val());
+			 if(DiscountType == '<?php echo PERCENTAGE;?>')
+			 {
+				
+				AfterDiscount = <?php echo DIS_PERCENTAGE;?>;	
+					  
+			 }
+			 else if(DiscountType == '<?php echo NILTYPE;?>' )
+			 {
+				AfterDiscount = "0.00";				
+			 }
+			 else
+			 {
+				 AfterDiscount = <?php echo DIS_LUMPSUM;?>;			 	
+			 }
+				var discount = parseFloat(AfterDiscount).toFixed(2);
+				return discount;
+			 }
+
+                   
+
     </script>
 
+