From a18ccbb05455b052d5732ca479e7c774a9586033 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sat, 23 Sep 2017 16:47:30 +0530
Subject: [PATCH] import label change,pdf fix

---
 application/views/editImportAmendPO.php |  5 ++++-
 application/views/editimportpo.php      |  8 ++++----
 application/views/importpo.php          | 10 +++++-----
 application/views/importpopdf.php       |  3 ++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index c5ef865f..7180301b 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -1418,7 +1418,7 @@ if(!empty($RequistionDetails))
                                             </div>
    <div class="col-md-12">
 <div class="col-md-12">
-<label>Special Instructions :</label>  
+<label>Import Description :</label>  
 <?php
 $data = array('name' => 'edittxtInstruction','value' => set_value('edittxtInstruction'),'id'=>'edittxtInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
 echo form_textarea($data);
@@ -2063,6 +2063,9 @@ else
 });
 
 
+$('#Importoption').attr("style", "pointer-events: none;");
+
+
 var insureoption=<?php echo json_encode($Insurance,JSON_PRETTY_PRINT)?>;
 var insureno=<?php echo json_encode($InsuranceNo,JSON_PRETTY_PRINT)?>;
 //console.log(insureoption);
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index ace55331..38505387 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -1457,7 +1457,7 @@ if($PONOStatus == PO_RELEASED)
 
     <div class="col-md-12">
 <div class="col-md-12">
-<label>Special Instructions :</label>  
+<label>Import Description : :</label>  
 <?php
 $data = array('name' => 'addtxtInstruction','value' => set_value('addtxtInstruction'),'id'=>'addtxtInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
 echo form_textarea($data);
@@ -2096,7 +2096,7 @@ echo form_textarea($data);
 
 <div class="col-md-12">
 <div class="col-md-12">
-<label>Special Instructions :</label>  
+<label>Import Description : :</label>  
 <?php
 $data = array('name' => 'edittxtInstruction','value' => set_value('edittxtInstruction'),'id'=>'edittxtInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
 echo form_textarea($data);
@@ -2720,7 +2720,7 @@ echo form_textarea($data);
 
 <div class="col-md-12">
 <div class="col-md-12">
-<label>Special Instructions :</label>  
+<label>Import Description : :</label>  
 <?php
 $data = array('name' => 'viewtxtInstruction','value' => set_value('viewtxtInstruction'),'id'=>'viewtxtInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
 echo form_textarea($data);
@@ -3258,7 +3258,7 @@ var NilType = '<?php echo NILTYPE;?>';
 
 
 
-
+$('#Importoption').attr("style", "pointer-events: none;");
 
 $('#Insurance').change(function() {
 
diff --git a/application/views/importpo.php b/application/views/importpo.php
index 9ed76927..f0a1b3dc 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -606,7 +606,7 @@ function vaildateBeforeOpenModal()
                         
                          <?php
                                                      
-                                        $options1 = array("0"=>'Select Import Option');       
+                                        // $options1 = array("0"=>'Select Import Option');       
                                              
                                            
 
@@ -614,13 +614,13 @@ function vaildateBeforeOpenModal()
                       {
                        foreach ($PoTypeOptions as $payment):
 
-                        $options1[$payment->ConfigValue] =  $payment->ConfigValue;
+                        $options3[$payment->ConfigValue] =  $payment->ConfigValue;
                          //$options6[$pay->PaymentID] =  $pay->PaymentTerms;
 
                         endforeach;
                       }
 
-                    echo form_dropdown('Importoption', $options1,set_value('Importoption'),'id="Importoption"' ,'class="form-control"');                                              ?>
+                    echo form_dropdown('Importoption', $options3,set_value('Importoption'),'id="Importoption"' ,'class="form-control"');                                              ?>
                     
            </div>
 
@@ -1289,7 +1289,7 @@ function vaildateBeforeOpenModal()
 
                             <div class="col-md-12">
 <div class="col-md-12">
-<label>Special Instructions :</label>  
+<label>Import Description :</label>  
 <?php
 $data = array('name' => 'addtxtInstruction','value' => set_value('addtxtInstruction'),'id'=>'addtxtInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
 echo form_textarea($data);
@@ -1918,7 +1918,7 @@ echo form_textarea($data);
 
 <div class="col-md-12">
 <div class="col-md-12">
-<label>Special Instructions :</label>  
+<label>Import Description : :</label>  
 <?php
 $data = array('name' => 'edittxtInstruction','value' => set_value('edittxtInstruction'),'id'=>'edittxtInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
 echo form_textarea($data);
diff --git a/application/views/importpopdf.php b/application/views/importpopdf.php
index db0a0dbe..eb29eb95 100755
--- a/application/views/importpopdf.php
+++ b/application/views/importpopdf.php
@@ -104,6 +104,7 @@
             $supplierGST=$PO->GSTNO;
             $finCap=$PO->Fincap;
             $ModeOfShipment=$PO->Mode_Of_Shipment;
+            $Supplier_Reference=$PO->Supplier_Reference;
 
              if($PO->InsuranceStatus=='1')
              {
@@ -336,7 +337,7 @@
 <br>
   <table style="border-collapse: collapse;width:100%;border-left-style:hidden;border-right-style:hidden;border-top-style:hidden;border-bottom-style:hidden;" border="1" cellspacing="0" cellpadding="0">
     <tr>
-        <td colspan="2" style="border: none;"><strong>Contact :</strong> <?php echo $SupplierContact; ?></td>
+        <td colspan="2" style="border: none;"><strong>Contact :</strong> <?php echo $Supplier_Reference; ?></td>
     </tr>
 	<tr>
 		<td style="border: none;"><strong>Mode of Shipment</strong>:  <?php echo $ModeOfShipment ?> </td>