From b8968a4c59e60c746e7c031be7436f2aa97fd69b Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 18 Sep 2017 15:13:51 +0530 Subject: [PATCH] done capital ,service screen changes --- application/controllers/purchaseorder.php | 2 +- application/views/capitalpopdf.php | 11 ++++++----- application/views/servicepopdf.php | 6 ++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 5aa3be1d..df249fc1 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -2559,7 +2559,7 @@ function addNewImportPurchaseOrder() $data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformation(); $data['POItem'] = $this->purchaseorder_model->GetCapitalPurchaseOrderDetailsForPDF($PONO); - + $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO); $CurrencyType=''; diff --git a/application/views/capitalpopdf.php b/application/views/capitalpopdf.php index 256efd75..3680f69c 100755 --- a/application/views/capitalpopdf.php +++ b/application/views/capitalpopdf.php @@ -1,6 +1,6 @@ GSTNO; $supplierPan=$PO->PAN; $supplierContact=$PO->ContactNumber; - + $ourRef=$PO->Other_Reference; $supplierVendor=$PO->SupplierID; $CostCenterCode=$PO->CostCenterCode; @@ -226,9 +227,9 @@ Supplier's Offer No:
 - Our Reference :
+ Our Reference :
- Shipped From:



Email :
Vendor code:           PAN:
Contact :           GSTIN: + Shipped From:



Email :
Vendor code:           PAN:
Contact :           GSTIN: Shipped To:

State code: Delivery :
@@ -474,7 +475,7 @@ else if($CapitalRange==0){ $TotalFreight1=$TotalFreight; - } + } ?>  

Special instructions:

diff --git a/application/views/servicepopdf.php b/application/views/servicepopdf.php index e736f85e..8fed389e 100755 --- a/application/views/servicepopdf.php +++ b/application/views/servicepopdf.php @@ -42,6 +42,7 @@ $supplierContact=''; $supplierVendor=''; $serviceDescription=''; + $ourRef=''; if(!empty($CompanyDetails)) { foreach ($CompanyDetails as $CO) @@ -121,6 +122,7 @@ $supplierContact=$PO->ContactNumber; $serviceDescription=$PO->Description_Of_Service; $supplierVendor=$PO->SupplierID; + $ourRef=$PO->Other_Reference; } } @@ -217,9 +219,9 @@ Supplier's Offer No:
 - Our Reference :
+ Our Reference :
- Shipped From:



Email :
Vendor code:         PAN:
Contact :          GSTIN: + Shipped From:



Email :
Vendor code:         PAN:
Contact :          GSTIN: Shipped To:

State code: Delivery :