From 7e3f05df2ede4c5c8514c8e7db64ce271501450c Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Fri, 11 Aug 2017 10:53:25 +0530
Subject: [PATCH] import,edit import,amendment

---
 application/views/editImportAmendPO.php | 11 ++++-------
 application/views/editimportpo.php      |  8 +++-----
 application/views/importpo.php          | 20 +++++++-------------
 3 files changed, 14 insertions(+), 25 deletions(-)
 mode change 100644 => 100755 application/views/editimportpo.php

diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index 54480c27..a215f51b 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -186,9 +186,7 @@ if(!empty($RequistionDetails))
 .box-body {
   padding:0px ! important;
 } 
-.select2{
-            width:100% ! important;
-    }
+
 </style>
 
 <script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript">
@@ -213,7 +211,6 @@ if(!empty($RequistionDetails))
  	$("#PaymentTerms").select2();
 
  $("#currencytype").select2();
-  $("#EditMaterialCode").select2();
         
      var POMaxDate = '<?php echo $MaxPoDate;?>';
   var d = new Date(POMaxDate);
@@ -698,7 +695,7 @@ if(!empty($RequistionDetails))
                                         
                                                                             
                             
-                                        echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control select2"');
+                                        echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"');
 
                                                         ?>
                                                     </div> 
@@ -1156,7 +1153,7 @@ if(!empty($RequistionDetails))
 
                                         </div>
                                         <div class="modal-footer">
-                                            <a class="btn btn-info font EditImport"  ID="EditImport" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a>
+                                            <a class="btn btn-info font EditImport"  ID="EditImport" ><i class="fa fa-plus" ></i>&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>
@@ -2955,7 +2952,7 @@ $('#txttotalgrossduty').val((parseFloat(TotalGrossDuty) + parseFloat(Grossdutypa
 $('#txttotalavlmodvat').val((parseFloat(TotalAvlmodvat) + parseFloat(AvailableModvat)).toFixed(2) );
 $('#txttotalgrossexpense').val((parseFloat(TotalGrossExpense) + parseFloat(Grossexpenses)).toFixed(2) );
 $('#txtToatlOrder').val((parseFloat(TotalOrder) + parseFloat(totalexp)).toFixed(2) );
-
+$('#txttot').val((parseFloat(TotalOrder)+parseFloat(totalexp)).toFixed(2));
 
 
 
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
old mode 100644
new mode 100755
index 60aa8406..4c590dc8
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -4069,7 +4069,7 @@ $('.AddImport').click(function()
     var receivedqty='';
     var rejectedqty='';
     var pendingqty='';
-    //console.log(totalexp);
+    //console.log(CustomED);
     $('#MaterialCode option[value='+materialCode+']').remove();
     
     
@@ -4145,9 +4145,8 @@ $('.AddImport').click(function()
           addHidden(theForm,"ProductPrice"+temp,BasicAmt);
           addHidden(theForm,"BasicPriceInMTon"+temp,Basicpriceinus);
           addHidden(theForm,"BasicINRValue"+temp,AfterBasicPrice);
-          addHidden(theForm,"TotalExp"+temp,totalexp);
 
-          //var a=parseFloat($('#AfterLandingCharge'+temp).val());
+          //var a=parseFloat($('#AfterCustomEDcess').val());
           //console.log(a);
 
 
@@ -4468,7 +4467,6 @@ $('#txttot').val(parseFloat(TotalOrdervalue).toFixed(2));
 
 }
 
-
 function clearTaxField()
 {
     //$('#AfterBasicPriceTax').val('');
@@ -4765,7 +4763,7 @@ var AfterExcisedutyTax=$('#AfterExciseDuty'+rowid).val()==''?'0.00':$('#AfterExc
 var AfterExcisedutyEDcess=$('#AfterExciseDutyEdCess'+rowid).val()==''?'0.00':$('#AfterExciseDutyEdCess'+rowid).val();
 var AfterExciseDutySH=$('#AfterExciseDutySHCess'+rowid).val()==''?'0.00':$('#AfterExciseDutySHCess'+rowid).val();
 var AfterAdditionalExciseduty=$('#AfterAddlExciseDuty'+rowid).val()==''?'0.00':$('#AfterAddlExciseDuty'+rowid).val();
-var AfterCustomEDcess=$('#AfterCustomEdCess'+rowid).val()==''?'0.00':$('#AfterCustomEdCess'+rowid).val();
+var AfterCustomEDcess=$('#AfterCustomEDcess'+rowid).val()==''?'0.00':$('#AfterCustomEDcess'+rowid).val();
 var AfterCustomSHcess=$('#AfterCustomSHCess'+rowid).val()==''?'0.00':$('#AfterCustomSHCess'+rowid).val();
 //var AdditionalExciseduty=$('#AfterAddlExciseDuty'+rowid).val()==''?'0.00':$('#AfterAddlExciseDuty'+rowid).val();
 var Grossdutypayable=$('#Grossdutypayable'+rowid).val()==''?'0.00':$('#Grossdutypayable'+rowid).val();
diff --git a/application/views/importpo.php b/application/views/importpo.php
index 438e33c3..56a49a62 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -73,9 +73,6 @@ if(!empty($AvlimportBudAmt))
 .dataTables_wrapper {
     padding-bottom: 0px;
 }
- .select2{
-            width:100% ! important;
-    }
 </style>
 <script src="<?php echo base_url()?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
 <script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
@@ -83,9 +80,6 @@ if(!empty($AvlimportBudAmt))
 <script>
  $(document).ready(function(){
 $("#PaymentTerms").select2();
-$("#ReqNo").select2();
-$("#MaterialCode").select2();
-$("#EditMaterialCode").select2();
 
  tinymce.init({
           selector: "textarea#txtSpcialInstruction",
@@ -358,7 +352,7 @@ function vaildateBeforeOpenModal()
                             </tr>
                         </div>
             
-				<div class="col-md-12" id="Schedulediv" style="display:none;">
+				<div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
 						<label >Schedule By </label>
 						 
 						<?php
@@ -367,7 +361,7 @@ function vaildateBeforeOpenModal()
 						?>
 
 				</div>
-				<div class="col-md-12" id="Deliverydtdiv">
+				<div class="col-md-12" id="Deliverydtdiv"><br/>
                             <label>Dispatch Instruction</label>
                              
             <?php
@@ -517,7 +511,7 @@ function vaildateBeforeOpenModal()
                                             endforeach;
                                             }
                             
-                                            echo form_dropdown('ReqNo', $RL,set_value('ReqNo'),'id="ReqNo"' ,'class="form-control select2"');
+                                            echo form_dropdown('ReqNo', $RL,set_value('ReqNo'),'id="ReqNo"' ,'class="form-control"');
 
                                                         ?>
                                                     </div>
@@ -568,7 +562,7 @@ function vaildateBeforeOpenModal()
                                                         $options = array("0"=>'Item Code');     
                                         //print_r(  $options);
                                         
-                                        echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control select2"');
+                                        echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
 
                                                         ?>
                                                     </div> 
@@ -1025,7 +1019,7 @@ function vaildateBeforeOpenModal()
 
                                         </div>
                                         <div class="modal-footer">
-                                            <a class="btn btn-info font AddImport"  ID="AddImport" ></i>&nbsp;&nbsp;<span class="bold">Add Import</span></a>
+                                            <a class="btn btn-info font AddImport"  ID="AddImport" ><i class="fa fa-plus"></i>&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>
@@ -1124,7 +1118,7 @@ function vaildateBeforeOpenModal()
                                         
                                                                             
                             
-                                        echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control select2"');
+                                        echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"');
 
                                                         ?>
                                                     </div> 
@@ -1584,7 +1578,7 @@ function vaildateBeforeOpenModal()
 
                                         </div>
                                         <div class="modal-footer">
-                                            <a class="btn btn-info font EditImport"  ID="EditImport" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a>
+                                            <a class="btn btn-info font EditImport"  ID="EditImport" ><i class="fa fa-plus" ></i>&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>