3052 Commits

Author SHA1 Message Date
a1680c709a Adding dropdown in Daily task. 2025-12-06 10:22:24 +05:30
0e75a3e1c9 Adding Dropdown in Employee. 2025-12-06 10:11:58 +05:30
dbf4f5e9c8 Adding New dropdown in across all modules. 2025-12-05 17:57:08 +05:30
7df9d47f07 Adding dropdown in directory. 2025-12-05 15:40:38 +05:30
8f6d877548 removed scrolling inside job - status logs 2025-12-05 12:05:55 +05:30
7930876b7d Merge pull request 'Adding time line in Jobs Status.' (#527) from Implementing_TimeLine into Purchase_Invoice_Management
Reviewed-on: #52
merged
2025-12-05 06:23:55 +00:00
b8f2607b45 Adding Workdone label. 2025-12-05 06:23:55 +00:00
47752e5e35 Adding time line in Jobs Status. 2025-12-05 06:23:55 +00:00
25bb7d1f58 allow view pdf file 2025-12-05 11:38:54 +05:30
427d728efc Merge pull request 'Adding Tabs in attendancepage just like View Jobs.' (#529) from Attendance_Tabs into Purchase_Invoice_Management
Reviewed-on: #529
Merged
2025-12-05 04:49:16 +00:00
65043732d3 Adding Tabs in attendancepage just like View Jobs. 2025-12-05 04:49:16 +00:00
6a0feacb1b Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-12-04 17:38:32 +05:30
949126d790 Adding height in ServiceProjectTeamlist. 2025-12-04 15:20:08 +05:30
f9d66d73b0 changed sequnce of project nave 2025-12-04 13:44:23 +05:30
0dbfc1f87a hide time 2025-12-04 13:09:29 +05:30
49c07606aa Adding Acknowledge number and date in View Purchase. 2025-12-04 11:32:58 +05:30
865928c1cb correct right path 2025-12-03 16:58:42 +05:30
06882e557e fixed- added right path 2025-12-03 16:54:48 +05:30
581447ecb6 addd field inside view Purchase - 2025-12-03 16:44:21 +05:30
2392a96eb8 added new column proform amount 2025-12-03 16:02:36 +05:30
8a3228c0c1 added pagination inside infra list 2025-12-03 15:27:12 +05:30
d615f6ca8a added required start tick on field base proforma and base amount 2025-12-03 14:53:14 +05:30
48f8d4aedb Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-12-03 13:55:43 +05:30
258bd82b54 handle proforma to base , Tax, amount condition 2025-12-03 13:55:39 +05:30
ef38ac4cdb added page-min-h in directorycontectlist. 2025-12-03 12:34:21 +05:30
8dfc8e4336 Merge pull request 'Adding ImageGallery Chips.' (#517) from Image_Gallery_FilterChips into Purchase_Invoice_Management
Reviewed-on: #517
merged
2025-12-03 06:55:13 +00:00
25b334a83c restriction before choosing project for gallery filter api calling an removed unused code 2025-12-03 06:55:13 +00:00
a8c10a0a9a UI updation in Collection. 2025-12-03 06:55:13 +00:00
4a66dad07a UI updation in Organization. 2025-12-03 06:55:13 +00:00
21c2a5cf7d Adding ImageGallery Chips. 2025-12-03 06:55:13 +00:00
83bd99549a Merge pull request 'Finance_Export_Functionality :- Implementing Export Functionality in Finance Module.' (#522) from Finance_Export_Functionality into Purchase_Invoice_Management
Reviewed-on: #522
Merged
2025-12-03 06:45:30 +00:00
8fc49ab4a7 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Finance_Export_Functionality 2025-12-03 12:14:41 +05:30
7fc058565b changed component, follow standard naming 2025-12-03 12:12:19 +05:30
d9947daf83 changed component, follow standard naming 2025-12-03 12:09:35 +05:30
36f5edf4f5 UI updation in all popups. 2025-12-03 11:42:44 +05:30
9cd1d932b1 added preview image inside challan, remove restric of payment date 2025-12-03 11:33:23 +05:30
214a416deb UI updation in Create and Update Service and Infra projects. 2025-12-03 11:30:41 +05:30
3e3ff189c9 changed class to className 2025-12-03 10:10:36 +05:30
06ac8099ed Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Finance_Export_Functionality 2025-12-03 09:55:57 +05:30
917e7f3ccc Adding api for Finance for Export. 2025-12-03 09:53:41 +05:30
927b1840b4 Merge pull request 'Correction in HoverPopup at Jobs View panel.' (#525) from Jobs_Side_Panel into Purchase_Invoice_Management
Reviewed-on: #525
Merged
2025-12-03 04:18:02 +00:00
8dbdd230af Adding HoverPopup effect. 2025-12-03 04:18:02 +00:00
57bbcd4b45 Correction in HoverPopup. 2025-12-03 04:18:02 +00:00
c3720df294 removed invalid border for tittle 2025-12-02 17:32:27 +05:30
a747880a77 fixed value of sume value 2025-12-02 17:27:55 +05:30
3bfe108dab removed all required condition 2025-12-02 17:23:03 +05:30
aa2e732ff4 added merged payment and delete 2025-12-02 10:58:38 +05:30
76d99d6a14 merged purchase_payment 2025-12-02 09:49:56 +05:30
444ffa9696 Merge pull request 'At the time of Update in Purchase Automatically hit the sumit without click.' (#526) from Purchase_Invoice_Update into Purchase_Invoice_Management
Reviewed-on: #526
merged
2025-12-02 04:13:53 +00:00
03fb5f7bc3 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Finance_Export_Functionality 2025-12-01 15:16:51 +05:30