Commit graph

164 commits

Author SHA1 Message Date
Kittapath
5ef3c3e417 สร้างรอบ 2024-03-08 11:38:27 +07:00
Kittapath
7fb9f887ab แก้เงินเดือนทะลุขั้น 2024-03-07 18:43:10 +07:00
Kittapath
a06d22d8fa Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-07 17:40:34 +07:00
1d6ecd3e67 Merge branch 'develop' into adiDev 2024-03-07 17:39:42 +07:00
f9de77f533 fix 2024-03-07 17:39:08 +07:00
Kittapath
8b1029844a Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-07 17:37:25 +07:00
Kittapath
20c5e39ff7 update_table_salaryProfile_add_isNext 2024-03-07 17:37:00 +07:00
Bright
f008f5d891 order isReserve 2024-03-07 17:27:51 +07:00
Kittapath
8d492370b6 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-07 16:17:47 +07:00
Kittapath
24744f7f32 isReserve ว่างได้ 2024-03-07 16:17:33 +07:00
Bright
63cfff2300 no message 2024-03-07 16:15:27 +07:00
e7d59e4397 Merge branch 'develop' into adiDev 2024-03-07 16:07:34 +07:00
efe434e6ac report02 2024-03-07 16:06:49 +07:00
Kittapath
93d4ffa7a6 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-07 15:57:01 +07:00
Kittapath
69df428a4a no message 2024-03-07 15:51:45 +07:00
Bright
50484f7e7c ปรับ order by 2024-03-07 15:47:22 +07:00
Kittapath
e8abc29fdc Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-07 15:39:15 +07:00
Kittapath
b7da166a82 เพิ่ม snap รอบพิเศษ 2024-03-07 15:38:21 +07:00
Bright
defec8a70e migrate 2024-03-07 15:30:46 +07:00
Kittapath
33a5cf2a57 เพิ่มฟิวคุณสมบัติบุคคล 2024-03-07 15:28:23 +07:00
Kittapath
aff5aa452e เพิ่มชื่อผัง 2024-03-07 14:25:14 +07:00
Bright
81f31d454e thai number 2024-03-07 09:35:24 +07:00
Kittapath
a8b09b356d Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-06 18:28:48 +07:00
Kittapath
8c7ea64985 คำนวนโควต้าตอนเพิ่มคน 2024-03-06 18:28:05 +07:00
Bright
3577b97ca0 สังกัด 2024-03-06 18:20:12 +07:00
Kittapath
972539cc6b Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-06 17:27:32 +07:00
Kittapath
494cf7e43d no message 2024-03-06 17:24:27 +07:00
Bright
18c75fc3cc no message 2024-03-06 17:03:24 +07:00
0598f8fd34 Merge branch 'develop' into adiDev 2024-03-06 15:46:01 +07:00
eac7a85f0c report checkpoint 2024-03-06 15:45:12 +07:00
Bright
3234878df5 no message 2024-03-05 18:36:41 +07:00
Bright
5af1ef281a รายงานแบบ 1 กท 2024-03-05 18:30:47 +07:00
161099dbe7 fix เงินเดือน 2024-03-05 14:41:40 +07:00
Kittapath
30a8052f83 no message 2024-03-05 13:32:57 +07:00
Kittapath
0d1bab0796 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-03-05 10:44:50 +07:00
Kittapath
72557983d6 คำนวนเงินเดือน 2024-03-05 10:43:08 +07:00
9f19dfbd28 fix word 2024-03-05 10:29:24 +07:00
55ec0d5e93 fix 2024-03-05 10:22:40 +07:00
a76bdbacba ตรวจสอบการเลื่อนขั้น 2024-03-05 09:38:05 +07:00
Kittapath
f82231c84b no message 2024-03-04 14:09:54 +07:00
606a3cfa36 fix bug 2024-03-04 14:00:40 +07:00
Kittapath
a44c8659fa Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop
# Conflicts:
#	src/controllers/SalaryPeriodController.ts
2024-03-04 13:44:06 +07:00
Kittapath
f0a815f75c no message 2024-03-04 13:40:33 +07:00
965984c5c6 fix bug 2024-03-04 13:37:21 +07:00
23b8909706 fix bug 2024-03-04 09:26:11 +07:00
53d12da717 fix 2024-03-01 14:53:25 +07:00
a1b0936bf6 fix 2024-03-01 14:46:06 +07:00
134fb53fce Merge branch 'develop' into adiDev 2024-03-01 11:04:12 +07:00
0f76e8d3d9 fix bug 2024-03-01 11:02:45 +07:00
Bright
328322211c no message 2024-03-01 10:46:04 +07:00