diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php
index 5173e84c..3f2a5ee6 100755
--- a/application/controllers/amendmentpurchaseorder.php
+++ b/application/controllers/amendmentpurchaseorder.php
@@ -62,6 +62,8 @@ class amendmentpurchaseorder extends BaseController
 				 endforeach;
 				$data['MaterialList'] = $result;//$this->purchaseorder_model->getRawMaterialList($ReqType,$ReqArray);
 				$data['Suplist'] = $this->purchaseorder_model->getSupplierName();
+				$data['Payment']=$this->purchaseorder_model->getSupplierPayment();
+				//print_r($data['Payment']);
 				 /*   Cost code from Requisition - Client Review Fix   
 				Start here */
 				$ReqDetails = $this->purchaseorder_model->getRequistDetails($ReqArray);
@@ -92,13 +94,19 @@ class amendmentpurchaseorder extends BaseController
 			  {	    
 				
 				$data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO);
+				$data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
+				$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019');
                 $this->global['pageTitle'] = 'Siddharth : Edit Service Purchase order form';			  
 				$this->loadViews("editServiceAmendPO", $this->global,  $data, NULL);	
 			  }
 				else if($ReqType == REVENUE)
 				{
-					
+				//$data['Payment']=$this->purchaseorder_model->getSupplierPayment();
+				$data['POSTATUS']=$this->purchaseorder_model->GetPOStatus($PONO);
 				$data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO);
+				$data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
+				echo "FROM CON";
+				//print_r($data['Payment']);
                 $this->global['pageTitle'] = 'Siddharth : Edit Revenue Purchase order form';			  
 				$this->loadViews("editRevenueAmendPO", $this->global,  $data, NULL);	
 				}
@@ -157,7 +165,7 @@ class amendmentpurchaseorder extends BaseController
 	{
 				$NewPO='0';
 				$PONO =$this->input->post('txtPONO');
-				echo "OLD PO IS" . $PONO;
+			//	echo "OLD PO IS" . $PONO;
 				
 				$POdt =$this->input->post('PODate');
 				$PODate =  $this->getDateformat($POdt);
@@ -176,6 +184,22 @@ class amendmentpurchaseorder extends BaseController
         }
 				$POType = $this->input->post('POType');
 				$PoRange = $this->input->post('txtPoRange');
+				$PaymentTerms=$this->input->post('PaymentTerms');
+				$PayableAT=$this->input->post('PayableAT');
+				$PaymentDate=$this->input->post('Payment');
+               
+			   if($PaymentDate==1)
+                {
+                	$PaymentDays='After';
+                }
+                else
+                {
+                	$PaymentDays='Before';
+                }
+				// echo $PaymentTerms;
+				// echo $PayableAT;
+				// echo $PaymentDays;
+				// echo "FINAL";
 				
 				$SpcialInstruction = $this->input->post('SpcialInstruction');
 				$TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary');
@@ -193,15 +217,15 @@ class amendmentpurchaseorder extends BaseController
 				$updateddt =  $dt->format('Y-m-d H:i:s');
 				// PO Master
 				// PO Master
-				$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>'ST015','DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt );
+				$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID,'PaymentTerms'=> $PaymentTerms,'PayableAT'=>$PayableAT,'PaymentDays'=>$PaymentDays,'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>'ST015','DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt );
 					
 					//$POMaster  = $this->purchaseorder_model->updatePOMaster($PONO,$POList);				
 					$LastPO  = $this->purchaseorder_model->addPOMaster($POMaster);	
 					foreach($LastPO as $PO):
-					$NewPO=$PO->PONO;
+					$NewPO=$PO['PONO'];
 					endforeach;
-					echo "NEW PO IS " . $NewPO;
-					echo "";
+					//echo "NEW PO IS " . $NewPO;
+					//echo "";
 					//change old po status as Amendment
 				    $PODetail=array('Status'=>"ST030");//TO SET PARENT PO AS AMENDMENT STATUS
 					print_r($PODetail);
@@ -215,7 +239,7 @@ class amendmentpurchaseorder extends BaseController
 					
 					
 				
-					echo 'before for loop';
+					//echo 'before for loop';
 					echo $RowCount;
 					
 						for ($i = 1; $i <= $RowCount; $i++)
@@ -277,13 +301,15 @@ class amendmentpurchaseorder extends BaseController
 								// {
 									$POLineItemList = array('PONO'=>$NewPO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter);
 									print_r($POLineItemList);
+									//die();
+									
 									$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
 									// if(count($POLineItem)>0)
 									// {
 										foreach($POLineItem as $line):
 										$LineItemNo =  $line->LineItemNo;
 										endforeach;
-										echo "Lineitem no is" . $LineItemNo;
+										//echo "Lineitem no is" . $LineItemNo;
 										//print_r($LineItemNo);
 										
 									// }
@@ -303,6 +329,7 @@ class amendmentpurchaseorder extends BaseController
 									$RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'ExciseDuty'=>$ExciseValue,'ExciseDutyCalulatedOn'=>$ExciseOption,'AfterExciseDuty'=>$AfterExciseValue,'Vat'=>$VatValue,'AfterVAT'=>$AfterVatValue,'VatCalulatedOn'=>$VatOption, 'CST'=>$CSTValue,'AfterCST'=>$AfterCSTValue,'CSTCalulatedOn'=>$CSTOption,'GST'=>$GSTValue,'AfterGST'=>$AfterGSTValue,'OtherTaxes'=>$OtherTaxValue,'AfterOtherTaxes'=>$AfterOtherTaxValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt);
 								
 									$RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
+									echo "DONE ALL";
 								
 								// }
 								// else
@@ -315,7 +342,180 @@ class amendmentpurchaseorder extends BaseController
 							 }								
 								
 								echo 'Purchase Order Amended Successfully! PO Number Is: '.$PONO .'- New PO Number is'.$NewPO;
-							}							
+							}
+
+
+
+function UpdateAmendServicePurchaseOrder()
+	{
+				$PONO =$this->input->post('txtPONO');
+				$NewPO='0';
+				//echo $PONO;
+				$POdt =$this->input->post('PODate');
+				$PODate =  $this->getDateformat($POdt);
+				
+                $SupplierID = $this->input->post('drpSupplier');  
+				$DeliveryAddr = $this->input->post('txtDeliveryAddress');
+				$dt = $this->input->post('Deliverydt');
+				  $DeliveryOption = $this->input->post('DateRange');
+        if($DeliveryOption==1){
+         $Deliverydt = '';
+        $DeliverySchedule = $this->input->post('Scheduleby');
+        }
+         else{
+         $Deliverydt = $this->getDateformat($dt);
+        $DeliverySchedule = '';
+        }
+
+
+                $PaymentDate=$this->input->post('Payment');
+                if($PaymentDate==1)
+                {
+                	$PaymentDays='After';
+                }
+                else
+                {
+                	$PaymentDays='Before';
+                }
+
+                $PaymentTerms=$this->input->post('PaymentTerms');
+				$Payableat=$this->input->post('PayableAT');
+				
+				$POType = $this->input->post('POType');
+								
+				$SpcialInstruction = $this->input->post('SpcialInstruction');
+				$TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary');
+			    $POStatus = $this->input->post('txtStatus');
+
+                $updatedBy = $this->session->userdata ( 'userId' );
+				$RowCount =  $this->input->post('txtRowCount'); 
+			//	echo "ROw Count is" . $RowCount;
+				
+			//	$DeletedRow =  $this->input->post('txtDeletedRow'); 
+				
+				//$comma_separated = explode(':', $DeletedRow);
+				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
+				$updateddt =  $dt->format('Y-m-d H:i:s');
+				$WorkStatus=$this->input->post('workstatus');
+				
+				
+				// PO Master
+				$POMaster = array('ParentPO'=>$PONO,'POType'=>$POType,'SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'PayableAT'=>$Payableat,'PaymentDays'=>$PaymentDays,'ServiceWorkStatus'=>$WorkStatus );
+				//print_r($POMaster);
+				$LastPO  = $this->purchaseorder_model->addPOMaster($POMaster);	
+				//print_r($LastPO);
+				    foreach($LastPO as $PO):
+					$NewPO=$PO['PONO'];
+					endforeach;
+					//echo "NEW PO IS " . $NewPO;
+					//echo "";
+					
+					$PODetail=array('Status'=>"ST030");//TO SET PARENT PO AS AMENDMENT STATUS
+					//print_r($PODetail);
+					$APO=$this->purchaseorder_model->updateAmendPOMaster($PONO,$PODetail);	
+					//echo $APO."Affected";
+			
+				$LineItemStatus = REQITEM_NEW;
+				//echo "Before For Loop" ; 
+				//echo $RowCount; 
+							
+				for ($i = 1; $i <= $RowCount; $i++)
+				{			
+
+					//echo "Inside Loop";
+					
+					$MaterialCode = $this->input->post('materialCode'.$i);
+					$Quantity = $this->input->post('quantity'.$i); 
+					$Reqnumber = $this->input->post('Reqnumber'.$i);
+					$itemRate = $this->input->post('itemRate'.$i);
+					$ServiceTax = $this->input->post('ServiceTax'.$i);
+					$EduCess = $this->input->post('EduCess'.$i);
+					$SecHighTax = $this->input->post('SecHighTax'.$i);
+					$KrishiTax = $this->input->post('KrishiTax'.$i);
+					$SwachhTax = $this->input->post('SwachhTax'.$i);
+					$CostCenter	= $this->input->post('costCode'.$i);
+					$POLineItemNo = $this->input->post('LineItemNo'.$i);
+					$TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
+					$ServiceFrequency=$this->input->post('Frequency'.$i);				
+					//	echo $MaterialCode;
+					//$POLineItem = array();
+					$LineItemNo = '';
+					//echo "LineItem is". $LineItemNo;
+					// $SkipInsert = "False";				 
+								   // if( count($comma_separated) > 0)
+								   // {
+								   // for($j = 1; $j < count($comma_separated); $j++)
+								   // {	
+									  // $deletedRow = 	$comma_separated[$j]	;
+									
+									  // if($deletedRow == $i  )
+									  // {
+										  // $SkipInsert = "True";
+										  // break;
+									  // }						 
+									  
+									// }
+								   // }
+					 // if($SkipInsert == "False")
+				// {
+					// if(strlen($POLineItemNo) == 0)
+					// {
+						
+						$POLineItemList = array('PONO'=>$NewPO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency);
+						//print_r($POLineItemList);
+						
+						$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
+						// if(count($POLineItem)>0)
+						// {
+							            foreach($POLineItem as $line):
+										$LineItemNo =  $line->LineItemNo;
+										endforeach;
+									//	echo " Last Lineitem no is" . $LineItemNo;
+										
+						//}
+					
+					// //}
+					// else
+					// {
+						// $LineItemNo = $POLineItemNo;	
+						
+						// $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter);
+						// $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$POLineItemNo,$POLineItemList);					
+						
+					// }
+
+					
+					
+					// if(trim($POType) == SERVICE )
+					// {
+					// $isExists = $this->purchaseorder_model->LineItemExists($LineItemNo); 
+					
+					// if(count($isExists) == 0)
+					// {
+					$ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'ServiceTax'=>$ServiceTax,'EducessTax'=>$EduCess,'SecHigherEducessTax'=>$SecHighTax,'KrishiKalyantax'=>$KrishiTax,'SwachhBharattax'=>$SwachhTax,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt);
+					//echo "Service to be stored";
+				
+					//print_r($ServiceTaxList);
+					 $ServiceList =$this->purchaseorder_model->addServiceTax($ServiceTaxList);
+					//echo "final";
+					//print_r($ServiceList);
+					
+					
+					// }
+					// else
+					// {
+						// $ServiceTaxList1 = array('ServiceTax'=>$ServiceTax,'EducessTax'=>$EduCess,'SecHigherEducessTax'=>$SecHighTax,'KrishiKalyantax'=>$KrishiTax,'SwachhBharattax'=>$SwachhTax,'TotalValue'=>$TotalOrderValue, 'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt);
+						
+						// $this->purchaseorder_model->updateServiceTax($LineItemNo,$ServiceTaxList1); 
+						
+					// }
+					
+					//}
+					
+				//} 				
+				}
+				echo 'PO Number'.$PONO . ' Amended Successfully! -  New PO Number is'.$NewPO;
+	}							
 					
 	
 	
@@ -327,71 +527,5 @@ class amendmentpurchaseorder extends BaseController
 		$retDate = $date->format('Y-m-d H:i:s');
 		return $retDate;
 	}
-	 /* ---------------------------------OLD AMENDPO FUNCTION-----------------------------------------------*/
-	 function  getpodetails()
-    {
-       $PONO=$this->input->post('pono');
-	   //$PONO='PO0001';
-	   $result = $this->amendment_model->getPODetails($PONO);
-	 // print_r($result);
-	   $obj=json_encode($result);
-	    echo $obj;
-		//print_r($obj);
-		//die();
-      
 	 
-	   
-    }
-	
-	function updatepo(){
-	$someArray = $_GET['jsondata'];
-	//$PONO = $_GET['pono'];
-	$PONO = $this->input->get('PONO');
-	$rowsaffected=0;
-	$porow=0;
-	
-	//echo $PONO."</br>";
-   // print_r($someArray);
-    $d=json_decode($someArray);
-	////print_r( $d);
-	foreach($d as $d1){
-	 $MaterialCode=$d1->ItemCode;
-	 $Quantity=$d1->Ordered_Quantity;
-	 $ReceivedQuantity=$d1->Additional_Quantity_Received;
-	 $Remarks=$d1->Remarks;
-	 $Status='ST031';
-	 $POstatus='ST030';
-	 $store=array('Quantity'=>$Quantity,'AmendmentQuantity'=>$ReceivedQuantity,'AmendmentRemarks'=>$Remarks,'Status'=>$Status);
-	 //print_r($store);
-	 $result=$this->amendment_model->updatePODetails($PONO,$MaterialCode,$store,$POstatus);
-	 $rowsaffected++;
-	
-	  
-	
-	}
-	   echo "<script>alert($rowsaffected+'--Rows Affected')</script>";
-	   $data['PODetails']=$this->amendment_model->getPONO();
-       $this->global['pageTitle'] = 'Siddharth : Amendment Purchase Order';
-	   
-	   $this->loadviews('amendmentpo',$this->global,	NULL);
-	
-	
-	
-	}
-	 function  amendmentpolisting()
-    {
-       $this->global['pageTitle'] = 'Siddharth : Amendment Purchase Order';
-	   
-        $data['POlisiting']=$this->amendment_model->getPOlist();
-		//echo "From CON.</br>";
-		//print_r($data);
-        $this->loadviews('amendmentpolisting',$this->global,$data);
-    }
-     
-     function pageNotFound()
-    {
-        $this->global['pageTitle'] = 'Siddharth : 404 - Page Not Found';
-        
-        $this->loadViews("404", $this->global, NULL, NULL);
-    }
 }
\ No newline at end of file
diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index d9357036..4566c06b 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -30,7 +30,7 @@ class purchaseorder_model extends CI_Model
      * @return array $result : This is result
      */
  
-function purchaseorderListing()
+function purchaseorderListing($forwhat='')
     {
 		$this->db->distinct();
         $this->db->select('POMast.PONO,supp.SupplierName,TotalOrderValue,PODate,Stat.StatusName,Stat.StatusCode,POMast.POType as ReqType,DeliveryDate,DeliverySchedule,DeliveryOption');
@@ -39,7 +39,10 @@ function purchaseorderListing()
         $this->db->join('T_Status Stat', 'Stat.StatusCode = POMast.Status');
 		$this->db->join('T_PurchaseOrder_LineItem LineItem', 'POMast.PONO = LineItem.PONO');
 		$this->db->join('T_Requestion_Master Req', 'Req.ReqNo = LineItem.ReqNo');
-		
+		if($forwhat=='amendment')
+		{
+		$this->db->where('POMast.Status',PO_RELEASED);
+		}
         $query = $this->db->get();
         //print_r( $this->db->last_query());
         $result = $query->result();        
diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php
index f40880e8..e7efc175 100755
--- a/application/views/editRevenueAmendPO.php
+++ b/application/views/editRevenueAmendPO.php
@@ -27,6 +27,10 @@ if(!empty($AvlBudAmt))
    
 		$AvlAmount = $AvlBudAmt;		
 	
+}
+foreach ($PaymentTerms as $TER) 
+{
+    $Terms=$TER->PaymentTerms;
 }
   
 		$SupId = '';
@@ -71,8 +75,27 @@ if(!empty($POMaster))
 		$POStatus	 = 	$Req->StatusCode;
 		$PONO = 	$Req->PONO;	
 		$ServiceDescription = $Req->ServiceDescription;	
+		$PayableAT=$Req->PayableAT;
+        $PaymentDays=$Req->PaymentDays;	
     }
 }
+if(!empty($RequistionDetails))
+{
+
+    foreach ($RequistionDetails as $ReqDet) 
+    {
+        $Reqon=$ReqDet->ReqDate;
+        $Requestedby=$ReqDet->Requestedby;
+        //$Status=$ReqDet->Status;
+    }
+}
+
+
+foreach ($POSTATUS as $PST ) 
+{
+   $POStatus=$PST->StatusName;
+}
+
 ?>
 <style>
             
@@ -149,6 +172,25 @@ $(function() {
 	minDate : 'now',	
 	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
 });
+$("#Requeston").datepicker({
+	//minDate : d,
+	maxDate : 'now',
+	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+});
+
+
+
+
+var paymentday=<?php echo json_encode($PaymentDays,JSON_PRETTY_PRINT)?>;
+if (paymentday=="After") 
+{
+//alert();
+    document.getElementById("After").checked = true;
+}
+else
+{
+    document.getElementById("Before").checked = true;
+}
 	
 $('#drpSupplier').change(function() {
     
@@ -1844,6 +1886,49 @@ body {
 			</div>
 		</div>
 		 	 
+		 <div class="col-md-12">
+			<legend>Payment Details</legend>
+          <!-- Text input-->
+		    <div class="col-md-3">
+			    <span for="payablefrom">Payable Terms</span>
+				    <select class="form-control required" id="PaymentTerms" name="PaymentTerms">
+					    <option value="" ><?php echo $Terms;?></option>
+							<?php
+							if(!empty($payment))
+							{
+								foreach ($payment as $rl)
+								{
+									?>
+									<option value="<?php echo $rl->PaymentTerms ?>"><?php echo $rl->PaymentTerms ?></option>
+									<?php
+								}
+							}
+							?>
+					</select>
+            </div>
+			
+            <div class="col-md-3">
+			  <span>Payable AT</span>
+            
+			  <?php
+				 $data = array('name' => 'PayableAT','value' => set_value('PayableAT',$PayableAT),'id'=>'PayableAT',  'class' => 'form-control' ,'required' => 'true');
+				echo form_input($data);
+				?>   
+					
+            </div>
+			
+           <div class="col-md-6">
+				  Payment Date <br/>
+                            <tr>
+                                <td>
+                                    <?php echo form_label('Before', 'Before') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"Before", "value"=>"0", 'checked'=>set_radio('Payment', '0', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+                                <td>
+                                    <?php echo form_label('After', 'After') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"After", "value"=>"1", 'checked'=>set_radio('Payment', '1', FALSE))); ?>
+
+                                </td>
+                            </tr>
+			</div>
+		</div>
 		</div>
     </div>
 	 <!-- Modal for Packing Calculation -->
@@ -3010,16 +3095,39 @@ body {
    <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />   
    <input type="hidden" name="txtPONO" id="txtPONO"  value="<?php  echo $PONO; ?>"/> 
 	
-	<a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
+	<!-- <a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
 	<a class="btn btn-primary Save"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
     <input type="reset" class="btn btn-primary" value="Reset">
    
-      <input type="reset" class="btn btn-primary" value = "OK">  
+      <!-- <input type="reset" class="btn btn-primary" value = "OK">  -->
  
     
    
 	   </div><br/>
 	   </div>
+ <div class="col-md-12">
+							<div class="col-md-4">
+								<span>Request On</span>								  
+								  <?php
+											 $data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
+											echo form_input($data);
+											?>   
+							</div>
+							<div class="col-md-4">
+								<span>Request By</span>								  
+								  <?php
+									 $data = array('name' => 'RequestBy','value' => set_value('RequestBy',$Requestedby),'id'=>'RequestBy',  'class' => 'form-control' ,'required' => 'true');
+									echo form_input($data);
+									?> 
+							</div>
+							<div class="col-md-4">
+								<span>Status</span>								  
+								 <?php
+									$options = array("0"=>$POStatus);     
+									echo form_dropdown('Status', $options,set_value('Status'),'id="Status"'  ,'required="true"' ,'class="form-control select2')
+								?>
+							</div><br/>
+						</div>
 </div>
 </div>
          </div>
@@ -3783,6 +3891,19 @@ function populateValueMainFormForDeleteItem(rowid)
 		$('#txtTotalVat').val(parseFloat(totVATAmt).toFixed(2)  );
 		$('#txtTotCST').val(parseFloat(totCSTAmt).toFixed(2) );
 		$('#txtTotalGST').val(parseFloat(totGSTAmt).toFixed(2)  );
+
+
+
+ var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
+//console.log(Detail);
+  
+       $.each(Detail, function (index, value) 
+       {
+           $("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
+
+
+         
+       } );
 		$('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt).toFixed(2) );
 		$('#txtTotalFreight').val(parseFloat(totFreightAmt).toFixed(2) );
 		$('#txtTotalInsurance').val(parseFloat(totInsuranceAmt).toFixed(2) );
@@ -3888,4 +4009,14 @@ $('#Scheduleby').change(function(){
 	   
     }); 
   });
+  var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
+//console.log(Detail);
+  
+       $.each(Detail, function (index, value) 
+       {
+           $("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
+
+
+         
+       } ); 
 </script>
\ No newline at end of file
diff --git a/application/views/editServiceAmendPO.php b/application/views/editServiceAmendPO.php
index 04e7f3b1..16ccee85 100755
--- a/application/views/editServiceAmendPO.php
+++ b/application/views/editServiceAmendPO.php
@@ -1,4 +1,4 @@
-	<?php 
+<?php 
 
 $DeliverOption='';
 		$SupId = '';
@@ -22,6 +22,8 @@ $Deliverydt='';
 $DeliverSchedule='';
 $MaxPoDate = '';
 $AvlAmount = 0;
+$Value="&#8377;";
+$RowCount = '';
 if(!empty($MaxPODate))
 {
     foreach ($MaxPODate as $date)
@@ -41,7 +43,7 @@ if(!empty($POMaster))
 		$pdt = new DateTime($Req->PODate);
 		$PODate =  $pdt->format('Y-m-d');
 		$DeliverOption = $Req->DeliveryOption;
-      $DeliverSchedule = $Req->DeliverySchedule;
+        $DeliverSchedule = $Req->DeliverySchedule;
 		$Ddt =	new DateTime($Req->DeliveryDate);
 		$Deliverydt =  $Ddt->format('Y-m-d');
         
@@ -49,15 +51,46 @@ if(!empty($POMaster))
 		$POStatus	 = 	$Req->StatusCode;
 		$PONO = 	$Req->PONO;	
 		$ServiceDescription = $Req->ServiceDescription;	
+		//$PaymentTerms=$Req->PaymentTerms;
+        $PayableAT=$Req->PayableAT;
+        $PaymentDays=$Req->PaymentDays;
+        $WrkStatus=$Req->ServiceWorkStatus;
     }
 }
 
+
+if(!empty($RequistionDetails))
+{
+
+    foreach ($RequistionDetails as $ReqDet) 
+    {
+        $Reqon=$ReqDet->ReqDate;
+        $Requestedby=$ReqDet->Requestedby;
+        //$Status=$ReqDet->Status;
+    }
+}
+
+//echo "$WrkStatus";
+
 if(!empty($AvlBudAmt))
 {
    
 		$AvlAmount = $AvlBudAmt;		
 	
 }
+
+
+foreach ($PaymentTerms as $TER) 
+{
+    $Terms=$TER->PaymentTerms;
+}
+
+
+
+// foreach ($POSTATUS as $PST ) 
+// {
+   // $POStatus=$PST->StatusName;
+// }
 ?>
 
 <script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
@@ -102,7 +135,11 @@ $("#PODate").datepicker({
 	minDate : 'now',	
 	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
 });	  
- 
+ $("#Requeston").datepicker({
+	//minDate : d,
+	maxDate : 'now',
+	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+});
 $('#drpSupplier').change(function() {
     
  var id = $('#drpSupplier').val();
@@ -118,6 +155,17 @@ $('#drpSupplier').change(function() {
 			if(obj.SupplierID === id)
 			{
 				$("#SupAddress").val(obj.Address);
+				$("#PayableAT").val(obj.PayableAT);
+                var a=obj.PaymentDays;
+                console.log(a);
+                if (a=="After") 
+                {
+                  //alert();
+                  document.getElementById("After").checked = true;
+
+                }
+                else
+                  document.getElementById("Before").checked = true;
 				
 			}
 			
@@ -394,20 +442,20 @@ function ExceedQuantityCheck()
 		return true;
 	}
  }
- function EditExceedQuantityCheck()
- {
-	// RequistQuantity
-	var EnterQuantity =   $("#EditQuantity").val()== '' ? "0.00" :  parseFloat($("#EditQuantity").val());
-	var ReqQuantity = parseFloat(RequistQuantity);
-	//alert(ReqQuantity);
-	if(EnterQuantity > ReqQuantity)
-	{
-		 alert('Your exceeding the Quantity from the Requisition Quantity:'+ RequistQuantity  +'.Please adjust the Quantity to proceed further.');
+ // function EditExceedQuantityCheck()
+ // {
+	// // RequistQuantity
+	// var EnterQuantity =   $("#EditQuantity").val()== '' ? "0.00" :  parseFloat($("#EditQuantity").val());
+	// var ReqQuantity = parseFloat(RequistQuantity);
+	// //alert(ReqQuantity);
+	// if(EnterQuantity > ReqQuantity)
+	// {
+		 // alert('Your exceeding the Quantity from the Requisition Quantity:'+ RequistQuantity  +'.Please adjust the Quantity to proceed further.');
 		
-		  $('#EditQuantity').focus();
-		 return false;
-	}
- }
+		  // $('#EditQuantity').focus();
+		 // return false;
+	// }
+ // }
  
  function ExceedBudget(ValuetoCheck,budgetAmount)
  {
@@ -591,797 +639,900 @@ $(document).ready(function () {
                         echo form_open($this->config->base_url().'/purchaseorder/addPO/',$attributes); ?>
  
 	 <section class="content">
-	 <div style="border:2px solid #333">
-	  <div id="content"></div>
-	 <div>
-         <center><b><h2>Siddharth Industries - Edit Service Purchase Order for Amendment - <?php echo $PONO;?></h2></b></center></div>
-         <div class="container-fluid">
-		
-	<div class="row">
-		<div class="col-md-12">
-	<div class="col-md-3">
-		<div class="col-md-12">
-			<label>Requistion No</label>
-						 
-						
-							<?php
-							 
-							  $options = array("0"=>'Selected Requisition Numbers'); 
-								 if(!empty($ReqList))
-						{
-						foreach ($ReqList as $SID):
-						  
-							   $options[$SID->ReqNo] = $SID->ReqNo ;
-                           endforeach;
-						}	
-							echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' , 'required="true"');
-
-							?>
-			</div>
-		<div class="col-md-12">
-				<label>Purchase Order Date</label>
-						<div class="form-group">
-									<?php
-							 $data = array('name' => 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate',  'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;');
-							echo form_input($data);
-							?>   							    
-						</div>
-		</div>							
-						 
-	</div>
-	<div class="col-md-9">
-		<div class="col-md-4">
-			<div class="col-md-12">
-				<label>Supplier</label>
-					  <?php
-						$options = array("0"=>'Select Supplier');     
-						//print_r(  $options);
-						
-						if(!empty($Suplist))
-						{
-						foreach ($Suplist as $SID):
-						  
-					   
-						  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
-
-						endforeach;
-						}										
-			
-						echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId ),'id="drpSupplier"'  ,'required="true"' ,'class="form-control select2');
-
-						?>						 
-					 
-			</div>
-			<div class="col-md-12"><br/>
-				<label>Address</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'SupAddress','value' => set_value('SupAddress',$Address),'id'=>'SupAddress',  'class' => 'form-control' ,'readonly' => 'true','rows' => '3', 'cols' => '40');
-						echo Form_textarea($data);
-						?>   
-					</div>
-			</div>
-		</div>
-		<div class="col-md-4">
-			<div class="col-md-12">
-				 <label>Purchase Order Type</label>
-						<div class="form-group">
-						
-									<?php
-							 $data = array('name' => 'POType','value' => set_value('POType',SERVICE),'id'=>'POType',  'class' => 'form-control' ,'readonly' => 'true');
-							echo form_input($data);
-							?>   
-						</div>
-			</div>
-			<div class="col-md-12">
-				 <label>Delivery Address</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'DeliveryAddr','value' => set_value('DeliveryAddr',$DeliveryAddress),'id'=>'DeliveryAddr',  'class' => 'form-control' ,'required' => 'true', 'rows' => '3', 'cols' => '40');
-						echo Form_textarea($data);
-						?><input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress"  value="<?php echo $DeliveryAddress;?>"> 
-						   
-					</div>
-			</div>
-		</div>
-		<div class="col-md-4">
-			<div class="col-md-12">
-				<b><u>Select Delivery By</u></b><br/>
-                            <tr>
-                                <td>
-  <?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;". form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?>
-
-<td>
-  <?php echo form_label('Schedule', 'Schedule') . form_radio(array('name' => 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?>
-
-
-</td>
-                               
-                            </tr>
-			</div>
-			<div class="col-md-12" id="Deliverydtdiv"><br/>
-				<label>Delivery Date</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
-						echo form_input($data);
-						?>   
-					</div>
-			</div>
-			<div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
-					<label >Schedule :</label>					 
-					<?php
-					$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
-					echo Form_textarea($data);
-					?>
-
-            </div>
-		</div>
-		
-	</div>
-	</div>
-    </div>
-	
-          <div class="container-fluid">  
- 	 
-<div style="padding-right:10px">
-<div align="right">
-  <!-- <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-primary" id="abcd" >Select Line Item</button> </a> -->
- 
-  
-  
-<!-- Model for servicepo -->
-    <div class="modal fade" id="SERVICE" role="dialog">
-		<div class="modal-dialog">
-	   <!-- Modal content-->
-	 <form>
-		  <div class="modal-content" style="width:900px;">
-			<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> 
-			  <center><h4>Add Service Purchase Order Item </h4></center>				
-			</div>
-			<div align="left"> 
-			 
-			<div class="col-md-12">
-						 <div class="col-md-3">
-						 <label>Req No</label>
-									<div>
-										 <?php
-											$RL = array("0"=>'Select Req No');     
-											if(!empty($RequistionDetails))
-											{
-											foreach ($RequistionDetails as $SID):			   
-												$RL[$SID->ReqNo] =  $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
-											endforeach;
-											}
-							
-											echo form_dropdown('ReqNo', $RL,set_value('ReqNo'),'id="ReqNo"' ,'class="form-control"');
-
-										?>						 
-									</div>
-								</div>
-						 
-						  <div class="col-md-3">
-						   <label>Department Name</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'deptName','value' => set_value('deptName'),'id'=>'deptName',  'class' => 'form-control');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						  <div class="col-md-3">
-						   <label>Cost Center Name</label>
-									<div class="form-group">
-												<?php
-						$data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-
-						?>		
-									</div>
-						 </div>
-						  <div class="col-md-3">
-						   <label>Available Budget Amount</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'AvlBudAmt','value' => set_value('AvlBudAmt'),'id'=>'AvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-		 </div>
-		 <div class="col-md-12">
-						  <div class="col-md-2">
-						  <label>Item Code</label>
-									<div>
-										 <?php
-										$options = array("0"=>'Item Code');     
-										//print_r(  $options);
-										
-																			
-							
-										echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
-
-										?>						 
-									</div>
-					   </div>
-						  
-						 <div class="col-md-2">
-						  <label>Item Name</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'ItemName','value' => set_value('ItemName'),'id'=>'ItemName',  'class' => 'form-control' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-2">
-						  <label>UOM</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-2">
-						  <label>Quantity</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange()');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-2">
-						  <label>Rate</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()' );
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-2">
-						  <label>Basic Amount</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue',  'class' => 'form-control num' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-		 </div>
-		 <div class="col-md-12">
-				<div class="col-md-12">
-					<div class="col-md-5 col-md-offset-4" align="right">
-							 
-			 Service Tax @14% :
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-												<?php
-										 $data = array('name' => 'AfterServiceTax','value' => set_value('AfterServiceTax'),'id'=>'AfterServiceTax',  'class' => 'form-control num' ,'placeholder' => 'After Service Tax','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>			 
-		 
-				</div>		 
-		    <div class="col-md-12">
-					<div class="col-md-5 col-md-offset-4" align="right">
-						Edu. cess @2% on service Tax 	: 
-			 
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-												<?php
-										 $data = array('name' => 'AfterEduCess','value' => set_value('AfterEduCess'),'id'=>'AfterEduCess',  'class' => 'form-control num' ,'placeholder' => 'After Edu.','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	 
-		 
-		 </div>
-		 <div class="col-md-12">
-						 
-		 <div class="col-md-5 col-md-offset-4" align="right">
-							Sec. & Higher Edu. cess @1 % on service Tax  :
-			 
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-												<?php
-										 $data = array('name' => 'AfterSecHighTax','value' => set_value('AfterSecHighTax'),'id'=>'AfterSecHighTax',  'class' => 'form-control num' ,'placeholder' => 'After High Edu.','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>
-		 </div>
-		  <div class="col-md-12">
-						 
-		 <div class="col-md-5 col-md-offset-4" align="right">
-							Krishi Kalyan tax  @.5 % on Basic Amount:
-			 
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-												<?php
-										 $data = array('name' => 'AfterKrishiTax','value' => set_value('AfterKrishiTax'),'id'=>'AfterKrishiTax',  'class' => 'form-control  num' ,'placeholder' => 'After Krishi Kalyan tax.','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>
-		 </div>
-		  <div class="col-md-12">
-						 
-		 <div class="col-md-5 col-md-offset-4" align="right">
-							Swachh Bharat tax @.5 % on Basic Amount:
-			 
-					</div>	
-						
-					<div class="col-md-3">
-							 <div class="form-group">
-												<?php
-										 $data = array('name' => 'AfterSwachhTax','value' => set_value('AfterSwachhTax'),'id'=>'AfterSwachhTax',  'class' => 'form-control num' ,'placeholder' => 'After High Edu.','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>
-		 </div>
-		
-		  <div class="col-md-12">
-		 <div class="col-md-5 col-md-offset-4" align="right">
-							Total Order value :			 
-					</div>	
-		<div class="col-md-3">
-							 <div class="form-group">
+		<div style="border:2px solid #333">
+			<div id="content"></div>
+			<div><center><b><h2>Siddharth Industries - Edit Service Purchase Order for Amendment- <?php echo $PONO;?></h2></b></center></div>
+			<div class="container-fluid">		
+							<div class="row">
+						<div class="col-md-12">
+							<div class="col-md-3">
+								<div class="col-md-12">
+									<label>Requistion No</label>
+												 
+												
 													<?php
-											 $data = array('name' => 'TotalOrderValue','value' => set_value('TotalOrderValue'),'id'=>'TotalOrderValue',  'class' => 'form-control num' ,'placeholder' => 'Total value','readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-		 </div>
-		 
-			</div>
-		
-			
-			  <br/>
-			   <br/>
-			<div class="modal-footer">
-			<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>
-						<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
-			
-			</div>
-		  </div>
-		 </form>
-			 
-		  </div>
-	</div>	
-  </div>
-   <!-- Edit Modal content-->
-  <div class="modal fade" id="EDITSERVICE" role="dialog">
-		<div class="modal-dialog">
-	   <!-- Modal content-->
-	 <form>
-		  <div class="modal-content" style="width:900px;">
-			<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> 
-			  <center><h4>Edit Service Purchase Order Item </h4></center>				
-			</div>
-			<div align="left"> 
-			 
-			<div class="col-md-12">
-						 <div class="col-md-3">
-						 <label>Req No</label>
-									<div>
-										 <?php
+													 
+													  $options = array("0"=>'Selected Requisition Numbers'); 
+														 if(!empty($ReqList))
+												{
+												foreach ($ReqList as $SID):
+												  
+													   $options[$SID->ReqNo] = $SID->ReqNo ;
+												   endforeach;
+												}	
+													echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' , 'required="true"');
+
+													?>
+									</div>
+								<div class="col-md-12">
+										<label>Purchase Order Date</label>
+												<div class="form-group">
+															<?php
+													 $data = array('name' => 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate',  'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;');
+													echo form_input($data);
+													?>   							    
+												</div>
+								</div>							
+												 
+							</div>
+							<div class="col-md-9">
+							<div class="col-md-4">
+								<div class="col-md-12">
+									<label>Supplier</label>
+										  <?php
+											$options = array("0"=>'Select Supplier');     
+											//print_r(  $options);
 											
-										$data = array('name' => 'EditReqNo','value' => set_value('EditReqNo'),'id'=>'EditReqNo',  'class' => 'form-control','readonly'=>'true');
-										echo form_input($data);
-										?>	
-										
-									</div>
+											if(!empty($Suplist))
+											{
+											foreach ($Suplist as $SID):
+											  
+										   
+											  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
+
+											endforeach;
+											}										
+								
+											echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId ),'id="drpSupplier"'  ,'required="true"' ,'class="form-control select2');
+
+											?>						 
+										 
 								</div>
-						 
-						  <div class="col-md-3">
-						   <label>Department Name</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'EditdeptName','value' => set_value('EditdeptName'),'id'=>'EditdeptName',  'class' => 'form-control','readonly'=>'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						  <div class="col-md-3">
-						   <label>Cost Center Name</label>
-									<div class="form-group">
-												<?php
-						$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-
-						?>		
-									</div>
-						 </div>
-						  <div class="col-md-3">
-						   <label>Available Budget Amount</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditAvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-		 </div>
-		 <div class="col-md-12">
-						  <div class="col-md-2">
-						  <label>Item Code</label>
-									<div>
-										 <?php
-										$options = array("0"=>'Item Code');     
-										//print_r(  $options);
-										
-										echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"');
-
-										?>						 
-									</div>
-					   </div>
-						  
-						 <div class="col-md-2">
-						  <label>Item Name</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'EditItemName','value' => set_value('EditItemName'),'id'=>'EditItemName',  'class' => 'form-control' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-2">
-						  <label>UOM</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'EditUOM','value' => set_value('EditUOM'),'id'=>'EditUOM',  'class' => 'form-control' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-2">
-						  <label>Quantity</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange()');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-2">
-						  <label>Rate</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-2">
-						  <label>Basic Amount</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'txtEditBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditBasicValue',  'class' => 'form-control num' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-		 </div>
-		 <div class="col-md-12">
-				<div class="col-md-12">
-					<div class="col-md-5  col-md-offset-4" align="right">
-							 
-			 Service Tax @14% :
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-												<?php
-										 $data = array('name' => 'EditAfterServiceTax','value' => set_value('EditAfterServiceTax'),'id'=>'EditAfterServiceTax',  'class' => 'form-control num','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>			 
-		 
-				</div>		 
-		    <div class="col-md-12">
-					<div class="col-md-5  col-md-offset-4" align="right">
-						Edu. cess @2% on service Tax 	: 
-			 
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-												<?php
-										 $data = array('name' => 'EditAfterEduCess','value' => set_value('EditAfterEduCess'),'id'=>'EditAfterEduCess',  'class' => 'form-control num' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	 
-		 
-		 </div>
-		 <div class="col-md-12">
-						 
-		 <div class="col-md-5  col-md-offset-4" align="right">
-							Sec. & Higher Edu. cess @1 % on service Tax  :
-			 
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-												<?php
-										 $data = array('name' => 'EditAfterSecHighTax','value' => set_value('EditAfterSecHighTax'),'id'=>'EditAfterSecHighTax',  'class' => 'form-control num' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>
-		 </div>
-		  <div class="col-md-12">
-						 
-		 <div class="col-md-5  col-md-offset-4" align="right">
-							Krishi Kalyan tax  @.5 % on Basic Amount:
-			 
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-												<?php
-										 $data = array('name' => 'EditAfterKrishiTax','value' => set_value('EditAfterKrishiTax'),'id'=>'EditAfterKrishiTax',  'class' => 'form-control num' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>
-		 </div>
-		  <div class="col-md-12">
-						 
-		 <div class="col-md-5  col-md-offset-4" align="right">
-							Swachh Bharat tax @.5 % on Basic Amount:
-			 
-					</div>	
-						
-					<div class="col-md-3">
-							 <div class="form-group">
-												<?php
-										 $data = array('name' => 'EditAfterSwachhTax','value' => set_value('EditAfterSwachhTax'),'id'=>'EditAfterSwachhTax',  'class' => 'form-control num' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>
-		 </div>
-		
-		  <div class="col-md-12">
-		 <div class="col-md-5  col-md-offset-4" align="right">
-							Total Order value :			 
-					</div>	
-		<div class="col-md-3">
-							 <div class="form-group">
+								<div class="col-md-12"><br/>
+									<label>Address</label>
+										<div class="form-group">
 													<?php
-											 $data = array('name' => 'EditTotalOrderValue','value' => set_value('EditTotalOrderValue'),'id'=>'EditTotalOrderValue',  'class' => 'form-control num' ,'readonly' => 'true');
+											 $data = array('name' => 'SupAddress','value' => set_value('SupAddress',$Address),'id'=>'SupAddress',  'class' => 'form-control' ,'readonly' => 'true','rows' => '3', 'cols' => '40');
+											echo Form_textarea($data);
+											?>   
+										</div>
+								</div>
+							</div>
+							<div class="col-md-4">
+								<div class="col-md-12">
+									 <label>Purchase Order Type</label>
+											<div class="form-group">
+											
+														<?php
+												 $data = array('name' => 'POType','value' => set_value('POType',SERVICE),'id'=>'POType',  'class' => 'form-control' ,'readonly' => 'true');
+												echo form_input($data);
+												?>   
+											</div>
+								</div>
+								<div class="col-md-12">
+									 <label>Delivery Address</label>
+										<div class="form-group">
+													<?php
+											 $data = array('name' => 'DeliveryAddr','value' => set_value('DeliveryAddr',$DeliveryAddress),'id'=>'DeliveryAddr',  'class' => 'form-control' ,'required' => 'true', 'rows' => '3', 'cols' => '40');
+											echo Form_textarea($data);
+											?><input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress"  value="<?php echo $DeliveryAddress;?>"> 
+											   
+										</div>
+								</div>
+							</div>
+							<div class="col-md-4">
+								<div class="col-md-6">
+									<b><u>Select Delivery By</u></b><br/>
+										<tr>
+											<td>
+												  <?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;". form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?>
+											</td>
+
+											<td>
+												  <?php echo form_label('Schedule', 'Schedule') . "&nbsp;&nbsp;". form_radio(array('name' => 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?>
+												 
+											</td>					   
+										</tr>
+								</div>
+								<div class="col-md-6">
+									<label>Work Status</label>
+									   <?php
+								
+									   $options = array("0"=>$WrkStatus);     
+										//print_r(  $options);
+						
+						                if(!empty($WorkStatus))
+						                  {
+						                    foreach ($WorkStatus as $SID):
+						  
+                                            $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+						                    endforeach;
+						                  }										
+			
+						echo form_dropdown('workstatus', $options,set_value('workstatus'),'id="workstatus"'  ,'required="true"' ,'class="form-control select2');
+
+											?>	
+								</div>
+								<div class="col-md-12" id="Deliverydtdiv"><br/>
+									<label>Delivery Date</label>
+										<div class="form-group">
+													<?php
+											 $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
 											echo form_input($data);
 											?>   
 										</div>
-							 </div>
-		 </div>
-		 
-			</div>
-		
-			
-			  <br/>
-			   <br/>
-			<div class="modal-footer">
-			<a class="btn btn-primary font EditService"  ID="Edit"  style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
-						<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
-			
-			</div>
-		  </div>
-		 </form>
-			 
-		  </div>
-	</div>	
-  </div>
-  
-</div>	
-   
-   
-   
-   <br/>
-   <div class="box-body" style="margin-top: -2%;">
-              <table id="ServiceTable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-                <thead style="background-color:#ddf">
-                <tr>
-					<th>SNo</th>
-					<th>Requisition No</th>
-					<th>Item Name</th>
-					<th>Quantity</th>
-					<th>UOM</th>
-					<th>Rate</th>
-					<th>Basic Amount</th>
-					<th>Tax Amount</th>
-					<th>Total Order Amount</th>
-					<th>Action</th>
-                </tr>
-                </thead>				
-               
-               <tbody id='ServiceAppend'>
-      <?php
-    if(!empty($POItem))
-                    {
-						 $index = 0;
-						
-                        foreach($POItem as $record)
-                        {
-							$index = $index + 1;
-                    ?>
-					<tr id="<?php echo $index ; ?>">
-					<td align="left"><?php echo $index ; ?></td> 
-					<td><?php echo $record->ReqNo ?></td> 
-					<td><?php echo $record->MaterialName ?></td> 
-					<td align="right"><?php echo $record->Quantity ?></td>   					
-					<td><?php echo $record->UOM ?></td>                     
-					<td align="right"><?php echo $record->Rate ?></td>                     
-					
-					<td align="right"><?php echo $record->BasicValue ?></td>    
-					  
-					<td align="right"><?php echo $record->Taxamount ?></td>
-					<td align="right"><?php echo $record->TotalValue ?></td>
-					 <input type="hidden" name="<?php echo 'Reqnumber'.$index ?>" id="<?php echo 'Reqnumber'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
-					 <input type="hidden" name="<?php echo 'departmentName'.$index ?>" id="<?php echo 'departmentName'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
-					<input type="hidden" name="<?php echo 'AvilBudget'.$index ?>" id="<?php echo 'AvilBudget'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />					
-					<input type="hidden" name="<?php echo 'LineItemNo'.$index ?>" id="<?php echo 'LineItemNo'.$index ?>" value="<?php echo $record->LineItemNo ; ?>" />
- <input type="hidden" name="<?php echo 'costCode'.$index ?>" id="<?php echo 'costCode'.$index ?>" value="<?php echo $record->CostCenterCode ; ?>" />
- <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 '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 ; ?>" />
- <input type="hidden" name="<?php echo 'ServiceTax'.$index ?>" id="<?php echo 'ServiceTax'.$index ?>" value="<?php echo $record->ServiceTax ; ?>" />
- <input type="hidden" name="<?php echo 'EduCess'.$index ?>" id="<?php echo 'EduCess'.$index ?>" value="<?php echo $record->EducessTax ; ?>" />
- <input type="hidden" name="<?php echo 'SecHighTax'.$index ?>" id="<?php echo 'SecHighTax'.$index ?>" value="<?php echo $record->SecHigherEducessTax ; ?>" />
- <input type="hidden" name="<?php echo 'KrishiTax'.$index ?>" id="<?php echo 'KrishiTax'.$index ?>" value="<?php echo $record->KrishiKalyantax ; ?>" />
-  <input type="hidden" name="<?php echo 'SwachhTax'.$index ?>" id="<?php echo 'SwachhTax'.$index ?>" value="<?php echo $record->SwachhBharattax ; ?>" />
- <input type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
-                    <?php 
-					        
-							//if($POStatus == PO_DRAFT) 
-							//{?>					
-					<td>    <a    data-target='#EDITSERVICE'	data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <!-- <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>-->
-                      <?php
-                       // } else {?>	
-						<!-- <td>   <a  	data-toggle="tooltip"  href="#"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?>  -  Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a>  </td> -->  
-						 <?php  
-                        }?>	
-                    </tr>
-					 <?php
-								$TotalServiceTax = $TotalServiceTax + $record->ServiceTax;
-								$TotalEducessTax = $TotalEducessTax + $record->EducessTax;
-								$TotalSecHigherEducessTax = $TotalSecHigherEducessTax + $record->SecHigherEducessTax;
-								$TotalKrishiKalyantax = $TotalKrishiKalyantax + $record->KrishiKalyantax;
-								$TotalSwachhBharattax = $TotalSwachhBharattax + $record->SwachhBharattax;
-								$TotalSummary = $TotalSummary + $record->TotalValue;
-                                                               
-                                                                 
-								$TotalBasicAmount = $TotalBasicAmount + $record->BasicValue;
+								</div>
+								<div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
+										<label >Schedule :</label>					 
+										<?php
+										$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
+										echo Form_textarea($data);
+										?>
+
+								</div>
+							</div>
+							
+						</div>
+							<div class="col-md-12">
+								<legend>Payment Details</legend>
+							<!-- Text input-->
+								<div class="col-md-3">
+									<span for="payablefrom">Payable Terms</span>
+										<select class="form-control required" id="PaymentTerms" name="PaymentTerms">
+											<option value="" ><?php echo $Terms;?></option>
+												<?php
+												if(!empty($payment))
+												{
+													foreach ($payment as $rl)
+													{
+														?>
+														<option value="<?php echo $rl->ConfigValue ?>"><?php echo $rl->ConfigValue ?></option>
+														<?php
+													}
+												}
+												?>
+										</select>
+								</div>
 								
-                        }
-						?> <input type="hidden" name="txtRowCount" id="txtRowCount"  value="<?php echo $index;?>">
-						<?php 
-						   
-                   // }
-                    ?>
-    </tbody>
-              </table>
-            </div>
-   
-     
-	<div class="row" style="border: 1px solid">
-		<div class="col-md-12">
-			<div class="col-md-4">
-				 <label>Basic Amount  :</label> 
-				 <?php
-						 $data = array('name' => 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',number_format($TotalBasicAmount,2)),'id'=>'txtTotBasicAmount',  'class' => 'form-control num'  ,'readonly' => 'true');
-						echo form_input($data);
-						?>   
-			</div>
-			<div class="col-md-4">
-				<label>Total Service Tax @14%   :</label> 
-				<?php
-						 $data = array('name' => 'txtTotalServiceTax','value' => set_value('txtTotalServiceTax',$TotalServiceTax),'id'=>'txtTotalServiceTax',  'class' => 'form-control num'   ,'readonly' => 'true');
-						echo form_input($data);
-						?>   
-			</div>
-			<div class="col-md-4">
-				 <label >Total Edu. cess @2% on service Tax  :</label> 
-				 <?php
-						 $data = array('name' => 'txtTotalEducess','value' => set_value('txtTotalEducess',$TotalEducessTax),'id'=>'txtTotalEducess',  'class' => 'form-control num' ,'readonly' => 'true');
-						echo form_input($data);
-						?>   
-			</div>
-		</div>
-		<div class="col-md-12">
-			<div class="col-md-4">
-				 <label >Total Sec. & Higher Edu. cess @1 % on service Tax   :</label> 
-				 <?php
-						 $data = array('name' => 'txtTotHigherEdu','value' => set_value('txtTotHigherEdu',$TotalSecHigherEducessTax),'id'=>'txtTotHigherEdu',  'class' => 'form-control num' ,'readonly' => 'true');
-						echo form_input($data);
-						?>   
-			</div>
-			<div class="col-md-4">
-				<label >Total Krishi Kalyan tax  @.5 % on Basic Amount  :</label> 
-				<?php
-						 $data = array('name' => 'txtTotalKrishiKalyan','value' => set_value('txtTotalKrishiKalyan',$TotalKrishiKalyantax),'id'=>'txtTotalKrishiKalyan',  'class' => 'form-control num'  ,'readonly' => 'true');
-						echo form_input($data);
-						?>   
-			</div>
-			<div class="col-md-4">
-				<label >Total Swachh Bharat tax  @.5 % on Basic Amount:</label> 
-				<?php
-						 $data = array('name' => 'txtTotSwachhBharat','value' => set_value('txtTotSwachhBharat',$TotalSwachhBharattax),'id'=>'txtTotSwachhBharat',  'class' => 'form-control num'   ,'readonly' => 'true');
-						echo form_input($data);
-						?>   
-			</div>
-		</div>
-		<div class="col-md-6 col-md-offset-6">
-			<br/>
-			<div class="col-md-6" align="right"> <label >Total Order Value   :</label></div>
-			<div class="col-md-6">			
-				<?php
-				 $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',$TotalSummary),'id'=>'txtTotalOrderValueSummary',  'class' => 'form-control num'  ,'readonly' => 'true');
-				echo form_input($data);
-				?>   
-					
-			</div> 
-		</div>
-		<div class="col-md-12">
-			<div class="col-md-12">
-				<label>Comments Of Special Instructions :</label>	<?php
-					 $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '4', 'cols' => '40' );
-					echo form_textarea($data);
-					?>  <input type="hidden" name="SpcialInstruction" id="SpcialInstruction"  value="<?php echo $ServiceDescription;?>"> 
-			</div>
-		</div>
-		<div class="col-md-12">
-			<div class="row"><br/>
-				<div align="right" style="padding-right:10px">
-				<input type="hidden" name="txtPONO" id="txtPONO"  value="<?php  echo $PONO; ?>"/> 
-				<input type="hidden" name="txtStatus" id="txtStatus" /> 		   
-				<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />  
-				<?php //if($POStatus == PO_DRAFT) {?>   
-			<!--	<a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
-				<a class="btn btn-primary Save"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
-				<input type="reset" class="btn btn-primary" value="Reset">
-				<?php //}else {?>
-				<!-- <input type="reset" class="btn btn-primary" value = "OK">  <?php// } ?> -->
-				</div><br/>
-		   </div>
-		</div>
-		<br/>
-	 </div><br/>
-</div>
-       
-</div>
+								<div class="col-md-3">
+								  <span>Payable AT</span>
+								  
+								  <?php
+									 $data = array('name' => 'PayableAT','value' => set_value('PayableAT',$PayableAT),'id'=>'PayableAT',  'class' => 'form-control' ,'required' => 'true');
+									echo form_input($data);
+									?>   
+										
+								</div>
+								
+								<div class="col-md-6">
+									  Payment Date <br/>
+												<tr>
+													<td>
+														<?php echo form_label('Before', 'Before') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"Before", "value"=>"0", 'checked'=>set_radio('Payment', '0', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+													<td>
+														<?php echo form_label('After', 'After') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"After", "value"=>"1", 'checked'=>set_radio('Payment', '1', FALSE))); ?>
+
+													</td>
+												</tr>
+								</div>
+							</div>
+						</div>
+						</div>	
+							<div class="container-fluid">   	 
+						<div style="padding-right:10px">
+						<div align="right">
+						<!-- <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-primary" id="abcd" >Select Line Item</button> </a> -->
+				  
+							<!-- Model for servicepo -->
+							<div class="modal fade" id="SERVICE" role="dialog">
+								<div class="modal-dialog">
+							   <!-- Modal content-->
+							 <form>
+								  <div class="modal-content" style="width:900px;">
+									<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> 
+									  <center><h4>Add Service Purchase Order Item </h4></center>				
+									</div>
+									<div align="left"> 
+									 
+									<div class="col-md-12">
+												 <div class="col-md-3">
+												 <label>Req No</label>
+															<div>
+																 <?php
+																	$RL = array("0"=>'Select Req No');     
+																	if(!empty($RequistionDetails))
+																	{
+																	foreach ($RequistionDetails as $SID):			   
+																		$RL[$SID->ReqNo] =  $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
+																	endforeach;
+																	}
+													
+																	echo form_dropdown('ReqNo', $RL,set_value('ReqNo'),'id="ReqNo"' ,'class="form-control"');
+
+																?>						 
+															</div>
+														</div>
+												 
+												  <div class="col-md-3">
+												   <label>Department Name</label>
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'deptName','value' => set_value('deptName'),'id'=>'deptName',  'class' => 'form-control');
+																echo form_input($data);
+																?>   
+															</div>
+												 </div>
+												  <div class="col-md-3">
+												   <label>Cost Center Name</label>
+															<div class="form-group">
+																		<?php
+												$data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+																		echo form_input($data);
+
+												?>		
+															</div>
+												 </div>
+												  <div class="col-md-3">
+												   <label>Available Budget Amount</label>
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'AvlBudAmt','value' => set_value('AvlBudAmt'),'id'=>'AvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+												 </div>
+								 </div>
+								 <div class="col-md-12">
+												<div class="col-md-3">
+												  <label>Item Code</label>
+															<div>
+																 <?php
+																$options = array("0"=>'Item Code');     
+																//print_r(  $options);
+																
+																									
+													
+																echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
+
+																?>						 
+															</div>
+											   </div>
+												<div class="col-md-3">
+												  <label>Item Name</label>
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'ItemName','value' => set_value('ItemName'),'id'=>'ItemName',  'class' => 'form-control' ,'readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+												 </div>
+												<div class="col-md-3">
+												  <label>UOM</label>
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control' ,'readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+												 </div>
+												<div class="col-md-3">
+												  <label>Frequency</label>
+															<div>
+																<?php
+																 $data = array('name' => 'Frequency','value' => set_value('Frequency'),'id'=>'Frequency',  'class' => 'form-control' );
+																echo form_input($data);
+																?>   					 
+															</div>
+											   </div>
+								</div>
+								<div class="col-md-12">
+												<div class="col-md-3">
+												  <label>Quantity</label>
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange()');
+																echo form_input($data);
+																?>   
+															</div>
+												 </div>
+												 <div class="col-md-3">
+												  <label><?php echo "Rate ($Value)";?></label>
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()' );
+																echo form_input($data);
+																?>   
+															</div>
+												 </div>
+												 <div class="col-md-3">
+												  <label><?php echo "Basic Amount ($Value);"?></label>
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue',  'class' => 'form-control num' ,'readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+												 </div>
+								 
+								</div>
+								 <div class="col-md-12">
+										<div class="col-md-12">
+											<div class="col-md-5 col-md-offset-4" align="right">
+													 
+									 Service Tax @14% :
+											</div>	
+											
+											<div class="col-md-3">
+													 <div class="form-group">
+																		<?php
+																 $data = array('name' => 'AfterServiceTax','value' => set_value('AfterServiceTax'),'id'=>'AfterServiceTax',  'class' => 'form-control num' ,'placeholder' => 'After Service Tax','readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+									 
+											</div>			 
+								 
+										</div>		 
+									<div class="col-md-12">
+											<div class="col-md-5 col-md-offset-4" align="right">
+												Edu. cess @2% on service Tax 	: 
+									 
+											</div>	
+											
+											<div class="col-md-3">
+													 <div class="form-group">
+																		<?php
+																 $data = array('name' => 'AfterEduCess','value' => set_value('AfterEduCess'),'id'=>'AfterEduCess',  'class' => 'form-control num' ,'placeholder' => 'After Edu.','readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+									 
+											</div>	 
+								 
+								 </div>
+								 <div class="col-md-12">
+												 
+								 <div class="col-md-5 col-md-offset-4" align="right">
+													Sec. & Higher Edu. cess @1 % on service Tax  :
+									 
+											</div>	
+											
+											<div class="col-md-3">
+													 <div class="form-group">
+																		<?php
+																 $data = array('name' => 'AfterSecHighTax','value' => set_value('AfterSecHighTax'),'id'=>'AfterSecHighTax',  'class' => 'form-control num' ,'placeholder' => 'After High Edu.','readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+									 
+											</div>
+								 </div>
+								  <div class="col-md-12">
+												 
+								 <div class="col-md-5 col-md-offset-4" align="right">
+													Krishi Kalyan tax  @.5 % on Basic Amount:
+									 
+											</div>	
+											
+											<div class="col-md-3">
+													 <div class="form-group">
+																		<?php
+																 $data = array('name' => 'AfterKrishiTax','value' => set_value('AfterKrishiTax'),'id'=>'AfterKrishiTax',  'class' => 'form-control  num' ,'placeholder' => 'After Krishi Kalyan tax.','readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+									 
+											</div>
+								 </div>
+								  <div class="col-md-12">
+												 
+								 <div class="col-md-5 col-md-offset-4" align="right">
+													Swachh Bharat tax @.5 % on Basic Amount:
+									 
+											</div>	
+												
+											<div class="col-md-3">
+													 <div class="form-group">
+																		<?php
+																 $data = array('name' => 'AfterSwachhTax','value' => set_value('AfterSwachhTax'),'id'=>'AfterSwachhTax',  'class' => 'form-control num' ,'placeholder' => 'After High Edu.','readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+									 
+											</div>
+								 </div>
+								
+								  <div class="col-md-12">
+								 <div class="col-md-5 col-md-offset-4" align="right">
+									<label><?php echo "Total Order Value ($Value)";?></label>		 
+											</div>	
+								<div class="col-md-3">
+													 <div class="form-group">
+																			<?php
+																	 $data = array('name' => 'TotalOrderValue','value' => set_value('TotalOrderValue'),'id'=>'TotalOrderValue',  'class' => 'form-control num' ,'placeholder' => 'Total value','readonly' => 'true');
+																	echo form_input($data);
+																	?>   
+																</div>
+													 </div>
+								 </div>
+								 
+									</div>
+								
+									
+									  <br/>
+									   <br/>
+									<div class="modal-footer">
+									<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>
+												<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
+									
+									</div>
+								  </div>
+								 </form>
+									 
+								  </div>
+							</div>	
+						  </div>
+						   <!-- Edit Modal content-->
+							<div class="modal fade" id="EDITSERVICE" role="dialog">
+								<div class="modal-dialog">
+							   <!-- Modal content-->
+							 <form>
+								  <div class="modal-content" style="width:900px;">
+									<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> 
+									  <center><h4>Edit Service Purchase Order Item </h4></center>				
+									</div>
+									<div align="left"> 
+									 
+									<div class="col-md-12">
+												 <div class="col-md-3">
+												 <label>Req No</label>
+															<div>
+																 <?php
+																	
+																$data = array('name' => 'EditReqNo','value' => set_value('EditReqNo'),'id'=>'EditReqNo',  'class' => 'form-control','readonly'=>'true');
+																echo form_input($data);
+																?>	
+																
+															</div>
+														</div>
+												 
+												  <div class="col-md-3">
+												   <label>Department Name</label>
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'EditdeptName','value' => set_value('EditdeptName'),'id'=>'EditdeptName',  'class' => 'form-control','readonly'=>'true');
+																echo form_input($data);
+																?>   
+															</div>
+												 </div>
+												  <div class="col-md-3">
+												   <label>Cost Center Name</label>
+															<div class="form-group">
+																		<?php
+												$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+																		echo form_input($data);
+
+												?>		
+															</div>
+												 </div>
+												  <div class="col-md-3">
+												   <label>Available Budget Amount</label>
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditAvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+												 </div>
+								 </div>
+								 <div class="col-md-12">
+												  <div class="col-md-3">
+												  <label>Item Code</label>
+															<div>
+																 <?php
+																$options = array("0"=>'Item Code');     
+																//print_r(  $options);
+																
+																echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"');
+
+																?>						 
+															</div>
+											   </div>
+												<div class="col-md-3">
+												  <label>Item Name</label>
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'EditItemName','value' => set_value('EditItemName'),'id'=>'EditItemName',  'class' => 'form-control' ,'readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+												 </div>
+												 <div class="col-md-3">
+												  <label>UOM</label>
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'EditUOM','value' => set_value('EditUOM'),'id'=>'EditUOM',  'class' => 'form-control' ,'readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+												 </div>
+												<div class="col-md-3">
+												  <label>Frequency</label>
+															<div>
+																<?php
+																 $data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency',  'class' => 'form-control' );
+																echo form_input($data);
+																?>   					 
+															</div>
+											   </div>
+								</div>
+								<div class="col-md-12">
+												<div class="col-md-3">
+												  <label>Quantity</label>
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange()');
+																echo form_input($data);
+																?>   
+															</div>
+												 </div>
+												 <div class="col-md-3">
+												  <label><?php echo "Rate ($Value)";?></label>
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
+																echo form_input($data);
+																?>   
+															</div>
+												 </div>
+												 <div class="col-md-3">
+												  <label><?php echo "Basic Amount ($Value)";?></label>
+															<div class="form-group">
+																		<?php
+																 $data = array('name' => 'txtEditBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditBasicValue',  'class' => 'form-control num' ,'readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+												 </div>
+								 
+								</div>
+								 <div class="col-md-12">
+										<div class="col-md-12">
+											<div class="col-md-5  col-md-offset-4" align="right">
+													 
+									 Service Tax @14% :
+											</div>	
+											
+											<div class="col-md-3">
+													 <div class="form-group">
+																		<?php
+																 $data = array('name' => 'EditAfterServiceTax','value' => set_value('EditAfterServiceTax'),'id'=>'EditAfterServiceTax',  'class' => 'form-control num','readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+									 
+											</div>			 
+								 
+										</div>		 
+									<div class="col-md-12">
+											<div class="col-md-5  col-md-offset-4" align="right">
+												Edu. cess @2% on service Tax 	: 
+									 
+											</div>	
+											
+											<div class="col-md-3">
+													 <div class="form-group">
+																		<?php
+																 $data = array('name' => 'EditAfterEduCess','value' => set_value('EditAfterEduCess'),'id'=>'EditAfterEduCess',  'class' => 'form-control num' ,'readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+									 
+											</div>	 
+								 
+								 </div>
+								 <div class="col-md-12">
+												 
+								 <div class="col-md-5  col-md-offset-4" align="right">
+													Sec. & Higher Edu. cess @1 % on service Tax  :
+									 
+											</div>	
+											
+											<div class="col-md-3">
+													 <div class="form-group">
+																		<?php
+																 $data = array('name' => 'EditAfterSecHighTax','value' => set_value('EditAfterSecHighTax'),'id'=>'EditAfterSecHighTax',  'class' => 'form-control num' ,'readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+									 
+											</div>
+								 </div>
+								  <div class="col-md-12">
+												 
+								 <div class="col-md-5  col-md-offset-4" align="right">
+													Krishi Kalyan tax  @.5 % on Basic Amount:
+									 
+											</div>	
+											
+											<div class="col-md-3">
+													 <div class="form-group">
+																		<?php
+																 $data = array('name' => 'EditAfterKrishiTax','value' => set_value('EditAfterKrishiTax'),'id'=>'EditAfterKrishiTax',  'class' => 'form-control num' ,'readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+									 
+											</div>
+								 </div>
+								  <div class="col-md-12">
+												 
+								 <div class="col-md-5  col-md-offset-4" align="right">
+													Swachh Bharat tax @.5 % on Basic Amount:
+									 
+											</div>	
+												
+											<div class="col-md-3">
+													 <div class="form-group">
+																		<?php
+																 $data = array('name' => 'EditAfterSwachhTax','value' => set_value('EditAfterSwachhTax'),'id'=>'EditAfterSwachhTax',  'class' => 'form-control num' ,'readonly' => 'true');
+																echo form_input($data);
+																?>   
+															</div>
+									 
+											</div>
+								 </div>
+								
+								  <div class="col-md-12">
+								 <div class="col-md-5  col-md-offset-4" align="right">
+								<label><?php echo "Total Order Value ($Value)";?></label>>			 
+											</div>	
+								<div class="col-md-3">
+													 <div class="form-group">
+																			<?php
+																	 $data = array('name' => 'EditTotalOrderValue','value' => set_value('EditTotalOrderValue'),'id'=>'EditTotalOrderValue',  'class' => 'form-control num' ,'readonly' => 'true');
+																	echo form_input($data);
+																	?>   
+																</div>
+													 </div>
+								 </div>
+								 
+									</div>
+								
+									
+									  <br/>
+									   <br/>
+									<div class="modal-footer">
+									<a class="btn btn-primary font EditService"  ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
+												<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
+									
+									</div>
+								  </div>
+								 </form>
+									 
+								  </div>
+							</div>	
+						  </div>
+						  
+						</div>	
+						<br/>
+						<div class="box-body" style="margin-top: -2%;">
+						<table id="ServiceTable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
+							<thead style="background-color:#ddf">
+							<tr>
+								<th>SNo</th>
+								<th>Requisition No</th>
+								<th>Item Name</th>
+								<th>Quantity</th>
+								<th>UOM</th>
+								<th>Rate</th>
+								<th>Basic Amount</th>
+								<th>Tax Amount</th>
+								<th>Total Order Amount</th>
+								<th>Action</th>
+							</tr>
+							</thead>				
+							   
+							<tbody id='ServiceAppend'>
+								  <?php
+								if(!empty($POItem))
+									{
+										 $index = 0;
+										
+										foreach($POItem as $record)
+										{
+											$index = $index + 1;
+									?>
+									<tr id="<?php echo $index ; ?>">
+									<td align="left"><?php echo $index ; ?></td> 
+									<td><?php echo $record->ReqNo ?></td> 
+									<td><?php echo $record->MaterialName ?></td> 
+									<td align="right"><?php echo $record->Quantity ?></td>   					
+									<td><?php echo $record->UOM ?></td>                     
+									<td align="right"><?php echo $record->Rate ?></td>                     
+									
+									<td align="right"><?php echo $record->BasicValue ?></td>    
+									  
+									<td align="right"><?php echo $record->Taxamount ?></td>
+									<td align="right"><?php echo $record->TotalValue ?></td>
+									 <input type="hidden" name="<?php echo 'Reqnumber'.$index ?>" id="<?php echo 'Reqnumber'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
+									 <input type="hidden" name="<?php echo 'departmentName'.$index ?>" id="<?php echo 'departmentName'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
+									<input type="hidden" name="<?php echo 'AvilBudget'.$index ?>" id="<?php echo 'AvilBudget'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />					
+									<input type="hidden" name="<?php echo 'LineItemNo'.$index ?>" id="<?php echo 'LineItemNo'.$index ?>" value="<?php echo $record->LineItemNo ; ?>" />
+									 <input type="hidden" name="<?php echo 'costCode'.$index ?>" id="<?php echo 'costCode'.$index ?>" value="<?php echo $record->CostCenterCode ; ?>" />
+									 <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 '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 ; ?>" />
+									 <input type="hidden" name="<?php echo 'ServiceTax'.$index ?>" id="<?php echo 'ServiceTax'.$index ?>" value="<?php echo $record->ServiceTax ; ?>" />
+									 <input type="hidden" name="<?php echo 'EduCess'.$index ?>" id="<?php echo 'EduCess'.$index ?>" value="<?php echo $record->EducessTax ; ?>" />
+									 <input type="hidden" name="<?php echo 'SecHighTax'.$index ?>" id="<?php echo 'SecHighTax'.$index ?>" value="<?php echo $record->SecHigherEducessTax ; ?>" />
+									 <input type="hidden" name="<?php echo 'KrishiTax'.$index ?>" id="<?php echo 'KrishiTax'.$index ?>" value="<?php echo $record->KrishiKalyantax ; ?>" />
+									  <input type="hidden" name="<?php echo 'SwachhTax'.$index ?>" id="<?php echo 'SwachhTax'.$index ?>" value="<?php echo $record->SwachhBharattax ; ?>" />
+									 <input type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
+									 <input type="hidden" name="<?php echo 'ServiceFrequency'.$index ?>" id="<?php echo 'ServiceFrequency'.$index ?>" value="<?php echo $record->ServiceFrequency ; ?>" />
+									<?php 
+											
+											// if($POStatus == PO_DRAFT) 
+											// {?>					
+									<td>    <a    data-target='#EDITSERVICE'	data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <!-- <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a> -->
+									  <?php
+										//} else {?>	
+								<!--		<td>   <a  	data-toggle="tooltip"  href="#"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?>  -  Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a>  </td>  -->
+										 <?php  
+										//}?>	
+									</tr>
+									 <?php
+												$TotalServiceTax = $TotalServiceTax + $record->ServiceTax;
+												$TotalEducessTax = $TotalEducessTax + $record->EducessTax;
+												$TotalSecHigherEducessTax = $TotalSecHigherEducessTax + $record->SecHigherEducessTax;
+												$TotalKrishiKalyantax = $TotalKrishiKalyantax + $record->KrishiKalyantax;
+												$TotalSwachhBharattax = $TotalSwachhBharattax + $record->SwachhBharattax;
+												$TotalSummary = $TotalSummary + $record->TotalValue;
+																			   
+																				 
+												$TotalBasicAmount = $TotalBasicAmount + $record->BasicValue;
+												
+										}
+										 $RowCount = $index;?> 
+										<?php 
+										   
+									}
+									?>
+							</tbody>
+						</table>
+					</div>
+				   
+					 
+						<div class="row" style="border: 1px solid">
+						<div class="col-md-12">
+							<div class="col-md-4">
+								 <label>Basic Amount  :</label> 
+								 <?php
+										 $data = array('name' => 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',$TotalBasicAmount),'id'=>'txtTotBasicAmount',  'class' => 'form-control num'  ,'readonly' => 'true');
+										echo form_input($data);
+										?>   
+							</div>
+							<div class="col-md-4">
+								<label>Total Service Tax @14%   :</label> 
+								<?php
+										 $data = array('name' => 'txtTotalServiceTax','value' => set_value('txtTotalServiceTax',$TotalServiceTax),'id'=>'txtTotalServiceTax',  'class' => 'form-control num'   ,'readonly' => 'true');
+										echo form_input($data);
+										?>   
+							</div>
+							<div class="col-md-4">
+								 <label >Total Edu. cess @2% on service Tax  :</label> 
+								 <?php
+										 $data = array('name' => 'txtTotalEducess','value' => set_value('txtTotalEducess',$TotalEducessTax),'id'=>'txtTotalEducess',  'class' => 'form-control num' ,'readonly' => 'true');
+										echo form_input($data);
+										?>   
+							</div>
+						</div>
+						<div class="col-md-12">
+							<div class="col-md-4">
+								 <label >Total Sec. & Higher Edu. cess @1 % on service Tax   :</label> 
+								 <?php
+										 $data = array('name' => 'txtTotHigherEdu','value' => set_value('txtTotHigherEdu',$TotalSecHigherEducessTax),'id'=>'txtTotHigherEdu',  'class' => 'form-control num' ,'readonly' => 'true');
+										echo form_input($data);
+										?>   
+							</div>
+							<div class="col-md-4">
+								<label >Total Krishi Kalyan tax  @.5 % on Basic Amount  :</label> 
+								<?php
+										 $data = array('name' => 'txtTotalKrishiKalyan','value' => set_value('txtTotalKrishiKalyan',$TotalKrishiKalyantax),'id'=>'txtTotalKrishiKalyan',  'class' => 'form-control num'  ,'readonly' => 'true');
+										echo form_input($data);
+										?>   
+							</div>
+							<div class="col-md-4">
+								<label >Total Swachh Bharat tax  @.5 % on Basic Amount:</label> 
+								<?php
+										 $data = array('name' => 'txtTotSwachhBharat','value' => set_value('txtTotSwachhBharat',$TotalSwachhBharattax),'id'=>'txtTotSwachhBharat',  'class' => 'form-control num'   ,'readonly' => 'true');
+										echo form_input($data);
+										?>   
+							</div>
+						</div>
+						<div class="col-md-6 col-md-offset-6">
+							<br/>
+							<div class="col-md-6" align="right"> <label >Total Order Value   :</label></div>
+							<div class="col-md-6">			
+								<?php
+								 $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',$TotalSummary),'id'=>'txtTotalOrderValueSummary',  'class' => 'form-control num'  ,'readonly' => 'true');
+								echo form_input($data);
+								?>   
+									
+							</div> 
+						</div>
+						<div class="col-md-12">
+							<div class="col-md-12">
+								<label>Special Instructions :</label>	<?php
+									 $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40' );
+									echo form_textarea($data);
+									?>  <input type="hidden" name="SpcialInstruction" id="SpcialInstruction"  value="<?php echo $ServiceDescription;?>"> 
+							</div>
+						</div>
+						<div class="col-md-12">
+							<div class="row"><br/>
+								<div align="right" style="padding-right:10px">
+								<input type="hidden" name="txtPONO" id="txtPONO"  value="<?php  echo $PONO; ?>"/> 
+								<input type="hidden" name="txtStatus" id="txtStatus" /> 		   
+								<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />  
+								<input type="hidden" name="txtRowCount" id="txtRowCount"  value="<?php echo $RowCount;?>">
+								<?php //if($POStatus == PO_DRAFT) {?>   
+								<!--<a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
+								<a class="btn btn-primary Save"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
+								<input type="reset" class="btn btn-primary" value="Reset">
+								<?php //}else {?>
+							<!--	<input type="reset" class="btn btn-primary" value = "OK">  <?php //} ?>-->
+								</div><br/>
+						   </div>
+						</div>
+						<br/>
+					 </div><br/>
+						<div class="col-md-12">
+							<div class="col-md-4">
+								<span>Request On</span>								  
+								  <?php
+											 $data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
+											echo form_input($data);
+											?>   
+							</div>
+							<div class="col-md-4">
+								<span>Request By</span>								  
+								  <?php
+									 $data = array('name' => 'RequestBy','value' => set_value('RequestBy',$Requestedby),'id'=>'RequestBy',  'class' => 'form-control' ,'required' => 'true');
+									echo form_input($data);
+									?> 
+							</div>
+							<div class="col-md-4">
+								<span>Status</span>								  
+								 <?php
+									// $options = array("0"=>'Select Status');     
+									// echo form_dropdown('Status', $options,set_value('Status'),'id="Status"'  ,'required="true"' ,'class="form-control select2')
+								 $options = array("0"=>$POStatus);     
+                                    echo form_dropdown('Status', $options,set_value('Status',$POStatus),'id="Status"'  ,'required="true"' ,'class="form-control select2')
+								?>
+							</div><br/>
+						</div>
+						</div>
+					</div>
 
 </div>
-</div></section></div>
+		</div>
+	</section>
+</div>
 <script type="text/html" id="ServiceList">
 <tr  id="<%=index%>">
 <td align="left"><%=index%></td>
@@ -1412,6 +1563,18 @@ var userid  = '';
     Mat: []
 };
 
+
+var paymentday=<?php echo json_encode($PaymentDays,JSON_PRETTY_PRINT)?>;
+if (paymentday=="After") 
+{
+//alert();
+    document.getElementById("After").checked = true;
+}
+else
+{
+    document.getElementById("Before").checked = true;
+}
+
 $("#EDITSERVICE").on("shown.bs.modal", function(e) {
 		userid = $(e.relatedTarget).data('userid');
 	
@@ -1435,6 +1598,8 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
 		$('#EditAfterSecHighTax').val($('#SecHighTax'+userid).val());
 		$('#EditAfterKrishiTax').val($('#KrishiTax'+userid).val());
 		$('#EditAfterSwachhTax').val($('#SwachhTax'+userid).val());
+		$('#EditFrequency').val($('#ServiceFrequency'+userid).val());
+
 		$('#EditTotalOrderValue').val(cellval[8].innerHTML);
 		
 		RequistQuantity = $('#quantity'+userid).val();
@@ -1656,6 +1821,8 @@ $('.AddService').click(function(){
 
 function populateValueMainFormForServiceTax()
 {
+	
+		//alert('Worked');
 		var AfterServiceTax = $('#AfterServiceTax').val() == '' ? '0.00' : $('#AfterServiceTax').val();
 		var AfterEduCess = $('#AfterEduCess').val() == '' ? '0.00' : $('#AfterEduCess').val();
 		var AfterSecHighTax = $('#AfterSecHighTax').val() == '' ? '0.00' : $('#AfterSecHighTax').val();
@@ -1670,7 +1837,7 @@ function populateValueMainFormForServiceTax()
 		
 		var totBasicAmt = $('#txtTotBasicAmount').val() == '' ? '0.00' : $('#txtTotBasicAmount').val();
                 totBasicAmt = Number(totBasicAmt.replace(/[^0-9\.]+/g,""));
-	  
+	 
 		var TotalServiceTax = $('#txtTotalServiceTax').val() == '' ? '0.00' : $('#txtTotalServiceTax').val();
 		var TotHigherEdu = $('#txtTotHigherEdu').val() == '' ? '0.00' : $('#txtTotHigherEdu').val();
 		var TotalEducess = $('#txtTotalEducess').val() == '' ? '0.00' : $('#txtTotalEducess').val();
@@ -2015,10 +2182,10 @@ function validateServiceTax()
 		$('#EditRate').focus();
 		return false;
 	}
-	else if(EditExceedQuantityCheck() ==  false)
-	{  
-		return false;
-	}
+	// else if(EditExceedQuantityCheck() ==  false)
+	// {  
+		// return false;
+	// }
 	else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false)
 	{
 		 $('#EditRate').focus(); 
@@ -2032,17 +2199,21 @@ function validateServiceTax()
  }
 //
 </script>
-<script>
+<script type="text/javascript">
 
 function Save(status)
 {  
+//alert(status);
+var stat='';
 if(status == '0')
 {
 	stat = '<?php echo PO_DRAFT; ?>';
+	alert(stat);
 }
 else
 {
 	stat = '<?php echo PO_CREATED; ?>';
+	alert(stat);
 }
 var splinstr = $('#txtSpcialInstruction').val();
 var deladd = $('#DeliveryAddr').val();
@@ -2052,8 +2223,10 @@ $('#txtStatus').val(stat);
 $('#SpcialInstruction').val(splinstr);
 $('#txtDeliveryAddress').val(deladd);
 
+//	alert("Before Validate");
 	if(validate())
 		{ 
+			//alert("Inside Validate");
 	     	if(document.getElementById('ServiceTable').rows.length < 2)
 			{
 				alert('Please Select Line item to Create PO');
@@ -2066,7 +2239,7 @@ $('#txtDeliveryAddress').val(deladd);
 		  $.ajax({ 
 			data:$('.ServicePO').serialize(),
 			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/UpdateServicePurchaseOrder", 
+			url:"<?php echo base_url() ?>amendmentpurchaseorder/UpdateAmendServicePurchaseOrder", 
 			success:function(data) {
 			if(data)
 			{
@@ -2077,7 +2250,7 @@ $('#txtDeliveryAddress').val(deladd);
 				$('#txtStatus').val('');
 				$('#SpcialInstruction').val('');
 				$('#txtDeliveryAddress').val('')
-				window.location =	"purchaseorderListing";
+				//window.location =	"purchaseorderListing";
 			
 			}
 			else
@@ -2100,6 +2273,7 @@ $('#Scheduleby').change(function(){
             minDate : 'now',
             dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
         });
+		
                 
             });
             $('#Deliverydt').change(function(){
@@ -2109,4 +2283,17 @@ $('#Scheduleby').change(function(){
             });
 
 
+
+var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
+//console.log(Detail);
+  
+       $.each(Detail, function (index, value) 
+       {
+           $("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
+
+
+         
+       } ); 
+
+
 </script>