edit Revenue purchase order bug fix - vadivel J

This commit is contained in:
vadivel J 2024-09-25 15:03:37 +05:30
parent 75de367f59
commit f758e9a938
2 changed files with 319 additions and 266 deletions

View File

@ -2313,7 +2313,7 @@ if (!empty($INRSYMBOL)) {
<div class="content-page">
<div class="content">
<div class="container-fluid">
<div class="row">
<div class="row mb-1">
<div class="col-6">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Emergency Purchase Order</h4>
@ -2321,6 +2321,8 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<?php
$attributes = array('class' => 'form-label-left CreatealterPO ', 'name' => 'CreatealterPO', 'id' => 'CreatealterPO');
echo form_open(base_url() . '/purchaseorder/addalterPO/', $attributes); ?>
@ -2328,7 +2330,7 @@ if (!empty($INRSYMBOL)) {
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-body">
<div class="card-body p-4">
<div class="row">
<div class="col-md-3">
<label>Request Type <span class="badge mandatory">*</span></label>
@ -2744,10 +2746,300 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<!-- table showing line items selected -->
<table class="table table-bordered ">
<div class="box-body">
<table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;">
<thead>
<tr>
<th>SNo</th>
<th>Requisition No</th>
<th>Item Code</th>
<th>Item Description</th>
<th>Quantity</th>
<th>UOM</th>
<th>Rate<?php echo "($INRSYM)" ?></th>
<th>Basic Amount<?php echo "($INRSYM)" ?></th>
<th>Tax Amount<?php echo "($INRSYM)" ?></th>
<th>Total Order Amount<?php echo "($INRSYM)" ?></th>
<th>Action</th>
</tr>
</thead>
<tbody id="ServiceAppend"></tbody>
<tbody id="RevenueAppend"></tbody>
</table>
</div>
</table>
<div class="row px-3" id="potaxes" style="display:none;" >
<div class="col-md-12 p-4">
<div class="row">
<!-- Revenue po taxes -->
<div class="col-md-12" style='border : 1px solid; display:none;'
id="revenuepotaxes">
<br />
<div class="row">
<div class="col-md-3">
<label>Basic Amount <?php echo "($INRSYM)" ?> </label>
<?php
$data = array('name' => 'txtTotBasicAmountRevenue', 'value' => set_value('txtTotBasicAmountRevenue'), 'id' => 'txtTotBasicAmountRevenue', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-3">
<label>Total Discount <?php echo "($INRSYM)" ?> </label>
<?php
$data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount'), 'id' => 'txtTotalDiscount', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-3">
<label>CGST <?php echo "($INRSYM)" ?> </label>
<?php
$data = array('name' => 'txtTotalCGST', 'value' => set_value('txtTotalCGST'), 'id' => 'txtTotalCGST', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-3" id="displaySGST">
<label>SGST <?php echo "($INRSYM)" ?> </label>
<?php
$data = array('name' => 'txtTotalSGST', 'value' => set_value('txtTotalSGST'), 'id' => 'txtTotalSGST', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-3" id="displayIGST" style="display:none;">
<label> IGST <?php echo "($INRSYM)" ?> </label>
<?php
$data = array('name' => 'txtTotalIGST', 'value' => set_value('txtTotalIGST'), 'id' => 'txtTotalIGST', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<br/>
<div class="row">
<div class="col-md-3">
<label>Total Packaging <?php echo "($INRSYM)" ?> </label>
<?php
$data = array('name' => 'txtTotalPackaing', 'value' => set_value('txtTotalPackaing'), 'id' => 'txtTotalPackaing', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-3">
<label>Total Insurance <?php echo "($INRSYM)" ?> </label>
<?php
$data = array('name' => 'txtTotalInsurance', 'value' => set_value('txtTotalInsurance'), 'id' => 'txtTotalInsurance', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-3">
<label>Total Freight <?php echo "($INRSYM)" ?></label>
<?php
$data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight'), 'id' => 'txtTotalFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-3">
<label>Total Order Value <?php echo "($INRSYM)" ?></label>
<?php
$data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary'), 'id' => 'txtTotalOrderValueSummary', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<br/>
<div class="row">
<div class="col-md-12">
<label>Special Instructions </label>
<?php
$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '8');
echo form_textarea($data);
?>
</div>
</div>
<br/>
<div class="row">
<div class="col-md-12">
<label>
Select Purchase Order File
</label><br>
<input type="file" name="POFiles" id="POFiles"><br>
</div>
</div>
<div class="row">
<div class="col-md-12 col-md-offset-9 text-right"><br />
<input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus1" id="txtStatus1" />
<input type="hidden" name="txtRowCount1" id="txtRowCount1" />
<input type="hidden" name="txtDeletedRow1" id="txtDeletedRow1" />
<input type="hidden" name="CheckLocalInter" id="CheckLocalInter" />
<input type="hidden" name="Budget" id="Budget" />
<input type="hidden" name="txtSpecial" id="txtSpecial" />
<input type="hidden" name="txtQuality" id="txtQuality" />
<!-- <a class="btn btn-success Save" ID="Save" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
<a class="btn btn-reset Save" ID="Cancel"
href="<?php echo base_url() . 'EmergencyPO'; ?>"
style="background-color: red;color: white;">&nbsp;&nbsp;<span
class="bold">Reset</span></a>
<a class="btn btn-success Submit" ID="Submit"
onclick="showsubmit()">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
</div>
</div>
<br/>
<div class="row" style="padding:0px;"><br />
</div>
</div>
<!-- Service po taxes -->
<div class="col-md-12" style="border: 1px solid; display:none;"
id="servicepotaxes">
<br>
<div class="row">
<div class="col-md-3">
<label>Basic Amount ()</label>
<input type="text" name="txtTotBasicAmount" value=""
id="txtTotBasicAmount" class="form-control num" readonly="true">
</div>
<div class="col-md-3">
<label>CGST ()</label>
<input type="text" name="txtTotCgst" value="" id="txtTotCgst"
class="form-control num" readonly="true">
</div>
<div class="col-md-3">
<label>SGST ()</label>
<input type="text" name="txtTotSgst" value="" id="txtTotSgst"
class="form-control num" readonly="true">
</div>
<div class="col-md-3">
<label>IGST ()</label>
<input type="text" name="txtTotIgst" value="" id="txtTotIgst"
class="form-control num" readonly="true">
</div>
</div>
<br>
<div class="row">
<div class="col-md-3">
<label>Other Allowances ()</label>
<input type="text" name="txtTotOtherAllo" value=""
id="txtTotOtherAllo" class="form-control num" readonly="true">
</div>
<div class="col-md-3">
<label>Total Order Value ()</label>
<input type="text" name="txtTotalOrderValueSummaryService" value=""
id="txtTotalOrderValueSummaryService" class="form-control num"
readonly="true">
</div>
</div>
<br>
<div class="row">
<div class="col-md-12">
<label>Description Of Service <span
class="badge mandatory">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'emergdescofpo', 'value' => set_value('emergdescofpo'), 'id' => 'emergdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data);
?>
</div>
</div>
</div>
<br>
<div class="row">
<div class="col-md-12">
<label>Scope Of Work</label>
<div class="form-group">
<?php
$data = array('name' => 'ScopeOfWork', 'value' => set_value('ScopeOfWork'), 'id' => 'ScopeOfWork', 'class' => 'form-control', 'rows' => '8');
echo form_textarea($data); ?>
</div>
</div>
</div>
<br>
<div class="row">
<div class="col-md-12">
<label>
Select Purchase Order File
</label><br>
<input type="file" name="POFile" id="POFile"><br>
</div>
</div>
<div class="row">
<div class="col-md-12 col-md-offset-9 text-right"><br>
<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="SpcialInstruction"
id="SpcialInstruction">
<input type="hidden" name="txtDeliveryAddress"
id="txtDeliveryAddress">
<input type="hidden" name="txtSpecialservice"
id="txtSpecialservice">
<input type="hidden" name="txtworkstatus" id="txtworkstatus">
<a class="btn btn-reset Save" ID="Cancel"
href="<?php echo base_url() . 'EmergencyPO'; ?>"
style="background-color: red;color: white;">&nbsp;&nbsp;<span
class="bold">Reset</span></a>
<a class="btn btn-success Submit" id="Submit"
onclick="showsubmit()">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
</div>
</div>
<br>
<div class="row" style="padding:0px;"><br>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- All model -->
<div class="row p-2">
<table class="table table-bordered ">
<div align="right" style="padding-right:10px">
<div style="padding-right:10px">
<!-- Model for revenue PO -->
<div id="REVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
@ -2755,13 +3047,15 @@ if (!empty($INRSYMBOL)) {
<div class="modal-dialog">
<!-- Modal content-->
<form>
<div class="modal-content" style="width:1060px;">
<div class="modal-content " style="width:1060px;">
<div class="modal-header">
<center>
<h4>Select Revenue Purchase Order Line Item </h4>
</center>
</div>
<div align="left" style="padding: 31px;">
<div style="padding: 31px;">
<div class="row">
<div class="col-md-3">
<label>Item Code<span class="badge mandatory">*</span></label>
@ -3097,6 +3391,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
@ -3115,13 +3410,14 @@ if (!empty($INRSYMBOL)) {
<div class="modal-dialog">
<!-- Modal content-->
<form>
<div class="modal-content" style="width:1000px;">
<div class="modal-content" style="width:1060px;">
<div class="modal-header">
<center>
<h4>Add Service Purchase Order Item </h4>
</center>
</div>
<div style="padding: 31px;">
<div align="left" style="padding: 31px;">
<div class="row">
<div class="col-md-3">
@ -3217,7 +3513,7 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="col-md-3 text-right">
CGST In %
<label> CGST In %</label>
</div>
<div class="col-md-3">
<div class="form-group">
@ -3241,7 +3537,7 @@ if (!empty($INRSYMBOL)) {
<div class="col-md-3">
</div>
<div class="col-md-3 text-right">
SGST In %
<label> SGST In % </label>
</div>
<div class="col-md-3">
<div class="form-group">
@ -3265,7 +3561,7 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="col-md-3 text-right">
IGST In %
<label> IGST In % </label>
</div>
<div class="col-md-3">
<div class="form-group">
@ -3361,9 +3657,9 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
</div> -->
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
<div class="row">
<div class="col-md-12" >
<label>Service Description<span
class="badge mandatory">*</span></label>
<?php
@ -4356,253 +4652,10 @@ if (!empty($INRSYMBOL)) {
<br />
</div>
<div class="box-body">
<table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;">
<thead>
<tr>
<th>SNo</th>
<th>Requisition No</th>
<th>Item Code</th>
<th>Item Description</th>
<th>Quantity</th>
<th>UOM</th>
<th>Rate<?php echo "($INRSYM)" ?></th>
<th>Basic Amount<?php echo "($INRSYM)" ?></th>
<th>Tax Amount<?php echo "($INRSYM)" ?></th>
<th>Total Order Amount<?php echo "($INRSYM)" ?></th>
<th>Action</th>
</tr>
</thead>
<tbody id="ServiceAppend"></tbody>
<tbody id="RevenueAppend"></tbody>
</table>
</div>
</table>
<!-- /.box-body -->
</div>
<div class="row " id="potaxes" style="display:none;" >
<div class="col-md-12 p-4">
<div class="row">
<!-- Revenue po taxes -->
<div class="col-md-12" style='border : 1px solid; display:none;'
id="revenuepotaxes">
<br />
<div class="row">
<div class="col-md-3">
<label>Basic Amount <?php echo "($INRSYM)" ?> </label>
<?php
$data = array('name' => 'txtTotBasicAmountRevenue', 'value' => set_value('txtTotBasicAmountRevenue'), 'id' => 'txtTotBasicAmountRevenue', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-3">
<label>Total Discount <?php echo "($INRSYM)" ?> </label>
<?php
$data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount'), 'id' => 'txtTotalDiscount', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-3">
<label>CGST <?php echo "($INRSYM)" ?> </label>
<?php
$data = array('name' => 'txtTotalCGST', 'value' => set_value('txtTotalCGST'), 'id' => 'txtTotalCGST', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-3" id="displaySGST">
<label>SGST <?php echo "($INRSYM)" ?> </label>
<?php
$data = array('name' => 'txtTotalSGST', 'value' => set_value('txtTotalSGST'), 'id' => 'txtTotalSGST', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-3" id="displayIGST" style="display:none;">
<label> IGST <?php echo "($INRSYM)" ?> </label>
<?php
$data = array('name' => 'txtTotalIGST', 'value' => set_value('txtTotalIGST'), 'id' => 'txtTotalIGST', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="row">
<div class="col-md-3">
<label>Total Packaging <?php echo "($INRSYM)" ?> </label>
<?php
$data = array('name' => 'txtTotalPackaing', 'value' => set_value('txtTotalPackaing'), 'id' => 'txtTotalPackaing', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-3">
<label>Total Insurance <?php echo "($INRSYM)" ?> </label>
<?php
$data = array('name' => 'txtTotalInsurance', 'value' => set_value('txtTotalInsurance'), 'id' => 'txtTotalInsurance', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-3">
<label>Total Freight <?php echo "($INRSYM)" ?></label>
<?php
$data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight'), 'id' => 'txtTotalFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-3">
<label>Total Order Value <?php echo "($INRSYM)" ?></label>
<?php
$data = array('name' => 'txtTotalOrderValueSummary', 'value' => set_value('txtTotalOrderValueSummary'), 'id' => 'txtTotalOrderValueSummary', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="row">
<div class="col-md-12">
<label>Special Instructions </label>
<?php
$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '8');
echo form_textarea($data);
?>
</div>
</div>
<div class="row">
<div class="col-md-12 col-md-offset-9 text-right"><br />
<input type="file" name="POFiles" id="POFiles"><br>
<input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus1" id="txtStatus1" />
<input type="hidden" name="txtRowCount1" id="txtRowCount1" />
<input type="hidden" name="txtDeletedRow1" id="txtDeletedRow1" />
<input type="hidden" name="CheckLocalInter" id="CheckLocalInter" />
<input type="hidden" name="Budget" id="Budget" />
<input type="hidden" name="txtSpecial" id="txtSpecial" />
<input type="hidden" name="txtQuality" id="txtQuality" />
<!-- <a class="btn btn-success Save" ID="Save" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
<a class="btn btn-reset Save" ID="Cancel"
href="<?php echo base_url() . 'EmergencyPO'; ?>"
style="background-color: red;color: white;">&nbsp;&nbsp;<span
class="bold">Reset</span></a>
<a class="btn btn-success Submit" ID="Submit"
onclick="showsubmit()">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
</div>
</div>
<div class="row" style="padding:0px;"><br />
</div>
</div>
<!-- Service po taxes -->
<div class="col-md-12" style="border: 1px solid; display:none;"
id="servicepotaxes">
<br>
<div class="row">
<div class="col-md-3">
<label>Basic Amount ()</label>
<input type="text" name="txtTotBasicAmount" value=""
id="txtTotBasicAmount" class="form-control num" readonly="true">
</div>
<div class="col-md-3">
<label>CGST ()</label>
<input type="text" name="txtTotCgst" value="" id="txtTotCgst"
class="form-control num" readonly="true">
</div>
<div class="col-md-3">
<label>SGST ()</label>
<input type="text" name="txtTotSgst" value="" id="txtTotSgst"
class="form-control num" readonly="true">
</div>
<div class="col-md-3">
<label>IGST ()</label>
<input type="text" name="txtTotIgst" value="" id="txtTotIgst"
class="form-control num" readonly="true">
</div>
</div>
<div class="row">
<div class="col-md-3">
<label>Other Allowances ()</label>
<input type="text" name="txtTotOtherAllo" value=""
id="txtTotOtherAllo" class="form-control num" readonly="true">
</div>
<div class="col-md-3">
<label>Total Order Value ()</label>
<input type="text" name="txtTotalOrderValueSummaryService" value=""
id="txtTotalOrderValueSummaryService" class="form-control num"
readonly="true">
</div>
</div>
<div class="row">
<div class="col-md-12">
<label>Description Of Service <span
class="badge mandatory">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'emergdescofpo', 'value' => set_value('emergdescofpo'), 'id' => 'emergdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data);
?>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<label>Scope Of Work</label>
<div class="form-group">
<?php
$data = array('name' => 'ScopeOfWork', 'value' => set_value('ScopeOfWork'), 'id' => 'ScopeOfWork', 'class' => 'form-control', 'rows' => '8');
echo form_textarea($data); ?>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 col-md-offset-9 text-right"><br>
<input type="file" name="POFile" id="POFile"><br>
<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="SpcialInstruction"
id="SpcialInstruction">
<input type="hidden" name="txtDeliveryAddress"
id="txtDeliveryAddress">
<input type="hidden" name="txtSpecialservice"
id="txtSpecialservice">
<input type="hidden" name="txtworkstatus" id="txtworkstatus">
<a class="btn btn-reset Save" id="Cancel"
href="http://localhost/ria/EmergencyPO">&nbsp;&nbsp;<span
class="bold">Reset</span></a>
<a class="btn btn-success Submit" id="Submit"
onclick="showsubmit()">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
</div>
</div>
<div class="row" style="padding:0px;"><br>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@ -4620,7 +4673,7 @@ if (!empty($INRSYMBOL)) {
<div id="packagingcalmodel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false"
style="display: none;">
<div class="modal-dialog modal-lg">
<div class="modal-dialog modal-sm">
<div class="modal-content"
>
<div class="modal-header">
@ -4839,7 +4892,7 @@ if (!empty($INRSYMBOL)) {
<div id="freightmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
<div class="modal-dialog modal-lg">
<div class="modal-dialog modal-sm">
<!-- Modal content-->
<div class="modal-content">

View File

@ -1931,14 +1931,14 @@ if (!empty($getlogpodtl)) {
<!-- end page title -->
<!-- Form row -->
<div class="row">
<div class="col-12">
<div class="col-md-12">
<div class="card">
<div class="card-body">
<div class="card-body p-4">
<?php
$attributes = array('class' => 'form-label-left CreatePO ', 'name' => 'CreatePO', 'id' => 'CreatePO');
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes);
?>
<div class="container-fluid">
<div class="form-row">
<div class="form-group col-md-3">
@ -2670,7 +2670,7 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
</div>
</div> <!-- end card body-->
</div> <!-- end card -->
</div><!-- end col-->