|
8a3a0dc483
|
add create functionality in ManagePaymentMode
|
2025-07-26 00:27:14 +05:30 |
|
|
ede1b85c1c
|
Merge pull request 'Feature#774_DeleteExpenseType : dded delete functionality for Expense Type using ID' (#296) from Feature#774_DeleteExpenseType into Feature_Expense
Reviewed-on: #296
merged
|
2025-07-25 18:38:42 +00:00 |
|
|
a0e063ac9a
|
dded delete functionality for Expense Type using ID
|
2025-07-26 00:06:47 +05:30 |
|
|
f1b652ace1
|
Merge pull request 'Feature#773_EditExpenseType : Edit Expense Type Master' (#295) from Feature#773_EditExpenseType into Feature_Expense
Reviewed-on: #295
Merged
|
2025-07-25 18:24:42 +00:00 |
|
|
5988089b49
|
forgot close fun inside cancel btn
|
2025-07-25 23:51:47 +05:30 |
|
|
5a2eb1894d
|
added edit functionality, merged create/edit into a common form
|
2025-07-25 23:49:25 +05:30 |
|
|
fb4384b58d
|
Merge pull request 'Feature#772_NEWExpenseType_Master : added create new Expense master form with api integrated' (#294) from Feature#772_NEWExpenseType_Master into Feature_Expense
Reviewed-on: #294
Merged
|
2025-07-25 17:53:37 +00:00 |
|
|
e5d0fcb8df
|
added create new Expense master form with api integrated
|
2025-07-25 23:20:44 +05:30 |
|
|
1d93ee104f
|
updated expense skeleton according expense list
|
2025-07-25 22:21:56 +05:30 |
|
|
0a1d2e8459
|
setdefault value for data range
|
2025-07-25 22:15:56 +05:30 |
|
|
eb08519c6d
|
added permission keys
|
2025-07-25 19:59:24 +05:30 |
|
|
41d3230325
|
added msg if data not exist
|
2025-07-25 19:59:03 +05:30 |
|
|
4123a5ca1e
|
Merge pull request 'Feature#804_ExpnseFilter : Added server side filter' (#293) from Feature#804_ExpnseFilter into Feature_Expense
Reviewed-on: #293
Merged
|
2025-07-25 13:59:48 +00:00 |
|
|
678fd50768
|
added filter for expense list
|
2025-07-25 13:59:48 +00:00 |
|
|
ee6c8069d0
|
group wise row of expenses list
|
2025-07-25 13:59:48 +00:00 |
|
|
7b39ee59f4
|
handle proper error
|
2025-07-25 19:26:51 +05:30 |
|
|
3d847444bb
|
Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Expense
|
2025-07-25 18:45:18 +05:30 |
|
|
303420409c
|
merged
|
2025-07-25 18:43:22 +05:30 |
|
|
00d91ad8dd
|
removed double assigned class
|
2025-07-25 18:28:12 +05:30 |
|
|
fb865cbe4f
|
prevent unwanted rendering
|
2025-07-25 18:28:12 +05:30 |
|
|
d34fadfc6d
|
implement delete functionality for Draft expenses only
|
2025-07-25 18:28:12 +05:30 |
|
|
3424c79594
|
rmoved unusd code
|
2025-07-25 18:27:13 +05:30 |
|
|
dce477f6cd
|
set up action properly
|
2025-07-25 18:27:12 +05:30 |
|
|
b1fa01e2c9
|
correctly set isActive flag from document data
|
2025-07-25 18:27:12 +05:30 |
|
|
007b08f335
|
added optinal chain for color , for prevent error
|
2025-07-25 18:27:12 +05:30 |
|
|
9bc5f84c83
|
completed full updation for expnse feature
|
2025-07-25 18:27:12 +05:30 |
|
|
0944a8d78c
|
progress in expense update
|
2025-07-25 18:27:12 +05:30 |
|
|
22ef95d6b7
|
completed full updation for expnse feature
|
2025-07-25 18:18:50 +05:30 |
|
|
6b830c5063
|
progress in expense update
|
2025-07-25 18:18:50 +05:30 |
|
|
ca2ed451d8
|
renamed status of expse list - name to displayName
|
2025-07-25 18:18:50 +05:30 |
|
|
d78f90f700
|
added utils fun that has code convert into bootstrap color like priamery.
|
2025-07-25 18:18:50 +05:30 |
|
|
182ae887d8
|
initiated forn edit and created with one component
|
2025-07-25 18:18:50 +05:30 |
|
|
24d7bd52d2
|
view expense with document (image), not yet PDF
|
2025-07-25 18:18:49 +05:30 |
|
|
2122d7e959
|
updated global modal for size customize
|
2025-07-25 18:18:49 +05:30 |
|
|
e388906b80
|
changed added expense button
|
2025-07-25 18:18:49 +05:30 |
|
|
e1f5bb8baf
|
color, displayName - of Expense status columns names added insinde hidden column
|
2025-07-25 18:18:49 +05:30 |
|
|
9df4b20ff0
|
Added taking action on expense, like Review, Approve ...
|
2025-07-25 18:18:49 +05:30 |
|
|
bd1dabdd68
|
made new hook for make action on give employee
|
2025-07-25 18:18:49 +05:30 |
|
|
945d5b1546
|
partially implemented Expense Details modal with full view
|
2025-07-25 18:18:48 +05:30 |
|
|
ce66c137aa
|
created and display expenses list
|
2025-07-25 18:18:48 +05:30 |
|
|
fca24d4081
|
making a expense page layout
|
2025-07-25 18:18:48 +05:30 |
|
|
977ab05e61
|
created list view interface
|
2025-07-25 18:18:48 +05:30 |
|
|
bc6e66b25c
|
api integrated for get list of expense-status in master
|
2025-07-25 18:18:48 +05:30 |
|
|
e5d97e3105
|
refactored code for optimze
|
2025-07-25 18:18:48 +05:30 |
|
|
b1586a8cfb
|
added Payment Mode master with API integration and table config for get list
|
2025-07-25 18:18:48 +05:30 |
|
|
de7ca102fd
|
add Expense Type master with API integration and table config
|
2025-07-25 18:18:47 +05:30 |
|
|
2f3fd2dacf
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Expense
|
2025-07-25 18:18:14 +05:30 |
|
|
d3f21f33b6
|
added background color property for table row - 'tr-group'- that grouping entities
|
2025-07-25 18:17:18 +05:30 |
|
|
92f5566fce
|
removed double assigned class
|
2025-07-24 15:55:52 +05:30 |
|
|
f404320179
|
Merge pull request 'Feature#802_DeleteExpense : Implemented Delete Expense' (#290) from Feature#802_DeleteExpense into Feature_Expense
Reviewed-on: #290
merged
|
2025-07-24 10:22:05 +00:00 |
|