1845 Commits

Author SHA1 Message Date
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
a11edec002 prevent unwanted rendering 2025-07-24 10:22:05 +00:00
bd308a57dd implement delete functionality for Draft expenses only 2025-07-24 10:22:05 +00:00
8a237eb4bf rmoved unusd code 2025-07-24 15:38:25 +05:30
d42bb413e8 Merge pull request 'react-query-v2 : react-query intergrated inside attendance and gallery module' (#270) from react-query-v2 into main
Reviewed-on: #270
2025-07-24 09:41:19 +00:00
f44bba5083 Merge pull request 'Feature#794_ActionExpense : completed action on expense' (#289) from Feature#794_ActionExpense into Feature_Expense
Reviewed-on: #289
Merged
2025-07-24 08:52:56 +00:00
034099c23a set up action properly 2025-07-24 14:20:38 +05:30
c14fdae4f7 correctly set isActive flag from document data 2025-07-24 14:19:54 +05:30
9a1fba347a added optinal chain for color , for prevent error 2025-07-24 12:51:30 +05:30
eaf49b513d Merge pull request 'Feature#796_EditExpense : Edit Expense Request' (#282) from Feature#796_EditExpense into Feature_Expense
Reviewed-on: #282
mwrged
2025-07-24 07:18:29 +00:00
719c916af3 Merge branch 'Feature#796_EditExpense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense 2025-07-24 12:45:57 +05:30
23ee4a83d1 completed full updation for expnse feature 2025-07-24 12:45:21 +05:30
cf719205d9 progress in expense update 2025-07-24 12:45:21 +05:30
195a88c1e4 renamed status of expse list - name to displayName 2025-07-24 12:43:09 +05:30
f4f8a61445 added utils fun that has code convert into bootstrap color like priamery. 2025-07-24 12:43:08 +05:30
7b2a4ea834 initiated forn edit and created with one component 2025-07-24 12:41:56 +05:30
de689b0af8 completed full updation for expnse feature 2025-07-24 12:35:12 +05:30
289a732600 progress in expense update 2025-07-24 02:55:39 +05:30
5e93798d01 Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense 2025-07-23 18:03:52 +05:30
209e1341de Merge pull request 'Feature#791_ViewExpense : View Expense Detailas from calling expense details api' (#286) from Feature#791_ViewExpense into Feature_Expense
Reviewed-on: #286
merged
2025-07-23 12:11:18 +00:00
ab737a80d4 view expense with document (image), not yet PDF 2025-07-23 17:36:54 +05:30
f30430c254 updated global modal for size customize 2025-07-23 17:27:47 +05:30
f6e18e0482 Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense 2025-07-23 14:17:34 +05:30
fa9736b620 changed added expense button 2025-07-23 14:15:16 +05:30
a23ca8a412 Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense 2025-07-23 14:07:09 +05:30
00b3a3420e renamed status of expse list - name to displayName 2025-07-23 11:59:02 +05:30
6c276a3c8d added utils fun that has code convert into bootstrap color like priamery. 2025-07-23 11:44:59 +05:30
5209b78df7 color, displayName - of Expense status columns names added insinde hidden column 2025-07-23 10:48:18 +05:30
5f6a00f9f2 initiated forn edit and created with one component 2025-07-22 18:53:17 +05:30
9bbd2dd014 Merge pull request 'Feature#794_ActionExpense : Partially Implemented Expense Action' (#279) from Feature#794_ActionExpense into Feature_Expense
Reviewed-on: #279
Merged
2025-07-22 12:07:15 +00:00
280715d62f Added taking action on expense, like Review, Approve ... 2025-07-22 17:20:08 +05:30
2ab2a1d8bd made new hook for make action on give employee 2025-07-22 14:39:49 +05:30