RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gas stock details changes-7 vadivel J 28-11-2024

Browse Source
This commit is contained in:
vadivelJ96 2024-11-29 16:56:25 +05:30
parent 369446b2c6
commit c858617245
6 changed files with 7027 additions and 6739 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controllers/Amendmentpurchaseorder.php
View File

@ -337,13 +337,10 @@ class Amendmentpurchaseorder extends BaseController
// die; // die;
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO); $LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO);
if(!empty($LastPO)){ if(!empty($LastPO)){
if (count($LastPO) > 0) { if (count($LastPO) > 0) {
$NewPO = $LastPO[0]['PONO']; $NewPO = $LastPO[0]['PONO'];
} }
}else{
$NewPO = "";
} }
if( $changeStatus == "ST026" || $changeStatus == "ST014"){ if( $changeStatus == "ST026" || $changeStatus == "ST014"){
@ -1026,6 +1023,7 @@ class Amendmentpurchaseorder extends BaseController
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO); $LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO);
$NewPO ='';
if (count($LastPO) > 0) { if (count($LastPO) > 0) {
$NewPO = $LastPO[0]['PONO']; $NewPO = $LastPO[0]['PONO'];
} }
@ -1418,8 +1416,8 @@ class Amendmentpurchaseorder extends BaseController
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null; $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
} }
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO); $LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO);
$NewPO = '';
$NewPO = '';
if (count($LastPO) > 0) { if (count($LastPO) > 0) {
$NewPO = $LastPO[0]['PONO']; $NewPO = $LastPO[0]['PONO'];
} }

325
app/Views/alterpurchaseorder.php
View File

@ -36,14 +36,12 @@ if (!empty($INRSYMBOL)) {
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
<style> <style>
/* Custom width for the modal */ /* Custom width for the modal */
.modal-dialog { .modal-dialog {
width: 100%; /* You can adjust this percentage to your needs */ width: 100%;
max-width: 1200px; /* Optional: This ensures the modal doesn't grow too large on large screens */ /* You can adjust this percentage to your needs */
max-width: 1200px;
/* Optional: This ensures the modal doesn't grow too large on large screens */
} }
/* Ensure content inside the modal scales properly */ /* Ensure content inside the modal scales properly */
@ -51,10 +49,12 @@ if (!empty($INRSYMBOL)) {
width: 100%; width: 100%;
} }
.modal { overflow: auto !important; } .modal {
overflow: auto !important;
}
.txtSpcialInstruction{ .txtSpcialInstruction {
background-color: #f4f9fb; background-color: #f4f9fb;
} }
@ -1593,9 +1593,9 @@ if (!empty($INRSYMBOL)) {
$('#cgstContainerView').attr("style", ""); $('#cgstContainerView').attr("style", "");
$('#sgstContainerView').attr("style", ""); $('#sgstContainerView').attr("style", "");
$('#igstContainerView').attr("style", "display:none"); $('#igstContainerView').attr("style", "display:none");
$('#CGSTAddModel').attr("style",""); $('#CGSTAddModel').attr("style", "");
$('#SGSTAddModel').attr("style",""); $('#SGSTAddModel').attr("style", "");
$('#IGSTAddModel').attr("style","display:none"); $('#IGSTAddModel').attr("style", "display:none");
$('#CST').attr("style", "display:none;"); $('#CST').attr("style", "display:none;");
$('#TotCST').attr("style", "display:none;"); $('#TotCST').attr("style", "display:none;");
@ -1608,11 +1608,11 @@ if (!empty($INRSYMBOL)) {
$('#SGSTEditModel').attr("style", "display:none"); $('#SGSTEditModel').attr("style", "display:none");
$('#IGSTEditModel').attr("style", ""); $('#IGSTEditModel').attr("style", "");
$('#cgstContainerView').attr("style", "display:none"); $('#cgstContainerView').attr("style", "display:none");
$('#sgstContainerView').attr("style","display:none"); $('#sgstContainerView').attr("style", "display:none");
$('#igstContainerView').attr("style",""); $('#igstContainerView').attr("style", "");
$('#CGSTAddModel').attr("style","display:none"); $('#CGSTAddModel').attr("style", "display:none");
$('#SGSTAddModel').attr("style","display:none"); $('#SGSTAddModel').attr("style", "display:none");
$('#IGSTAddModel').attr("style",""); $('#IGSTAddModel').attr("style", "");
$('#Vat').attr("style", "display:none;"); $('#Vat').attr("style", "display:none;");
$('#TotVat').attr("style", "display:none;"); $('#TotVat').attr("style", "display:none;");
@ -1620,7 +1620,7 @@ if (!empty($INRSYMBOL)) {
} }
} }
$(document).ready(function(){ $(document).ready(function () {
SetVatorCST() SetVatorCST()
}) })
@ -1896,13 +1896,13 @@ if (!empty($INRSYMBOL)) {
return false; return false;
} else if ($('#PoTypeOptions').val() == "0") { } else if ($('#PoTypeOptions').val() == "0") {
if($('#purpose').val()=="REVENUE"){ if ($('#purpose').val() == "REVENUE") {
alert('Please Select Revenue Type Options'); alert('Please Select Revenue Type Options');
$('#PoTypeOptions').focus(); $('#PoTypeOptions').focus();
return false; return false;
}else{ } else {
alert('Please Select Service Type Options'); alert('Please Select Service Type Options');
$('#PoTypeOptions').focus(); $('#PoTypeOptions').focus();
@ -1911,11 +1911,11 @@ if (!empty($INRSYMBOL)) {
} }
} else if ($('#DepartmentName').val()=="0"){ } else if ($('#DepartmentName').val() == "0") {
alert('Please Select Department Name ') alert('Please Select Department Name ')
return false; return false;
} }
else if ($('#CostCenterName').val()=="0"){ else if ($('#CostCenterName').val() == "0") {
alert('Please Select Cost Center Name ') alert('Please Select Cost Center Name ')
} }
@ -1936,7 +1936,7 @@ if (!empty($INRSYMBOL)) {
return false; return false;
} }
else if( $('#Otherpayment').length > 0 && $('#Otherpayment').is(':visible') && $('#Otherpayment').val() == ''){ else if ($('#Otherpayment').length > 0 && $('#Otherpayment').is(':visible') && $('#Otherpayment').val() == '') {
alert('Please Enter the Description of payable terms'); alert('Please Enter the Description of payable terms');
$('#Otherpayment').focus(); $('#Otherpayment').focus();
@ -2466,7 +2466,7 @@ if (!empty($INRSYMBOL)) {
<b><u>Select Tax Range<span class="badge mandatory">*</span></u></b><br /> <b><u>Select Tax Range<span class="badge mandatory">*</span></u></b><br />
<div class="centered"> <div class="centered">
<?php echo form_label('Local', 'Local') . "&nbsp;&nbsp;" . form_radio(array("name" => "Range", 'onchange' => 'SetVatorCST();', "id" => "Local", "value" => "0", 'checked' => set_radio('Range', '0', ))); ?> <?php echo form_label('Local', 'Local') . "&nbsp;&nbsp;" . form_radio(array("name" => "Range", 'onchange' => 'SetVatorCST();', "id" => "Local", "value" => "0", 'checked' => set_radio('Range', '0', ))); ?>
<?php echo form_label('Inter state', 'Inter state') . "&nbsp;&nbsp;" . form_radio(array("name" => "Range", 'onchange' => 'SetVatorCST();' , "id" => "Inter_state", "value" => "1")); ?> <?php echo form_label('Inter state', 'Inter state') . "&nbsp;&nbsp;" . form_radio(array("name" => "Range", 'onchange' => 'SetVatorCST();', "id" => "Inter_state", "value" => "1")); ?>
</div> </div>
</div> </div>
<div class="col-md-3" style='display:none;' id='workstatus'> <div class="col-md-3" style='display:none;' id='workstatus'>
@ -2651,12 +2651,18 @@ if (!empty($INRSYMBOL)) {
<div class="form-group"> <div class="form-group">
<?php <?php
$poDt=new DateTime('now', new DateTimeZone('Asia/Kolkata')); $poDt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$formattedDate = $poDt->format('Y-m-d'); $formattedDate = $poDt->format('Y-m-d');
$data = array('type' => 'date', 'name' => 'PODate', $data = array(
'value' => set_value('PODate',$formattedDate), 'min' => $formattedDate, 'type' => 'date',
'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'name' => 'PODate',
'onkeypress' => 'return false;'); 'value' => set_value('PODate', $formattedDate),
'min' => $formattedDate,
'id' => 'PODate',
'class' => 'form-control',
'required' => 'true',
'onkeypress' => 'return false;'
);
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -2818,7 +2824,8 @@ if (!empty($INRSYMBOL)) {
<table class="table table-bordered "> <table class="table table-bordered ">
<div class="box-body"> <div class="box-body">
<table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;"> <table id="serviceTax" class="table table-bordered table-hover"
style="background-color:#fff;">
<thead> <thead>
<tr> <tr>
<th>SNo</th> <th>SNo</th>
@ -2841,7 +2848,7 @@ if (!empty($INRSYMBOL)) {
</table> </table>
<div class="row px-3" id="potaxes" style="display:none;" > <div class="row px-3" id="potaxes" style="display:none;">
<div class="col-md-12 p-4"> <div class="col-md-12 p-4">
<div class="row"> <div class="row">
@ -2884,7 +2891,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
<div class="col-md-3" id="igstContainerView" > <div class="col-md-3" id="igstContainerView">
<label> IGST <?php echo "($INRSYM)" ?> </label> <label> IGST <?php echo "($INRSYM)" ?> </label>
<?php <?php
$data = array('name' => 'txtTotalIGST', 'value' => set_value('txtTotalIGST'), 'id' => 'txtTotalIGST', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'txtTotalIGST', 'value' => set_value('txtTotalIGST'), 'id' => 'txtTotalIGST', 'class' => 'form-control num', 'readonly' => 'true');
@ -2893,7 +2900,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<br/> <br />
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
@ -2926,7 +2933,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<br/> <br />
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@ -2938,7 +2945,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<br/> <br />
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@ -2974,7 +2981,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<br/> <br />
<div class="row" style="padding:0px;"><br /> <div class="row" style="padding:0px;"><br />
</div> </div>
@ -3114,8 +3121,8 @@ if (!empty($INRSYMBOL)) {
<!-- Model for revenue PO --> <!-- Model for revenue PO -->
<div align="center"> <div align="center">
<div id="REVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" <div id="REVENUE" class="modal fade" tabindex="-1" role="dialog"
aria-hidden="true"> aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content--> <!-- Modal content-->
<form> <form>
@ -3124,7 +3131,8 @@ if (!empty($INRSYMBOL)) {
<center> <center>
<h4>Select Revenue Purchase Order Line Item </h4> <h4>Select Revenue Purchase Order Line Item </h4>
</center> </center>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal"
aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>
@ -3133,7 +3141,8 @@ if (!empty($INRSYMBOL)) {
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<label>Item Code<span class="badge mandatory">*</span></label> <label>Item Code<span
class="badge mandatory">*</span></label>
<div> <div>
<?php <?php
$options = array("0" => 'Item Code'); $options = array("0" => 'Item Code');
@ -3161,7 +3170,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Quantity<span class="badge mandatory">*</span></label> <label>Quantity<span
class="badge mandatory">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?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()');
@ -3193,9 +3203,13 @@ if (!empty($INRSYMBOL)) {
<label><?php echo "Basic Amt ($INRSYM)"; ?></label> <label><?php echo "Basic Amt ($INRSYM)"; ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'txtBasicValue', $data = array(
'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue', 'name' => 'txtBasicValue',
'class' => 'form-control num', 'readonly' => 'true'); 'value' => set_value('txtBasicValue'),
'id' => 'txtBasicValue',
'class' => 'form-control num',
'readonly' => 'true'
);
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -3227,7 +3241,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Discount Rate<span class="badge mandatory"></span> <label>Discount Rate<span
class="badge mandatory"></span>
</label> </label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3297,7 +3312,8 @@ if (!empty($INRSYMBOL)) {
<div class="row"> <div class="row">
<div class="col-md-3"></div> <div class="col-md-3"></div>
<div class="col-md-3"> <div class="col-md-3">
<label>Freight Type <span class="badge mandatory"></label> <label>Freight Type <span
class="badge mandatory"></label>
<div> <div>
<?php <?php
$options = array("0" => 'Select Freight Type'); $options = array("0" => 'Select Freight Type');
@ -3318,7 +3334,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Freight Rate <span class="badge mandatory"></label> <label>Freight Rate <span
class="badge mandatory"></label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);change();'); $data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);change();');
@ -3394,7 +3411,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="row" id="IGSTAddModel" > <div class="row" id="IGSTAddModel">
<div class="col-md-6"></div> <div class="col-md-6"></div>
<div class="col-md-3"> <div class="col-md-3">
@ -3422,7 +3439,8 @@ if (!empty($INRSYMBOL)) {
<div class="col-md-9"> <div class="col-md-9">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label> <label> Insurance <?php echo "($INRSYM)" ?> (if
Any)</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance'), 'id' => 'txtInsurance', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);'); $data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance'), 'id' => 'txtInsurance', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);');
@ -3462,8 +3480,9 @@ if (!empty($INRSYMBOL)) {
<br> <br>
<div class="col-12 text-right"> <div class="col-12 text-right">
<a class="btn btn-secondary waves-effect" data-dismiss="modal" <a class="btn btn-secondary waves-effect"
value="Cancel">Cancel</a> &nbsp;&nbsp; data-dismiss="modal" value="Cancel">Cancel</a>
&nbsp;&nbsp;
<a class="btn btn-success font AddRevenue" ID="AddRevenue"> <a class="btn btn-success font AddRevenue" ID="AddRevenue">
&nbsp;&nbsp;<span class="bold">Add Revenue</span></a> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
@ -3497,7 +3516,8 @@ if (!empty($INRSYMBOL)) {
<center> <center>
<h4>Add Service Purchase Order Item </h4> <h4>Add Service Purchase Order Item </h4>
</center> </center>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal"
aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>
@ -3506,7 +3526,8 @@ if (!empty($INRSYMBOL)) {
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<label>Item Code<span class="badge mandatory">*</span></label> <label>Item Code<span
class="badge mandatory">*</span></label>
<div> <div>
<?php <?php
$options = array("0" => 'Item Code'); $options = array("0" => 'Item Code');
@ -3560,7 +3581,8 @@ if (!empty($INRSYMBOL)) {
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<label>Quantity<span class="badge mandatory">*</span></label> <label>Quantity<span
class="badge mandatory">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ServiceQuantity', 'value' => set_value('ServiceQuantity'), 'id' => 'ServiceQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()'); $data = array('name' => 'ServiceQuantity', 'value' => set_value('ServiceQuantity'), 'id' => 'ServiceQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
@ -3593,7 +3615,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<div class="row" > <div class="row">
<div class="col-md-3"> <div class="col-md-3">
</div> </div>
@ -3744,7 +3766,7 @@ if (!empty($INRSYMBOL)) {
</div> --> </div> -->
<div class="row"> <div class="row">
<div class="col-md-12" > <div class="col-md-12">
<label>Service Description<span <label>Service Description<span
class="badge mandatory">*</span></label> class="badge mandatory">*</span></label>
<?php <?php
@ -4203,7 +4225,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<center> <label>Cost of the product Per KG</label></center> <center> <label>Cost of the product Per KG</label>
</center>
<hr /> <hr />
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
@ -4268,8 +4291,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span <a class="btn btn-success font AddImport" ID="AddImport">
class="bold">Add Import</span></a> &nbsp;&nbsp;<span class="bold">Add Import</span></a>
</div> </div>
</div> </div>
</form> </form>
@ -4663,7 +4686,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<center> <label>Cost of the product Per KG</label></center> <center> <label>Cost of the product Per KG</label>
</center>
<hr /> <hr />
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
@ -4728,8 +4752,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span <a class="btn btn-success font AddImport" ID="AddImport">
class="bold">Add Capital</span></a> &nbsp;&nbsp;<span class="bold">Add Capital</span></a>
</div> </div>
</div> </div>
</form> </form>
@ -4757,12 +4781,10 @@ if (!empty($INRSYMBOL)) {
<div class="card"> <div class="card">
<div id="packagingcalmodel" class="modal fade" tabindex="-1" role="dialog" <div id="packagingcalmodel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false" style="display: none;">
style="display: none;"> <div class="modal-dialog " style="width: 720px;" >
<div class="modal-dialog modal-sm" style="width: 1060px;"> <div class="modal-content">
<div class="modal-content"
>
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Packing Calculation On <span id="WeightTitle"></span></h4> <h4 class="modal-title">Packing Calculation On <span id="WeightTitle"></span></h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
@ -4779,13 +4801,9 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary waves-effect" <button type="button" class="btn btn-secondary waves-effect" onclick="
onclick=" $('#packagingcalmodel').modal('hide');" value="Cancel">Cancel</button>
$('#packagingcalmodel').modal('hide');"
value="Cancel">Cancel</button>
<button type="button" class="btn btn-info waves-effect waves-light" <button type="button" class="btn btn-info waves-effect waves-light"
onclick="SetPackagingOption()">Save</button> onclick="SetPackagingOption()">Save</button>
</div> </div>
</div> </div>
@ -4794,8 +4812,7 @@ if (!empty($INRSYMBOL)) {
<!-- Modal for Packing Calculation --> <!-- Modal for Packing Calculation -->
<div id="submitmodel" class="modal fade" role="dialog" <div id="submitmodel" class="modal fade" role="dialog" aria-labelledby="myModalLabel">
aria-labelledby="myModalLabel">
<div class="modal-dialog" style="width:1060px;"> <div class="modal-dialog" style="width:1060px;">
<!-- Modal content--> <!-- Modal content-->
@ -4817,11 +4834,10 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary waves-effect" <button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal"
data-dismiss="modal" value="Cancel">Cancel</button> value="Cancel">Cancel</button>
<button type="button" class="btn btn-info waves-effect waves-light" <button type="button" class="btn btn-info waves-effect waves-light"
ID="PackagingOption" ID="PackagingOption" onclick="submitoption();dropdownselect();">Save</button>
onclick="submitoption();dropdownselect();">Save</button>
</div> </div>
</form> </form>
</div> </div>
@ -4833,10 +4849,11 @@ if (!empty($INRSYMBOL)) {
<div id="filemodel" class="modal fade " tabindex="-1" data-backdrop="true" role="dialog" aria-labelledby="myModalLabel"> <div id="filemodel" class="modal fade " tabindex="-1" data-backdrop="true" role="dialog"
aria-labelledby="myModalLabel">
<div class="modal-dialog modal-dialog-scrollable " style="width: 1060px;" role="document"> <div class="modal-dialog modal-dialog-scrollable " style="width: 1060px;" role="document">
<!-- Modal content--> <!-- Modal content-->
<div class="modal-content" > <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Add Bill Details</h4> <h4 class="modal-title">Add Bill Details</h4>
</div> </div>
@ -4844,7 +4861,9 @@ if (!empty($INRSYMBOL)) {
<form action=""> <form action="">
<div class="row"> <div class="row">
<div class="col-md-4 "><strong>Delivery Challan /Inv No</strong> <div class="col-md-4 "><strong>Delivery Challan /Inv No</strong>
<input type="text" name="ChallanInvNo" id="ChallanInvNo" maxlength="12" class="form-control" value="" required onkeypress="return isNumberKey(event)"> <input type="text" name="ChallanInvNo" id="ChallanInvNo" maxlength="12"
class="form-control" value="" required
onkeypress="return isNumberKey(event)">
</div> </div>
<div class="col-md-4 "><strong>Delivery Challan /Inv Date</strong> <div class="col-md-4 "><strong>Delivery Challan /Inv Date</strong>
<?php <?php
@ -4860,16 +4879,19 @@ if (!empty($INRSYMBOL)) {
<div class="row"> <div class="row">
<div class="col-md-4 mt-2 "><strong>Vehicle No</strong> <div class="col-md-4 mt-2 "><strong>Vehicle No</strong>
<input type="text" name="VehicleNo" id="VehicleNo" maxlength="13" class="form-control" value="" required> <input type="text" name="VehicleNo" id="VehicleNo" maxlength="13"
class="form-control" value="" required>
</div> </div>
<div class="col-md-4 mt-2 "><strong>Courier No</strong> <div class="col-md-4 mt-2 "><strong>Courier No</strong>
<input type="text" name="CourierNo" id="CourierNo" maxlength="12" class="form-control" value="" required> <input type="text" name="CourierNo" id="CourierNo" maxlength="12"
class="form-control" value="" required>
</div> </div>
<div class="col-md-4 mt-2" id="QualityChecked"><strong>Is Quality Check Required</strong> <div class="col-md-4 mt-2" id="QualityChecked"><strong>Is Quality Check
Required</strong>
<div class="radio m-2"> <div class="radio m-2">
<input type="radio" name="Quality" checked="checked" value='0' id="QualityChecktrue" <input type="radio" name="Quality" checked="checked" value='0'
style="cursor: default;"> id="QualityChecktrue" style="cursor: default;">
<label for="QualityChecktrue">Yes</label> <label for="QualityChecktrue">Yes</label>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<input type="radio" name="Quality" id="QualityCheckFalse" value='1' <input type="radio" name="Quality" id="QualityCheckFalse" value='1'
@ -4880,9 +4902,10 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="row" > <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<input type="button" class="btn btn-success" id="addmorebutton" value=" + ADD FILES.."> <input type="button" class="btn btn-success" id="addmorebutton"
value=" + ADD FILES..">
<div id="newdiv"></div><!-- this div for add more section--> <div id="newdiv"></div><!-- this div for add more section-->
</div> </div>
@ -4892,8 +4915,10 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="col-md-12 " align="right"> <div class="col-md-12 " align="right">
<a class="btn btn-secondary" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a> <a class="btn btn-secondary" data-dismiss="modal"
<a class="btn btn-info ok" ID="ExciseOption12" onclick="rfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a> onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
<a class="btn btn-info ok" ID="ExciseOption12"
onclick="rfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div> </div>
</div> </div>
</form> </form>
@ -4951,8 +4976,8 @@ if (!empty($INRSYMBOL)) {
<div class="col-md-12 text-right"> <div class="col-md-12 text-right">
<a class="btn btn-secondary waves-effect" data-dismiss="modal" <a class="btn btn-secondary waves-effect" data-dismiss="modal"
onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a> onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
<a class="btn btn-info ok" ID="ExciseOption12" <a class="btn btn-info ok" ID="ExciseOption12" onclick="sfilealert();">&nbsp;&nbsp;<span
onclick="sfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a> class="bold">Submit</span></a>
</div> </div>
</div> </div>
</div> </div>
@ -4970,7 +4995,7 @@ if (!empty($INRSYMBOL)) {
<div id="freightmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" <div id="freightmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false"> aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
<div class="modal-dialog modal-sm" style="width: 1060px;"> <div class="modal-dialog " style="width: 720px;">
<!-- Modal content--> <!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
@ -4993,12 +5018,9 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-secondary" data-dismiss="modal" <a class="btn btn-secondary" data-dismiss="modal" value="Cancel">Cancel</a>
value="Cancel">Cancel</a> <a class="btn btn-info" ID="freightOption" data-bs-target="#REVENUE" data-bs-toggle="modal"
<a class="btn btn-info" ID="freightOption" data-bs-dismiss="modal" onclick="setfreightOption();"><span class="bold">Ok</span></a>
data-bs-target="#REVENUE" data-bs-toggle="modal" data-bs-dismiss="modal"
onclick="setfreightOption();"
><span class="bold">Ok</span></a>
</div> </div>
</div> </div>
@ -5062,8 +5084,8 @@ if (!empty($INRSYMBOL)) {
<form> <form>
<div class="radio"> <div class="radio">
<label><input type="radio" name="optVat" checked="checked" value="0" <label><input type="radio" name="optVat" checked="checked" value="0" id="optVat">Basic
id="optVat">Basic Amount</label> Amount</label>
</div> </div>
<div class="radio"> <div class="radio">
<label><input type="radio" name="optVat" value="1" id="optVat">Excise <label><input type="radio" name="optVat" value="1" id="optVat">Excise
@ -5095,8 +5117,8 @@ if (!empty($INRSYMBOL)) {
<form> <form>
<div class="radio"> <div class="radio">
<label><input type="radio" name="optCST" checked="checked" value="0" <label><input type="radio" name="optCST" checked="checked" value="0" id="optCST">Basic
id="optCST">Basic Amount</label> Amount</label>
</div> </div>
<div class="radio"> <div class="radio">
<label><input type="radio" name="optCST" value="1" id="optCST">Excise <label><input type="radio" name="optCST" value="1" id="optCST">Excise
@ -5161,8 +5183,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="col-md-3" style="display:none;"> <div class="col-md-3" style="display:none;">
<label>Available Budget Amount</label><img id="AlertImg" <label>Available Budget Amount</label><img id="AlertImg"
src="<?php echo base_url(); ?>public/assets/dist/img/red.png" src="<?php echo base_url(); ?>public/assets/dist/img/red.png" alt="your image"
alt="your image" width="25px" style="display:none;" /> width="25px" style="display:none;" />
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt', 'class' => 'form-control num', 'readonly' => 'true');
@ -5305,7 +5327,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<div class="row" > <div class="row">
<div class="col-md-6" align="right"> <div class="col-md-6" align="right">
CGST In % CGST In %
@ -5741,7 +5763,7 @@ if (!empty($INRSYMBOL)) {
<div class="row" id="CGSTEditModel"> <div class="row" id="CGSTEditModel">
<div class="col-md-6"> <div class="col-md-6">
</div> </div>
<div class="col-md-3" > <div class="col-md-3">
<label>CGST in %</label> <label>CGST in %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -5857,8 +5879,7 @@ if (!empty($INRSYMBOL)) {
<!-- footer for revenue po --> <!-- footer for revenue po -->
<div class="modal-footer"> <div class="modal-footer">
<div class="col-md-12 text-right"> <div class="col-md-12 text-right">
<a class="btn btn-secondary waves-effect" data-dismiss="modal" <a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>
value="Cancel">Cancel</a>
<a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span <a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span
class="bold">Edit Revenue</span></a> class="bold">Edit Revenue</span></a>
</div> </div>
@ -5868,35 +5889,35 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- </section> --> <!-- </section> -->
<!-- <script type="text/html" id="RevenueList"> <!-- <script type="text/html" id="RevenueList">
<tr id="<%=index%>"> <tr id="<%=index%>">
<td align="left"><%=index%></td> <td align="left"><%=index%></td>
<td align="left"><%=ReqNo%></td> <td align="left"><%=ReqNo%></td>
@ -5916,7 +5937,7 @@ if (!empty($INRSYMBOL)) {
</td> </td>
</tr> </tr>
</script> --> </script> -->
<script> <script>
var index = '1'; var index = '1';
var userid = ''; var userid = '';
@ -6182,8 +6203,8 @@ if (!empty($INRSYMBOL)) {
} }
</script> </script>
<script> <script>
var SelectedMaterialCode = []; var SelectedMaterialCode = [];
var CollIndex = 0; var CollIndex = 0;
@ -7221,7 +7242,7 @@ if (!empty($INRSYMBOL)) {
success: function (data) { success: function (data) {
// Handle the server response // Handle the server response
$('#loader').hide(); $('#loader').hide();
if(data){ if (data) {
alert(data); alert(data);
} }
@ -8056,8 +8077,8 @@ if (!empty($INRSYMBOL)) {
} else { } } else { }
} }
</script> </script>
<script type="text/html" id="addList"> <script type="text/html" id="addList">
<tr id="<%=index%>"> <tr id="<%=index%>">
<td style="width: 15%;" align="left"><%=MaterialCode1%></td> <td style="width: 15%;" align="left"><%=MaterialCode1%></td>
<td style="width: 15%;" align="left"><%=DeliveryChallanDate%></td> <td style="width: 15%;" align="left"><%=DeliveryChallanDate%></td>
@ -8069,8 +8090,8 @@ if (!empty($INRSYMBOL)) {
</tr> </tr>
</script> </script>
</script> </script>
<script type="text/html" id="addservice"> <script type="text/html" id="addservice">
<tr id="<%=index%>"> <tr id="<%=index%>">
<td style="width: 15%;" align="left"><%=MaterialCode%></td> <td style="width: 15%;" align="left"><%=MaterialCode%></td>
<td style="width: 15%;" align="left"><%=Description%></td> <td style="width: 15%;" align="left"><%=Description%></td>
@ -8078,7 +8099,7 @@ if (!empty($INRSYMBOL)) {
</tr> </tr>
</script> </script>
<script> <script>
//table append for file uploading //table append for file uploading
var index = '1'; var index = '1';
var specialrow = 0; var specialrow = 0;
@ -8269,11 +8290,11 @@ if (!empty($INRSYMBOL)) {
} }
</script> </script>
<!-- Multiple file Upload Script --> <!-- Multiple file Upload Script -->
<script> <script>
var counter = 0; var counter = 0;
var counterConstant = 0; var counterConstant = 0;
@ -8304,7 +8325,7 @@ if (!empty($INRSYMBOL)) {
'<div class="col-md-3" style="margin-top:1.0%; ">' + '<div class="col-md-3" style="margin-top:1.0%; ">' +
'<button style="margin-right:2px;" class="btn btn-success" type="button" onclick="addRow(' + counter + ')"id="addbtn1" ><i class="fa fa-plus-square"></i></button> '+ '<button style="margin-right:2px;" class="btn btn-success" type="button" onclick="addRow(' + counter + ')"id="addbtn1" ><i class="fa fa-plus-square"></i></button> ' +
'<button class="btn btn-danger remove remove_this" id="removebtn' + counter + '" onclick="removeRow(this.id)"><i class="fa fa-minus-square"></i> </button>' '<button class="btn btn-danger remove remove_this" id="removebtn' + counter + '" onclick="removeRow(this.id)"><i class="fa fa-minus-square"></i> </button>'
+ +
@ -8313,8 +8334,8 @@ if (!empty($INRSYMBOL)) {
'<div class="col-md-3" style="margin-top:1.8%; ">' + '<div class="col-md-3" style="margin-top:1.8%; ">' +
'<div class="col-md-3" > '+ '<div class="col-md-3" > ' +
'</div> '+ '</div> ' +
'</div><br>'; '</div><br>';
$('#newdiv').append(div); $('#newdiv').append(div);
@ -8383,14 +8404,14 @@ if (!empty($INRSYMBOL)) {
div.innerHTML = div.innerHTML =
'<div class="col-md-3">' + '<div class="col-md-3">' +
'<label><br></label>'+ '<label><br></label>' +
'<input type="file" name="browseFiles' + counterConstant + '" id="imag" onchange="Copyfilename(this.name); "><br>' + '<input type="file" name="browseFiles' + counterConstant + '" id="imag" onchange="Copyfilename(this.name); "><br>' +
'</div>' + '</div>' +
'<div class="col-md-3" style="margin-top:1.0%; ">' + '<div class="col-md-3" style="margin-top:1.0%; ">' +
'<button style="margin-right:2px;" class="btn btn-success" type="button" onclick="addRow(' + counter + ')"id="addbtn1" ><i class="fa fa-plus-square"></i></button> '+ '<button style="margin-right:2px;" class="btn btn-success" type="button" onclick="addRow(' + counter + ')"id="addbtn1" ><i class="fa fa-plus-square"></i></button> ' +
'<button class="btn btn-danger remove remove_this" id="removebtn' + counter + '" onclick="removeRow(this.id)"><i class="fa fa-minus-square"></i> </button>' '<button class="btn btn-danger remove remove_this" id="removebtn' + counter + '" onclick="removeRow(this.id)"><i class="fa fa-minus-square"></i> </button>'
+ +
@ -8399,8 +8420,8 @@ if (!empty($INRSYMBOL)) {
'<div class="col-md-3" style="margin-top:1.8%; ">' + '<div class="col-md-3" style="margin-top:1.8%; ">' +
'<div class="col-md-3" > '+ '<div class="col-md-3" > ' +
'</div> '+ '</div> ' +
'</div>'; '</div>';
$('#newdiv').append(div); $('#newdiv').append(div);
@ -8586,7 +8607,7 @@ if (!empty($INRSYMBOL)) {
//alert("count"+counterConstants); //alert("count"+counterConstants);
var div = document.createElement('div'); var div = document.createElement('div');
div.id = "divid" + counters; div.id = "divid" + counters;
div.className = "row p-2" ; div.className = "row p-2";
div.innerHTML = div.innerHTML =
'<div class="col-md-4">' + '<div class="col-md-4">' +
@ -8704,8 +8725,8 @@ if (!empty($INRSYMBOL)) {
$("#addemorebutton").show(); $("#addemorebutton").show();
} }
} }
</script> </script>
<script> <script>
$('#IsOpenOrder').change(function () { $('#IsOpenOrder').change(function () {
var input = document.getElementById('purpose').value; var input = document.getElementById('purpose').value;
// alert("IsOpenOrder"); // alert("IsOpenOrder");
@ -8749,18 +8770,18 @@ if (!empty($INRSYMBOL)) {
$this.addClass('select2'); $this.addClass('select2');
} }
}); });
</script> </script>
<script> <script>
$(document).ready(function() { $(document).ready(function () {
// When the second modal is about to be shown // When the second modal is about to be shown
$('#packagingcalmodel').on('show.bs.modal', function () { $('#packagingcalmodel').on('show.bs.modal', function () {
// Set a higher z-index for the second modal to appear on top // Set a higher z-index for the second modal to appear on top
$('#packagingcalmodel').css('z-index', 1060); // Set the z-index for the second modal $('#packagingcalmodel').css('z-index', 1060); // Set the z-index for the second modal
// Ensure the second modal backdrop appears above the first one // Ensure the second modal backdrop appears above the first one
setTimeout(function() { setTimeout(function () {
$('.modal-backdrop').last().css('z-index', 1055); $('.modal-backdrop').last().css('z-index', 1055);
}, 0); }, 0);
}); });
@ -8774,13 +8795,13 @@ if (!empty($INRSYMBOL)) {
</script> </script>
<script> <script>
$(document).ready(function() { $(document).ready(function () {
// When the second modal is about to be shown // When the second modal is about to be shown
$('#freightmodel').on('show.bs.modal', function () { $('#freightmodel').on('show.bs.modal', function () {
// Set a higher z-index for the second modal to appear on top // Set a higher z-index for the second modal to appear on top
$('#freightmodel').css('z-index', 1060); // Set the z-index for the second modal $('#freightmodel').css('z-index', 1060); // Set the z-index for the second modal
// Ensure the second modal backdrop appears above the first one // Ensure the second modal backdrop appears above the first one
setTimeout(function() { setTimeout(function () {
$('.modal-backdrop').last().css('z-index', 1055); $('.modal-backdrop').last().css('z-index', 1055);
}, 0); }, 0);
}); });

86
app/Views/editCapitalAmendPO.php
View File

@ -2050,13 +2050,15 @@ if (!empty($POItem) && $CapitalRange == '1') {
?> ?>
</div> </div>
</div> </div>
<div class="form-row" style="padding:1%;"></div> <div class="form-row" style="border:solid black 1px; padding:1%;">
<div class="form-row" style="padding:0px;" id="EditModalImportTaxHide" style="display:none;"> <div class="form-row" style="padding:1%;" id="EditModalImportTaxHide" style="display:none;">
<br />
<div class="form-group col-md-6" style="padding:0px;"> <br/>
<div class="form-group col-md-6" style="padding:15px;">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Basic Price In<?php echo "($INR)" ?> <label for="EditBasicPriceTax">Basic Price In<?php echo "($INR)" ?></label>
</div> </div>
<!--<div class="form-group col-md-4"> <!--<div class="form-group col-md-4">
<div > <div >
@ -2075,7 +2077,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Landing charge<?php echo "$INR" ?> <label for="EditLandingCharge">Landing charge<?php echo "$INR" ?></label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2092,7 +2095,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Assessable Value (A)<?php echo "$INR" ?> <label for="EditHighseas">Assessable Value (A)<?php echo "$INR" ?></label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<div style="display: none;"> <div style="display: none;">
@ -2111,7 +2114,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Custom duty (B) :<?php echo "$INR" ?> <label for="EditCustomduty"> Custom duty (B) :<?php echo "$INR" ?></label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2131,7 +2135,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Custom ED_cess : (C)<?php echo "($INR)" ?> <label for="EditCustomEDcess"> Custom ED_cess : (C)<?php echo "($INR)" ?></label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2148,7 +2153,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Custom S & H cess : (D)<?php echo "($INR)" ?> <label for="EditCustomSHcess"> Custom S & H cess : (D)<?php echo "($INR)" ?></label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2164,10 +2170,13 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-md-6" style="padding:0px;">
<div class="form-group col-md-6" style="padding:15px;">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Subtotal: (E)<?php echo "($INR)" ?> <label for="EditAdditionalExciseduty"> Subtotal: (E)<?php echo "($INR)" ?></label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<div style="display: none"> <div style="display: none">
@ -2185,16 +2194,14 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<!-- Additional Excise duty : (g) --> <!-- Additional Excise duty : (g) -->
<label for="EditIgstInt">
IGST on (E): (F) IGST on (E): (F)
<?php echo " ($INR)"; ?> <?php echo " ($INR)"; ?>
</label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2210,16 +2217,11 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"> <div class="form-group col-md-8">
<label for="EditGrossdutypayable">
Total Duty <?php echo "($INR)" ?> Total Duty <?php echo "($INR)" ?>
</label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2232,7 +2234,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
<!--Start of Adding of Frieght model--> <!--Start of Adding of Frieght model-->
<div class="form-row" style="padding:0px;"> <div class="form-row" style="padding:0px;">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<span>Freight Type </span> <label for="drpamendFreight">Freight Type</label>
<?php <?php
$options = array("0" => 'Select Freight Type'); $options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) { if (!empty($FreightType)) {
@ -2244,14 +2246,14 @@ if (!empty($POItem) && $CapitalRange == '1') {
?> ?>
</div> </div>
<div class="form-group col-md-3" id="AmendTripsValue" style="display:none;"> <div class="form-group col-md-3" id="AmendTripsValue" style="display:none;">
<span>NO Of Trips</span> <label for="AmendNOOfTrips">NO Of Trips</label>
<?php <?php
$data = array('name' => 'AmendNOOfTrips', 'value' => set_value('AmendNOOfTrips'), 'id' => 'AmendNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);'); $data = array('name' => 'AmendNOOfTrips', 'value' => set_value('AmendNOOfTrips'), 'id' => 'AmendNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<span>Freight Rate </span> <label for="AmendtxtFreight">Freight Rate</label>
<?php <?php
$data = array('name' => 'AmendtxtFreight', 'value' => set_value('AmendtxtFreight'), 'id' => 'AmendtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(3);'); $data = array('name' => 'AmendtxtFreight', 'value' => set_value('AmendtxtFreight'), 'id' => 'AmendtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(3);');
echo form_input($data); echo form_input($data);
@ -2259,7 +2261,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<div class="form-group col-md-3" style="padding-left: 0px;"> <div class="form-group col-md-3" style="padding-left: 0px;">
<span>Freight Amt <?php echo "($INR)" ?></span> <label for="AmendtxtAfterFreight"> Freight Amt </label>
<?php <?php
$data = array('name' => 'AmendtxtAfterFreight', 'value' => set_value('AmendtxtAfterFreight'), 'id' => 'AmendtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'AmendtxtAfterFreight', 'value' => set_value('AmendtxtAfterFreight'), 'id' => 'AmendtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -2269,13 +2271,16 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<!--End of Adding of freight in edit model --> <!--End of Adding of freight in edit model -->
<div class="form-row"> <br>
<center> <label>Cost of the product Per UOM</label></center> <center> <label>Cost of the product Per UOM</label></center>
<hr /> <hr />
</div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="EditDutyImpact">
Duty Impact Duty Impact
</label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2284,7 +2289,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
?> ?>
</div> </div>
<div class="form-group col-md-4" style="margin-top: -4.8%"> <div class="form-group col-md-4" style="margin-top: -4.8%">
<span>Quantity</span> <label for="EditPurQuantity">Quantity</label>
<?php <?php
$data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); $data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
echo form_input($data); echo form_input($data);
@ -2296,7 +2301,10 @@ if (!empty($POItem) && $CapitalRange == '1') {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="EditCustomDutyExpenses">
Custom Duty<?php echo "($INR)/UOM" ?> Custom Duty<?php echo "($INR)/UOM" ?>
</label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2309,7 +2317,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Clearing Charges <?php echo "($INR)" ?> <label for="EditClearingCharges"> Clearing Charges <?php echo "($INR)" ?></label>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<?php <?php
@ -2317,11 +2326,9 @@ if (!empty($POItem) && $CapitalRange == '1') {
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-4">
<!-- RMC Including Customers --> <div class="form-group col-md-4 " style="margin-top: -4.8%">
Nett per UOM<?php echo "($INR)"; ?> <label for="EditNett">Nett per UOM<?php echo "($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<?php <?php
$data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -2340,7 +2347,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
</div>
<br>
<div class="form-row" style="text-align: left;"> <div class="form-row" style="text-align: left;">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label>Capital Description </label> <label>Capital Description </label>
@ -2350,6 +2358,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a> <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>

810
app/Views/editCapitalPo.php
View File

File diff suppressed because it is too large Load Diff

2
app/Views/editImportAmendPO.php
View File

@ -123,7 +123,7 @@ if (!empty($POMaster)) {
$PONOStatus = $Req->StatusCode; $PONOStatus = $Req->StatusCode;
$PONO = $Req->PONO; $PONO = $Req->PONO;
$ServiceDescription = $Req->ServiceDescription; $ServiceDescription = $Req->ServiceDescription;
$ExchangeRate = number_format(($Req->ExchangeRate), 2); $ExchangeRate = number_format((float)($Req->ExchangeRate), 2);
$EDt = new DateTime($Req->ExchangeRateCalculatedon); $EDt = new DateTime($Req->ExchangeRateCalculatedon);
$ExchangeRateCalculatedon = $EDt->format('d-m-Y'); $ExchangeRateCalculatedon = $EDt->format('d-m-Y');

759
app/Views/editRevenuepurchaseorder.php
View File

File diff suppressed because it is too large Load Diff