From 10cbc427a8cd89d8c822283609d9b9f280750b1d Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 5 Sep 2017 17:10:39 +0530
Subject: [PATCH] new fields added in importPO flow

---
 application/logs/log-2017-09-05.php     |  46 +++
 application/views/editImportAmendPO.php | 200 +++++++++--
 application/views/editimportpo.php      | 371 ++++++++++++++++++--
 application/views/importpo.php          | 435 ++++++++++++++++++------
 4 files changed, 888 insertions(+), 164 deletions(-)

diff --git a/application/logs/log-2017-09-05.php b/application/logs/log-2017-09-05.php
index cbe4a19c..c074eb3c 100644
--- a/application/logs/log-2017-09-05.php
+++ b/application/logs/log-2017-09-05.php
@@ -4266,3 +4266,49 @@ ERROR - 2017-09-05 09:33:30 --> Severity: Notice  --> Uninitialized string offse
 ERROR - 2017-09-05 09:33:30 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editCapitalAmendPO.php 378
 ERROR - 2017-09-05 09:33:30 --> Severity: Notice  --> Uninitialized string offset: 0 /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editCapitalAmendPO.php 378
 ERROR - 2017-09-05 09:33:30 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editCapitalAmendPO.php 378
+ERROR - 2017-09-05 18:42:10 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 1998
+ERROR - 2017-09-05 18:43:13 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 1998
+ERROR - 2017-09-05 18:44:38 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2073
+ERROR - 2017-09-05 18:46:50 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2073
+ERROR - 2017-09-05 18:49:04 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2073
+ERROR - 2017-09-05 18:50:00 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2074
+ERROR - 2017-09-05 18:53:06 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2073
+ERROR - 2017-09-05 18:55:15 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2073
+ERROR - 2017-09-05 18:56:17 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 1998
+ERROR - 2017-09-05 10:56:52 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/4sept333/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
+ERROR - 2017-09-05 10:57:19 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2365
+ERROR - 2017-09-05 10:58:13 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2365
+ERROR - 2017-09-05 10:58:13 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2365
+ERROR - 2017-09-05 10:58:35 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2365
+ERROR - 2017-09-05 10:58:35 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2365
+ERROR - 2017-09-05 18:59:41 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2073
+ERROR - 2017-09-05 19:01:14 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2073
+ERROR - 2017-09-05 19:02:38 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2073
+ERROR - 2017-09-05 19:04:19 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2073
+ERROR - 2017-09-05 19:05:03 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2073
+ERROR - 2017-09-05 19:07:06 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2073
+ERROR - 2017-09-05 19:08:29 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2073
+ERROR - 2017-09-05 19:22:46 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2128
+ERROR - 2017-09-05 19:24:29 --> Severity: Notice  --> Undefined variable: AvlimportBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/importpo.php 2128
+ERROR - 2017-09-05 11:45:15 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/4sept333/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
+ERROR - 2017-09-05 11:45:27 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2365
+ERROR - 2017-09-05 12:26:37 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2365
+ERROR - 2017-09-05 12:27:29 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2441
+ERROR - 2017-09-05 12:29:59 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2441
+ERROR - 2017-09-05 12:33:17 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2442
+ERROR - 2017-09-05 12:34:16 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2440
+ERROR - 2017-09-05 12:39:17 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2447
+ERROR - 2017-09-05 12:39:49 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2447
+ERROR - 2017-09-05 12:41:07 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2447
+ERROR - 2017-09-05 12:43:00 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2502
+ERROR - 2017-09-05 12:47:15 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2511
+ERROR - 2017-09-05 12:47:38 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2511
+ERROR - 2017-09-05 12:49:18 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2566
+ERROR - 2017-09-05 12:54:39 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/4sept333/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
+ERROR - 2017-09-05 12:54:50 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2629
+ERROR - 2017-09-05 13:04:39 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2629
+ERROR - 2017-09-05 13:21:50 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2629
+ERROR - 2017-09-05 13:23:40 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2629
+ERROR - 2017-09-05 13:27:29 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2629
+ERROR - 2017-09-05 13:32:12 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2629
+ERROR - 2017-09-05 13:35:21 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/4sept333/siddharth_application/application/views/editimportpo.php 2629
diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index 932faf0e..69155797 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -278,9 +278,9 @@ if(!empty($RequistionDetails))
 		</div>
          <div class="container-fluid">
         <div class="row">
-    <div class="col-md-12">
+    <div class="col-md-12" style="padding: 0px;">
     <div class="col-md-3">
-        <div class="col-md-12">
+        <div class="col-md-12" style="padding: 0px;">
 
            <label>Requistion No</label>
              <?php
@@ -302,7 +302,7 @@ if(!empty($RequistionDetails))
 
 
 
-     <div class="col-md-12">
+     <div class="col-md-12" style="padding: 0px;">
                 <label>Currency Type</label>
                      
                          <?php
@@ -343,8 +343,8 @@ if(!empty($RequistionDetails))
 
             
     </div>
-    <div class="col-md-9">
-        <div class="col-md-4">
+    <div class="col-md-9" style="padding: 0px;">
+        <div class="col-md-4" style="padding: 0px;">
             <div class="col-md-12">
                 <label>Supplier</label>
                      
@@ -387,7 +387,7 @@ if(!empty($RequistionDetails))
 
             
         </div>
-        <div class="col-md-4">
+        <div class="col-md-4" style="padding: 0px;">
            <!--  <div class="col-md-12">
                  <label>Purchase Order Type</label>
                         <div class="form-group">
@@ -441,7 +441,7 @@ if(!empty($RequistionDetails))
                 </div>
             </div>-->
         </div>
-        <div class="col-md-4">
+        <div class="col-md-4" style="padding: 0px;">
         <div class="col-md-12">
 
                             <b><u>Select Delivery By</u></b><br/>
@@ -458,7 +458,7 @@ if(!empty($RequistionDetails))
                             </tr>
                         </div>
             
-                <div class="col-md-12" id="Schedulediv" style="display:none;"> <br/>
+                <div class="col-md-12" id="Schedulediv" style="display:none;padding-left: 0px;padding-top: 7px;"> <br/>
                        <!--  <label >Schedule </label>
                          
                         <?php
@@ -474,7 +474,7 @@ if(!empty($RequistionDetails))
                         ?>
 
                 </div>
-                <div class="col-md-12" id="Deliverydtdiv"> <br/>
+                <div class="col-md-12" id="Deliverydtdiv" style="padding-left: 0px;padding-top: 7px;"> <br/>
                            <!--  <label>Delivery Date</label>
                              
                                 <?php
@@ -501,8 +501,8 @@ if(!empty($RequistionDetails))
     </div>
 
     <!-- <input type="hidden" name="beforeDispatch" id="beforeDispatch" value=$Import_DispatchDetails />  -->
-    <div class="col-md-12">
-    <div class="col-md-12">
+    <div class="col-md-12" style="padding: 0px;">
+    <div class="col-md-12" style="padding: 0px;">
         <div class="col-md-3"> 
                 <a href="http://www.xe.com/" target="_blank"><u>Click here to check Today's Foreign Exchange value</u></a>        
         </div>
@@ -518,7 +518,7 @@ if(!empty($RequistionDetails))
          <div class="col-md-3">
                <!--  <label>Exchange Rate </label> -->
 
-                <p id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)"?></p>
+                <label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)"?></label>
                 <div class="form-group">
                     <?php
                     $data = array('name' => 'ExchangeRate','value' => set_value('ExchangeRate',$ExchangeRate),'id'=>'ExchangeRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'USRate()');
@@ -526,7 +526,7 @@ if(!empty($RequistionDetails))
                     ?>
                 </div>                
             </div> 
-            <div class="col-md-3">
+            <div class="col-md-3" style="padding-left: 0px;">
                 <label>Place of Origin</label>
                         <div class="form-group">
                                     <?php
@@ -559,11 +559,86 @@ if(!empty($RequistionDetails))
             </div>      
     </div>
     </div>
-     <div class="col-md-12">
 
-           <legend>Payment Details</legend>
-           
-             <div class="col-md-4">
+     <!--start new fields 1 sep-->
+  <div class="row">
+  <div class="col-md-12"> 
+  <div class="col-md-3">
+  <div class="col-md-12" style="padding: 0px;">
+   
+
+    <label>Mode Of Shipment</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'addmodeofshipment','value' => set_value('addmodeofshipment'),'id'=>'addmodeofshipment',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+
+
+
+  </div> 
+  </div>
+  <div class="col-md-9" style="padding:0px;">
+  <div class="col-md-4" style="padding:0px;" >
+  <div class="col-md-12">
+ <label>Supplier Reference</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'amendsupplierreference','value' => set_value('amendsupplierreference'),'id'=>'amendsupplierreference',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+
+
+  
+
+  </div>
+  </div>
+  <div class="col-md-4" style="padding:0px;">
+  <div class="col-md-12">
+   <label>Supplier's Offer No</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'amendsupplierofferno','value' => set_value('amendsupplierofferno'),'id'=>'amendsupplierofferno',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+
+  </div>
+  </div>
+    <div class="col-md-4" style="padding:0px;">
+  <div class="col-md-6" style="padding:0px;">
+  
+   <label>Other Reference(S)</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'amendotherreference','value' => set_value('amendotherreference'),'id'=>'amendotherreference',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+  </div>
+  <div class="col-md-6">
+  <label>Fincap</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'amendfincap','value' => set_value('amendfincap'),'id'=>'amendfincap',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+    </div>
+  </div>
+  </div> 
+  </div>
+  </div><!--End new fields 1 sep-->
+
+     <div class="col-md-12" style="padding: 0px;">
+       <div class="col-md-3">
                 <label for="payablefrom">Payable Terms</label>
                     <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms;?>">
                     
@@ -600,7 +675,7 @@ if(!empty($RequistionDetails))
                                                    }                                                                                            echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"'  ,'required="true"' ,'class="form-control select2');                                                    ?>
                     
            </div>
-            <div class="col-md-4" id="otheroptiondiv" style="display:none;">
+            <div class="col-md-3" id="otheroptiondiv" style="display:none;">
                       <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
 ;">*</span></label>
                        <div class="form-group">                        
@@ -635,7 +710,7 @@ if(!empty($RequistionDetails))
                             <div class="modal-dialog">
                                 <!-- Modal content-->
                                 <form>
-                                    <div class="modal-content" style="width:950px; font-size: 12px;" >
+                                    <div class="modal-content" style="width:1000px; font-size: 12px;" >
                                         <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
                                              
                                             <center><h4>Edit Import Purchase Order Item </h4></center>
@@ -676,7 +751,7 @@ if(!empty($RequistionDetails))
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-3">
+                                                <div class="col-md-3" style="padding-right: 0px;">
                                                     <label>Available Budget Amount</label>
                                                     <div class="form-group">
                                                         <?php
@@ -729,7 +804,8 @@ if(!empty($RequistionDetails))
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                <div class="col-md-6" style="padding: 0px;">
+                                                <div class="col-md-3">
                                                     <label>Quantity</label>
                                                     <div class="form-group">
                                                         <?php
@@ -739,7 +815,7 @@ if(!empty($RequistionDetails))
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                <div class="col-md-3">
                                                    <!--  <label>Rate </label> -->
 
                                           
@@ -751,7 +827,12 @@ if(!empty($RequistionDetails))
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                 <div class="col-md-3">
+                                                          <label>Per</label>  <?php
+                                                        $data = array('name' => 'EditAmendPer','value' => set_value('EditAmendPer'),'id'=>'EditAmendPer',  'class' => 'form-control');
+                                                       echo form_input($data); ?>
+                                                          </div>
+                                                <div class="col-md-3" style="padding: 0px;">
                                                    <!-- <label><?php echo "Basic Value In";?></label>-->
                                             <label id="label3"><?php echo "Basic Value In $Currencycode ($Value)";?></label> 
                                                     <div class="form-group">
@@ -763,6 +844,7 @@ if(!empty($RequistionDetails))
                                                         ?>
                                                     </div>
                                                 </div>
+                                                </div>
                                             </div>
                                             <div class="col-md-12">
 
@@ -1084,6 +1166,61 @@ if(!empty($RequistionDetails))
                                                                 </div>
                                                             </div>
                                                         </div>
+                                                         <!--Start of Adding of Frieght model-->
+                                                             <div class="col-md-12" style="padding:0px;">
+                                                        <div class="col-md-3">
+                                                            <span>Freight Type </span>
+                                                            <div>
+                                                                <?php
+                                                                $options = array("0"=>'Select Freight Type');
+                                                                //print_r(  $options);
+
+                                                                if(!empty($FreightType))
+                                                                {
+                                                                    foreach ($FreightType as $SID):
+
+
+                                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+                                                                    endforeach;
+                                                                }
+
+                                                                echo form_dropdown('drpamendFreight', $options,set_value('drpamendFreight'),'id="drpamendFreight"' ,'class="form-control "');
+
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                            <div class="col-md-3" id="AmendTripsValue" style="display:none;">
+                                                            <span>NO Of Trips</span>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'AmendNOOfTrips','value' => set_value('AmendNOOfTrips'),'id'=>'AmendNOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <span>Freight Rate </span>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'AmendtxtFreight','value' => set_value('AmendtxtFreight'),'id'=>'AmendtxtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                            
+                                                        <div class="col-md-3" style="padding-left: 0px;">
+                                                            <span>Freight Amt In INR</span>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'AmendtxtAfterFreight','value' => set_value('AmendtxtAfterFreight'),'id'=>'AmendtxtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                              
+                                                    </div>
+                                                            <!--End of Adding of freight in edit model -->
 
                                                         <div class="col-md-12">
                                                             <center> <label>Cost of the product Per UOM</label></center>
@@ -1162,10 +1299,10 @@ if(!empty($RequistionDetails))
 
                                         </div>
                                         <div class="modal-footer">
-                                            <a class="btn btn-info font EditImport"  ID="EditImport" > &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
+                                            <a class="btn btn-primary font EditImport"  ID="EditImport" > &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
                                             <!--<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
 
-                                            <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
+                                            <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                         </div>
                                     </div>
@@ -3554,6 +3691,19 @@ var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
                      $('#otheroptiondiv').hide();    
                }
            });
+       $('#drpamendFreight').change(function(){
+  var FreightType = $('#drpamendFreight').val();
+if (FreightType == "PER TRIP")
+        {
+           
+           $('#AmendTripsValue').show();
+        }
+        else {
+           
+           $('#AmendTripsValue').hide();  
+        } 
+
+});
  
 
  
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 21804b9c..217dd37b 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -286,9 +286,9 @@ if(!empty($RequistionDetails))
 		</div>
          <div class="container-fluid">
         <div class="row">
-    <div class="col-md-12">
+    <div class="col-md-12" style="padding:0px;">
     <div class="col-md-3">
-        <div class="col-md-12">
+        <div class="col-md-12" style="padding:0px;">
 
            <label>Requistion No</label>
              <?php
@@ -312,7 +312,7 @@ if(!empty($RequistionDetails))
 
 
 
-     <div class="col-md-12">
+     <div class="col-md-12" style="padding:0px;">
                 <label>Currency Type</label>
                      
                 <?php
@@ -364,8 +364,8 @@ if(!empty($RequistionDetails))
 
             
     </div>
-    <div class="col-md-9">
-        <div class="col-md-4">
+    <div class="col-md-9" style="padding:0px;">
+        <div class="col-md-4" style="padding:0px;">
             <div class="col-md-12">
                 <label>Supplier</label>
                      
@@ -408,7 +408,7 @@ if(!empty($RequistionDetails))
 
             
         </div>
-        <div class="col-md-4">
+        <div class="col-md-4" style="padding:0px;">
             <!-- <div class="col-md-12">
                  <label>Purchase Order Type</label>
                         <div class="form-group">
@@ -462,7 +462,8 @@ if(!empty($RequistionDetails))
             </div>-->
         </div>
         <div class="col-md-4" style="padding: 0px;">
-        <div class="col-md-12">
+        <div class="col-md-12" style="padding-left: 0px;">
+ 
 
                             <b><u>Select Delivery By</u></b><br/>
                             <tr>
@@ -475,8 +476,8 @@ if(!empty($RequistionDetails))
                             </tr>
                         </div>
             
-                <div class="col-md-12" id="Schedulediv" style="display:none;margin-top: 28px;""> 
-                        <label >Schedule By </label>
+                <div class="col-md-12" id="Schedulediv" style="display:none;margin-top: 28px;padding-left: 0px;"> 
+                        <label>Schedule By </label>
                          
                         <?php
                         $data = array('name' => 'Scheduleby','value' => set_value('Scheduleby',$DeliverySchedule),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
@@ -484,7 +485,7 @@ if(!empty($RequistionDetails))
                         ?>
 
                 </div>
-               <div class="col-md-12" id="Deliverydtdiv" style="margin-top: 28px;""> 
+               <div class="col-md-12" id="Deliverydtdiv" style="margin-top: 28px;padding-left: 0px;"> 
                          <label>Dispatch Instruction</label>
                              
                          <?php
@@ -501,8 +502,8 @@ if(!empty($RequistionDetails))
         </div>
         
     </div>
-    <div class="col-md-12">
-    <div class="col-md-12">
+    <div class="col-md-12" style="padding:0px;">
+    <div class="col-md-12" style="padding:0px;">
         <div class="col-md-3"> 
                 <a href="http://www.xe.com/" target="_blank"><u>Click here to check Today's Foreign Exchange value</u></a>        
         </div>
@@ -518,7 +519,7 @@ if(!empty($RequistionDetails))
          <div class="col-md-3">
                <!--  <label>Exchange Rate </label> -->
 
-                <p id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)"?></p>
+                <label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)"?></label>
                 <div class="form-group">
                     <?php
                     $data = array('name' => 'ExchangeRate','value' => set_value('ExchangeRate',$ExchangeRate),'id'=>'ExchangeRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'USRate()');
@@ -526,7 +527,7 @@ if(!empty($RequistionDetails))
                     ?>
                 </div>                
             </div> 
-             <div class="col-md-3">
+             <div class="col-md-3" style="padding-left: 0px;">
                 <label>Place of Origin</label>
                         <div class="form-group">
                                     <?php
@@ -539,11 +540,85 @@ if(!empty($RequistionDetails))
             </div>     
     </div>
     </div>
-    <div class="col-md-12">
+       <!--start new fields 1 sep-->
+  <div class="row">
+  <div class="col-md-12"> 
+  <div class="col-md-3">
+  <div class="col-md-12" style="padding: 0px;">
+   
 
-           <legend>Payment Details</legend>
+    <label>Mode Of Shipment</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'editmodeofshipment','value' => set_value('editmodeofshipment'),'id'=>'editmodeofshipment',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+
+
+
+  </div> 
+  </div>
+  <div class="col-md-9" style="padding:0px;">
+  <div class="col-md-4" style="padding:0px;" >
+  <div class="col-md-12">
+ <label>Supplier Reference</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'editsupplierreference','value' => set_value('editsupplierreference'),'id'=>'editsupplierreference',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+
+
+  
+
+  </div>
+  </div>
+  <div class="col-md-4" style="padding:0px;">
+  <div class="col-md-12">
+   <label>Supplier's Offer No</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'editsupplierofferno','value' => set_value('editsupplierofferno'),'id'=>'editsupplierofferno',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+
+  </div>
+  </div>
+    <div class="col-md-4" style="padding:0px;">
+  <div class="col-md-6" style="padding:0px;">
+  
+   <label>Other Reference(S)</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'editotherreference','value' => set_value('editotherreference'),'id'=>'editotherreference',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+  </div>
+  <div class="col-md-6">
+  <label>Fincap</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'editfincap','value' => set_value('editfincap'),'id'=>'editfincap',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+    </div>
+  </div>
+  </div> 
+  </div>
+  </div><!--End new fields 1 sep-->
+    <div class="col-md-12" style="padding: 0px;">
            
-             <div class="col-md-4">
+             <div class="col-md-3">
                 <label for="payablefrom">Payable Terms</label>
                     <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms;?>">
                     
@@ -580,7 +655,7 @@ if(!empty($RequistionDetails))
                                                    }                                                                                            echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"'  ,'required="true"' ,'class="form-control select2');                                                    ?>
                     
            </div>
-            <div class="col-md-4" id="otheroptiondiv" style="display:none;">
+            <div class="col-md-3" id="otheroptiondiv" style="display:none;">
                       <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
 ;">*</span></label>
                        <div class="form-group">                        
@@ -674,7 +749,7 @@ if($PONOStatus == PO_RELEASED)
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-3">
+                                                <div class="col-md-3" style="padding-right: 0px;">
                                                     <label>Available Budget Amount (<?php echo $INR?>)</label>
                                                     <div class="form-group">
                                                         <?php
@@ -730,12 +805,13 @@ if($PONOStatus == PO_RELEASED)
                                                     <label>UOM</label>
                                                     <div class="form-group">
                                                         <?php
-                                                        $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                        $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control' ,'readonly' => 'true');
                                                         echo form_input($data);
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                <div class="col-md-6" style="padding:0px;">
+                                                <div class="col-md-3">
                                                     <label>Quantity</label>
                                                     <div class="form-group">
                                                         <?php
@@ -745,7 +821,7 @@ if($PONOStatus == PO_RELEASED)
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                <div class="col-md-3">
                                                     <!-- <label>Rate </label>
  -->
 
@@ -757,7 +833,12 @@ if($PONOStatus == PO_RELEASED)
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                 <div class="col-md-3">
+                                                    <label>Per</label>  <?php
+                                                  $data = array('name' => 'AddPer','value' => set_value('AddPer'),'id'=>'AddPer',  'class' => 'form-control');
+                                                 echo form_input($data); ?>
+                                                    </div>
+                                                <div class="col-md-3" style="padding: 0px;">
                                                    <!-- <label>Basic Amount </label>-->
                                     <!-- <p id=labelBasicvalue><label><?php echo "Basic Value In $Currencycode ($Value)";?></label></p>
  -->
@@ -772,6 +853,7 @@ if($PONOStatus == PO_RELEASED)
                                                         ?>
                                                     </div>
                                                 </div>
+                                                </div>
                                             </div>
                                             <div class="col-md-12">
 
@@ -1097,6 +1179,61 @@ if($PONOStatus == PO_RELEASED)
                                                                 </div>
                                                             </div>
                                                         </div>
+                                                         <!--Start of Adding of Frieght model-->
+                                                             <div class="col-md-12" style="padding:0px;">
+                                                        <div class="col-md-3">
+                                                            <span>Freight Type </span>
+                                                            <div>
+                                                                <?php
+                                                                $options = array("0"=>'Select Freight Type');
+                                                                //print_r(  $options);
+
+                                                                if(!empty($FreightType))
+                                                                {
+                                                                    foreach ($FreightType as $SID):
+
+
+                                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+                                                                    endforeach;
+                                                                }
+
+                                                                echo form_dropdown('drpaddFreight', $options,set_value('drpaddFreight'),'id="drpaddFreight"' ,'class="form-control "');
+
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                            <div class="col-md-3" id="AddTripsValue" style="display:none;">
+                                                            <span>NO Of Trips</span>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'addNOOfTrips','value' => set_value('addNOOfTrips'),'id'=>'addNOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <span>Freight Rate </span>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'addtxtFreight','value' => set_value('addtxtFreight'),'id'=>'addtxtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                            
+                                                        <div class="col-md-3" style="padding-left: 0px;">
+                                                            <span>Freight Amt In INR</span>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'addtxtAfterFreight','value' => set_value('addtxtAfterFreight'),'id'=>'addtxtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                              
+                                                    </div>
+                                                            <!--End of Adding of freight in edit model -->
 
                                                         <div class="col-md-12">
                                                             <center> <label>Cost of the product Per UOM</label></center>
@@ -1239,7 +1376,7 @@ if($PONOStatus == PO_RELEASED)
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-3">
+                                                <div class="col-md-3" style="padding-right: 0px;">
                                                     <label>Available Budget Amount (<?php echo $INR?>)</label>
                                                     <div class="form-group">
                                                         <?php
@@ -1295,12 +1432,13 @@ if($PONOStatus == PO_RELEASED)
                                                     <label>UOM</label>
                                                     <div class="form-group">
                                                         <?php
-                                                        $data = array('name' => 'EditUOM','value' => set_value('EditUOM'),'id'=>'EditUOM',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                        $data = array('name' => 'EditUOM','value' => set_value('EditUOM'),'id'=>'EditUOM',  'class' => 'form-control' ,'readonly' => 'true');
                                                         echo form_input($data);
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                <div class="col-md-6" style="padding: 0px;">
+                                                <div class="col-md-3">
                                                     <label>Quantity</label>
                                                     <div class="form-group">
                                                         <?php
@@ -1310,10 +1448,10 @@ if($PONOStatus == PO_RELEASED)
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                <div class="col-md-3">
                                                    <!--  <label>Rate </label> -->
 
-                        <!-- <P id=labelEditRate> -->  <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)";?> 
+                        <!-- <P id=labelEditRate> -->  <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)";?> </label>
                                                     <div class="form-group">
                                                         <?php
                                                        $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange(),validateEditExceedLimit()' );
@@ -1321,7 +1459,12 @@ if($PONOStatus == PO_RELEASED)
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                 <div class="col-md-3">
+                                                    <label>Per</label>  <?php
+                                                  $data = array('name' => 'EditPer','value' => set_value('EditPer'),'id'=>'EditPer',  'class' => 'form-control');
+                                                 echo form_input($data); ?>
+                                                    </div>
+                                                <div class="col-md-3" style="padding: 0px;">
                                                    <!-- <label><?php echo "Basic Value In";?></label>-->
                                     <!-- <p id=label3> --><label id=label3><?php echo "Basic Value In $Currencycode ($Value)";?></label><!-- </p> -->
                                                     <div class="form-group">
@@ -1333,6 +1476,9 @@ if($PONOStatus == PO_RELEASED)
                                                         ?>
                                                     </div>
                                                 </div>
+                                                
+                                                </div>
+                                                
                                             </div>
                                             <div class="col-md-12">
 
@@ -1661,6 +1807,61 @@ if($PONOStatus == PO_RELEASED)
                                                                 </div>
                                                             </div>
                                                         </div>
+                                                          <!--Start of Adding of Frieght model-->
+                                                             <div class="col-md-12" style="padding:0px;">
+                                                        <div class="col-md-3">
+                                                            <span>Freight Type </span>
+                                                            <div>
+                                                                <?php
+                                                                $options = array("0"=>'Select Freight Type');
+                                                                //print_r(  $options);
+
+                                                                if(!empty($FreightType))
+                                                                {
+                                                                    foreach ($FreightType as $SID):
+
+
+                                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+                                                                    endforeach;
+                                                                }
+
+                                                                echo form_dropdown('drpeditFreight', $options,set_value('drpeditFreight'),'id="drpeditFreight"' ,'class="form-control "');
+
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                            <div class="col-md-3" id="EditTripsValue" style="display:none;">
+                                                            <span>NO Of Trips</span>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'editNOOfTrips','value' => set_value('editNOOfTrips'),'id'=>'editNOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <span>Freight Rate </span>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'edittxtFreight','value' => set_value('txtFreight'),'id'=>'txtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                            
+                                                        <div class="col-md-3" style="padding-left: 0px;">
+                                                            <span>Freight Amt In INR</span>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'edittxtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                              
+                                                    </div>
+                                                            <!--End of Adding of freight in edit model -->
 
                                                         <div class="col-md-12">
                                                             <center> <label>Cost of the product Per UOM</label></center>
@@ -1797,7 +1998,7 @@ if($PONOStatus == PO_RELEASED)
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-3">
+                                                <div class="col-md-3" style="padding-right: 0px;">
                                                     <label>Available Budget Amount</label>
                                                     <div class="form-group">
                                                         <?php
@@ -1858,7 +2059,8 @@ if($PONOStatus == PO_RELEASED)
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                <div class="col-md-6" style="padding: 0px;">
+                                                <div class="col-md-3">
                                                     <label>Quantity</label>
                                                     <div class="form-group">
                                                         <?php
@@ -1868,10 +2070,10 @@ if($PONOStatus == PO_RELEASED)
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                <div class="col-md-3">
                                                    <!--  <label>Rate </label> -->
 
-                                            <!-- <P id=labelEditRate> -->  <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)";?> 
+                                            <!-- <P id=labelEditRate> -->  <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)";?> </label>
                                                     <div class="form-group">
                                                         <?php
                                                        $data = array('name' => 'ViewRate','value' => set_value('ViewRate'),'id'=>'ViewRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
@@ -1879,7 +2081,12 @@ if($PONOStatus == PO_RELEASED)
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                        <div class="col-md-3">
+                                                  <label>Per</label>  <?php
+                                                $data = array('name' => 'ViewPer','value' => set_value('ViewPer'),'id'=>'ViewPer',  'class' => 'form-control');
+                                               echo form_input($data); ?>
+                                                  </div>
+                                                <div class="col-md-3" style="padding: 0px;">
                                                    <!-- <label><?php echo "Basic Value In";?></label>-->
                                            <!--  <p id=label3> --><label id=label3><?php echo "Basic Value In $Currencycode ($Value)";?></label><!-- </p> -->
                                                     <div class="form-group">
@@ -1891,6 +2098,7 @@ if($PONOStatus == PO_RELEASED)
                                                         ?>
                                                     </div>
                                                 </div>
+                                                </div>
                                             </div>
                                             <div class="col-md-12">
 
@@ -2212,6 +2420,62 @@ if($PONOStatus == PO_RELEASED)
                                                                 </div>
                                                             </div>
                                                         </div>
+                                                          <!--Start of Adding of Frieght model-->
+                                                             <div class="col-md-12" style="padding:0px;">
+                                                        <div class="col-md-3">
+                                                            <span>Freight Type </span>
+                                                            <div>
+                                                                <?php
+                                                                $options = array("0"=>'Select Freight Type');
+                                                                //print_r(  $options);
+
+                                                                if(!empty($FreightType))
+                                                                {
+                                                                    foreach ($FreightType as $SID):
+
+
+                                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+                                                                    endforeach;
+                                                                }
+
+                                                                echo form_dropdown('drpviewFreight', $options,set_value('drpviewFreight'),'id="drpviewFreight"' ,'class="form-control "');
+
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                            <div class="col-md-3" id="ViewTripsValue" style="display:none;">
+                                                            <span>NO Of Trips</span>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'viewNOOfTrips','value' => set_value('viewNOOfTrips'),'id'=>'viewNOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <span>Freight Rate </span>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'viewtxtFreight','value' => set_value('viewtxtFreight'),'id'=>'viewtxtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                            
+                                                        <div class="col-md-3" style="padding-left: 0px;">
+                                                            <span>Freight Amt In INR</span>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'viewtxtAfterFreight','value' => set_value('viewtxtAfterFreight'),'id'=>'viewtxtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                              
+                                                    </div>
+                                                            <!--End of Adding of freight in edit model -->
+
 
                                                         <div class="col-md-12">
                                                             <center> <label>Cost of the product Per KG</label></center>
@@ -5383,6 +5647,45 @@ if(validate()&&Budgetcheck())
                      $('#otheroptiondiv').hide();    
                }
            });
+       $('#drpviewFreight').change(function(){
+  var FreightType = $('#drpviewFreight').val();
+if (FreightType == "PER TRIP")
+        {
+           
+           $('#ViewTripsValue').show();
+        }
+        else {
+           
+           $('#ViewTripsValue').hide();  
+        } 
+
+});
+$('#drpeditFreight').change(function(){
+  var FreightType = $('#drpeditFreight').val();
+if (FreightType == "PER TRIP")
+        {
+           
+           $('#EditTripsValue').show();
+        }
+        else {
+           
+           $('#EditTripsValue').hide();  
+        } 
+
+});
+$('#drpaddFreight').change(function(){
+  var FreightType = $('#drpaddFreight').val();
+if (FreightType == "PER TRIP")
+        {
+           
+           $('#AddTripsValue').show();
+        }
+        else {
+           
+           $('#AddTripsValue').hide();  
+        } 
+
+});
  
 </script>
  
diff --git a/application/views/importpo.php b/application/views/importpo.php
index a0d2d7ec..ddfe2486 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -91,7 +91,7 @@ $("#PaymentTerms").select2();
         });
         //Initialize Select2 Elements for currency type
         $("#currencytype").select2();
-		
+    
      var POMaxDate = '<?php echo $MaxPoDate;?>';
      var d = new Date(POMaxDate);
      var t='<?php echo $CurrentDate;?>';  
@@ -117,35 +117,35 @@ $("#PaymentTerms").select2();
     });
 function openModal()
 {
-	if(vaildateBeforeOpenModal())
-	{
-		 $('#IMPORT').modal('show');	
-	}
+  if(vaildateBeforeOpenModal())
+  {
+     $('#IMPORT').modal('show');  
+  }
 }
 
 function vaildateBeforeOpenModal()
 {
-	if($('#PODate').val() == '')
-	{
-		alert('Please Enter the Purchase Order date');
-		$('#PODate').focus();
-		return false;
-	}
-	else if($('#drpSupplier').val() == "0")
-	{
-		alert('Please Select the Supplier details');
-		$('#drpSupplier').focus();
-		return false;
-	}
-	else if($('#DeliveryAddr').val() == '')
-	{
-		alert('Please Enter the Delivery Address');
-		$('#DeliveryAddr').focus();
-		return false;
-	}
-	else if($('#Dispatch').val() == '' && $('#Scheduleby').val() == '')
-	{
-		if(document.getElementById("Schedule").checked)
+  if($('#PODate').val() == '')
+  {
+    alert('Please Enter the Purchase Order date');
+    $('#PODate').focus();
+    return false;
+  }
+  else if($('#drpSupplier').val() == "0")
+  {
+    alert('Please Select the Supplier details');
+    $('#drpSupplier').focus();
+    return false;
+  }
+  else if($('#DeliveryAddr').val() == '')
+  {
+    alert('Please Enter the Delivery Address');
+    $('#DeliveryAddr').focus();
+    return false;
+  }
+  else if($('#Dispatch').val() == '' && $('#Scheduleby').val() == '')
+  {
+    if(document.getElementById("Schedule").checked)
     {
       alert('Please Enter Schedule By');
       return false;
@@ -157,19 +157,19 @@ function vaildateBeforeOpenModal()
       return false;
     }
     
-	}
-	else if($('#currencytype').val() == '0')
-	{
-		alert('Please Select the Currency Type');
-		$('#currencytype').focus();
-		return false;
-	}
-	else if($('#ExchangeRate').val() == '')
-	{
-		 alert('Please Enter the Exchange Rate');
-		$('#ExchangeRate').focus();
-		return false;
-	}
+  }
+  else if($('#currencytype').val() == '0')
+  {
+    alert('Please Select the Currency Type');
+    $('#currencytype').focus();
+    return false;
+  }
+  else if($('#ExchangeRate').val() == '')
+  {
+     alert('Please Enter the Exchange Rate');
+    $('#ExchangeRate').focus();
+    return false;
+  }
 
   else if($('#PlaceOforigin').val()== '')
   {
@@ -187,10 +187,10 @@ function vaildateBeforeOpenModal()
   }
 
     
-	else 
-	{
-		return true;
-	}
+  else 
+  {
+    return true;
+  }
 }
 </script>
 
@@ -221,16 +221,16 @@ function vaildateBeforeOpenModal()
  
      <div style="border:2px solid #333">
         
-			 
-			 <center><b><h2>Siddharth Industries - Import Purchase Order</h2></b></center><br/>
-			 
-			 
-		 
+       
+       <center><b><h2>Siddharth Industries - Import Purchase Order</h2></b></center><br/>
+       
+       
+     
          <div class="container-fluid">
         <div class="row">
     <div class="col-md-12">
     <div class="col-md-3">
-        <div class="col-md-12">
+        <div class="col-md-12" style="padding:0px;">
 
            <label>Requistion No</label>
              <?php
@@ -249,7 +249,7 @@ function vaildateBeforeOpenModal()
 
             ?>  
          </div>
-        <div class="col-md-12">
+        <div class="col-md-12" style="padding:0px;">
         <label>Currency Type</label>
 
               <?php
@@ -271,8 +271,8 @@ function vaildateBeforeOpenModal()
             </div>   
              
     </div>
-    <div class="col-md-9">
-        <div class="col-md-4">
+    <div class="col-md-9" style="padding:0px;">
+        <div class="col-md-4" style="padding:0px;">
             <div class="col-md-12">
                 <label>Supplier</label>
                      
@@ -305,7 +305,7 @@ function vaildateBeforeOpenModal()
             </div>
              
         </div>
-        <div class="col-md-4">
+        <div class="col-md-4" style="padding:0px;">
             <div class="col-md-12" style="padding: 0px;">
             <div class="col-md-6">
                  <label>PO Type</label>
@@ -337,7 +337,7 @@ function vaildateBeforeOpenModal()
                     </div>
             </div>
             
-			 
+       
            <!-- <div class="col-md-12">
                 Basic value in INR :
                 <div class="form-group">
@@ -349,7 +349,7 @@ function vaildateBeforeOpenModal()
             </div>-->
         </div>
         <div class="col-md-4" style="padding: 0px;">
-		  <div class="col-md-12">
+      <div class="col-md-12">
 
                             <b><u>Select Delivery By</u></b><br/>
                             <tr>
@@ -362,16 +362,16 @@ function vaildateBeforeOpenModal()
                             </tr>
                         </div>
             
-				<div class="col-md-12" id="Schedulediv" style="display:none;margin-top: 28px;"> 
-						<label >Schedule By </label>
-						 
-						<?php
-						$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
-						echo Form_textarea($data);
-						?>
+        <div class="col-md-12" id="Schedulediv" style="display:none;margin-top: 28px;"> 
+            <label >Schedule By </label>
+             
+            <?php
+            $data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
+            echo Form_textarea($data);
+            ?>
 
-				</div>
-				<div class="col-md-12" id="Deliverydtdiv" style="margin-top: 28px;"> 
+        </div>
+        <div class="col-md-12" id="Deliverydtdiv" style="margin-top: 28px;"> 
                             <label>Dispatch Instruction</label>
                              
             <?php
@@ -386,8 +386,8 @@ function vaildateBeforeOpenModal()
                 
         </div>       
     </div>
-    <div class="col-md-12">
-    <div class="col-md-12">
+    <div class="col-md-12" style="padding:0px;">
+    <div class="col-md-12" style="padding:0px;">
         <div class="col-md-3"> 
                 <a href="http://www.xe.com/" target="_blank"><u>Click here to check Today's Foreign Exchange value</u></a>        
         </div>
@@ -422,11 +422,86 @@ function vaildateBeforeOpenModal()
             </div>      
     </div>
     </div>
-     <div class="col-md-12">
 
-           <legend>Payment Details</legend>
-          <!-- Text input-->
-             <div class="col-md-4">
+    <!--start new fields 1 sep-->
+  <div class="row">
+  <div class="col-md-12"> 
+  <div class="col-md-3">
+  <div class="col-md-12" style="padding: 0px;">
+   
+
+    <label>Mode Of Shipment</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'addmodeofshipment','value' => set_value('addmodeofshipment'),'id'=>'addmodeofshipment',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+
+
+
+  </div> 
+  </div>
+  <div class="col-md-9" style="padding:0px;">
+  <div class="col-md-4" style="padding:0px;" >
+  <div class="col-md-12">
+ <label>Supplier Reference</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'addsupplierreference','value' => set_value('addsupplierreference'),'id'=>'addsupplierreference',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+
+
+  
+
+  </div>
+  </div>
+  <div class="col-md-4" style="padding:0px;">
+  <div class="col-md-12">
+   <label>Supplier's Offer No</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'addsupplierofferno','value' => set_value('addsupplierofferno'),'id'=>'addsupplierofferno',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+
+  </div>
+  </div>
+    <div class="col-md-4" style="padding:0px;">
+  <div class="col-md-6" style="padding:0px;">
+  
+   <label>Other Reference(S)</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'addotherreference','value' => set_value('addotherreference'),'id'=>'addotherreference',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+  </div>
+  <div class="col-md-6">
+  <label>Fincap</label>
+            <div class="form-group">
+            
+                  <?php
+               $data = array('name' => 'addfincap','value' => set_value('addfincap'),'id'=>'addfincap',  'class' => 'form-control');
+              echo form_input($data);
+              ?>   
+            </div>
+    </div>
+  </div>
+  </div> 
+  </div>
+  </div><!--End new fields 1 sep-->
+     <div class="col-md-12" style="padding: 0px;">
+ 
+             <div class="col-md-3">
                 <label for="payablefrom">Payable Terms</label>
                     <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms;?>">
                     
@@ -476,7 +551,7 @@ function vaildateBeforeOpenModal()
                     
            </div>
             
-             <div class="col-md-4" id="otheroptiondiv" style="display:none;">
+             <div class="col-md-3" id="otheroptiondiv" style="display:none;">
                       <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
 ;">*</span></label>
                        <div class="form-group">                        
@@ -511,7 +586,7 @@ function vaildateBeforeOpenModal()
                             <div class="modal-dialog">
                                 <!-- Modal content-->
                                 <form>
-                                    <div class="modal-content" style="width:1000px;font-size:12px;">
+                                    <div class="modal-content" style="width:1030px;font-size:12px;">
                                         <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
                                             
                                             <center><h4>Add Import Purchase Order Item </h4></center>
@@ -563,7 +638,7 @@ function vaildateBeforeOpenModal()
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-3">
+                                                <div class="col-md-3" style="padding-right: 0px;">
                                                     <label>Available Budget Amount(<?php echo $INR?>)</label>
                                                     <div class="form-group">
                                                         <?php
@@ -604,12 +679,13 @@ function vaildateBeforeOpenModal()
                                                     <label>UOM</label>
                                                     <div class="form-group">
                                                         <?php
-                                                        $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                        $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control' ,'readonly' => 'true');
                                                         echo form_input($data);
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                <div class="col-md-6" style="padding:0px;">
+                                                <div class="col-md-3">
                                                     <label>Quantity</label>
                                                     <div class="form-group">
                                                         <?php
@@ -619,7 +695,7 @@ function vaildateBeforeOpenModal()
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                <div class="col-md-3">
                                                   <!-- <P id=labelRate> -->  <label id=labelRate><?php echo "Rate in";?> </label><!-- </P> -->
                                                     <div class="form-group">
                                                         <?php
@@ -628,7 +704,12 @@ function vaildateBeforeOpenModal()
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                 <div class="col-md-3">
+                                                    <label>Per</label>  <?php
+                                                    $data = array('name' => 'AddPer','value' => set_value('AddPer'),'id'=>'AddPer',  'class' => 'form-control');
+                                                    echo form_input($data); ?>
+                                                  </div>
+                                                <div class="col-md-3" style="padding: 0px;">
                                                     <!--<label>Basic Amount </label>-->
                                                <!--  <p id=label2> -->  <label id=label2><?php echo "Basic Value In";?></label><!-- </p> -->
                                                     <div class="form-group">
@@ -640,6 +721,7 @@ function vaildateBeforeOpenModal()
                                                         ?>
                                                     </div>
                                                 </div>
+                                                </div>
                                             </div>
                                             <div class="col-md-12">
 
@@ -960,9 +1042,64 @@ function vaildateBeforeOpenModal()
                                                                 </div>
                                                             </div>
                                                         </div>
+                                                          <div class="col-md-12" style="padding:0px;">
+                                                        <div class="col-md-3">
+                                                            <label>Freight Type </label>
+                                                            <div>
+                                                                <?php
+                                                                $options = array("0"=>'Select Freight Type');
+                                                                //print_r(  $options);
+
+                                                                if(!empty($FreightType))
+                                                                {
+                                                                    foreach ($FreightType as $SID):
+
+
+                                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+                                                                    endforeach;
+                                                                }
+
+                                                                echo form_dropdown('drpFreight', $options,set_value('drpFreight'),'id="drpFreight"' ,'class="form-control "');
+
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                            <div class="col-md-3" id="TripsValue" style="display:none;">
+                                                            <label>NO Of Trips</label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'NOOfTrips','value' => set_value('NOOfTrips'),'id'=>'NOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <label>Freight Rate </label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'txtFreight','value' => set_value('txtFreight'),'id'=>'txtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                            
+                                                        <div class="col-md-3" style="padding-left: 0px;">
+                                                            <label>Freight Amt In INR</label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'txtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                              
+                                                    </div>
+
+
 
                                                         <div class="col-md-12">
-                                                            <center>Cost of the product Per UOM</center> 
+                                                           <center><label>Cost of the product Per UOM</label></center>
                                                             <hr/>
                                                         </div>
                                                         <div class="col-md-12">
@@ -979,7 +1116,7 @@ function vaildateBeforeOpenModal()
                                                                 </div>
                                                             </div>
                                                             <div class="col-md-4"  style="margin-top: -4.8%">
-                                                                <span>Quantity</span>
+                                                                <label>Quantity</label>
                                                                 <div class="form-group">
                                                                     <?php
                                                                     $data = array('name' => 'PurQuantity','value' => set_value('PurQuantity'),'id'=>'PurQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateCtable()');
@@ -1041,10 +1178,10 @@ function vaildateBeforeOpenModal()
 
                                         </div>
                                         <div class="modal-footer">
-                                            <a class="btn btn-info font AddImport"  ID="AddImport" > &nbsp;&nbsp;<span class="bold">Add Import</span></a>
+                                            <a class="btn btn-primary font AddImport"  ID="AddImport" > &nbsp;&nbsp;<span class="bold">Add Import</span></a>
                                             <!--<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
 
-                                            <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
+                                            <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                         </div>
                                     </div>
@@ -1104,7 +1241,7 @@ function vaildateBeforeOpenModal()
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-3">
+                                                <div class="col-md-3" style="padding-right: 0px;">
                                                     <label>Available Budget Amount (<?php echo $INR?>)</label>
                                                     <div class="form-group">
                                                         <?php
@@ -1165,7 +1302,8 @@ function vaildateBeforeOpenModal()
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                <div class="col-md-6" style="padding: 0px;">
+                                                <div class="col-md-3">
                                                     <label>Quantity</label>
                                                     <div class="form-group">
                                                         <?php
@@ -1175,7 +1313,7 @@ function vaildateBeforeOpenModal()
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                <div class="col-md-3">
                                                 <!-- <P id=labelEditRate> -->  <label id=labelEditRate><?php echo "Rate in";?> </label><!-- </P> -->
                                                     <!-- <label>Rate </label> -->
                                                     <div class="form-group">
@@ -1189,7 +1327,12 @@ function vaildateBeforeOpenModal()
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-2">
+                                                 <div class="col-md-3">
+                                                    <label>Per</label>  <?php
+                                                    $data = array('name' => 'EditPer','value' => set_value('EditPer'),'id'=>'EditPer',  'class' => 'form-control');
+                                                    echo form_input($data); ?>
+                                                  </div>
+                                                <div class="col-md-3" style="padding: 0px;">
                                             <!-- <p id=label3> --><label id=label3><?php echo "Basic Value In";?></label><!-- </p> -->
                                                     <div class="form-group">
                                                         <?php
@@ -1200,6 +1343,7 @@ function vaildateBeforeOpenModal()
                                                         ?>
                                                     </div>
                                                 </div>
+                                                </div>
                                             </div>
                                             <div class="col-md-12">
 
@@ -1519,9 +1663,64 @@ function vaildateBeforeOpenModal()
                                                                 </div>
                                                             </div>
                                                         </div>
+                                                         <!--Start of Adding of Frieght model-->
+                                                             <div class="col-md-12" style="padding:0px;">
+                                                        <div class="col-md-3">
+                                                            <label>Freight Type </label>
+                                                            <div>
+                                                                <?php
+                                                                $options = array("0"=>'Select Freight Type');
+                                                                //print_r(  $options);
+
+                                                                if(!empty($FreightType))
+                                                                {
+                                                                    foreach ($FreightType as $SID):
+
+
+                                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+                                                                    endforeach;
+                                                                }
+
+                                                                echo form_dropdown('drpeditFreight', $options,set_value('drpeditFreight'),'id="drpeditFreight"' ,'class="form-control "');
+
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                            <div class="col-md-3" id="editTripsValue" style="display:none;">
+                                                            <label>NO Of Trips</label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'editNOOfTrips','value' => set_value('editNOOfTrips'),'id'=>'editNOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-3">
+                                                            <label>Freight Rate </label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'edittxtFreight','value' => set_value('txtFreight'),'id'=>'txtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                            
+                                                        <div class="col-md-3" style="padding-left: 0px;">
+                                                            <label>Freight Amt In INR</label>
+                                                            <div class="form-group">
+                                                                <?php
+                                                                $data = array('name' => 'edittxtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
+                                                                echo form_input($data);
+                                                                ?>
+                                                            </div>
+                                                        </div>
+                              
+                                                    </div>
+                                                            <!--End of Adding of freight in edit model -->
 
                                                         <div class="col-md-12">
-                                                        <center> Cost of the product Per UOM</center>
+                                                        <center> <label>Cost of the product Per UOM</label></center>
                                                             <hr/>
                                                         </div>
                                                         <div class="col-md-12">
@@ -1539,7 +1738,7 @@ function vaildateBeforeOpenModal()
                                                                 </div>
                                                             </div>
                                                             <div class="col-md-4"  style="margin-top: -4.8%">
-                                                                <span>Quantity</span>
+                                                                <label>Quantity</label>
                                                                 <div class="form-group">
                                                                     <?php
                                                                     $data = array('name' => 'EditPurQuantity','value' => set_value('EditPurQuantity'),'id'=>'EditPurQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCtable()');
@@ -1600,10 +1799,10 @@ function vaildateBeforeOpenModal()
 
                                         </div>
                                         <div class="modal-footer">
-                                            <a class="btn btn-info font EditImport"  ID="EditImport" > &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
+                                            <a class="btn btn-primary font EditImport"  ID="EditImport" > &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
                                             <!--<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
 
-                                            <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
+                                            <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                         </div>
                                     </div>
@@ -1650,7 +1849,7 @@ function vaildateBeforeOpenModal()
 
        <div class="col-md-12">
             <div class="col-md-4">
-              <label >Total Landing Charge:<?php echo "($INR)"?></label> 
+              <label >Total Landing Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotallanding','value' => set_value('txttotallanding'),'id'=>'txttotallanding',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1659,7 +1858,7 @@ function vaildateBeforeOpenModal()
             </div>
 
             <div class="col-md-4">
-              <label >Total High seas sales Charge:<?php echo "($INR)"?></label> 
+              <label >Total High seas sales Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalhighseas','value' => set_value('txttotalhighseas'),'id'=>'txttotalhighseas',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1668,7 +1867,7 @@ function vaildateBeforeOpenModal()
             </div>
 
             <div class="col-md-4">
-              <label >Total Custom Duty Charge:<?php echo "($INR)"?></label> 
+              <label >Total Custom Duty Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalcustom','value' => set_value('txttotalcustom'),'id'=>'txttotalcustom',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1677,7 +1876,7 @@ function vaildateBeforeOpenModal()
             </div>
 
             <div class="col-md-4">
-              <label >Total Excise duty  Charge:<?php echo "($INR)"?></label> 
+              <label >Total Excise duty  Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalexcise','value' => set_value('txttotalexcise'),'id'=>'txttotalexcise',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1686,7 +1885,7 @@ function vaildateBeforeOpenModal()
             </div>
 
             <div class="col-md-4">
-              <label >Total Excise duty ED_cess Charge:<?php echo "($INR)"?></label> 
+              <label >Total Excise duty ED_cess Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalexciseED','value' => set_value('txttotalexciseED'),'id'=>'txttotalexciseED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1696,7 +1895,7 @@ function vaildateBeforeOpenModal()
 
 
             <div class="col-md-4">
-              <label >Total Excise duty S & H cess  Charge:<?php echo "($INR)"?></label> 
+              <label >Total Excise duty S & H cess  Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalexciseSH','value' => set_value('txttotalexciseSH'),'id'=>'txttotalexciseSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1705,7 +1904,7 @@ function vaildateBeforeOpenModal()
             </div>
 
             <div class="col-md-4">
-              <label >Total Custom ED_cess Charge:<?php echo "($INR)"?></label> 
+              <label >Total Custom ED_cess Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalcustomED','value' => set_value('txttotalcustomED'),'id'=>'txttotalcustomED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1714,7 +1913,7 @@ function vaildateBeforeOpenModal()
             </div>
 
             <div class="col-md-4">
-              <label >Total Custom S & H cess Charge:<?php echo "($INR)"?></label> 
+              <label >Total Custom S & H cess Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalcustomSH','value' => set_value('txttotalcustomSH'),'id'=>'txttotalcustomSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1723,7 +1922,7 @@ function vaildateBeforeOpenModal()
             </div>
 
             <div class="col-md-4">
-              <label >Total Additional Excise duty Charge:<?php echo "($INR)"?></label> 
+              <label >Total Additional Excise duty Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalAdditionalExciseduty','value' => set_value('txttotalAdditionalExciseduty'),'id'=>'txttotalAdditionalExciseduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1733,7 +1932,7 @@ function vaildateBeforeOpenModal()
 
 
             <div class="col-md-4">
-              <label >Total Gross duty payable Charge:<?php echo "($INR)"?></label> 
+              <label >Total Gross duty payable Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalgrossduty','value' => set_value('txttotalgrossduty'),'id'=>'txttotalgrossduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1742,7 +1941,7 @@ function vaildateBeforeOpenModal()
             </div>
 
              <div class="col-md-4">
-              <label >Total Available Modvat set-off on import Charge:<?php echo "($INR)"?></label> 
+              <label >Total Available Modvat set-off on import Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalavlmodvat','value' => set_value('txttotalavlmodvat'),'id'=>'txttotalavlmodvat',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1752,7 +1951,7 @@ function vaildateBeforeOpenModal()
 
 
             <div class="col-md-4">
-              <label >Total Gross expenses due to custom duty Charge :<?php echo "($INR)"?></label> 
+              <label >Total Gross expenses due to custom duty Charge <?php echo "($INR)"?></label> 
                                             
                             <?php
                          $data = array('name' => 'txttotalgrossexpense','value' => set_value('txttotalgrossexpense'),'id'=>'txttotalgrossexpense',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1764,7 +1963,7 @@ function vaildateBeforeOpenModal()
            
 
                     <div  class="col-md-4">
-                            <label>Total Order Value:<?php echo "($INR)"?></label>  <?php
+                            <label>Total Order Value <?php echo "($INR)"?></label>  <?php
                          $data = array('name' => 'txtToatlOrder','value' => set_value('txtToatlOrder'),'id'=>'txtToatlOrder',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true','style'=>'text-align:right;');
                         echo form_input($data);
                         ?>   
@@ -1781,7 +1980,7 @@ function vaildateBeforeOpenModal()
                         ?>   
                       </div>   
                      </div> 
-					 <div align="right" style="padding-right:10px">
+           <div align="right" style="padding-right:10px">
 
 <div class="col-md-3 col-md-offset-9"><br/>
         <input type="hidden" name="txtPoRange" id="txtPoRange" /> 
@@ -1800,7 +1999,7 @@ function vaildateBeforeOpenModal()
             </div> 
  
          </div>
-		 </div>
+     </div>
     </section>   
 </div>
 
@@ -4178,7 +4377,7 @@ var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
 
        // } ); 
        $("#PaymentTerms").change(function() {
-console.log($('#PaymentTerms').val().trim());
+//console.log($('#PaymentTerms').val().trim());
                if ($('#PaymentTerms').val().trim()=='PT08')
                     
                {
@@ -4189,6 +4388,32 @@ console.log($('#PaymentTerms').val().trim());
                      $('#otheroptiondiv').hide();    
                }
            });
+       $('#drpFreight').change(function(){
+  var FreightType = $('#drpFreight').val();
+if (FreightType == "PER TRIP")
+        {
+           
+           $('#TripsValue').show();
+        }
+        else {
+           
+           $('#TripsValue').hide();  
+        } 
+
+});
+$('#drpeditFreight').change(function(){
+  var FreightType = $('#drpeditFreight').val();
+if (FreightType == "PER TRIP")
+        {
+           
+           $('#editTripsValue').show();
+        }
+        else {
+           
+           $('#editTripsValue').hide();  
+        } 
+
+});
 
 </script>