2968 Commits

Author SHA1 Message Date
00d5df5ebb Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Services_Bugs 2025-11-28 11:58:14 +05:30
40b11d209c UI updation at Purchase Invoice. 2025-11-28 11:49:26 +05:30
e5bfc6be44 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-11-28 11:10:16 +05:30
d987bd2a51 Alignment in Add Chalan and adding Page-min-h at list. 2025-11-28 11:09:45 +05:30
bd1a97716c Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-11-28 11:02:38 +05:30
e0789cda3a fixed project, supplier and Organization filed fullfied whenevr open for update 2025-11-28 11:02:17 +05:30
73f5b46a40 Adding Query key in useUpdatePurchaseInvoice. 2025-11-28 10:36:02 +05:30
9234253c97 fixed perfoma amt and delivery charge validation 2025-11-28 10:26:26 +05:30
2b4f086318 added add challan btn 2025-11-28 09:54:42 +05:30
1c41c00d72 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-11-27 21:25:26 +05:30
b8d3e58428 added challan 2025-11-27 21:25:23 +05:30
1b3e090211 added updation invoice 2025-11-27 16:52:33 +05:30
339a5ff257 UI alignment in Purchase Invoice popup and changes in Jobs Arcieve and Archieve button. 2025-11-27 15:56:19 +05:30
528255c2bd added view deatils of purchases 2025-11-27 12:42:40 +05:30
909022b034 added purchase list 2025-11-26 20:25:59 +05:30
271787812b added get api for purchases 2025-11-26 19:15:50 +05:30
0eb3cc61a3 removed unused code 2025-11-26 18:56:36 +05:30
ea0e38f100 removed console 2025-11-26 18:41:23 +05:30
d27546073f Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-26 18:37:08 +05:30
a1a8dd4447 added zoom in and size bar collaspeing 2025-11-26 18:37:05 +05:30
80717f0458 Showing message on the center of the page in Branches. 2025-11-26 18:02:26 +05:30
4dbfe2bd48 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-26 17:53:21 +05:30
c2c8dabdd4 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-26 17:52:34 +05:30
54ca807436 removed double class name 2025-11-26 17:52:22 +05:30
6e57108f8e Merge pull request 'UI alignment in Finance forms.' (#515) from Finance_Form_Layout into Project_Branch_Management
Reviewed-on: #515
merged
2025-11-26 12:21:31 +00:00
219161f15e UI alignment in Finance forms. 2025-11-26 12:21:31 +00:00
86039552c8 Merge pull request 'Weidget_Dashoard_Jobs :- Creating Weiget for Jobs.' (#521) from Weidget_Dashoard_Jobs into Project_Branch_Management
Reviewed-on: #521
merged
2025-11-26 12:19:44 +00:00
e8ebbe4d76 Hide the Weidget. 2025-11-26 12:19:44 +00:00
3d7a404d1f Changing Name of tabs. 2025-11-26 12:19:44 +00:00
e041e0fe8a Adding Permission in Attendance Weiget at dasboard and Project Profile. 2025-11-26 12:19:44 +00:00
082df5fad3 Changes in Daily progress report filter panel and Daily task list view. 2025-11-26 12:19:44 +00:00
cfcf80b6c2 Changes in ServiceJobs. 2025-11-26 12:19:44 +00:00
7617146512 Adding Min Height in Attendance Weiget. 2025-11-26 12:19:44 +00:00
711dfb8f00 Correction in Project Statistics. 2025-11-26 12:19:44 +00:00
cf430881dc Creating new weidget for dashboard for Service jobs. 2025-11-26 12:19:44 +00:00
80f5dbd639 reset after invoice created 2025-11-26 15:50:46 +05:30
998284f398 added organization api and successfuly created invoice 2025-11-26 15:16:58 +05:30
82c1dc4b8e created purchase form 2025-11-26 12:29:40 +05:30
b8df8a2bde initially setup purchaseform 2025-11-25 20:01:11 +05:30
5d773b0680 Merge branch 'SideBarCollapsed' into Purchase_Invoice_Management 2025-11-25 15:24:19 +05:30
d4582c101a Merge pull request 'Project_Branch_Management : New Feature Service Project - Branch Management' (#519) from Project_Branch_Management into main
Reviewed-on: #519
merged
2025-11-25 09:42:47 +00:00
c6af020c85 changed fs-6 and body-font-size 2025-11-25 15:09:25 +05:30
822ff1a7e4 UI Alignment in Service Card view. 2025-11-25 11:20:19 +05:30
92d17167b1 added zoom in-out 2025-11-25 10:11:43 +05:30
f13005a031 fixed side issue collapsing 2025-11-24 19:48:03 +05:30
8ec62827d5 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-24 17:58:26 +05:30
965fce1587 Merge pull request 'Service_Project_ListView :- Creating List view for service Project.' (#518) from Service_Project_ListView into Project_Branch_Management
Reviewed-on: #518
Merged
2025-11-24 11:16:57 +00:00
bb37fd7044 set align for Service Project List card 2025-11-24 11:16:57 +00:00
03d60bf66d Adding search functionality in Projectpage. 2025-11-24 11:16:57 +00:00
071e5956a7 Changes. 2025-11-24 11:16:57 +00:00