|
|
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 |
|
|
|
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 |
|
|
|
264ed4a74d
|
added pluse minus sign
|
2025-11-11 16:50:17 +05:30 |
|
|
|
867ee92151
|
Adding popup in employees for ManageReporting.
|
2025-11-11 11:11:13 +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 |
|
|
|
bc6a935e95
|
modify view of PR
|
2025-11-10 12:40:29 +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 |
|
|
|
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 |
|
|
|
5a7c6a29ba
|
added recurring payment
|
2025-11-08 15:20:53 +05:30 |
|
|
|
587fb420fd
|
migrated PR from upgrade_Expense
|
2025-11-08 12:53:24 +05:30 |
|
|
|
2f70b83548
|
added route and initially setup of payment-request
|
2025-11-08 09:24:45 +05:30 |
|
|
|
6f228ed5f1
|
added currency,rename of ExpenseType to expenseCategory - hooks,( expenseCategoryIds = fileter object)
|
2025-11-08 09:10:35 +05:30 |
|
|
|
7b2bb4d59a
|
Merge branch 'Issues_Oct_4W_V1' into migrate_main
|
2025-11-07 15:17:58 +05:30 |
|
|
|
3259a1ba81
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Payment_Getway_Management
|
2025-11-07 14:56:27 +05:30 |
|
|
|
034859e88b
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Oct_4W_V1
|
2025-11-07 14:51:05 +05:30 |
|
|
|
a656907695
|
migrated suscripton onfield to main sub-branch
|
2025-11-07 14:47:09 +05:30 |
|
|
|
c216ea1162
|
some minor label changes
|
2025-11-03 12:32:34 +05:30 |
|
|
|
c7fe28a4ed
|
change application title from all places from PMS to OnFieldWork
|
2025-11-03 12:07:07 +05:30 |
|
|
|
8522f0ca82
|
Correction in Date format in Attendance logs, and adding spinnerloade at attendance tab.
|
2025-10-31 15:37:26 +05:30 |
|
|
|
1c64fac499
|
Adding Spinners in all files.
|
2025-10-31 15:06:11 +05:30 |
|
|
|
f7c55b4e67
|
Changes in Attendance tabs.
|
2025-10-31 05:21:20 +00:00 |
|
|
|
8fb2091dbd
|
Changes in Expense Component UI.
|
2025-10-30 16:30:29 +05:30 |
|
|
|
31a8329254
|
added initial setp for aing subscription
|
2025-10-30 09:48:35 +05:30 |
|
|
|
46ad5429cf
|
intergrated self subscription
|
2025-10-29 18:59:05 +05:30 |
|
|
|
e95a78e1a3
|
added payment getway using raz razorpay
|
2025-10-29 10:58:28 +05:30 |
|
|
|
aa1fc00611
|
initially setup paymentgatway
|
2025-10-25 15:37:38 +05:30 |
|
|
|
32f16092db
|
changed ui for org
|
2025-10-24 17:29:38 +05:30 |
|
|
|
9355efa4af
|
fixed search position of master search bar
|
2025-10-24 13:12:41 +05:30 |
|
|
|
c438b51ef1
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main
|
2025-10-24 13:04:39 +05:30 |
|
|
|
9e5555ff9d
|
added properly permissions
|
2025-10-24 06:41:58 +00:00 |
|
|
|
8a18c0860e
|
added collection permission
|
2025-10-24 06:41:58 +00:00 |
|
|
|
e5b01e9e0f
|
added xl, and doc file allow to upload and getSubscription plan api properly
|
2025-10-24 06:41:58 +00:00 |
|
|
|
b7268f9294
|
removed console
|
2025-10-24 06:41:58 +00:00 |
|
|
|
43ecdadfa9
|
added paymentadjustment head crud operation
|
2025-10-24 06:41:58 +00:00 |
|
|
|
10fc88c022
|
added mark as completd api operation
|
2025-10-24 06:41:58 +00:00 |
|
|
|
3b0097f46b
|
integrated editcollection and vew douments
|
2025-10-24 06:41:58 +00:00 |
|
|
|
edae70f8af
|
integrated collection details api
|
2025-10-24 06:41:58 +00:00 |
|
|
|
2a0f7794b5
|
Changes in filter panel.
|
2025-10-16 10:17:12 +05:30 |
|
|
|
798ea24088
|
Merge branch 'Issues_Oct_main_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main
|
2025-10-16 10:03:02 +05:30 |
|
