diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php index 7a84dfa4..0cb16e47 100755 --- a/application/controllers/amendmentpurchaseorder.php +++ b/application/controllers/amendmentpurchaseorder.php @@ -250,12 +250,13 @@ class amendmentpurchaseorder extends BaseController function EditRevenuePurchaseOrder() { + $NewPO=''; $MAD=''; $PONO =$this->input->post('txtPONO'); - //echo "Revenue Amendment"; - //echo "OLD PO IS" . $PONO; + echo "Revenue Amendment"; + echo "OLD PO IS" . $PONO; $POdt =$this->input->post('PODate'); $PODate = $this->getDateformat($POdt); @@ -366,30 +367,48 @@ class amendmentpurchaseorder extends BaseController $Reqnumber = $this->input->post('Reqnumber'.$i); $itemRate = $this->input->post('itemRate'.$i); $preitemrate=$this->input->post('beforeitemRate'.$i); + $DiscountType = $this->input->post('DisType'.$i); + $beforeDiscountType = $this->input->post('beforeDisType'.$i); $DiscountValue = $this->input->post('DisVal'.$i); $preDiscountValue = $this->input->post('beforeDisVal'.$i); $AfterDiscount = $this->input->post('AfterDisVal'.$i); + $beforeAfterDiscount = $this->input->post('beforeAfterDisVal'.$i); + $PackagingOption = $this->input->post('PackOption'.$i); $PackagingType = $this->input->post('PackType'.$i); + $beforePackagingType = $this->input->post('beforePackType'.$i); $PackagingValue = $this->input->post('PackVal'.$i); $prePackagingValue = $this->input->post('beforePackVal'.$i); $AfterPackagingValue = $this->input->post('AfterPackVal'.$i); - $VatOption = $this->input->post('VatOption'.$i);//SGST - $VatValue = $this->input->post('VatVal'.$i); + $beforeAfterPackagingValue = $this->input->post('beforeAfterPackVal'.$i); + + + $VatValue = $this->input->post('VatVal'.$i);//SGST $preVatValue = $this->input->post('beforeVatVal'.$i); $AfterVatValue = $this->input->post('AfterVatVal'.$i); + $beforeAfterVatValue = $this->input->post('beforeAfterVatVal'.$i); + $GSTValue = $this->input->post('GSTVal'.$i);//CGST $preGSTValue = $this->input->post('beforeGSTVal'.$i); $AfterGSTValue = $this->input->post('AfterGSTVal'.$i); + $beforeAfterGSTValue = $this->input->post('beforeAfterGSTVal'.$i); + $OtherTaxValue = $this->input->post('OtherTaxVal'.$i);//IGST $preOtherTaxValue = $this->input->post('beforeOtherTaxVal'.$i); $AfterOtherTaxValue = $this->input->post('AfterOtherTaxVal'.$i); + $beforeAfterOtherTaxValue = $this->input->post('beforeAfterOtherTaxVal'.$i); + $FreightType = $this->input->post('FreightType'.$i); + $beforeFreightType = $this->input->post('beforeFreightType'.$i); $FreightValue = $this->input->post('FreightVal'.$i); $preFreightValue = $this->input->post('beforeFreightVal'.$i); $AfterFreightValue = $this->input->post('AfterFreightVal'.$i); + $beforeAfterFreightValue = $this->input->post('beforeAfterFreightVal'.$i); + $NoofTrips = $this->input->post('Nooftrips'.$i); + $beforeNoofTrips = $this->input->post('beforeNooftrips'.$i); + $InsuranceValue = $this->input->post('Insval'.$i); $preInsuranceValue = $this->input->post('beforeInsval'.$i); $TotalOrderValue = $this->input->post('TotalOrderValue'.$i); @@ -399,50 +418,103 @@ class amendmentpurchaseorder extends BaseController $LineItemNo = ''; $RecQtyvalue=0; $rowspanvalue=0; + if(($Quantity-$preqty)!=0) { $rowspanvalue++; - $CAD.="Amended Quantity : ".$preqty ."Current Qty:".$Quantity.""; + $CAD.="Amended Quantity : ".$preqty ."Current Qty : ".$Quantity.""; } if(($itemRate-$preitemrate)!=0) { $rowspanvalue++; - $CAD.="Amended Rate : " . $preitemrate."Current Item Rate:".$itemRate.""; + $CAD.="Amended Rate : " . $preitemrate."Current Item Rate : ".$itemRate.""; } + + $rowspanvalue++; + $CAD.="Amended DiscountType : " . $beforeDiscountType."Current DiscountType : ".$DiscountType.""; + if(($DiscountValue-$preDiscountValue)!=0) { $rowspanvalue++; - $CAD.="Amended Discount:". $preDiscountValue ."Current Discount Value:".$DiscountValue.""; + $CAD.="Amended Discount : ". $preDiscountValue ."Current Discount : ".$DiscountValue.""; } + if(($AfterDiscount-$beforeAfterDiscount)!=0) + { + $rowspanvalue++; + $CAD.="Amended Discount Value : ". $beforeAfterDiscount ."Current Discount Value : ".$AfterDiscount.""; + } + + $rowspanvalue++; + $CAD.="Amended Packaging Type : ". $beforePackagingType ."Current Packaging Type : ".$PackagingType.""; + if(($PackagingValue-$prePackagingValue)!=0) { $rowspanvalue++; - $CAD.="Amended PackageValue:". $prePackagingValue."Current Packaginf Value:".$PackagingValue.""; + $CAD.="Amended Package Value : ". $prePackagingValue."Current Package Value : ".$PackagingValue.""; + } + if(($AfterPackagingValue-$beforeAfterPackagingValue)!=0) + { + $rowspanvalue++; + $CAD.="Amended Package Value : ". $beforeAfterPackagingValue."Current Package Value : ".$AfterPackagingValue.""; } if(($VatValue-$preVatValue)!=0)//SGST { $rowspanvalue++; - $CAD.="Amended SGST value:". $preVatValue."Current SGST Value:".$VatValue.""; + $CAD.="Amended SGST : ". $preVatValue."Current SGST : ".$VatValue.""; + } + if(($AfterVatValue-$beforeAfterVatValue)!=0)//SGST + { + $rowspanvalue++; + $CAD.="Amended SGST value : ". $beforeAfterVatValue."Current SGST Value : ".$AfterVatValue.""; } if(($GSTValue-$preGSTValue)!=0)//CGST { $rowspanvalue++; - $CAD.="Amended CGSTValue:". $preGSTValue."Current CGST Value:".$GSTValue.""; + $CAD.="Amended CGST : ". $preGSTValue."Current CGST : ".$GSTValue.""; + } + if(($AfterGSTValue-$beforeAfterGSTValue)!=0)//CGST + { + $rowspanvalue++; + $CAD.="Amended CGST Value : ". $beforeAfterGSTValue."Current CGST Value : ".$AfterGSTValue.""; } if(($OtherTaxValue-$preOtherTaxValue)!=0)//IGST { $rowspanvalue++; - $CAD.="Amended IGST Value:". $preOtherTaxValue."Current IGST Value:".$OtherTaxValue.""; + $CAD.="Amended IGST : ". $preOtherTaxValue."Current IGST : ".$OtherTaxValue.""; } + if(($AfterOtherTaxValue-$beforeAfterOtherTaxValue)!=0)//IGST + { + $rowspanvalue++; + $CAD.="Amended IGST : ". $beforeAfterOtherTaxValue."Current IGST : ".$AfterOtherTaxValue.""; + } + + $rowspanvalue++; + $CAD.="Amended Freight Type : ". $beforeFreightType."Current Freight Type : ".$FreightType.""; + + if(($FreightType=="PER TRIP") || ($beforeFreightType=="PER TRIP")){ + if($NoofTrips != $beforeNoofTrips) + { + $rowspanvalue++; + $CAD.="Amended No of Trips : ". $beforeNoofTrips."Current No of Trips : ".$NoofTrips.""; + } + } + if(($FreightValue-$preFreightValue)!=0) { $rowspanvalue++; - $CAD.="Amended FreightValue:". $preFreightValue."Current Freight Value:".$FreightValue.""; + $CAD.="Amended Freight : ". $preFreightValue."Current Freight : ".$FreightValue.""; } + + if(($AfterFreightValue-$beforeAfterFreightValue)!=0) + { + $rowspanvalue++; + $CAD.="Amended Freight Value : ". $beforeAfterFreightValue."Current Freight Value : ".$AfterFreightValue.""; + } + if(($InsuranceValue-$preInsuranceValue)!=0) { $rowspanvalue++; - $CAD.="Amended Insurance Value:". $preInsuranceValue."Current Insurance Value:".$InsuranceValue.""; + $CAD.="Amended Insurance Value : ". $preInsuranceValue."Current Insurance Value : ".$InsuranceValue.""; } if($rowspanvalue>0) { @@ -454,8 +526,8 @@ class amendmentpurchaseorder extends BaseController $CAD="".$MaterialCode.""; $CAD.=$CAD2; } - - + // echo $CAD; + // die(); $ReceivedQty = $this->purchaseorder_model->GetLineItemReceivedQty($PONO,$MaterialCode); if(count($ReceivedQty)>0) diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 884d74f2..8d3ec162 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -634,7 +634,7 @@ function purchaseorderListing($forwhat='') $subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,LineItem.ServiceMaterialDescription,Mat.MaterialCode,Mat.MaterialName, Mat.UOM,Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue,POMaster.AmendedDetails,LineItem.AmendedDetails as lineamenddetails, - ROUND(( Tax.After_SGST + Tax.After_CGST + Tax.After_IGST ) ,2)as Taxamount,ReqMat.NumberOfService, + ROUND(( Tax.After_SGST + Tax.After_CGST + Tax.After_IGST ) ,2)as Taxamount,ReqMat.NumberOfService,ReqMat.Schedule_Type,ReqMat.Service_Period, TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,Payment.PaymentTerms FROM T_PurchaseOrder_LineItem LineItem join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode diff --git a/application/views/Amendervicepopdf.php b/application/views/Amendervicepopdf.php index 3659857f..9d4b5240 100755 --- a/application/views/Amendervicepopdf.php +++ b/application/views/Amendervicepopdf.php @@ -23,7 +23,7 @@ $ServiceDescription = ''; $totaltaxamount=0.00; $PaymentOtherDescription=''; - + $NoOfServices=0; if(!empty($CompanyDetails)) { @@ -113,7 +113,7 @@ ?>
 
-
PURCHASE ORDER - PO NO:
+
PURCHASE ORDER - PO NO:/S
@@ -137,8 +137,8 @@ - - + +
PO DATE :DELIVERY DATE / SCHEDULE BY :PO DATE :  DELIVERY DATE / SCHEDULE BY :  
@@ -151,11 +151,13 @@ - - - - - + + + + + + + - - - - + + + + + +
Requistion NumberRequested ByRequested DepartmentCost Center
Requistion NumberRequistion DateFrequencyRequested ByRequested DepartmentCost Center
format("d-m-Y"); echo $date; ?>
- - - - - - - - - - - - - - +
#Item CodeService DescriptionQtyUOMRate In INRBasic Amount In INRSGST In INRCGST In INRIGST In INROther Allow In INRTotal Amount In INR
+ + + + + + + + + + + BasicValue*$record->NumberOfService) + $record->Taxamount ;//+ $record->otherallowance; + if($record->Schedule_Type=="One Time"){ + $TotalAmount = ($record->BasicValue) + $record->Taxamount ;//+ $record->otherallowance; + }else if($record->Schedule_Type=="Recurring"){ + $TotalAmount = ($record->BasicValue * $record->NumberOfService) + $record->Taxamount ;//+ $record->otherallowance; + } ?> - - - + + + + - - - - - - - - + + + Taxamount; } - $OrderValue = $SubTotalAmount ; + $OrderValue = $SubTotalAmount+ $otherallowances; } ?>
#Service DescriptionHSN CodeUOMQtyRate In INRBasic Amount In INR
MaterialName ; ?>ServiceMaterialDescription ; ?>ServiceMaterialDescription ; ?>HSNCODE)){echo $record->HSNCODE;}else{echo "NIL";}?>UOM ; ?> Quantity ; ?>UOM ; ?>Rate ; ?>BasicValue * $record->NumberOfService),2); ?>After_SGST ; ?>After_CGST ; ?>After_IGST ; ?>otherallowance ; ?>Rate ; ?>Schedule_Type == "One Time"){echo number_format(($record->Quantity * $record->Rate),2,'.','');}else if($record->Schedule_Type == "Recurring"){echo number_format((($record->Quantity * $record->Rate) * $record->NumberOfService),2,'.','');} ?>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
HSN CodeCGST

SGST

IGST

Total Tax AmtOther Allow In INRTotal Amt In INR
ValueAmtValueAmtValueAmt
HSNCODE)){echo $record->HSNCODE;}else{echo "NIL";}?>CGST?>%After_CGST?>SGST?>%After_SGST?>IGST?>%After_IGST?>Taxamount?>otherallowance?>Schedule_Type == "One Time"){echo number_format(($l->Taxamount + $l->otherallowance + ($l->Rate * $l->Quantity)),2,'.','');}else if($record->Schedule_Type == "Recurring"){echo number_format(($l->Taxamount + $l->otherallowance + ($l->Rate * $l->Quantity * $l->NumberOfService)),2,'.','');}?>
+ +

 

+ @@ -273,39 +319,35 @@ } ?>
-
+

 

+ +

Payment Terms: 

+ +
Scope Of Work As Annixture :
+ + +
+   - + + - + + - + + - - - - -
Total Amount In Words

Total Amount Before Tax In INR - Total Amount Before Tax In INR  
Total Tax Amount In INR - Total Tax Amount In INR  
Total Amount After Tax In INR - Total Amount After Tax In INR  
-

Payment Terms

-

- 		-

Certified that the particulars given above are true and correct

-

-

 

-

Authorized Signatory

-
-

 

-
Scope Of Work :
- - + - - +

 

-
Released By : FirstName;?>
-
Released On : format('d-m-Y');?>
+
 Released By : FirstName;?>
+
 Released On : format('d-m-Y');?>
+ + +

Certified that the particulars given above are true and correct

+

+

 

+

Authorized Signatory

+ + + + +
diff --git a/application/views/Amendrevenuepopdf.php b/application/views/Amendrevenuepopdf.php index 59feea73..b4d12000 100755 --- a/application/views/Amendrevenuepopdf.php +++ b/application/views/Amendrevenuepopdf.php @@ -12,10 +12,11 @@ $DeliverySchedule=''; $postatus=''; $ServiceDescription = ''; - $PaymentTerms = ''; - $PaymentOtherDescription=''; - /* $PaymentDays=''; - $PayableAT=''; */ + $PaymentTerms = ''; + $PaymentOtherDescription=''; + $type=''; + $value=''; + $amt=''; $totaltaxonly=0; if(!empty($CompanyDetails)) { @@ -110,67 +111,70 @@ else { echo '
DRAFT
'; + } ?>
 
-
SIDDHARTH INDUSTRIES - PURCHASE ORDER
PO NO :
-
- - - - - - - -
-


-
+
PURCHASE ORDER - PO NO:/R
+ + + + + + + + + + + + + + + + + + +
+

+

+
+ Vendor Address : +
+		 +

Delivery To :

+

+
PO DATE :  DELIVERY DATE / SCHEDULE BY :  
- - - - - - - - -
Vendor Address :

Delivery To :
- - - - - - - -
PO DATE :DELIVERY DATE / SCHEDULE BY :
-
+ -

 

+
- - - - + + + + + - - - - + + + + +
Requistion NumberRequested ByRequested DepartmentCost CenterRequistion NumberRequistion DateRequested ByRequested DepartmentCost Center
format("Y-m-d"); echo $date; ?>
-

 

+ - - - - - - - - - - - - - - - + + + + + + + + + @@ -224,26 +222,15 @@ ?> - - - - + + + + + - - - - - - - - - - - - +
#Item CodeItem DescriptionUOMQtyRate In INRBasic Value In INRDiscount In INRCGST In INRSGST In INRIGST In INRInsurance In INRPackaging In INRFreight In INRTotal Amount In INR#Item CodeItem DescriptionHSN CodeUOMQtyRate In INRBasic Value In INR
MaterialCode ; ?>MaterialName ; ?>UOM ; ?>MaterialCode ; ?>MaterialName ; ?>HSNCODE)){echo $record->HSNCODE;}else{echo "NIL";} ; ?>UOM ; ?> Quantity ; ?> Rate ; ?> BasicValue ; ?>AfterDiscount; ?>AfterCGST ; ?>AfterSGST ; ?>AfterIGST ; ?>Insurance ; ?>AfterPackagingValue ; ?>AfterFreightValue ; ?>BasicValue+ $record->AfterCGST+$record->AfterIGST+$record->AfterSGST + $record->Insurance+ $record->AfterFreightValue+$record->AfterPackagingValue)- ($record->AfterDiscount)); - echo number_format($TotalAmount,2) ; ?>
- - - + 

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
HSN Code

Discount In INR

SGST 

CGST  

IGST

Packaging In INR  Insurance In INR    Freight In INR Total Tax   Total Amount In INR 
ValueAmtValueAmtValueAmtValueAmtValueAmtValueAmt
HSNCODE)){echo $l->HSNCODE;}else{echo "NIL";} ; ?>DiscountType == 'PERCENTAGE'){$type="%";}else if($l->DiscountType == 'LUMP SUM'){$type="LS";}else if($l->DiscountType == 'NIL'){$type='';} echo $l->DiscountValue . $type;?>AfterDiscount;?>SGST."%";?>AfterSGST;?>CGST."%";?>AfterCGST;?>IGST."%";?>AfterIGST;?>PackagingType == 'PERCENTAGE'){$type="%";}else if($l->PackagingType == 'LUMP SUM'){$type="LS";}else if($l->PackagingType == 'NIL'){$type='';} echo $l->PackagingValue . $type;?>AfterPackagingValue;?>Insurance;?>FreightType == 'PER TRIP'){$type="TRIP"; echo $l->FreightValue ."*" . $l->NoOfTrip . $type;}else{ if($l->FreightType == 'LUMP SUM'){$type="LS";}else if($l->FreightType == 'NIL'){$type='';}else if($l->FreightType == 'PER UOM'){$type='UOM';}else if($l->FreightType == 'PERCENTAGE'){$type='%';} echo $l->PackagingValue . $type;}?>AfterFreightValue;?>AfterSGST+$l->AfterCGST+$l->AfterIGST+$l->AfterPackagingValue+$l->Insurance+$l->AfterFreightValue;echo number_format($tax,2);?>BasicValue + $tax)-($l->AfterDiscount)),2);?>


+ + -
- - + +

+ AmendedDetails)){$i++;}}} if($i<0){ ?> @@ -312,37 +357,33 @@ $OrderValue = (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insuranc } ?>
+ +  +

Payment Terms :  

+ +
Special Instruction:
- + + - + + - + + - - - -
Total Amount In Words :

 Total Amount Before Tax In INR :  Total Amount Before Tax In INR : 
 Total Tax Amount In INR : Total Tax Amount In INR : 
 Total Amount After Tax In INR :  Total Amount After Tax In INR : 
-

Payment Terms :

-

- 		-

 Certified that the particulars given above are true and correct

-

-

 

-

Authorized Signatory

-
-

 

-
Special Instruction:
- - - - - +

 

Released By : FirstName;?>
Released On : format('d-m-Y');?>
@@ -376,7 +404,20 @@ $OrderValue = (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insuranc -
+ + +

 Certified that the particulars given above are true and correct

+

+

 

+

Authorized Signatory

+ + + + +

 

+ + +
diff --git a/application/views/amendcapitalpopdf.php b/application/views/amendcapitalpopdf.php index 75c56a20..9975189d 100755 --- a/application/views/amendcapitalpopdf.php +++ b/application/views/amendcapitalpopdf.php @@ -115,7 +115,7 @@ ?>
 
-
PURCHASE ORDER - PO NO:
+
PURCHASE ORDER - PO NO:/C
@@ -150,11 +150,12 @@
- - - - - + + + + + + - - - - + + + + +
Requistion NumberRequested ByRequested DepartmentCost Center
Requistion NumberRequistion DateRequested ByRequested DepartmentCost Center
format("Y-m-d"); echo $date; ?>

 

- - - - - +
#Item and DescriptionQty
+ + + + + + - + - + - + - + - - + + + + @@ -234,6 +240,14 @@ ?>
#Item and DescriptionHSN CodeUOMQty Rate Per Unit in Rate Per Unit in Rate Per Unit in Rate Per Unit in Total Amount in Total Amount in Total Amount in Total Amount in
MaterialCode;?> - MaterialName ; ?>MaterialCode;?> - MaterialName ; ?>HSNCODE)){echo $record->HSNCODE;}else {echo "NIL";}?>UOM; ?> Quantity ; ?> Rate ; ?>
+

 

+ +

Payment Terms: 

+ + +
Special Instruction:
+ + @@ -289,8 +303,33 @@
-

Payment Terms

-

+ + ReleasedOn, new DateTimeZone('Asia/Kolkata')); + + + ?> + + + +

 

+
Released By : FirstName;?>
+
Released On : format('d-m-Y');?>
+ + + + + + +

Certified that the particulars given above are true and correct

@@ -302,39 +341,13 @@
-
Special Instruction:
+ + - ReleasedOn, new DateTimeZone('Asia/Kolkata')); - - - ?> - - - - - - - - - - - -
Released By:Released On:
FirstName;?>format('d-m-Y');?>
- - - - + +
diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php index 494a6534..533774f3 100755 --- a/application/views/editRevenueAmendPO.php +++ b/application/views/editRevenueAmendPO.php @@ -244,7 +244,7 @@ $('#EditPackagingType').change(function() { if(selValue == PercentageType) { var PackagingCalculation = ''; - $('#packagingcalmodel').modal('show'); + //$('#packagingcalmodel').modal('show'); $('#txtEditPackaging').removeAttr( 'readonly','true' ); } else @@ -438,6 +438,10 @@ function calculatePackaging() else { var basicValue = parseFloat($('#txtEditBasicValue').val()); + var discount=parseFloat($('#txtEditAfterDiscount').val()); + + basicValue=basicValue-discount; + // alert("Final"+basicValue); //var ExciseDuty = parseFloat($('#txtEditAfterExciseDuty').val()); var AfterVat = 0.0; // if(VatCalculation != 0 && $('#txtEditVat').val() != '' ) @@ -492,11 +496,13 @@ function calculatePackaging() else { var basicValue = parseFloat($('#txtEditBasicValue').val()); - + var discount=parseFloat($('#txtEditAfterDiscount').val()); + basicValue=basicValue-discount; if($('#txtEditGST').val() != "0" && $('#txtEditGST').val() != '') { var GSTValue = parseFloat($('#txtEditGST').val()); + var AfterGST = 0.0; AfterGST = ; @@ -526,12 +532,15 @@ function calculatePackaging() else { var basicValue = parseFloat($('#txtEditBasicValue').val()); - + var discount=parseFloat($('#txtEditAfterDiscount').val()); + basicValue=basicValue-discount; if($('#txtEditOtherTax').val() != "0" && $('#txtEditOtherTax').val() != '') - { + { + var OtherTaxValue = parseFloat($('#txtEditOtherTax').val()); - + + var AfterOtherTaxes = 0.0; AfterOtherTaxes = ; @@ -1467,7 +1476,7 @@ function calculateEditTaxValue() -
+
@@ -1520,35 +1529,45 @@ function calculateEditTaxValue() + - + + - - - + + + + + - + + - + + - - - + + + + + - + + - + + - + - - + + @@ -1670,7 +1689,7 @@ function calculateEditTaxValue()
- + 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',$totOrderSummaryAmt),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); echo form_input($data); @@ -1943,7 +1962,7 @@ function AmendChange(){ var TotalOrderValue = $("#txtEditTotalOrderValue").val(); var TotalTaxValue = calculateEditTaxValue(); - alert(TotalTaxValue); + //alert(TotalTaxValue); @@ -2085,7 +2104,7 @@ function populateValueMainFormForEditRevenueTax() var Discount =$('#AfterDisVal'+rowid).val() == '' ? '0.00' : $('#AfterDisVal'+rowid).val(); var BasicVal = $('#basicval'+rowid).val() == '' ? '0.00' : $('#basicval'+rowid).val(); var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val(); - alert(TotalVal); + //alert(TotalVal); totBasicAmt = parseFloat(totBasicAmt ) + parseFloat(BasicVal);