Commit graph

572 commits

Author SHA1 Message Date
kittapath
99c3eb762e merge 2025-09-15 21:41:07 +07:00
kittapath
e1ca3c01c8 Merge branch 'main' into develop
# Conflicts:
#	src/controllers/SalaryPeriodController.ts
2025-09-15 21:40:17 +07:00
a8d01c42d8 #1718 2025-08-14 15:36:16 +07:00
16e331c6aa close log 2025-08-13 13:38:56 +07:00
91965f170f Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/SalaryPeriodController.ts
2025-08-08 16:32:11 +07:00
f0ba4c8bfc snap and #1741 2025-08-08 16:21:07 +07:00
kittapath
79686e5d45 test snap 2025-07-15 23:52:51 +07:00
kittapath
ab7544373d delete console 2025-07-15 23:36:37 +07:00
kittapath
9998c767eb comment log snap 2025-07-15 22:40:02 +07:00
3c92e500fe Merge branch 'develop' into adiDev 2025-07-11 17:07:04 +07:00
45e125be20 update script snapshot 2025-07-11 17:06:12 +07:00
Bright
dbb43f5969 revert 2025-07-11 14:23:54 +07:00
Bright
536734088f ทดสอบใช้ CHAR10 ขึ้นบรรทัดใหม่ 2025-07-11 14:17:50 +07:00
7c324f1f6f #51 2025-07-11 13:08:05 +07:00
edbb502a0e Merge branch 'develop' into adiDev 2025-07-11 11:44:49 +07:00
d742e4a3ea #50 2025-07-11 11:43:38 +07:00
Bright
30ac106894 api duplicate รูปภาพโปรไฟล์ 2025-07-11 10:50:05 +07:00
56241eda4f Merge branch 'develop' into adiDev 2025-07-02 15:51:04 +07:00
4ddcd270a5 update snap 2025-07-02 15:50:06 +07:00
Bright
8721fcaf30 Fix รายชื่อข้าราชการผู้ที่ได้รับการเสนอขอเลื่อนเงินเดือนทั้งปีสองขั้น #1391 2025-06-27 13:51:38 +07:00
2fc4fd3121 #1390 2025-06-25 17:31:26 +07:00
59eec3d7b9 fix 2025-06-25 15:22:03 +07:00
3b067ef714 update 2025-06-17 18:17:49 +07:00
Bright
f5fd33f7f7 migrate 2025-06-17 14:45:08 +07:00
f53df5d478 add field in salary_profile 2025-06-17 13:40:06 +07:00
0b38e17a0d update 2025-06-05 12:13:42 +07:00
f1c134cb09 update 2025-06-04 15:32:01 +07:00
0af89e7ecf #1521 2025-06-04 13:52:02 +07:00
26a224eeda #1348 and checkpoint 2025-05-27 17:45:05 +07:00
3def195a55 report order by org (emp) 2025-05-19 11:39:09 +07:00
a699e40ee7 #1496 2025-05-16 17:21:23 +07:00
bc4d6c9eb7 #1501 2025-05-15 10:32:10 +07:00
be2238d5d5 #1348 2025-05-13 16:46:06 +07:00
moss
eaaf085472 migrate 2025-05-13 16:15:50 +07:00
4fcf9b0492 wait migrate 2025-05-13 16:08:01 +07:00
98638b9182 checkpoint 2025-05-13 09:49:13 +07:00
moss
5402b06696 แก้ respnse 2025-05-02 11:00:33 +07:00
moss
047bd4d945 special 2025-05-01 17:59:58 +07:00
moss
1f14baaab3 Merge branch 'develop' of github.com:Frappet/hrms-api-salary into develop 2025-05-01 17:40:02 +07:00
moss
3f17faa338 report 2025-05-01 17:39:55 +07:00
46575e7cff fix emp2-14 2025-05-01 17:35:22 +07:00
moss
fa83d942e8 Merge branch 'develop' of github.com:Frappet/hrms-api-salary into develop 2025-05-01 16:31:33 +07:00
moss
ec571dec54 sort by root 2025-05-01 16:31:25 +07:00
aaaeb6cc00 update 2025-05-01 16:20:51 +07:00
85377ca291 fix 2025-05-01 13:39:33 +07:00
e6639e8e72 update 2025-05-01 13:22:51 +07:00
moss
79d10b12e3 snap บางสำนัก 2025-05-01 09:48:03 +07:00
moss
39ec6018d2 snap บางอัน 2025-05-01 09:40:55 +07:00
bd38181be1 Merge branch 'develop' into adiDev 2025-04-30 15:21:58 +07:00
a1db6af300 fix snap 2025-04-30 15:20:47 +07:00