2668 Commits

Author SHA1 Message Date
c63b13f200 fetched latest data 2025-11-05 12:13:34 +05:30
10ec11a828 Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Recurring_Expense 2025-11-05 12:04:14 +05:30
3b318a672c Implementing Get and Correct API in Recurring. 2025-11-05 12:01:05 +05:30
fba19f6ead added currency utils 2025-11-05 11:59:14 +05:30
4069720ed0 changed currency format in list 2025-11-05 11:48:03 +05:30
e8698473db added layout for Expense veiw modal 2025-11-04 23:17:43 +05:30
f688a7169e spearated component for updated logs Expense and RequestedPayment 2025-11-04 22:54:10 +05:30
69e60caf23 initially setup delete request 2025-11-04 19:36:30 +05:30
ecf34b499e fixed Transaction details inside request payment 2025-11-04 19:31:05 +05:30
e868d27d5f Implementing Get and Update API in Recurring Expense. 2025-11-04 18:34:00 +05:30
0dc68eb20d fixed file uploading and payee 2025-11-04 17:15:42 +05:30
7a749b14e9 Impleting Create API for Recurring Expense. 2025-11-04 17:03:27 +05:30
76fe342c1e Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Recurring_Expense 2025-11-04 15:43:10 +05:30
44a7749cd3 Creating Form for Recurring Expense. 2025-11-04 15:42:00 +05:30
611116b70c chanaged paramter name of payementRequestSchema 2025-11-04 15:34:28 +05:30
e79702661d Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-04 15:30:48 +05:30
10ff3ecd2f fixed permission for update Payement request and expense 2025-11-04 15:30:44 +05:30
bede21aff2 added 2025-11-04 14:11:47 +05:30
bce69783f7 Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-04 14:10:29 +05:30
a8f83571ee Added Checkbox at Advance Payment. 2025-11-04 14:10:07 +05:30
616b986deb Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-04 13:02:18 +05:30
57d33ab817 fixed Expense type to Expense Category 2025-11-04 13:01:51 +05:30
5bf5e18c6b Adding some gap in Amout and Currency at PaymentRequestList. 2025-11-04 12:06:59 +05:30
190612feed Set default INR in Currency at popup. 2025-11-04 12:02:33 +05:30
346ef0174b Rearranging the fields of Payment Request Popup. 2025-11-04 11:42:43 +05:30
192c04fb6f fixed category filter field 2025-11-04 10:46:20 +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
d02b14272f added acion api t update status 2025-11-03 20:25:41 +05:30
edafc204b8 Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-03 17:49:53 +05:30
1e14bfe0b1 added view Paymen request 2025-11-03 17:48:50 +05:30
1c4384a62e Adding Filter Get api and delete modal open. 2025-11-03 17:12:24 +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
871daf6036 added api Get Advance Payment 2025-11-03 14:48:42 +05:30
59c46f7f3b Calling API for Get payment Request. 2025-11-03 14:46:20 +05:30
e80223beba Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-03 12:52:17 +05:30
de2d23ec83 added padding for table header 2025-11-03 12:52:10 +05:30
f3cfb3cf24 adding api for get list for payment request. 2025-11-03 12:50:06 +05:30
0e3c78df11 added advance rpayment list component 2025-11-03 12:11:30 +05:30
e0c0a14777 Adding List view for Payment Request. 2025-11-03 10:06:09 +05:30
17a08304e3 Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-01 18:11:13 +05:30
c13e0acd3d added advance list inside Advance payments 2025-11-01 18:10:48 +05:30
b0a58740a5 Remove mandatory field from bill attachment. 2025-11-01 17:39:54 +05:30
c123373892 Adding Create API for Payment Request. 2025-11-01 17:10:47 +05:30
9c03303547 added employee search box inside advance payment 2025-11-01 16:55:32 +05:30
d8712c0d04 Merge pull request 'issues_Oct_4W' (#498) from issues_Oct_4W into OnFieldWork_V1
Reviewed-on: #498
Merged
2025-11-01 11:21:09 +00:00
5f0972ee32 addedfixed height for employee list insidemanage bucket 2025-11-01 11:21:09 +00:00
0d1d51d56b fixed check ehcke issue 2025-11-01 11:21:09 +00:00
166b0a1caf Remove fw-bold in View popup at attendance logs. 2025-11-01 11:21:09 +00:00
196069b39a Creating APi for Create Payemnt Request. 2025-11-01 16:00:00 +05:30
10c2e9dfee Added Submit and Cancel button on Payment Request. 2025-11-01 15:08:43 +05:30