|
|
3b32e38e53
|
Merge branch 'develop' into adiDev
|
2024-04-10 11:17:10 +07:00 |
|
|
|
5cd2a3ff3d
|
fix report 25
|
2024-04-10 11:16:19 +07:00 |
|
Bright
|
11890b4231
|
คำสั่งเลื่อนเงินเดือนรอบตุลาคม (gov2-08)
|
2024-04-10 11:14:57 +07:00 |
|
Bright
|
0d42cf022c
|
เพิ่มฟิลด์ yearSlice บัญชีการคำนวณโควตา
|
2024-04-09 16:47:04 +07:00 |
|
Bright
|
9132d4cd99
|
ปรับลำดับแสดงในreportให้ตรงกับหน้าเว็บ
|
2024-04-09 16:20:53 +07:00 |
|
Bright
|
f078d02462
|
no message
|
2024-04-09 15:54:49 +07:00 |
|
|
|
e4710ed004
|
Merge branch 'develop' into adiDev
|
2024-04-09 15:16:11 +07:00 |
|
|
|
5879ccf93d
|
fix report 16 to 14
|
2024-04-09 15:15:23 +07:00 |
|
Bright
|
81fd9dd511
|
แบบ2กท. กรองเฉพาะคนที่ไม่เกษียณเฉพาะรอบตุลา
|
2024-04-09 13:59:14 +07:00 |
|
Bright
|
c149234bf9
|
Merge branch 'develop' into develop-Bright
|
2024-04-09 11:59:09 +07:00 |
|
Bright
|
a5b0d2e911
|
ToThaiFullDate2
|
2024-04-09 11:58:37 +07:00 |
|
|
|
64c9fb4c0e
|
Merge branch 'develop' into adiDev
|
2024-04-09 11:56:28 +07:00 |
|
|
|
2a650659bd
|
fix report
|
2024-04-09 11:54:57 +07:00 |
|
Bright
|
3786ef4b78
|
เพิ่มฟังก์ชั่น ToThaiShortDate
|
2024-04-09 10:23:07 +07:00 |
|
Kittapath
|
8f272ad51f
|
เก็บเกษียณ
|
2024-04-09 09:25:55 +07:00 |
|
Bright
|
7fe1e65c3b
|
Merge branch 'develop' into develop-Bright
|
2024-04-05 17:43:11 +07:00 |
|
Bright
|
a268b8e2cb
|
comma
|
2024-04-05 17:42:39 +07:00 |
|
|
|
50e9243e89
|
Merge branch 'develop' into adiDev
|
2024-04-05 17:40:49 +07:00 |
|
|
|
6a18371d03
|
fix api
|
2024-04-05 17:39:30 +07:00 |
|
Bright
|
45b3777d33
|
Merge branch 'develop' into develop-Bright
|
2024-04-05 17:19:59 +07:00 |
|
Bright
|
68ac1392c9
|
ปรับ orgShortName ที่มีตัวเลข
|
2024-04-05 17:19:07 +07:00 |
|
|
|
99b4c9256a
|
Merge branch 'develop' into adiDev
|
2024-04-05 16:55:02 +07:00 |
|
|
|
96462647fc
|
emp-01 ถึง 05
|
2024-04-05 16:53:48 +07:00 |
|
Bright
|
de0f2572d6
|
แก้ชื่อหน่วยงาน
|
2024-04-05 16:35:18 +07:00 |
|
Bright
|
1cf851c395
|
Merge branch 'develop' into develop-Bright
|
2024-04-05 15:02:25 +07:00 |
|
Bright
|
c9c79a52be
|
no message
|
2024-04-05 15:01:48 +07:00 |
|
Kittapath
|
0ec4517341
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop
|
2024-04-05 14:23:00 +07:00 |
|
Kittapath
|
a568259c57
|
no message
|
2024-04-05 14:22:26 +07:00 |
|
Bright
|
d29e06384c
|
fix report (gov)
|
2024-04-05 14:08:15 +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 |
|
