Commit graph

127 commits

Author SHA1 Message Date
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
Bright
33c5dd839e Merge branch 'develop' into develop-Bright
# Conflicts:
#	src/controllers/SalaryPeriodController.ts
2024-02-28 18:10:09 +07:00
Bright
42acedebf5 no message 2024-02-28 18:07:38 +07:00
aeb034a654 เพิ่ม call 2024-02-28 18:03:36 +07:00
Kittapath
97551dc096 คำนวนเงินเดือนย้อนหลัง 2024-02-28 17:58:39 +07:00
Kittapath
bbe3ee2906 migrate db 2024-02-28 16:33:03 +07:00
6fd1a8170e Merge branch 'develop' into adiDev 2024-02-28 16:28:17 +07:00
95c4321c5d add feild SalaryOrg 2024-02-28 16:27:36 +07:00
Kittapath
442f2f9a86 แก้ฟิวvalidate 2024-02-28 16:04:09 +07:00
Kittapath
8339e6ce6d no message 2024-02-28 14:46:17 +07:00
Kittapath
6ed7265094 no message 2024-02-28 14:18:07 +07:00
Kittapath
4d24a34674 Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-02-28 13:59:24 +07:00
Kittapath
6bca6c5ba5 no message 2024-02-28 13:59:03 +07:00
Bright
74349d93c4 ลบ caption "ไอดี" 2024-02-28 13:35:08 +07:00
Bright
382866d1cd Cronjob SalaryPeriod 2024-02-28 13:16:01 +07:00
Kittapath
b93fb6c1e5 no message 2024-02-28 11:27:52 +07:00
Kittapath
6856c0c33a Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop 2024-02-28 11:24:24 +07:00
Kittapath
b91a217229 no message 2024-02-28 11:22:42 +07:00
Bright
0f28e9d531 Merge branch 'develop' into develop-Bright 2024-02-28 10:38:13 +07:00
Bright
a5daa9d742 call api 2024-02-28 10:37:48 +07:00
Kittapath
f0e6ca6a56 snap salary(ยังไม่เสร็จ) 2024-02-28 10:34:55 +07:00
Bright
5f222498cb แก้ SLR_018 , ลบ return id 2024-02-27 17:14:22 +07:00