po bug fixed

This commit is contained in:
venbatechnologies@gmail.com 2017-08-04 16:51:17 +05:30
parent b934101656
commit 70ba1db7fd
9 changed files with 268 additions and 615 deletions

View File

@ -2626,528 +2626,132 @@ function addNewImportPurchaseOrder()
/*This function is used to convert amount(digit) into words*/
public function convertNumber($number)
public function convertNumber($amt){
{
list($integer, $fraction) = explode(".", (string) $number);
$output = "Rupee"." ";
if ($integer{0} == "-")
{
$output = "negative ";
$integer = ltrim($integer, "-");
}
else if ($integer{0} == "+")
{
$output = "positive ";
$integer = ltrim($integer, "+");
}
if ($integer{0} == "0")
{
$output .= "zero";
}
else
{
$integer = str_pad($integer, 36, "0", STR_PAD_LEFT);
$group = rtrim(chunk_split($integer, 3, " "), " ");
$groups = explode(" ", $group);
$groups2 = array();
foreach ($groups as $g)
{
$groups2[] = $this->convertThreeDigit($g{0}, $g{1}, $g{2});
}
for ($z = 0; $z < count($groups2); $z++)
{
if ($groups2[$z] != "")
{
$output .= $groups2[$z] . $this->convertGroup(11 - $z) . (
$z < 11
&& !array_search('', array_slice($groups2, $z + 1, -1))
&& $groups2[11] != ''
&& $groups[11]{0} == '0'
? " "
: ", "
);
}
}
$output = rtrim($output, ", ");
}
if ($fraction > 0)
{
$output .= " paise";
for ($i = 0; $i < strlen($fraction); $i++)
{
$output .= " " . $this->convertDigit($fraction{$i});
}
}
return $output;
$totalAmt=explode(".",$amt);
$number = $totalAmt[0];
$no = $number;
if(!empty($totalAmt[1])){
$point = $totalAmt[1];
}
/* get symbol based amount in words*/
public function convertNumberSymbol($number,$symbol,$name,$paise)
{
list($integer, $fraction) = explode(".", (string) $number);
$output = $name." ";
if ($integer{0} == "-")
{
$output = "negative ";
$integer = ltrim($integer, "-");
}
else if ($integer{0} == "+")
{
$output = "positive ";
$integer = ltrim($integer, "+");
}
if ($integer{0} == "0")
{
$output .= "zero";
}
else
{
$integer = str_pad($integer, 36, "0", STR_PAD_LEFT);
$group = rtrim(chunk_split($integer, 3, " "), " ");
$groups = explode(" ", $group);
$groups2 = array();
foreach ($groups as $g)
{
$groups2[] = $this->convertThreeDigit($g{0}, $g{1}, $g{2});
}
for ($z = 0; $z < count($groups2); $z++)
{
if ($groups2[$z] != "")
{
$output .= $groups2[$z] . $this->convertGroup(11 - $z) . (
$z < 11
&& !array_search('', array_slice($groups2, $z + 1, -1))
&& $groups2[11] != ''
&& $groups[11]{0} == '0'
? " "
: ", "
);
}
}
$output = rtrim($output, ", ");
}
if ($fraction > 0)
{
$output .= $paise;
for ($i = 0; $i < strlen($fraction); $i++)
{
$output .= " " . $this->convertDigit($fraction{$i});
}
}
return $output;
}
public function convertGroup($index)
{
switch ($index)
{
case 11:
return " decillion";
case 10:
return " nonillion";
case 9:
return " octillion";
case 8:
return " septillion";
case 7:
return " sextillion";
case 6:
return " quintrillion";
case 5:
return " quadrillion";
case 4:
return " trillion";
case 3:
return " billion";
case 2:
return " million";
case 1:
return " thousand";
case 0:
return "";
}
else{
$point=0;
}
public function convertThreeDigit($digit1, $digit2, $digit3)
{
$hundred = null;
$digits_1 = strlen($no);
$buffer = "";
$i = 0;
$str = array();
$words = array('0' => '', '1' => 'one', '2' => 'two',
'3' => 'three', '4' => 'four', '5' => 'five', '6' => 'six',
'7' => 'seven', '8' => 'eight', '9' => 'nine',
'10' => 'ten', '11' => 'eleven', '12' => 'twelve',
'13' => 'thirteen', '14' => 'fourteen',
'15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
'18' => 'eighteen', '19' =>'nineteen', '20' => 'twenty',
'30' => 'thirty', '40' => 'forty', '50' => 'fifty',
'60' => 'sixty', '70' => 'seventy',
'80' => 'eighty', '90' => 'ninety');
$digits = array('', 'hundred', 'thousand', 'lakh', 'crore');
while ($i < $digits_1) {
$divider = ($i == 2) ? 10 : 100;
$number = floor($no % $divider);
$no = floor($no / $divider);
$i += ($divider == 10) ? 1 : 2;
if ($number) {
$plural = (($counter = count($str)) && $number > 9) ? 's' : null;
$hundred = ($counter == 1 && $str[0]) ? ' and ' : null;
$str [] = ($number < 21) ? $words[$number] .
" " . $digits[$counter] . $plural . " " . $hundred
:
$words[floor($number / 10) * 10]
. " " . $words[$number % 10] . " "
. $digits[$counter] . $plural . " " . $hundred;
} else $str[] = null;
}
$str = array_reverse($str);
$result = implode('', $str);
if ($digit1 == "0" && $digit2 == "0" && $digit3 == "0")
$points = ($point) ?
" " . $words[$point / 10] . " " .
$words[$point = $point % 10] : '';
{
if(($point=='' || $point=='00' || $point=='0') && $points==''){
$amountInWords = "Rupee " . $result." Only";
}
else{
return "";
$amountInWords = "Rupee " . $result ." Paise ". $points." Only";
}
}
return $amountInWords;
}
public function convertNumberSymbol($amt,$symbol,$name,$paise){
if ($digit1 != "0")
{
$buffer .= $this->convertDigit($digit1) . " hundred";
if ($digit2 != "0" || $digit3 != "0")
{
$buffer .= " and ";
}
}
if ($digit2 != "0")
{
$buffer .= $this->convertTwoDigit($digit2, $digit3);
}
else if ($digit3 != "0")
{
$buffer .= $this->convertDigit($digit3);
}
return $buffer;
$totalAmt=explode(".",$amt);
$number = $totalAmt[0];
$no = $number;
if(!empty($totalAmt[1])){
$point = $totalAmt[1];
}
else{
$point=0;
}
public function convertTwoDigit($digit1, $digit2)
{
if ($digit2 == "0")
{
switch ($digit1)
{
case "1":
return "ten";
case "2":
return "twenty";
case "3":
return "thirty";
case "4":
return "forty";
case "5":
return "fifty";
case "6":
return "sixty";
case "7":
return "seventy";
case "8":
return "eighty";
case "9":
return "ninety";
}
} else if ($digit1 == "1")
{
switch ($digit2)
{
case "1":
return "eleven";
case "2":
return "twelve";
case "3":
return "thirteen";
case "4":
return "fourteen";
case "5":
return "fifteen";
case "6":
return "sixteen";
case "7":
return "seventeen";
case "8":
return "eighteen";
case "9":
return "nineteen";
}
} else
{
$temp = $this->convertDigit($digit2);
switch ($digit1)
{
case "2":
return "twenty-$temp";
case "3":
return "thirty-$temp";
case "4":
return "forty-$temp";
case "5":
return "fifty-$temp";
case "6":
return "sixty-$temp";
case "7":
return "seventy-$temp";
case "8":
return "eighty-$temp";
case "9":
return "ninety-$temp";
}
}
$hundred = null;
$digits_1 = strlen($no);
$i = 0;
$str = array();
$words = array('0' => '', '1' => 'one', '2' => 'two',
'3' => 'three', '4' => 'four', '5' => 'five', '6' => 'six',
'7' => 'seven', '8' => 'eight', '9' => 'nine',
'10' => 'ten', '11' => 'eleven', '12' => 'twelve',
'13' => 'thirteen', '14' => 'fourteen',
'15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
'18' => 'eighteen', '19' =>'nineteen', '20' => 'twenty',
'30' => 'thirty', '40' => 'forty', '50' => 'fifty',
'60' => 'sixty', '70' => 'seventy',
'80' => 'eighty', '90' => 'ninety');
$digits = array('', 'hundred', 'thousand', 'lakh', 'crore');
while ($i < $digits_1) {
$divider = ($i == 2) ? 10 : 100;
$number = floor($no % $divider);
$no = floor($no / $divider);
$i += ($divider == 10) ? 1 : 2;
if ($number) {
$plural = (($counter = count($str)) && $number > 9) ? 's' : null;
$hundred = ($counter == 1 && $str[0]) ? ' and ' : null;
$str [] = ($number < 21) ? $words[$number] .
" " . $digits[$counter] . $plural . " " . $hundred
:
$words[floor($number / 10) * 10]
. " " . $words[$number % 10] . " "
. $digits[$counter] . $plural . " " . $hundred;
} else $str[] = null;
}
$str = array_reverse($str);
$result = implode('', $str);
$points = ($point) ?
" " . $words[$point / 10] . " " .
$words[$point = $point % 10] : '';
if(($point=='' || $point=='00' || $point=='0') && $points==''){
$amountInWords = $name." " . $result." Only";
}
public function convertDigit($digit)
{
switch ($digit)
{
case "0":
return "zero";
case "1":
return "one";
case "2":
return "two";
case "3":
return "three";
case "4":
return "four";
case "5":
return "five";
case "6":
return "six";
case "7":
return "seven";
case "8":
return "eight";
case "9":
return "nine";
}
else{
$amountInWords = $name." " . $result.$paise ." ". $points." Only";
}
return $amountInWords;
}

View File

@ -609,7 +609,7 @@ function purchaseorderListing($forwhat='')
$subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,LineItem.ServiceMaterialDescription,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Mat.HSNCODE,
LineItem.Quantity,LineItem.Rate,(LineItem.Quantity *LineItem.Rate) as BasicValue ,(After_CGST + After_SGST + After_IGST) as Taxamount
,TotalValue,CGST,SGST,IGST,After_CGST,After_SGST,After_IGST,otherallowance,LineItem.CostCenterCode,sup.SupplierName,sup.Address,POMaster.DeliveryAddress,POMaster.DeliveryDate,POMaster.Status,POMaster.PODate,POMaster.PONO,POMaster.ServiceDescription,POMaster.PaymentOtherDescription,ReqMat.NumberOfService,ReqMat.Service_Period,ReqMat.Schedule_Type,Payment.PaymentID,Payment.PaymentTerms,AdvanceAmount FROM
,TotalValue,CGST,SGST,IGST,After_CGST,After_SGST,After_IGST,otherallowance,LineItem.CostCenterCode,sup.SupplierName,sup.Address,POMaster.DeliveryAddress,POMaster.DeliveryDate,POMaster.Status,POMaster.PODate,POMaster.PONO,POMaster.ServiceDescription,POMaster.PaymentOtherDescription,POMaster.DeliveryOption,POMaster.DeliverySchedule,ReqMat.NumberOfService,ReqMat.Service_Period,ReqMat.Schedule_Type,Payment.PaymentID,Payment.PaymentTerms,AdvanceAmount FROM
T_PurchaseOrder_LineItem LineItem
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo

View File

@ -1295,7 +1295,7 @@ $(document).ready(function () {
<label>Service Description</label> <?php
$data = array('name' => 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction',$ServiceDescription),'id'=>'EdittxtSpcialInstruction', 'class' => 'form-control');
echo form_input($data);
?> <input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="<?php echo $ServiceDescription;?>">
?> <input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
</div>
</div>

View File

@ -4836,7 +4836,7 @@ function populateValueMainFormForDeleteItem(rowid)
<div class="col-md-12">
<label>Special Instructions </label>
<?php
$data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction', 'class' => 'form-control');
$data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction', 'class' => 'form-control','rows' => '8');
echo form_textarea($data);
?>
</div>
@ -4919,7 +4919,7 @@ function populateValueMainFormForDeleteItem(rowid)
<div class="col-md-12">
<div class="col-md-12">
<label>Scope Of Work</label> <?php
$data = array('name' => 'ScopeOfWork','value' => set_value('ScopeOfWork'),'id'=>'ScopeOfWork', 'class' => 'form-control num');
$data = array('name' => 'ScopeOfWork','value' => set_value('ScopeOfWork'),'id'=>'ScopeOfWork', 'class' => 'form-control','rows' => '8');
echo form_textarea($data); ?>
</div>
</div>

View File

@ -271,7 +271,7 @@
<table style="border-collapse: collapse;" cellpadding="0" cellspacing="0" border="1" width="100%">
<tbody>
<tr>
<td style="text-align: center;" ><strong>Total Amount In Words</strong><br /><br /><em><?php echo $TotalAmountInWords." "."Only.";?></em></td>
<td style="text-align: center;" ><strong>Total Amount In Words</strong><br /><br /><em><?php echo $TotalAmountInWords.".";?></em></td>
<td style="text-align: center;" ><?php if($currencyName!='INR'){ ?>
Total Order Amount in <?php echo "$currencyName"."("."$currencyCode".")" ?><?php } else { ?><b>Total Order Amount in <?php echo "$currencyName"; ?><?php } ?> </b> <br/><?php if($currencyName!='INR'){ ?><?php echo number_format($OrderValue,2); } else {?> <?php echo number_format($OrderValue,2, '.', '');}?></td>

View File

@ -177,12 +177,8 @@ if(!empty($RequistionDetails))
padding-bottom: 0px;
}
.content {
Padding:0% ! important;
}
body {
background-color: #ecf0f5;
.num {
text-align:right;
}
.pagination {
margin :0px ! important;
@ -211,14 +207,10 @@ body {
<script>
$(document).ready(function(){
// tinymce.init({
// selector: "textarea#txtSpcialInstruction",
// menubar: false,
// statusbar: false,
// toolbar: false
// });
$("#PaymentTerms").select2();
$("#currencytype").select2();
var POMaxDate = '<?php echo $MaxPoDate;?>';
var d = new Date(POMaxDate);
@ -266,7 +258,7 @@ body {
<!-- <section class="content"> -->
<div style="border:2px solid #333">
<div style="border:2px solid #333;">
<div class="col-md-12">
<div class="col-md-11">
<center><b><h2>Siddharth Industries - Amend Import Purchase Order-<?php echo "$PONO"?></h2></b></center>
@ -443,7 +435,7 @@ body {
<div class="col-md-4">
<div class="col-md-12">
<b><u>Select Delivery By</u></b><br/>
<b><u>Select Delivery By</u>
<tr>
<td>
<!-- <?php echo form_label('Date', 'Date') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td> -->
@ -457,7 +449,7 @@ body {
</tr>
</div>
<div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
<div class="col-md-12" id="Schedulediv" style="display:none;">
<!-- <label >Schedule </label>
<?php
@ -465,7 +457,7 @@ body {
echo Form_textarea($data);
?> -->
<label >Schedule </label>
<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');
@ -473,7 +465,7 @@ body {
?>
</div>
<div class="col-md-12" id="Deliverydtdiv"><br/>
<div class="col-md-12" id="Deliverydtdiv">
<!-- <label>Delivery Date</label>
<?php
@ -509,7 +501,7 @@ body {
<label>Exchange Rate On</label>
<div class="form-group">
<?php
$data = array('name' => 'Exchangerateon','value' => set_value('Exchangerateon',$CurrentDate),'id'=>'Exchangerateon', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
$data = array('name' => 'Exchangerateon','value' => set_value('Exchangerateon',$CurrentDate),'id'=>'Exchangerateon', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
echo form_input($data);
?>
</div>
@ -520,7 +512,7 @@ body {
<p id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)"?></p>
<div class="form-group">
<?php
$data = array('name' => 'ExchangeRate','value' => set_value('ExchangeRate',$ExchangeRate),'id'=>'ExchangeRate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'USRate()');
$data = array('name' => 'ExchangeRate','value' => set_value('ExchangeRate',$ExchangeRate),'id'=>'ExchangeRate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'USRate()');
echo form_input($data);
?>
</div>
@ -558,32 +550,59 @@ body {
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-12">
<legend>Payment Details</legend>
<!-- Text input-->
<div class="col-md-3">
<span for="payablefrom">Payable Terms</span>
<select class="form-control required" id="PaymentTerms" name="PaymentTerms">
<option value="<?php echo $Terms;?>"><?php echo $Terms;?></option>
<!-- <option value=<?php echo $Deatail?> > Payment method</option> -->
<?php
<div class="col-md-4">
<label for="payablefrom">Payable Terms</label>
<input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms;?>">
<?php
if(!empty($Payment))
{
foreach ($Payment as $pay2)
if($Terms==$pay2->PaymentID){
//echo "$Terms";
//echo "$pay2->PaymentTerms";
?>
<input type="hidden" name="beforePaymentTermsText" value="<?php echo $pay2->PaymentTerms?>">
<?php
$optionsPay[$pay2->PaymentID] = $pay2->PaymentTerms;
}
foreach ($Payment as $pay1):
if($Terms!=$pay1->PaymentID){
$optionsPay[$pay1->PaymentID] = $pay1->PaymentTerms;
}
endforeach;
} 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;">
<label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
;">*</span></label>
<div class="form-group">
<?php
?>
</select>
</div>
$data = array('name' => 'Otherpayment','Otherpayment' => set_value('Otherpayment'),'id'=>'Otherpayment', 'class' => 'form-control' ,'required' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
</div>
<div class="col-md-6">
</div>
</div>
</div>
@ -607,9 +626,9 @@ body {
<div class="modal-dialog">
<!-- Modal content-->
<form>
<div class="modal-content" style="width:900px;">
<div class="modal-content" style="width:950px; font-size: 12px;" >
<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4>Edit Import Purchase Order Item </h4></center>
</div>
<div align="left">
@ -655,7 +674,7 @@ body {
// $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt',),'id'=>'EditAvlBudAmt', 'class' => 'form-control' ,'readonly' => 'true');
// echo form_input($data);
$data = array('name' => 'EditAvlBud','value' => set_value('EditAvlBud'),'id'=>'EditAvlBud', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EditAvlBud','value' => set_value('EditAvlBud'),'id'=>'EditAvlBud', 'class' => 'form-control num' ,'readonly' => 'true');
// $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt','dsfd'),'id'=>'EditAvlBudAmt', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
@ -705,7 +724,7 @@ body {
<label>Quantity</label>
<div class="form-group">
<?php
$data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange(),ExceedEditQuantityCheck()');
$data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange(),ExceedEditQuantityCheck()');
echo form_input($data);
?>
@ -714,22 +733,23 @@ body {
<div class="col-md-2">
<!-- <label>Rate </label> -->
<P id=labelEditRate> <label><?php echo "Rate in $Currencycode ($Value)";?>
<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' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
$data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
echo form_input($data);
?>
</div>
</div>
<div class="col-md-2">
<!-- <label><?php echo "Basic Value In";?></label>-->
<p id="label3"><label><?php echo "Basic Value In $Currencycode ($Value)";?></label></p>
<label id="label3"><?php echo "Basic Value In $Currencycode ($Value)";?></label>
<div class="form-group">
<?php
//$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EdittxtBasicValue','value' => set_value('EdittxtBasicValue'),'id'=>'EdittxtBasicValue', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EdittxtBasicValue','value' => set_value('EdittxtBasicValue'),'id'=>'EdittxtBasicValue', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
@ -746,7 +766,7 @@ body {
<div class="form-group">
<?php
$data = array('name' => 'EditimBasicPrice','value' => set_value('EditimBasicPrice'),'id'=>'EditimBasicPrice', 'class' => 'form-control' ,'placeholder '=>'basic price','onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
$data = array('name' => 'EditimBasicPrice','value' => set_value('EditimBasicPrice'),'id'=>'EditimBasicPrice', 'class' => 'form-control num' ,'placeholder '=>'basic price','onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
echo form_input($data);
?>
</div>
@ -754,12 +774,12 @@ body {
<div class="col-md-3">
Exchange Rate :
<label>Exchange Rate :</label>
<div class="form-group">
<?php
$data = array('name' => 'EditExchangeRt','value' => set_value('EditExchangeRt'),'id'=>'EditExchangeRt', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
$data = array('name' => 'EditExchangeRt','value' => set_value('EditExchangeRt'),'id'=>'EditExchangeRt', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
echo form_input($data);
?>
</div>
@ -770,11 +790,11 @@ body {
<!-- Basic value in INR : -->
<p id="labelEditBasicINR"><label><?php echo "Basic value in INR :";?></label></p>
<label id="labelEditBasicINR"><?php echo "Basic value in INR :";?></label>
<div class="form-group">
<?php
$data = array('name' => 'EditINRBasicvalue','value' => set_value('EditINRBasicvalue'),'id'=>'EditINRBasicvalue', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EditINRBasicvalue','value' => set_value('EditINRBasicvalue'),'id'=>'EditINRBasicvalue', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
@ -794,7 +814,7 @@ body {
<div class="col-md-4">
<div class="form-group" style="display:none;">
<?php
$data = array('name' => 'EditBasicPriceTax','value' => set_value('EditBasicPriceTax'),'id'=>'EditBasicPriceTax', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
$data = array('name' => 'EditBasicPriceTax','value' => set_value('EditBasicPriceTax'),'id'=>'EditBasicPriceTax', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
</div>
@ -802,7 +822,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterBasicPriceTax','value' => set_value('EditAfterBasicPriceTax'),'id'=>'EditAfterBasicPriceTax', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EditAfterBasicPriceTax','value' => set_value('EditAfterBasicPriceTax'),'id'=>'EditAfterBasicPriceTax', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
@ -816,7 +836,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditLandingCharge','value' => set_value('EditLandingCharge'),'id'=>'EditLandingCharge', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateloadingcharge()');
$data = array('name' => 'EditLandingCharge','value' => set_value('EditLandingCharge'),'id'=>'EditLandingCharge', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateloadingcharge()');
echo form_input($data);
@ -827,7 +847,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterLandingCharge','value' => set_value('EditAfterLandingCharge'),'id'=>'EditAfterLandingCharge', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EditAfterLandingCharge','value' => set_value('EditAfterLandingCharge'),'id'=>'EditAfterLandingCharge', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
@ -841,7 +861,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditHighseas ','value' => set_value('EditHighseas'),'id'=>'EditHighseas', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateHighseassalescharge()');
$data = array('name' => 'EditHighseas ','value' => set_value('EditHighseas'),'id'=>'EditHighseas', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateHighseassalescharge()');
echo form_input($data);
?>
</div>
@ -849,7 +869,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterHighseas','value' => set_value('EditAfterHighseas'),'id'=>'EditAfterHighseas', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EditAfterHighseas','value' => set_value('EditAfterHighseas'),'id'=>'EditAfterHighseas', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
@ -863,7 +883,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditCustomduty','value' => set_value('EditCustomduty'),'id'=>'EditCustomduty', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomduty()');
$data = array('name' => 'EditCustomduty','value' => set_value('EditCustomduty'),'id'=>'EditCustomduty', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomduty()');
echo form_input($data);
?>
</div>
@ -871,7 +891,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterCustomduty','value' => set_value('EditAfterCustomduty'),'id'=>'EditAfterCustomduty', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EditAfterCustomduty','value' => set_value('EditAfterCustomduty'),'id'=>'EditAfterCustomduty', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
@ -885,7 +905,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditExcisedutyTax','value' => set_value('EditExcisedutyTax'),'id'=>'EditExcisedutyTax', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateExciseDuty()');
$data = array('name' => 'EditExcisedutyTax','value' => set_value('EditExcisedutyTax'),'id'=>'EditExcisedutyTax', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateExciseDuty()');
echo form_input($data);
?>
</div>
@ -893,7 +913,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterExcisedutyTax','value' => set_value('EditAfterExcisedutyTax'),'id'=>'EditAfterExcisedutyTax', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EditAfterExcisedutyTax','value' => set_value('EditAfterExcisedutyTax'),'id'=>'EditAfterExcisedutyTax', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
@ -907,7 +927,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditExcisedutyEDcess','value' => set_value('EditExcisedutyEDcess'),'id'=>'EditExcisedutyEDcess', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateExciseED1()');
$data = array('name' => 'EditExcisedutyEDcess','value' => set_value('EditExcisedutyEDcess'),'id'=>'EditExcisedutyEDcess', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateExciseED1()');
echo form_input($data);
?>
</div>
@ -915,7 +935,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterExcisedutyEDcess','value' => set_value('EditAfterExcisedutyEDcess'),'id'=>'EditAfterExcisedutyEDcess', 'class' => 'form-control','readonly' => 'true');
$data = array('name' => 'EditAfterExcisedutyEDcess','value' => set_value('EditAfterExcisedutyEDcess'),'id'=>'EditAfterExcisedutyEDcess', 'class' => 'form-control num','readonly' => 'true');
echo form_input($data);
?>
</div>
@ -929,7 +949,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditExcisedutySHcess','value' => set_value('EditExcisedutySHcess'),'id'=>'EditExcisedutySHcess', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateexciseSHcess()');
$data = array('name' => 'EditExcisedutySHcess','value' => set_value('EditExcisedutySHcess'),'id'=>'EditExcisedutySHcess', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateexciseSHcess()');
echo form_input($data);
?>
</div>
@ -937,7 +957,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterExcisedutySHcess','value' => set_value('EditAfterExcisedutySHcess'),'id'=>'EditAfterExcisedutySHcess', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EditAfterExcisedutySHcess','value' => set_value('EditAfterExcisedutySHcess'),'id'=>'EditAfterExcisedutySHcess', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
@ -951,7 +971,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditCustomEDcess','value' => set_value('EditCustomEDcess'),'id'=>'EditCustomEDcess', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomEdcess()');
$data = array('name' => 'EditCustomEDcess','value' => set_value('EditCustomEDcess'),'id'=>'EditCustomEDcess', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomEdcess()');
echo form_input($data);
?>
</div>
@ -959,7 +979,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterCustomEDcess','value' => set_value('EditAfterCustomEDcess'),'id'=>'EditAfterCustomEDcess', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EditAfterCustomEDcess','value' => set_value('EditAfterCustomEDcess'),'id'=>'EditAfterCustomEDcess', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
@ -973,7 +993,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditCustomSHcess','value' => set_value('EditCustomSHcess'),'id'=>'EditCustomSHcess', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomSHcess()');
$data = array('name' => 'EditCustomSHcess','value' => set_value('EditCustomSHcess'),'id'=>'EditCustomSHcess', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomSHcess()');
echo form_input($data);
?>
</div>
@ -981,7 +1001,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterCustomSHcess','value' => set_value('EditAfterCustomSHcess'),'id'=>'EditAfterCustomSHcess', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EditAfterCustomSHcess','value' => set_value('EditAfterCustomSHcess'),'id'=>'EditAfterCustomSHcess', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
@ -997,7 +1017,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditAdditionalExciseduty ','value' => set_value('EditAdditionalExciseduty'),'id'=>'EditAdditionalExciseduty', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
$data = array('name' => 'EditAdditionalExciseduty ','value' => set_value('EditAdditionalExciseduty'),'id'=>'EditAdditionalExciseduty', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
echo form_input($data);
?>
</div>
@ -1005,7 +1025,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterAdditionalExciseduty','value' => set_value('EditAfterAdditionalExciseduty'),'id'=>'EditAfterAdditionalExciseduty', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EditAfterAdditionalExciseduty','value' => set_value('EditAfterAdditionalExciseduty'),'id'=>'EditAfterAdditionalExciseduty', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
@ -1019,7 +1039,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditGrossdutypayable ','value' => set_value('EditGrossdutypayable'),'id'=>'EditGrossdutypayable', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
$data = array('name' => 'EditGrossdutypayable ','value' => set_value('EditGrossdutypayable'),'id'=>'EditGrossdutypayable', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
</div>
@ -1033,7 +1053,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditAvailableModvat','value' => set_value('EditAvailableModvat'),'id'=>'EditAvailableModvat', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EditAvailableModvat','value' => set_value('EditAvailableModvat'),'id'=>'EditAvailableModvat', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?> (b + c + d + g)
</div>
@ -1049,7 +1069,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditGrossexpenses','value' => set_value('EditGrossexpenses'),'id'=>'EditGrossexpenses', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
$data = array('name' => 'EditGrossexpenses','value' => set_value('EditGrossexpenses'),'id'=>'EditGrossexpenses', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
</div>
@ -1067,7 +1087,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'Editpurchaserate','value' => set_value('Editpurchaserate'),'id'=>'Editpurchaserate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
$data = array('name' => 'Editpurchaserate','value' => set_value('Editpurchaserate'),'id'=>'Editpurchaserate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
echo form_input($data);
?>
</div>
@ -1076,7 +1096,7 @@ body {
<span>Quantity</span>
<div class="form-group">
<?php
$data = array('name' => 'EditPurQuantity','value' => set_value('EditPurQuantity'),'id'=>'EditPurQuantity', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCtable()');
$data = array('name' => 'EditPurQuantity','value' => set_value('EditPurQuantity'),'id'=>'EditPurQuantity', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCtable()');
echo form_input($data);
?>
</div>
@ -1092,7 +1112,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditCustomDutyExpenses ','value' => set_value('EditCustomDutyExpenses'),'id'=>'EditCustomDutyExpenses', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
$data = array('name' => 'EditCustomDutyExpenses ','value' => set_value('EditCustomDutyExpenses'),'id'=>'EditCustomDutyExpenses', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
echo form_input($data);
?>
</div>
@ -1107,7 +1127,7 @@ body {
<div class="col-md-4">
<div class="form-group">
<?php
$data = array('name' => 'EditRMCIncludingCustomers','value' => set_value('EditRMCIncludingCustomers'),'id'=>'EditRMCIncludingCustomers', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
$data = array('name' => 'EditRMCIncludingCustomers','value' => set_value('EditRMCIncludingCustomers'),'id'=>'EditRMCIncludingCustomers', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
echo form_input($data);
?>
</div>
@ -1118,7 +1138,7 @@ body {
<div class="col-md-4">
<div class="form-group" style="display:none;" >
<?php
$data = array('name' => 'EditTotalExp','value' => set_value('EditTotalExp'),'id'=>'EditTotalExp', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
$data = array('name' => 'EditTotalExp','value' => set_value('EditTotalExp'),'id'=>'EditTotalExp', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
echo form_input($data);
?>
</div>
@ -1665,20 +1685,25 @@ body {
</div>
</div>
<div class="col-md-12">
<div class="col-md-12">
<div class="col-md-4">
<span>Request On</span>
<?php
$data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
$data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-12">
<div class="col-md-4">
<span>Request By</span>
<?php
$data = array('name' => 'RequestBy','value' => set_value('RequestBy',$RequesterName),'id'=>'RequestBy', 'class' => 'form-control' ,'required' => 'true');
$data = array('name' => 'RequestBy','value' => set_value('RequestBy',$RequesterName),'id'=>'RequestBy', 'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-12">
<div class="col-md-4">
<span>Status</span>
<?php
@ -1688,7 +1713,10 @@ body {
$data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div><br/>
</div>
</div>
<br/>
<br>
</div>
@ -3277,7 +3305,7 @@ function Save(status)
$('#txtStatus').val(stat);
tinyMCE.triggerSave();
var splinstr = $('#txtSpcialInstruction').val();
var txtRowCount = $('#txtRowCount').val();
var txtDeletedRow = $('#txtDeletedRow').val();
@ -3353,6 +3381,22 @@ var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
} );
$("#PaymentTerms").change(function() {
if ($('#PaymentTerms').val().trim()=='PT08')
{
$('#otheroptiondiv').show();
}
else {
$('#otheroptiondiv').hide();
}
});
</script>

View File

@ -1,4 +1,3 @@
<?php $ReqType ='';
$CompanyAddress = '';
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
@ -1850,9 +1849,7 @@ SetVatorCST();
$('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$('#EditIgst').val(),$('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val()));
}
if ($("#EditDiscountType").val()!=0) {
calculateDiscount(1);
}
if ($("#EditPackagingType").val()!=0) {
calculatePackaging(1);
}
@ -2357,7 +2354,7 @@ function calculateEditTaxValue()
<label>Quantity</label>
<div class="form-group">
<?php
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()');
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change();');
echo form_input($data);
?>
</div>
@ -2366,7 +2363,7 @@ function calculateEditTaxValue()
<label><?php echo "Rate In ($INRSYM)";?></label>
<div class="form-group">
<?php
$data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()' );
$data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change();' );
echo form_input($data);
?>
</div>
@ -2430,7 +2427,7 @@ function calculateEditTaxValue()
<label>CGST In %</label>
<div class="form-group">
<?php
$data = array('name' => 'Cgst','value' => set_value('Cgst',0),'id'=>'Cgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change();');
$data = array('name' => 'Cgst','value' => set_value('Cgst',0),'id'=>'Cgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'change();');
echo form_input($data);
?>
</div>
@ -2493,7 +2490,7 @@ function calculateEditTaxValue()
<label>SGST In %</label>
<div class="form-group">
<?php
$data = array('name' => 'Sgst','value' => set_value('Sgst',0),'id'=>'Sgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()');
$data = array('name' => 'Sgst','value' => set_value('Sgst',0),'id'=>'Sgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change();');
echo form_input($data);
?>
</div>
@ -2513,7 +2510,7 @@ function calculateEditTaxValue()
<label>IGST In %</label>
<div class="form-group">
<?php
$data = array('name' => 'Igst','value' => set_value('Igst',0),'id'=>'Igst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()');
$data = array('name' => 'Igst','value' => set_value('Igst',0),'id'=>'Igst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'change();');
echo form_input($data);
?>
</div>
@ -2715,7 +2712,7 @@ function calculateEditTaxValue()
<label>Quantity</label>
<div class="form-group">
<?php
$data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange()','style'=>'text-align:right;');
$data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange();','style'=>'text-align:right;');
echo form_input($data);
?>
</div>
@ -2724,7 +2721,7 @@ function calculateEditTaxValue()
<label><?php echo "Rate In ($INRSYM)";?></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'=>'Editchange()','style'=>'text-align:right;' );
$data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange();','style'=>'text-align:right;' );
echo form_input($data);
?>
</div>
@ -4153,7 +4150,7 @@ function validateEditRevenueTax()
function calculateCgstTax(varBasicValue,Cgst,discount)
{
var discount = discount;
var basicValue = parseFloat(varBasicValue);
var basicValue = parseFloat(varBasicValue-discount);
var Cgst = parseFloat(Cgst);
var ServiceTaxValue = 0.0;
@ -4167,7 +4164,7 @@ function calculateCgstTax(varBasicValue,Cgst,discount)
function calculateSgstTax(varBasicValue,Sgst,discount)
{
var discount = discount;
var basicValue = parseFloat(varBasicValue);
var basicValue = parseFloat(varBasicValue-discount);
var Sgst = parseFloat(Sgst);
var ServiceTaxValue = 0.0;
@ -4181,7 +4178,7 @@ function calculateCgstTax(varBasicValue,Cgst,discount)
function calculateIgstTax(varBasicValue,Igst,discount)
{
var discount = discount;
var basicValue = parseFloat(varBasicValue);
var basicValue = parseFloat(varBasicValue-discount);
var Igst = parseFloat(Igst);
var ServiceTaxValue = 0.0;
@ -4512,7 +4509,7 @@ function change(){
if($("#Igst").val()!=''){
$('#AfterIgst').val(calculateIgstTax($('#txtBasicValue').val(),$('#Igst').val(),$('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val());
$('#AfterIgst').val(calculateIgstTax($('#txtBasicValue').val(),$('#Igst').val(),$('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val()));
}

View File

@ -3997,4 +3997,4 @@ $("#PaymentTerms").change(function() {
</script>

View File

@ -65,7 +65,15 @@
$dt = new DateTime($PO->PODate, new DateTimeZone('Asia/Kolkata'));
$Podt = $dt->format('d-m-Y');
$dtDe = new DateTime($PO->DeliveryDate, new DateTimeZone('Asia/Kolkata'));
if($PO->DeliveryOption=='1'){
$DeliveryDate = '';
$DeliverySchedule = $PO->DeliverySchedule;
}
else{
$dtDe = new DateTime($PO->DeliveryDate, new DateTimeZone('Asia/Kolkata'));
$DeliveryDate = $dtDe->format('d-m-Y');
$DeliverySchedule = '';
}
$ServiceDescription =$PO->ServiceDescription;
if($PO->PaymentID!='PT08'){
$PaymentTerms = $PO->PaymentTerms;