FIX_ merged reqlist
This commit is contained in:
parent
39ecdef0d0
commit
c3e7e73142
@ -576,7 +576,7 @@ if (!empty($RequistionDetails)) {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label for="payablefrom">Import Options</label>
|
<label for="payablefrom">Import Type Options<span class="badge mandatory">*</span></label>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
//$options1 = array("0"=>'Select Import Option');
|
//$options1 = array("0"=>'Select Import Option');
|
||||||
@ -602,7 +602,7 @@ if (!empty($RequistionDetails)) {
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label for="payablefrom">Payable Terms</label>
|
<label for="payablefrom">Payable Terms<span class="badge mandatory">*</span></label>
|
||||||
<input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms; ?>">
|
<input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms; ?>">
|
||||||
|
|
||||||
|
|
||||||
@ -651,7 +651,7 @@ if (!empty($RequistionDetails)) {
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label for="payablefrom">Insurance</label>
|
<label for="payablefrom">Insurance<span class="badge mandatory">*</span></label>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -695,7 +695,7 @@ if (!empty($RequistionDetails)) {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label for="BudgetType">Budget Type</label>
|
<label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
|
||||||
<select id='BudgetType' name='BudgetType'>
|
<select id='BudgetType' name='BudgetType'>
|
||||||
<?php if ($BudgetType == 'CAPITAL') {
|
<?php if ($BudgetType == 'CAPITAL') {
|
||||||
$opt1 = 'CAPITAL';
|
$opt1 = 'CAPITAL';
|
||||||
|
|||||||
@ -82,39 +82,66 @@ span.highlight {
|
|||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<div class="box-header">
|
|
||||||
<center><b><h3 class="box-title">Requisition Listing</h3></b></center>
|
<div class="box-header">
|
||||||
|
<center><b>
|
||||||
</div><!-- /.box-header -->
|
<h3 class="box-title">Requisition Listing</h3>
|
||||||
<?php if($DraftCount > 0 ) {?><p style="text-align: center;">
|
</b></center>
|
||||||
<span class="highlight">The Requisition No <b><?php echo $ReqNo;?></b> is in Draft status.</span> Please act on the requisition.<span class="highlight">Then only you can raise New Requisition. </span>
|
|
||||||
</p> <?php } ?>
|
</div><!-- /.box-header -->
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-12 text-right" style="margin-left:-2%;">
|
<?php if($DraftCount > 0 ) {?><p style="text-align: center;">
|
||||||
<div class="form-group">
|
<span class="highlight">The Requisition No <b><?php echo $ReqNo;?></b> is in Draft
|
||||||
<?php if($DraftCount == 0)
|
status.</span> Please act on the requisition.<span class="highlight">Then only you can raise
|
||||||
{ ?>
|
New Requisition. </span>
|
||||||
<a class="btn btn-success" onclick="Test()" href="<?php echo base_url(); ?>RequisitionForm">Raise New Requisition</a><?php }?>
|
</p> <?php } ?>
|
||||||
|
|
||||||
</div>
|
<div class="row">
|
||||||
</div>
|
<div class="col-md-12 text-right" style="margin-left:-2%;">
|
||||||
</div>
|
<div class="form-group">
|
||||||
<table id="Requisition" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
|
|
||||||
<thead style="background-color: #ddd;">
|
<div class="col-md-8">
|
||||||
<tr>
|
<form class="Date-filter-form" id="DateRangeFilter" >
|
||||||
<th>Requisted Date</th>
|
<input type="hidden" name="table" value="requisition">
|
||||||
<th>Requisition No</th>
|
<label for="fromDate">From:</label>
|
||||||
<th>Requisition Type</th>
|
<input type="text" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
|
||||||
<th>Tot No.OfLineItem </th>
|
|
||||||
<th>Po CreatedLineItem</th>
|
<label for="toDate">To:</label>
|
||||||
<th>Partially PoCreatedLineItem</th>
|
<input type="text" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
|
||||||
<th>NewLine Item</th>
|
|
||||||
<th>Status</th>
|
<button type="submit">Search</button>
|
||||||
<th>Action</th>
|
<i class="fa fa-repeat" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
|
||||||
|
<div class="error" id="error"></div>
|
||||||
</tr>
|
</form>
|
||||||
</thead>
|
</div>
|
||||||
|
|
||||||
|
<div class="col-md-4">
|
||||||
|
<?php if($DraftCount == 0) { ?>
|
||||||
|
<a class="btn btn-success" onclick="Test()"
|
||||||
|
href="<?php echo base_url(); ?>RequisitionForm">Raise New Requisition</a>
|
||||||
|
<?php }?>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<table id="Requisition" class="table table-bordered table-hover"
|
||||||
|
style="background-color:#fff;font-size:12px;">
|
||||||
|
<thead style="background-color: #ddd;">
|
||||||
|
<tr>
|
||||||
|
<th>Requisted Date</th>
|
||||||
|
<th>Requisition No</th>
|
||||||
|
<th>Requisition Type</th>
|
||||||
|
<th>Tot No.OfLineItem </th>
|
||||||
|
<th>Po CreatedLineItem</th>
|
||||||
|
<th>Partially PoCreatedLineItem</th>
|
||||||
|
<th>NewLine Item</th>
|
||||||
|
<th>Status</th>
|
||||||
|
<th>Action</th>
|
||||||
|
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -129,21 +156,28 @@ span.highlight {
|
|||||||
<td> <?php $Pdt = new DateTime($record->CreatedDate );
|
<td> <?php $Pdt = new DateTime($record->CreatedDate );
|
||||||
$PODate = $Pdt->format('d-m-Y');
|
$PODate = $Pdt->format('d-m-Y');
|
||||||
echo $PODate ?>
|
echo $PODate ?>
|
||||||
</td>
|
</td>
|
||||||
<td><?php echo $record->ReqNo ?></td>
|
<td><?php echo $record->ReqNo ?></td>
|
||||||
<td><?php echo $record->ReqType ?></td>
|
<td><?php echo $record->ReqType ?></td>
|
||||||
<td><?php echo $record->TotalNoofLineItems ?></td>
|
<td><?php echo $record->TotalNoofLineItems ?></td>
|
||||||
<td><?php echo $record->PolineItems ?></td>
|
<td><?php echo $record->PolineItems ?></td>
|
||||||
<td><?php echo $record->PartilallyLineItems ?></td>
|
<td><?php echo $record->PartilallyLineItems ?></td>
|
||||||
<td> <?php echo $record->newLineItem ?></td>
|
<td> <?php echo $record->newLineItem ?></td>
|
||||||
|
|
||||||
|
|
||||||
<td><?php echo $record->StatusName ?></td>
|
<td><?php echo $record->StatusName ?></td>
|
||||||
|
|
||||||
<td> <a data-toggle="tooltip" href="<?php echo base_url().'EditRequisitionForm?ReqNo='.$record->ReqNo.'&ReqType='.$record->ReqType; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?> - Click here to view Requisition details"></i> </a> <a data-toggle="tooltip" onclick="DeleteRow('<?php echo $record->ReqNo; ?>' )" ><span class="glyphicon glyphicon-trash" title="<?php echo $record->ReqNo; ?> - Click here to Delete Requisition details"></span></a> </td>
|
<td> <a data-toggle="tooltip"
|
||||||
</tr>
|
href="<?php echo base_url().'EditRequisitionForm?ReqNo='.$record->ReqNo.'&ReqType='.$record->ReqType; ?>"><i
|
||||||
|
class="fa fa-pencil" data-toggle="tooltip"
|
||||||
<?php
|
title="<?php echo $record->ReqNo; ?> - Click here to view Requisition details"></i> </a>
|
||||||
|
<a data-toggle="tooltip" onclick="DeleteRow('<?php echo $record->ReqNo; ?>' )"><span
|
||||||
|
class="glyphicon glyphicon-trash"
|
||||||
|
title="<?php echo $record->ReqNo; ?> - Click here to Delete Requisition details"></span></a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<?php
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user