2716 Commits

Author SHA1 Message Date
f69faccd62 Changing due to date name to due date. 2025-11-07 09:49:00 +05:30
25a599e614 added pagination 2025-11-06 19:16:55 +05:30
71959558cd removed unused code 2025-11-06 18:16:25 +05:30
e40ff68209 Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-06 18:09:39 +05:30
2a0c10fa71 Merge pull request 'Creating Recurring Expense Details form.' (#502) from View_Recurring_Expense into upgrade_Expense
Reviewed-on: #502
Mereged
2025-11-06 12:39:29 +00:00
161f14d247 fixed missing fieldd noOfEmployee inside employee 2025-11-06 18:08:19 +05:30
da32f9c8ff Creating Recurring Expense Details form. 2025-11-06 17:52:28 +05:30
72e5cf0bbe display all time lien from darft 2025-11-06 15:48:53 +05:30
1278e32da9 Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-06 13:18:00 +05:30
28f15f649f update advance trsnaction table 2025-11-06 13:17:31 +05:30
07eedfc9e2 Alphabatically sorting at Manage Roles. 2025-11-06 12:35:06 +05:30
9d35d00009 Adding text-center at status column. 2025-11-06 12:31:14 +05:30
35956cc9bb Implementing Recurring Expense status column. 2025-11-06 12:29:35 +05:30
41377167e6 Correction in UI of Recurring page. 2025-11-06 12:25:32 +05:30
428f22ea8e UI changes in Collection forms and Recurring form. 2025-11-06 12:23:46 +05:30
4d40b8e149 Removing unwanted horizontal line in expense Details popup and remove unwanted console.log. 2025-11-06 10:39:26 +05:30
e4585d6c43 added view for working area 2025-11-06 10:21:33 +05:30
c3e030754f Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-06 10:07:46 +05:30
deda915e74 fixed updated recurring 2025-11-06 10:07:36 +05:30
dfaf90ccac Changes in Advance PaymentList. 2025-11-06 10:05:05 +05:30
a253eea33c fixed action schema or PR 2025-11-06 09:32:05 +05:30
d9e1bfac97 changed inut type for tax , base, tds 2025-11-06 09:15:29 +05:30
06e8046dde Properly updateExpense time line 2025-11-06 09:10:30 +05:30
82f173c0ed changed veriable name expensesCategoryId to expenseCategoryId and passes properly param. for list api 2025-11-06 08:55:55 +05:30
1f784f330d merged recurring into upgrade expense 2025-11-06 01:00:11 +05:30
4ae0b403a6 Merge branch 'Recurring_Expense' into upgrade_Expense 2025-11-06 00:25:26 +05:30
33256981da recover , misssing code during resloving merged 2025-11-06 00:21:57 +05:30
1ca1f15422 use 2025-11-05 23:29:09 +05:30
84ed1984d7 Merge branch 'Recurring_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Recurring_Expense 2025-11-05 23:13:07 +05:30
b668faab33 Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-05 23:04:34 +05:30
8229a44a74 added advance transaction records 2025-11-05 23:04:27 +05:30
324ad05771 Adding API for EDIT in Recurring Expense. 2025-11-05 21:36:03 +05:30
418979568d Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into upgrade_Expense 2025-11-05 21:11:30 +05:30
bac9f25df1 added advance payment api 2025-11-05 20:10:19 +05:30
e1e9920b3e added payee at updation time 2025-11-05 18:15:53 +05:30
9b091840d6 added payee default 2025-11-05 18:10:24 +05:30
b897a41f95 Removing unwanted space. 2025-11-05 17:43:24 +05:30
ec2a1706fc added new fields inside Expense action - tds, baseAmount, taxAmount 2025-11-05 17:04:04 +05:30
cb0ed03525 Adding some changes in Recurring Schema. 2025-11-05 17:00:25 +05:30
0372991ac1 Adding auto trim in Schema of Recurring Expense. 2025-11-05 16:57:36 +05:30
ac9eaa1e67 Adding Radio Buttons at Manage Recurring Expense. 2025-11-05 16:19:44 +05:30
daaebf919d added New Expense after Payment Request done 2025-11-05 15:17:07 +05:30
92fa1c9a3d Adding filter in Recurring Expense and search functionality is also working. 2025-11-05 14:45:06 +05:30
c0f30397ef Implementing Payee api for Payee. 2025-11-05 13:02:46 +05:30
00f405069b Adding Some spacing in columns. 2025-11-05 12:40:17 +05:30
2a46ac1349 Adding Spacing in List for Recurring Expense. 2025-11-05 12:33:56 +05:30
f4838441aa removed border 2025-11-05 12:16:27 +05:30
c63b13f200 fetched latest data 2025-11-05 12:13:34 +05:30
9b65c12239 Merge branch 'Recurring_Expense' into upgrade_Expense 2025-11-05 12:09:37 +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