amendment po changes-1 vadivel J 04-12-2024

This commit is contained in:
vadivelJ96 2024-12-04 14:42:39 +05:30
parent aff4f723e9
commit 7f62538c55
3 changed files with 16 additions and 7 deletions

View File

@ -7414,7 +7414,7 @@ if (!empty($getlogpodtl)) {
if ($('#EditCPRate').val() != '') { if ($('#EditCPRate').val() != '') {
selValue = $("#EditDiscountType").val(); selValue = $("#EditDiscountType").val();
$('#txtEditDiscount').val(''); $('#txtEditDiscount').val('');
$('#txtEditAfterDiscount').val(''); $('#txtEditAfterDiscount').val("0.00");
if (selValue == '<?php echo NILTYPE; ?>') { if (selValue == '<?php echo NILTYPE; ?>') {
$('#txtEditDiscount').attr('readonly', 'true'); $('#txtEditDiscount').attr('readonly', 'true');
@ -7424,7 +7424,7 @@ if (!empty($getlogpodtl)) {
} else { } else {
$('#txtEditDiscount').removeAttr('readonly', 'true'); $('#txtEditDiscount').removeAttr('readonly', 'true');
$('#txtEditDiscount').val(''); $('#txtEditDiscount').val('');
$('#txtEditAfterDiscount').val(''); $('#txtEditAfterDiscount').val("0.00");
} }
} else { } else {
alert('Please Select MaterialCode and Rate Field Value'); alert('Please Select MaterialCode and Rate Field Value');
@ -7818,6 +7818,9 @@ if (!empty($getlogpodtl)) {
} }
EditRatechange(); EditRatechange();
$('#editpackagingcalmodel').modal('hide');
} }

View File

@ -644,7 +644,6 @@ if (!empty($getlogpodtl)) {
var freight = ''; var freight = '';
$('#drpFreight').change(function () { $('#drpFreight').change(function () {
alert("started");
var FreightType = $("#drpFreight").val(); var FreightType = $("#drpFreight").val();
if (FreightType == "PER TRIP") { if (FreightType == "PER TRIP") {
@ -4143,7 +4142,8 @@ if (!empty($getlogpodtl)) {
<form> <form>
<div> <div>
<label><input type="radio" name="optFreight" checked="checked" value='0' id="optFreight"> Basic <label><input type="radio" name="optFreight" checked="checked" value='0' id="optFreight">
Basic
Amount</label> Amount</label>
</div> </div>
<div> <div>

View File

@ -307,7 +307,6 @@
</tr> </tr>
<?php } <?php }
}else{ }else{
$date = DateTime::createFromFormat('M-Y', $month); $date = DateTime::createFromFormat('M-Y', $month);
$startDate = $date->modify('first day of this month')->format('Y-m-d'); $startDate = $date->modify('first day of this month')->format('Y-m-d');
@ -331,7 +330,14 @@
$dateInMonthDmYFormat = Datetime::createFromFormat('Y-m-d',$dateInMonth)->format('d-m-Y'); $dateInMonthDmYFormat = Datetime::createFromFormat('Y-m-d',$dateInMonth)->format('d-m-Y');
?> ?>
<tr> <tr
<?php
$currentDate = date('d-m-Y');
if ($dateInMonthDmYFormat === $currentDate) { echo 'style="background: #cef0ad;"'; }
?>
>
<td class="celda_normal"><?=$dateInMonthDmYFormat??'-'?></td> <td class="celda_normal"><?=$dateInMonthDmYFormat??'-'?></td>
<!-- only setting opening stock editable for first day of the month --> <!-- only setting opening stock editable for first day of the month -->
<td class="celda_normal openingStock" <td class="celda_normal openingStock"