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

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
Smart 2024-10-07 09:33:26 +05:30
commit 21b25663d5
6 changed files with 977 additions and 893 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/Views/EditservicePurchaseorder.php
View File

@ -1551,7 +1551,7 @@ if (!empty($getlogpodtl)) {
<!-- Model for servicepo --> <!-- Model for servicepo -->
<div id="SERVICE" class="modal fade" tabindex="-1" role="dialog" <div id="SERVICE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width" style="width: 1200px; !important"> <div class="modal-dialog modal-full-width" style="width: 1060px; !important">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Add Service Purchase Order Item</h4> <h4 class="modal-title">Add Service Purchase Order Item</h4>
@ -1684,8 +1684,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="row"> <div class="row">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
<label> CGST In % </label>
CGST In %
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -1706,8 +1706,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="row"> <div class="row">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
<label> SGST In % </label>
SGST In %
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -1728,8 +1728,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="row"> <div class="row">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
<label> IGST In % </label>
IGST In %
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -1829,7 +1829,7 @@ if (!empty($getlogpodtl)) {
<!-- Edit Service Modal content Starts Here--> <!-- Edit Service Modal content Starts Here-->
<div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog" <div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width"> <div class="modal-dialog modal-full-width" style="width: 1060px; !important">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Edit Service Purchase Order Item</h4> <h4 class="modal-title">Edit Service Purchase Order Item</h4>
@ -1969,8 +1969,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
<label> CGST In % </label>
CGST In %
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -1993,8 +1993,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
<label> SGST In % </label>
SGST In %
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<div> <div>
@ -2019,7 +2019,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
IGST In % <label> IGST In % </label>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<div> <div>

1443
app/Views/alterpurchaseorder.php
View File

File diff suppressed because it is too large Load Diff

137
app/Views/editCapitalPo.php
View File

@ -1586,7 +1586,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div id="CAPITAL" class="modal fade" tabindex="-1" role="dialog" <div id="CAPITAL" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width"> <div class="modal-dialog modal-full-width" style="width :1060px !important ;">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Add Capital Purchase Order Item</h4> <h4 class="modal-title">Add Capital Purchase Order Item</h4>
@ -1596,7 +1596,7 @@ if (!empty($getlogpodtl)) {
<form> <form>
<div class="modal-body p-4"> <div class="modal-body p-4">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-2" style="padding:0px"> <div class="form-group col-md-3" style="padding:0px">
<label>Req No<span class="text-danger">*</span></label> <label>Req No<span class="text-danger">*</span></label>
<div> <div>
@ -1616,7 +1616,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Department Name</label> <label>Department Name</label>
<div> <div>
<?php <?php
@ -1625,7 +1625,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Cost Center Code</label> <label>Cost Center Code</label>
<div> <div>
<?php <?php
@ -1636,7 +1636,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Avail Bud Amount<?php echo "($INR)" ?></label> <label>Avail Bud Amount<?php echo "($INR)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1644,8 +1644,12 @@ if (!empty($getlogpodtl)) {
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2" id="ExchangeRateModalDiv" style="display:none;padding-right: 0px;"> </div>
<div class="form-row">
<div class="form-group col-md-9"></div>
<div class="form-group col-md-3" id="ExchangeRateModalDiv" style="display:none;padding-right: 0px;">
<label> Exchange Rate</label> <label> Exchange Rate</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1657,7 +1661,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-row"> <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> <label>Item Code<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
@ -1666,7 +1670,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Item Name</label> <label>Item Name</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1675,7 +1679,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-1"> <div class="form-group col-md-3">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1684,7 +1688,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Quantity<span class="text-danger">*</span></label> <label>Quantity<span class="text-danger">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1693,7 +1697,12 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2" style="padding: 0px;">
</div>
<div class="form-row">
<div class="form-group col-md-3"></div>
<div class="form-group col-md-3" style="padding: 0px;">
<label id="RateIn">Rate(In INR /UOM)</label><span class="text-danger">*</span> <label id="RateIn">Rate(In INR /UOM)</label><span class="text-danger">*</span>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1702,12 +1711,12 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-1"> <div class="form-group col-md-3">
<label>Per</label> <?php <label>Per</label> <?php
$data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer', 'class' => 'form-control'); $data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer', 'class' => 'form-control');
echo form_input($data); ?> echo form_input($data); ?>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label id="TotalAmount">Basic value <?php echo "($INR)" ?></label> <label id="TotalAmount">Basic value <?php echo "($INR)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1716,6 +1725,8 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div> </div>
<div class="form-row" id="ADDCAPdiv" style="padding:0px;"> <div class="form-row" id="ADDCAPdiv" style="padding:0px;">
@ -1791,7 +1802,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
CGST In % <label> CGST In % </label>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -1816,8 +1827,8 @@ if (!empty($getlogpodtl)) {
<div class="form-row" id="ADDCAPdiv3" style="padding:0px"> <div class="form-row" id="ADDCAPdiv3" style="padding:0px">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
<label> SGST In % </label>
SGST In %
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -1845,7 +1856,7 @@ if (!empty($getlogpodtl)) {
<div class="form-row" id="ADDCAPdiv2" style="padding:0px"> <div class="form-row" id="ADDCAPdiv2" style="padding:0px">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
IGST In % <label> IGST In % </label>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -2229,7 +2240,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-row" style="padding: 20px 30px 10px 30px;text-align: left;"> <div class="form-row" >
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label>Capital Description </label> <label>Capital Description </label>
<?php <?php
@ -2248,7 +2259,7 @@ if (!empty($getlogpodtl)) {
</div><!-- /.modal --> </div><!-- /.modal -->
<div id="EDITCAPITAL" class="modal fade" tabindex="-1" role="dialog" <div id="EDITCAPITAL" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width"> <div class="modal-dialog modal-full-width" style="width: 1060px !important;">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Edit Capital Purchase Order Item</h4> <h4 class="modal-title">Edit Capital Purchase Order Item</h4>
@ -2258,7 +2269,7 @@ if (!empty($getlogpodtl)) {
<form> <form>
<div class="modal-body p-4"> <div class="modal-body p-4">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Req No<span class="text-danger">*</span></label> <label>Req No<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
@ -2277,7 +2288,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Department Name</label> <label>Department Name</label>
<div> <div>
<?php <?php
@ -2287,7 +2298,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Cost Center Code</label> <label>Cost Center Code</label>
<div> <div>
<?php <?php
@ -2298,7 +2309,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Avail Bud Amount<?php echo "($INR)" ?></label> <label>Avail Bud Amount<?php echo "($INR)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2307,7 +2318,12 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2" id="ExchangeRateModalEditDiv" style="display:none;">
</div>
<div class="form-row">
<div class="form-group col-md-9"></div>
<div class="form-group col-md-3" id="ExchangeRateModalEditDiv" style="display:none;">
<label> Exchange Rate</label> <label> Exchange Rate</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2319,7 +2335,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-row" style="padding: 0px;"> <div class="form-row" style="padding: 0px;">
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Item Code<span class="text-danger">*</span></label> <label>Item Code<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
@ -2328,7 +2344,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Item Name</label> <label>Item Name</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2337,7 +2353,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-1"> <div class="form-group col-md-3">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2346,7 +2362,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Quantity<span class="text-danger">*</span></label> <label>Quantity<span class="text-danger">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2355,29 +2371,37 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2" style="padding: 0px;"> </div>
<label id="EditRateIn">Rate(in INR/UOM)</label><span class="text-danger">*</span>
<div class="form-group"> <div class="form-row">
<?php
$data = array('name' => 'EditCPRate', 'value' => set_value('EditCPRate'), 'id' => 'EditCPRate', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()'); <div class="form-group col-md-3"></div>
echo form_input($data); <div class="form-group col-md-3" style="padding: 0px;">
?> <label id="EditRateIn">Rate(in INR/UOM)</label><span class="text-danger">*</span>
<div class="form-group">
<?php
$data = array('name' => 'EditCPRate', 'value' => set_value('EditCPRate'), 'id' => 'EditCPRate', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()');
echo form_input($data);
?>
</div>
</div> </div>
</div>
<div class="form-group col-md-1"> <div class="form-group col-md-3">
<label>Per</label> <?php <label>Per</label> <?php
$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control'); $data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control');
echo form_input($data); ?> echo form_input($data); ?>
</div>
<div class="form-group col-md-2" style="padding-right: 0px;">
<label id="EditTotalAmount">Basic value <?php echo "($INR)" ?></label>
<div class="form-group">
<?php
$data = array('name' => 'EditCPTotalAmount', 'value' => set_value('EditCPTotalAmount'), 'id' => 'EditCPTotalAmount', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div> </div>
</div>
<div class="form-group col-md-3" style="padding-right: 0px;">
<label id="EditTotalAmount">Basic value <?php echo "($INR)" ?></label>
<div class="form-group">
<?php
$data = array('name' => 'EditCPTotalAmount', 'value' => set_value('EditCPTotalAmount'), 'id' => 'EditCPTotalAmount', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div> </div>
<div class="form-row" style="padding:0px;" id="EDITCAPdiv"> <div class="form-row" style="padding:0px;" id="EDITCAPdiv">
@ -2457,8 +2481,9 @@ if (!empty($getlogpodtl)) {
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-6" align="right">
CGST In % <div class="form-group col-md-6" align="right">
<label> CGST In % <label>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -2482,7 +2507,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-row" id="EDITCAPdiv1"> <div class="form-row" id="EDITCAPdiv1">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
SGST In % <label> SGST In % </label>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<div class="form-group"> <div class="form-group">
@ -2507,7 +2532,7 @@ if (!empty($getlogpodtl)) {
<div class="form-row" id="EDITCAPdiv2"> <div class="form-row" id="EDITCAPdiv2">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
IGST In % <label> IGST In % </label>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -2881,8 +2906,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row" style="padding: 0px 30px 10px 30px;text-align: left;"> <div class="form-row" >
<div class="form-group col-md-11"> <div class="form-group col-md-12">
<label>Capital Description </label> <label>Capital Description </label>
<?php <?php
$data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); $data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');

237
app/Views/editRevenuepurchaseorder.php
View File

@ -647,10 +647,10 @@ if (!empty($getlogpodtl)) {
if (FreightType == "PER TRIP") { if (FreightType == "PER TRIP") {
$('#TripsValue').show(); $('#TripsValue').show();
$(this).parent().removeClass('col-md-4').addClass('col-md-2');
} else { } else {
$('#TripsValue').hide(); $('#TripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-4');
} }
selValue = $("#drpFreight").val(); selValue = $("#drpFreight").val();
@ -696,15 +696,16 @@ if (!empty($getlogpodtl)) {
$('#EDITREVENUE').modal('show'); $('#EDITREVENUE').modal('show');
} }
}); });
EditservicePurchaseorder
$('#drpEditFreight').change(function() { $('#drpEditFreight').change(function() {
var FreightType = $("#drpEditFreight").val(); var FreightType = $("#drpEditFreight").val();
if (FreightType == "PER TRIP") { if (FreightType == "PER TRIP") {
$('#EditTripsValue').show(); $('#EditTripsValue').show();
$(this).parent().removeClass('col-md-4').addClass('col-md-2');
} else { } else {
$('#EditTripsValue').hide(); $('#EditTripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-4');
} }
selValue = $("#drpEditFreight").val(); selValue = $("#drpEditFreight").val();
@ -2730,7 +2731,7 @@ if (!empty($getlogpodtl)) {
<!-- Add Model for revenue po --> <!-- Add Model for revenue po -->
<div id="REVENUE" class="modal fade" tabindex="-1" role="dialog" <div id="REVENUE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width"> <div class="modal-dialog modal-full-width" style="width: 1060px !important;">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Select Revenue Purchase Order Line Item</h4> <h4 class="modal-title">Select Revenue Purchase Order Line Item</h4>
@ -2785,7 +2786,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row"> <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> <label>Item Code<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
@ -2796,7 +2797,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Item Name</label> <label>Item Name</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2805,7 +2806,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-1"> <div class="form-group col-md-3">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2814,7 +2815,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Quantity<span class="text-danger">*</span></label> <label>Quantity<span class="text-danger">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2823,7 +2824,12 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2">
</div>
<div class="form-row">
<div class="col-md-3"></div>
<div class="form-group col-md-3">
<label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger">*</span></label> <label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2832,12 +2838,12 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-1"> <div class="form-group col-md-3">
<label>Per</label> <?php <label>Per</label> <?php
$data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer', 'class' => 'form-control'); $data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer', 'class' => 'form-control');
echo form_input($data); ?> echo form_input($data); ?>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label><?php echo "Basic Amt ($INRSYM)"; ?></label> <label><?php echo "Basic Amt ($INRSYM)"; ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2847,9 +2853,10 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"></div> <div class="form-group col-md-3"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-3">
<label>Discount Type </label> <label>Discount Type </label>
<div> <div>
<?php <?php
@ -2864,7 +2871,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Discount Rate </label> <label>Discount Rate </label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2873,7 +2880,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Discounted Amt <?php echo "($INRSYM)" ?></label> <label>Discounted Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2884,8 +2891,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row" style="text-align:left;"> <div class="form-row" style="text-align:left;">
<div class="form-group col-md-4"></div> <div class="form-group col-md-3"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-3">
<label>Packaging Type </label> <label>Packaging Type </label>
<div> <div>
<?php <?php
@ -2900,7 +2907,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Packaging Rate </label> <label>Packaging Rate </label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2909,7 +2916,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Packaging Amt <?php echo "($INRSYM)" ?></label> <label>Packaging Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2920,8 +2927,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"></div> <div class="form-group col-md-3"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-3">
<label>Freight Type </label> <label>Freight Type </label>
<?php <?php
$options = array("0" => 'Select Freight Type'); $options = array("0" => 'Select Freight Type');
@ -2933,17 +2940,8 @@ if (!empty($getlogpodtl)) {
} }
echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "'); echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
?> ?>
</div> </div>
<div class="form-group col-md-2" id="TripsValue" style="display:none;"> <div class="form-group col-md-3">
<label>NO Of Trips</label>
<div class="form-group">
<?php
$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-2">
<label>Freight Rate </label> <label>Freight Rate </label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2952,7 +2950,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Freight Amt <?php echo "($INRSYM)" ?></label> <label>Freight Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2962,9 +2960,23 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-3" id="TripsValue" style="display:none;">
<label>NO Of Trips</label>
<div class="form-group">
<?php
$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6"></div>
<div class="form-group col-md-3">
<label>CGST In %</label> <label>CGST In %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2973,7 +2985,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>CGST Amt <?php echo "($INRSYM)" ?></label> <label>CGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2984,8 +2996,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row" id="SGSTAddModel"> <div class="form-row" id="SGSTAddModel">
<div class="form-group col-md-8"></div> <div class="form-group col-md-6"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>SGST In %</label> <label>SGST In %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2994,7 +3006,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>SGST Amt <?php echo "($INRSYM)" ?></label> <label>SGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3004,10 +3016,10 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
</div> </div>
<div class="form-row" style="text-align:left;"> <div class="form-row" id="IGSTAddModel" style="display:none;" >
<div id="IGSTAddModel" style="display:none;">
<div class="form-group col-md-8"></div> <div class="form-group col-md-6"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>IGST In %</label> <label>IGST In %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3016,7 +3028,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>IGST Amt <?php echo "($INRSYM)" ?></label> <label>IGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3025,11 +3037,11 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-3">
<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label> <label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3040,8 +3052,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-3">
<label><?php echo "Total Order Amt ($INRSYM)"; ?></label> <label><?php echo "Total Order Amt ($INRSYM)"; ?></label>
<?php <?php
$data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue'), 'id' => 'txtTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue'), 'id' => 'txtTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true');
@ -3073,7 +3085,7 @@ if (!empty($getlogpodtl)) {
<!-- Edit Model for revenue po --> <!-- Edit Model for revenue po -->
<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog" <div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width"> <div class="modal-dialog modal-full-width" style="width: 1060px;">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4> <h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4>
@ -3125,7 +3137,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row"> <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> <label>Item Code<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
@ -3137,7 +3149,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Item Name</label> <label>Item Name</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3146,7 +3158,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-1"> <div class="form-group col-md-3">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3155,7 +3167,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Quantity<span class="text-danger">*</span></label> <label>Quantity<span class="text-danger">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3164,7 +3176,11 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> </div>
<div class="form-row">
<div class="form-group col-md-3"></div>
<div class="form-group col-md-3">
<label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger">*</span></label> <label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3173,12 +3189,12 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-1"> <div class="form-group col-md-3">
<label>Per</label> <?php <label>Per</label> <?php
$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control'); $data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control');
echo form_input($data); ?> echo form_input($data); ?>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label><?php echo "Basic Amt ($INRSYM)"; ?></label> <label><?php echo "Basic Amt ($INRSYM)"; ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3187,13 +3203,12 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"></div> <div class="form-group col-md-3"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-3">
<label>Discount Type </label> <label>Discount Type </label>
<div> <div>
<?php <?php
@ -3212,7 +3227,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Discount Rate </label> <label>Discount Rate </label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3221,7 +3236,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Discounted Amt <?php echo "($INRSYM)" ?> </label> <label>Discounted Amt <?php echo "($INRSYM)" ?> </label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3232,8 +3247,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row" style="text-align:left;"> <div class="form-row" style="text-align:left;">
<div class="form-group col-md-4"></div> <div class="form-group col-md-3"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-3">
<label>Packaging Type </label> <label>Packaging Type </label>
<div> <div>
<?php <?php
@ -3252,7 +3267,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Packaging Rate </label> <label>Packaging Rate </label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3261,7 +3276,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Packaging Amt <?php echo "($INRSYM)" ?> </label> <label>Packaging Amt <?php echo "($INRSYM)" ?> </label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3272,8 +3287,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"></div> <div class="form-group col-md-3"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-3">
<label>Freight Type </label> <label>Freight Type </label>
<?php $options = array("0" => 'Select Freight Type'); <?php $options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) { if (!empty($FreightType)) {
@ -3283,16 +3298,8 @@ if (!empty($getlogpodtl)) {
} }
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-2" id="EditTripsValue" style="display:none;">
<label>NO Of Trips</label> <div class="form-group col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-2">
<label>Freight Rate </label> <label>Freight Rate </label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3301,7 +3308,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Freight Amt <?php echo "($INRSYM)" ?></label> <label>Freight Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3311,30 +3318,46 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-3" id="EditTripsValue" style="display:none;">
<label>CGST In %</label> <label>NO Of Trips</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();'); $data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div>
<div class="form-group col-md-2">
<label>CGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group">
<?php
$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div> </div>
</div>
<div class="form-row">
<div class="form-group col-md-6"></div>
<div class="form-group col-md-3">
<label>CGST In %</label>
<div class="form-group">
<?php
$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
echo form_input($data);
?>
</div> </div>
</div> </div>
<div class="form-group col-md-3">
<label>CGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group">
<?php
$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row" id="SGSTEditModel"> <div class="form-row" id="SGSTEditModel">
<div class="form-group col-md-8"></div> <div class="form-group col-md-6"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>SGST In %</label> <label>SGST In %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3343,7 +3366,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>SGST Amt <?php echo "($INRSYM)" ?></label> <label>SGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3354,8 +3377,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row" id="IGSTEditModel" style="display:none;"> <div class="form-row" id="IGSTEditModel" style="display:none;">
<div class="form-group col-md-8"></div> <div class="form-group col-md-6"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>IGST In %</label> <label>IGST In %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3364,7 +3387,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>IGST Amt <?php echo "($INRSYM)" ?></label> <label>IGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3375,8 +3398,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-3">
<label> Insurance Amt <?php echo "($INRSYM)" ?> (if Any)</label> <label> Insurance Amt <?php echo "($INRSYM)" ?> (if Any)</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3389,8 +3412,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-3">
<label><?php echo "Total Order Amt ($INRSYM)"; ?></label> <label><?php echo "Total Order Amt ($INRSYM)"; ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php

23
app/Views/editimportpo.php
View File

@ -1820,7 +1820,7 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<label> <label>
<?php echo "Nett per UOM($INR)"; ?> <?php echo "Net per UOM($INR)"; ?>
</label> </label>
<div> <div>
<?php <?php
@ -2095,7 +2095,7 @@ if (!empty($getlogpodtl)) {
<br> <br>
<div class="form-row" style="border:1px solid black;"> <div class="form-row" style="border:1px solid black;">
<br /> <br/>
<div class="form-group col-md-6 p-2 mt-1" style="padding:0px;"> <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
@ -2237,6 +2237,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-group col-md-6 p-2 mt-1" style="padding:0px;"> <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<!-- Additional Excise duty : (g) --> <!-- Additional Excise duty : (g) -->
@ -2262,11 +2263,6 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<!-- Additional Excise duty : (g) --> <!-- Additional Excise duty : (g) -->
@ -2290,10 +2286,6 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"> <div class="form-group col-md-8">
<!-- Gross duty payable --> <!-- Gross duty payable -->
@ -2312,11 +2304,10 @@ if (!empty($getlogpodtl)) {
<br> <br>
<!--Start of Adding of Frieght model--> <!--Start of Adding of Frieght model-->
<div class="form-row" style="padding:0px;"> <div class="form-row" style="padding:0px;">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<span>Freight Type </span> <label>Freight Type </label>
<?php <?php
$options = array("0" => 'Select Freight Type'); $options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) { if (!empty($FreightType)) {
@ -2328,14 +2319,14 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
<div class="form-group col-md-4" id="EditTripsValue" style="display:block;"> <div class="form-group col-md-4" id="EditTripsValue" style="display:block;">
<span>NO Of Trips</span> <label>NO Of Trips</label>
<?php <?php
$data = array('name' => 'editNOOfTrips', 'value' => set_value('editNOOfTrips'), 'id' => 'editNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);'); $data = array('name' => 'editNOOfTrips', 'value' => set_value('editNOOfTrips'), 'id' => 'editNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<span>Freight Rate </span> <label>Freight Rate </label>
<?php <?php
$data = array('name' => 'edittxtFreight', 'value' => set_value('edittxtFreight'), 'id' => 'edittxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);'); $data = array('name' => 'edittxtFreight', 'value' => set_value('edittxtFreight'), 'id' => 'edittxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
echo form_input($data); echo form_input($data);
@ -2406,7 +2397,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label> <label><?php echo "Net per UOM($INR)"; ?></label>
<div> <div>
<?php <?php
$data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');

4
app/Views/editrequisitionform.php
View File

@ -788,7 +788,7 @@ td {
var rowHtml = `<tr id="${temp}"> var rowHtml = `<tr id="${temp}">
<td align="center">${temp}</td> <td align="center">${temp}</td>
<td align="center">${materialCode}</td> <td align="center">${materialCode}</td>
<td align="center">${materialName}</td> <td align="left">${materialName}</td>
<td align="center">${uom}</td> <td align="center">${uom}</td>
<td align="center">${quantity}</td> <td align="center">${quantity}</td>
<td align="center">0.00</td> <td align="center">0.00</td>
@ -852,6 +852,8 @@ td {
$('#txtRowCount').val(temp); $('#txtRowCount').val(temp);
$('#add-req-modal').modal('hide');
} }
}); });