2931 Commits

Author SHA1 Message Date
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
05f45a66d8 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#1737 2025-11-14 11:59:06 +05:30
0b38196847 Hide “Advance Payment” Mode When Creating Expense After Payment Processed (Mobile & Web) 2025-11-14 11:52:12 +05:30
74e645a41e Increase the size of datepicker at gallery filter panel and remove unwanted PaidBy field in ViewPayment Request. 2025-11-14 11:23:10 +05:30
598601c515 We are creating filter chips in the Payment Request filter panel. 2025-11-14 10:22:27 +05:30
297e0712bc integrated job details api and optimized form 2025-11-14 02:51:29 +05:30
9b7988d6d8 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-13 19:50:41 +05:30
844a6f59d1 added fetch api of jobs 2025-11-13 19:50:19 +05:30
c1be1dafc8 Changes in Payment Request List view adding Due Date, Created at and Payee. 2025-11-13 17:45:05 +05:30
14ed888fe8 UI implementation has been done in Expense 2025-11-13 17:22:54 +05:30
b13034a995 Expense widget - Layout change 2025-11-13 15:14:07 +05:30
c4b589460a Correction in EmpReportingManger. 2025-11-13 12:33:50 +05:30
32b7c53b6c Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-13 12:31:47 +05:30
c0378e1d7d revert body background color change. It was turned white after making changes for Landing Page. Ideallly it had to be gray 2025-11-13 12:31:43 +05:30
8453a09426 Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment 2025-11-13 11:34:34 +05:30
60421d1028 Adding Navigate functionality in ManageReporting. 2025-11-13 11:34:05 +05:30
2746e9d2bb added Job tab 2025-11-13 11:00:51 +05:30
651779adea Merge branch 'Organization_Hierarchy' into Service_Project_Managment 2025-11-13 10:20:48 +05:30
910565e003 Merge branch 'Organization_Hierarchy' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Hierarchy 2025-11-13 10:07:48 +05:30
a40f96fe72 removed unneeded border and replace toggle for activtive - inactie 2025-11-13 10:07:40 +05:30
cd467efcb3 Correction in EmpReporting Manger. 2025-11-13 10:05:41 +05:30
559d6cdaac Adding Employee details at mange Reporting popup. 2025-11-13 09:54:54 +05:30
3500adc1eb Change the icon in Employee List manage Reporting button. 2025-11-13 09:45:41 +05:30
d7f00898a0 added delete service project 2025-11-12 19:38:04 +05:30
1bba9ab68a added created, fetch and edit operration 2025-11-12 18:12:37 +05:30
5c1b14bd38 added create service project and separated service project and orgnaization project 2025-11-12 14:18:43 +05:30
6019114853 Corrected the spelling mistake in landing page file 2025-11-12 12:41:21 +05:30
fa944f5abe Removing unwanted placeholder. 2025-11-12 12:14:09 +05:30
4351fafed7 Adding Card in Profile related to Reporting Manger. 2025-11-11 18:59:58 +05:30
15e67da7f6 modify hero images for landing page 2025-11-11 18:47:00 +05:30
94413b9beb Implementing ManageReporting at Employee. 2025-11-11 18:00:34 +05:30
8900ed6fc4 Merge branch 'landing-page-consmatic-changes-migration' into migrate_main 2025-11-11 17:34:50 +05:30
04a3141f65 remove swiper from login main and added bootstrap corausal 2025-11-11 17:34:25 +05:30
264ed4a74d added pluse minus sign 2025-11-11 16:50:17 +05:30
1067ac02b3 arrange images for login screen swiper module 2025-11-11 16:05:09 +05:30
96abc8d42c Additing validation at payment Request schema. 2025-11-11 14:40:31 +05:30
ba0036b1fa Adding Badge. 2025-11-11 14:14:02 +05:30
c52fb2c999 Adding TDS percentage calculation at View Payment Request. 2025-11-11 14:11:35 +05:30