2561 Commits

Author SHA1 Message Date
210b01513e Removing Project name column in Attendance Logs and Regularize. 2025-10-09 14:56:00 +05:30
2fe297c6b6 Adding 2 columns in Regularize column Request at and Requested by 2025-10-09 10:27:13 +05:30
ffd7f15488 Merge pull request 'Attendance Tab Should Display All Records for Each Employee' (#465) from Kartik_Bug#1425 into OnFieldWork_V1
Reviewed-on: #465
Merged
2025-10-08 13:38:09 +00:00
7f33d5e6bd Attendance Tab Should Display All Records for Each Employee 2025-10-08 13:38:09 +00:00
108ca1cc96 Merge pull request 'Adding NA and updation in Excel,PDF and Print functionality in Employee list.' (#463) from Kartik_Bug#1436 into OnFieldWork_V1
Reviewed-on: #463
Merged
2025-10-08 13:37:48 +00:00
0b1a276898 Adding NA and updation in Excel,PDF and Print functionality in Employee list. 2025-10-08 13:37:48 +00:00
6246dbd23f Merge pull request 'Missing title in View popup' (#462) from Kartik#Enhancement#1444 into OnFieldWork_V1
Reviewed-on: #462
Merged
2025-10-08 13:37:18 +00:00
af3bf11beb Missing title in View popup 2025-10-08 13:37:18 +00:00
2e5951d9d1 Merge pull request 'Expense Type label to be renamed to Expense Category.' (#461) from Kartik_Enhancement#1446 into OnFieldWork_V1
Reviewed-on: #461
Merged
2025-10-08 13:37:02 +00:00
cdc5e32554 Expense Type label to be renamed to Expense Category. 2025-10-08 13:37:02 +00:00
bc047a84fc Adding processpending in ExpenseStatus. 2025-10-08 18:49:24 +05:30
0511ed6d82 Changes in Attendance module for all projects. 2025-10-08 13:52:06 +05:30
bc933f4c64 Adding Search box in Expense Paid by dropdown. 2025-10-08 11:29:51 +05:30
bd3645aae6 In Modify project add project.id on UseProjectDetails 2025-10-08 10:58:31 +05:30
2f2215ab8a Merge pull request 'OnField_Issues_Oct_2W' (#455) from OnField_Issues_Oct_2W into OnFieldWork_V1
Reviewed-on: #455
Merged
2025-10-07 04:10:40 +00:00
071f862743 Incorrect navigation when viewing project details 2025-10-07 04:10:40 +00:00
040331e27d Removing the dropdown from the Masters page. 2025-10-07 04:10:40 +00:00
db2730c02b Employee Click Should Navigate to Profile Page from Attendance Page 2025-10-07 04:10:40 +00:00
9df813698d Merge pull request 'Adding_Chips_Expense' (#451) from Adding_Chips_Expense into OnFieldWork_V1
Reviewed-on: #451
Merged
2025-10-06 13:47:36 +00:00
6ba018399c Merge branch 'OnFieldWork_V1' of https://git.marcoaiot.com/admin/marco.pms.web into Adding_Chips_Expense 2025-10-06 19:06:33 +05:30
1e49cf17a2 addd dropdown at expense table action 2025-10-04 16:25:28 +05:30
ab5e0b2f79 Merge branch 'OnFieldWork_V1' of https://git.marcoaiot.com/admin/marco.pms.web into Adding_Chips_Expense 2025-10-04 16:12:07 +05:30
7c9d2ddeb1 Added Chips in Expense filter. 2025-10-04 16:06:26 +05:30
f0f579beae fixed dashbord card size 2025-10-04 15:47:07 +05:30
b53e6284b9 Merge branch 'OnFieldWork_V1' of https://git.marcoaiot.com/admin/marco.pms.web into OnFieldWork_V1 2025-10-04 14:13:43 +05:30
b1c23aab4d added expens group fied Name 2025-10-04 14:13:09 +05:30
4a05e67ff0 Adding dropdown in ExpenseFilter. 2025-10-04 14:12:20 +05:30
87d13d0f77 Changes in Monthly Expense weidget. 2025-10-04 12:20:59 +05:30
997971629f addd Expense By project 2025-10-04 11:08:19 +05:30
18ac8e11bd added expense filte at api url level 2025-10-04 10:50:14 +05:30
78808ecac0 added Expensebstatus widget, fixed small bugs 2025-10-03 19:07:44 +05:30
3553a7b521 change class to className 2025-10-03 10:57:55 +05:30
aca96c60ae removed console and comment 2025-10-02 13:24:36 +05:30
25f4f1e7a7 added expense analysis card inisde dashboard 2025-10-02 13:10:14 +05:30
0c1889e1c1 added Ellipsis Pagination 2025-10-01 22:45:31 +05:30
9884943907 addded imported field added 2025-10-01 18:45:26 +05:30
2531d91209 fixed dashboard graph 2025-10-01 16:21:08 +05:30
49b597c833 fixed expense date, added project name at check in checkout modal 2025-10-01 15:34:19 +05:30
2aae7194b7 implemented singlR 2025-10-01 13:00:38 +05:30
ae772d925a remove project permissions 2025-10-01 10:13:52 +05:30
c1e5ff4043 remove dashboard 2025-09-30 23:39:41 +05:30
2aff3b9e80 changed logins api 2025-09-30 19:35:01 +05:30
4e48478fbc update attendnace and expense 2025-09-30 19:31:24 +05:30
4ea1e06a9c hide project infra, setting, Organization, and show only all employees and inactive employee 2025-09-30 18:16:29 +05:30
4ddb8415cc added gobal create project,change paid by at expense create 2025-09-30 17:27:20 +05:30
d5df200ede Merge pull request 'Organization_Management : Organization Hierarchy' (#443) from Organization_Management into main
Reviewed-on: #443
Merged
2025-09-30 09:07:30 +00:00
9c6450496e added closed fun after create project and changed label name 2025-09-30 14:22:01 +05:30
cfd3986479 fixed small changed like heading, font change 2025-09-30 11:59:16 +05:30
764b145ad9 empty select activity, planne work fields after successfully created task 2025-09-29 18:31:56 +05:30
20c7cf7f37 added right path for organization info show 2025-09-29 18:00:48 +05:30