requisition module bug fix - vadivel J

This commit is contained in:
vadivelJ96 2024-09-11 14:33:26 +05:30
parent 0e09aba6dc
commit 102595424a
4 changed files with 156 additions and 127 deletions

View File

@ -1125,13 +1125,13 @@ if (!empty($getlogpodtl)) {
<td><?php echo $oldpo->PONO ?></td>
<!--
<?php if ($oldpo->logDate != '-') {
$logdate = date('d-m-Y', strtotime($oldpo->logDate));
} else {
$logdate = '-';
} ?>
<td><?= $logdate; ?></td> -->
<?php if ($oldpo->logDate != '-') {
$logdate = date('d-m-Y', strtotime($oldpo->logDate));
} else {
$logdate = '-';
} ?>
<td><?= $logdate; ?></td> -->
<td><?php echo $oldpo->LineItemNos; ?></td>
<td><?php echo $oldpo->entity ?></td>
<?php if ($oldpo->entity == 'PO DateChanged') {

View File

@ -46,6 +46,10 @@ if (!empty($ReqPOType)) {
border-color: rgb(32, 176, 130);
}
.th{
font-size: 14px;
}
</style>
<script type="text/javascript">
window.onload = function() {
@ -153,14 +157,14 @@ if (!empty($ReqPOType)) {
<table id="Items" class="table table-striped table-hover mb-0" style="font-size:12px;">
<thead>
<tr>
<th>SNo</th>
<th>Material Code</th>
<th>Material Name</th>
<th>Uom</th>
<th>RequestedQuantity</th>
<th>PoQuantity</th>
<th>Status</th>
<th>Action</th>
<th class="th">SNo</th>
<th class="th">Material Code</th>
<th class="th">Material Name</th>
<th class="th">Uom</th>
<th class="th">RequestedQuantity</th>
<th class="th">PoQuantity</th>
<th class="th">Status</th>
<th class="th">Action</th>
</tr>
</thead>
<tbody id="tempAppend">

View File

@ -741,7 +741,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
endforeach;
}
echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo"', 'class="form-control"');
echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo" class="form-control"');
?>
</div>
@ -782,7 +782,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
<div class="form-row">
<div class="form-group col-md-2">
<div class="form-group col-md-3">
<label>Item Code<span class="text-danger">*</span></label>
<!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
@ -792,14 +792,14 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
$options = array("0" => 'Item Code');
//print_r( $options);
echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control"');
echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode" class="form-control"');
?>
</div>
</div>
<div class="form-group col-md-2">
<div class="form-group col-md-3">
<label>Item Name</label>
<div>
<?php
@ -808,7 +808,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?>
</div>
</div>
<div class="form-group col-md-2">
<div class="form-group col-md-3">
<label>UOM</label>
<div>
<?php
@ -817,7 +817,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?>
</div>
</div>
<div class="form-group col-md-6" style="padding:0px;">
<div class="form-group col-md-3">
<label>Quantity<span class="text-danger">*</span></label>
<div>
@ -827,8 +827,19 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?>
</div>
</div>
<div class="form-group col-md-3">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-3">
</div>
<div class="form-group col-md-3">
<!-- <P id=labelRate> --> <label id=labelRate><?php echo "Rate in"; ?> <span class="text-danger">*</span></label><!-- </P> -->
<div>
<?php
@ -837,12 +848,14 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?>
</div>
</div>
<div class="form-group col-md-3">
<label>Per</label> <?php
$data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="form-group col-md-3" style="padding: 0px;">
<div class="form-group col-md-3" >
<!--<label>Basic Amount </label>-->
<!-- <p id=label2> --> <label id=label2><?php echo "Basic Value In"; ?></label><!-- </p> -->
<div>
@ -854,10 +867,16 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-3">
</div>
<div class="form-group col-md-3">
<!-- <p id=labelBasicpriceus> --> <label id=labelBasicpriceus><?php echo "Basic Price In"; ?></label><!-- </p> -->
@ -903,9 +922,13 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
</div>-->
<div class="form-row" style="border:1px solid #000;padding:0px;">
</div>
<div class="form-row " style="border:1px solid #000;padding:10px;margin-top:15px;">
<br />
<div class="form-group col-md-6" style="padding:0px;">
<div class="form-group col-md-6" style="padding:15px;">
<div class="form-row">
<div class="form-group col-md-4">
<!-- Basic Price: -->
@ -1044,7 +1067,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
</div>
<div class="form-group col-md-6" style="padding:0px;">
<div class="form-group col-md-6" style="padding:15px;">
<div class="form-row">
<div class="form-group col-md-4">
<!-- Additional Excise duty : (g) -->
@ -1068,10 +1092,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Additional Excise duty : (g) -->
@ -1095,8 +1115,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
<div class="form-row">
<div class="form-group col-md-8">
<!-- Gross duty payable -->
@ -1113,8 +1131,10 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
<br>
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-3">
<div class="form-group col-md-4">
<label>Freight Type </label>
<div>
<?php
@ -1144,7 +1164,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?>
</div>
</div>
<div class="form-group col-md-3">
<div class="form-group col-md-4">
<label>Freight Rate </label>
<div>
<?php
@ -1154,7 +1174,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
<div class="form-group col-md-3" style="padding-left: 0px;">
<div class="form-group col-md-4" style="padding-left: 0px;">
<label>Freight Amt In <?php echo $INR; ?></label>
<div>
<?php
@ -1166,12 +1186,13 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
<br>
<p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
<hr>
<br>
<div class="form-row">
<center><label>Cost of the product Per UOM</label></center>
<hr />
</div>
<div class="form-row">
<div class="form-group col-md-4">
<label>Duty Impact</label>
@ -1196,6 +1217,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
@ -1212,7 +1234,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
<div class="form-row">
<div class="form-row mt-2">
<div class="form-group col-md-4">
<!-- RMC Including Customers -->
<label><?php echo "Clearing Charges($INR)"; ?></label>
@ -1226,13 +1249,10 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
<div class="form-group col-md-4">
<!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div class="form-group col-md-4" style="margin-top: -4.8%">
<!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label>
<div>
<?php
$data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -1266,7 +1286,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
<div class="form-row">
<div class="form-row mt-3">
<div class="form-row">
<label style="text-align: left;">Import Description :</label>
<?php
@ -1275,7 +1297,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?>
</div>
</div>
</div>
</div>
</div>
@ -1346,8 +1367,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-2">
<div class="form-group col-md-3">
<label>Item Code<span class="text-danger">*</span></label>
<!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
@ -1372,14 +1394,14 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
?>
</div>
</div>
<div class="form-group col-md-2">
<div class="form-group col-md-3">
<label>Item Name</label>
<div>
<?php
@ -1388,7 +1410,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?>
</div>
</div>
<div class="form-group col-md-2">
<div class="form-group col-md-3">
<label>UOM</label>
<div>
<?php
@ -1397,8 +1419,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?>
</div>
</div>
<div class="form-group col-md-6" style="padding: 0px;">
<div class="form-group col-md-3">
<div class="form-group col-md-3">
<label>Quantity<span class="text-danger">*</span></label>
<div>
<?php
@ -1408,39 +1429,48 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?>
</div>
</div>
<div class="form-group col-md-3">
<!-- <P id=labelEditRate> --> <label id=labelEditRate><?php echo "Rate in"; ?> <span class="text-danger">*</span></label><!-- </P> -->
<!-- <label>Rate </label> -->
<div>
<?php
$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),calculateFreight(1)');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-3">
<label>Per</label> <?php
$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="form-group col-md-3" style="padding: 0px;">
<!-- <p id=label3> --><label id=label3><?php echo "Basic Value In"; ?></label><!-- </p> -->
<div>
<?php
//$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EdittxtBasicValue', 'value' => set_value('EdittxtBasicValue'), 'id' => 'EdittxtBasicValue', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-3"></div>
<div class="form-group col-md-3">
<!-- <P id=labelEditRate> --> <label id=labelEditRate><?php echo "Rate in"; ?> <span class="text-danger">*</span></label><!-- </P> -->
<!-- <label>Rate </label> -->
<div>
<?php
$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),calculateFreight(1)');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-3">
<label>Per</label> <?php
$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="form-group col-md-3" >
<!-- <p id=label3> --><label id=label3><?php echo "Basic Value In"; ?></label><!-- </p> -->
<div>
<?php
//$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'EdittxtBasicValue', 'value' => set_value('EdittxtBasicValue'), 'id' => 'EdittxtBasicValue', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-3">
</div>
<div class="form-group col-md-3">
<!-- <p id=labelEditBasicPriceUs> --><label id=labelEditBasicPriceUs><?php echo "Basic Value In"; ?></label><!-- </p> -->
@ -1482,13 +1512,17 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?>
</div>
</div>
<!--<div class="form-group col-md-3">
<a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
</div>-->
<div class="form-row" style="border:1px solid #000;padding:0px;">
</div>
<div class="form-row" style="border:1px solid #000;padding:10px;margin-top:15px;">
<br />
<div class="form-group col-md-6" style="padding:0px;">
<div class="form-group col-md-6" style="padding:15px;">
<div class="form-row">
<div class="form-group col-md-4">
<!-- Basic Price: -->
@ -1580,9 +1614,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Custom ED_cess : (e) -->
@ -1628,7 +1659,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
</div>
<div class="form-group col-md-6" style="padding:0px;">
<div class="form-group col-md-6" style="padding:15px;">
<div class="form-row">
<div class="form-group col-md-4">
<!-- Additional Excise duty : (g) -->
@ -1652,11 +1683,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Additional Excise duty : (g) -->
@ -1679,9 +1705,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-8">
<!-- Gross duty payable -->
@ -1696,8 +1719,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
</div>
<!--Start of Adding of Frieght model-->
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-3">
@ -1716,12 +1737,12 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
endforeach;
}
echo form_dropdown('drpeditFreight', $options, set_value('drpeditFreight'), 'id="drpeditFreight"', 'class="form-control "');
echo form_dropdown('drpeditFreight', $options, set_value('drpeditFreight'), 'id="drpeditFreight" class="form-control "');
?>
</div>
</div>
<div class="form-group col-md-3" id="editTripsValue" style="display:block;">
<div class="form-group col-md-3" id="editTripsValue" style="display:none;">
<label>NO Of Trips</label>
<div>
<?php
@ -1730,6 +1751,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?>
</div>
</div>
<div class="form-group col-md-3">
<label>Freight Rate </label>
<div>
@ -1753,10 +1775,12 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
<!--End of Adding of freight in edit model -->
<div class="form-row">
<center> <label>Cost of the product Per UOM</label></center>
<hr />
</div>
<br>
<p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
<hr>
<br>
<div class="form-row">
<div class="form-group col-md-4">
<label>Duty Impact </label>
@ -1798,13 +1822,12 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- RMC Including Customers -->
<label><?php echo "Clearing Charges ($INR)"; ?></label>
</div>
<div class="form-row mt-2">
<div class="form-group col-md-4">
<div>
<!-- RMC Including Customers -->
<label><?php echo "Clearing Charges ($INR)"; ?></label>
<?php
$data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
echo form_input($data);
@ -1853,10 +1876,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
</div>
<div class="form-row">
<div class="form-row mt-3">
<div class="form-row">
<label>Import Description :</label>
<?php
@ -4181,7 +4202,7 @@ $('#ImportAppend').append(rowHtml);
} else {
$('#content').loader('show');
// $('#content').loader('show');
var formData = new FormData($('.ImportPO')[0]);
formData.append('txtRowCount', txtRowCount);
formData.append('txtDeletedRow', txtDeletedRow);
@ -4196,7 +4217,7 @@ $('#ImportAppend').append(rowHtml);
contentType: false,
success: function(data) {
if (data) {
$('#content').loader('hide');
// $('#content').loader('hide');
alert(data);
$('#txtRowCount').val('');
$('#txtDeletedRow').val('');

View File

@ -25,6 +25,10 @@ if (!empty($Emp)) {
border-color: rgb(32, 176, 130);
}
.th{
font-size: 14px;
}
</style>
<div class="content-page">
<div class="content">
@ -135,12 +139,12 @@ if (!empty($Emp)) {
<table id="Items" class="table table-striped table-hover mb-0" style="font-size:12px;">
<thead>
<tr>
<th>SNo</th>
<th>Material Code</th>
<th>Material Name</th>
<th>Uom</th>
<th>Quantity</th>
<th>Action</th>
<th class="th">SNo</th>
<th class="th">Material Code</th>
<th class="th">Material Name</th>
<th class="th">Uom</th>
<th class="th">Quantity</th>
<th class="th">Action</th>
</tr>
</thead>
<tbody id="tempAppend"></tbody>