import,capital issue fix

application/controllers/purchaseorder.php

@@ -2942,7 +2942,8 @@ $point=0;
     '18' => 'eighteen', '19' =>'nineteen', '20' => 'twenty',
     '30' => 'thirty', '40' => 'forty', '50' => 'fifty',
     '60' => 'sixty', '70' => 'seventy',
-    '80' => 'eighty', '90' => 'ninety');
+    '80' => 'eighty', '90' => 'ninety','06'=>'Zero Six','01'=>'Zero One','02'=>'Zero Two'
+    ,'03'=>'Zero Three','04'=>'Zero Four','05'=>'Zero Five','07'=>'Zero Seven','08'=>'Zero Eight','09'=>'Zero Nine');
 	 $words1 = array('2' => 'twenty',
     '3' => 'thirty', '4' => 'fourty',
     '5' => 'fifty', '6' => 'sixty', '7' => 'seventy',

application/models/purchaseorder_model.php

@@ -1642,7 +1642,7 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
     else if($CapitalRange==0){
          $taxQuery ='SELECT group_concat(pl.MaterialCode ORDER BY pl.MaterialCode ASC) as Itemcode,
          SUM(it.`AfterFreightValue`) AS TotalFreight,it.FreightValue,it.AfterFreightValue,
-         SUM(it.`AfterIGST`) AS TotalIGST FROM T_Import_Tax it
+         SUM(it.`IGST`) AS TotalIGST FROM T_Import_Tax it
                 join T_PurchaseOrder_LineItem pl on pl.LineItemNo=it.LineItemNo
                 join T_PurchaseOrder_Master pm on pm.PONO=pl.PONO
                 where pm.POType=? and pm.PONO=?

application/views/editCapitalPo.php

@@ -3528,7 +3528,7 @@ $("#PaymentMethod").select2();
 
 
                                             <div class="modal-footer">
-                                                <?php if($CapitalRange!=1){ ?>
+                                                <?php if($CapitalRange!=1|| $CapitalRange==0){ ?>
                                                 <a class="btn btn-primary font ViewCapital"  ID="ViewUpdateCapital"  >&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
                                                 <?php } ?>
 
@@ -6668,7 +6668,9 @@ var Freight=parseFloat($('#txtAfterFreightlocview').val() == '' ? '0.00' : $('#t
             }); 
 
             
-            $('.ViewCapital').click(function(){ 
+$('.ViewCapital').click(function()
+{ 
+  
   var tr= document.getElementById(userid);
   var cellval = tr.cells;
                  
@@ -6676,15 +6678,52 @@ var Freight=parseFloat($('#txtAfterFreightlocview').val() == '' ? '0.00' : $('#t
   var FreightVal = $("#txtViewFreight").val();
   var AfterFreightVal = $("#txtViewAfterFreight").val();
   var NoOfTrip = $("#ViewNOOfTrips").val();
+      
   $('#FreightType'+userid).val(FreightType);
   $('#FreightVal'+userid).val(FreightVal);
   $('#NoOfTrip'+userid).val(NoOfTrip);
-                
-                
   $('#AfterFreightVal'+userid).val(AfterFreightVal);
+
+
+  
+  var Freightloc=$("#drpFreightviewloc").val();
+  var Nostriploc=$("#NOOfTripslocview").val();
+  var freightvalloc=$("#txtFreightlocview").val();
+  var AfterFreightloc=$("#txtAfterFreightlocview").val();
+
+  var cgst=$("#ViewCgst").val();
+  var AfterCgst=$("#ViewAfterCgst").val();
+  var sgst=$("#ViewSgst").val();
+  var AfterSgst=$("#ViewAfterSgst").val();
+  var igst=$("#ViewIgst").val();
+  var afterIgst=$("#ViewAfterIgst").val();
+  var allowance=$("#ViewOtherAllowances").val();
+
+  var basicval = $("#ViewCPTotalAmount").val();
+
+//console.log(basicval);
+
+  $('#Cgst'+userid).val(cgst);
+  $('#AfterCgst'+userid).val(AfterCgst);
+  $('#Sgst'+userid).val(sgst);
+  $('#AfterSgst'+userid).val(AfterSgst);
+  $('#Igst'+userid).val(igst);
+  $('#AfterIgst'+userid).val(afterIgst);
+
+
+  $('#Ftype'+userid).val(Freightloc);
+  $('#NoTrip'+userid).val(Nostriploc);
+  $('#Fvalue'+userid).val(freightvalloc);
+  $('#Afvalue'+userid).val(AfterFreightloc);
+
+
+
   populateValueMainFormForViewCapitalTax();
 
-            });
+
+
+});
+
 function validateEditCapitalTax()
      {  
    
@@ -7007,11 +7046,12 @@ $('#txttotalSubtotal').val((parseFloat(TotalSubtotal)).toFixed(2));
 $('#txttotalIgst').val((parseFloat(TotalIgst)).toFixed(2));
                    
             }
-
+function populateValueMainFormForViewCapitalTax()
-             function populateValueMainFormForViewCapitalTax()
+{
-            {
          
     var rows =  document.getElementById('serviceTax').rows.length;
+    var capital=<?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
+
     var TotalOrderValueSummary = 0;
 
     var TotCgst = 0;
@@ -7036,17 +7076,67 @@ $('#txttotalIgst').val((parseFloat(TotalIgst)).toFixed(2));
     var CapitalToatlOrder=0;
     var TotFreight =0;
     var TotDiscount=0;
-                for (var i = 1; i < rows; i++) {
+    var TotaFreight =0;
 
-                        var TotFreightI  = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
+                
+    for (var i = 1; i < rows; i++) 
+    {
+                                     
+var TotFreightI  = $('#AfterFreightVal'+i).val() == '' ? '0.00' : $('#AfterFreightVal'+i).val();
      
    TotFreight  = parseFloat(TotFreight) + parseFloat(TotFreightI);
 
-                    }
+var TotalCgstI = $('#AfterCgst'+i).val() == '' ? '0.00' : $('#AfterCgst'+i).val();
+
+var TotalSgstI = $('#AfterSgst'+i).val() == '' ? '0.00' : $('#AfterSgst'+i).val();
+
+var TotalIgstI = $('#AfterIgst'+i).val() == '' ? '0.00' : $('#AfterIgst'+i).val();
+
+var TotOtherI = $('#OtherAmt'+i).val() == '' ? '0.00' : $('#OtherAmt'+i).val();
+
+var TotalFreight = $('#Afvalue'+i).val() == '' ? '0.00' : $('#Afvalue'+i).val();
+
+var discountedRateValue = $('#AfterDisVal'+i).val() == '' ? '0.00' : $('#AfterDisVal'+i).val();
+
+//console.log(discountedRateValue);
+
+TotCgst = parseFloat(TotCgst) + parseFloat(TotalCgstI);
+TotSgst = parseFloat(TotSgst) + parseFloat(TotalSgstI);
+TotIgst = parseFloat(TotIgst) + parseFloat(TotalIgstI);
+TotaFreight=parseFloat(TotaFreight)+parseFloat(TotalFreight);
+
+    
+    
+}
 
     $('#txtTotalFreight').val(parseFloat(TotFreight).toFixed(2));
 
+    $('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) );
+    $('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) );
+    $('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) );
+    $('#TotalFreight').val(parseFloat(TotaFreight).toFixed(2) );    
+
+    var basicval=parseFloat($('#CapitalBasicOrder').val());
+    var totdiscount=parseFloat($('#txtTotalDiscount').val());
+    var totcgstt=parseFloat($('#txtTotCgst').val());
+    var totsgstt=parseFloat($('#txtTotSgst').val());
+    var totigstt=parseFloat($('#txtTotIgst').val());
+    var totfreightt=parseFloat($('#TotalFreight').val());
+    var otherallowance=parseFloat($('#TotalOtherAllowances').val());
+    var totorder=parseFloat(basicval)+parseFloat(totcgstt)+parseFloat(totsgstt)+parseFloat(totigstt)+parseFloat(totfreightt)+parseFloat(otherallowance)-parseFloat(totdiscount);
+
+   // console.log(totorder);  
+
+    if(capital==1)
+    {
+         $('#CapitalToatlOrder').val(parseFloat(totorder).toFixed(2) );         
     }        
+        
+
+            
+
+}
+
 var DisplayCurrencySymbol='';
 var ViewCurrencySymbol='';
 var currency = <?php echo json_encode($Currency, JSON_PRETTY_PRINT) ?>;

application/views/editimportpo.php

@@ -2750,9 +2750,9 @@ echo form_textarea($data);
 <input type="hidden" name="<?php echo 'CustomSHCess'.$index ?>" id="<?php echo 'CustomSHCess'.$index ?>" value="<?php echo $record->CustomSHCess ; ?>" />
 <input type="hidden" name="<?php echo 'AfterCustomSHCess'.$index ?>" id="<?php echo 'AfterCustomSHCess'.$index ?>" value="<?php echo $record->AfterCustomSHCess; ?>" />
 
-<input type="hidden" name="<?php echo 'Grossdutypayable'.$index ?>" id="<?php echo 'Grossdutypayable'.$index ?>" value="<?php echo $record->Grossdutypayable ; ?>" />
+<!-- <input type="hidden" name="<?php echo 'Grossdutypayable'.$index ?>" id="<?php echo 'Grossdutypayable'.$index ?>" value="<?php echo $record->Grossdutypayable ; ?>" /> -->
-<input type="hidden" name="<?php echo 'QuantityKG'.$index ?>" id="<?php echo 'QuantityKG'.$index ?>" value="<?php echo $record->QuantityKG ; ?>" />
+<!-- <input type="hidden" name="<?php echo 'QuantityKG'.$index ?>" id="<?php echo 'QuantityKG'.$index ?>" value="<?php echo $record->QuantityKG ; ?>" />
-
+ -->
 
 
 <input type="hidden" name="<?php echo 'BasicPriceInMTon'.$index ?>" id="<?php echo 'BasicPriceInMTonG'.$index ?>" value="<?php echo $record->BasicPriceInMTon ; ?>" />
@@ -2762,8 +2762,8 @@ echo form_textarea($data);
 
 
 
-<input type="hidden" name="<?php echo 'Grossdutypayable'.$index ?>" id="<?php echo 'Grossdutypayable'.$index ?>" value="<?php echo $record->Grossdutypayable; ?>" />
+<!-- <input type="hidden" name="<?php echo 'Grossdutypayable'.$index ?>" id="<?php echo 'Grossdutypayable'.$index ?>" value="<?php echo $record->Grossdutypayable; ?>" />
-
+ -->
 
 <input type="hidden" name="<?php echo 'BasicINRValue'.$index ?>" id="<?php echo 'BasicINRValue'.$index ?>" value="<?php echo $record->BasicINRValue; ?>" />
 

application/views/importpo.php

@@ -3379,7 +3379,7 @@ function calculateFreight(isEdit)
        var FreightType =$("#drpFreight").val();
        if(FreightType == "0")
        {
-         alert('Please select Freight Type');
+         //alert('Please select Freight Type');
          $('#txtFreight').val('');
          $("#drpFreight").focus();
        }