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 |
|
Bright
|
1be7261ba0
|
no message
|
2024-02-27 16:45:24 +07:00 |
|
Kittapath
|
48c52e4f8c
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop
|
2024-02-27 16:20:14 +07:00 |
|
Kittapath
|
bcbd7c6208
|
no message
|
2024-02-27 16:19:18 +07:00 |
|
Bright
|
2f179d7e86
|
แก้ไขเงินเดือน
|
2024-02-27 16:12:32 +07:00 |
|
Bright
|
94cece9fc5
|
คำนวนเงินเดือนใหม่
|
2024-02-27 13:03:34 +07:00 |
|
Kittapath
|
2a7a5d5922
|
เพิ่มฟิว isResult
|
2024-02-27 12:56:44 +07:00 |
|
Kittapath
|
f5ba594a84
|
หาสังกัดตัวเอง
|
2024-02-27 12:34:44 +07:00 |
|
Kittapath
|
0a8cccc3aa
|
เพิ่มปี
|
2024-02-27 11:27:12 +07:00 |
|
Kittapath
|
9b3028eb8a
|
no message
|
2024-02-27 11:05:20 +07:00 |
|
Bright
|
5421b6f111
|
no message
|
2024-02-27 10:39:37 +07:00 |
|
Bright
|
d0185cc46a
|
Merge branch 'develop' into develop-Bright
|
2024-02-27 10:35:42 +07:00 |
|
Bright
|
309bf670bf
|
Edit SLR_020
|
2024-02-27 10:35:06 +07:00 |
|
Kittapath
|
ab9bf7cc80
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop
|
2024-02-27 10:30:42 +07:00 |
|
Kittapath
|
02e824f8c4
|
เพิ่มฟิว15% ทศนิยม
|
2024-02-27 10:30:28 +07:00 |
|
|
|
7d99487523
|
Merge branch 'develop' into adiDev
|
2024-02-27 10:10:40 +07:00 |
|
|
|
906edd7050
|
fix total
|
2024-02-27 10:09:51 +07:00 |
|
Kittapath
|
092d8e2e18
|
เพิ่มฟิวงบระมาณ
|
2024-02-27 10:09:06 +07:00 |
|
Kittapath
|
bf12751bfa
|
แก้ไขเงินเดือน
|
2024-02-27 08:58:22 +07:00 |
|
|
|
f79704c7a7
|
Merge branch 'develop' into adiDev
|
2024-02-23 17:18:10 +07:00 |
|
|
|
b2c65714fd
|
darft entity salaryOrg , salaryProfile
|
2024-02-23 17:17:19 +07:00 |
|
Bright
|
ebc04fcae3
|
ดักกรณี year = 0
|
2024-02-23 12:13:12 +07:00 |
|
|
|
2cef1f1b76
|
fix update salary preriod
|
2024-02-23 11:40:08 +07:00 |
|
Bright
|
aaaf4f548c
|
no message
|
2024-02-22 17:52:39 +07:00 |
|
Kittapath
|
5bdd2c226e
|
no message
|
2024-02-22 17:43:26 +07:00 |
|
