fixed bugs from tracker date -12/09/2024
This commit is contained in:
vadivelJ96
parent
638c23db16
commit
a5dae07787
@ -169,11 +169,40 @@
|
|||||||
|
|
||||||
<?php $statusCode = $record->StatusCode;
|
<?php $statusCode = $record->StatusCode;
|
||||||
|
|
||||||
if ($statusCode == PO_DRAFT || $statusCode == PO_CREATED) { ?>
|
if ($statusCode == PO_DRAFT || $statusCode == PO_CREATED) {
|
||||||
<td> <a data-toggle="tooltip" href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType . '&CapitalRange=' . $record->CapitalRange; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->PONO; ?> - Click here to Edit Purchase Order details"></i> </a> </td>
|
|
||||||
|
|
||||||
|
|
||||||
|
?>
|
||||||
|
|
||||||
|
<td>
|
||||||
|
|
||||||
|
<a data-toggle="tooltip" title="<?php echo $record->PONO; ?> - Click here to Edit Purchase Order details"
|
||||||
|
href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType
|
||||||
|
. '&CapitalRange=' . $record->CapitalRange; ?>">
|
||||||
|
<i class="fa fa-pencil-alt" data-toggle="tooltip" > </i>
|
||||||
|
</a>
|
||||||
|
|
||||||
|
</td>
|
||||||
<?php
|
<?php
|
||||||
} else { ?>
|
} else {
|
||||||
<td> <a data-toggle="tooltip" href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType . '&CapitalRange=' . $record->CapitalRange; ?>"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->PONO; ?> - Click here to view Purchase Order details"></i> </a> <a data-toggle="tooltip" href="<?php echo base_url() . 'purchaseorder/CreatePOPrint?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType; ?>" target="new"><i class="fa fa-print" data-toggle="tooltip" title="<?php echo $record->PONO; ?> - Click here to Print the Purchase Order details"></i> </a> </td>
|
|
||||||
|
?>
|
||||||
|
<td>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<a data-toggle="tooltip" href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType
|
||||||
|
. '&CapitalRange=' . $record->CapitalRange; ?>"><i class="fa fa-eye" data-toggle="tooltip"
|
||||||
|
title="<?php echo $record->PONO; ?> - Click here to view Purchase Order details"></i>
|
||||||
|
</a>
|
||||||
|
|
||||||
|
<a data-toggle="tooltip" href="<?php echo base_url() . 'purchaseorder/CreatePOPrint?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType; ?>"
|
||||||
|
target="new"><i class="fa fa-print" data-toggle="tooltip" title="<?php echo $record->PONO; ?>
|
||||||
|
- Click here to Print the Purchase Order details"></i>
|
||||||
|
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
<?php
|
<?php
|
||||||
} ?>
|
} ?>
|
||||||
</tr>
|
</tr>
|
||||||
@ -278,4 +307,9 @@ $(document).ready(function() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$(document).ready(function(){
|
||||||
|
$('[data-toggle="tooltip"]').tooltip();
|
||||||
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
@ -872,7 +872,7 @@
|
|||||||
onkeypress="return isNumberKey(event)">
|
onkeypress="return isNumberKey(event)">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3" style="margin-top: 18px;">
|
<div class="col-md-3" >
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<span for="ESI_Rate">ESI Rate(%)</span>
|
<span for="ESI_Rate">ESI Rate(%)</span>
|
||||||
<font color="Red">*</font>
|
<font color="Red">*</font>
|
||||||
|
|||||||
@ -34,6 +34,28 @@
|
|||||||
.icon-button:hover {
|
.icon-button:hover {
|
||||||
color: #0056b3;
|
color: #0056b3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
td {
|
||||||
|
padding-left: 0;
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
td {
|
||||||
|
padding-left: 0;
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.configIdTh{
|
||||||
|
text-align:center !important;
|
||||||
|
width:15%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.configIdTd{
|
||||||
|
text-align:center !important;
|
||||||
|
width:15%;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
@ -96,7 +118,7 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Create Date</th>
|
<th>Create Date</th>
|
||||||
<th>Configuration ID</th>
|
<th class="configIdTh">Configuration ID</th>
|
||||||
<th>Configuration Name</th>
|
<th>Configuration Name</th>
|
||||||
<th>Description</th>
|
<th>Description</th>
|
||||||
<th>Action</th>
|
<th>Action</th>
|
||||||
@ -114,7 +136,7 @@
|
|||||||
$cdate = date('d-m-Y', strtotime($record->CreatedDate));
|
$cdate = date('d-m-Y', strtotime($record->CreatedDate));
|
||||||
} ?>
|
} ?>
|
||||||
<td ><?php echo $cdate; ?> </td>
|
<td ><?php echo $cdate; ?> </td>
|
||||||
<td><?php echo $record->Config_ID ?></td>
|
<td class="configIdTd"><?php echo $record->Config_ID ?></td>
|
||||||
<td><?php echo $record->ConfigName ?></td>
|
<td><?php echo $record->ConfigName ?></td>
|
||||||
<td><?php echo $record->Comments ?> </td>
|
<td><?php echo $record->Comments ?> </td>
|
||||||
<!-- <td><?php echo $record->CreatedDate ?></td> -->
|
<!-- <td><?php echo $record->CreatedDate ?></td> -->
|
||||||
@ -125,7 +147,8 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<td><a href="<?php echo base_url() . 'configurationctrl/editconfig?ConfigID=' . $record->Config_ID; ?>"><i class="fas fa-pencil-alt"></i> </a>
|
<td >
|
||||||
|
<a href="<?php echo base_url() . 'configurationctrl/editconfig?ConfigID=' . $record->Config_ID; ?>"><i class="fas fa-pencil-alt"></i> </a>
|
||||||
<!-- <a><i class="fa fa-trash"></i> </a> -->
|
<!-- <a><i class="fa fa-trash"></i> </a> -->
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
|
|||||||
@ -753,11 +753,11 @@ foreach ($PaymentTerms as $TER) {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
<div class="form-group col-md-3">
|
<div class="form-group col-md-3">
|
||||||
<label>Work Status<span class="text-danger">*</span></label>
|
<label>Work Status<span class="text-danger">*</span></label>
|
||||||
<?php
|
<?php
|
||||||
@ -998,6 +998,16 @@ foreach ($PaymentTerms as $TER) {
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -50,6 +50,32 @@ if (!empty($ReqPOType)) {
|
|||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
td {
|
||||||
|
padding-left: 0;
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
td {
|
||||||
|
padding-left: 0;
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.th-materialCode{
|
||||||
|
text-align:center !important;
|
||||||
|
width:15%;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.th-requestedQuantity{
|
||||||
|
text-align:center !important;
|
||||||
|
width:15%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.th-PoQuantity{
|
||||||
|
text-align:center !important;
|
||||||
|
width:15%;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
window.onload = function() {
|
window.onload = function() {
|
||||||
@ -158,11 +184,11 @@ if (!empty($ReqPOType)) {
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th class="th">SNo</th>
|
<th class="th">SNo</th>
|
||||||
<th class="th">Material Code</th>
|
<th class="th th-materialCode">Material Code</th>
|
||||||
<th class="th">Material Name</th>
|
<th class="th th-materialName">Material Name</th>
|
||||||
<th class="th">Uom</th>
|
<th class="th">Uom</th>
|
||||||
<th class="th">RequestedQuantity</th>
|
<th class="th th-requestedQuantity">RequestedQuantity</th>
|
||||||
<th class="th">PoQuantity</th>
|
<th class="th th-PoQuantity">PoQuantity</th>
|
||||||
<th class="th">Status</th>
|
<th class="th">Status</th>
|
||||||
<th class="th">Action</th>
|
<th class="th">Action</th>
|
||||||
</tr>
|
</tr>
|
||||||
@ -176,15 +202,15 @@ if (!empty($ReqPOType)) {
|
|||||||
$materialdesc = isset($record->MaterialDescription) ? $record->MaterialDescription : "";
|
$materialdesc = isset($record->MaterialDescription) ? $record->MaterialDescription : "";
|
||||||
//echo $materialdesc;
|
//echo $materialdesc;
|
||||||
?>
|
?>
|
||||||
<tr id="<?php echo $index; ?>">
|
<tr id="<?php echo $index; ?>">
|
||||||
<td align="left"><?php echo $index; ?></td>
|
<td align="center"><?php echo $index; ?></td>
|
||||||
<input type="hidden" name="<?php echo 'te' . $index ?>" id="<?php echo 'te' . $index ?>" value="<?php echo $record->MaterialCode; ?>" />
|
<input type="hidden" name="<?php echo 'te' . $index ?>" id="<?php echo 'te' . $index ?>" value="<?php echo $record->MaterialCode; ?>" />
|
||||||
<input type="hidden" name="<?php echo 'te' . $index ?>" id="<?php echo 'tes' . $index ?>" value="<?php echo $record->Quantity; ?>" />
|
<input type="hidden" name="<?php echo 'te' . $index ?>" id="<?php echo 'tes' . $index ?>" value="<?php echo $record->Quantity; ?>" />
|
||||||
<td align="left"><?php echo $record->MaterialCode; ?></td>
|
<td align="center"><?php echo $record->MaterialCode; ?></td>
|
||||||
<td align="left"><?php echo $record->MaterialName; ?></td>
|
<td align="left"><?php echo $record->MaterialName; ?></td>
|
||||||
<td align="left"><?php echo $record->UOM; ?></td>
|
<td align="left"><?php echo $record->UOM; ?></td>
|
||||||
<td align="left"><?php echo $record->Quantity; ?></td>
|
<td align="center"><?php echo $record->Quantity; ?></td>
|
||||||
<td align="left"><?php echo $record->POQTY; ?></td>
|
<td align="center"><?php echo $record->POQTY; ?></td>
|
||||||
<td align="left"><?php echo $record->StatusName; ?></td>
|
<td align="left"><?php echo $record->StatusName; ?></td>
|
||||||
<input type="hidden" name="<?php echo 'materialdesc' . $index ?>" id="<?php echo 'materialdesc' . $index ?>" value="<?php echo isset($record->MaterialDescription) ? $record->MaterialDescription : ''; ?>" />
|
<input type="hidden" name="<?php echo 'materialdesc' . $index ?>" id="<?php echo 'materialdesc' . $index ?>" value="<?php echo isset($record->MaterialDescription) ? $record->MaterialDescription : ''; ?>" />
|
||||||
<td>
|
<td>
|
||||||
|
|||||||
@ -12,11 +12,12 @@ $Terms = '';
|
|||||||
|
|
||||||
$t = '';
|
$t = '';
|
||||||
if (!empty($staticspecialinstruction)) {
|
if (!empty($staticspecialinstruction)) {
|
||||||
foreach ($staticspecialinstruction as $text)
|
$t=$staticspecialinstruction[0]->ConfigValue;
|
||||||
$t = $text->ConfigValue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
date_default_timezone_set('Asia/Kolkata');
|
date_default_timezone_set('Asia/Kolkata');
|
||||||
$date = date('d/m/Y h:i:s a', time());
|
$date = date('d/m/Y h:i:s a', time());
|
||||||
|
|
||||||
@ -91,6 +92,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
|||||||
|
|
||||||
setup: function(ed) {
|
setup: function(ed) {
|
||||||
ed.on('init', function(evt) {
|
ed.on('init', function(evt) {
|
||||||
|
console.log(evt);
|
||||||
|
console.log('<?php echo $t; ?>')
|
||||||
ed.setContent('<?php echo $t; ?>');
|
ed.setContent('<?php echo $t; ?>');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -276,7 +279,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
|||||||
$ReqType = $SID->ReqType;
|
$ReqType = $SID->ReqType;
|
||||||
endforeach;
|
endforeach;
|
||||||
}
|
}
|
||||||
echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"');
|
echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo" required="true"');
|
||||||
|
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
@ -679,28 +682,71 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
|||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
<div class="form-group col-md-12">
|
<div class="form-group col-md-12">
|
||||||
<label>Special Instructions :</label> <?php
|
<label>Special Instructions :</label>
|
||||||
$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
|
<?php
|
||||||
echo form_textarea($data);
|
|
||||||
?>
|
$data = array('name' => 'txtSpcialInstruction', 'value' => set_value(field: 'txtSpcialInstruction'),
|
||||||
|
'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
|
||||||
|
echo form_textarea(data: $data);
|
||||||
|
?>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<div class="form-row">
|
||||||
|
<div class="form-group col-md-12">
|
||||||
|
<label>
|
||||||
|
Select Purchase Order File
|
||||||
|
</label>
|
||||||
|
<br>
|
||||||
|
<input type="file" name="POFile" id="POFile"><br>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-row" align="right" style="padding-right:10px">
|
<br><br>
|
||||||
|
|
||||||
<div class="form-group col-md-4 col-md-offset-8"><br />
|
|
||||||
<input type="file" name="POFile" id="POFile"><br>
|
|
||||||
<input type="hidden" name="txtPoRange" id="txtPoRange" />
|
|
||||||
<input type="hidden" name="isEdit" id="isEdit" value="0" />
|
<div class="form-row" >
|
||||||
<input type="hidden" name="txtStatus" id="txtStatus" />
|
|
||||||
<input type="hidden" name="txtRowCount" id="txtRowCount" />
|
<div class="form-group col-md-4">
|
||||||
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
|
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">
|
||||||
|
<span class="bold">Save as Draft</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group col-md-4">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group col-md-4" align="right">
|
||||||
|
|
||||||
|
<input type="hidden" name="txtPoRange" id="txtPoRange"/>
|
||||||
|
<input type="hidden" name="isEdit" id="isEdit" value="0"/>
|
||||||
|
<input type="hidden" name="txtStatus" id="txtStatus"/>
|
||||||
|
<input type="hidden" name="txtRowCount" id="txtRowCount"/>
|
||||||
|
<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()">
|
<input type="reset" class="btn btn-success" value="Reset" onclick="window.location.reload()">
|
||||||
<a class="btn btn-success Save" ID="Save" onclick="Save(0)"> <span class="bold">Save as Draft</span></a>
|
|
||||||
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)"> <span class="bold">Submit</span></a>
|
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">
|
||||||
|
<span class="bold">Submit</span>
|
||||||
|
</a>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<br />
|
<br />
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user