2968 Commits

Author SHA1 Message Date
c8bbf6b8a8 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Katik_Task#1746 2025-11-17 18:40:18 +05:30
36be17daa7 Merge pull request 'Hide “Advance Payment” Mode When Creating Expense After Payment Processed (Mobile & Web)' (#509) from Kartik_Bug#1735 into Service_Project_Managment
Reviewed-on: #509
2025-11-17 13:06:01 +00:00
d6b2ed9f84 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 18:35:49 +05:30
088e5e0368 UI Implementation at Job List 2025-11-17 18:35:42 +05:30
977e5c77a7 Merge pull request 'Invoice list should display according to the selected date range in Collection module.' (#510) from Kartik_Bug#1505 into Service_Project_Managment
Reviewed-on: #510
2025-11-17 13:03:50 +00:00
2b1d3e5890 Merge branch 'Service_Project_Managment' into Kartik_Bug#1505 2025-11-17 13:03:42 +00:00
a61e621ce2 Merge pull request 'Kartik_Bug#1737 :- UI Implementation in Expense Weidget.' (#507) from Kartik_Bug#1737 into Service_Project_Managment
Reviewed-on: #507
2025-11-17 13:01:33 +00:00
0bd1cea703 1) Handle blank space in menu bar
2) Breadcrum  "Home" link to "Dashboard" on pages where it was missing
2025-11-17 18:30:13 +05:30
d6ef713370 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 18:28:20 +05:30
da391368a6 setup job data for update 2025-11-17 18:28:15 +05:30
6860ba3dff Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 18:25:48 +05:30
849567f999 UI changes in View Jobs. 2025-11-17 18:25:42 +05:30
507bc68da9 Added the server timeout for signalR 2025-11-17 18:12:35 +05:30
767475c7e5 Adding Create Service Project and Create Infra project project at ManageProject. 2025-11-17 17:53:01 +05:30
5f649cd917 Added Job Id in Jobs. 2025-11-17 17:50:41 +05:30
ea6686560d added missing job id 2025-11-17 17:46:13 +05:30
1358cd749a fixed error during came merged 2025-11-17 17:09:35 +05:30
d95ba4c800 added changes status fun 2025-11-17 17:06:05 +05:30
78eafd2e5a Showing ProjectName at the breadcrum in Services Project. 2025-11-17 16:15:36 +05:30
6598ec9f73 Adding placeholder and adding in TagInput a background color. 2025-11-17 15:44:03 +05:30
679ae95b8c Removing project selection at Job Creation. 2025-11-17 15:21:31 +05:30
4f03cbb305 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 13:34:09 +05:30
d342550b0f added refresh Manage Job form whenever closing after editing and creating job 2025-11-17 13:34:04 +05:30
4f7ad519cf Change label in Advance Payment in Total balance to currenct balance and hide project selection dropdown in PR and Advance. 2025-11-17 13:11:22 +05:30
c311324bad Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 12:45:01 +05:30
937531afb6 updated PmsEmployeeInputTag for getting all exiten employee for update 2025-11-17 12:44:56 +05:30
b68f8306fd added confirmation modal inside serviceproject employee list 2025-11-17 12:44:01 +05:30
7470a6836f UI alignment at View Managejob Ticket in jobs. 2025-11-17 12:33:19 +05:30
12184091cd UI alignment at view Jobs. 2025-11-17 11:29:44 +05:30
8761c128e6 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-17 10:57:51 +05:30
8eb34addcd added serviceproject list 2025-11-17 10:57:48 +05:30
b568188a3e Adding TDS Calculation in ViewExpense. 2025-11-17 10:31:41 +05:30
a21bec943d Added GST number in Organization. 2025-11-17 10:05:02 +05:30
3d1d8264ad Merge pull request 'Service_Project_Management_Bugs :- Changes for Jobs' (#511) from Service_Project_Management_Bugs into Service_Project_Managment
Reviewed-on: #511
Merged
2025-11-17 04:16:04 +00:00
d831d08aaf Adding validation in Contact number and adding trim functioanlity. 2025-11-17 04:16:04 +00:00
8553b6bee7 At New Project popup show the Active selected all the time when popup open. 2025-11-17 04:16:04 +00:00
e47262123d Added columns in jobs list and implementing functionality for daysleft. 2025-11-17 04:16:04 +00:00
852ebd7dd0 Correction in UI in ProjectPage. 2025-11-17 04:16:04 +00:00
fc1235caef added allocation and deallocation of service Project team 2025-11-17 00:42:50 +05:30
7e646ca3e8 add new EmployeeSearch for multiple 2025-11-14 20:07:28 +05:30
92bcfb73c6 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-14 16:47:40 +05:30
770123119c Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-14 16:39:57 +05:30
7190a3c190 added offcanavs for create and update 2025-11-14 16:39:46 +05:30
b399977946 Invoice list should display according to the selected date range in Collection module. 2025-11-14 15:39:40 +05:30
314dd67118 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-14 15:12:23 +05:30
74e3b11174 Adding some space in Payment Request list. 2025-11-14 15:12:07 +05:30
dab3c5fe52 fixed attachement error 2025-11-14 14:58:50 +05:30
d1bcc9981c Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-14 13:04:29 +05:30
86819dde03 added comment, attchment 2025-11-14 13:04:15 +05:30
64d96d46d0 Correction in UI in Dashboard weidget. 2025-11-14 12:58:47 +05:30