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

fixing bugs in purchase order module - vadivel J

Browse Source
This commit is contained in:
vadivel J 2024-10-30 12:04:05 +05:30
parent ba3c123f61
commit fb9b4f6eb8
4 changed files with 56 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Views/EditservicePurchaseorder.php
View File

@ -1092,7 +1092,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="table-responsive" style="padding-bottom: 30px;"> <div class="table-responsive table-bordered" style="padding-bottom: 30px;">
<table id="ServiceTable" class="table table-striped table-hover mb-0" style="font-size:12px;"> <table id="ServiceTable" class="table table-striped table-hover mb-0" style="font-size:12px;">
<thead> <thead>
<tr> <tr>
@ -1106,9 +1106,6 @@ if (!empty($getlogpodtl)) {
<th style="text-align: right;">Basic Amount <?php echo "($INRSYM)" ?></th> <th style="text-align: right;">Basic Amount <?php echo "($INRSYM)" ?></th>
<th style="text-align: right;">Tax Amount <?php echo "($INRSYM)" ?></th> <th style="text-align: right;">Tax Amount <?php echo "($INRSYM)" ?></th>
<th style="text-align: right;">Total Order Amount <?php echo "($INRSYM)" ?></th> <th style="text-align: right;">Total Order Amount <?php echo "($INRSYM)" ?></th>
<!-- <th>Actual Quantity</th>
<th>Received Quantity</th>
<th>Pending Quantity</th> -->
<th>Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>

77
app/Views/alterpurchaseorder.php
View File

@ -59,6 +59,9 @@ if (!empty($INRSYMBOL)) {
} }
.text-right {
text-align: right !important;
}
@ -1870,7 +1873,7 @@ if (!empty($INRSYMBOL)) {
if($('#purpose').val()=="REVENUE"){ if($('#purpose').val()=="REVENUE"){
alert('Please Revenue Service Type Options'); alert('Please Select Revenue Type Options');
$('#PoTypeOptions').focus(); $('#PoTypeOptions').focus();
return false; return false;
@ -2799,10 +2802,10 @@ if (!empty($INRSYMBOL)) {
<th>Item Description</th> <th>Item Description</th>
<th>Quantity</th> <th>Quantity</th>
<th>UOM</th> <th>UOM</th>
<th>Rate<?php echo "($INRSYM)" ?></th> <th class="text-right">Rate<?php echo "($INRSYM)" ?></th>
<th>Basic Amount<?php echo "($INRSYM)" ?></th> <th class="text-right">Basic Amount<?php echo "($INRSYM)" ?></th>
<th>Tax Amount<?php echo "($INRSYM)" ?></th> <th class="text-right">Tax Amount<?php echo "($INRSYM)" ?></th>
<th>Total Order Amount<?php echo "($INRSYM)" ?></th> <th class="text-right">Total Order Amount<?php echo "($INRSYM)" ?></th>
<th>Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
@ -4881,32 +4884,20 @@ if (!empty($INRSYMBOL)) {
<div align="center">
<div id="servicemodel" class="modal fade" data-backdrop-limit="1" role="dialog" <div id="servicemodel" class="modal fade" data-backdrop-limit="1" role="dialog"
aria-labelledby="myModalLabel"> aria-labelledby="myModalLabel">
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content--> <!-- Modal content-->
<div class="modal-content" style="width:950px;"> <div class="modal-content" style="width:1060px;">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">SERVICE Bill Details</h4> <h4 class="modal-title">SERVICE Bill Details</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>
</div> </div>
<div class="modal-body" style="padding:0px;"> <div class="modal-body" style="padding:0px;">
<div class="col-md-12"> <div class="col-md-12" align="left">
<!-- <div class="col-md-4">
<input type = "file" size = "20" input accept=".docx,.pdx,.doc.JPG,.PNG,.jpg" id="images1" name="images1" onChange="sfilecheck();"/>
<label for="images">Select Company file<br/><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label>
</div>
</div> -->
<!-- <div class="col-md-10"> -->
<!-- <legend>Multiple File</legend> -->
<div class="col-md-offset-0 col-md-1"> <div class="col-md-offset-0 col-md-1">
<input type="button" class="btn btn-success" id="addemorebutton" <input type="button" class="btn btn-success" id="addemorebutton"
value=" + ADD FILES.."> value=" + ADD FILES..">
@ -4930,7 +4921,7 @@ 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-success ok" ID="ExciseOption12" <a class="btn btn-info ok" ID="ExciseOption12"
onclick="sfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a> onclick="sfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div> </div>
</div> </div>
@ -4939,6 +4930,9 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div>
@ -5992,12 +5986,12 @@ if (!empty($INRSYMBOL)) {
<td>${Reqnumber}</td> <td>${Reqnumber}</td>
<td>${materialCode}</td> <td>${materialCode}</td>
<td>${materialName}</td> <td>${materialName}</td>
<td>${quantity}</td> <td align="center">${quantity}</td>
<td>${uom}</td> <td>${uom}</td>
<td>${itemRate}</td> <td align="right">${itemRate}</td>
<td>${basicval}</td> <td align="right">${basicval}</td>
<td>${TotalTaxValue}</td> <td align="right">${TotalTaxValue}</td>
<td>${TotalOrderValue}</td> <td align="right">${TotalOrderValue}</td>
<td> <td>
<a data-target='#EDITREVENUE' data-id="${temp}" data-index="${index}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE"> <a data-target='#EDITREVENUE' data-id="${temp}" data-index="${index}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
<i class="ri-pencil-fill"></i> <i class="ri-pencil-fill"></i>
@ -6682,12 +6676,12 @@ if (!empty($INRSYMBOL)) {
<td>${Reqnumber}</td> <td>${Reqnumber}</td>
<td>${materialCode}</td> <td>${materialCode}</td>
<td>${materialName}</td> <td>${materialName}</td>
<td>${quantity}</td> <td align="center">${quantity}</td>
<td>${uom}</td> <td>${uom}</td>
<td>${itemRate}</td> <td align="right">${itemRate}</td>
<td>${basicval}</td> <td align="right">${basicval}</td>
<td>${TotalTaxValue}</td> <td align="right">${TotalTaxValue}</td>
<td>${TotalOrderValue}</td> <td align="right">${TotalOrderValue}</td>
<td> <td>
<a data-target='#EDITSERVICE' data-id="${temp}" data-index="${index}" data-userid="${temp}" data-toggle="modal" href="#EDITSERVICE"> <a data-target='#EDITSERVICE' data-id="${temp}" data-index="${index}" data-userid="${temp}" data-toggle="modal" href="#EDITSERVICE">
<i class="ri-pencil-fill"></i> <i class="ri-pencil-fill"></i>
@ -8506,7 +8500,7 @@ if (!empty($INRSYMBOL)) {
$("#addemorebutton").click(function () { $("#addemorebutton").click(function () {
//alert('sda');
if (counters > 4) { if (counters > 4) {
alert("You have to upload five files only"); //this allows only 5 files; alert("You have to upload five files only"); //this allows only 5 files;
@ -8518,16 +8512,15 @@ if (!empty($INRSYMBOL)) {
var div = document.createElement('div'); var div = document.createElement('div');
div.id = "divid" + counters; div.id = "divid" + counters;
div.className = "row"; div.className = "row p-2";
div.innerHTML = '<div class="col-md-12">' + div.innerHTML =
'<div class="col-md-4" >' + '<div class="col-md-4" >' +
'<label><br></label>' + '<label>Select Service Bill</label>' +
'<input type="file" id="images1" name="browseFiles' + counterConstants + '" onchange="Copyfilenames(this.name);"><br>' + '<input type="file" id="images1" name="browseFiles' + counterConstants + '" onchange="Copyfilenames(this.name);"><br>' +
'</div>' + '</div>' +
'<div class="col-md-1" >' + '<div class="col-md-1 " >' +
'<label><br><br></label>' + '<label><br><br></label>' +
'<button class="btn btn-success btn-sm" type="button" onclick="addRows(' + counters + ')"id="addbtns1" ><i class="fa fa-plus-square"></i></button></div>' + '<button class="btn btn-success btn-sm" type="button" onclick="addRows(' + counters + ')"id="addbtns1" ><i class="fa fa-plus-square"></i></button></div>' +
@ -8585,11 +8578,11 @@ 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"; div.className = "row p-2" ;
div.innerHTML = '<div class="col-md-12">' + div.innerHTML =
'<div class="col-md-6">' + '<div class="col-md-4">' +
'<label><br></label>' + '<label>Select Service Bill</label>' +
'<input type="file" name="browseFiles' + counterConstants + '" id="images1" onchange="Copyfilename(this.name); "><br>' + '<input type="file" name="browseFiles' + counterConstants + '" id="images1" onchange="Copyfilename(this.name); "><br>' +
'</div>' + '</div>' +

19
app/Views/editRevenueAmendPO.php
View File

@ -132,6 +132,13 @@ if (!empty($INRSYMBOL)) {
<style> <style>
.modal { overflow: auto !important; } .modal { overflow: auto !important; }
.text-right {
text-align: right !important;
}
.text-center {
text-align: center !important;
}
</style> </style>
<script src="<?php echo base_url() ?>public/assets/tinymce/js/tinymce/tinymce.min.js"></script> <script src="<?php echo base_url() ?>public/assets/tinymce/js/tinymce/tinymce.min.js"></script>
@ -1214,12 +1221,12 @@ if (!empty($INRSYMBOL)) {
<th>SNo</th> <th>SNo</th>
<th>Requisition No</th> <th>Requisition No</th>
<th>Item Name</th> <th>Item Name</th>
<th>Quantity</th> <th class="text-center">Quantity</th>
<th>UOM</th> <th>UOM</th>
<th>Rate<?php echo "($INRSYM)" ?></th> <th class="text-right">Rate<?php echo "($INRSYM)" ?></th>
<th>Basic Amount<?php echo "($INRSYM)" ?></th> <th class="text-right">Basic Amount<?php echo "($INRSYM)" ?></th>
<th>Tax Amount<?php echo "($INRSYM)" ?></th> <th class="text-right">Tax Amount<?php echo "($INRSYM)" ?></th>
<th>Total Order Amount<?php echo "($INRSYM)" ?></th> <th class="text-right">Total Order Amount<?php echo "($INRSYM)" ?></th>
<th>Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
@ -1237,7 +1244,7 @@ if (!empty($INRSYMBOL)) {
<td align="left"><?php echo $index; ?></td> <td align="left"><?php echo $index; ?></td>
<td><?php echo $record->ReqNo ?></td> <td><?php echo $record->ReqNo ?></td>
<td><?php echo $record->MaterialName ?></td> <td><?php echo $record->MaterialName ?></td>
<td align="right"><?php echo $record->Quantity ?></td> <td align="center"><?php echo $record->Quantity ?></td>
<td><?php echo $record->UOM ?></td> <td><?php echo $record->UOM ?></td>
<td align="right"><?php echo $record->Rate ?></td> <td align="right"><?php echo $record->Rate ?></td>

6
app/Views/porelease_view.php
View File

@ -185,7 +185,11 @@ if (empty($Status)) {
<?php if ($record->StatusCode == PO_APPROVER_ONHOLD or $record->StatusCode == PO_CREATED or $record->StatusCode == REQITEM_Emergency_PO_CREATED) { ?> <?php if ($record->StatusCode == PO_APPROVER_ONHOLD or $record->StatusCode == PO_CREATED or $record->StatusCode == REQITEM_Emergency_PO_CREATED) { ?>
<select name="selectId" id="selectId" onchange="showvalue('<?php echo $record->PONO ?>','<?php echo $index; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Remarks ?>');" style="width: 193px;"> <select
class="form-control"
name="selectId" id="selectId"
onchange="showvalue('<?php echo $record->PONO ?>','<?php echo $index; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Remarks ?>');"
style="width: 193px;">
<option value="-1">Select Action</option> <option value="-1">Select Action</option>
<!-- <option value="1">Release</option> --> <!-- <option value="1">Release</option> -->
<option value="1">Approve And Release</option> <option value="1">Approve And Release</option>