Commit graph

63 commits

Author SHA1 Message Date
Kittapath
a568259c57 no message 2024-04-05 14:22:26 +07:00
Bright
ff63e650fb ปรับ endpont + emp-10 2024-04-01 17:19:32 +07:00
Bright
139da05b0c comma 2024-04-01 14:11:06 +07:00
Bright
3284fdbb86 gov1-08 2024-04-01 13:31:39 +07:00
Bright
0b416e57f4 no message 2024-03-29 17:45:33 +07:00
Bright
377e8a46de รวม report 2024-03-29 17:35:28 +07:00
Bright
b048fde3b6 emp2-03 2024-03-29 14:09:42 +07:00
Bright
fbe018c211 no message 2024-03-29 11:27:56 +07:00
Bright
4f1d2f6c62 emp2-(04, 06, 08, 10, 12, 14, 16, 18, 19, 20, 22, 24) 2024-03-28 17:21:32 +07:00
09433a80bd fix report emp2-02 2024-03-28 10:26:34 +07:00
1a9b60dc7b Merge branch 'develop' into adiDev 2024-03-27 16:01:04 +07:00
7a6f594580 emp2-02 2024-03-27 16:00:02 +07:00
Bright
478cd7f083 gov-(04-05) กรองเกษียณและไม่เกษียณ 2024-03-27 15:30:41 +07:00
Kittapath
94d0412e21 แก้เปอรเซรนเงนพิเศษ 2024-03-27 12:11:09 +07:00
df264107d1 Merge branch 'develop' into adiDev 2024-03-26 17:00:06 +07:00
0c5da1e97c report emp2-01 2024-03-26 16:59:14 +07:00
Bright
04d746bb18 thai num 2024-03-25 16:36:41 +07:00
Bright
2e273262de no message 2024-03-25 16:29:35 +07:00
Bright
b17a55da72 isNext 2024-03-25 16:28:48 +07:00
Bright
e05e6c625e emp1-09 2024-03-25 15:57:38 +07:00
Kittapath
9d6992e4e1 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop
# Conflicts:
#	src/controllers/ReportController.ts
2024-03-22 18:04:20 +07:00
Kittapath
8c0589fedd set api เงินเดือนลูกจ่างรอบตุลา 2024-03-22 18:02:51 +07:00
Bright
db910ec9f9 gov1-03 & gov2-03 ปรับ Group1,2 2024-03-22 17:44:56 +07:00
Kittapath
6fad0f10a3 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-22 12:32:33 +07:00
Kittapath
bacac6c931 แก้report ลูกจ้างเลื่อนขั้นเงินเดือนพิเศษ 2024-03-22 12:32:17 +07:00
Bright
511970f61a ปรับ gov1-03 2024-03-22 12:04:57 +07:00
Kittapath
f4c6831c0b เก็บเงินพิเศษลูกจ้าง 2024-03-22 11:31:56 +07:00
Bright
d3dd7012a1 gov2-03 2024-03-21 18:18:50 +07:00
Kittapath
1fd8586c74 emp1 4 5 6 7 12 13 15 16 2024-03-21 16:34:30 +07:00
Kittapath
3c00aa7ac2 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-21 15:29:56 +07:00
Kittapath
727119a9b0 emp 01-03 2024-03-21 15:29:39 +07:00
Bright
376da1aa75 gov1-03 2024-03-21 14:17:21 +07:00
Kittapath
aef3fbba79 report 05 2024-03-21 10:25:48 +07:00
Kittapath
342f95302d report 04 2024-03-21 09:51:42 +07:00
8d3fa8f7a7 Merge branch 'develop' into adiDev 2024-03-20 20:35:14 +07:00
31faf3b62b fix gov1-04 2024-03-20 20:34:23 +07:00
Kittapath
90c2da588d Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-20 19:30:33 +07:00
Kittapath
1a354baf68 report gov2 02 2024-03-20 19:30:13 +07:00
1b2e4239f5 fix gov1-04 2024-03-20 19:12:43 +07:00
Kittapath
dc8b7f815a Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-20 18:06:14 +07:00
Kittapath
78801a8c6c report 2 2024-03-20 18:05:57 +07:00
Bright
0dcc5c0ac0 เลื่อนเงินเดือนปีก่อนหน้า 2024-03-20 17:16:59 +07:00
Kittapath
3d6ceb2229 report gov01-07 2024-03-20 13:54:34 +07:00
5bbda41b2f Merge branch 'develop' into adiDev 2024-03-20 11:51:52 +07:00
2fc8c3d459 fix report gov1-04 2024-03-20 11:50:19 +07:00
Bright
a14ca23c0a ปีพศ. 2024-03-20 11:14:07 +07:00
Kittapath
9404c61b5e Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-20 11:04:55 +07:00
Kittapath
ab2eb826d3 report gov2 2024-03-20 11:04:39 +07:00
Bright
a9eb07af38 Merge branch 'develop-Bright' into develop 2024-03-20 10:56:20 +07:00
Bright
8d43780135 ปรับ report gov1-03 2024-03-20 10:56:15 +07:00