From 623300b3919ad69d1c1f961359fbfa52b184a40a Mon Sep 17 00:00:00 2001
From: velz2020 <velmurugan.s@venbainfotech.com>
Date: Thu, 27 Jul 2017 20:11:26 +0530
Subject: [PATCH] AMEND PDF CHANGES

---
 .../controllers/amendmentpurchaseorder.php    | 59 +++++++++++--------
 application/models/purchaseorder_model.php    | 18 +++---
 application/views/Amendervicepopdf.php        |  8 +--
 application/views/editCapitalAmendPO.php      | 38 ++++++------
 application/views/editRevenueAmendPO.php      | 36 ++++++-----
 application/views/editServiceAmendPO.php      | 53 +++++++++++------
 6 files changed, 124 insertions(+), 88 deletions(-)

diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php
index cdd66233..2fdbae6c 100755
--- a/application/controllers/amendmentpurchaseorder.php
+++ b/application/controllers/amendmentpurchaseorder.php
@@ -226,7 +226,7 @@ class amendmentpurchaseorder extends BaseController
 	 }
 	 
 	 
-	 function EditRevenuePurchaseOrder()
+	function EditRevenuePurchaseOrder()
 	{
 				$NewPO='';
 				$MAD='';
@@ -261,25 +261,27 @@ class amendmentpurchaseorder extends BaseController
 				
 				$POType = $this->input->post('POType');
 				$PoRange = $this->input->post('txtPoRange');
+				$PaymentTermsText=$this->input->post('beforePaymentTermsText');
 				$PaymentTerms=$this->input->post('PaymentTerms');
 				$prePaymentTerms=$this->input->post('beforePaymentTerms');
+				$testdate=date("Y-m-d");
                 if($PaymentTerms!=$prePaymentTerms)
 				{
-				$MAD="Amended PaymentTerms :&nbsp;&nbsp;". $prePaymentTerms ."<br>";
+				$MAD.="Amended PaymentTerms :&nbsp;&nbsp;". $PaymentTermsText ."<br>";
 				}
 				
-				if(($dt) != ($predeliverydate))
+				if(($predeliverydate != $testdate)&&($dt) != ($predeliverydate))
 				{
 
-				$predeliverydate = $this->getDateformat($dt);
+				//$predeliverydate = $this->getDateformat($dt);
 				$MAD.='Amended Delivery Date : &nbsp;&nbsp; ' . $predeliverydate . '<br>' ; 	
 				}
 			    if($DeliverySchedule != $preschedule)
 				{
 				$MAD.="Amended Schedule :&nbsp;&nbsp;" . $preschedule."<br>";	
 				}
-			    
-				
+			    // echo "MAD is:" . $MAD;
+				// die();
 				$SpecialInstruction = $this->input->post('txtSpcialInstruction');//$_POST['txtSpcialInstruction'];//$this->input->post('txtSpcialInstruction');//t->post('txtSpcialInstruction'));
 				
 			//	echo $SpecialInstruction;
@@ -297,7 +299,8 @@ class amendmentpurchaseorder extends BaseController
 				// PO Master
 				// PO Master
 				$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID,'POType'=>$POType,'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>PO_RELEASED,'PaymentTerms'=>$PaymentTerms,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpecialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'AmendedDetails'=>$MAD);
-				//print_r($POMaster);
+				// print_r($POMaster);
+				// die();
 				
 								
 					 $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster,$updatedBy,$PONO);	
@@ -369,7 +372,7 @@ class amendmentpurchaseorder extends BaseController
 								if(($Quantity-$preqty)!=0)
 							    {
 								$rowspanvalue++;
-								$CAD="<tr><td>Amended Quantity : ".$preqty ."</td><td>Current Qty:".$Quantity."</td></tr>";
+								$CAD.="<tr><td>Amended Quantity : ".$preqty ."</td><td>Current Qty:".$Quantity."</td></tr>";
 								}
 								if(($itemRate-$preitemrate)!=0)
 								{
@@ -379,7 +382,7 @@ class amendmentpurchaseorder extends BaseController
 								if(($DiscountValue-$preDiscountValue)!=0)
 								{
 									$rowspanvalue++;
-								$CAD.="<tr><td>Amended Discount:". $preDiscountValue ."</td><td>Current Discount Value:".$itemRate."</td></tr>";
+								$CAD.="<tr><td>Amended Discount:". $preDiscountValue ."</td><td>Current Discount Value:".$DiscountValue."</td></tr>";
 								}
 								if(($PackagingValue-$prePackagingValue)!=0)
 								{
@@ -477,12 +480,17 @@ function UpdateAmendServicePurchaseOrder()
 				}
 				
 				$ddate=$this->input->post('Deliverydt');
+				//echo "current Date is:-" . $ddate . "<br>";
 				$beforeddate=$this->input->post('beforeDeliverydt');
-				
+				//echo $beforeddate."<br>";
+				$testdate=date("Y-m-d");
+				//echo "Today date:-" . $testdate ."<br>";
 				$dschedule=$this->input->post('Scheduleby');
+				//echo "$dschedule";
 				$beforedschedule=$this->input->post('beforeScheduleby');
+				//echo "beforedate is:-" . $beforeddate;
 				
-				if($ddate != $beforeddate)
+				if(($beforeddate != $testdate) && ($ddate != $beforeddate))
 				{
 					$MAD.="Amended Delivery Date :&nbsp;&nbsp;" . 	$beforeddate . "<br>";
 				}
@@ -491,6 +499,8 @@ function UpdateAmendServicePurchaseOrder()
 				{
 					$MAD.="Amended Delivery Schedule :&nbsp;&nbsp;" . $beforedschedule . "<br>";
 				}
+				// echo "MAD IS:-".$MAD;
+				// die();
 				// if(($ddate != $beforeddate) || ($dschedule != $beforedschedule) )
 				// {
 					// $beforeddate2=new DateTime($beforeddate, new DateTimeZone('Asia/Kolkata'));
@@ -501,12 +511,12 @@ function UpdateAmendServicePurchaseOrder()
 					// $MAD.="Amended Delivery Option :&nbsp;&nbsp;" . $beforeddate ."".$beforedschedule. "<br>";
 				// }
               
-
+				$PaymentTermsText=$this->input->post('beforePaymentTermsText');
                 $PaymentTerms=$this->input->post('PaymentTerms');
 				$beforePaymentTerms=$this->input->post('beforePaymentTerms');
 				if($PaymentTerms != $beforePaymentTerms)
 				{
-					$MAD.="Amended PaymentTerms :&nbsp;&nbsp;". $beforePaymentTerms ."<br>";
+					$MAD.="Amended PaymentTerms :&nbsp;&nbsp;". $PaymentTermsText ."<br>";
 				}
 				//echo "MAD IS" . $MAD . "<br>";
 				
@@ -527,7 +537,8 @@ function UpdateAmendServicePurchaseOrder()
 				// PO Master
 				$POMaster = array('ParentPO'=>$PONO,'POType'=>$POType,'SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>PO_RELEASED,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$scopeofwork,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'ServiceWorkStatus'=>$WorkStatus,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'AmendedDetails'=>$MAD);
 				
-				//print_r($POMaster);
+				// print_r($POMaster);
+				// die();	
 				
 				$LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster,$updatedBy,$PONO);	
 				//print_r($LastPO);
@@ -599,17 +610,17 @@ function UpdateAmendServicePurchaseOrder()
 					 if(($SGST != $beforeSGST) && ($AfterSGST != $beforeSGSTvalue))
 					 {
 						 $rowspanvalue+=2;
-						 $CAD.="<tr><td>Amended SGST :&nbsp;" . $beforeSGST ."</td><td>Current SGST :&nbsp;" . $SGST . "</td></tr><tr><td>Amended SGST value :&nbsp;" . $beforeSGSTvalue ."</td><td>Current SGST value:&nbsp;" . $AfterSGST . "</td></tr>";
+						 $CAD.="<tr><td>Amended SGST% :&nbsp;" . $beforeSGST ."</td><td>Current SGST% :&nbsp;" . $SGST . "</td></tr><tr><td>Amended SGST value :&nbsp;" . $beforeSGSTvalue ."</td><td>Current SGST value:&nbsp;" . $AfterSGST . "</td></tr>";
 					 }
 					 if(($CGST != $beforeCGST) && ($AfterCGST != $beforeCGSTvalue))
 					 {
 						 $rowspanvalue+=2;
-						 $CAD.="<tr><td>Amended CGST :&nbsp;" . $beforeCGST ."</td><td>Current CGST :&nbsp;" . $CGST . "</td></tr><tr><td>Amended CGST value :&nbsp;" . $beforeCGSTvalue ."</td><td>Current CGST value:&nbsp;" . $AfterCGST . "</td></tr>";
+						 $CAD.="<tr><td>Amended CGST% :&nbsp;" . $beforeCGST ."</td><td>Current CGST% :&nbsp;" . $CGST . "</td></tr><tr><td>Amended CGST value :&nbsp;" . $beforeCGSTvalue ."</td><td>Current CGST value:&nbsp;" . $AfterCGST . "</td></tr>";
 					 }
 					 if(($IGST != $beforeIGST) && ($AfterIGST != $beforeIGSTvalue))
 					 {
 						$rowspanvalue+=2;
-						 $CAD.="<tr><td>Amended IGST :&nbsp;" . $beforeIGST ."</td><td>Current IGST :&nbsp;" . $IGST . "</td></tr><tr><td>Amended IGST value :&nbsp;" . $beforeIGSTvalue ."</td><td>Current IGST value:&nbsp;" . $AfterIGST . "</td></tr>";
+						 $CAD.="<tr><td>Amended IGST% :&nbsp;" . $beforeIGST ."</td><td>Current IGST% :&nbsp;" . $IGST . "</td></tr><tr><td>Amended IGST value :&nbsp;" . $beforeIGSTvalue ."</td><td>Current IGST value:&nbsp;" . $AfterIGST . "</td></tr>";
 					 }
 					 if($otherallowance != $beforeotherallowance)
 					 {
@@ -682,13 +693,15 @@ function UpdateAmendServicePurchaseOrder()
 				$curdispatch=$this->input->post('Dispatch');
 				$PaymentMethod = $this->input->post('PaymentMethod');
 				$prePaymentmethod=$this->input->post('beforePaymentmethod');
+				$prePaymentmethodtext=$this->input->post('beforePaymentTermsText');
+				
 				$DeliverySchedule = $this->input->post('Scheduleby');
 				$preDeliverySchedule = $this->input->post('beforeSchedule');
 				$PlaceOforigin = $this->input->post('PlaceOforigin');
 				
 				if($PaymentMethod != $prePaymentmethod)
 				{
-					$MAD.="Amended Paymemnt Terms :&nbsp;&nbsp;" .$prePaymentmethod."<br>"; 
+					$MAD.="Amended Paymemnt Terms :&nbsp;&nbsp;" .$prePaymentmethodtext."<br>"; 
 				}
 				if($predispatch != $curdispatch)
 				{
@@ -733,8 +746,8 @@ function UpdateAmendServicePurchaseOrder()
 				$updateddt =  $dt->format('Y-m-d H:i:s');
 				
 				$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'POType'=>$POType,'PODate'=>$PODate,'Status'=>PO_RELEASED,'CapitalRange'=>$PoRange,'ExchangeRate'=>$ExchangeRate,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'PaymentTerms'=>$PaymentMethod,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CurrencyType'=>$currencytypeID,'AmendedDetails'=>$MAD,'Import_DispatchDetails'=>$curdispatch,'Import_PlaceofOrgin'=>$PlaceOforigin);
-				//print_r($POMaster);
-					
+				// print_r($POMaster);
+				// die();	
 					$LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster,$CreateBy,$PONO);		
 				  
 				  foreach($LastPO as $PO):
@@ -840,17 +853,17 @@ function UpdateAmendServicePurchaseOrder()
 								 if(($SGST != $preSGST) && ($SGSTvalue != $preSGSTvalue))
 								 {
 									 $rowspanvalue+=2;
-									 $CAD.="<tr><td>Amended SGST :&nbsp;" . $preSGST ."</td><td>Current SGST :&nbsp;" . $SGST . "</td></tr><tr><td>Amended SGST value :&nbsp;" . $preSGSTvalue ."</td><td>Current SGST value:&nbsp;" . $SGSTvalue . "</td></tr>";
+									 $CAD.="<tr><td>Amended SGST% :&nbsp;" . $preSGST ."</td><td>Current SGST% :&nbsp;" . $SGST . "</td></tr><tr><td>Amended SGST value :&nbsp;" . $preSGSTvalue ."</td><td>Current SGST value:&nbsp;" . $SGSTvalue . "</td></tr>";
 								 }
 								 if(($CGST != $preCGST) && ($CGSTvalue != $preCGSTvalue))
 								 {
 									 $rowspanvalue+=2;
-									 $CAD.="<tr><td>Amended CGST :&nbsp;" . $preCGST ."</td><td>Current CGST :&nbsp;" . $CGST . "</td></tr><tr><td>Amended CGST value :&nbsp;" . $preCGSTvalue ."</td><td>Current CGST value:&nbsp;" . $CGSTvalue . "</td></tr>";
+									 $CAD.="<tr><td>Amended CGST% :&nbsp;" . $preCGST ."</td><td>Current CGST% :&nbsp;" . $CGST . "</td></tr><tr><td>Amended CGST value :&nbsp;" . $preCGSTvalue ."</td><td>Current CGST value:&nbsp;" . $CGSTvalue . "</td></tr>";
 								 }
 								 if(($IGST != $preIGST) && ($IGSTvalue != $preIGSTvalue))
 								 {
 									$rowspanvalue+=2;
-									 $CAD.="<tr><td>Amended IGST :&nbsp;" . $preIGST ."</td><td>Current IGST :&nbsp;" . $IGST . "</td></tr><tr><td>Amended IGST value :&nbsp;" . $preIGSTvalue ."</td><td>Current IGST value:&nbsp;" . $IGSTvalue . "</td></tr>";
+									 $CAD.="<tr><td>Amended IGST% :&nbsp;" . $preIGST ."</td><td>Current IGST% :&nbsp;" . $IGST . "</td></tr><tr><td>Amended IGST value :&nbsp;" . $preIGSTvalue ."</td><td>Current IGST value:&nbsp;" . $IGSTvalue . "</td></tr>";
 								 }
 								 if($otherallowance != $preotherallowance)
 								 {
diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index 435dbf07..6fabc042 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -625,15 +625,17 @@ function purchaseorderListing($forwhat='')
 			 
 		
 					
-					$subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ServiceMaterialDescription,ReqNo,Mat.MaterialCode,Mat.MaterialName,
-				Mat.UOM,Quantity,Rate,ROUND((Quantity 	*Rate),2 ) as BasicValue ,POMaster.AmendedDetails,LineItem.AmendedDetails as lineamenddetails,
-				ROUND(( Tax.After_SGST + Tax.After_CGST + Tax.After_IGST ) ,2)as  Taxamount 	,
-				TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address
+					$subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,LineItem.ServiceMaterialDescription,Mat.MaterialCode,Mat.MaterialName,
+				Mat.UOM,Quantity,Rate,ROUND((Quantity 	*Rate),2 ) as BasicValue,POMaster.AmendedDetails,LineItem.AmendedDetails as lineamenddetails,
+				ROUND(( Tax.After_SGST + Tax.After_CGST + Tax.After_IGST + Tax.otherallowance) ,2)as  Taxamount,ReqMat.NumberOfService,
+				TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,Payment.PaymentTerms
 				FROM T_PurchaseOrder_LineItem LineItem 
 				join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
 				join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
 				join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO
 				join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID
+				join T_PaymentTerms Payment on Payment.PaymentID = POMaster.PaymentTerms
+				join T_Requestion_Master ReqMat on ReqMat.ReqNo = LineItem.ReqNo
 				where LineItem.PONO =?';
 
 			 $query = $this->db->query($subQuery,array($PONO));			 
@@ -696,12 +698,13 @@ function purchaseorderListing($forwhat='')
 			Mat.UOM,Quantity,Rate,ROUND((Quantity 	*Rate),2 ) as BasicValue ,
 			ROUND(((AfterPackagingValue + AfterFreightValue + AfterSGST + AfterCGST + 
 			AfterIGST  + Insurance)) ,2)as  Taxamount,
-			TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend
+			TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,Payment.PaymentTerms
 			FROM T_PurchaseOrder_LineItem LineItem 
 			join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
 			join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
 			join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO
 			join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID
+			join T_PaymentTerms Payment on Payment.PaymentID = POMaster.PaymentTerms
 			where LineItem.PONO =?';
 
 		 $query = $this->db->query($subQuery,array($PONO));			 
@@ -869,8 +872,8 @@ QuantityRejected,ROUND(ReceivedQuantity-QuantityRejected)as PendingQty,
     {
         //echo $PONO;
 		
-            $subQuery ='SELECT distinct LineItem.PONO,LineItem.AmendedDetails as lineamd,LineItem.LineItemNo,SUP.SupplierName,SUP.Address,POMast.DeliveryAddress,POMast.DeliveryDate,POMast.PODate,POMast.DeliveryOption,POMast.ServiceDescription,POMast.PaymentTerms,POMast.Import_PlaceofOrgin,POMast.AmendedDetails,POMast.PaymentDays,POMast.DeliverySchedule,POMast.TotalOrderValue,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
-Mat.UOM,Quantity,Rate,Req.Status,POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,POMast.CurrencyType,
+            $subQuery ='SELECT distinct LineItem.PONO,LineItem.AmendedDetails as lineamd,LineItem.LineItemNo,SUP.SupplierName,SUP.Address,POMast.DeliveryAddress,POMast.DeliveryDate,POMast.PODate,POMast.DeliveryOption,POMast.ServiceDescription,POMast.Import_PlaceofOrgin,POMast.AmendedDetails,POMast.PaymentDays,POMast.DeliverySchedule,POMast.TotalOrderValue,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
+Mat.UOM,Quantity,Rate,Req.Status,POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,POMast.CurrencyType,Payment.PaymentTerms,
  Req.CostCenterCode FROM T_PurchaseOrder_LineItem LineItem 
  join T_PurchaseOrder_Master POMast on POMast.PONO = LineItem.PONO
  join T_SupplierDetailsN  SUP on SUP.SupplierID=POMast.SupplierID
@@ -878,6 +881,7 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
  join T_Service_Tax ServiceTax on ServiceTax.LineItemNo = LineItem.LineItemNo
  join T_Import_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo 
  join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo 
+ join T_PaymentTerms Payment on Payment.PaymentID = POMast.PaymentTerms
  join T_Employee_Details emp on Req.Requestedby = emp.EmpID where LineItem.PONO =?';
          $query = $this->db->query($subQuery,array($PONO));            
        //print_r ($query->result());
diff --git a/application/views/Amendervicepopdf.php b/application/views/Amendervicepopdf.php
index 98c161fa..7b544129 100644
--- a/application/views/Amendervicepopdf.php
+++ b/application/views/Amendervicepopdf.php
@@ -193,7 +193,7 @@
 								foreach($POItem as $record)
 								{
 									$index = $index + 1;
-									$TotalAmount = $record->BasicValue + $record->Taxamount + $record->otherallowance;
+									$TotalAmount = ($record->BasicValue*$record->NumberOfService) + $record->Taxamount + $record->otherallowance;
 							?>
 		<tr  style="line-height: 1.5em;">
 		<td><?php echo $index ; ?></td>
@@ -202,7 +202,7 @@
 		<td align="right"><?php echo $record->Quantity ; ?></td>
 		<td align="right"><?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->BasicValue * $record->NumberOfService)  ; ?></td>
 		<td align="right"><?php echo $record->After_SGST  ; ?></td>
 		<td align="right"><?php echo $record->After_CGST ; ?></td>
 		<td align="right"><?php echo $record->After_IGST  ; ?></td>
@@ -269,10 +269,10 @@
         <tbody>
         <tr>
         <td style="text-align: center;" rowspan="3"><strong>Total Amount In Words</strong><br /><br /><em><?php echo $TotalAmountInWords." "."Only.";?></em></td>
-        <td style="text-align: right;">Total Amount Before Tax In INR - <?php echo ($OrderValue - $totaltaxamount)?></td>
+        <td style="text-align: right;">Total Amount Before Tax In INR - <?php echo number_format(($OrderValue - $totaltaxamount),2)?></td>
         </tr>
         <tr>
-        <td style="text-align: right;">Total Tax Amount In INR - <?php echo $totaltaxamount;?> </td>
+        <td style="text-align: right;">Total Tax Amount In INR - <?php echo number_format($totaltaxamount,2);?> </td>
         </tr>
         <tr>
         <td style="text-align: right;"><strong>Total Amount After Tax In INR - <?php echo  number_format($OrderValue,2);?></strong></td>
diff --git a/application/views/editCapitalAmendPO.php b/application/views/editCapitalAmendPO.php
index 82567688..d66f7d6e 100644
--- a/application/views/editCapitalAmendPO.php
+++ b/application/views/editCapitalAmendPO.php
@@ -156,13 +156,13 @@ if(!empty($AvlBudAmt))
 	<script src="<?php echo base_url()  ?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
 <script type="text/javascript">
 
- // tinymce.init({
-          // selector: "textarea#txtSpcialInstruction",
-          // menubar: false,
-            // statusbar: false,
-            // toolbar: false
-          // // plugins: "link image"
-        // });
+ tinymce.init({
+          selector: "textarea#txtSpcialInstruction",
+          menubar: false,
+            statusbar: false,
+            toolbar: false
+          // plugins: "link image"
+        });
 		
     var DelOpt = '<?php echo $DeliverOption; ?>';
     var SchName = <?php echo json_encode($DeliverSchedule); ?>;
@@ -498,11 +498,14 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                  
                                 foreach ($Payment as $rl):
                                                      
-                            if($PaymentTerms==$rl->PaymentTerms)
+                            if($PaymentTerms==$rl->PaymentID)
                             {
 								//echo $PaymentTerms."<br>";
 								//print_r($Payment);
-                                $options6[$rl->PaymentTerms] =  $rl->PaymentTerms;
+                                $options6[$rl->PaymentID] =  $rl->PaymentTerms;
+								?>
+											<input type="hidden" name="beforePaymentTermsText" value="<?php echo $rl->PaymentTerms?>">
+														<?php
                             }
 
                                 endforeach;
@@ -512,9 +515,9 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                             {
                                 foreach ($Payment as $rl2):
                                                       
-                            if($PaymentTerms!=$rl2->PaymentTerms)
+                            if($PaymentTerms!=$rl2->PaymentID)
                             {
-                                 $options6[$rl2->PaymentTerms] =  $rl2->PaymentTerms;
+                                 $options6[$rl2->PaymentID] =  $rl2->PaymentTerms;
                             }
 
                                 endforeach;
@@ -576,7 +579,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                     <td><?php echo $record->UOM ?></td>                     
                     <td style="text-align:right"><?php echo $record->Rate ?></td>                     
                     <td style="text-align:right"><?php echo $record->Rate * $record->Quantity ?></td>    
-                    <td style="text-align:right"><?php echo $record->ServiceTaxamount?></td>
+                    <td style="text-align:right"><?php if($CapitalRange=='1'){echo $record->ServiceTaxamount;}else if($CapitalRange=='0'){echo $record->Taxamount; }?></td>
                     <td style="text-align:right"><?php echo $record->Rate * $record->Quantity ?></td>
                 <?php 
                                 $row=array("materialCode"=>$record->MaterialCode,"ReqNo"=>$record->ReqNo);
@@ -647,10 +650,10 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 <input type="hidden" name="<?php echo 'PurQuantity'.$index ?>" id="<?php echo 'PurQuantity'.$index ?>" value="<?php echo $record->QuantityKG; ?>" />
 
 <input type="hidden" name="<?php echo 'PerKgExpense'.$index ?>" id="<?php echo 'PerKgExpense'.$index ?>" value="<?php echo $record->ImportTotalValue; ?>" />
-<?php } ?>
+<?php }  ?>
 
 <input type="hidden" name="<?php echo 'basicval'.$index ?>" id="<?php echo 'basicval'.$index ?>" value="<?php echo $record->Rate * $record->Quantity ; ?>" />
-
+<?php if($CapitalRange=='1'){ ?>
 <input type="hidden" name="<?php echo 'SGST'.$index ?>" id="<?php echo 'SGST'.$index ?>" value="<?php echo $record->SGST ; ?>" />
 <input type="hidden" name="<?php echo 'beforeSGST'.$index ?>" id="<?php echo 'beforeSGST'.$index ?>" value="<?php echo $record->SGST ; ?>" />
 <input type="hidden" name="<?php echo 'afterSGST'.$index ?>" id="<?php echo 'afterSGST'.$index ?>" value="<?php echo $record->After_SGST ; ?>" />
@@ -666,7 +669,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 <input type="hidden" name="<?php echo 'otherallowance'.$index ?>" id="<?php echo 'otherallowance'.$index ?>" value="<?php echo $record->otherallowance ; ?>" />
 <input type="hidden" name="<?php echo 'beforeotherallowance'.$index ?>" id="<?php echo 'beforeotherallowance'.$index ?>" value="<?php echo $record->otherallowance ; ?>" />
 <input type="hidden" name="<?php echo 'totalservicevalue'.$index ?>" id="<?php echo 'totalservicevalue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
-
+<?php }?>
 
 
 
@@ -682,7 +685,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                          <!-- <td>   <a    data-target='#VIEWCAPITAL'	data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#VIEWCAPITAL"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the  <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a>	  </td>  -->
                         
                     </tr> <?php
-
+							if($CapitalRange=='1'){
                             $TotalSGST =$TotalSGST+$record->After_SGST;
                             $TotalCGST = $TotalCGST+$record->After_CGST;
                             $TotalIGST = $TotalIGST+$record->After_IGST;
@@ -691,6 +694,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                             $TotalSummary = $TotalSummary+$record->ServiceTaxamount;
                             $TotalBasicAmount = $TotalBasicAmount+$record->BasicValue;
                             //$ServiceDescription = $ServiceDescription;
+							}
                                 if($CapitalRange=='0'){
                                $TotalLanding  = $TotalLanding + $record->AfterLandingCharge;
                                $tothighseas   = $tothighseas + $record->AfterHighSeasSalesCharge;
@@ -2762,7 +2766,7 @@ $("#EdittxtTotalOrderValue").val('');
 
 	stat = '<?php echo PO_CREATED; ?>';
 
-
+tinyMCE.triggerSave();
 var splinstr = $('#txtSpcialInstruction').val();
 //alert(splinstr);
 var deladd = $('#DeliveryAddr').val();
diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php
index f1e2c137..6b079be9 100755
--- a/application/views/editRevenueAmendPO.php
+++ b/application/views/editRevenueAmendPO.php
@@ -74,8 +74,9 @@ if(!empty($POMaster))
 		$DeliverOption = $Req->DeliveryOption;
         $DeliverSchedule = $Req->DeliverySchedule;
 		$Ddt =	new DateTime($Req->DeliveryDate);
+		echo $Req->DeliveryDate."<br>";
 		$Deliverydt =  $Ddt->format('Y-m-d');
-		
+		echo $Deliverydt;
 		
 		$DeliveryAddress =$Req->DeliveryAddress;
 		$POStatus	 = 	$Req->StatusCode;
@@ -133,8 +134,10 @@ foreach ($POSTATUS as $PST )
  
 <script type="text/javascript">
        tinymce.init({
-          selector: "textarea#txtSpcialInstruction"//,
-          
+          selector: "textarea#txtSpcialInstruction",
+           menubar: false,
+            statusbar: false,
+            toolbar: false,
            //plugins: "link image"
         });
       
@@ -845,7 +848,7 @@ body {
 					</div>
 				</div>
 				<div class="col-md-4" id="Deliverydtdiv" style="padding:0%;">
-					<input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt;?>">
+					<input type="text" name="beforeDeliverydt" value="<?php echo $Deliverydt;?>">
 					<label>Delivery Date</label>		
 						<div class="form-group">
 									
@@ -885,19 +888,23 @@ body {
                                                  
                                                 foreach ($Payment as $pay2)
                                                       
-                                                    if($Terms==$pay2->PaymentTerms){
-														echo "$Terms";
-														echo "$pay2->PaymentTerms";
+                                                    if($Terms==$pay2->PaymentID){
+														//echo "$Terms";
+														//echo "$pay2->PaymentTerms";
+														
+														?>
+											<input type="hidden" name="beforePaymentTermsText" value="<?php echo $pay2->PaymentTerms?>">
+														<?php
                                                      
-                                                       $optionsPay[$pay2->PaymentTerms] =  $pay2->PaymentTerms;
+                                                       $optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
                                                        
                                                      }
                                                    
                                                      foreach ($Payment as $pay1):
                                                       
-                                                     if($Terms!=$pay1->PaymentTerms){
+                                                     if($Terms!=$pay1->PaymentID){
                                                      
-                                                       $optionsPay[$pay1->PaymentTerms] =  $pay1->PaymentTerms;
+                                                       $optionsPay[$pay1->PaymentID] =  $pay1->PaymentTerms;
                                                        
                                                      }
                                                     endforeach;
@@ -2215,14 +2222,5 @@ $('#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.ConfigValue).html(value.ConfigValue) );
-
-
-         
-       // } ); 
 </script>
\ No newline at end of file
diff --git a/application/views/editServiceAmendPO.php b/application/views/editServiceAmendPO.php
index 31a2291b..088f2418 100755
--- a/application/views/editServiceAmendPO.php
+++ b/application/views/editServiceAmendPO.php
@@ -60,9 +60,10 @@ if(!empty($POMaster))
 		$PODate =  $pdt->format('Y-m-d');
 		$DeliverOption = $Req->DeliveryOption;
         $DeliverSchedule = $Req->DeliverySchedule;
+		echo "*" . $Req->DeliveryDate . "*";
 		$Ddt =	new DateTime($Req->DeliveryDate);
 		$Deliverydt =  $Ddt->format('Y-m-d');
-        
+        echo "-" . $Deliverydt . "-";	
 		$DeliveryAddress =$Req->DeliveryAddress;
 		$PONOStatus	 = 	$Req->StatusCode;
 		$PONO = 	$Req->PONO;	
@@ -123,7 +124,9 @@ foreach ($PaymentTerms as $TER)
 
 tinymce.init({
           selector: "textarea#txtSpcialInstruction",
-          
+           menubar: false,
+            statusbar: false,
+            toolbar: false,
            plugins: "link image"
         });
     var DelOpt = '<?php echo $DeliverOption; ?>';
@@ -149,10 +152,16 @@ $('#Scheduleby').val(SchName);
 <script>
 tinymce.init({
           selector: "textarea#ScopeofWork",
-          
-           plugins: "link image"
+		  selector: "textarea#txtSpcialInstruction",
+           menubar: false,
+            statusbar: false,
+            toolbar: false,
+         plugins: "link image"
         });
-</script>		
+</script>	
+
+	
+
 <script>
      
 
@@ -732,7 +741,7 @@ $(document).ready(function () {
 								</div>
 								<div class="col-md-12" id="Deliverydtdiv"><br/>
 									<label>Delivery Date</label>
-									<input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt?>">
+									<input type="text" name="beforeDeliverydt" value="<?php echo $Deliverydt?>">
 										<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;');
@@ -758,6 +767,7 @@ $(document).ready(function () {
 								<div class="col-md-4">
 			    <label>Payment Terms</label> 
 				<input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms?>">
+				
 				  
                                             <?php
                                                        
@@ -765,27 +775,27 @@ $(document).ready(function () {
                                                
                                                     if(!empty($Payment))
                                                     {
-                                                 
+                                                 //print_r($Payment);
                                                 foreach ($Payment as $pay2)
                                                       
-                                                    if($Terms==$pay2->PaymentTerms){
-														//echo "$Terms";
-														//echo "$pay2->PaymentTerms";
-                                                     
-                                                       $optionsPay[$pay2->PaymentTerms] =  $pay2->PaymentTerms;
+                                                    if($Terms==$pay2->PaymentID){
+														?>
+														<input type="hidden" id="beforePaymentTermsText" name="beforePaymentTermsText" value="<?php echo $pay2->PaymentTerms?>">
+                                                     <?php
+                                                       $optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
                                                        
                                                      }
                                                    
                                                      foreach ($Payment as $pay1):
                                                       
-                                                     if($Terms!=$pay1->PaymentTerms){
-                                                     
-                                                       $optionsPay[$pay1->PaymentTerms] =  $pay1->PaymentTerms;
+                                                     if($Terms!=$pay1->PaymentID){
+                                                    
+                                                       $optionsPay[$pay1->PaymentID] =  $pay1->PaymentTerms;
                                                        
                                                      }
                                                     endforeach;
                                                     }										
-
+													
                                                     echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"'  ,'required="true"' ,'class="form-control select2');
 
                                                     ?>
@@ -1855,14 +1865,21 @@ function validateServiceTax()
  }
 //
 </script>
+// <script>
+// $('#PaymentTerms').change(function() {
+	// var data=$('#PaymentTerms option:selected').text();
+	// $('#beforePaymentTermsText').val(data);
+  // alert( data );
+// });
+// </script>
 <script>
 
 function Save()
 {  
 //alert("worked");
 	stat = '<?php echo PO_CREATED; ?>';
-
-//var splinstr = $('#txtSpcialInstruction').val();
+tinyMCE.triggerSave();
+var splinstr = $('#ScopeofWork').val();
 var deladd = $('#DeliveryAddr').val();
 $('#txtStatus').val(stat);