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

changes in emergency po

Browse Source
This commit is contained in:
vadivel J 2024-10-05 13:24:21 +05:30
parent 719f57ec51
commit f8585c2657
4 changed files with 367 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Views/EditservicePurchaseorder.php
View File

@ -1551,7 +1551,7 @@ if (!empty($getlogpodtl)) {
<!-- Model for servicepo --> <!-- Model for servicepo -->
<div id="SERVICE" class="modal fade" tabindex="-1" role="dialog" <div id="SERVICE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width" style="width: 1200px; !important"> <div class="modal-dialog modal-full-width" style="width: 1060px; !important">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Add Service Purchase Order Item</h4> <h4 class="modal-title">Add Service Purchase Order Item</h4>
@ -1829,7 +1829,7 @@ if (!empty($getlogpodtl)) {
<!-- Edit Service Modal content Starts Here--> <!-- Edit Service Modal content Starts Here-->
<div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog" <div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width"> <div class="modal-dialog modal-full-width" style="width: 1060px; !important">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Edit Service Purchase Order Item</h4> <h4 class="modal-title">Edit Service Purchase Order Item</h4>

55
app/Views/alterpurchaseorder.php
View File

@ -1860,16 +1860,40 @@ if (!empty($INRSYMBOL)) {
if (input == -1) { if (input == -1) {
alert("Select Request Type"); alert("Select Request Type");
$('#purpose').focus();
return false;
} else if ($('#drpSupplier').val() == "0") { } else if ($('#drpSupplier').val() == "0") {
alert('Please Select the Supplier details'); alert('Please Select the Supplier details');
$('#drpSupplier').focus(); $('#drpSupplier').focus();
return false; return false;
} else if ($('#PoTypeOptions').val() == "0") { } else if ($('#PoTypeOptions').val() == "0") {
alert('Please Select POType');
if($('#purpose').val()=="REVENUE"){
alert('Please Revenue Service Type Options');
$('#PoTypeOptions').focus(); $('#PoTypeOptions').focus();
return false; return false;
} else if ($('#BudgetType').val() == "0") { }else{
alert('Please Select Service Type Options');
$('#PoTypeOptions').focus();
return false;
}
} else if ($('#DepartmentName').val()=="0"){
alert('Please Select Department Name ')
return false;
}
else if ($('#CostCenterName').val()=="0"){
alert('Please Select Cost Center Name ')
}
else if ($('#BudgetType').val() == "0") {
alert('Please Select Budget Type'); alert('Please Select Budget Type');
$('#BudgetType').focus(); $('#BudgetType').focus();
return false; return false;
@ -1973,7 +1997,7 @@ if (!empty($INRSYMBOL)) {
// $("#selectdeliveryby").show(); // $("#selectdeliveryby").show();
$("#txtPoRange").show(); $("#txtPoRange").show();
$("#emergdescofpoDiv").hide(); $("#emergdescofpoDiv").hide();
$('#typeOptions').html('Revenue Type Options'); $('#typeOptions').html('Revenue Type Options <span class="badge mandatory">*</span>');
} else if (this.value == 'SERVICE') // Service po } else if (this.value == 'SERVICE') // Service po
{ {
$("#potaxes").show(); $("#potaxes").show();
@ -1988,7 +2012,7 @@ if (!empty($INRSYMBOL)) {
$('#EditDisplayScheduleDiv').show(); $('#EditDisplayScheduleDiv').show();
$("#txtPoRange").hide(); $("#txtPoRange").hide();
$("#emergdescofpoDiv").show(); $("#emergdescofpoDiv").show();
$('#typeOptions').html('Service Type Options'); $('#typeOptions').html('Service Type Options <span class="badge mandatory">*</span>');
} else if (this.value == 'IMPORT') // Import po } else if (this.value == 'IMPORT') // Import po
{ {
@ -1998,7 +2022,7 @@ if (!empty($INRSYMBOL)) {
$("#revenuepotaxes").hide(); $("#revenuepotaxes").hide();
$("#servicepotaxes").hide(); $("#servicepotaxes").hide();
$("#workstatus").hide(); $("#workstatus").hide();
$('#typeOptions').html('Import Type Options'); $('#typeOptions').html('Import Type Options <span class="badge mandatory">*</span>');
} else if (this.value == 'CAPITAL') // Capital po } else if (this.value == 'CAPITAL') // Capital po
{ {
$("#potaxes").show(); $("#potaxes").show();
@ -2007,7 +2031,7 @@ if (!empty($INRSYMBOL)) {
$("#revenuepotaxes").hide(); $("#revenuepotaxes").hide();
$("#servicepotaxes").hide(); $("#servicepotaxes").hide();
$("#workstatus").hide(); $("#workstatus").hide();
$('#typeOptions').html('Capital Type Options'); $('#typeOptions').html('Capital Type Options <span class="badge mandatory">*</span>');
} else // Default } else // Default
{ {
$("#potaxes").show(); $("#potaxes").show();
@ -2639,8 +2663,9 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label id="typeOptions">Service Type Options<span <label id="typeOptions">Service Type Options
class="badge mandatory">*</span></label> <span class="badge mandatory">*</span>
</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3047,6 +3072,7 @@ if (!empty($INRSYMBOL)) {
<div style="padding-right:10px"> <div style="padding-right:10px">
<!-- Model for revenue PO --> <!-- Model for revenue PO -->
<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-labelledby="myModalLabel"
aria-hidden="true"> aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
@ -3057,9 +3083,12 @@ 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">
<span aria-hidden="true">&times;</span>
</button>
</div> </div>
<div style="padding: 31px;"> <div align="left" style="padding: 31px;">
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
@ -3409,8 +3438,11 @@ if (!empty($INRSYMBOL)) {
</form> </form>
</div> </div>
</div> </div>
</div>
<!-- Model for service PO --> <!-- Model for service PO -->
<div align="center">
<div class="modal fade" id="SERVICE" role="dialog"> <div class="modal fade" id="SERVICE" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content--> <!-- Modal content-->
@ -3420,6 +3452,9 @@ 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">
<span aria-hidden="true">&times;</span>
</button>
</div> </div>
<div align="left" style="padding: 31px;"> <div align="left" style="padding: 31px;">
@ -3691,6 +3726,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div>
<!-- model for import PO --> <!-- model for import PO -->

23
app/Views/editimportpo.php
View File

@ -1820,7 +1820,7 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<label> <label>
<?php echo "Nett per UOM($INR)"; ?> <?php echo "Net per UOM($INR)"; ?>
</label> </label>
<div> <div>
<?php <?php
@ -2095,7 +2095,7 @@ if (!empty($getlogpodtl)) {
<br> <br>
<div class="form-row" style="border:1px solid black;"> <div class="form-row" style="border:1px solid black;">
<br /> <br/>
<div class="form-group col-md-6 p-2 mt-1" style="padding:0px;"> <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
@ -2237,6 +2237,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-group col-md-6 p-2 mt-1" style="padding:0px;"> <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
<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) -->
@ -2262,11 +2263,6 @@ if (!empty($getlogpodtl)) {
</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) -->
@ -2290,10 +2286,6 @@ if (!empty($getlogpodtl)) {
</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">
<!-- Gross duty payable --> <!-- Gross duty payable -->
@ -2312,11 +2304,10 @@ if (!empty($getlogpodtl)) {
<br> <br>
<!--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-4"> <div class="form-group col-md-4">
<span>Freight Type </span> <label>Freight Type </label>
<?php <?php
$options = array("0" => 'Select Freight Type'); $options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) { if (!empty($FreightType)) {
@ -2328,14 +2319,14 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
<div class="form-group col-md-4" id="EditTripsValue" style="display:block;"> <div class="form-group col-md-4" id="EditTripsValue" style="display:block;">
<span>NO Of Trips</span> <label>NO Of Trips</label>
<?php <?php
$data = array('name' => 'editNOOfTrips', 'value' => set_value('editNOOfTrips'), 'id' => 'editNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);'); $data = array('name' => 'editNOOfTrips', 'value' => set_value('editNOOfTrips'), 'id' => 'editNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<span>Freight Rate </span> <label>Freight Rate </label>
<?php <?php
$data = array('name' => 'edittxtFreight', 'value' => set_value('edittxtFreight'), 'id' => 'edittxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);'); $data = array('name' => 'edittxtFreight', 'value' => set_value('edittxtFreight'), 'id' => 'edittxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
echo form_input($data); echo form_input($data);
@ -2406,7 +2397,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label> <label><?php echo "Net per UOM($INR)"; ?></label>
<div> <div>
<?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');

4
app/Views/editrequisitionform.php
View File

@ -788,7 +788,7 @@ td {
var rowHtml = `<tr id="${temp}"> var rowHtml = `<tr id="${temp}">
<td align="center">${temp}</td> <td align="center">${temp}</td>
<td align="center">${materialCode}</td> <td align="center">${materialCode}</td>
<td align="center">${materialName}</td> <td align="left">${materialName}</td>
<td align="center">${uom}</td> <td align="center">${uom}</td>
<td align="center">${quantity}</td> <td align="center">${quantity}</td>
<td align="center">0.00</td> <td align="center">0.00</td>
@ -852,6 +852,8 @@ td {
$('#txtRowCount').val(temp); $('#txtRowCount').val(temp);
$('#add-req-modal').modal('hide');
} }
}); });