diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index dfc7ef0f..56b5f52f 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -304,7 +304,7 @@ class purchaseorder extends BaseController
 			 $this->load->View("capitalpopdf", NULL); 
 	 }
 	//To View/Update Purchase Order	
-	 //To View/Update Purchase Order 
+	
      function EditPurchaseOrder()
      {
                 $PONO =  $_GET['PONO'];
@@ -325,6 +325,7 @@ class purchaseorder extends BaseController
                 $data['Suplist'] = $this->purchaseorder_model->getSupplierName();
                
                   $data['Payment']=$this->purchaseorder_model->getPaymentTermsDetails();
+                  $data['PoTypeOptions'] = $this->purchaseorder_model->getConfigValue('C026');
                 $data['INRSYMBOL']=$this->purchaseorder_model->GetINRCurrencytype('INR');
                  /*   Cost code from Requisition - Client Review Fix   
                 Start here */
@@ -429,7 +430,7 @@ class purchaseorder extends BaseController
                     // $data[$Rate->ExchangeRate]=$Rate->ExchangeRate;
                $data['CurrencyDetail']=$this->purchaseorder_model->GetCurrencyDetail($Currency);
                $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
-               $data['PoTypeOptions'] = $this->purchaseorder_model->getConfigValue('C026');
+               
                //print_r($data['PaymentTerms']);
                $unicode ='';
                foreach ($data['CurrencyDetail'] as $Detail)
diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php
index f141d68e..8d7d7ddc 100755
--- a/application/controllers/servicepurchaseorder.php
+++ b/application/controllers/servicepurchaseorder.php
@@ -179,10 +179,9 @@ class servicepurchaseorder extends BaseController
 	}
 	
 	//This used to Create Service Purchase Order
-	
 	function addNewServicePurchaseOrder()
 	{
-             
+            
 				$POdt =$this->input->post('PODate');
 				$PODate =  $this->getDateformat($POdt);
                                 $SupplierID = $this->input->post('drpSupplier');  
@@ -199,7 +198,15 @@ class servicepurchaseorder extends BaseController
                                         $Deliverydt = $this->getDateformat($dt);
                                         $DeliverySchedule = '';
                                         }
-
+                                   $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');
+                                   $DescriptionOfPo = $this->input->post('descofpo');
                                 $PaymentTerms=$this->input->post('PaymentTerms');
 				$OtherPayment=$this->input->post('Otherpayment');
 
@@ -220,7 +227,7 @@ class servicepurchaseorder extends BaseController
 
 				$WorkStatus=$this->input->post('workstatus');
 				// PO Master
-				$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus, 'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption, 'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'ServiceWorkStatus'=>$WorkStatus,'POType'=>$POType,'PaymentOtherDescription'=>$OtherPayment);
+				$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus, 'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption, 'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'ServiceWorkStatus'=>$WorkStatus,'POType'=>$POType,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$SupplierReference,'Mode_Of_Shipment'=>$ModeOfShipment,'Supplier_Offer_No'=>$SuppliersOfferNo,'Other_Reference'=>$OtherReferences,'Fincap'=>$Fincap,'Description_Of_Service'=>$DescriptionOfPo,'InsuranceStatus'=>$InsuranceOptions,'InsuranceNumber'=>$InsuranceNo,'POSubType'=>$ServiceTypeOptions);
 				
 					$POMaster  = $this->purchaseorder_model->addPOMaster($POList);
 					
@@ -235,7 +242,7 @@ class servicepurchaseorder extends BaseController
 					
 						for ($i = 1; $i <= $RowCount; $i++)
 							{	
-							
+                                                                $Per = $this->input->post('per'.$i);
 								$MaterialCode = $this->input->post('materialCode'.$i);
 								$Quantity = $this->input->post('quantity'.$i); 
 								$Reqnumber = $this->input->post('Reqnumber'.$i);
@@ -270,7 +277,7 @@ class servicepurchaseorder extends BaseController
 								  if($SkipInsert == "False")
 									{
 								
-								$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'ServiceMaterialDescription'=>$ItemDescription);
+								$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'ServiceMaterialDescription'=>$ItemDescription,'Per'=>$Per);
 								//print_r($POLineItemList);
 								//die();
 					
@@ -319,7 +326,15 @@ class servicepurchaseorder extends BaseController
                             $DeliverySchedule = '';
                             }
 
-
+                              $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');
+                                   $DescriptionOfPo = $this->input->post('editdescofpo');
               
 
                         $PaymentTerms=$this->input->post('PaymentTerms');
@@ -342,7 +357,7 @@ class servicepurchaseorder extends BaseController
 				
 				
 				// PO Master
-				$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'ServiceWorkStatus'=>$WorkStatus,'PaymentOtherDescription'=>$OtherPayment);
+				$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'ServiceWorkStatus'=>$WorkStatus,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$SupplierReference,'Mode_Of_Shipment'=>$ModeOfShipment,'Supplier_Offer_No'=>$SuppliersOfferNo,'Other_Reference'=>$OtherReferences,'Fincap'=>$Fincap,'Description_Of_Service'=>$DescriptionOfPo,'InsuranceStatus'=>$InsuranceOptions,'InsuranceNumber'=>$InsuranceNo,'POSubType'=>$ServiceTypeOptions);
 
 				$POMaster  = $this->purchaseorder_model->updatePOMaster($PONO,$POList);				
 				
@@ -365,7 +380,8 @@ class servicepurchaseorder extends BaseController
 					$POLineItemNo = $this->input->post('LineItemNo'.$i);
 					$TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
 					$ItemDescription = $this->input->post('ItemDescription'.$i);
-                                        $OtherAmt = $this->input->post('OtherAmt'.$i);			
+                                        $OtherAmt = $this->input->post('OtherAmt'.$i);
+                                        $Per = $this->input->post('per'.$i);
 					
 					$POLineItem = array();
 					$LineItemNo = '';
@@ -389,7 +405,7 @@ class servicepurchaseorder extends BaseController
 					if(strlen($POLineItemNo) == 0)
 					{
 
-						$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'ServiceMaterialDescription'=>$ItemDescription);
+						$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'ServiceMaterialDescription'=>$ItemDescription,'Per'=>$Per);
 
 						$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
 						if(count($POLineItem)>0)
@@ -403,7 +419,7 @@ class servicepurchaseorder extends BaseController
 					{
 						$LineItemNo = $POLineItemNo;	
 						
-						$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceMaterialDescription'=>$ItemDescription);
+						$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceMaterialDescription'=>$ItemDescription,'Per'=>$Per);
 						$POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$POLineItemNo,$POLineItemList);					
 						
 					}
diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index c7125202..da157a50 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -636,7 +636,7 @@ function GetPOType($ReqNo)
 	function GetServicePurchaseOrderDetails($PONO = '')
 	{
 	     
-	$subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Quantity,ReceivedQuantity,Rate,LineItem.Status,(Quantity *Rate) as BasicValue ,(After_CGST + After_SGST + After_IGST) as Taxamount
+	$subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,LineItem.Per,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Quantity,ReceivedQuantity,Rate,LineItem.Status,(Quantity *Rate) as BasicValue ,(After_CGST + After_SGST + After_IGST) as Taxamount
 				,TotalValue,CGST,After_CGST,SGST,After_SGST,IGST,After_IGST,otherallowance,LineItem.CostCenterCode,LineItem.ServiceFrequency,LineItem.ServiceMaterialDescription,Req.Schedule_Type,Req.NumberOfService,Req.Service_Period
 				FROM T_PurchaseOrder_LineItem LineItem 
 				join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php
index bf0acf99..87f5076a 100755
--- a/application/views/EditservicePurchaseorder.php
+++ b/application/views/EditservicePurchaseorder.php
@@ -1,6 +1,8 @@
 <?php 
-
-$DeliverOption='';
+    $insuranceStatus = array(
+array("name"=>"NO","value"=>"0"),array("name"=>"YES","value"=>"1")
+);
+                $DeliverOption='';
 		$SupId = '';
                 $SupName = '';
 		$Address = '';
@@ -25,6 +27,15 @@ $DeliverOption='';
                 $Value="&#8377;";
 
                 $StatusName='';
+                $ModeOfShipment='';
+                $SupplierReference='';
+                $SuppliersOfferNo='';
+                $OtherReferences='';
+                $Fincap='';
+                $InsuranceOptions='';
+                $InsuranceNo='';
+                $ServiceTypeOptions='';
+                $DescriptionOfPo = '';
 
 
 if(!empty($INRSYMBOL))
@@ -47,6 +58,7 @@ if(!empty($MaxPODate))
 }
 if(!empty($POMaster))
 {
+
     foreach ($POMaster as $Req)
     {
 
@@ -64,11 +76,19 @@ if(!empty($POMaster))
 		$PONOStatus	 = 	$Req->StatusCode;
 		$PONO = $Req->PONO;	
 		$ServiceDescription = $Req->ServiceDescription;	
-		
-      
-        $WrkStatus=$Req->ServiceWorkStatus;
-        $StatusName=$Req->StatusName;
-        $otherPayment = $Req->PaymentOtherDescription;	
+                $WrkStatus=$Req->ServiceWorkStatus;
+                $StatusName=$Req->StatusName;
+                $otherPayment = $Req->PaymentOtherDescription;	
+                $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;	
+                $DescriptionOfPo = $Req->Description_Of_Service;
+	
     }
 }
 
@@ -152,11 +172,20 @@ foreach ($PaymentTerms as $TER)
  
 
 <script type="text/javascript">
+
+
+var insuranceOpt = '<?php echo $InsuranceOptions; ?>';
     var DelOpt = '<?php echo $DeliverOption; ?>';
 
     var SchName = '<?php echo $DeliverSchedule; ?>';
 var DelDt = '<?php echo $Deliverydt; ?>';
 $(document).ready(function () {
+if(insuranceOpt=="1"){
+ 
+}
+else{
+$('#insuranceTxtDiv').hide();
+}
      if(DelOpt=="0"){
  $('#Deliverydtdiv').show();
                     $('#Schedulediv').hide();
@@ -208,7 +237,7 @@ $("#PODate").datepicker({
 	dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
 }); */
 $('#drpSupplier').change(function() {
-    
+    var PaymentOtherData = '<?php echo $otherPayment; ?>';
  var id = $('#drpSupplier').val();
 
  $("#SupAddress").val('');
@@ -235,6 +264,12 @@ $('#drpSupplier').change(function() {
                  if(PaymentID!='PT08'){
                  $('#otheroptiondiv').hide();  
                     $('#Otherpayment').val('');
+                    }
+                    else if(PaymentID=='PT08'){
+                    $('#otheroptiondiv').show(); 
+                     $('#Otherpayment').val(PaymentOtherData);
+                    
+                   
                     }
                  $.each(Payment, function(pay, payobj) {
 			if(payobj.PaymentID == PaymentID)
@@ -809,7 +844,7 @@ $(document).ready(function () {
 						<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>
@@ -825,7 +860,7 @@ $(document).ready(function () {
 						<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>
@@ -841,7 +876,7 @@ $(document).ready(function () {
 						<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>
@@ -855,7 +890,7 @@ $(document).ready(function () {
 						<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>
@@ -865,12 +900,105 @@ $(document).ready(function () {
 						<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>
     </div>
 	</div>
+	</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-->
@@ -1113,7 +1241,7 @@ $(document).ready(function () {
 										 <div class="form-group">
 										 
 															<?php
-													 $data = array('name' => 'Sgst','value' => set_value('Sgst',0),'id'=>'Sgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'Ratechange()','readonly' => 'true','onkeypress'=>'return isNumberKey(event);');
+													 $data = array('name' => 'Sgst','value' => set_value('Sgst',0),'id'=>'Sgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'Ratechange()','onkeypress'=>'return isNumberKey(event);');
 													echo form_input($data);
 													?>   
 												</div>
@@ -1458,7 +1586,7 @@ $(document).ready(function () {
 								 </div>
 								 	<div class="col-md-12" style="padding: 0px 30px 10px 30px;"> 
 								<label>Service Description</label>	<?php
-									 $data = array('name' => 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction',$ServiceDescription),'id'=>'EdittxtSpcialInstruction',  'class' => 'form-control' ,'rows' => '3', 'cols' => '40');
+									 $data = array('name' => 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction'),'id'=>'EdittxtSpcialInstruction',  'class' => 'form-control' ,'rows' => '3', 'cols' => '40');
 									echo form_textarea($data);
 									?>  <input type="hidden" name="SpcialInstruction" id="SpcialInstruction"  value=""> 
 							</div> 
@@ -1783,7 +1911,7 @@ $(document).ready(function () {
 
 								if(!empty($POItem))
 									{
-                                                                        
+                                                                       
 									
 											$index = 0;
 										
@@ -1825,6 +1953,7 @@ $(document).ready(function () {
 									 <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 '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 ; ?>" />
@@ -1931,8 +2060,8 @@ $(document).ready(function () {
                <div class="col-md-12">
                <label>Description Of Service</label>
                 <div class="form-group">                        
-                           	<?php
-							 $data = array('name' => 'editdescofpo','value' => set_value('editdescofpo'),'id'=>'editdescofpo',  'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
+                           	<?php 
+							 $data = array('name' => 'editdescofpo','value' => set_value('editdescofpo',$DescriptionOfPo),'id'=>'editdescofpo',  'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
 							echo form_textarea($data);
 							?>  
                        </div>
@@ -2029,6 +2158,13 @@ $('.AddService').click(function(){
          var materialCode =$('#MaterialCode').val();
          var materialName =  $("#ItemName").val();
          var uom = $("#UOM").val();
+          var addPer='';
+                if($("#AddPer").val().trim()==''){
+               addPer = $("#UOM").val();
+               }
+               else{
+               addPer = $("#AddPer").val();
+                    }
 		 var quantity = $("#Quantity").val();
 		 var itemRate = parseFloat($("#Rate").val()).toFixed(2);
 		
@@ -2082,6 +2218,7 @@ $('.AddService').click(function(){
 		  addHidden(theForm,"materialCode"+temp,materialCode );
 		 addHidden(theForm,"materialName"+temp,materialName );
 	     addHidden(theForm,"uom"+temp,uom);
+             addHidden(theForm,"per"+temp,addPer);
 		 addHidden(theForm,"quantity"+temp,quantity);
 		  addHidden(theForm,"itemRate"+temp,itemRate);
 		  addHidden(theForm,"Cgst"+temp,Cgst);
@@ -2114,6 +2251,13 @@ $('.AddService').click(function(){
 			var editMaterialCode =  $("#EditMaterialCode").val();
 			var editDescription = $("#EditItemName").val();		
 			var editUOM = $('#EditUOM').val();
+                              var editPer='';
+                if($("#EditPer").val().trim()==''){
+               editPer = $("#EditUOM").val();
+               }
+               else{
+               editPer = $("#EditPer").val();
+                    }
 			var editQuantity = $('#EditQuantity').val();
 			
 			 var itemRate = $("#EditRate").val();
@@ -2155,6 +2299,7 @@ $('.AddService').click(function(){
 			$('#materialCode'+userid).val(editMaterialCode);
 			$('#materialName'+userid).val(editDescription);
 			$('#uom'+userid).val(editUOM);
+                        $('#per'+userid).val(editPer);
 			$('#CostCode'+userid).val(CostCode);
 			$('#quantity'+userid).val(editQuantity);
                         $('#itemRate'+userid).val(itemRate);
@@ -2282,6 +2427,7 @@ function clearServiceModalFields()
 	$('#MaterialCode').val("0")	;
 	$("#ItemName").val('');		
 	$('#UOM').val(''); 
+         $('#AddPer').val('');
 	$('#Quantity').val('');       
 	$("#Rate").val('');			 
 
@@ -2296,6 +2442,7 @@ function clearServiceModalFields()
         $("#txtSpcialInstruction").val('');
 	$("#TotalOrderValue ").val('');
 	$("#Frequency").val('');
+        tinyMCE.get('txtSpcialInstruction').setContent('');
 }
 var DeletedMaterialCode='';
 var DeletedMaterialName='';
@@ -2511,7 +2658,7 @@ function validateServiceTax()
                  $('#txtSpcialInstruction').focus(); 
 				return false;
             }
-	else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvlBudAmt').val()) == false)
+	else if(ExceedBudget($('#txtBasicValue').val(),$('#AvlBudAmt').val()) == false)
 	{
 		 $('#Rate').focus(); 
 				return false;
@@ -2570,7 +2717,7 @@ function validateServiceTax()
                  $('#EdittxtSpcialInstruction').focus(); 
 				return false;
             }
-	else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false)
+	else if(ExceedBudget($('#txtEditBasicValue').val(),$('#EditAvlBudAmt').val()) == false)
 	{
 		 $('#EditRate').focus(); 
 		 return false;
@@ -2607,7 +2754,7 @@ $('#txtDeliveryAddress').val(deladd);
                         
                         AvlBudAmt = '<?php echo number_format($AvlAmount+$TotalBasicAmount, 2, '.', '') ?>';
 
-var txtTotalOrderValueSummary = $('#txtTotalOrderValueSummary').val();
+var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val();
 
 	if(validate())
 		{ 
@@ -2899,6 +3046,7 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
 		
 		$('#EditItemName').val($('#materialName'+userid).val());
 		$('#EditUOM').val($('#uom'+userid).val());
+                $('#EditPer').val($('#per'+userid).val());
 		$('#EditQuantity').val($('#quantity'+userid).val());
 		RequistQuantity = $('#quantity'+userid).val();
 		$('#EditRate').val($('#itemRate'+userid).val());
@@ -2920,7 +3068,7 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
 
 		$('#EditTotalOrderValue').val(cellval[9].innerHTML);
                 $('#EditOtherAllowances').val($('#OtherAmt'+userid).val());
-		$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());
+		 tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription'+userid).val());
 		RequistQuantity = $('#quantity'+userid).val();
 		
 		
@@ -2982,7 +3130,7 @@ $("#VIEWSERVICE").on("shown.bs.modal", function(e) {
 		var tr= document.getElementById(userid);
 		var cellval = tr.cells;
 		var id= $('#Reqnumber'+userid).val();
-		
+		$('#ViewPer').val($('#per'+userid).val());
 		$('#ViewReqNo').val($('#Reqnumber'+userid).val());
 		$('#ViewdeptName').val($('#departmentName'+userid).val());
 		$("#ViewCostCenter").val($('#costCode'+userid).val());
@@ -3011,7 +3159,8 @@ $("#VIEWSERVICE").on("shown.bs.modal", function(e) {
 
 		$('#ViewTotalOrderValue').val(cellval[9].innerHTML);
                 $('#ViewOtherAllowances').val($('#OtherAmt'+userid).val());
-		$('#ViewtxtSpcialInstruction').val($('#ItemDescription'+userid).val());
+		
+                tinyMCE.get('ViewtxtSpcialInstruction').setContent($('#ItemDescription'+userid).val());
 		RequistQuantity = $('#quantity'+userid).val();
 		
 		
@@ -3064,4 +3213,16 @@ $("#VIEWSERVICE").on("shown.bs.modal", function(e) {
 		}
 	   
 });
-</script>
\ No newline at end of file
+$("#insuranceStatus").change(function(){
+var InsNo = '<?php echo $InsuranceNo; ?>';
+
+if($("#insuranceStatus").val()=="1"){
+$('#insuranceTxtDiv').show();
+$('#insuranceNo').val(InsNo);
+}
+else{
+$('#insuranceTxtDiv').hide();
+$('#insuranceNo').val('');
+}
+});
+</script>
diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php
index d93b063d..78c334c0 100755
--- a/application/views/servicePurchaseorder.php
+++ b/application/views/servicePurchaseorder.php
@@ -1,4 +1,10 @@
-<?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');
@@ -132,6 +138,10 @@ $('#drpSupplier').change(function() {
                  $('#otheroptiondiv').hide();  
                     $('#Otherpayment').val('');
                     }
+                    else if(PaymentID=='PT08'){
+                    $('#otheroptiondiv').show();  
+                    $('#Otherpayment').val('');
+                    }
                 $.each(Payment, function(pay, payobj) {
 			if(payobj.PaymentID == PaymentID)
 			{
@@ -383,7 +393,7 @@ function Ratechange(){
 
 	 calculateTotalOrdervalue();
 	 
-	 var res = ExceedBudget($('#TotalOrderValue').val(), $('#AvlBudAmt').val());
+	 var res = ExceedBudget($('#txtBasicValue').val(), $('#AvlBudAmt').val());
       if(!res)
 	  {
 		 $('#Rate').focus();
@@ -410,7 +420,7 @@ function EditRatechange(){
          var frequencyValue = parseFloat($('#EditFrequencyNo').val());
 	  var Tot =  txtQuantity * frequencyValue * txtUnitPrice
 	  $('#txtEditBasicValue').val(parseFloat(Tot).toFixed(2));
-	    ExceedBudget(Tot, $('#EditAvlBudAmt').val());	 
+	    ExceedBudget($('#txtEditBasicValue').val(), $('#EditAvlBudAmt').val());	 
 	 
 	
         $('#EditAfterCgst').val(calculateCgstTax($('#txtEditBasicValue').val(),$("#EditCgst").val()== '' ? "0.00" :  $("#EditCgst").val()));
@@ -509,6 +519,7 @@ function ExceedQuantityCheck()
  
 function clearTaxField()
 {
+
 	$('#txtBasicValue').val('');
 	$('#AfterCgst').val(0);
 	$('#AfterSgst').val(0);
@@ -521,6 +532,8 @@ function clearTaxField()
 	
 	$("#ItemName").val('');
 	$("#UOM").val('');
+        $("#AddPer").val('');
+        tinyMCE.get('txtSpcialInstruction').setContent('');
 	$("#Quantity").val('');
 	RequistQuantity	= '';	
 	
@@ -812,6 +825,84 @@ function clearEditTaxField()
 	</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):
+						  
+					   
+						  $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">
@@ -1574,6 +1665,7 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
 		
 		$('#EditItemName').val($('#materialName'+userid).val());
 		$('#EditUOM').val($('#uom'+userid).val());
+               $('#EditPer').val($('#per'+userid).val());
 		$('#EditQuantity').val($('#quantity'+userid).val());
 		RequistQuantity = $('#quantity'+userid).val();
 		$('#EditRate').val($('#itemRate'+userid).val());
@@ -1596,7 +1688,10 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
                 
 		$('#EditTotalOrderValue').val(cellval[9].innerHTML);
 		$('#EditOtherAllowances').val($('#OtherAmt'+userid).val());
-		$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());
+               
+
+                tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription'+userid).val());
+		//$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());
 		
 		$("#EditMaterialCode").empty();
 		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
@@ -1660,6 +1755,13 @@ $('.AddService').click(function(){
                  
                  var materialName =  $("#ItemName").val();
                  var uom = $("#UOM").val();
+                 var addPer='';
+                if($("#AddPer").val().trim()==''){
+               addPer = $("#UOM").val();
+               }
+               else{
+               addPer = $("#AddPer").val();
+                    }
 		 var quantity = $("#Quantity").val();
 		 RequistQuantity = $('#quantity'+userid).val();
 		 var itemRate = parseFloat($("#Rate").val()).toFixed(2)
@@ -1715,6 +1817,7 @@ $('.AddService').click(function(){
 		  addHidden(theForm,"materialCode"+temp,materialCode );
 		 addHidden(theForm,"materialName"+temp,materialName );
 	     addHidden(theForm,"uom"+temp,uom);
+             addHidden(theForm,"per"+temp,addPer);
 		 addHidden(theForm,"quantity"+temp,quantity);
 		  addHidden(theForm,"itemRate"+temp,itemRate);
 		
@@ -1749,6 +1852,13 @@ $('.AddService').click(function(){
 			var editMaterialCode =  $("#EditMaterialCode").val();
 			var editDescription = $("#EditItemName").val();		
 			var editUOM = $('#EditUOM').val();
+                         var editPer='';
+                if($("#EditPer").val().trim()==''){
+               editPer = $("#EditUOM").val();
+               }
+               else{
+               editPer = $("#EditPer").val();
+                    }
 			var editQuantity = $('#EditQuantity').val();
 			
 			 var itemRate = $("#EditRate").val();
@@ -1791,6 +1901,8 @@ $('.AddService').click(function(){
 			$('#materialCode'+userid).val(editMaterialCode);
 			$('#materialName'+userid).val(editDescription);
 			$('#uom'+userid).val(editUOM);
+                        $('#per'+userid).val(editPer);
+                        
 			$('#quantity'+userid).val(editQuantity);
                         $('#itemRate'+userid).val(itemRate);
 			$('#Cgst'+userid).val(Cgst);
@@ -1920,6 +2032,7 @@ function clearServiceModalFields()
 	$('#MaterialCode').val("0")	;
 	$("#ItemName").val('');		
 	$('#UOM').val(''); 
+        $('#AddPer').val('');
 	$('#Quantity').val('');       
 	$("#Rate").val('');			 
 
@@ -1932,7 +2045,7 @@ function clearServiceModalFields()
 	$("#Igst").val(0);
 	$("#TotalOrderValue").val('');
         $("#OtherAllowances").val(0);
-        $("#txtSpcialInstruction").val('');
+       tinyMCE.get('txtSpcialInstruction').setContent('');
 	$("#Frequency").val('');
 }
 
@@ -2072,7 +2185,7 @@ function validateServiceTax()
                  $('#txtSpcialInstruction').focus(); 
 				return false;
             }
-	else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvlBudAmt').val()) == false)
+	else if(ExceedBudget($('#txtBasicValue').val(),$('#AvlBudAmt').val()) == false)
 	{
 		 $('#Rate').focus(); 
 				return false;
@@ -2132,7 +2245,7 @@ function validateServiceTax()
                  $('#EdittxtSpcialInstruction').focus(); 
 				return false;
             }
-	else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false)
+	else if(ExceedBudget($('#txtEditBasicValue').val(),$('#EditAvlBudAmt').val()) == false)
 	{
 		 $('#EditRate').focus(); 
 		 return false;
@@ -2179,7 +2292,7 @@ var deladd = $('#DeliveryAddr').val();
 $('#txtDeliveryAddress').val(deladd);
 $('#txtStatus').val(stat);
 var AvlBudAmt = '<?php echo $AvlAmount ?>';
- var txtTotalOrderValueSummary = $('#txtTotalOrderValueSummary').val();
+ var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val();
 	if(validate())
 		{ 	
 			if(document.getElementById('serviceTax').rows.length < 2)
@@ -2372,5 +2485,18 @@ $("#PaymentTerms").change(function() {
 location.reload();
 
 }
+$('#insuranceTxtDiv').hide();
+$("#insuranceStatus").change(function(){
+
+if($("#insuranceStatus").val()=="1"){
+$('#insuranceTxtDiv').show();
+
+}
+else{
+$('#insuranceTxtDiv').hide();
+$('#insuranceNo').val('');
+}
+});
 
 </script>
+
diff --git a/assets/js/CreatePOValidation.js b/assets/js/CreatePOValidation.js
index a9c6c17a..44971dd1 100755
--- a/assets/js/CreatePOValidation.js
+++ b/assets/js/CreatePOValidation.js
@@ -61,6 +61,12 @@ function validate()
 		$('#DeliveryAddr').focus();
 		return false;
 	}
+        else if($('#insuranceStatus').val() == "1" && $('#insuranceNo').val().trim() == ''){
+        alert('Please Enter the Insurance No');
+		$('#insuranceNo').focus();
+		return false;
+
+                }
 	
    else if(PoType=='CAPITAL' && capitalType=='International'){