diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index fedd65a2..cee0975c 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -250,13 +250,17 @@ class purchaseorder extends BaseController function CreatePOPrint() { $PONO = $_GET['PONO']; - $ReqType = $_GET['ReqType']; + $ReqType = $_GET['ReqType']; + if($ReqType == SERVICE) { $this ->servicepoprint($PONO); } + + + else if($ReqType == REVENUE) { $this ->revenuepoprint($PONO); diff --git a/application/views/servicepopdf.php b/application/views/servicepopdf.php index b5e9be69..e7884df4 100755 --- a/application/views/servicepopdf.php +++ b/application/views/servicepopdf.php @@ -24,7 +24,8 @@ $totaltaxamount=0.00; $PaymentOtherDescription=''; $NoOfServices=0; - $advance=0; + $advance=0; + $AdvanceAmount=0.00; if(!empty($CompanyDetails)) { @@ -86,7 +87,7 @@ if($PaymentTerms=='Others'){ $PaymentOtherDescription=$PO->PaymentOtherDescription; } - + $AdvanceAmount=$PO->AdvanceAmount; } } @@ -337,7 +338,7 @@

Payment Terms: 

-
Scope Of Work As Annixture :
+
Scope Of Work As Annexure :
@@ -360,11 +361,11 @@ Advance Amount Paid In INR   - + Balance Needs to be pay In INR   - + diff --git a/application/views/serviceporeport.php b/application/views/serviceporeport.php index 1c539625..7ea85830 100755 --- a/application/views/serviceporeport.php +++ b/application/views/serviceporeport.php @@ -78,7 +78,9 @@ $Adv=''; ?> - PONO?> + + + PONO ?> SupplierName?> diff --git a/application/views/viewmrirforbilling.php b/application/views/viewmrirforbilling.php index 73d8cd2f..094bbf0d 100755 --- a/application/views/viewmrirforbilling.php +++ b/application/views/viewmrirforbilling.php @@ -1,4 +1,4 @@ -