AMEND ISSUES FIXED REVENUE
This commit is contained in:
velz2020
parent
ced1335024
commit
6d07073c8a
@ -178,13 +178,16 @@ class amendmentpurchaseorder extends BaseController
|
||||
{
|
||||
$CapitalRange = $_GET['CapitalRange'];
|
||||
|
||||
$AvlBudget = $this->purchaseorder_model->GetAvailableBudgetAmount($CostCode,$FYdt,$ReqType);
|
||||
|
||||
|
||||
if(count($AvlBudget)>0)
|
||||
{
|
||||
$data['AvlBudAmt'] = $AvlBudget[0]['BudgetAmount'] - $AvlBudget[0]['Totalvalue'];
|
||||
}
|
||||
$CapitalAvlBudget = $this->purchaseorder_model->GetAvailableCapitalBudgetAmount($CostCode,$FYdt,$ReqType);
|
||||
|
||||
|
||||
if(count($CapitalAvlBudget)>0)
|
||||
{
|
||||
|
||||
|
||||
$data['AvlCapitalBudAmt'] = $CapitalAvlBudget[0]['BudgetAmount'] - $CapitalAvlBudget[0]['Totalvalue'];
|
||||
|
||||
}
|
||||
if($CapitalRange=='0'){
|
||||
$data['POItem'] = $this->purchaseorder_model->getCapitalPurchaseOrderDetails($PONO);
|
||||
|
||||
@ -255,8 +258,8 @@ class amendmentpurchaseorder extends BaseController
|
||||
$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);
|
||||
@ -299,7 +302,7 @@ class amendmentpurchaseorder extends BaseController
|
||||
$MAD.="Amended PaymentTerms : ". $PaymentTermsText . $Otherpaymentamend ."<br>";
|
||||
}
|
||||
|
||||
if((($predeliverydate != $testdate)&&($dt != $predeliverydate))|| ($DeliverySchedule1 != $preschedule))
|
||||
if(($dt != $predeliverydate)|| ($DeliverySchedule1 != $preschedule))
|
||||
{
|
||||
|
||||
|
||||
@ -308,7 +311,7 @@ class amendmentpurchaseorder extends BaseController
|
||||
|
||||
$SpecialInstruction = $this->input->post('txtSpcialInstruction');//$_POST['txtSpcialInstruction'];//$this->input->post('txtSpcialInstruction');//t->post('txtSpcialInstruction'));
|
||||
|
||||
|
||||
//echo $MAD;
|
||||
|
||||
$TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary');
|
||||
$POStatus = $this->input->post('txtStatus');
|
||||
@ -317,8 +320,8 @@ class amendmentpurchaseorder extends BaseController
|
||||
|
||||
$RowCount = $this->input->post('txtRowCount');
|
||||
|
||||
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
|
||||
$updateddt = $dt->format('Y-m-d H:i:s');
|
||||
$dtt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
|
||||
$updateddt = $dtt->format('Y-m-d H:i:s');
|
||||
if(empty($Deliverydt))
|
||||
{
|
||||
$Deliverydt=null;
|
||||
@ -332,6 +335,7 @@ class amendmentpurchaseorder extends BaseController
|
||||
$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID,'POType'=>$POType,'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>PO_RELEASED,'PaymentTerms'=>$PaymentTerms,'PaymentOtherDescription'=>$Otherpayment,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpecialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'AmendedDetails'=>$MAD);
|
||||
//print_r($POMaster);
|
||||
|
||||
|
||||
|
||||
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster,$updatedBy,$PONO);
|
||||
if(count($LastPO)>0)
|
||||
@ -559,6 +563,7 @@ class amendmentpurchaseorder extends BaseController
|
||||
|
||||
|
||||
|
||||
|
||||
function UpdateAmendServicePurchaseOrder()
|
||||
{
|
||||
$PONO =$this->input->post('txtPONO');
|
||||
@ -595,7 +600,7 @@ function UpdateAmendServicePurchaseOrder()
|
||||
$preTotalordervalue=$this->input->post('preTotalordervalue');
|
||||
|
||||
$MAD.="Amended Total OrderValue: " . $preTotalordervalue . "<br>";
|
||||
if((($beforeddate != $testdate) && ($ddate != $beforeddate))||($dschedule != $beforedschedule))
|
||||
if(($ddate != $beforeddate)||($dschedule != $beforedschedule))
|
||||
{
|
||||
$MAD.="Amended DeliveryOption : " . $beforeddate . $beforedschedule."<br>";
|
||||
}
|
||||
|
||||
@ -122,7 +122,7 @@
|
||||
|
||||
<table style="border-collapse: collapse;font-size:12px;" border="1" width="100%" cellspacing="0" cellpadding="0">
|
||||
<tbody>
|
||||
<tr>
|
||||
<tr style="page-break-after: always;">
|
||||
|
||||
<td colspan="2">
|
||||
<p style="color:#3c8dbc;font-size:16px;"><strong><?php echo $CompanyName; ?></strong></p>
|
||||
@ -130,7 +130,7 @@
|
||||
</td>
|
||||
<td align="right"><img width="100" height="100" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11JREFUeNrsnT9IHEEYxWfFw8rgpUhlo5URi2gTbIUUSrq1ui4oRLRIY9JIKrGKTQrBgJLuuutEi4CtSSOpPIuATdIEcid2YpN9C3sc8c6bf7uZmX0P7k7ultm7337zzXxvZjGaiaIfQoiqoHTUHk6eniSPUbLQUmUoebojB23dDZGBmQiQAAmQAAmQIkACJEACpAiweA3bbvDV5mb6+iKOxfTc3MDjf15dicbBQfr3591d7wBGM1H0J3l9bNLI84UFsby6mkIzFWACJMCafJ9PJyfSx29vbHQuoqJaxl34zc5O+mVtwIPi5EIcXV52IjnoLvx+by/9wXkIF8aHbq0dgYi4vOB1Q7QV2c4BXM4Z3r+RGBTAR9VqmqhVBoZnIyOdx9taTXqQGJ+YUDqXFwBV4WGU69aXRkNsr69LtyEzHfIKIKJCVl9PT3u+/63P+6bnC64SuWm3jdsYn5xkKcdamCJAAiwjQJcHAC8ATs/OBg1Qy0y4ub6WPhb1cuPwUFycn9/77OPWlvXzeQGw2QPGQ9o/PhZrS0v3IPpooFrpwgChYniidq6fnTnvrBSaA3Uc3A/1uvPuSmEA0f0uFLsyBKcZDjaisvSj8DsFW6pbcHPQpV12WQoBCHhri4taEOGwhJAXjeeBgFebn1eyp0LKi1Ym0rCsXieRqLk06HVetFqJwHmWnRz3yotHzabT9n0hpRxGZ0SjjpGKCEQkxgUtWDlbCyMfIi/qTHMgrDf7srCem5mQDS5YQNKRD2vCuQLMhCVM3bwIiK4PLIUYqrp5EXPFeGWFALO8CEdGddId7NYOHWFQUa1cUO4Fty78/fZW6tFrjx7gqfqAT0PbmWAqVCwq+bDUOxMeyokh6L8B1J1kE2BgIkACJMDyAbSx56/cACV3CoyOjfX9rNSrcrI7E/qVYYCnYhKY3LXkJECVOdx+Us51m6Nwm7HVQyUCf4UGEJuFZPMgIhC+XlYfw21WWQ/GxXJ50q09iBS1MSjYW73ww3SXMVXOobsk4MU80GQZc5DQbl5tOzWRRpS8nJqy1tUAzWZ7ecvKDdfdggWfTV0GbdnA4JB1UdhbHjo0LesAS6YWa2GaCQRIgARIESABEiABUgRIgARYRoAVYtBWBfcL/xb8hwS6av8VYADVjF2M5sTWJAAAAABJRU5ErkJggg=="></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr style="page-break-after: always;">
|
||||
<td>
|
||||
<strong>Vendor Address :</strong>
|
||||
<?php echo $SuplierName?><br /><?php echo $SuplierAddress ?>
|
||||
@ -140,7 +140,7 @@
|
||||
<p><?php echo $DeliveryAddress?></p>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr style="page-break-after: always;">
|
||||
<td>PO DATE : <?php echo $Podt?></td>
|
||||
<td colspan="2">DELIVERY DATE / SCHEDULE BY : <?php echo $DeliveryDate.$DeliverySchedule;?></td>
|
||||
</tr>
|
||||
@ -154,7 +154,7 @@
|
||||
|
||||
<table style="border-collapse: collapse;" cellpadding="0" cellspacing="0" border="1" width="100%">
|
||||
<tbody>
|
||||
<tr style="background:#8c8c8c;color:#fff;">
|
||||
<tr style="background:#8c8c8c;color:#fff;page-break-after: always;">
|
||||
<td style="text-align: center;">Requistion Number</td>
|
||||
<td style="text-align: center;">Requistion Date</td>
|
||||
<td style="text-align: center;">Requested By</td>
|
||||
@ -169,7 +169,7 @@
|
||||
{
|
||||
|
||||
?>
|
||||
<tr>
|
||||
<tr style="page-break-after: always;">
|
||||
<td style="text-align: center;"><?php echo $ReqDetails['RequistionNo']; ?></td>
|
||||
<td style="text-align: center;"><?php $date = new DateTime($ReqDetails['ReqDate'],new DateTimeZone('Asia/Kolkata')); $date=$date->format("Y-m-d"); echo $date; ?></td>
|
||||
<td style="text-align: center;"><?php echo $ReqDetails['RequestedName']; ?></td>
|
||||
@ -186,7 +186,7 @@
|
||||
|
||||
<!-- <p> </p> -->
|
||||
<table width="100%">
|
||||
<tr style="background:#8c8c8c;color:#fff;">
|
||||
<tr style="background:#8c8c8c;color:#fff;page-break-after: always;">
|
||||
<th style="text-align: center;">#</th>
|
||||
<th style="text-align: center;">Item Code</th>
|
||||
<th style="text-align: center;">Item Description</th>
|
||||
@ -214,14 +214,14 @@
|
||||
$Insurance = 0;
|
||||
$AfterFreightValue = 0;
|
||||
$AfterDiscount = 0;
|
||||
$AfterPackaging = 0;
|
||||
$AfterPackaging = 0;
|
||||
|
||||
foreach($POItem as $record)
|
||||
{
|
||||
$index = $index + 1;
|
||||
|
||||
?>
|
||||
<tr>
|
||||
<tr style="page-break-after: always;">
|
||||
<td style="text-align: center;"><?php echo $index ; ?></td>
|
||||
<td style="text-align: center;"><?php echo $record->MaterialCode ; ?></td>
|
||||
<td style="text-align: center;"><?php echo $record->MaterialName ; ?></td>
|
||||
@ -246,15 +246,18 @@
|
||||
$AfterPackaging=$AfterPackaging+$record->AfterPackagingValue;
|
||||
$totaltaxonly=($AfterCGST+$AfterSGST+$AfterIGST+$Insurance+$AfterFreightValue+$AfterPackaging);
|
||||
}
|
||||
|
||||
$OrderValue = (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insurance +$AfterFreightValue+$AfterPackaging) - $AfterDiscount) ;
|
||||
}?>
|
||||
|
||||
|
||||
|
||||
?>
|
||||
</table>
|
||||
|
||||
<p></p>
|
||||
<table style="border-collapse: collapse;" border="1" width="100%" cellspacing="0" cellpadding="0">
|
||||
<tbody>
|
||||
<tr style="line-height: 1.5em;">
|
||||
<tr style="line-height: 1.5em;page-break-after: always;">
|
||||
<td style="text-align: center;" rowspan="2"><strong>HSN Code</strong><br /><br /></td>
|
||||
<td style="text-align: center;" colspan="2"><strong>Discount In INR</strong><br /><br /></td>
|
||||
<td style="text-align: center;" colspan="2"><strong>SGST</strong> <br /><br /></td>
|
||||
@ -267,7 +270,7 @@
|
||||
<td style="text-align: center;" rowspan="2"><strong>Total Tax</strong> </td>
|
||||
<td style="text-align: center;" rowspan="2"><strong> Total Amount In INR</strong> </td>
|
||||
</tr>
|
||||
<tr style="line-height: 2.5em;">
|
||||
<tr style="line-height: 2.5em;page-break-after: always;"">
|
||||
<td style="text-align: center;"><strong>Value</strong></td>
|
||||
<td style="text-align: center;"><strong>Amt</strong></td>
|
||||
<td style="text-align: center;"><strong>Value</strong></td>
|
||||
@ -285,6 +288,7 @@
|
||||
<?php if(!empty($POItem)){
|
||||
foreach($POItem as $l)
|
||||
{
|
||||
$tax=0;
|
||||
?>
|
||||
<tr style="line-height: 1.5em;">
|
||||
<td style="text-align: center;"><?php if(!empty($l->HSNCODE)){echo $l->HSNCODE;}else{echo "NIL";} ; ?></td>
|
||||
@ -302,7 +306,8 @@
|
||||
<td style="text-align: right;"><?php if($l->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;}?></td>
|
||||
<td style="text-align: right;"><?php echo $l->AfterFreightValue;?></td>
|
||||
<td style="text-align: right;"><?php $tax=$l->AfterSGST+$l->AfterCGST+$l->AfterIGST+$l->AfterPackagingValue+$l->Insurance+$l->AfterFreightValue;echo number_format($tax,2);?></td>
|
||||
<td style="text-align: right;"><?php echo number_format((($record->BasicValue + $tax)-($l->AfterDiscount)),2);?></td>
|
||||
<td style="text-align: right;"><?php echo number_format((($l->BasicValue + $tax)-($l->AfterDiscount)),2);?></td>
|
||||
|
||||
</tr>
|
||||
|
||||
<?php }
|
||||
@ -312,11 +317,9 @@
|
||||
</table><br><br>
|
||||
|
||||
|
||||
<?php
|
||||
|
||||
|
||||
$OrderValue = (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insurance +$AfterFreightValue+$AfterPackaging) - $AfterDiscount) ;
|
||||
}?>
|
||||
|
||||
|
||||
|
||||
<p></p>
|
||||
<?php //s$i=0; if(!empty($POItem)){foreach($POItem as $v){if(!empty($v->AmendedDetails)){$i++;}}} if($i<0){ ?>
|
||||
@ -368,7 +371,7 @@ $OrderValue = (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insuranc
|
||||
<tr>
|
||||
<td style="text-align: center;" rowspan="3"><strong>Total Amount In Words :</strong><br /><br /><b><i><?php echo $TotalAmountInWords." "."Only.";?></i></b></td>
|
||||
<td style="text-align: right;"> <strong>Total Amount Before Tax In INR : </strong></td>
|
||||
<td style="text-align: right;"><?php echo number_format($SubTotalAmount,2); ?></td>
|
||||
<td style="text-align: right;"><?php echo number_format(($SubTotalAmount-$AfterDiscount),2); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="text-align: right;"> <strong>Total Tax Amount In INR : <strong></td>
|
||||
|
||||
@ -140,7 +140,7 @@ if(!empty($POMaster))
|
||||
if(!empty($AvlBudAmt))
|
||||
{
|
||||
|
||||
$AvlAmount = $AvlBudAmt;
|
||||
$AvlAmount = $AvlCapitalBudAmt;
|
||||
|
||||
}
|
||||
?>
|
||||
@ -2883,13 +2883,28 @@ $('#txtStatus').val(stat);
|
||||
if(validate())
|
||||
{
|
||||
|
||||
|
||||
var ex=$('#ExchangeRt').val();
|
||||
//alert(ex);
|
||||
//alert(parseInt($('#CapitalToatlOrder').val() * ex));
|
||||
var AvlBudAmt = '<?php echo $AvlAmount ?>';
|
||||
//alert(AvlBudAmt);
|
||||
if(document.getElementById('serviceTax').rows.length < 2)
|
||||
{
|
||||
alert('Please Select Line item to Create PO');
|
||||
$('#Deliverydt').focus();
|
||||
return false;
|
||||
}
|
||||
else if($('#Otherpayment').val()=='' && $('#PaymentMethod').val()=='PT08'){
|
||||
alert('Please Enter Other Payable Terms Description');
|
||||
$('#Otherpayment').focus();
|
||||
return false;
|
||||
}
|
||||
|
||||
else if(parseInt(AvlBudAmt) < parseInt($('#CapitalToatlOrder').val() * ex)) {
|
||||
alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
|
||||
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
|
||||
@ -1542,18 +1542,18 @@ function calculateEditTaxValue()
|
||||
<input type="hidden" name="<?php echo 'AfterPackVal'.$index ?>" id="<?php echo 'AfterPackVal'.$index ?>" value="<?php echo $record->AfterPackagingValue ; ?>" />
|
||||
<input type="hidden" name="<?php echo 'beforeAfterPackVal'.$index ?>" id="<?php echo 'beforeAfterPackVal'.$index ?>" value="<?php echo $record->AfterPackagingValue ; ?>" />
|
||||
<input type="hidden" name="<?php echo 'VatOption'.$index ?>" id="<?php echo 'VatOption'.$index ?>" value="<?php echo $record->VatCalulatedOn ; ?>" />
|
||||
<input type="hidden" name="<?php echo 'VatVal'.$index ?>" id="<?php echo 'VatVal'.$index ?>" value="<?php echo $record->Vat ; ?>" /> <!-- SGST-->
|
||||
<input type="hidden" name="<?php echo 'beforeVatVal'.$index ?>" id="<?php echo 'beforeVatVal'.$index ?>" value="<?php echo $record->Vat ; ?>" /><!-- SGST-->
|
||||
<input type="hidden" name="<?php echo 'AfterVatVal'.$index ?>" id="<?php echo 'AfterVatVal'.$index ?>" value="<?php echo $record->AfterVAT ; ?>" /><!-- SGST-->
|
||||
<input type="hidden" name="<?php echo 'beforeAfterVatVal'.$index ?>" id="<?php echo 'beforeAfterVatVal'.$index ?>" value="<?php echo $record->AfterVAT ; ?>" /><!-- SGST-->
|
||||
<input type="hidden" name="<?php echo 'GSTVal'.$index ?>" id="<?php echo 'GSTVal'.$index ?>" value="<?php echo $record->GST ; ?>" /><!-- CGST-->
|
||||
<input type="hidden" name="<?php echo 'beforeGSTVal'.$index ?>" id="<?php echo 'beforeGSTVal'.$index ?>" value="<?php echo $record->GST ; ?>" /><!-- CGST-->
|
||||
<input type="hidden" name="<?php echo 'AfterGSTVal'.$index ?>" id="<?php echo 'AfterGSTVal'.$index ?>" value="<?php echo $record->AfterGST ; ?>" /><!-- CGST-->
|
||||
<input type="hidden" name="<?php echo 'beforeAfterGSTVal'.$index ?>" id="<?php echo 'beforeAfterGSTVal'.$index ?>" value="<?php echo $record->AfterGST ; ?>" /><!-- CGST-->
|
||||
<input type="hidden" name="<?php echo 'OtherTaxVal'.$index ?>" id="<?php echo 'OtherTaxVal'.$index ?>" value="<?php echo $record->OtherTaxes ; ?>" /><!-- IGST-->
|
||||
<input type="hidden" name="<?php echo 'beforeOtherTaxVal'.$index ?>" id="<?php echo 'beforeOtherTaxVal'.$index ?>" value="<?php echo $record->OtherTaxes ; ?>" /><!-- IGST-->
|
||||
<input type="hidden" name="<?php echo 'AfterOtherTaxVal'.$index ?>" id="<?php echo 'AfterOtherTaxVal'.$index ?>" value="<?php echo $record->AfterOtherTaxes ; ?>" /><!-- IGST-->
|
||||
<input type="hidden" name="<?php echo 'beforeAfterOtherTaxVal'.$index ?>" id="<?php echo 'beforeAfterOtherTaxVal'.$index ?>" value="<?php echo $record->AfterOtherTaxes ; ?>" /><!-- IGST-->
|
||||
<input type="hidden" name="<?php echo 'VatVal'.$index ?>" id="<?php echo 'VatVal'.$index ?>" value="<?php echo $record->SGST ; ?>" /> <!-- SGST-->
|
||||
<input type="hidden" name="<?php echo 'beforeVatVal'.$index ?>" id="<?php echo 'beforeVatVal'.$index ?>" value="<?php echo $record->SGST ; ?>" /><!-- SGST-->
|
||||
<input type="hidden" name="<?php echo 'AfterVatVal'.$index ?>" id="<?php echo 'AfterVatVal'.$index ?>" value="<?php echo $record->AfterSGST ; ?>" /><!-- SGST-->
|
||||
<input type="hidden" name="<?php echo 'beforeAfterVatVal'.$index ?>" id="<?php echo 'beforeAfterVatVal'.$index ?>" value="<?php echo $record->AfterSGST ; ?>" /><!-- SGST-->
|
||||
<input type="hidden" name="<?php echo 'GSTVal'.$index ?>" id="<?php echo 'GSTVal'.$index ?>" value="<?php echo $record->CGST ; ?>" /><!-- CGST-->
|
||||
<input type="hidden" name="<?php echo 'beforeGSTVal'.$index ?>" id="<?php echo 'beforeGSTVal'.$index ?>" value="<?php echo $record->CGST ; ?>" /><!-- CGST-->
|
||||
<input type="hidden" name="<?php echo 'AfterGSTVal'.$index ?>" id="<?php echo 'AfterGSTVal'.$index ?>" value="<?php echo $record->AfterCGST ; ?>" /><!-- CGST-->
|
||||
<input type="hidden" name="<?php echo 'beforeAfterGSTVal'.$index ?>" id="<?php echo 'beforeAfterGSTVal'.$index ?>" value="<?php echo $record->AfterCGST ; ?>" /><!-- CGST-->
|
||||
<input type="hidden" name="<?php echo 'OtherTaxVal'.$index ?>" id="<?php echo 'OtherTaxVal'.$index ?>" value="<?php echo $record->IGST ; ?>" /><!-- IGST-->
|
||||
<input type="hidden" name="<?php echo 'beforeOtherTaxVal'.$index ?>" id="<?php echo 'beforeOtherTaxVal'.$index ?>" value="<?php echo $record->IGST ; ?>" /><!-- IGST-->
|
||||
<input type="hidden" name="<?php echo 'AfterOtherTaxVal'.$index ?>" id="<?php echo 'AfterOtherTaxVal'.$index ?>" value="<?php echo $record->AfterIGST ; ?>" /><!-- IGST-->
|
||||
<input type="hidden" name="<?php echo 'beforeAfterOtherTaxVal'.$index ?>" id="<?php echo 'beforeAfterOtherTaxVal'.$index ?>" value="<?php echo $record->AfterIGST ; ?>" /><!-- IGST-->
|
||||
<input type="hidden" name="<?php echo 'FreightType'.$index ?>" id="<?php echo 'FreightType'.$index ?>" value="<?php echo $record->FreightType ; ?>" />
|
||||
<input type="hidden" name="<?php echo 'beforeFreightType'.$index ?>" id="<?php echo 'beforeFreightType'.$index ?>" value="<?php echo $record->FreightType ; ?>" />
|
||||
<input type="hidden" name="<?php echo 'FreightVal'.$index ?>" id="<?php echo 'FreightVal'.$index ?>" value="<?php echo $record->FreightValue ; ?>" />
|
||||
@ -1584,11 +1584,11 @@ function calculateEditTaxValue()
|
||||
$totDiscountAmt = $totDiscountAmt + $record->AfterDiscount;
|
||||
$totPackagingAmt = $totPackagingAmt + $record->AfterPackagingValue;
|
||||
$totExciseAmt = $totExciseAmt + $record->AfterExciseDuty;
|
||||
$totVATAmt = $totVATAmt + $record->AfterVAT;
|
||||
$totCSTAmt = $totCSTAmt + $record->AfterCST;
|
||||
$totGSTAmt = $totGSTAmt +$record->AfterGST;
|
||||
$totVATAmt = $totVATAmt + $record->AfterSGST;
|
||||
//$totCSTAmt = $totCSTAmt + $record->AfterCST;
|
||||
$totGSTAmt = $totGSTAmt +$record->AfterCGST;
|
||||
|
||||
$totOtherTaxAmt = $totOtherTaxAmt + $record->AfterOtherTaxes;
|
||||
$totOtherTaxAmt = $totOtherTaxAmt + $record->AfterIGST;
|
||||
$totFreightAmt = $totFreightAmt + $record->AfterFreightValue;
|
||||
$totInsuranceAmt = $totInsuranceAmt + $record->Insurance;
|
||||
$totOrderSummaryAmt = $totOrderSummaryAmt +$record->TotalValue;
|
||||
@ -1734,6 +1734,8 @@ function calculateEditTaxValue()
|
||||
<div class="col-md-4">
|
||||
|
||||
<?php
|
||||
$Reqon=new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
|
||||
$Reqon=$Reqon->format('Y-m-d');
|
||||
$data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston', 'class' => 'form-control num' ,'required' => 'true','readonly' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
@ -1820,15 +1822,13 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
|
||||
$('#txtEditAfterDiscount').val($('#AfterDisVal'+userid).val());
|
||||
$('#txtEditVat').val($('#VatVal'+userid).val());
|
||||
$('#txtEditAfterVat').val($('#AfterVatVal'+userid).val());
|
||||
//$('#txtEditCST').val($('#CSTVal'+userid).val());
|
||||
//$('#txtEditAfterCST').val($('#AfterCSTVal'+userid).val());
|
||||
|
||||
|
||||
$('#txtEditPackaging').val($('#PackVal'+userid).val());
|
||||
$('#txtEditAfterPackaging').val($('#AfterPackVal'+userid).val());
|
||||
$('#txtEditGST').val($('#GSTVal'+userid).val());
|
||||
$('#txtEditAfterGST').val($('#AfterGSTVal'+userid).val());
|
||||
//$('#txtEditExciseDuty').val($('#ExciseVal'+userid).val());
|
||||
//$('#txtEditAfterExciseDuty').val($('#AfterExciseVal'+userid).val());
|
||||
|
||||
$('#txtEditOtherTax').val($('#OtherTaxVal'+userid).val());
|
||||
$('#txtEditAfterOtherTax').val($('#AfterOtherTaxVal'+userid).val());
|
||||
|
||||
@ -1903,11 +1903,7 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
|
||||
|
||||
});
|
||||
|
||||
function AmendChange(){
|
||||
|
||||
var amdqty=$('#EditQuantity').val($('#quantity'+userid).val());
|
||||
alert('Workeed');
|
||||
}
|
||||
|
||||
|
||||
$('.editrevenue').click(function(){
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user