From 806925a5da56e936ffabea71898b93a3876a34ee Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 4 Oct 2017 12:24:37 +0530
Subject: [PATCH] advance screen issue fix

---
 application/models/purchaseorder_model.php |  2 +-
 application/views/advancerequest.php       | 32 +++++++++++++++++++---
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index c63995d0..01df9622 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -1548,7 +1548,7 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
 
      function getadvancePONO($Status='')
     {
-        $this->db->select ('Mast.PONO,POType,Mast.CreatedDate,Mast.ReleasedOn,Mast.TotalOrderValue,Mast.SupplierID,DeliveryDate,DeliverySchedule,DeliveryOption,Mast.PaymentTerms as Paycode,Payterm.PaymentTerms,LineItem.ReqNo,Requestedby,Departmentcode,DepartmentName,LineItem.CostCenterCode,SupDet.SupplierName,Import_DispatchDetails,CurrencyType,AdvancePercentage,AdvanceAmount,POAdv.Remarks,Mast.CapitalRange');
+        $this->db->select ('Mast.PONO,POType,Mast.CreatedDate,Mast.ReleasedOn,Mast.TotalOrderValue,Mast.SupplierID,DeliveryDate,DeliverySchedule,DeliveryOption,Mast.PaymentTerms as Paycode,Payterm.PaymentTerms,LineItem.ReqNo,Requestedby,Departmentcode,DepartmentName,LineItem.CostCenterCode,SupDet.SupplierName,Import_DispatchDetails,CurrencyType,AdvancePercentage,AdvanceAmount,POAdv.Remarks,Mast.CapitalRange,Mast.PaymentOtherDescription');
         $this->db->from('T_PurchaseOrder_Master Mast');
         $this->db->join('T_PurchaseOrder_LineItem LineItem','Mast.PONO=LineItem.PONO');
         $this->db->join('T_Requestion_Master ReqMa','LineItem.ReqNo=ReqMa.ReqNo');
diff --git a/application/views/advancerequest.php b/application/views/advancerequest.php
index 00707189..30894dc0 100755
--- a/application/views/advancerequest.php
+++ b/application/views/advancerequest.php
@@ -142,18 +142,29 @@ $(function() {
 							
                       <legend>Payment Details</legend>           
                         <div class="col-md-12">
-						<div class="col-md-3">
+
+						<div class="col-md-2">
 						<label for="payablefrom">Payment Terms</label>
 							 <?php
 								$data = array('name' => 'PaymenyTerms','value' => set_value('PaymentTerms'),'id'=>'PaymenyTerms' , 'class' => 'form-control' ,'readonly' => 'true'  );
 								echo form_input($data);
 							?>
 						</div>
-						
+
+
+           
+            <div class="col-md-2" id="otheroptiondiv" style="display:none;">
+            <label for="payablefrom">Payment Terms Description</label>
+               <?php
+                $data = array('name' => 'PaymenyTermsDes','value' => set_value('PaymentTermsDes'),'id'=>'PaymenyTermsDes' , 'class' => 'form-control' ,'readonly' => 'true'  );
+                echo form_input($data);
+              ?>
+            </div>
+					
 			
                 
                                
-                       <div class="col-md-3">
+                       <div class="col-md-2">
 			           <label for="payablefrom">Advance In %</label>
 				        <?php
 						$data = array('name' => 'AdvanceIn','value' => set_value('Advance In'),'id'=>'AdvanceIn'  ,'class' => 'form-control','onchange'=>'advanceamountCalculation()','required' => 'true','style'=>'text-align:right;' );
@@ -162,7 +173,7 @@ $(function() {
                        </div>
 					  
 					  
-						<div class="col-md-3">
+						<div class="col-md-2">
 						<label for="selectmonth" id=labeladv>Advance Amount In INR</label>
 						<?php
 						 $data = array('name' => 'AdvanceAmount','value' => set_value('AdvanceAmount'),'id'=>'AdvanceAmount', 'class' => 'form-control num' ,'required' => 'true','readonly'=>'true');
@@ -232,6 +243,19 @@ var PONUM=$('#PurchaseOrderNumber').val();
               $('#ReleasedOn').val(convertReldt);
               $('#TotalOrderValue').val(obj.TotalOrderValue);
               $('#PaymenyTerms').val(obj.PaymentTerms);
+
+              if (obj.PaymentTerms=='Others')
+              {
+                $('#otheroptiondiv').show();
+                $('#PaymenyTermsDes').val(obj.PaymentOtherDescription);
+                //console.log(obj.PaymentOtherDescription);
+              }
+
+              else
+              {
+                $('#otheroptiondiv').hide();
+                $('#PaymenyTermsDes').val('');
+              }
               $('#Department').val(obj.DepartmentName);
               $('#CostCenterCode').val(obj.CostCenterCode);
               $('#SupplierName').val(obj.SupplierName);