diff --git a/application/views/Amendrevenuepopdf.php b/application/views/Amendrevenuepopdf.php index 72713fc1..137ab514 100644 --- a/application/views/Amendrevenuepopdf.php +++ b/application/views/Amendrevenuepopdf.php @@ -53,10 +53,16 @@ $PaymentTerms = $PO->PaymentTerms; $PaymentDays=$PO->PaymentDays; $PayableAT=$PO->PayableAT; + + + + } } - $currencyName='INR'; + + + $currencyName='INR'; $currencyCode =''; if(!empty($CurrencySymbol)) { @@ -106,7 +112,7 @@ ?>
 
-
SIDDHARTH INDUSTRIES - PURCHASE ORDER - PO NO:
+
SIDDHARTH INDUSTRIES - PURCHASE ORDER
PO NO :
@@ -268,12 +274,12 @@ $OrderValue = (( $SubTotalAmount + $AfterVAT +$AfterGST+$AfterOtherTaxes +$Insu
- - - + + + + lineamd ;?> - - LineAmend ; + } } ?>
+

Amended Details

+
Item Descriptionprevious DetailsCurrent DetailsPrevious DetailsCurrent Details
@@ -303,18 +311,18 @@ $OrderValue = (( $SubTotalAmount + $AfterVAT +$AfterGST+$AfterOtherTaxes +$Insu - - + + - + - +
Total Amount In Words

 Total Amount Before Tax In INR   Total Amount In Words :

 Total Amount Before Tax In INR :
 Total Tax Amount In INR   Total Tax Amount In INR :
 Total Amount After Tax In INR    Total Amount After Tax In INR :
-

 Payment Terms

+

Payment Terms :

diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php index 4096852d..9bbdedd0 100755 --- a/application/views/editRevenueAmendPO.php +++ b/application/views/editRevenueAmendPO.php @@ -72,7 +72,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'); @@ -95,7 +95,7 @@ if(!empty($RequistionDetails)) //$Status=$ReqDet->Status; } } - +//echo $ServiceDescription; foreach ($POSTATUS as $PST ) { @@ -128,15 +128,14 @@ foreach ($POSTATUS as $PST ) - - - + + @@ -1611,9 +1610,10 @@ body {
'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction', 'class' => 'form-control','rows' => '3', 'cols' => '40' ); + $data = array('name' => 'txtSpcialInstruction','id'=>'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription), 'rows'=>'8','class' => 'form-control' ); echo form_textarea($data); - ?> + ?> +
@@ -2112,11 +2112,11 @@ function Save(status) //alert('Inside else'); stat = ''; -var splinstr = $('#txtSpcialInstruction').val(); + var deladd = $('#DeliveryAddr').val(); $('#txtStatus').val(stat); - - +tinyMCE.triggerSave(); +var splinstr = $('#txtSpcialInstruction').val(); $('#SpcialInstruction').val(splinstr); $('#txtDeliveryAddress').val(deladd); @@ -2155,7 +2155,7 @@ $('#txtDeliveryAddress').val(deladd); $('#txtStatus').val(''); $('#SpcialInstruction').val(''); $('#txtDeliveryAddress').val('') - window.location = "amendmentpurchaseorder"; + //window.location = "amendmentpurchaseorder"; } else