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:
vadivelJ96 2024-12-27 17:49:27 +05:30
commit ff8ef6db72
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/Expense.php
View File

@ -53,7 +53,7 @@ class Expense extends BaseController
// If no last serial number exists, start with 00001 // If no last serial number exists, start with 00001
$lastNumber = $lastSerial ? (int)explode('/', $lastSerial)[1] : 0; $lastNumber = $lastSerial ? (int)explode('/', $lastSerial)[1] : 0;
$newNumber = str_pad($lastNumber + 1, 5, '0', STR_PAD_LEFT); $newNumber = str_pad($lastNumber + 1, 5, '0', STR_PAD_LEFT);
return "$financialYear/$newNumber"; return "NonIGR/$financialYear/$newNumber";
} }
public function addExpense() public function addExpense()

6
app/Views/attendance.php
View File

@ -407,7 +407,7 @@ $currentday = date('d');
$WH = 'WH' . $col; $WH = 'WH' . $col;
$OT = 'OT' . $col; $OT = 'OT' . $col;
?> ?>
<td <?php if ($flag2 == 1) { ?> title=" <?php echo $title; ?> " <td <?php if ($flag2 == 1) { ?> title=" <?php echo $title; ?> "
<?php } else if ($flag == 1) { ?> title="sunday" <?php } ?> <?php } else if ($flag == 1) { ?> title="sunday" <?php } ?>
class="celda_normal" class="celda_normal"
@ -422,7 +422,7 @@ $currentday = date('d');
<?php if (!empty($a->$WH)) { <?php if (!empty($a->$WH)) {
echo $a->$WH; echo $a->$WH;
} else { } else {
echo '0'; echo '';
} ?></td> } ?></td>
<td <?php if ($flag2 == 1) { ?> title=" <?php echo $title; ?> " <td <?php if ($flag2 == 1) { ?> title=" <?php echo $title; ?> "
<?php } else if ($flag == 1) { ?> title="sunday" <?php } ?> <?php } else if ($flag == 1) { ?> title="sunday" <?php } ?>
@ -438,7 +438,7 @@ $currentday = date('d');
<?php if (!empty($a->$OT)) { <?php if (!empty($a->$OT)) {
echo $a->$OT; echo $a->$OT;
} else { } else {
echo '0'; echo '';
} ?></td> } ?></td>
<?php $flag = 0; <?php $flag = 0;

4
app/Views/publicholidays.php
View File

@ -181,8 +181,8 @@
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$("#hdate").datepicker({ $("#hdate").datepicker({
format: 'dd-mm-yyyy', // Correct format for Bootstrap Datepicker format: 'dd-mm-yyyy',
startDate: new Date(), // Replace `d` with `new Date()` if `d` is not defined // startDate: new Date(),
autoclose: true, autoclose: true,
todayHighlight: true, todayHighlight: true,
clearBtn: true clearBtn: true

2
app/Views/sales_invoice.php
View File

@ -286,7 +286,7 @@
<a href="#" <a href="#"
class="editable-field" class="editable-field"
data-invoice-id="<?php echo $invoice->invoice_id; ?>"> data-invoice-id="<?php echo $invoice->invoice_id; ?>">
<?php echo !empty($invoice->received_qty) ? $invoice->received_qty : "Click to Edit"; ?> <?php echo !empty($invoice->received_qty) ? $invoice->received_qty : "0"; ?>
</a> </a>
<div class="edit-container" style="display:none;"> <div class="edit-container" style="display:none;">
<input type="text" class="edit-input-field" /> <input type="text" class="edit-input-field" />