From 6592742615ba3a90d92d3139b617f7a50bde3984 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 17 Aug 2017 15:15:45 +0530
Subject: [PATCH] payment terms

---
 application/views/editimportpo.php |  6 ++++--
 application/views/importpo.php     | 20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 381d3dec..42ba4582 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -3356,7 +3356,8 @@ function CalculateExciseED1()
   }
   else
   {
-  $('#AfterExcisedutyEDcess').val(parseFloat(Math.round(txtexcisetot)));
+  //$('#AfterExcisedutyEDcess').val(parseFloat(Math.round(txtexcisetot)));
+  $('#AfterExcisedutyEDcess').val(parseFloat(txtexcisetot).toFixed(2));
    }
  
   CalculateexciseSHcess();
@@ -3380,7 +3381,8 @@ function EditCalculateExciseED1()
   }
   else
   {
-  $('#EditAfterExcisedutyEDcess').val(parseFloat(Math.round(txtexcisetot)));
+  //$('#EditAfterExcisedutyEDcess').val(parseFloat(Math.round(txtexcisetot)));
+   $('#EditAfterExcisedutyEDcess').val(parseFloat(txtexcisetot).toFixed(2));
   }
   EditCalculateexciseSHcess();
 
diff --git a/application/views/importpo.php b/application/views/importpo.php
index 0a68d5e4..d99ced98 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -1943,6 +1943,18 @@ $('#drpSupplier').change(function() {
       
           });
 
+           $.each(Payment, function(pay, payobj) {
+      if(payobj.PaymentID == PaymentID)
+      {
+                                      
+      }
+                        else{
+                    $("#PaymentTerms").append( $('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
+
+                           }
+      
+    });
+
           
 
 
@@ -3985,15 +3997,15 @@ if(validate())
 var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
 //console.log(Detail);
   
-       $.each(Detail, function (index, value) 
-       {
+       // $.each(Detail, function (index, value) 
+       // {
 
         
-           $("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
+       //     $("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
 
          
 
-       } ); 
+       // } ); 
        $("#PaymentTerms").change(function() {
 console.log($('#PaymentTerms').val().trim());
                if ($('#PaymentTerms').val().trim()=='PT08')