2751 Commits

Author SHA1 Message Date
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
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
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
94413b9beb Implementing ManageReporting at Employee. 2025-11-11 18:00:34 +05:30
264ed4a74d added pluse minus sign 2025-11-11 16:50:17 +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
867ee92151 Adding popup in employees for ManageReporting. 2025-11-11 11:11:13 +05:30
1195cae2d7 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Hierarchy 2025-11-11 09:45:48 +05:30
4eecaf0509 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 18:54:01 +05:30
d82f405e08 changed Expense view u 2025-11-10 18:53:47 +05:30
a37c6b32cb Changing label in Create Payment Request. 2025-11-10 18:31:13 +05:30
9e18dda02f Adding End Date at the view Recurring Expense. 2025-11-10 17:08:23 +05:30
b016f4a523 UI updation at recurring expense. 2025-11-10 17:04:28 +05:30
081b042308 corrected signal key 2025-11-10 16:27:26 +05:30
ca4d57cdc0 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 16:10:45 +05:30
ec9bcd1ea5 added validation for Tax , base amount, and added signal for PR and Recurring 2025-11-10 16:10:18 +05:30
00e74b645c Ui alignment in Recurring Expense and Payment Request page. 2025-11-10 16:00:28 +05:30
26675d61c3 UI correction at Collection form. 2025-11-10 15:36:17 +05:30
78faab1b1e Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 12:58:34 +05:30
6982bb9d77 added heading for PR and Expense Modal 2025-11-10 12:58:30 +05:30
2e49a61aab Changing Date in Expense list grouping. 2025-11-10 12:44:13 +05:30
3723f05a38 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 12:40:33 +05:30
bc6a935e95 modify view of PR 2025-11-10 12:40:29 +05:30
6531eb7576 Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main 2025-11-10 11:50:00 +05:30
c52cbb1435 Adding End Date in Recurring Expense Popup and adding i icon on it. 2025-11-10 11:49:56 +05:30
30615e4bba login page swaper added 2025-11-10 11:28:51 +05:30
dad9551e52 add images
(cherry picked from commit 34b0fa3d43d45e67098ce768f30a00fca0a72925)
2025-11-10 11:24:58 +05:30
449de6edba added new attribute - disabled 2025-11-10 10:15:13 +05:30
34b0fa3d43 add images 2025-11-10 10:06:09 +05:30
c14dc3d765 prevent calling unnecessary call during logout and fixed currency displaying in update form 2025-11-08 21:32:35 +05:30
e7fcfdb154 added Advance Payment 2025-11-08 16:07:09 +05:30
b35c39ca36 removed unsused 2025-11-08 15:42:00 +05:30
2b5858a885 removed unused code 2025-11-08 15:38:51 +05:30
04806c6d53 fixed error - building image 2025-11-08 15:34:59 +05:30