Commit graph

148 commits

Author SHA1 Message Date
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
Bright
772741ed01 แก้แจ้งเตือนปีที่ซ้ำเป็น พศ. 2024-03-01 10:38:05 +07:00
8b81afe00d fix bug 2024-02-29 15:33:17 +07:00
43a8c8c8f0 Merge branch 'develop' into adiDev 2024-02-29 14:53:34 +07:00
b2205ff3ce cal sixPercent 2024-02-29 14:52:54 +07:00
Kittapath
442be8bf38 เงินเดือนว่างได้ 2024-02-29 14:41:44 +07:00
Kittapath
0888d3d8d8 เงินเดือนไม่มีค่าให้เป็นnull 2024-02-29 14:07:27 +07:00
Kittapath
6791dde26f แก้คิวรี่ค้นหาคนในระบบเงินเดือน 2024-02-29 13:40:49 +07:00
Kittapath
a8b77ec2fb ค้นหาคนเกษียญ 2024-02-29 12:08:11 +07:00
Kittapath
b8e4e8270b Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-02-29 11:29:24 +07:00
Kittapath
8358ed8773 เพิ่มฟิว isretire 2024-02-29 11:29:05 +07:00
b055549375 fix snapshot error 2024-02-29 11:24:33 +07:00
Kittapath
77b8ef8a7d แก้ merge 2024-02-29 11:01:35 +07:00
e711a26335 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop
# Conflicts:
#	src/controllers/SalaryPeriodController.ts
2024-02-29 10:38:45 +07:00
037fa442a5 cal Quota and fix bug 2024-02-29 10:29:51 +07:00
Kittapath
ddd4eadfcf no message 2024-02-28 20:41:27 +07:00
Kittapath
b17fd476c0 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-02-28 18:11:35 +07:00