178 Commits

Author SHA1 Message Date
9b091840d6 added payee default 2025-11-05 18:10:24 +05:30
ec2a1706fc added new fields inside Expense action - tds, baseAmount, taxAmount 2025-11-05 17:04:04 +05:30
e8698473db added layout for Expense veiw modal 2025-11-04 23:17:43 +05:30
ecf34b499e fixed Transaction details inside request payment 2025-11-04 19:31:05 +05:30
0dc68eb20d fixed file uploading and payee 2025-11-04 17:15:42 +05:30
10ff3ecd2f fixed permission for update Payement request and expense 2025-11-04 15:30:44 +05:30
57d33ab817 fixed Expense type to Expense Category 2025-11-04 13:01:51 +05:30
3aa9934f8b Merge branch 'OnFieldWork_V1' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-04 09:55:06 +05:30
859eaa747f Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-03 16:56:49 +05:30
c13e0acd3d added advance list inside Advance payments 2025-11-01 18:10:48 +05:30
9c03303547 added employee search box inside advance payment 2025-11-01 16:55:32 +05:30
0d1d51d56b fixed check ehcke issue 2025-11-01 11:21:09 +00:00
dc75121d31 fixed date formating inside attenace logs and expense list 2025-10-30 11:29:02 +05:30
cc4cea0f27 fixed date range picker width 2025-10-29 11:46:46 +05:30
7c5dca1665 updated confirm modal, added success option 2025-10-24 11:36:00 +05:30
0091b1064e intergrated collection managment 2025-10-17 13:49:44 +05:30
44b3f842f2 Correction in Date Ranger in Attendance Logs. 2025-10-10 16:36:39 +05:30
fbb68a4488 Correction in DataRangePicker for date range box and Calender. 2025-10-10 15:24:34 +05:30
24501b3c76 persist date 2025-10-10 12:48:37 +05:30
bc933f4c64 Adding Search box in Expense Paid by dropdown. 2025-10-08 11:29:51 +05:30
25f4f1e7a7 added expense analysis card inisde dashboard 2025-10-02 13:10:14 +05:30
9884943907 addded imported field added 2025-10-01 18:45:26 +05:30
4ddb8415cc added gobal create project,change paid by at expense create 2025-09-30 17:27:20 +05:30
72424eee53 added updation for fllter 2025-09-29 11:52:11 +05:30
482f8a9bcb added organization api in repo. and removed unuse files 2025-09-27 23:54:44 +05:30
1e7b4ba21e Date field not cleared in Tenant filter after clicking Clear button 2025-09-27 09:40:05 +00:00
7ac3268514 Add an info (ℹ️) icon to the Daily Progress Report’s Total Pending Task 2025-09-27 09:37:36 +00:00
57edd92dce fixed blocking of dailyprogress by using pagination 2025-09-25 12:36:55 +05:30
a380a7ab29 Changes in Choose Organization1 popup increase the space. 2025-09-22 16:25:02 +05:30
c609387924 Changes in Organization popup 2025-09-22 16:00:24 +05:30
Pramod
e610cc08c1 changed Uii for org. or project assigned 2025-09-20 18:47:09 +05:30
731d2dbed7 Changes in Infrastructure. 2025-09-20 11:51:32 +05:30
2e65007f26 fixed Modal provider component and setup organization creation 2025-09-18 15:23:48 +05:30
3c4c25b449 refactore SelectMult Tag for label display is required or optional 2025-09-18 15:23:23 +05:30
979293ad90 setup organization modal, it seprated form another becuase this modal can open anywhere at one hook 2025-09-18 15:21:23 +05:30
99eaf92e3f initially setup 2025-09-18 15:18:51 +05:30
a48fc1d989 fixed Modal provider component and setup organization creation 2025-09-18 15:18:04 +05:30
8eb8e27f89 refactore SelectMult Tag for label display is required or optional 2025-09-18 15:18:04 +05:30
012a89b3ea setup organization modal, it seprated form another becuase this modal can open anywhere at one hook 2025-09-18 15:18:04 +05:30
701d1adc0b initially setup 2025-09-18 15:18:03 +05:30
42086d7f3a Merge branch 'Refactor_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Sep_1W_V2 2025-09-16 10:40:27 +05:30
70110192f4 Remove Required Indicator from Tags Field in Document Upload 2025-09-13 10:13:18 +00:00
2f2ddb0576 Standardize All Buttons in Expenses Module to Match Website-Wide Button Style 2025-09-13 10:06:14 +00:00
0484de498c Changes in UI of Directory Notes Tabs and all the popups. 2025-09-12 16:11:31 +05:30
717264c9f9 fixed update and creation for contacts 2025-09-11 17:34:56 +05:30
bac62e1fa7 Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
# Conflicts:
#	src/components/Employee/EmpOverview.jsx
2025-09-10 10:38:13 +05:30
5ec5218dd6 Merge branch 'Issues_Sep_1W' into Document_Manag
# Conflicts:
#	src/pages/Activities/DailyTask.jsx
#	src/pages/master/MasterPage.jsx
2025-09-10 10:37:38 +05:30
d5b3c25b45 added flag for pick future date or not 2025-09-09 13:31:30 +05:30
f8466e5f4a changed text font of SelectMulti tag value scondaru to semibold 2025-09-09 13:17:47 +05:30
97a4a4593e Changes In Popup of Document Manager popup. 2025-09-08 14:54:15 +05:30