3078 Commits

Author SHA1 Message Date
7eb2274584 Resolving Error in EditActivitymodal. 2025-12-06 16:57:14 +05:30
5a8a8c4676 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Adding_dropdown 2025-12-06 16:54:54 +05:30
d9c3964983 Merge pull request 'Add Pending Actions toggle near search box in Expense.' (#530) from Adding_Toggle_Button into Purchase_Invoice_Management
Reviewed-on: #530
merged
2025-12-06 11:18:15 +00:00
50e33b7b39 Add Pending Actions toggle near search box in Expense. 2025-12-06 11:18:15 +00:00
d6a8040977 Merge pull request 'Attendance in Employee Profile Should Display Project-Wise' (#531) from Kartik_Enhancement_918 into Purchase_Invoice_Management
Reviewed-on: #531
Merged
2025-12-06 11:14:50 +00:00
95813c5869 Planned Work now accepts values with up to 2 decimal places. 2025-12-06 11:14:50 +00:00
88dc11793c Attendance in Employee Profile Should Display Project-Wise 2025-12-06 11:14:50 +00:00
ca3cc590d2 Merge pull request 'Branch_Detail_View :- Adding details view in jobs.' (#532) from Branch_Detail_View into Purchase_Invoice_Management
Reviewed-on: #532
merged
2025-12-06 11:13:10 +00:00
1e151a8b10 Adding Cursor pointer for view branch in jobs. 2025-12-06 11:13:10 +00:00
946e0b2883 Showing details view in Branches. 2025-12-06 11:13:10 +00:00
baa17ab0cf fixed visile dropdown issue inside master page 2025-12-06 16:42:10 +05:30
7de27cc335 Correction in Master Page. 2025-12-06 16:35:02 +05:30
3c3468f8f9 Correction in EmpProfile. 2025-12-06 16:00:07 +05:30
c4a46cbe80 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Adding_dropdown 2025-12-06 15:08:54 +05:30
c83e7eb75f Adding dropdown in Edit Task. 2025-12-06 15:07:18 +05:30
72b533226a Adding dropdown across all places. 2025-12-06 14:49:23 +05:30
48ff718da4 Correction in directory managecontact. 2025-12-06 13:00:35 +05:30
654e34ebfa Adding Dropdown in all places. 2025-12-06 12:58:43 +05:30
c7e72946ea added mission hook 2025-12-06 11:58:09 +05:30
19c8975e8f added margin bottom for selectField 2025-12-06 11:30:32 +05:30
1f64cf65f9 Merge branch 'Adding_dropdown' of https://git.marcoaiot.com/admin/marco.pms.web into Adding_dropdown 2025-12-06 11:12:35 +05:30
29cebedfad fixed selectfield ui 2025-12-06 11:12:25 +05:30
a1680c709a Adding dropdown in Daily task. 2025-12-06 10:22:24 +05:30
0e75a3e1c9 Adding Dropdown in Employee. 2025-12-06 10:11:58 +05:30
cdf9bbbe48 added padding to better space 2025-12-06 09:48:15 +05:30
94fbeef5d1 added skeleton 2025-12-05 19:32:23 +05:30
88053d1286 added optional chain for handle error 2025-12-05 18:55:23 +05:30
23a7a56e32 added collection overview widget 2025-12-05 18:24:23 +05:30
dbf4f5e9c8 Adding New dropdown in across all modules. 2025-12-05 17:57:08 +05:30
7df9d47f07 Adding dropdown in directory. 2025-12-05 15:40:38 +05:30
8f6d877548 removed scrolling inside job - status logs 2025-12-05 12:05:55 +05:30
7930876b7d Merge pull request 'Adding time line in Jobs Status.' (#527) from Implementing_TimeLine into Purchase_Invoice_Management
Reviewed-on: #52
merged
2025-12-05 06:23:55 +00:00
b8f2607b45 Adding Workdone label. 2025-12-05 06:23:55 +00:00
47752e5e35 Adding time line in Jobs Status. 2025-12-05 06:23:55 +00:00
25bb7d1f58 allow view pdf file 2025-12-05 11:38:54 +05:30
427d728efc Merge pull request 'Adding Tabs in attendancepage just like View Jobs.' (#529) from Attendance_Tabs into Purchase_Invoice_Management
Reviewed-on: #529
Merged
2025-12-05 04:49:16 +00:00
65043732d3 Adding Tabs in attendancepage just like View Jobs. 2025-12-05 04:49:16 +00:00
6a0feacb1b Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-12-04 17:38:32 +05:30
949126d790 Adding height in ServiceProjectTeamlist. 2025-12-04 15:20:08 +05:30
f9d66d73b0 changed sequnce of project nave 2025-12-04 13:44:23 +05:30
0dbfc1f87a hide time 2025-12-04 13:09:29 +05:30
49c07606aa Adding Acknowledge number and date in View Purchase. 2025-12-04 11:32:58 +05:30
865928c1cb correct right path 2025-12-03 16:58:42 +05:30
06882e557e fixed- added right path 2025-12-03 16:54:48 +05:30
581447ecb6 addd field inside view Purchase - 2025-12-03 16:44:21 +05:30
2392a96eb8 added new column proform amount 2025-12-03 16:02:36 +05:30
8a3228c0c1 added pagination inside infra list 2025-12-03 15:27:12 +05:30
d615f6ca8a added required start tick on field base proforma and base amount 2025-12-03 14:53:14 +05:30
48f8d4aedb Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-12-03 13:55:43 +05:30
258bd82b54 handle proforma to base , Tax, amount condition 2025-12-03 13:55:39 +05:30