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

Merge branch 'CI4-Application' of bitbucket.org:venbainformationtechnology/ria into CI4-Application

Browse Source
This commit is contained in:
bitbucket 2024-08-05 11:30:54 +05:30
commit 65bc9a27b2
13 changed files with 472 additions and 556 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Views/EditservicePurchaseorder.php
View File

@ -36,6 +36,7 @@ $ServiceTypeOptions = '';
$DescriptionOfPo = ''; $DescriptionOfPo = '';
$BudgetType = ''; $BudgetType = '';
$PrePOFile = ''; $PrePOFile = '';
$parentPO= '';
if (!empty($INRSYMBOL)) { if (!empty($INRSYMBOL)) {
@ -53,6 +54,7 @@ if (!empty($MaxPODate)) {
if (!empty($POMaster)) { if (!empty($POMaster)) {
foreach ($POMaster as $Req) { foreach ($POMaster as $Req) {
$parentPO =$Req->ParentPO;
$SupId = $Req->SupplierID; $SupId = $Req->SupplierID;
$SupName = $Req->SupplierName; $SupName = $Req->SupplierName;
@ -728,9 +730,11 @@ if (!empty($getlogpodtl)) {
<div style="border:2px solid #333"> <div style="border:2px solid #333">
<div id="content"></div> <div id="content"></div>
<div> <div>
<center><b> <?php if ($parentPO == '') { ?>
<h2>Edit Service Purchase Order - <?php echo $PONO; ?></h2> <center><b><h2> Edit Service Purchase Order-<?php echo "$PONO"?></h2></b></center>
</b></center> <?php } else {?>
<center><b><h2> Amended Service Purchase Order-<?php echo "$PONO"?></h2></b></center>
<?php } ?>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
@ -1706,8 +1710,8 @@ if (!empty($getlogpodtl)) {
<div class="modal-footer"> <div class="modal-footer">
<div class="col-md-12"> <div class="col-md-12">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a> <a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
</div> </div>
@ -1998,7 +2002,7 @@ if (!empty($getlogpodtl)) {
<div class="modal-footer"> <div class="modal-footer">
<div class="col-md-12"> <div class="col-md-12">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
</div> </div>
@ -2405,11 +2409,11 @@ if (!empty($getlogpodtl)) {
<div class="modal-footer"> <div class="modal-footer">
<div class="col-md-12 text-right"> <div class="col-md-12 text-right">
<div class="col-md-4 col-md-offset-8"> <div class="col-md-4 col-md-offset-8">
<a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
<a class="btn btn-success" onclick="splpoupdate()">&nbsp;&nbsp;<span class="bold">Update</span> <a class="btn btn-success" onclick="splpoupdate()">&nbsp;&nbsp;<span class="bold">Update</span>
<!-- <input id="tag-form-submit" type="submit" class="btn btn-success bold" value="Update"> --></a> <!-- <input id="tag-form-submit" type="submit" class="btn btn-success bold" value="Update"> --></a>
<!-- <a class="btn btn-success ok" ID="ExciseOption12" onclick="splpoupdate()" ><span class="bold">Update</span></a> --> <!-- <a class="btn btn-success ok" ID="ExciseOption12" onclick="splpoupdate()" ><span class="bold">Update</span></a> -->
<a class="btn btn-success" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
</div><!-- /.modal footer --> </div><!-- /.modal footer -->
@ -2448,7 +2452,7 @@ if (!empty($getlogpodtl)) {
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a> <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a>
<?php } ?> <?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve and Release</span></a> <a class="btn btn-approved Save" ID="Save" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?> <?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(3)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Save" ID="Submit" onclick="Save(3)">&nbsp;&nbsp;<span class="bold">Submit</span></a>

2
app/Views/capitalpurchaseorder.php
View File

@ -2549,7 +2549,7 @@ function vaildateBeforeOpenModal()
<a class="btn btn-reset Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a> <a class="btn btn-reset Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a> <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-approve Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a> <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div> </div>
<br/> <br/>

251
app/Views/createPOfromRequistion.php
View File

@ -1,58 +1,55 @@
<?php $defaultDate = ''; ?> <?php $defaultDate = ''; ?>
<script>
</script>
<style> <style>
#ImportPOCheck { .modal-dialog-centered {
margin-top:200px; display: flex;
z-index: 1080 !important; align-items: center;
justify-content: center;
min-height: 100vh;
}
.modal-content-custom-width {
width: 75%; /* Adjust the width as needed */
} }
.modal .dataTables_paginate {
{
padding-right:30% ! important;
}
.dataTables_paginate
{
margin-top: -5%; margin-top: -5%;
} }
.dataTables_wrapper
{ .dataTables_wrapper {
padding-bottom: 0px; padding-bottom: 0px;
margin-top: -3%; margin-top: -3%;
} }
.content-wrapper
{ .content-wrapper {
min-height: 733px; min-height: 733px;
} }
#REQLIST_filter { #REQLIST_filter {
float: inline-end; float: inline-end;
} }
#REQLIST_wrapper .row .col-sm-4 { #REQLIST_wrapper .row .col-sm-4 {
flex-basis: 50%; flex-basis: 50%;
float: inline-end; float: inline-end;
} }
#REQLIST_paginate { #REQLIST_paginate {
flex-basis: 50%; flex-basis: 50%;
float: inline-end; float: inline-end;
} }
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<?php <?php $attributes = array('class' => 'form-label-left CreatePO ', 'name' => 'CreatePO', 'id' => 'CreatePO', 'method' => 'post', 'role' => 'form');
$attributes = array('class' => 'form-label-left CreatePO ','name' => 'CreatePO','id' => 'CreatePO','method' => 'post','role' => 'form' );
echo form_open(base_url() . 'purchaseOrder', $attributes); ?> echo form_open(base_url() . 'purchaseOrder', $attributes); ?>
<section class="content"> <section class="content">
<div class="box"> <div class="box">
<div class="box-header"> <div class="box-header">
<center><h3 class="box-title"> Create Purchase Order from Requistion</h3></center> <center>
<h3 class="box-title"> Create Purchase Order from Requistion</h3>
</center>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<div id="content"></div> <div id="content"></div>
<div class="row"> <div class="row">
@ -85,8 +82,7 @@
</div> </div>
<?php <?php
$listErrors = session()->getFlashdata('listErrors'); $listErrors = session()->getFlashdata('listErrors');
if($listErrors) if ($listErrors) {
{
?> ?>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@ -101,13 +97,14 @@
<div class="col-md-3 col-md-offset-9"> <div class="col-md-3 col-md-offset-9">
<p> <p>
<div align="right" style="padding-right:0px"> <div align="right" style="padding-right:0px">
<!--<a href="<?php echo base_url(); ?>purchaseorderform/purchaseorder"> <!--<a href="<?php echo base_url(); ?>purchaseorderform/purchaseorder"> -->
<button type="button" class="btn btn-success">Create PO</button></a> --> <!--<button type="button" class="btn btn-success">Create PO</button></a> -->
<!--<input type="submit" class="btn btn-success" onclick="return Validate();" value="Create Purchase Order"> --> <!--<input type="submit" class="btn btn-success" onclick="return Validate();" value="Create Purchase Order"> -->
<a class="btn btn-success" onclick="Validate();">Create Purchase Order</a> <a class="btn btn-success" onclick="Validate();">Create Purchase Order</a>
<input type="hidden" name="txtReqNo" id="txtReqNo" /> <input type="hidden" name="txtReqNo" id="txtReqNo" />
<input type="hidden" name="txtReqType" id="txtReqType" /> <input type="hidden" name="txtReqType" id="txtReqType" />
</div></p> </div>
</p>
</div> </div>
</div> </div>
</div> </div>
@ -115,20 +112,19 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="modal fade" id="RequisitionDtlsModal" role="dialog">
<div class="modal-dialog" style="vertical-align: middle;width: fit-content">
<div class="modal fade" id="myModal" role="dialog">
<div class="modal-dialog">
<!-- Modal content--> <!-- Modal content-->
<form> <form>
<div class="modal-content" style="width: 948px;"> <div class="modal-content" style="width:800px">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4> Requisition Details - <label id="SelReqNo" name="SelReqNo"></label> </h4></center> <center>
<h4> Requisition Details - <label id="SelReqNo" name="SelReqNo"></label> </h4>
</center>
</div> </div>
<div align="left"> <div class="modal-body">
<div class="row">
<div class="col-md-12">
<div class="col-md-4"> <div class="col-md-4">
<label>Request Type</label> <label>Request Type</label>
<div class="form-group"> <div class="form-group">
@ -138,7 +134,6 @@
?> ?>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label>Requested By</label> <label>Requested By</label>
<div class="form-group"> <div class="form-group">
@ -157,9 +152,8 @@
?> ?>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<label>Requested Date</label> <label>Requested Date</label>
<div class="form-group"> <div class="form-group">
@ -169,11 +163,9 @@
?> ?>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label>Cost Center Code</label> <label>Cost Center Code</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter', 'class' => 'form-control', 'readonly' => 'true'); $data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); ?> echo form_input($data); ?>
@ -188,56 +180,37 @@
?> ?>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="row">
<table class="table table-bordered editableTable" style="border:1px solid #fff"> <!-- #333" --> <table class="table table-bordered editableTable" style="border:1px solid #fff">
<div align="right" style="padding-right:10px"> <thead style="background-color: #ddd !important;">
<div class="modal fade" role="dialog">
<thead style="background-color: #ddd !important;"> <!-- #fff -->
<tr> <tr>
<th style="white-space: nowrap;">SNo</th>
<th>SNo</th> <th style="white-space: nowrap;">Item Code</th>
<th>Item Code</th> <th style="white-space: nowrap;">Item Description</th>
<th>Item Description</th> <th style="white-space: nowrap;">UOM</th>
<th>UOM</th> <th style="white-space: nowrap;">Requested Quantity</th>
<th>Requested Quantity</th> <th style="white-space: nowrap;">Ordered Quantity</th>
<th>Ordered Quantity</th> <th style="white-space: nowrap;">Status</th>
<th>Status</th>
</tr> </tr>
</thead> </thead>
<tbody id="tbleAppend"> <tbody id="tbleAppend"></tbody>
</tbody>
</table> </table>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="col-md-12"> <div class="modal-footer">
<div class="col-md-12">
<a class="btn btn-info" data-dismiss="modal" value="Cancel">Ok</a> <a class="btn btn-info" data-dismiss="modal" value="Cancel">Ok</a>
</div> </div>
</div> </div>
</div> </div>
</form>
</div> </div>
</div> </div>
<table id="REQLIST" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;"> <table id="REQLIST" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
<div align="right" style="padding-right:10px"> <div align="right" style="padding-right:10px">
<div class="modal fade" role="dialog"> <div class="modal fade" role="dialog">
<thead style="background-color: #ddd !important;"> <thead style="background-color: #ddd !important;">
<tr> <tr>
<th>Select</th> <th>Select</th>
@ -256,11 +229,9 @@
</thead> </thead>
<tbody id="AppendReqList"> <tbody id="AppendReqList">
<?php <?php
if(!empty($ReqList)) if (!empty($ReqList)) { //alert($ReqList);
{ //alert($ReqList);
$index = 1; $index = 1;
foreach($ReqList as $record) foreach ($ReqList as $record) {
{
?> ?>
<tr id="<?php echo $index; ?>"> <tr id="<?php echo $index; ?>">
<td><input type="checkbox" name="chk<?php echo $index; ?>" id="chk<?php echo $index; ?>" onclick="selectReqNo(<?php echo $index; ?>)" />&nbsp;</td> <td><input type="checkbox" name="chk<?php echo $index; ?>" id="chk<?php echo $index; ?>" onclick="selectReqNo(<?php echo $index; ?>)" />&nbsp;</td>
@ -271,10 +242,9 @@
echo $RequestedDate; echo $RequestedDate;
?> ?>
</td> </td>
<td><a data-toggle="modal" data-target="#myModal" data-id="<%=index%>" data-userid="<?php echo $record->ReqNo ?>"><u><?php echo $record->ReqNo; ?> </u></a></td> <td><a data-toggle="modal" data-target="#RequisitionDtlsModal" data-id="<%=index%>" data-userid="<?php echo $record->ReqNo ?>"><u><?php echo $record->ReqNo; ?> </u></a></td>
<td><?php echo $record->ReqType; ?></td> <td><?php echo $record->ReqType; ?></td>
<td><?php echo $record->FirstName; ?></td> <td><?php echo $record->FirstName; ?></td>
<td align="right"><?php echo $record->TotalNoofLineItems; ?></td> <td align="right"><?php echo $record->TotalNoofLineItems; ?></td>
<td align="right"><?php echo $record->PolineItems; ?></td> <td align="right"><?php echo $record->PolineItems; ?></td>
<td align="right"><?php echo $record->PartilallyLineItems; ?></td> <td align="right"><?php echo $record->PartilallyLineItems; ?></td>
@ -285,71 +255,51 @@
</tr> </tr>
<?php $index = $index + 1; <?php $index = $index + 1;
} }
} }
?> ?>
</tbody> </tbody>
</table> </table>
<div align="right"> <div align="right">
<!-- <input type="submit" class="btn btn-success" onclick="return Validate();" value="Create Purchase Order"> --> <!-- <input type="submit" class="btn btn-success" onclick="return Validate();" value="Create Purchase Order"> -->
</div> </div>
</div>
</div>
<div class="modal fade" id="ImportPOCheck" role="dialog"> <div class="modal fade" id="ImportPOCheck" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog modal-dialog-centered">
<!-- Modal content--> <!-- Modal content-->
<div class="modal-content"> <div class="modal-content modal-content-custom-width">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Do You want to create Import PO for this Requistion?</h4> <h4 class="modal-title">Do You want to create Import PO for this Requistion?</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form> <form>
<div class="radio"> <div class="radio">
<label><input type="radio" name="optImport" checked="checked" value="0" id="optImport">YES</label> <label><input type="radio" name="optImport" value="0" id="optImport">YES</label>
</div> </div>
<div class="radio"> <div class="radio">
<label><input type="radio" name="optImport" value="1" id="optImport">NO</label> <label><input type="radio" name="optImport" value="1" id="optImport" checked="checked">NO</label>
</div> </div>
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<!--<a class="btn btn-success" ID="Import" onclick="SetImportPO();" style="margin-top: -24px;">--> <!--<a class="btn btn-success" ID="Import" onclick="SetImportPO();" style="margin-top: -24px;">-->
<input type="submit" class="btn btn-success" onclick="SetImportPO();" value="OK" style="margin-top: -24px;"/> <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a> <input type="submit" class="btn btn-success" onclick="SetImportPO();" value="OK" />
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</section> </section>
</div> </div>
<script> <script>
var POType = ''; var POType = '';
function SetImportPO() function SetImportPO() {
{
POType = $("input:radio[name='optImport']:checked").val(); POType = $("input:radio[name='optImport']:checked").val();
$('#ImportPOCheck').modal('hide'); $('#ImportPOCheck').modal('hide');
if(POType == 0) $('#txtReqType').val(POType == 0 ? 'IMPORT' : '');
{
$('#txtReqType').val('IMPORT');
}
else
{
$('#txtReqType').val('');
}
} }
$('#ReqDate').val(''); $('#ReqDate').val('');
@ -373,60 +323,36 @@ var Type ='';
var i = 0; var i = 0;
function selectReqNo(rowId) function selectReqNo(rowId) {
{
ckb = $('#chk' + rowId).is(':checked'); ckb = $('#chk' + rowId).is(':checked');
var tr = document.getElementById(rowId); var tr = document.getElementById(rowId);
var cellval = tr.cells; var cellval = tr.cells;
//coo/kie_value_add = {}; //coo/kie_value_add = {};
if(!ckb ) if (!ckb) {
{
var removeItem = cellval[2].innerText; var removeItem = cellval[2].innerText;
$.each(RequistionList.Req, function(i, el) { $.each(RequistionList.Req, function(i, el) {
if (this.ReqNo == removeItem) { //Type = ''; if (this.ReqNo == removeItem) { //Type = '';
RequistionList.Req.splice(i, 1); RequistionList.Req.splice(i, 1);
} }
}); });
} else {
}
else
{
var tr = document.getElementById(rowId); var tr = document.getElementById(rowId);
var cellval = tr.cells; var cellval = tr.cells;
//alert(RequistionList.Req.length); //alert(RequistionList.Req.length);
if(RequistionList.Req.length > 0) if (RequistionList.Req.length > 0) {
{
if(Type == cellval[3].innerText )
{
if (Type == cellval[3].innerText) {
RequistionList.Req.push({ RequistionList.Req.push({
"ReqNo": cellval[2].innerText, "ReqNo": cellval[2].innerText,
"ReqType": cellval[3].innerText, "ReqType": cellval[3].innerText,
"ReqBy": cellval[4].innerText, "ReqBy": cellval[4].innerText,
}); });
} else {
}
else
{
alert('Same type of Requistion only can be together.') alert('Same type of Requistion only can be together.')
$('#chk' + rowId).attr('checked', false); $('#chk' + rowId).attr('checked', false);
} }
} } else {
else
{
RequistionList.Req.push({ RequistionList.Req.push({
"ReqNo": cellval[2].innerText, "ReqNo": cellval[2].innerText,
@ -436,17 +362,14 @@ function selectReqNo(rowId)
Type = cellval[3].innerText; Type = cellval[3].innerText;
} }
i = i + 1; i = i + 1;
} }
$('#txtReqNo').val(JSON.stringify(RequistionList)); $('#txtReqNo').val(JSON.stringify(RequistionList));
} }
$("#myModal").on("shown.bs.modal", function(e) {
$("#RequisitionDtlsModal").on("shown.bs.modal", function(e) {
var ReqId = $(e.relatedTarget).data('userid'); var ReqId = $(e.relatedTarget).data('userid');
$('#SelReqNo').html(ReqId); $('#SelReqNo').html(ReqId);
//alert(ReqId);
$('#content').loader('show'); $('#content').loader('show');
$.ajax({ $.ajax({
data: { id: ReqId }, data: { id: ReqId },
@ -463,48 +386,40 @@ $("#myModal").on("shown.bs.modal", function(e) {
$("#Desigination").val(json.Requist[0]['Designation']); $("#Desigination").val(json.Requist[0]['Designation']);
$("#CostCenter").val(json.Requist[0]['CostCenterCode']); $("#CostCenter").val(json.Requist[0]['CostCenterCode']);
$("#AvlBudgetAmount").val(parseFloat(getAvalAmt).toFixed(2)); $("#AvlBudgetAmount").val(parseFloat(getAvalAmt).toFixed(2));
$("#tbleAppend").empty(); $("#tbleAppend").empty();
$("#tbleAppend").append(json.Items); $("#tbleAppend").append(json.Items);
} }
});
}); });
}); function Validate() {
function Validate()
{
var ReqNo = $('#txtReqNo').val(); var ReqNo = $('#txtReqNo').val();
if(ReqNo.length <=0 ) if (ReqNo.length <= 0) {
{
alert('Please select the Requisition Number to Create Purchase Order'); alert('Please select the Requisition Number to Create Purchase Order');
return false; return false;
} } else {
else
{
$('#ImportPOCheck').modal('show'); $('#ImportPOCheck').modal('show');
} }
} }
$(function() { $(function() {
//$("#revenueTax").DataTable();
$('#REQLIST').DataTable({ $('#REQLIST').DataTable({
"paging": true, "paging": true,
"lengthChange": true, "lengthChange": true,
"searching": true, "searching": true,
"columnDefs" : [{"targets":1, "type":"date-eu"}], "columnDefs": [{
"aaSorting": [[ 2, "desc" ]], "targets": 1,
"type": "date-eu"
}],
"aaSorting": [
[2, "desc"]
],
"ordering": true, "ordering": true,
"info": true, "info": true,
"autoWidth": true, "autoWidth": true,
"pageLength": 10, "pageLength": 10,
"lengthMenu": [10, 25, 50, 100] "lengthMenu": [10, 25, 50, 100]
}); });
}); });
</script> </script>
<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script> <script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>

13
app/Views/editCapitalPo.php
View File

@ -1,4 +1,4 @@
<?php <?php $parentPO= '';
$AvlCapitalBudAmt = isset($AvlCapitalBudAmt) ? (int)$AvlCapitalBudAmt : 0; $AvlCapitalBudAmt = isset($AvlCapitalBudAmt) ? (int)$AvlCapitalBudAmt : 0;
$insuranceStatus = array( $insuranceStatus = array(
array("name"=>"NO","value"=>"0"),array("name"=>"YES","value"=>"1") array("name"=>"NO","value"=>"0"),array("name"=>"YES","value"=>"1")
@ -119,6 +119,7 @@ if(!empty($POMaster))
foreach ($POMaster as $Req) foreach ($POMaster as $Req)
{ {
$parentPO =$Req->ParentPO;
$SupId = $Req->SupplierID; $SupId = $Req->SupplierID;
@ -473,9 +474,11 @@ $("#PaymentMethod").select2();
<div style="border:2px solid #333"> <div style="border:2px solid #333">
<div class="col-md-12"> <div class="col-md-12">
<?php if ($parentPO == '') { ?>
<center><b><h2> Edit Capital Purchase Order- <?php echo $PONO;?></h2></b></center> <center><b><h2> Edit Capital Purchase Order-<?php echo "$PONO"?></h2></b></center>
<?php } else {?>
<center><b><h2> Amended Capital Purchase Order-<?php echo "$PONO"?></h2></b></center>
<?php } ?>
<!-- <div class="col-md-1"><br/> <!-- <div class="col-md-1"><br/>
<a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorder/CreatecapitalPOPrint" target="_blank">Print</a> <a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorder/CreatecapitalPOPrint" target="_blank">Print</a>
</div> --> </div> -->
@ -3900,7 +3903,7 @@ $("#PaymentMethod").select2();
<a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save as Draft</span></a> <a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<?php }?> <?php }?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-approve Save" ID="Submit" onclick="Save(4)" >&nbsp;&nbsp;<span class="bold">Approve</span></a> <a class="btn btn-approved Save" ID="Submit" onclick="Save(4)" >&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else { <?php } else {
if($DEPCode== FINANCE){?> if($DEPCode== FINANCE){?>
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a> <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>

12
app/Views/editImportAmendPO.php
View File

@ -1425,11 +1425,9 @@ echo form_textarea($data);
</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-success font EditImport" ID="EditImport" > &nbsp;&nbsp;<span class="bold">Edit Import</span></a> <a class="btn btn-success font EditImport" ID="EditImport" > &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
<!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>--> <!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
</form> </form>
@ -1924,9 +1922,9 @@ echo form_textarea($data);
<?php //if($PONOStatus == PO_DRAFT) {?> <?php //if($PONOStatus == PO_DRAFT) {?>
<!-- <a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> --> <!-- <a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
<a class="btn btn-cancel Save" ID="Cancel" href="<?php echo base_url().'amendmentpurchaseorder'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<!-- <input type="reset" class="btn btn-success" value="Reset"> --> <!-- <input type="reset" class="btn btn-success" value="Reset"> -->
<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url().'amendmentpurchaseorder'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php //}else {?> <?php //}else {?>
<!-- <input type="reset" class="btn btn-success" value = "OK"> <?php //} ?>--> <!-- <input type="reset" class="btn btn-success" value = "OK"> <?php //} ?>-->
<br/> <br/>
@ -1937,8 +1935,8 @@ echo form_textarea($data);
<label>Request On :</label><?php echo $Reqon;?><br/> <label>Request On :</label><?php echo $Reqon;?><br/>
<label>Request By :</label><?php echo $RequesterName;?><br/> <label>Request By :</label><?php echo $RequesterName;?><br/>
<label>Status :</label><?php echo $StatusName;?> <!--<label>Status :</label><?php echo $StatusName;?>-->
<!-- <label>Status : </label><?php <label>Status : </label><?php
$statusMappings = [ $statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE', 'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE', 'AWAITING RELEASE' => 'AWAITING APPROVE',
@ -1955,7 +1953,7 @@ echo form_textarea($data);
} else { } else {
echo "Status not provided"; echo "Status not provided";
} }
?> --> ?>
</div> </div>
</div> </div>

29
app/Views/editRevenuepurchaseorder.php
View File

@ -14,6 +14,7 @@ $otherref = '';
$revenuesubtype = ''; $revenuesubtype = '';
$insurencestatus = ''; $insurencestatus = '';
$insurenceno = ''; $insurenceno = '';
$parentPO= '';
if (!empty($MaxPODate)) { if (!empty($MaxPODate)) {
foreach ($MaxPODate as $date) { foreach ($MaxPODate as $date) {
$MaxPoDate = $date->PODate; $MaxPoDate = $date->PODate;
@ -65,6 +66,7 @@ if (!empty($POMaster)) {
//print_r($POMaster); //print_r($POMaster);
//print_r($POItem); //print_r($POItem);
foreach ($POMaster as $Req) { foreach ($POMaster as $Req) {
$parentPO =$Req->ParentPO;
$SupId = $Req->SupplierID; $SupId = $Req->SupplierID;
$SupName = $Req->SupplierName; $SupName = $Req->SupplierName;
$Address = $Req->MSME ? "MSME : ".$Req->MSME."\n".$Req->Address :$Req->Address ; $Address = $Req->MSME ? "MSME : ".$Req->MSME."\n".$Req->Address :$Req->Address ;
@ -1846,9 +1848,11 @@ if (!empty($getlogpodtl)) {
<div style="border:2px solid #333"> <div style="border:2px solid #333">
<div id="content"></div> <div id="content"></div>
<div> <div>
<center><b> <?php if ($parentPO == '') { ?>
<h2>Edit Revenue Purchase Order - <?php echo $PONO; ?></h2> <center><b><h2> Edit Revenue Purchase Order - <?php echo $PONO; ?></h2></b></center>
</b></center> <?php } else {?>
<center><b><h2> Amended Revenue Purchase Order - <?php echo $PONO; ?></h2></b></center>
<?php } ?>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
@ -2162,9 +2166,8 @@ if (!empty($getlogpodtl)) {
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a> <a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
@ -2690,7 +2693,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3 col-md-offset-9"><br /> <div class="col-md-3 col-md-offset-9"><br />
<a class="btn btn-success font AddRevenue" ID="AddRevenue">&nbsp;&nbsp;<span class="bold">Add Revenue</span></a> &nbsp;&nbsp;&nbsp;&nbsp;<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn-success font AddRevenue" ID="AddRevenue">&nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
</div> </div>
</div> </div>
@ -3059,7 +3063,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="col-md-3 col-md-offset-9"><br /> <div class="col-md-3 col-md-offset-9"><br />
<a class="btn btn-success EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>&nbsp;&nbsp;&nbsp;&nbsp;<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn-success EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
</div> </div>
@ -3964,13 +3969,13 @@ if (!empty($getlogpodtl)) {
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" /> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" /> <input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" />
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" /> <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
if ($PONOStatus == PO_DRAFT) { ?> <a class="btn btn-cancel Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a> <?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<?php } ?> <?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve and Release </span></a> <a class="btn btn-approved Save" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?> <?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<?php } else { ?> <?php } else { ?>

4
app/Views/editSupplier.php
View File

@ -363,10 +363,10 @@ if (!empty($supplier)) {
<input type="text" id="accno" maxlength="20" name="accno" value="<?php echo $accno; ?>" class="form-control" onkeypress="return isNumberKey(event)" required> <input type="text" id="accno" maxlength="20" name="accno" value="<?php echo $accno; ?>" class="form-control" onkeypress="return isNumberKey(event)" required>
</div> </div>
<div class="col-md-3"><span>IFSC Code</span><span class="badge">*</span> <div class="col-md-3"><span>IFSC Code</span><span class="badge">*</span>
<input type="text" id="ifsc" name="ifsc" value="<?php echo $IFSCCode; ?>" class="form-control" maxlength="12" onkeypress="return alphaNumberic(event);" style="text-transform: uppercase" required> <input type="text" id="ifsc" name="ifsc" value="<?php echo $IFSCCode; ?>" class="form-control" maxlength="12" style="text-transform: uppercase" required>
</div> </div>
<div class="col-md-3"><span>Bank Branch Name</span> <div class="col-md-3"><span>Bank Branch Name</span>
<input type="text" id="branchname" name="branchname" value="<?php echo $branchname; ?>" class="form-control" maxlength="200" onkeypress="return alphaNumberic(event);"> <input type="text" id="branchname" name="branchname" value="<?php echo $branchname; ?>" class="form-control" maxlength="200">
</div> </div>
<div class="col-md-3"><span>Bank Address</span> <div class="col-md-3"><span>Bank Address</span>
<input type="text" id="bankaddress" name="bankaddress" value="<?php echo $bankaddress; ?>" class="form-control" maxlength="200"> <input type="text" id="bankaddress" name="bankaddress" value="<?php echo $bankaddress; ?>" class="form-control" maxlength="200">

10
app/Views/editimportpo.php
View File

@ -3168,10 +3168,10 @@ echo form_textarea($data);
<a class="btn btn-cancel Save" ID="Cancel" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a> <a class="btn btn-cancel Save" ID="Cancel" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED ) { <?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED ) {
if($PONOStatus == PO_DRAFT){?> if($PONOStatus == PO_DRAFT){?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<?php }?> <?php }?>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(4)" >&nbsp;&nbsp;<span class="bold">Approve and Release</span></a> <a class="btn btn-approved Submit" ID="Submit" onclick="Save(4)" >&nbsp;&nbsp;<span class="bold">Approve</span></a>
<!-- <input type="reset" class="btn btn-success" value="Reset"> --> <!-- <input type="reset" class="btn btn-success" value="Reset"> -->
<?php }else {?> <?php }else {?>
@ -3183,7 +3183,7 @@ echo form_textarea($data);
else{?> else{?>
<!-- <input type="reset" class="btn btn-success" value = "OK"> --> <!-- <input type="reset" class="btn btn-success" value = "OK"> -->
<a class="btn btn-success Submit" ID="Submit" onclick="Save(2)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Submit" ID="Submit" onclick="Save(2)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(4)" >&nbsp;&nbsp;<span class="bold">Approve and Release</span></a> <a class="btn btn-approved Submit" ID="Submit" onclick="Save(4)" >&nbsp;&nbsp;<span class="bold">Approve</span></a>
<a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorderListing">OK</a> <a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorderListing">OK</a>
<?php }?> <?php }?>
<?php } ?> <?php } ?>
@ -3194,8 +3194,7 @@ echo form_textarea($data);
<label>Request On :</label><?php echo $Reqon;?><br/> <label>Request On :</label><?php echo $Reqon;?><br/>
<label>Request By :</label><?php echo $RequesterName;?><br/> <label>Request By :</label><?php echo $RequesterName;?><br/>
<label>Status :</label><?php echo $StatusName;?> <label>Status : </label><?php
<!-- <label>Status : </label><?php
$statusMappings = [ $statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE', 'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE', 'AWAITING RELEASE' => 'AWAITING APPROVE',
@ -3213,7 +3212,6 @@ echo form_textarea($data);
echo "Status not provided"; echo "Status not provided";
} }
?> ?>
-->
</div> </div>
</div> </div>

19
app/Views/importpo.php
View File

@ -249,7 +249,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</b></center><br /> </b></center><br />
<div class="col-md-12 text-right" style="padding-bottom: 6px; padding-right: 23px;"> <div class="col-md-12 text-right" style="padding-bottom: 6px; padding-right: 23px;">
<a href="<?php echo base_url() ?>CreatePO" class="btn btn-success" id="back" value="Back">Back</a> <a href="<?php echo base_url() ?>CreatePO" class="btn btn-cancel" id="back" value="Back">Back</a>
</div> </div>
@ -1243,13 +1243,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</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-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Import</span></a> <a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Import</span></a>
<!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>--> <!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
</form> </form>
@ -1842,11 +1838,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</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-success font EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a> <a class="btn btn-success font EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
<!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>--> <!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
</form> </form>
@ -2000,7 +1994,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div> </div>
<div align="right" style="padding-right:10px"> <div align="right" style="padding-right:10px">
<div class="col-md-3 col-md-offset-9"><br /> <div class="col-md-4 col-md-offset-8"><br />
<input type="file" name="POFile" id="POFile"><br> <input type="file" name="POFile" id="POFile"><br>
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
@ -2009,10 +2003,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" /> <input type="hidden" name="Budget" id="Budget" />
<input type="reset" class="btn btn-reset" value="Reset" onclick="window.location.reload()">
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a> <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-success" value="Reset" onclick="window.location.reload()">
</div> </div>
<br /> <br />

10
app/Views/inwardgateregister.php
View File

@ -315,10 +315,12 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<center> <div class="col-md-12 text-right">
<a class="btn btn-primary" onclick="modalSave()">&nbsp;&nbsp;<span class="bold">Save</span> <div class="col-md-4 col-md-offset-8">
<a class="btn btn-primary" data-dismiss="modal" value="Close">Close</a> <a class="btn btn-cancel" data-dismiss="modal" value="Close">Close</a>
</center> <a class="btn btn-primary" onclick="modalSave()">&nbsp;&nbsp;<span class="bold">Save</span></a>
</div>
</div>
</div><!-- footer div closed --> </div><!-- footer div closed -->
</div><!-- modal content div closed--> </div><!-- modal content div closed-->
</div><!-- modal content closed--> </div><!-- modal content closed-->

28
app/Views/purchaseorder.php
View File

@ -1829,7 +1829,7 @@ if (!empty($INRSYMBOL)) {
<div id="content"></div> <div id="content"></div>
<div> <center><b> <h2>Revenue Purchase Order</h2> </b></center> </div> <div> <center><b> <h2>Revenue Purchase Order</h2> </b></center> </div>
<div class="col-md-12 text-right" style="padding-bottom:6px; padding-right:29px;"> <div class="col-md-12 text-right" style="padding-bottom:6px; padding-right:29px;">
<a href="<?php echo base_url() ?>CreatePO" class="btn btn-success" id="back" value="Back">Back</a> <a href="<?php echo base_url() ?>CreatePO" class="btn btn-cancel" id="back" value="Back">Back</a>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
@ -2151,9 +2151,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a> <a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
@ -2182,9 +2181,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="FreightOption" onclick="SetfreightOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a> <a class="btn btn-success" ID="FreightOption" onclick="SetfreightOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
@ -2221,8 +2219,8 @@ if (!empty($INRSYMBOL)) {
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="ExciseOption" onclick="SetExciseCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a> <a class="btn btn-success" ID="ExciseOption" onclick="SetExciseCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
@ -2252,8 +2250,8 @@ if (!empty($INRSYMBOL)) {
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="VatOption" onclick="SetVatCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a> <a class="btn btn-success" ID="VatOption" onclick="SetVatCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
@ -2689,7 +2687,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3 col-md-offset-9"><br /> <div class="col-md-3 col-md-offset-9"><br />
<a class="btn btn-success font AddRevenue" ID="AddRevenue"> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>&nbsp;&nbsp;&nbsp;&nbsp;<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn-success font AddRevenue" ID="AddRevenue"> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
</div> </div>
</div> </div>
@ -3058,7 +3057,9 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3 col-md-offset-9"><br /> <div class="col-md-3 col-md-offset-9"><br />
<a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>&nbsp;&nbsp;&nbsp;&nbsp; <a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
</div> </div>
</div> </div>
@ -3203,7 +3204,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="row" style="padding: 2% 0%"> <div class="row" style="padding: 2% 0%">
<div class="col-md-3 col-md-offset-9"><br /> <div class="col-md-4 col-md-offset-8"><br />
<input type="file" name="POFile" id="POFile"><br> <input type="file" name="POFile" id="POFile"><br>
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
@ -3211,12 +3212,9 @@ if (!empty($INRSYMBOL)) {
<input type="hidden" name="txtRowCount" id="txtRowCount" /> <input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" /> <input type="hidden" name="Budget" id="Budget" />
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a> <a class="btn btn-reset Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
</div><br /> </div><br />
</div> </div>
</div> </div>

10
app/Views/servicePurchaseorder.php
View File

@ -603,7 +603,7 @@ if (!empty($INRSYMBOL)) {
</b></center> </b></center>
</div> </div>
<div class="col-md-12 text-right" style="padding-bottom: 19px; padding-right: 39px;"> <div class="col-md-12 text-right" style="padding-bottom: 19px; padding-right: 39px;">
<a href="<?php echo base_url() ?>CreatePO" class="btn btn-success" id="back" value="Back">Back</a> <a href="<?php echo base_url() ?>CreatePO" class="btn btn-cancel" id="back" value="Back">Back</a>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
@ -1245,8 +1245,8 @@ if (!empty($INRSYMBOL)) {
<div class="modal-footer"> <div class="modal-footer">
<div class="col-md-12"> <div class="col-md-12">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font AddService" ID="AddService"> &nbsp;&nbsp;<span class="bold">Add Service</span></a> <a class="btn btn-success font AddService" ID="AddService"> &nbsp;&nbsp;<span class="bold">Add Service</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
</div> </div>
@ -1533,8 +1533,8 @@ if (!empty($INRSYMBOL)) {
<div class="modal-footer"> <div class="modal-footer">
<div class="col-md-12"> <div class="col-md-12">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a> <a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div> </div>
</div> </div>
</div> </div>
@ -1651,9 +1651,9 @@ if (!empty($INRSYMBOL)) {
<input type="hidden" name="SpcialInstruction" id="SpcialInstruction"> <input type="hidden" name="SpcialInstruction" id="SpcialInstruction">
<input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress"> <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress">
<input type="hidden" name="Budget" id="Budget" /> <input type="hidden" name="Budget" id="Budget" />
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a> <a class="btn btn-reset Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
</div><br /> </div><br />
</div> </div>
</div> </div>

2
app/Views/servicepo.php
View File

@ -7,7 +7,7 @@
<section class="content"> <section class="content">
<div style="border:2px solid #333"> <div style="border:2px solid #333">
<center><b><h2>Service Purchase Order</h2></b></center> <center><b><h2>Service Purchase Order.</h2></b></center>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">